[Fix 0000] 代码冲突修复

src/views/vent/monitorManager/fanLocalMonitor/components/dischargeGas.vue

@@ -103,53 +103,10 @@
       option && myChart.value.setOption(option);
       refresh.value = false;
       nextTick(() => {
-        if (option['xAxis']) option['xAxis']['data'] = xData;
-        option['series'] = yDataList;
-        initEcharts();
+        setTimeout(() => {
+          refresh.value = true;
+        }, 0);
       });
-    });
-
-    const ChartRef = ref();
-    const myChart = ref();
-    const refresh = ref(true);
-    const xData: any[] = [];
-    const yDataList: [] = [];
-    const echartsData = ref<Record<string, any>[]>([]);
-    const monitorData = ref<Record<string, any>>({});
-    watch(
-      () => props.data,
-      (newVal) => {
-        // 创建新对象，合并 newVal 和 targetVolume
-        const combinedData = {
-          gasT1: newVal.gasT1,
-          gasT2: newVal.gasT2,
-          gasT3: newVal.gasT3,
-          gasT4: newVal.gasT4,
-          readTime: newVal.readTime || new Date().toISOString(), // 确保有时间字段
-        };
-        monitorData.value = combinedData;
-        if (echartsData.value.length > 20) {
-          echartsData.value.shift();
-        }
-        echartsData.value = [...echartsData.value, combinedData];
-      }
-    );
-    function initEcharts() {
-      if (ChartRef.value) {
-        myChart.value = echarts.init(ChartRef.value);
-        option && myChart.value.setOption(option);
-        refresh.value = false;
-        nextTick(() => {
-          setTimeout(() => {
-            refresh.value = true;
-          }, 0);
-        });
-      }
-    }
-    onMounted(() => {});
-    function onSubmit() {
-      emit('close');
-      closeModal();
     }
   }
   function onHide() {
@@ -255,105 +212,45 @@
         z-index: -1;
       }
     }
