diff --git a/.env.development b/.env.development index 13c7001..a08e7e1 100644 --- a/.env.development +++ b/.env.development @@ -7,9 +7,9 @@ ENV = 'development' # 开发环境 # VUE_APP_BASE_API = '/dev-api' # 后台 -# VUE_APP_BASE_API = 'http://192.168.1.222:8080' +VUE_APP_BASE_API = 'http://192.168.1.222:8080' # 梅州云端 -VUE_APP_BASE_API = 'http://106.55.173.225:8091' +# VUE_APP_BASE_API = 'http://106.55.173.225:8091' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/api/comprehensiveEnergy/systemEnergy.js b/src/api/comprehensiveEnergy/systemEnergy.js new file mode 100644 index 0000000..f494476 --- /dev/null +++ b/src/api/comprehensiveEnergy/systemEnergy.js @@ -0,0 +1,9 @@ +import request from "@/utils/request"; + +export const compreReport = (data) => { + return request({ + url: "/compre/report", + method: "post", + data, + }); +}; diff --git a/src/api/device/gather.js b/src/api/device/gather.js index 9834a82..8d856b5 100644 --- a/src/api/device/gather.js +++ b/src/api/device/gather.js @@ -8,6 +8,12 @@ export function cpmList(query) { params: query, }); } +export function cpmList2(cpmIds) { + return request({ + url: "/device/cpm/list/" + cpmIds, + method: "get", + }); +} // 根据id查询设备采集参数信息 export function getCPM(cpmId) { diff --git a/src/assets/flowimg/circulate-move.gif b/src/assets/flowimg/circulate-move.gif index fc9a46b..c157849 100644 Binary files a/src/assets/flowimg/circulate-move.gif and b/src/assets/flowimg/circulate-move.gif differ diff --git a/src/assets/flowimg/circulate-nomove.png b/src/assets/flowimg/circulate-nomove.png index 95bcc0d..f9ce69a 100644 Binary files a/src/assets/flowimg/circulate-nomove.png and b/src/assets/flowimg/circulate-nomove.png differ diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index d6028ce..f50d80d 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -1449,3 +1449,6 @@ .el-table--border th.el-table__cell { border-bottom: 1px solid #00264f !important; } +.el-table__expand-icon{ + color: #fff !important; +} \ No newline at end of file diff --git a/src/views/alarm/alarmRule/index.vue b/src/views/alarm/alarmRule/index.vue index e45da8b..8c809d7 100644 --- a/src/views/alarm/alarmRule/index.vue +++ b/src/views/alarm/alarmRule/index.vue @@ -668,7 +668,8 @@ export default { this.multiple = !selection.length; }, // 弹框选择设备名称 - handleDevice(selectedValue) { + handleDevice(selectedValue, val) { + console.log("选择设备", selectedValue); // 通过选中的 value 找到对应的 label const selectedItem = this.devices.find( (item) => item.id === selectedValue @@ -683,8 +684,13 @@ export default { // 请求采集位点 this.getCpmIdList(this.form.ledgerId); } - //清除采集位点 - this.form.cpmId = ""; + if (!val) { + console.log("非第一次打开弹框-选择设备类型"); + //清除采集位点 + this.form.cpmId = ""; + } else { + console.log("第一次打开弹框-默认采集点位"); + } }, //采集参数列表 getCpmIdList(id) { @@ -775,6 +781,8 @@ export default { }; this.open = true; this.title = "修改报警规则"; + // 手动调用 handleDevice 方法 + this.handleDevice(this.form.ledgerId, true); }); }, /** 提交按钮 */ diff --git a/src/views/comprehensiveEnergy/systemEnergy/index.vue b/src/views/comprehensiveEnergy/systemEnergy/index.vue new file mode 100644 index 0000000..bbdf0e3 --- /dev/null +++ b/src/views/comprehensiveEnergy/systemEnergy/index.vue @@ -0,0 +1,777 @@ + + + + + diff --git a/src/views/hotWater/energyAnalysis/components/energyReport.vue b/src/views/hotWater/energyAnalysis/components/energyReport.vue index 4c5cbfc..e62b93c 100644 --- a/src/views/hotWater/energyAnalysis/components/energyReport.vue +++ b/src/views/hotWater/energyAnalysis/components/energyReport.vue @@ -476,42 +476,12 @@ export default { }, //请求折线图数据 getChartData() { - console.log("图表参数", this.queryParams); - let timeType = null; - if (this.dateType == "day") { - timeType = 1; - this.queryParams.startTime = - this.dayDate.length > 0 ? this.dayDate[0] : ""; - this.queryParams.endTime = - this.dayDate.length > 0 ? this.dayDate[1] : ""; - } else if (this.dateType == "month") { - timeType = 2; - this.queryParams.startTime = - this.monthDate.length > 0 ? this.monthDate[0] : ""; - this.queryParams.endTime = - this.monthDate.length > 0 ? this.monthDate[1] : ""; - } else if (this.dateType == "year") { - timeType = 3; - this.queryParams.startTime = this.startYear; - this.queryParams.endTime = this.endYear; - } - let data = { - type: timeType, - page: this.queryParams.pageNum, - limit: this.total, - startDate: this.queryParams.startTime, - endDate: this.queryParams.endTime, - buildingId: this.building, - }; - hotEnergyQuery(data).then((res) => { - console.log("图表返回的数据", res); - this.brokenData1 = []; - this.brokenData2 = []; - this.brokenData3 = []; - this.brokenTime = []; - if (res.code == 200 && res.rows.length > 0) { - this.exportData = res.rows; - res.rows.forEach((item) => { + if ((this.total == 10)) { + // 防止数据提交重复 + console.log("不用请求"); + if (this.tableData.length > 0) { + this.exportData = this.tableData; + this.exportData.forEach((item) => { this.brokenData1.push(item.useHotWater); this.brokenData2.push(item.electValue); this.brokenData3.push(item.electWater); @@ -530,7 +500,63 @@ export default { this.brokenTime = []; } this.renderingBroken(); - }); + } else { + console.log("图表参数", this.queryParams); + let timeType = null; + if (this.dateType == "day") { + timeType = 1; + this.queryParams.startTime = + this.dayDate.length > 0 ? this.dayDate[0] : ""; + this.queryParams.endTime = + this.dayDate.length > 0 ? this.dayDate[1] : ""; + } else if (this.dateType == "month") { + timeType = 2; + this.queryParams.startTime = + this.monthDate.length > 0 ? this.monthDate[0] : ""; + this.queryParams.endTime = + this.monthDate.length > 0 ? this.monthDate[1] : ""; + } else if (this.dateType == "year") { + timeType = 3; + this.queryParams.startTime = this.startYear; + this.queryParams.endTime = this.endYear; + } + let data = { + type: timeType, + page: this.queryParams.pageNum, + limit: this.total, + startDate: this.queryParams.startTime, + endDate: this.queryParams.endTime, + buildingId: this.building, + }; + hotEnergyQuery(data).then((res) => { + console.log("图表返回的数据", res); + this.brokenData1 = []; + this.brokenData2 = []; + this.brokenData3 = []; + this.brokenTime = []; + if (res.code == 200 && res.rows.length > 0) { + this.exportData = res.rows; + res.rows.forEach((item) => { + this.brokenData1.push(item.useHotWater); + this.brokenData2.push(item.electValue); + this.brokenData3.push(item.electWater); + this.brokenTime.push(item.curDate); + }); + // 对数组进行反转操作 + this.brokenData1.reverse(); + this.brokenData2.reverse(); + this.brokenData3.reverse(); + this.brokenTime.reverse(); + this.renderingBroken(); + } else { + this.brokenData1 = []; + this.brokenData2 = []; + this.brokenData3 = []; + this.brokenTime = []; + } + this.renderingBroken(); + }); + } }, renderingBroken() { if (this.currentIndex === 0) { diff --git a/src/views/hotWater/waterMonitor/waterMonitorDetails.vue b/src/views/hotWater/waterMonitor/waterMonitorDetails.vue index 0ccc1c1..c73f831 100644 --- a/src/views/hotWater/waterMonitor/waterMonitorDetails.vue +++ b/src/views/hotWater/waterMonitor/waterMonitorDetails.vue @@ -112,7 +112,7 @@
无线网关
回水阀
房间
-
循环加热泵
+
补水阀
- + /> -->
+ + + + + + + + + + +
@@ -510,6 +549,8 @@ import { getHouse, delHouse, } from "@/api/region"; +import { cpmList2 } from "@/api/device/gather"; +import { ledgerList } from "@/api/device/ledger"; export default { name: "region", dicts: ["sys_type"], @@ -533,7 +574,12 @@ export default { // 总条数 total: 0, isDialogOpen: false, //楼栋新增修改弹框 - dialogForm: {}, + dialogForm: { + ledgerId: "", + deviceName: "", + cpmId: "", + cpmName: "", + }, dialogRules: { status: [ { required: true, message: "请选择二维码状态", trigger: "blur" }, @@ -543,6 +589,8 @@ export default { isUpdate: false, isTableUpdate: false, rowId: "", //当前表格列id + devices: [], //设备列表 + cpmList: [], //采集点位列表 }; }, mounted() { @@ -738,6 +786,7 @@ export default { this.dialogTitle = "修改房间"; this.currentParentId = row.floorId; this.getDialogRoom(row.id); + this.getDeviceList(); } this.isDialogOpen = true; }, @@ -866,6 +915,7 @@ export default { this.dialogTitle = "新增楼层"; } else if (data.nodeType === 3) { this.dialogTitle = "新增房间"; + this.getDeviceList(); } this.isDialogOpen = true; }, @@ -894,6 +944,7 @@ export default { } else if (data.nodeType === 4) { this.dialogTitle = "修改房间"; this.getDialogRoom(data.id); + this.getDeviceList(); } this.isDialogOpen = true; }, @@ -1002,6 +1053,18 @@ export default { this.dialogForm.status !== null ? this.dialogForm.status.toString() : null; + // // 处理设备类型id和采集参数类型id,字符串"1,2,3"改为["1","2","3"] + // this.dialogForm.ledgerId = this.dialogForm.ledgerId + // ? this.dialogForm.ledgerId.split(",") + // : []; + // this.dialogForm.cpmId = this.dialogForm.cpmId + // ? this.dialogForm.cpmId.split(",") + // : []; + + // 如果有this.dialogForm.ledgerId，则需要请求采集参数类型 + if (this.dialogForm.ledgerId && this.dialogForm.ledgerId.length > 0) { + this.getCpmIdList(this.dialogForm.ledgerId); + } } }); }, @@ -1052,6 +1115,10 @@ export default { }, addSet() { if (this.currentLevel === 0) { + if (!this.dialogForm.areaName || !this.dialogForm.systemType) { + this.$modal.msgWarning("请输入新增数据"); + return; + } // 新增区域 let data = { areaName: this.dialogForm.areaName, @@ -1076,6 +1143,10 @@ export default { } }); } else if (this.currentLevel === 1) { + if (!this.dialogForm.buildingName) { + this.$modal.msgWarning("请输入新增数据"); + return; + } // 新增楼栋 let data = { buildingName: this.dialogForm.buildingName, @@ -1108,6 +1179,10 @@ export default { } }); } else if (this.currentLevel === 2) { + if (!this.dialogForm.floorName) { + this.$modal.msgWarning("请输入新增数据"); + return; + } // 新增楼层 let data = { buildingId: this.currentId, @@ -1136,6 +1211,10 @@ export default { } }); } else if (this.currentLevel === 3) { + if (!this.dialogForm.houseName) { + this.$modal.msgWarning("请输入新增数据"); + return; + } // 新增房间 let data = { buildingId: "", @@ -1150,7 +1229,16 @@ export default { usableArea: this.dialogForm.usableArea, builtYear: this.dialogForm.builtYear, status: this.dialogForm.status, + ledgerId: + this.dialogForm.ledgerId && this.dialogForm.ledgerId.length > 0 + ? this.dialogForm.ledgerId + : [], + cpmId: + this.dialogForm.cpmId && this.dialogForm.cpmId.length > 0 + ? this.dialogForm.cpmId + : [], }; + console.log("新增的参数", data); addHouse(data).then((res) => { if (res.code == 200) { this.$modal.msgSuccess("新增成功"); @@ -1169,6 +1257,10 @@ export default { } }, updateAreaData(id) { + if (!this.dialogForm.areaName) { + this.$modal.msgWarning("请输入修改数据"); + return; + } let data = { id: id, areaName: this.dialogForm.areaName, @@ -1200,6 +1292,10 @@ export default { } else { nextId = ""; } + if (!this.dialogForm.buildingName) { + this.$modal.msgWarning("请输入修改数据"); + return; + } let data = { id: id, buildingName: this.dialogForm.buildingName, @@ -1240,6 +1336,10 @@ export default { } else { nextId = ""; } + if (!this.dialogForm.floorName) { + this.$modal.msgWarning("请输入修改数据"); + return; + } let data = { id: id, buildingId: nextId, @@ -1276,6 +1376,10 @@ export default { } else { nextId = ""; } + if (!this.dialogForm.houseName) { + this.$modal.msgWarning("请输入修改数据"); + return; + } let data = { id: id, buildingId: "", @@ -1290,6 +1394,14 @@ export default { usableArea: this.dialogForm.usableArea, builtYear: this.dialogForm.builtYear, status: this.dialogForm.status, + ledgerId: + this.dialogForm.ledgerId && this.dialogForm.ledgerId.length > 0 + ? this.dialogForm.ledgerId + : [], + cpmId: + this.dialogForm.cpmId && this.dialogForm.cpmId.length > 0 + ? this.dialogForm.cpmId + : [], }; console.log("修改的参数", data); updateHouse(data).then((res) => { @@ -1308,6 +1420,74 @@ export default { } }); }, + // 查询设备列表 + getDeviceList() { + let data = { + pageNum: 1, + pageSize: 100000, + }; + ledgerList(data).then((response) => { + this.devices = response.rows; + }); + }, + // 弹框选择设备名称 + handleDevice(selectedValue) { + console.log("选择设备", selectedValue); + this.getCpmIdList(selectedValue); + // // 通过选中的 value 找到对应的 label + // const selectedItem = this.devices.find( + // (item) => item.id === selectedValue + // ); + // if (selectedItem) { + // const selectedLabel = selectedItem.deviceName; + // console.log("选中的 value:", selectedValue); + // console.log("选中的 label:", selectedLabel); + // // 在这里可以进行其他操作，比如发送请求等 + // this.dialogForm.ledgerId = selectedValue; + // this.dialogForm.deviceName = selectedLabel; + // // 请求采集位点 + // this.getCpmIdList(this.dialogForm.ledgerId); + // } + // if (!val) { + // console.log("非第一次打开弹框-选择设备类型"); + // //清除采集位点 + // this.dialogForm.cpmId = ""; + // } else { + // console.log("第一次打开弹框-默认采集点位"); + // this.dialogForm = { + // cpmId: "", + // }; + // } + }, + //采集参数列表 + getCpmIdList(ids) { + if (ids.length > 0) { + cpmList2(ids).then((response) => { + this.cpmList = response.rows; + console.log("this.cpmList", this.cpmList); + }); + } else { + console.log("无值不请求"); + this.cpmList = []; + } + }, + // 弹框选择采集类型 + handleMeter(selectedValue) { + console.log("选择的采集类型", selectedValue); + console.log("dialogForm.cpmId", this.dialogForm.cpmId); + // // 通过选中的 value 找到对应的 label + // const selectedItem = this.cpmList.find( + // (item) => item.id === selectedValue + // ); + // if (selectedItem) { + // const selectedLabel = selectedItem.otherName; + // console.log("选中的 value:", selectedValue); + // console.log("选中的 label:", selectedLabel); + // // 在这里可以进行其他操作，比如发送请求等 + // this.dialogForm.cpmId = selectedValue; + // this.dialogForm.cpmName = selectedLabel; + // } + }, }, };