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 @@