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/assets/images/boiler.png b/src/assets/images/boiler.png index 442345e..2d71bb5 100644 Binary files a/src/assets/images/boiler.png and b/src/assets/images/boiler.png differ diff --git a/src/assets/images/gasStop.png b/src/assets/images/gasStop.png new file mode 100644 index 0000000..6466b56 Binary files /dev/null and b/src/assets/images/gasStop.png differ diff --git a/src/assets/images/gasWork.png b/src/assets/images/gasWork.png new file mode 100644 index 0000000..38c8150 Binary files /dev/null and b/src/assets/images/gasWork.png differ diff --git a/src/views/aircAndWindc/awSysMonitor/components/damperMonitor.vue b/src/views/aircAndWindc/awSysMonitor/components/damperMonitor.vue index 81cf9e0..266c620 100644 --- a/src/views/aircAndWindc/awSysMonitor/components/damperMonitor.vue +++ b/src/views/aircAndWindc/awSysMonitor/components/damperMonitor.vue @@ -111,7 +111,7 @@ >
-
1#风阀反馈：
+
宴会一厅风阀反馈：
{{ damperOneBackObj.collectValue }}%
调节：
@@ -133,7 +133,7 @@
-
2#风阀反馈：
+
餐厅风阀反馈：
{{ damperTwoBackObj.collectValue }}%
调节：
@@ -155,7 +155,7 @@
-
3#风阀反馈：
+
会议风阀反馈：
{{ damperThreeBackObj.collectValue }}%
调节：
@@ -914,8 +914,15 @@ export default { item.collectName.includes("模式选择") ) { this.modeChangeObj = item; - if (String(this.modeChangeObj.collectValue) === "0.00") { - this.modeChangeObj.collectValue = 0; + // collectValue转换为整数 + if ( + typeof this.modeChangeObj.collectValue === "string" && + this.modeChangeObj.collectValue.match(/^\d+\.00$/) + ) { + this.modeChangeObj.collectValue = parseInt( + this.modeChangeObj.collectValue, + 10 + ); } if (this.modeChangeObj.collectValue === 0) { this.isShowMode1 = true; @@ -1537,6 +1544,7 @@ export default { .windC { width: 13rem; height: 5.38rem; + margin-right: 1rem; position: relative; .menu-title { color: #e1f4ff; @@ -1631,10 +1639,10 @@ export default { } .wind-tem2 { z-index: 10; - width: 3.3rem; + width: 3.7rem; position: absolute; top: 2.2rem; - right: -0.7rem; + right: -1.1rem; display: flex; flex-direction: row; align-items: center; @@ -1650,10 +1658,10 @@ export default { } .wind-tem3 { z-index: 10; - width: 3.3rem; + width: 3.47rem; position: absolute; top: 4.1rem; - right: -0.7rem; + right: -0.9rem; display: flex; flex-direction: row; align-items: center; @@ -1669,10 +1677,10 @@ export default { } .wind-tem4 { z-index: 10; - width: 3.3rem; + width: 3.47rem; position: absolute; top: 5.9rem; - right: -0.7rem; + right: -0.9rem; display: flex; flex-direction: row; align-items: center; diff --git a/src/views/boilerSys/boilerMonitor/boilerMonitorDetails.vue b/src/views/boilerSys/boilerMonitor/boilerMonitorDetails.vue index 567f0c9..6442444 100644 --- a/src/views/boilerSys/boilerMonitor/boilerMonitorDetails.vue +++ b/src/views/boilerSys/boilerMonitor/boilerMonitorDetails.vue @@ -57,62 +57,62 @@
当前工作状态
- {{ getStatusText(getStatusValue('DB611658')) }} + {{ getStatusText(getStatusValue("DB611658")) }}
火焰强度
- {{ getStatusValue('DB611724') }} + {{ getStatusValue("DB611724") }}
设备运行时长
- {{ formatToOneDecimal(getStatusValue('DB8296')/60) }}小时 + {{ formatToOneDecimal(getStatusValue("DB8296") / 60) }}小时
当前压力
-
{{ getStatusValue('DB611500') }} Mpa
+
{{ getStatusValue("DB611500") }} Mpa
设定压力
-
{{ getStatusValue('DBW611598') }} Mpa
+
{{ getStatusValue("DBW611598") }} Mpa
启动压差
-
{{ getStatusValue('DBW611600') }} Mpa
+
{{ getStatusValue("DBW611600") }} Mpa
停止压差
-
{{ getStatusValue('DBW611602') }} Mpa
+
{{ getStatusValue("DBW611602") }} Mpa
温度瞬值
-
{{ getStatusValue('PLC1500_DB8300') }} ℃
+
{{ getStatusValue("PLC1500_DB8300") }} ℃
压力瞬值
-
{{ getStatusValue('PLC1500_DB8304') }} Mpa
+
{{ getStatusValue("PLC1500_DB8304") }} Mpa
流量瞬值
-
{{ getStatusValue('PLC1500_DB8308') }} t/h
+
{{ getStatusValue("PLC1500_DB8308") }} t/h
流量累计
-
{{ getStatusValue('PLC1500_DB8320') }} t
+
{{ getStatusValue("PLC1500_DB8320") }} t
空气
燃气
-
{{ getStatusValue('DB611496') }}℃
+
{{ getStatusValue("DB611496") }}℃
烟气
@@ -121,28 +121,51 @@ -
{{ getStatusValue('DB611736') }}%
+
{{ getStatusValue("DB611736") }}%
-
+
+ +
主阀
副阀
-
{{ getStatusValue('DB611514') }}rpm
+
{{ getStatusValue("DB611514") }}rpm
风机
@@ -172,8 +199,15 @@
-
-
+
+
-
- {{ item.otherName }}:{{ item.curValue !== null && item.curValue !== undefined ? item.curValue : '--' }}{{ item.unit || '' }} + {{ item.otherName }}:{{ + item.curValue !== null && item.curValue !== undefined + ? item.curValue + : "--" + }}{{ item.unit || "" }}
@@ -213,13 +251,13 @@
-
- {{ item.curValue == 1 ? 'ON' : 'OFF' }} + {{ item.curValue == 1 ? "ON" : "OFF" }}
{{ item.otherName }}
@@ -234,10 +272,13 @@
-
{{ item.otherName }}
@@ -270,7 +311,7 @@ export default { doDatas: [], aoDatas: [], runDatas: [], - alarmDatas: [] + alarmDatas: [], }, }; }, @@ -332,58 +373,64 @@ export default { if (value === null || value === undefined) { return null; } - + const num = parseFloat(value); if (isNaN(num)) { return value; } - + return num.toFixed(1); }, // Get status value from runDatas where mtNum = DB611658 getStatusValue(mtNum) { - if (!this.steamBoilerData.runDatas || !Array.isArray(this.steamBoilerData.runDatas)) { + if ( + !this.steamBoilerData.runDatas || + !Array.isArray(this.steamBoilerData.runDatas) + ) { return null; } - - const statusItem = this.steamBoilerData.runDatas.find(item => - item.mtNum === mtNum && item.curValue !== null && item.curValue !== undefined + + const statusItem = this.steamBoilerData.runDatas.find( + (item) => + item.mtNum === mtNum && + item.curValue !== null && + item.curValue !== undefined ); - + return statusItem ? statusItem.curValue : null; }, - + // Get status text based on status value getStatusText(statusValue) { if (statusValue === null || statusValue === undefined) { - return '未知'; + return "未知"; } - + const statusMap = { - 0: '上电延时', - 1: '关机', - 2: '待机', - 3: '前清扫', - 4: '预点火', - 5: '点火', - 6: '传火', - 7: '工作', - 8: '后清扫', - 9: '故障', - 10: '小火保持', - 11: '自检', - 12: '检漏', - 13: '开点火器', - 14: '启动等待中' + 0: "上电延时", + 1: "关机", + 2: "待机", + 3: "前清扫", + 4: "预点火", + 5: "点火", + 6: "传火", + 7: "工作", + 8: "后清扫", + 9: "故障", + 10: "小火保持", + 11: "自检", + 12: "检漏", + 13: "开点火器", + 14: "启动等待中", }; - - return statusMap[statusValue] || '未知'; + + return statusMap[statusValue] || "未知"; }, - getSteamBoiler() { + getSteamBoiler() { // type 0：代表查询动画界面数据，1：代表查询模拟量监测数据，2：代表查询继电器数据，3：查询端口输入数据，4：代表查询报警数据 // 0：代表查询动画界面数据 let queryData = { - systemType: '3', + systemType: "3", type: 0, }; steamBoilerBoiler(queryData).then((res) => { @@ -647,6 +694,13 @@ export default { top: 3.8rem; left: 2rem; } + .gasValve-img { + position: absolute; + top: 1.73rem; + left: 2.6rem; + width: 0.5rem; + height: 0.4rem; + } .mainValve-img { position: absolute; top: 2.81rem; @@ -666,8 +720,8 @@ export default { flex-direction: column; align-items: center; position: absolute; - top: 0.1rem; - left: 7.4rem; + top: -0.1rem; + left: 7.3rem; .other-li { display: flex; flex-direction: row; @@ -686,7 +740,7 @@ export default { flex-direction: column; align-items: center; position: absolute; - top: 0.1rem; + top: -0.1rem; left: 9.2rem; .other-li { display: flex; @@ -794,7 +848,7 @@ export default { align-items: center; position: absolute; top: 4.15rem; - right: 2.28rem; + right: 2.63rem; .pump-text { margin-top: 0.03rem; padding: 0.02rem 0.05rem;