diff --git a/.env.development b/.env.development index a08e7e1..13c7001 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/views/hotWater/waterMonitor/waterMonitorDetails copy.vue b/src/views/hotWater/waterMonitor/waterMonitorDetails copy.vue new file mode 100644 index 0000000..a099470 --- /dev/null +++ b/src/views/hotWater/waterMonitor/waterMonitorDetails copy.vue @@ -0,0 +1,2398 @@ + + + + + + diff --git a/src/views/hotWater/waterMonitor/waterMonitorDetails.vue b/src/views/hotWater/waterMonitor/waterMonitorDetails.vue index a099470..8ebc927 100644 --- a/src/views/hotWater/waterMonitor/waterMonitorDetails.vue +++ b/src/views/hotWater/waterMonitor/waterMonitorDetails.vue @@ -579,154 +579,55 @@
- -
-
- - - - - -
- 当前有报警信号触发 -
- - - - - -
- 泵1:{{ Number(threePumpObj.freq1) }}Hz -
- - - - -
- 泵2:{{ Number(threePumpObj.freq2) }}Hz -
- - - - -
- 泵3:{{ Number(threePumpObj.freq3) }}Hz -
- - - -
-
- {{ getPercentage(progress1) }}% -
-
+
+
+ + +
+
+
+ +
+
+ + +
- {{ getPercentage(progress1) }}% -
-
-
最大值:3.2米
-
实际值:{{ progress1 }}米
-
-
- 入口压力:{{ threePumpObj.inPress }}bar -
-
- 目标压力:{{ threePumpObj.goalPress }}bar -
-
- 出口压力:{{ threePumpObj.outPress }}bar + class="progressContainer1" + v-if="getPercentage(progress1) > 50" + > +
+ {{ getPercentage(progress1) }}% +
+
+
+ {{ getPercentage(progress1) }}% +
+
+
最大值:3.2米
+
实际值:{{ progress1 }}米
+
@@ -789,7 +690,7 @@ export default { pumname: "", currentWeekday: "", isShowHotWater: false, - + isSHowWaterPump: false, threePumpObj: {}, }; }, @@ -844,10 +745,10 @@ export default { this.getDayData(); // 设置定时器,每 10 秒执行一次 this.timer = setInterval(() => { - if (this.isShowHotWater) { + if (this.isShowHotWater && !this.isSHowWaterPump) { this.baseMessgae(); + this.sysStatus(); } - this.sysStatus(); }, 10000); // 每秒更新一次时间 this.nowTimer = setInterval(() => { @@ -993,17 +894,23 @@ export default { this.progressName1 = "裙楼"; this.progressName2 = "中厨"; this.isShowHotWater = true; + this.isSHowWaterPump = false; this.baseMessgae(); this.sysStatus(); } else if (this.currentName === "3楼") { this.progressName1 = "高区"; this.progressName2 = "中区"; this.isShowHotWater = true; + this.isSHowWaterPump = false; this.baseMessgae(); this.sysStatus(); + } else if (this.currentName.includes("水泵")) { + this.isShowHotWater = false; + this.isSHowWaterPump = true; + // this.sysStatus(); } else { this.isShowHotWater = false; - this.sysStatus(); + this.isSHowWaterPump = false; } } }); @@ -1104,8 +1011,13 @@ export default { this.isShowHotWater = true; this.baseMessgae(); this.sysStatus(); + } else if (this.currentName.includes("水泵")) { + this.isShowHotWater = false; + this.isSHowWaterPump = true; + // this.sysStatus(); } else { this.isShowHotWater = false; + this.isSHowWaterPump = false; this.sysStatus(); } }, @@ -1215,7 +1127,9 @@ export default { // 模拟点击第一行 this.handlerow(firstRow); // 设置当前选中行 - this.$refs.maintable.setCurrentRow(firstRow); + if (this.isShowHotWater && !isSHowWaterPump) { + this.$refs.maintable.setCurrentRow(firstRow); + } } } else { this.tableData = []; @@ -2225,6 +2139,9 @@ export default { color: #e40825; } } + .iframeDiv { + width: 100%; + } } .changecontent {