更新

src/views/vent/monitorManager/alarmMonitor/common/gasCcb.vue

@@ -87,111 +87,61 @@
     },
   });
   let typeData = ref<any[]>(['pump_under']);
-  let pumpUnder = reactive({
-    label:'测试1',
-    data:[
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-    ]
-  });
-  let pumpOver = reactive({
-    label:'测试1',
-    data:[
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-        {name:'1111111111111111111',val:22},
-    ]
-  });
+  let pumpUnder = reactive({});
+  let pumpOver = reactive({});
 
-//   watch(
-//     () => props.gasData,
-//     (newV, oldV) => {
-//       console.log(newV, 'ccc---');
-//       let data = newV.pump;
+  watch(
+    () => props.gasData,
+    (newV, oldV) => {
+      console.log(newV, 'ccc---');
+      let data = newV.pump;
 
-//       if (data && data.length != 0) {
-//         typeData.value = data.map((v) => v.deviceType);
+      if (data && data.length != 0) {
+        typeData.value = data.map((v) => v.deviceType);
 
-//         let list = {
-//           label: '',
-//           data: [],
-//         };
-//         if (typeData.value.includes('pump_under')) {
-//           let labelData = getTableHeaderColumns('pump_under_monitor');
-//           let param = labelData.map((el: any) => {
-//             return {
-//               name: el.title,
-//               val: el.dataIndex,
-//             };
-//           });
-//           let filterData = data.filter((v) => v.deviceType == 'pump_under')[0];
-//           list.label = filterData.strinstallpos;
-//           list.data = param.map((item) => {
-//             return {
-//               name: item.name,
-//               val: filterData.readData[item.val] && filterData.readData[item.val] != '0' ? filterData.readData[item.val] : '-',
-//             };
-//           });
-//           pumpUnder = Object.assign({}, list);
-//         } else if (typeData.value.includes('pump_under_31')) {
-//           let labelData = getTableHeaderColumns('pump_under_31_monitor');
-//           let param = labelData.map((el: any) => {
-//             return {
-//               name: el.title,
-//               val: el.dataIndex,
-//             };
-//           });
-//           let filterData = data.filter((v) => v.deviceType == 'pump_under_31')[0];
-//           list.label = filterData.strinstallpos;
-//           list.data = param.map((item) => {
-//             return {
-//               name: item.name,
-//               val: filterData.readData[item.val] && filterData.readData[item.val] != '0' ? filterData.readData[item.val] : '-',
-//             };
-//           });
-//           pumpOver = Object.assign({}, list);
-//         }
-//       }
-//     },
-//     { immediate: true }
-//   );
+        let list = {
+          label: '',
+          data: [],
+        };
+        if (typeData.value.includes('pump_under')) {
+          let labelData = getTableHeaderColumns('pump_under_monitor');
+          let param = labelData.map((el: any) => {
+            return {
+              name: el.title,
+              val: el.dataIndex,
+            };
+          });
+          let filterData = data.filter((v) => v.deviceType == 'pump_under')[0];
+          list.label = filterData.strinstallpos;
+          list.data = param.map((item) => {
+            return {
+              name: item.name,
+              val: filterData.readData[item.val] && filterData.readData[item.val] != '0' ? filterData.readData[item.val] : '-',
+            };
+          });
+          pumpUnder = Object.assign({}, list);
+        } else if (typeData.value.includes('pump_under_31')) {
+          let labelData = getTableHeaderColumns('pump_under_31_monitor');
+          let param = labelData.map((el: any) => {
+            return {
+              name: el.title,
+              val: el.dataIndex,
+            };
+          });
+          let filterData = data.filter((v) => v.deviceType == 'pump_under_31')[0];
+          list.label = filterData.strinstallpos;
+          list.data = param.map((item) => {
+            return {
+              name: item.name,
+              val: filterData.readData[item.val] && filterData.readData[item.val] != '0' ? filterData.readData[item.val] : '-',
+            };
+          });
+          pumpOver = Object.assign({}, list);
+        }
+      }
+    },
+    { immediate: true }
+  );
 
   onMounted(() => {});
 </script>
@@ -231,6 +181,7 @@
       background: var(--image-top-area) no-repeat center;
       background-size: 100% 100%;
 overflow:hidden;
+
       .box-label {
         position: absolute;
         left: 50%;
@@ -257,6 +208,7 @@ overflow:hidden;
         justify-content: space-between;
         align-items: center;
         flex-wrap: wrap;
+        overflow-y:auto;
 
         .value-b {
           width: calc(50% - 10px);