diff --git a/public/favicon.ico b/public/favicon.ico index 48117e3..df36fcf 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/image/real-time-44.png b/src/assets/image/real-time-44.png new file mode 100644 index 0000000..0abdcfa Binary files /dev/null and b/src/assets/image/real-time-44.png differ diff --git a/src/store/index.js b/src/store/index.js index 118986f..7903167 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -61,7 +61,7 @@ export default new Vuex.Store({ { label: '土壤氮含量', value: 41, countType: 0,unit:'mg/kg' }, { label: '土壤磷含量', value: 42, countType: 0,unit:'mg/kg' }, { label: '土壤钾含量', value: 43, countType: 0,unit:'mg/kg' }, - { label: '臭氧', value: 44, countType: 0,unit:'ppm' }, + { label: '管道压力', value: 44, countType: 0,unit:'Kpa' }, { label: '一氧化碳', value: 45, countType: 0,unit:'ppm' }, { label: '氨气', value: 46, countType: 0,unit:'ppm' }, { label: '硫化氢', value: 47, countType: 0,unit:'ppm' }, diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index af89284..e78338b 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -75,12 +75,13 @@ export default { setTimeout(() => { that.dataInit(); that.timer&&clearInterval(that.timer) - setInterval(() => { + that.timer= setInterval(() => { that.dataInit(); }, 60000); }, 0); }, beforeDestroy() { + const that = this; // 销毁播放器 if (this.player) { this.player.dispose(); diff --git a/src/views/page/status.vue b/src/views/page/status.vue index bfe47bd..512c5e8 100644 --- a/src/views/page/status.vue +++ b/src/views/page/status.vue @@ -35,8 +35,8 @@
-
进水泵
-
配肥泵
+
进水泵
+
配肥泵
@@ -247,8 +247,8 @@ export default { ADdata: 0, },], right2Index: [], - rightList2: ['外控信号2#', - '外控信号1#', + rightList2: ['外控信号1#', + '外控信号2#', '外控信号3#', '外控信号4#', '高液位信号', @@ -279,7 +279,8 @@ export default { } }, //清除监听 - beforeDestroy(){ + beforeDestroy(){ + const that = this; that.pageTimer&&clearInterval(that.pageTimer) }, mounted() { @@ -478,6 +479,7 @@ export default { var number = this.padString(this.inputData['29'].toString(2), 14) var index = 6 var typeNumber = -1 + for (var i = 0; i < index; i++) { if (Number(number[i])) { typeNumber = i @@ -488,21 +490,31 @@ export default { var statusIndex = 8 for (var j = 0; j < statusIndex; j++) { if (Number(number[number.length-1 - j])) { - this.right2Index.push(j) + if(j=0){ + this.right2Index.push(1) + }else if(j=1){ + this.right2Index.push(0) + }else{ + this.right2Index.push(j) + } } } }, //进水泵和出水泵状态 getData30() { - var number = this.padString(this.inputData['30'].toString(2), 2) - if (Number(number[0])) { - this.left1Act = 1 - } - else if (Number(number[1])) { - this.left1Act = 0 - } else { - this.left1Act = -1 - } + // var number = this.padString(this.inputData['30'].toString(2), 2) + // if (Number(number[0])) { + // this.left1Act = 1 + // } + // if (Number(number[1])) { + // this.left1Act = 0 + // } + // if (Number(number[0])&&Number(number[1])) { + // this.left1Act = 3 + // } + // else { + // this.left1Act = -1 + // } }, dataInit() { var deviceDetail = this.deviceDetail