diff --git a/src/components/Progress.vue b/src/components/Progress.vue index 9e7380c..b97fb72 100644 --- a/src/components/Progress.vue +++ b/src/components/Progress.vue @@ -133,22 +133,6 @@ v-if="operatorStore.disinfectStatus != 0 || binLocal" > - -
警报信息
@@ -248,14 +232,6 @@ const binLocal = computed(() => { return echartsStore?.binCharts || localStorage.getItem('bin') }) -const envir1Local = computed(() => { - return echartsStore?.envir1Charts || localStorage.getItem('envir1') -}) - -const envir2Local = computed(() => { - return echartsStore?.envir2Charts || localStorage.getItem('envir2') -}) - const binOption = ref({ tooltip: { trigger: 'axis', @@ -304,102 +280,6 @@ const binOption = ref({ }, ], }) -const envir1Option = ref({ - tooltip: { - trigger: 'axis', - }, - legend: { - data: ['温度', '湿度', 'H2O2浓度', 'H2O2饱和度'], - }, - grid: { - left: '3%', - right: '4%', - bottom: '3%', - containLabel: true, - }, - xAxis: { - type: 'category', - boundaryGap: false, - data: echartsStore.abscissaFormater, - }, - yAxis: { - type: 'value', - }, - series: [ - { - name: '温度', - type: 'line', - stack: '1', - data: [], - }, - { - name: '湿度', - type: 'line', - stack: '2', - data: [], - }, - { - name: 'H2O2浓度', - type: 'line', - stack: '3', - data: [], - }, - { - name: 'H2O2饱和度', - type: 'line', - stack: '4', - data: [], - }, - ], -}) -const envir2Option = ref({ - tooltip: { - trigger: 'axis', - }, - legend: { - data: ['温度', '湿度', 'H2O2浓度', 'H2O2饱和度'], - }, - grid: { - left: '3%', - right: '4%', - bottom: '3%', - containLabel: true, - }, - xAxis: { - type: 'category', - boundaryGap: false, - data: echartsStore.abscissaFormater, - }, - yAxis: { - type: 'value', - }, - series: [ - { - name: '温度', - type: 'line', - stack: '1', - data: [], - }, - { - name: '湿度', - type: 'line', - stack: '2', - data: [], - }, - { - name: 'H2O2浓度', - type: 'line', - stack: '3', - data: [], - }, - { - name: 'H2O2饱和度', - type: 'line', - stack: '4', - data: [], - }, - ], -}) const operatorStore = useOperatorStore() const webSocketStore = useWebSocketStore() @@ -415,8 +295,6 @@ const showDetail = () => { const timer = ref(null) const binCharts = ref(null) -const envir1Charts = ref(null) -const envir2Charts = ref(null) const time1 = ref(null) const time2 = ref(null) @@ -429,16 +307,6 @@ onMounted(() => { binCharts.value = echarts.init(document.getElementById('bin')) binCharts.value.setOption(binOption.value) } - let b = echarts.getInstanceByDom(document.getElementById('envir1')) - if (b == undefined) { - envir1Charts.value = echarts.init(document.getElementById('envir1')) - envir1Charts.value.setOption(envir1Option.value) - } - let c = echarts.getInstanceByDom(document.getElementById('envir2')) - if (c == undefined) { - envir2Charts.value = echarts.init(document.getElementById('envir2')) - envir2Charts.value.setOption(envir2Option.value) - } time1.value = setInterval(() => { binCharts.value?.setOption({ @@ -489,102 +357,6 @@ onMounted(() => { }, ], }) - envir1Charts.value?.setOption({ - tooltip: { - trigger: 'axis', - }, - legend: { - data: ['温度', '湿度', 'H2O2浓度', 'H2O2饱和度'], - }, - grid: { - left: '3%', - right: '4%', - bottom: '3%', - containLabel: true, - }, - xAxis: { - type: 'category', - boundaryGap: false, - data: echartsStore.abscissaFormater, - }, - yAxis: { - type: 'value', - }, - series: [ - { - name: '温度', - type: 'line', - stack: '1', - data: [], - }, - { - name: '湿度', - type: 'line', - stack: '2', - data: [], - }, - { - name: 'H2O2浓度', - type: 'line', - stack: '3', - data: [], - }, - { - name: 'H2O2饱和度', - type: 'line', - stack: '4', - data: [], - }, - ], - }) - envir2Charts.value?.setOption({ - tooltip: { - trigger: 'axis', - }, - legend: { - data: ['温度', '湿度', 'H2O2浓度', 'H2O2饱和度'], - }, - grid: { - left: '3%', - right: '4%', - bottom: '3%', - containLabel: true, - }, - xAxis: { - type: 'category', - boundaryGap: false, - data: echartsStore.abscissaFormater, - }, - yAxis: { - type: 'value', - }, - series: [ - { - name: '温度', - type: 'line', - stack: '1', - data: [], - }, - { - name: '湿度', - type: 'line', - stack: '2', - data: [], - }, - { - name: 'H2O2浓度', - type: 'line', - stack: '3', - data: [], - }, - { - name: 'H2O2饱和度', - type: 'line', - stack: '4', - data: [], - }, - ], - }) }, 1000 * 20) time1.value = setInterval(() => { @@ -636,102 +408,6 @@ onMounted(() => { }, ], }) - envir1Charts.value?.setOption({ - tooltip: { - trigger: 'axis', - }, - legend: { - data: ['温度', '湿度', 'H2O2浓度', 'H2O2饱和度'], - }, - grid: { - left: '3%', - right: '4%', - bottom: '3%', - containLabel: true, - }, - xAxis: { - type: 'category', - boundaryGap: false, - data: echartsStore.abscissaFormater, - }, - yAxis: { - type: 'value', - }, - series: [ - { - name: '温度', - type: 'line', - stack: '1', - data: [], - }, - { - name: '湿度', - type: 'line', - stack: '2', - data: [], - }, - { - name: 'H2O2浓度', - type: 'line', - stack: '3', - data: [], - }, - { - name: 'H2O2饱和度', - type: 'line', - stack: '4', - data: [], - }, - ], - }) - envir2Charts.value?.setOption({ - tooltip: { - trigger: 'axis', - }, - legend: { - data: ['温度', '湿度', 'H2O2浓度', 'H2O2饱和度'], - }, - grid: { - left: '3%', - right: '4%', - bottom: '3%', - containLabel: true, - }, - xAxis: { - type: 'category', - boundaryGap: false, - data: echartsStore.abscissaFormater, - }, - yAxis: { - type: 'value', - }, - series: [ - { - name: '温度', - type: 'line', - stack: '1', - data: [], - }, - { - name: '湿度', - type: 'line', - stack: '2', - data: [], - }, - { - name: 'H2O2浓度', - type: 'line', - stack: '3', - data: [], - }, - { - name: 'H2O2饱和度', - type: 'line', - stack: '4', - data: [], - }, - ], - }) }, 1000) }) diff --git a/src/mock/command.js b/src/mock/command.js index 97b53e3..a15006f 100644 --- a/src/mock/command.js +++ b/src/mock/command.js @@ -369,6 +369,7 @@ export const airInletProportionalValve_getStateJSON = { messageId: 'AirInletProportionalValve_getState', } +// 获取出口阀门的信息 export const AirOutletProportionalValve_getStateJSON = { command: 'DeviceIOControlService.AirOutletProportionalValve_getState', messageId: 'airOutletProportionalValve_getState', diff --git a/src/pages/Home.vue b/src/pages/Home.vue index 845f3c8..a00ff76 100644 --- a/src/pages/Home.vue +++ b/src/pages/Home.vue @@ -82,6 +82,7 @@ :class=" activeTab == 8 ? 'tab_btn style-btn active_btn' : 'style-btn tab_btn' " + v-if="[0, 5].includes(operatorStore.disinfectStatus)" @click="changeTab(8)" > { return { binCharts: {}, - envir1Charts: {}, - envir2Charts: {}, } }, // actions @@ -14,12 +12,6 @@ export const useEchartsStore = defineStore({ updateBinCharts(binCharts) { this.binCharts = binCharts }, - updateEnvir1Charts(envir1Charts) { - this.envir1Charts = envir1Charts - }, - updateEnvir2Charts(envir2Charts) { - this.envir2Charts = envir2Charts - }, }, getters: { abscissaFormater(state) { @@ -57,47 +49,5 @@ export const useEchartsStore = defineStore({ }) return arr }, - envir1Temp(state) { - let arr = [] - Object.values(state.envir1Charts).map(item => { - arr.push(item[0]) - }) - return arr - }, - envir1Humidity(state) { - let arr = [] - Object.values(state.envir1Charts).map(item => { - arr.push(item[1]) - }) - return arr - }, - envir1HP(state) { - let arr = [] - Object.values(state.envir1Charts).map(item => { - arr.push(item[2]) - }) - return arr - }, - envir2Temp(state) { - let arr = [] - Object.values(state.envir2Charts).map(item => { - arr.push(item[0]) - }) - return arr - }, - envir2Humidity(state) { - let arr = [] - Object.values(state.envir2Charts).map(item => { - arr.push(item[1]) - }) - return arr - }, - envir2HP(state) { - let arr = [] - Object.values(state.envir2Charts).map(item => { - arr.push(item[2]) - }) - return arr - }, }, }) diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js index 70bc5de..758507c 100644 --- a/src/store/modules/websocket.js +++ b/src/store/modules/websocket.js @@ -159,12 +159,6 @@ export const useWebSocketStore = defineStore({ echartsStore.updateBinCharts( JSON.parse(localStorage.getItem('bin')), ) - echartsStore.updateEnvir1Charts( - JSON.parse(localStorage.getItem('envir1')), - ) - echartsStore.updateEnvir2Charts( - JSON.parse(localStorage.getItem('envir2')), - ) } break case 'getAllUser': @@ -366,12 +360,6 @@ export const useWebSocketStore = defineStore({ echartsStore.updateBinCharts( JSON.parse(localStorage.getItem('bin')), ) - echartsStore.updateEnvir1Charts( - JSON.parse(localStorage.getItem('envir1')), - ) - echartsStore.updateEnvir2Charts( - JSON.parse(localStorage.getItem('envir2')), - ) } break default: diff --git a/src/utils/index.js b/src/utils/index.js index 3e37571..b7a65bf 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -5,18 +5,18 @@ export const saveEchartsDataToLocal = (time, binObj, envir1Obj, envir2Obj) => { } else { resolveData({}, time, binObj, 'bin') } - if (localStorage.getItem('envir1')) { - const envir1Local = JSON.parse(localStorage.getItem('envir1')) - resolveData(envir1Local, time, envir1Obj, 'envir1') - } else { - resolveData({}, time, envir1Obj, 'envir1') - } - if (localStorage.getItem('envir2')) { - const envir2Local = JSON.parse(localStorage.getItem('envir2')) - resolveData(envir2Local, time, envir2Obj, 'envir2') - } else { - resolveData({}, time, envir2Obj, 'envir2') - } + // if (localStorage.getItem('envir1')) { + // const envir1Local = JSON.parse(localStorage.getItem('envir1')) + // resolveData(envir1Local, time, envir1Obj, 'envir1') + // } else { + // resolveData({}, time, envir1Obj, 'envir1') + // } + // if (localStorage.getItem('envir2')) { + // const envir2Local = JSON.parse(localStorage.getItem('envir2')) + // resolveData(envir2Local, time, envir2Obj, 'envir2') + // } else { + // resolveData({}, time, envir2Obj, 'envir2') + // } } function resolveData(obj, time, newData, key) {