更新

src/views/vent/monitorManager/alarmMonitor/warn/dustWarn.vue

@@ -110,6 +110,7 @@ let gridV = reactive({
 let cardListTf = reactive<any[]>([])
 let router = useRouter()
 let echartNow = ref<any[]>([])
+let echartYc=reactive<any[]>([])
 
 // https获取监测数据
 let timer: null | NodeJS.Timeout = null;
@@ -152,11 +153,12 @@ function topAreaClick(index) {
     echartDataFc.minData.data.length = 0;
     echartDataFc.aveValue.data.length = 0;
     echartDataFc.xData.length = 0;
+    echartYc.length=0
 
     echartNow.value = JSON.parse(choiceData[index].readData.expectInfo)['list']
-    echartNow.value.push({ time: JSON.parse(choiceData[index].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[index].readData.expectInfo)['nowVal'], value1: JSON.parse(choiceData[index].readData.expectInfo)['aveVal'] })
+    echartYc.push({ time: JSON.parse(choiceData[index].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[index].readData.expectInfo)['nowVal'], value1: JSON.parse(choiceData[index].readData.expectInfo)['aveVal'] })
     // let unique = uniqueObjects(echartNow.value, 'time');
-    let setData = [...echartNow.value].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
+    let setData = [...echartNow.value,echartYc].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
     setData.forEach(el => {
         if (el.value && el.value != '0' && el.value1!='0') {
             echartDataFc.maxData.data.push(el.value);
@@ -216,9 +218,9 @@ function getSysWarnList(id, type) {
 
             if (choiceData[activeIndex.value]) {
                 echartNow.value = JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['list']
-                echartNow.value.push({ time: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowVal'], value1: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['aveVal'] })
+                echartYc.push({ time: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowVal'], value1: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['aveVal'] })
                 // let unique = uniqueObjects(echartNow.value, 'time');
-                let setData = [...echartNow.value].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
+                let setData = [...echartNow.value,echartYc].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
                 setData.forEach(el => {
                     if (el.value && el.value != '0' && el.value1!='0') {
                         echartDataFc.maxData.data.push(el.value);
@@ -237,9 +239,9 @@ function getSysWarnList(id, type) {
             } else {
                 activeIndex.value = 0;
                 echartNow.value = JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['list']
-                echartNow.value.push({ time: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowVal'], value1: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['aveVal'] })
+                echartYc.push({ time: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowVal'], value1: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['aveVal'] })
                 // let unique = uniqueObjects(echartNow.value, 'time');
-                let setData = [...echartNow.value].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
+                let setData = [...echartNow.value,echartYc].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
                 setData.forEach(el => {
                     if (el.value && el.value != '0' && el.value1!='0') {
                         echartDataFc.maxData.data.push(el.value);

src/views/vent/monitorManager/deviceMonitor/components/device/modal/dust.modal.vue

@@ -120,6 +120,7 @@ export default defineComponent({
     const dustMonitor = shallowRef({});
     const dustSwitch = ref(false);
     const echartNow = ref<any[]>([])
+    const echartYc=reactive<any[]>([])
 
     const echatsOption = {
       grid: {
@@ -278,10 +279,10 @@ export default defineComponent({
           // posList.value = item['history'];
 
           echartNow.value = JSON.parse(item.readData.expectInfo)['list']
-          echartNow.value.push({time:JSON.parse(item.readData.expectInfo)['nowTime'],value:JSON.parse(item.readData.expectInfo)['nowVal'],value1:JSON.parse(item.readData.expectInfo)['aveVal']})
+          echartYc.push({time:JSON.parse(item.readData.expectInfo)['nowTime'],value:JSON.parse(item.readData.expectInfo)['nowVal'],value1:JSON.parse(item.readData.expectInfo)['aveVal']})
           // let unique=uniqueObjects( echartNow.value, 'time');
     
-          let setData = [ ... echartNow.value].sort((a,b)=>Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
+          let setData = [ ... echartNow.value,...echartYc].sort((a,b)=>Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
           setData.forEach(el=>{
            if(el.value && el.value!='0'&& el.value1 !='0'){
             el.nowVal=el.value