diff --git a/.env.development b/.env.development index e9b040a..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://106.55.173.225:8091' +VUE_APP_BASE_API = 'http://192.168.1.222:8080' +# 梅州云端 +# VUE_APP_BASE_API = 'http://106.55.173.225:8091' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/assets/flowimg/pump.png b/src/assets/flowimg/pump.png new file mode 100644 index 0000000..dff68a2 Binary files /dev/null and b/src/assets/flowimg/pump.png differ diff --git a/src/assets/flowimg/replenish-move.gif b/src/assets/flowimg/replenish-move.gif index 81d9c90..e08ed7a 100644 Binary files a/src/assets/flowimg/replenish-move.gif and b/src/assets/flowimg/replenish-move.gif differ diff --git a/src/assets/flowimg/replenish-nomove.png b/src/assets/flowimg/replenish-nomove.png index f1d3e46..04dfe04 100644 Binary files a/src/assets/flowimg/replenish-nomove.png and b/src/assets/flowimg/replenish-nomove.png differ diff --git a/src/assets/flowimg/replenish-nomove3.png b/src/assets/flowimg/replenish-nomove3.png new file mode 100644 index 0000000..f1d3e46 Binary files /dev/null and b/src/assets/flowimg/replenish-nomove3.png differ diff --git a/src/assets/images/pump.png b/src/assets/images/pump.png new file mode 100644 index 0000000..26bf387 Binary files /dev/null and b/src/assets/images/pump.png differ diff --git a/src/views/centerairC/sysMonitor/monitorCenter.vue b/src/views/centerairC/sysMonitor/monitorCenter.vue index d8c27be..695cd29 100644 --- a/src/views/centerairC/sysMonitor/monitorCenter.vue +++ b/src/views/centerairC/sysMonitor/monitorCenter.vue @@ -145,14 +145,14 @@
-
- {{ hostLoad0 }}% +
+ {{ hostLoad1 }}%
1#冷却水流: - 接通 + 接通 断开
1#冷冻水流: - 接通 + 接通 断开
@@ -196,14 +196,14 @@
-
- {{ hostLoad1 }}% +
+ {{ hostLoad2 }}%
2#冷却水流: - 接通 + 接通 断开
2#冷冻水流: - 接通 + 接通 断开
@@ -248,15 +248,15 @@
-
- {{ hostLoad2 }}% +
+ {{ hostLoad3 }}%
3#冷却水流: - 接通 + 接通 断开
3#冷冻水流: - 接通 + 接通 断开
@@ -308,70 +308,70 @@ - +
- {{ coolingPumpHz0 }}Hz -
-
{{ coolingPumpHz1 }}Hz
{{ coolingPumpHz2 }}Hz
{{ coolingPumpHz3 }}Hz
{{ coolingPumpHz4 }}Hz
+
+ {{ coolingPumpHz5 }}Hz +
1#
2#
@@ -380,70 +380,70 @@
5#
- +
- {{ freezingPumpHz0 }}Hz -
-
{{ freezingPumpHz1 }}Hz
{{ freezingPumpHz2 }}Hz
{{ freezingPumpHz3 }}Hz
{{ freezingPumpHz4 }}Hz
+
+ {{ freezingPumpHz5 }}Hz +
3#
2#
@@ -451,95 +451,95 @@
{{ coolingTowerHz3 }}Hz
{{ coolingTowerHz2 }}Hz
{{ coolingTowerHz1 }}Hz
@@ -781,21 +781,21 @@ export default { oneKeyButtonId: "", // 主机负载 - hostLoad0: "", hostLoad1: "", hostLoad2: "", + hostLoad3: "", // 冷却泵频率反馈 - coolingPumpHz0: "", coolingPumpHz1: "", coolingPumpHz2: "", coolingPumpHz3: "", coolingPumpHz4: "", + coolingPumpHz5: "", // 冷冻泵频率反馈 - freezingPumpHz0: "", freezingPumpHz1: "", freezingPumpHz2: "", freezingPumpHz3: "", freezingPumpHz4: "", + freezingPumpHz5: "", // 冷却塔风机频率 coolingTowerHz3: "", coolingTowerHz2: "", @@ -1230,12 +1230,30 @@ export default { }, // 主机负载 hostLoadData(index) { - // 检查 hostList 长度是否足够 - if (this.hostList.length <= index) { + // 从 this.hostList 中查找 deviceName 包含与 index 相同数字的对象 + let targetDevice = null; + for (let i = 0; i < this.hostList.length; i++) { + const device = this.hostList[i]; + const indexStr = index.toString(); + const deviceName = device.deviceName.toString(); + for (let j = 0; j < indexStr.length; j++) { + if (deviceName.includes(indexStr[j])) { + targetDevice = device; + break; + } + } + if (targetDevice) { + break; + } + } + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // 检查 properties 数组是否存在 hostList[index]数组的properties数组 - const properties = this.hostList[index].properties; + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; + + // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { return false; } @@ -1255,15 +1273,34 @@ export default { }, // 主机启停状态 hostListControlClass(index) { - // 检查 hostList 长度是否足够 - if (this.hostList.length <= index) { + // 从 this.hostList 中查找 deviceName 包含与 index 相同数字的对象 + let targetDevice = null; + for (let i = 0; i < this.hostList.length; i++) { + const device = this.hostList[i]; + const indexStr = index.toString(); + const deviceName = device.deviceName.toString(); + for (let j = 0; j < indexStr.length; j++) { + if (deviceName.includes(indexStr[j])) { + targetDevice = device; + break; + } + } + if (targetDevice) { + break; + } + } + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // 检查 properties 数组是否存在 hostList[index]数组的properties数组 - const properties = this.hostList[index].properties; + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; + + // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { return false; } + // 遍历 properties 数组,如果当前对象paramType === 2并且item.collectValue !== "0.00"则便是启停控制中的开启 for (let i = 0; i < properties.length; i++) { const item = properties[i]; @@ -1276,12 +1313,30 @@ export default { }, // 主机运行状态 hostListRunClass(index) { - // 检查 hostList 长度是否足够 - if (this.hostList.length <= index) { + // 从 this.hostList 中查找 deviceName 包含与 index 相同数字的对象 + let targetDevice = null; + for (let i = 0; i < this.hostList.length; i++) { + const device = this.hostList[i]; + const indexStr = index.toString(); + const deviceName = device.deviceName.toString(); + for (let j = 0; j < indexStr.length; j++) { + if (deviceName.includes(indexStr[j])) { + targetDevice = device; + break; + } + } + if (targetDevice) { + break; + } + } + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // 检查 properties 数组是否存在 hostList[index]数组的properties数组 - const properties = this.hostList[index].properties; + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; + + // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { return false; } @@ -1297,12 +1352,30 @@ export default { }, // 主机冷却水流信号 hostCoolingWaterFlowClass(index) { - // 检查 hostList 长度是否足够 - if (this.hostList.length <= index) { + // 从 this.hostList 中查找 deviceName 包含与 index 相同数字的对象 + let targetDevice = null; + for (let i = 0; i < this.hostList.length; i++) { + const device = this.hostList[i]; + const indexStr = index.toString(); + const deviceName = device.deviceName.toString(); + for (let j = 0; j < indexStr.length; j++) { + if (deviceName.includes(indexStr[j])) { + targetDevice = device; + break; + } + } + if (targetDevice) { + break; + } + } + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // 检查 properties 数组是否存在 hostList[index]数组的properties数组 - const properties = this.hostList[index].properties; + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; + + // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { return false; } @@ -1318,12 +1391,30 @@ export default { }, // 主机冷冻水流信号 hostFreezeWaterFlowClass(index) { - // 检查 hostList 长度是否足够 - if (this.hostList.length <= index) { + // 从 this.hostList 中查找 deviceName 包含与 index 相同数字的对象 + let targetDevice = null; + for (let i = 0; i < this.hostList.length; i++) { + const device = this.hostList[i]; + const indexStr = index.toString(); + const deviceName = device.deviceName.toString(); + for (let j = 0; j < indexStr.length; j++) { + if (deviceName.includes(indexStr[j])) { + targetDevice = device; + break; + } + } + if (targetDevice) { + break; + } + } + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // 检查 properties 数组是否存在 hostList[index]数组的properties数组 - const properties = this.hostList[index].properties; + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; + + // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { return false; } @@ -1339,15 +1430,34 @@ export default { }, // 冷却泵运行状态 coolingPumpRunClass(index) { - // 检查 coolingPump 长度是否足够 - if (this.coolingPump.length <= index) { + // 从 this.coolingPump 中查找 deviceName 包含与 index 相同数字的对象 + let targetDevice = null; + for (let i = 0; i < this.coolingPump.length; i++) { + const device = this.coolingPump[i]; + const indexStr = index.toString(); + const deviceName = device.deviceName.toString(); + for (let j = 0; j < indexStr.length; j++) { + if (deviceName.includes(indexStr[j])) { + targetDevice = device; + break; + } + } + if (targetDevice) { + break; + } + } + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // 检查 properties 数组是否存在 coolingPump[index]数组的properties数组 - const properties = this.coolingPump[index].properties; + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; + + // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { return false; } + // 遍历 properties 数组,如果当前对象paramType === 1并且item.collectValue !== "0.00"则便是运行状态中的运行 for (let i = 0; i < properties.length; i++) { const item = properties[i]; @@ -1360,12 +1470,30 @@ export default { }, // 冷却泵频率 coolingPumpHz(index) { - // 检查 coolingPump 长度是否足够 - if (this.coolingPump.length <= index) { + // 从 this.coolingPump 中查找 deviceName 包含与 index 相同数字的对象 + let targetDevice = null; + for (let i = 0; i < this.coolingPump.length; i++) { + const device = this.coolingPump[i]; + const indexStr = index.toString(); + const deviceName = device.deviceName.toString(); + for (let j = 0; j < indexStr.length; j++) { + if (deviceName.includes(indexStr[j])) { + targetDevice = device; + break; + } + } + if (targetDevice) { + break; + } + } + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // 检查 properties 数组是否存在 coolingPump[index]数组的properties数组 - const properties = this.coolingPump[index].properties; + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; + + // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { return false; } @@ -1386,13 +1514,30 @@ export default { }, // 冷冻泵运行状态 freezingPumpRunClass(index) { - // 检查 freezingPump 长度是否足够 - if (this.freezingPump.length <= index) { + // 从 this.freezingPump 中查找 deviceName 包含与 index 相同数字的对象 + let targetDevice = null; + for (let i = 0; i < this.freezingPump.length; i++) { + const device = this.freezingPump[i]; + const indexStr = index.toString(); + const deviceName = device.deviceName.toString(); + for (let j = 0; j < indexStr.length; j++) { + if (deviceName.includes(indexStr[j])) { + targetDevice = device; + break; + } + } + if (targetDevice) { + break; + } + } + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // console.log("打印this.freezingPump数组", this.freezingPump); - // 检查 properties 数组是否存在 freezingPump[index]数组的properties数组 - const properties = this.freezingPump[index].properties; + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; + + // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { return false; } @@ -1408,12 +1553,30 @@ export default { }, //冷冻泵频率 freezingPumpHz(index) { - // 检查 freezingPump 长度是否足够 - if (this.freezingPump.length <= index) { + // 从 this.freezingPump 中查找 deviceName 包含与 index 相同数字的对象 + let targetDevice = null; + for (let i = 0; i < this.freezingPump.length; i++) { + const device = this.freezingPump[i]; + const indexStr = index.toString(); + const deviceName = device.deviceName.toString(); + for (let j = 0; j < indexStr.length; j++) { + if (deviceName.includes(indexStr[j])) { + targetDevice = device; + break; + } + } + if (targetDevice) { + break; + } + } + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // 检查 properties 数组是否存在 freezingPump[index]数组的properties数组 - const properties = this.freezingPump[index].properties; + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; + + // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { return false; } @@ -1432,15 +1595,28 @@ export default { // 否则代表运行状态中的不运行 return false; }, - // 冷却塔风机运行状态,index为多少号风机,0表示1号风机;item表示风机x + // 冷却塔风机运行状态,index为多少号风机,1表示1号风机;item表示风机x coolingTowerRunClass(index, item) { - // 检查 coolingTower 长度是否足够 - if (this.coolingTower.length <= index) { + // 从 this.coolingTower 中查找 deviceName 第一个数字与 index 相同的对象 + let targetDevice = null; + for (let i = 0; i < this.coolingTower.length; i++) { + const device = this.coolingTower[i]; + const deviceName = device.deviceName.toString(); + // 使用正则表达式匹配 deviceName 开头的数字,提取 deviceName 的第一个词(以非数字字符分割) + const firstWordMatch = deviceName.match(/^\d+/); + if (firstWordMatch && firstWordMatch[0] === index.toString()) { + targetDevice = device; + break; + } + } + + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // 获取指定索引的 coolingTower 元素的 properties 数组 - const properties = this.coolingTower[index].properties; + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { @@ -1464,7 +1640,7 @@ export default { // console.log("paramType为1的对象", filteredProperties); // console.log("index, item", index, item); // 根据 index 和 item 生成目标属性名称 - const towerNumber = index + 1; + const towerNumber = index; const targetPropertyName = `${towerNumber}号冷却塔风机${item}运行`; // console.log("targetPropertyName",targetPropertyName) // 在新数组中查找与目标名称匹配的对象,并检查其 collectValue 是否不为 "0.00" @@ -1489,15 +1665,28 @@ export default { // 否则代表运行状态中的不运行 return false; }, - // 冷却塔风机频率,index为多少号风机,0表示1号风机;item表示风机x + // 冷却塔风机频率,index为多少号风机,1表示1号风机;item表示风机x coolingTowerHz(index, item) { - // 检查 coolingTower 长度是否足够 - if (this.coolingTower.length <= index) { + // 从 this.coolingTower 中查找 deviceName 第一个数字与 index 相同的对象 + let targetDevice = null; + for (let i = 0; i < this.coolingTower.length; i++) { + const device = this.coolingTower[i]; + const deviceName = device.deviceName.toString(); + // 使用正则表达式匹配 deviceName 开头的数字,提取 deviceName 的第一个词(以非数字字符分割) + const firstWordMatch = deviceName.match(/^\d+/); + if (firstWordMatch && firstWordMatch[0] === index.toString()) { + targetDevice = device; + break; + } + } + + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // 获取指定索引的 coolingTower 元素的 properties 数组 - const properties = this.coolingTower[index].properties; + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { @@ -1521,7 +1710,7 @@ export default { // console.log("paramType为4的对象", filteredProperties); // console.log("index, item", index, item); // 根据 index 和 item 生成目标属性名称 - const towerNumber = index + 1; + const towerNumber = index; const targetPropertyName = `${towerNumber}号冷却塔风机${item}频率反馈`; // console.log("targetPropertyName",targetPropertyName) // 在新数组中查找与目标名称匹配的对象,并检查其 collectValue 是否不为 "0.00" @@ -1555,13 +1744,30 @@ export default { }, // 冷却塔出水蝶阀启停状态 towerValveControlClass(index) { - // 检查 coolingTowerOutlet 长度是否足够 - if (this.coolingTowerOutlet.length <= index) { + // 从 this.coolingTowerOutlet 中查找 deviceName 包含与 index 相同数字的对象 + let targetDevice = null; + for (let i = 0; i < this.coolingTowerOutlet.length; i++) { + const device = this.coolingTowerOutlet[i]; + const indexStr = index.toString(); + const deviceName = device.deviceName.toString(); + for (let j = 0; j < indexStr.length; j++) { + if (deviceName.includes(indexStr[j])) { + targetDevice = device; + break; + } + } + if (targetDevice) { + break; + } + } + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // console.log("打印this.coolingTowerOutlet数组", this.coolingTowerOutlet); - // 检查 properties 数组是否存在 coolingTowerOutlet[index]数组的properties数组 - const properties = this.coolingTowerOutlet[index].properties; + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; + + // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { return false; } @@ -1596,13 +1802,30 @@ export default { }, // 冷却塔进水蝶阀启停状态 towerValveInControlClass(index) { - // 检查 this.coolingTowerInlet 长度是否足够 - if (this.coolingTowerInlet.length <= index) { + // 从 this.coolingTowerInlet 中查找 deviceName 包含与 index 相同数字的对象 + let targetDevice = null; + for (let i = 0; i < this.coolingTowerInlet.length; i++) { + const device = this.coolingTowerInlet[i]; + const indexStr = index.toString(); + const deviceName = device.deviceName.toString(); + for (let j = 0; j < indexStr.length; j++) { + if (deviceName.includes(indexStr[j])) { + targetDevice = device; + break; + } + } + if (targetDevice) { + break; + } + } + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // console.log("打印this.coolingTowerOutlet数组", this.coolingTowerInlet); - // 检查 properties 数组是否存在 coolingTowerInlet[index]数组的properties数组 - const properties = this.coolingTowerInlet[index].properties; + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; + + // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { return false; } @@ -1637,13 +1860,30 @@ export default { }, // 冷冻蝶阀启停状态 frozenValveControlClass(index) { - // 检查 frozenValve 长度是否足够 - if (this.frozenValve.length <= index) { + // 从 this.frozenValve 中查找 deviceName 包含与 index 相同数字的对象 + let targetDevice = null; + for (let i = 0; i < this.frozenValve.length; i++) { + const device = this.frozenValve[i]; + const indexStr = index.toString(); + const deviceName = device.deviceName.toString(); + for (let j = 0; j < indexStr.length; j++) { + if (deviceName.includes(indexStr[j])) { + targetDevice = device; + break; + } + } + if (targetDevice) { + break; + } + } + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // console.log("打印this.frozenValve数组", this.frozenValve); - // 检查 properties 数组是否存在 frozenValve[index]数组的properties数组 - const properties = this.frozenValve[index].properties; + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; + + // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { return false; } @@ -1677,13 +1917,32 @@ export default { }, // 冷却蝶阀启停状态 coolingValueControlClass(index) { - // 检查 coolingValue 长度是否足够 - if (this.coolingValue.length <= index) { + // 从 this.coolingValue 中查找 deviceName 包含与 index 相同数字的对象 + let targetDevice = null; + for (let i = 0; i < this.coolingValue.length; i++) { + const device = this.coolingValue[i]; + const indexStr = index.toString(); + const deviceName = device.deviceName.toString(); + for (let j = 0; j < indexStr.length; j++) { + if (deviceName.includes(indexStr[j])) { + targetDevice = device; + break; + } + } + if (targetDevice) { + break; + } + } + + // 如果未找到匹配的设备,返回 false + if (!targetDevice) { return false; } - // console.log("打印this.coolingValue数组", this.coolingValue); - // 检查 properties 数组是否存在 coolingValue[index]数组的properties数组 - const properties = this.coolingValue[index].properties; + + // 获取匹配设备的 properties 数组 + const properties = targetDevice.properties; + + // 检查 properties 数组是否存在 if (!properties || properties.length === 0) { return false; } diff --git a/src/views/components/waterTank.vue b/src/views/components/waterTank.vue index a5832ac..fd2ccfa 100644 --- a/src/views/components/waterTank.vue +++ b/src/views/components/waterTank.vue @@ -64,7 +64,7 @@ export default { height: 120px !important; } .water { - width: 110px !important; + width: 105px !important; } } @@ -78,7 +78,7 @@ export default { height: 100px !important; } .water { - width: 90px !important; + width: 85px !important; } } @@ -92,7 +92,7 @@ export default { height: 110px !important; } .water { - width: 100px !important; + width: 96px !important; } } @@ -106,7 +106,7 @@ export default { height: 90px !important; } .water { - width: 80px !important; + width: 76px !important; } } diff --git a/src/views/hotWater/waterControl/index.vue b/src/views/hotWater/waterControl/index.vue index 3b68dcc..0ced23a 100644 --- a/src/views/hotWater/waterControl/index.vue +++ b/src/views/hotWater/waterControl/index.vue @@ -276,8 +276,8 @@
@@ -303,46 +303,44 @@ >
-
-
-
-
-
回水温度设定差值:
- -
-
-
-
回水温度设定延时时间:
- -
S
+
+
回水温度设定差值:
+ +
+
+
+
回水温度设定延时时间:
+ +
min
+
@@ -1236,6 +1234,10 @@ export default { width: 1.2rem; height: 0.8rem; } + .monitor-img3 { + width: 1.2rem; + height: 0.8rem; + } } .control-bottom { width: 100%; @@ -1359,24 +1361,11 @@ export default { } } } -@media (min-width: 1400px) and (max-width: 1620px) { - .monitor-li { - width: calc(49% - 40px) !important; - margin: 0 20px !important; - .monitor-img1 { - width: 120px !important; - height: 120px !important; - } - .monitor-img2 { - width: 120px !important; - height: 80px !important; - } - .monitor-flex-left { - padding: 0 0.3rem !important; - } +@media (min-width: 1350px) and (max-width: 1460px) { + .monitor-img3 { } } -@media (min-width: 1240px) and (max-width: 1400px) { +@media (min-width: 1350px) and (max-width: 1850px) { .monitor-li { width: calc(49% - 10px) !important; margin: 0 5px !important; @@ -1389,8 +1378,12 @@ export default { width: 100px !important; height: 60px !important; } + .monitor-img3 { + width: 1.2rem !important; + height: 0.9rem !important; + } } -@media (max-width: 1240px) { +@media (max-width: 1350px) { .monitor-li { width: 100% !important; margin: 0 !important; @@ -1403,6 +1396,10 @@ export default { width: 100px !important; height: 80px !important; } + .monitor-img3 { + width: 100px !important; + height: 80px !important; + } .monitor-flex-left { padding: 0 30px !important; } diff --git a/src/views/hotWater/waterMonitor/index.vue b/src/views/hotWater/waterMonitor/index.vue index 6823663..045da6e 100644 --- a/src/views/hotWater/waterMonitor/index.vue +++ b/src/views/hotWater/waterMonitor/index.vue @@ -801,8 +801,8 @@ export default { .replenish { position: absolute; top: 0.7rem; - left: 0.9rem; - width: 1.7rem; + left: 0rem; + width:2.55rem; height: 0.34rem; z-index: 1; }