From ec2f27d196505590502388268837106db58ce68c Mon Sep 17 00:00:00 2001 From: jiangyinzhi <4617248933@YFZMY.COM> Date: Fri, 26 Jul 2024 10:33:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/settings.js | 2 +- src/store/module/user.js | 2 +- src/views/comment/components/report.vue | 9 +- src/views/comment/energyReport.vue | 9 +- src/views/energyEfficiency/TaskFilling.vue | 2 +- src/views/energyEfficiency/clockIn/index.vue | 26 +++ .../energyEfficiency/constructionInfo.vue | 59 +++--- src/views/energyEfficiency/taskManage.vue | 184 ++++++++++++------ src/views/enterprise/bengjiSystem.vue | 8 +- src/views/enterprise/energyManagement.vue | 4 +- src/views/enterprise/fengjiSystem.vue | 8 +- src/views/enterprise/generalEnergy.vue | 10 +- src/views/enterprise/kongyajiSystem.vue | 8 +- .../bursting/burstingDetail.vue | 24 ++- .../facilityManage/common-vue/uploader.vue | 7 + src/views/facilityManage/common-vue/year.vue | 5 + .../facilityManage/components/multipleAir.vue | 8 +- src/views/facilityManage/index.vue | 2 +- 18 files changed, 258 insertions(+), 119 deletions(-) diff --git a/src/settings.js b/src/settings.js index dcdbca2..ed75c64 100644 --- a/src/settings.js +++ b/src/settings.js @@ -12,7 +12,7 @@ module.exports = { menuExclude: [], // ${process.env.VUE_APP_BASE_API} // https://portal.xt.nfjbill.ren:30004 - downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-nx/file/minio/download/`, + downloadUrl: `${process.env.VUE_APP_BASE_API}/file/minio/download/`, // downloadUrl: `https://www.greensgcc.com/proxy-xj/file/minio/download/`, // downloadUrl: `http://172.29.69.38:19012/proxy-sx/file/minio/download/`, uploadUrl: `${process.env.VUE_APP_BASE_API}/file/minio/upload/`, diff --git a/src/store/module/user.js b/src/store/module/user.js index b270b6b..decd8d4 100644 --- a/src/store/module/user.js +++ b/src/store/module/user.js @@ -35,7 +35,7 @@ const getDefaultState = () => ({ to: { path: '' }, - cityType: process.env.VUE_APP_CITY_TYPE=='sx', //外观图片必填 + cityType: true, //外观图片必填 cityIsNx: process.env.VUE_APP_CITY_TYPE=='sx', //位置必填 imageRecognition: process.env.VUE_APP_CITY_TYPE=='ah', // 图像识别 validate: process.env.VUE_APP_CITY_TYPE=='ah', // 大区间校验 diff --git a/src/views/comment/components/report.vue b/src/views/comment/components/report.vue index 55d42b5..81c6947 100644 --- a/src/views/comment/components/report.vue +++ b/src/views/comment/components/report.vue @@ -8,7 +8,7 @@ -->
-
公共建筑|公共机构
+
{{getName}}
@@ -200,6 +200,13 @@ export default { return true } return false + }, + getName(){ + let res = '' + if(this.EnergyReportInfo.buildType&&this.EnergyReportInfo.buildType.indexOf('/')>0){ + res ='|' + this.EnergyReportInfo.buildType.split('/')[0] + } + return '公共机构'+res } }, diff --git a/src/views/comment/energyReport.vue b/src/views/comment/energyReport.vue index 9f2d1d3..e5fe602 100644 --- a/src/views/comment/energyReport.vue +++ b/src/views/comment/energyReport.vue @@ -24,7 +24,7 @@ >
-
公共建筑|公共机构
+
{{getName}}
@@ -416,6 +416,13 @@ export default { }) }, computed: { + getName(){ + let res = '' + if(this.EnergyReportInfo.buildType&&this.EnergyReportInfo.buildType.indexOf('/')>0){ + res ='|' + this.EnergyReportInfo.buildType.split('/')[0] + } + return '公共机构'+res + } }, // beforeDestroy() { diff --git a/src/views/energyEfficiency/TaskFilling.vue b/src/views/energyEfficiency/TaskFilling.vue index cce0674..fb1bfb1 100644 --- a/src/views/energyEfficiency/TaskFilling.vue +++ b/src/views/energyEfficiency/TaskFilling.vue @@ -628,7 +628,7 @@ export default { let item = JSON.parse(sessionStorage.getItem('tidCid')).item if(!item.isPosition){ this.$notify({ - message: '请在完成打卡之后提交', + message: '必须先在app打卡以后才能提交', duration: 1000, type: 'warning' }) diff --git a/src/views/energyEfficiency/clockIn/index.vue b/src/views/energyEfficiency/clockIn/index.vue index ce61580..8e462c7 100644 --- a/src/views/energyEfficiency/clockIn/index.vue +++ b/src/views/energyEfficiency/clockIn/index.vue @@ -12,6 +12,7 @@ input-align="right" placeholder="请输入" required + :rules="[{ required: true }]" /> - +
@@ -339,7 +339,7 @@ export default { tips7: false, newAnswer: [], // 问答题存 loading:false, - result1: '', + result1: '无', result222: '', result333: '', result444: '', @@ -499,12 +499,12 @@ export default { roomArea: '', // 数据机房面积 operationYear: '', // 建筑投运年份 peopleNum: '', // 用能人数 - purchasePower: '', // 购电方式 - basicCharge: '', // 基本电费 - valleyElectricityPrices: '', // 是否享受峰谷平电价 - photovoltaicArea: '', // 光伏总建设面积 - photovoltaicPhotovoltaic: '', // 光伏总装机容量 - reclaimedWater: '', // 是否采用再生水 + purchasePower: '1', // 购电方式 + basicCharge: '1', // 基本电费 + valleyElectricityPrices: '2', // 是否享受峰谷平电价 + photovoltaicArea: '0', // 光伏总建设面积 + photovoltaicPhotovoltaic: '0', // 光伏总装机容量 + reclaimedWater: '2', // 是否采用再生水 reclaimedWaterType: '', // 再生水类型 wallMaterials: '', // 外墙结构 doorWindowGlass: '', // 门窗玻璃 @@ -517,26 +517,26 @@ export default { energyAudit: '', // 近三年是否进行过能源审计 heatPump: '', // 是否已使用热泵 solarWater: '', // 是否已使用太阳能热水 - photovoltaic: '', // 是否已使用光伏 + photovoltaic: '2', // 是否已使用光伏 enquireIds: '', // 问询中确认为是的选项id用逗号隔开（只保存为问询是的选项） text1: '', // 图一 text2: '', // 图二 text3: '', // 图三 - greenElectricityTrading: '' // 是否使用绿电交易 + greenElectricityTrading: '2' // 是否使用绿电交易 }, // 页面回显数据 showData: { buildType1: '请选择', // 建筑类型 buildTypepCode: '', - purchasePower1: '请选择', // 购电方式 + purchasePower1: '普通代理', // 购电方式 reclaimedWaterType1: '请选择', // 再生水类型 wallMaterials1: '请选择', // 外墙结构 doorWindowGlass1: '请选择', // 门窗玻璃 windowFrameMaterial1: '请选择', // 窗框材料 itemizedMeasurementType1: '请选择', // 分项计量类型 - basicCharge1: '请选择', // 基本电费 - valleyElectricityPrices1: '请选择', // 是否享受峰谷平电价 - reclaimedWater1: '请选择', // 是否采用再生水 + basicCharge1: '有', // 基本电费 + valleyElectricityPrices1: '否', // 是否享受峰谷平电价 + reclaimedWater1: '否', // 是否采用再生水 itemizedMeter1: '请选择', // 是否有分项计量 energyPlatform1: '请选择', // 是否具有能源管理平台 energyAudit1: '请选择', // 近三年是否进行过能源审计 @@ -555,10 +555,10 @@ export default { index15: '', // 近三年是否进行过能源审计 heatPump: '', // 是否已使用热泵 solarWater: '', // 是否已使用太阳能热水 - photovoltaic: '', // 是否已使用光伏 + photovoltaic: '否', // 是否已使用光伏 gfShow: '', - greenElectricityTrading1: '请选择', // 是否使用绿电交易 - indexLd: '' // 是否使用绿电交易 + greenElectricityTrading1: '否', // 是否使用绿电交易 + indexLd: '2' // 是否使用绿电交易 }, qjnyArr: [], // 已使用清洁能源 wqjgArr: [], // 外墙结构 @@ -1987,12 +1987,12 @@ export default { roomArea: '', // 数据机房面积 operationYear: '请选择', // 建筑投运年份 peopleNum: '', // 用能人数 - purchasePower: '', // 购电方式 - basicCharge: '', // 基本电费 - valleyElectricityPrices: '', // 是否享受峰谷平电价 + purchasePower: '1', // 购电方式 + basicCharge: '1', // 基本电费 + valleyElectricityPrices: '2', // 是否享受峰谷平电价 photovoltaicArea: '', // 光伏总建设面积 photovoltaicPhotovoltaic: '', // 光伏总装机容量 - reclaimedWater: '', // 是否采用再生水 + reclaimedWater: '2', // 是否采用再生水 reclaimedWaterType: '', // 再生水类型 wallMaterials: '', // 外墙结构 doorWindowGlass: '', // 门窗玻璃 @@ -2005,24 +2005,25 @@ export default { energyAudit: '', // 近三年是否进行过能源审计 heatPump: '', // 是否已使用热泵 solarWater: '', // 是否已使用太阳能热水 - photovoltaic: '', // 是否已使用光伏 + photovoltaic: '2', // 是否已使用光伏 enquireIds: '', // 问询中确认为是的选项id用逗号隔开（只保存为问询是的选项） text1: '', // 图一 text2: '', // 图二 text3: '', // 图三 + greenElectricityTrading: '2', // 是否使用绿电交易 }), // 页面回显数据 (this.showData = { buildType1: '请选择', // 建筑类型 - purchasePower1: '请选择', // 购电方式 + purchasePower1: '普通代理', // 购电方式 reclaimedWaterType1: '请选择', // 再生水类型 wallMaterials1: '请选择', // 外墙结构 doorWindowGlass1: '请选择', // 门窗玻璃 windowFrameMaterial1: '请选择', // 窗框材料 itemizedMeasurementType1: '请选择', // 分项计量类型 - basicCharge1: '请选择', // 基本电费 - valleyElectricityPrices1: '请选择', // 是否享受峰谷平电价 - reclaimedWater1: '请选择', // 是否采用再生水 + basicCharge1: '有', // 基本电费 + valleyElectricityPrices1: '否', // 是否享受峰谷平电价 + reclaimedWater1: '否', // 是否采用再生水 itemizedMeter1: '请选择', // 是否有分项计量 energyPlatform1: '请选择', // 是否具有能源管理平台 energyAudit1: '请选择', // 近三年是否进行过能源审计 @@ -2041,9 +2042,9 @@ export default { index15: '', // 近三年是否进行过能源审计 heatPump: '', // 是否已使用热泵 solarWater: '', // 是否已使用太阳能热水 - photovoltaic: '', // 是否已使用光伏 + photovoltaic: '否', // 是否已使用光伏 gfShow: '', - greenElectricityTrading1: '请选择', // 是否使用绿电交易 + greenElectricityTrading1: '否', // 是否使用绿电交易 indexLd: '' // 是否使用绿电交易 }), (this.qjnyArr = []), // 已使用清洁能源 diff --git a/src/views/energyEfficiency/taskManage.vue b/src/views/energyEfficiency/taskManage.vue index 38b3003..e09dbf6 100644 --- a/src/views/energyEfficiency/taskManage.vue +++ b/src/views/energyEfficiency/taskManage.vue @@ -25,7 +25,9 @@ - + - - - - - - - -
+
+
+
@@ -277,28 +270,88 @@ export default { pageNum: 1, //当前页数 pageSize: 5, //每页多少条 taskType: null, //当前选择任务状态 - appointmentTime: null, //当前选择的预约日期 year: null, //当前选择的预约日期 consName: null, //客户名称 + }, + refreshing: false, + timer: null, + scrollPosition: 0, + pageN: 1, + isList: false, + } + }, + watch: { + 'page.consName': { + handler() { + if (this.timer) { + clearTimeout(this.timer) + } + this.timer = setTimeout(() => { + this.onSearch() + }, 1500) } } }, beforeDestroy() { // sessionStorage.removeItem('tidCid') }, - mounted() { - this.getTaskType() - const data = { - child:null, - code: null, - name: '无', - pCode: null, - value: null + async mounted() { + this.scrollPosition = sessionStorage.getItem('scrollableDiv') || 0 + this.pageN = sessionStorage.getItem('pageNum') || 1 + await this.getTaskType() + + if (sessionStorage.getItem('taskTypeList')) { + this.page.taskType = sessionStorage.getItem('taskTypeList') + this.radio = this.taskType.findIndex( + item => item.code == this.page.taskType + ) + } + if (sessionStorage.getItem('year')) { + this.page.year = sessionStorage.getItem('year') + } + if (sessionStorage.getItem('consName')) { + this.page.consName = sessionStorage.getItem('consName') + } else { + this.getTaskList() } - this.clickRadio(data, 0) }, methods: { - + onRefresh() { + // 清空列表数据 + this.finished = false + // 重新加载数据 + // 将 loading 设置为 true，表示处于加载状态 + // this.loading = true + this.page.taskType = '' + this.page.consName = '' + this.page.year = '' + sessionStorage.removeItem('year') + sessionStorage.removeItem('taskTypeList') + this.radio = '' + this.page.pageNum = 1 + const data = { + child:null, + code: null, + name: '无', + pCode: null, + value: null + } + this.clickRadio(data, 0) + this.getTaskList() + }, + //滚动DOM位置 + scroll() { + this.$nextTick(() => { + const scrollableDiv = this.$refs.scrollableDiv + if (scrollableDiv) { + this.$refs.scrollableDiv.scrollTop = this.scrollPosition + this.scrollPosition = 0 + sessionStorage.removeItem('scrollableDiv') + this.page.pageNum = this.pageN + this.page.pageSize = 5 + } + }) + }, aaa() { var hhh = this.statusPopup this.statusPopup = !hhh @@ -308,6 +361,9 @@ export default { var qqq = this.datePopup this.datePopup = !qqq this.statusPopup = false + this.$nextTick(()=> { + this.$refs.yearPopup.defaultIndex(this.page.year) + }) }, // 滑动加载 @@ -403,6 +459,12 @@ export default { }, // 生成诊断报告 togenReport(item) { + this.pageN = this.page.pageNum + this.page.pageNum = 1 + const scrollableDiv = this.$refs.scrollableDiv + if (scrollableDiv) { + this.scrollPosition = scrollableDiv.scrollTop || 0 + } const data = { taskId: item.id, customerId: item.customerId @@ -448,6 +510,12 @@ export default { }, // 获取任务管理列表 async getTaskList() { + this.isList = false + if (this.pageN + 1 > 1) { + this.page.pageSize = this.pageN * 5 + sessionStorage.removeItem('pageNum') + } + console.log(this.page, 'ppppp'); const res = await taskList(this.page) if (res.code == 0) { this.taskList1 = res.data.list @@ -459,15 +527,17 @@ export default { this.immediateCheck = true this.finished = false } + this.isList = true } + this.scroll() }, // 获取状态下拉 - getTaskType() { + async getTaskType() { const info = { codeSortId: 80000001031, codeType: 'sbwxlx', } - getCode(info).then((res) => { + await getCode(info).then((res) => { if (res.code == 0) { this.taskType = res.data this.taskType.unshift({ @@ -484,46 +554,31 @@ export default { clickRadio(item, index) { this.radio = index this.page.taskType = item.code - this.page.appointmentTime = '' this.page.year = '' this.page.pageNum = 1 this.allPage = 0 - + sessionStorage.setItem('taskTypeList', item.code||'') + sessionStorage.setItem('year', '') this.getTaskList() this.statusPopup = false }, - // 日期选择赋值 - onConfirm(val) { - var date2 = new Date(val) - var y = date2.getFullYear() - var m = date2.getMonth() + 1 - m = m < 10 ? '0' + m : m - var d = date2.getDate() - d = d < 10 ? '0' + d : d - let dateTime = y + '-' + m + '-' + d - - this.page.pageNum = 1 - this.page.appointmentTime = dateTime - - this.allPage = 0 - this.getTaskList() - this.datePopup = false - }, onConfirmYear(data) { this.page.pageNum = 1 this.page.year = data.value this.allPage = 0 + sessionStorage.setItem('year', data.value) this.getTaskList() this.datePopup = false; }, onCancelYear() { - this.datePopup = false; - + this.page.year = '' + this.datePopup = false; }, // 客户名称关键字查询 onSearch(){ this.page.pageNum = 1 this.allPage = 0 + sessionStorage.setItem('consName', this.page.consName) this.getTaskList() }, goClockIn(item){ @@ -532,20 +587,31 @@ export default { name: 'clockIn', }) } + }, + beforeRouteLeave(to, from, next) { + const scrollableDiv = this.$refs.scrollableDiv + if (scrollableDiv) { + this.scrollPosition = scrollableDiv.scrollTop || 0 + sessionStorage.setItem('scrollableDiv', this.scrollPosition) + sessionStorage.setItem('pageNum', this.page.pageNum) + } + next() } }