-    .setting-box {
-      width: 1570px;
-      height: 70px;
-      margin: 10px 0;
-      background-color: #ffffff05;
-      border: 1px solid #00d8ff22;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-
-      .right-inputs {
-        width: 100%;
-        display: flex;
-        height: 40px;
-        margin: 0 10px;
-        justify-content: space-between;
-      }
-      .left-buttons {
-        display: flex;
-        height: 40px;
 
-        .btn {
-          margin: 0 10px;
-        }
-      }
-      .border-clip {
-        width: 1px;
-        height: 25px;
-        border-right: 1px solid #8b8b8b77;
-      }
-      .input-title {
-        max-width: 150px;
-      }
-      .input-box {
-        width: 220px !important;
-        background: transparent !important;
-        border-color: #00d8ff44 !important;
-        margin-right: 20px;
-        color: #fff !important;
-      }
-      .btn {
-        padding: 8px 20px;
-        position: relative;
-        border-radius: 2px;
-        color: #fff;
-        width: fit-content;
-        cursor: pointer;
+    .btn1 {
+      border: 1px solid #5cfaff;
 
-        &::before {
-          position: absolute;
-          display: block;
-          content: '';
-          width: calc(100% - 4px);
-          height: calc(100% - 4px);
-          top: 2px;
-          left: 2px;
-          border-radius: 2px;
-          z-index: -1;
-        }
+      &::before {
+        background-image: linear-gradient(#2effee92, #0cb1d592);
       }
 
-      .btn1 {
-        border: 1px solid #5cfaff;
+      &:hover {
+        border: 1px solid #5cfaffaa;
 
         &::before {
-          background-image: linear-gradient(#2effee92, #0cb1d592);
-        }
-
-        &:hover {
-          border: 1px solid #5cfaffaa;
-
-          &::before {
-            background-image: linear-gradient(#2effee72, #0cb1d572);
-          }
+          background-image: linear-gradient(#2effee72, #0cb1d572);
         }
       }
     }
+  }
 
-    @keyframes open {
-      0% {
-        height: 0px;
-      }
-      100% {
-        height: fit-content;
-      }
+  @keyframes open {
+    0% {
+      height: 0px;
     }
-
-    @keyframes close {
-      0% {
-        height: fit-content;
-      }
-      100% {
-        height: 0px;
-      }
+    100% {
+      height: fit-content;
     }
-    :deep(.zxm-divider-inner-text) {
-      color: #cacaca88 !important;
+  }
+
+  @keyframes close {
+    0% {
+      height: fit-content;
     }
-    :deep(.zxm-form-item) {
-      margin-bottom: 10px;
+    100% {
+      height: 0px;
     }
+  }
+  :deep(.zxm-divider-inner-text) {
+    color: #cacaca88 !important;
+  }
+  :deep(.zxm-form-item) {
+    margin-bottom: 10px;
+  }
 </style>

src/views/vent/monitorManager/fanLocalMonitor/components/supplyAir.vue

@@ -109,39 +109,10 @@
       option && myChart.value.setOption(option);
       refresh.value = false;
       nextTick(() => {
-        if (option['xAxis']) option['xAxis']['data'] = xData;
-        option['series'] = yDataList;
-        initEcharts();
+        setTimeout(() => {
+          refresh.value = true;
+        }, 0);
       });
-    });
-    const ChartRef = ref();
-    const myChart = ref();
-    const refresh = ref(true);
-    const xData: any[] = [];
-    const yDataList: [] = [];
-    // const echartsData = ref([]);
-    // const monitorData = ref({});
-    const echartsData = ref<Record<string, any>[]>([]);
-    const monitorData = ref<Record<string, any>>({});
-    watch(
-      () => props.data,
-      (newVal) => {
-        // 创建新对象，合并 newVal 和 targetVolume
-        const combinedData = {
-          inletAirVolume_merge: newVal.inletAirVolume_merge,
-          targetVolume: props.targetVolume, // 添加目标风量
-          readTime: newVal.readTime || new Date().toISOString(), // 确保有时间字段
-        };
-        monitorData.value = combinedData;
-        if (echartsData.value.length > 20) {
-          echartsData.value.shift();
-        }
-        echartsData.value = [...echartsData.value, combinedData];
-      }
-    );
-    function onSubmit() {
-      emit('close');
-      closeModal();
     }
   }
   function onHide() {
@@ -228,119 +199,62 @@
       padding: 8px 20px;
       margin: 10px;
       position: relative;
-      // min-height: 600px;
-      .left-box {
-        flex: 1; /* 占据 3/4 的空间 */
-        background-image: url(../../../../../assets/images/supplyAir.svg);
-        background-repeat: no-repeat;
-        background-size: contain; /* 确保背景图片完整显示 */
-        background-position: center; /* 确保背景图片居中 */
-      }
-      .right-box {
-        flex: 1; /* 占据 3/4 的空间 */
-        height: 400px;
-        width: 100%;
-      }
-    }
-    .setting-box {
-      width: 1570px;
-      height: 70px;
-      margin: 10px 0;
-      background-color: #ffffff05;
-      border: 1px solid #00d8ff22;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
+      border-radius: 2px;
+      color: #fff;
+      width: fit-content;
+      cursor: pointer;
 
-      .right-inputs {
-        width: 100%;
-        display: flex;
-        height: 40px;
-        margin: 0 10px;
-        justify-content: space-between;
+      &::before {
+        position: absolute;
+        display: block;
+        content: '';
+        width: calc(100% - 4px);
+        height: calc(100% - 4px);
+        top: 2px;
+        left: 2px;
+        border-radius: 2px;
+        z-index: -1;
       }
-      .left-buttons {
-        display: flex;
-        height: 40px;
+    }
 
-        .btn {
-          margin: 0 10px;
-        }
-      }
-      .border-clip {
-        width: 1px;
-        height: 25px;
-        border-right: 1px solid #8b8b8b77;
-      }
-      .input-title {
-        max-width: 150px;
-      }
-      .input-box {
-        width: 220px !important;
-        background: transparent !important;
-        border-color: #00d8ff44 !important;
-        margin-right: 20px;
-        color: #fff !important;
-      }
-      .btn {
-        padding: 8px 20px;
-        position: relative;
-        border-radius: 2px;
-        color: #fff;
-        width: fit-content;
-        cursor: pointer;
+    .btn1 {
+      border: 1px solid #5cfaff;
 
-        &::before {
-          position: absolute;
-          display: block;
-          content: '';
-          width: calc(100% - 4px);
-          height: calc(100% - 4px);
-          top: 2px;
-          left: 2px;
-          border-radius: 2px;
-          z-index: -1;
-        }
+      &::before {
+        background-image: linear-gradient(#2effee92, #0cb1d592);
       }
 
-      .btn1 {
-        border: 1px solid #5cfaff;
+      &:hover {
+        border: 1px solid #5cfaffaa;
 
         &::before {
-          background-image: linear-gradient(#2effee92, #0cb1d592);
-        }
-
-        &:hover {
-          border: 1px solid #5cfaffaa;
-
-          &::before {
-            background-image: linear-gradient(#2effee72, #0cb1d572);
-          }
+          background-image: linear-gradient(#2effee72, #0cb1d572);
         }
       }
     }
+  }
 
-    @keyframes open {
-      0% {
-        height: 0px;
-      }
-      100% {
-        height: fit-content;
-      }
+  @keyframes open {
+    0% {
+      height: 0px;
     }
-
-    @keyframes close {
-      0% {
-        height: fit-content;
-      }
-      100% {
-        height: 0px;
-      }
+    100% {
+      height: fit-content;
     }
-    :deep(.zxm-divider-inner-text) {
-      color: #cacaca88 !important;
+  }
+
+  @keyframes close {
+    0% {
+      height: fit-content;
     }
-    :deep(.zxm-form-item) {
-      margin-bottom: 10px;
+    100% {
+      height: 0px;
     }
+  }
+  :deep(.zxm-divider-inner-text) {
+    color: #cacaca88 !important;
+  }
+  :deep(.zxm-form-item) {
+    margin-bottom: 10px;
+  }
 </style>