提交修改

src/views/realTime/weather/components/carbonWater.vue

@@ -71,7 +71,7 @@
                     :class="{
                       'active-list': dataCenter.activeModal.senid == items.senid,
                     }"
-                    v-for="(items, indexs) in item"
+                    v-for="(items, indexs) in item.value"
                     :key="indexs"
                     @click="setListItem(items, indexs)"
                     >{{ items.sensor_name }}</li
@@ -234,25 +234,40 @@ function handleTitle(record, column, item) {
       }
     });
     //排序
-    console.log(dataCenter.activeModal.activeData.sensor)
     // 所有的都没有数据9065000110
     dataCenter.activeModal.senid = dataCenter.activeModal.activeData.sensor[0].senid;
-    // dataCenter.activeModal.senid = '9065000110';
     dataCenter.activeModal.sensor_name = dataCenter.activeModal.activeData.sensor[0].sensor_name;
     dataCenter.activeModal.dchar = dataCenter.activeModal.activeData.sensor[0].dchar;
-    
     dataCenter.cahrtsList.yName = dataCenter.activeModal.activeData.sensor[0].sensor_name+'('+dataCenter.activeModal.activeData.sensor[0].dchar+')';
     if (dataCenter.activeModal.activeData.st_type == 6) {
       let obj = {};
       dataCenter.activeModal.activeData.sensor?.forEach((i) => {
         if (obj.hasOwnProperty(i.ts_layer)) {
-          obj[i.ts_layer].push(i);
+          obj[i.ts_layer].value.push(i);
         } else {
-          obj[i.ts_layer] = [];
-          obj[i.ts_layer].push(i);
+          obj[i.ts_layer] = {};
+          obj[i.ts_layer].id = null;
+          obj[i.ts_layer].value = [];
+          obj[i.ts_layer].value.push(i);
+
+          if (i.ts_layer.includes('m')) {
+            obj[i.ts_layer].id = Number(i.ts_layer.split('m')[0])
+          } else {
+            obj[i.ts_layer].id = 0
+          }
         }
       });
-      dataCenter.activeModal.leftList = obj;
+      let sortedObjKeys = Object.keys(obj).sort((a, b) => {
+        return obj[b].id - obj[a].id
+      })
+      let arr = {}
+      sortedObjKeys.forEach(j => {
+        arr[j] = obj[j]
+      })
+      console.log(arr)
+      
+      setListItem(arr[Object.keys(arr)[0]].value[0])
+      dataCenter.activeModal.leftList = arr;
     }
     getMonitorInfoData();
     dataCenter.showModal = true;

src/views/realTime/weather/components/sameAs.vue

@@ -131,8 +131,17 @@ function onChange(value, dateString) {
 function setListItem(item, index) {
   dataCenter.activeSenName = index;
   dataCenter.cahrtsList.yName = item;
-  dataCenter.activeSenid = dataCenter.activeItem[index].senid;
-  getMonitorInfoData();
+  console.log(dataCenter.activeItem[index])
+  if(dataCenter.activeItem[index]){
+    dataCenter.activeSenid = dataCenter.activeItem[index].senid;
+    getMonitorInfoData();
+  }else{
+    dataCenter.cahrtsData = []
+    if (chart) {
+      chart.clear();
+    }
+  }
+ 
 }
 // 处理表头
 function processingData(table_head) {