微调

2024-12-05 19:31:43 +08:00
parent 11c32ed360
commit c195a58eb4
2 changed files with 114 additions and 114 deletions
--- a/frontend/src/api/device/error/errorData.ts
+++ b/frontend/src/api/device/error/errorData.ts
@@ -42,194 +42,194 @@ const errordata = ref<ErrorSystem.ErrorSystemList[]>([
      {
          col1:'频率偏差',
          col2: '',
-           deviceLevel: 'A', 
+           deviceLevel: 'A',
           measurementType:'频率',
-           condition: '42.5~57.5 Hz', 
-           maxErrorValue: '±0.01Hz' 
+           condition: '42.5~57.5 Hz',
+           maxErrorValue: '±0.01Hz'
      },
      {
          col1:'三相不平衡度',
          col2: '',
-         deviceLevel: 'A', 
+         deviceLevel: 'A',
         measurementType:'电压',
-         condition: '0.5%~5%', 
-         maxErrorValue: '±0.15%' 
+         condition: '0.5%~5%',
+         maxErrorValue: '±0.15%'
      },
      {
          col1:'三相不平衡度',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'电压',
-        condition: '5%（不包含）~ 40%', 
-        maxErrorValue: '±0.3%' 
+        condition: '5%（不包含）~ 40%',
+        maxErrorValue: '±0.3%'
     },
     {
         col1:'三相不平衡度',
         col2: '',
-      deviceLevel: 'A', 
+      deviceLevel: 'A',
      measurementType:'电流',
-      condition: '', 
-      maxErrorValue: '±1%' 
+      condition: '',
+      maxErrorValue: '±1%'
      },
      {
          col1:'电压波动',
          col2: '电压幅值',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'电压',
-        condition: '', 
-        maxErrorValue: '±0.2%Un' 
+        condition: '',
+        maxErrorValue: '±0.2%Un'
      },
      {
          col1:'电压波动',
          col2: '持续时间',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'时间',
-        condition: '', 
-        maxErrorValue: '±1周波' 
+        condition: '',
+        maxErrorValue: '±1周波'
      },
      {
          col1:'闪变',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'短时间闪变',
-        condition: 'Pst：0.2~10', 
-        maxErrorValue: '±5%' 
+        condition: 'Pst：0.2~10',
+        maxErrorValue: '±5%'
      },
      {
          col1:'谐波和间谐波',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'电压',
-        condition: 'Uh≥1%Un', 
-        maxErrorValue: '±5%Uh' 
+        condition: 'Uh≥1%Un',
+        maxErrorValue: '±5%Uh'
      },
      {
          col1:'谐波和间谐波',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'电压',
-        condition: 'Uh＜1%Un', 
-        maxErrorValue: '±0.05%Un' 
+        condition: 'Uh＜1%Un',
+        maxErrorValue: '±0.05%Un'
      },
      {
          col1:'谐波和间谐波',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'电流',
-        condition: 'In≥3%In', 
-        maxErrorValue: '±5%Ih' 
+        condition: 'In≥3%In',
+        maxErrorValue: '±5%Ih'
      },
      {
          col1:'谐波和间谐波',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'电流',
-        condition: 'In＜3%In', 
-        maxErrorValue: '±0.15%In' 
+        condition: 'In＜3%In',
+        maxErrorValue: '±0.15%In'
      },
      {
          col1:'谐波和间谐波',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'相角',
-        condition: '', 
-        maxErrorValue: 'h≤5,±1°*h' 
+        condition: '',
+        maxErrorValue: 'h≤5,±1°*h'
      },
      {
          col1:'谐波和间谐波',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'相角',
-        condition: '', 
-        maxErrorValue: 'h>5,±5°' 
+        condition: '',
+        maxErrorValue: 'h>5,±5°'
      },
      {
          col1:'谐波和间谐波',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'功率',
-        condition: 'Ph≥150W', 
-        maxErrorValue: '±1%Ph' 
+        condition: 'Ph≥150W',
+        maxErrorValue: '±1%Ph'
      },
      {
          col1:'谐波和间谐波',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'功率',
-        condition: 'Ph＜150W', 
-        maxErrorValue: '±1.5W' 
+        condition: 'Ph＜150W',
+        maxErrorValue: '±1.5W'
      },
      {
          col1:'高频次谐波',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'电压',
-        condition: 'Uh≥1%Un', 
-        maxErrorValue: '±5%Uh' 
+        condition: 'Uh≥1%Un',
+        maxErrorValue: '±5%Uh'
      },
      {
          col1:'高频次谐波',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'电压',
-        condition: 'Uh＜1%Un', 
-        maxErrorValue: '±0.05%Un' 
+        condition: 'Uh＜1%Un',
+        maxErrorValue: '±0.05%Un'
      },
      {
          col1:'高频次谐波',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'电流',
-        condition: 'In≥3%In', 
-        maxErrorValue: '±5%Ih' 
+        condition: 'In≥3%In',
+        maxErrorValue: '±5%Ih'
      },
      {
          col1:'高频次谐波',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'电流',
-        condition: 'In＜3%In', 
-        maxErrorValue: '±0.15%In' 
+        condition: 'In＜3%In',
+        maxErrorValue: '±0.15%In'
      },
      {
          col1:'功率',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'功率',
-        condition: '', 
-        maxErrorValue: '±0.5%' 
+        condition: '',
+        maxErrorValue: '±0.5%'
      },
      {
          col1:'电流',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'电流',
-        condition: 'I≥0.05In', 
-        maxErrorValue: '±0.5%' 
+        condition: 'I≥0.05In',
+        maxErrorValue: '±0.5%'
      },
      {
          col1:'电流',
          col2: '',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'电流',
-        condition: '0.01In≤I＜0.05In', 
-        maxErrorValue: '±1%' 
+        condition: '0.01In≤I＜0.05In',
+        maxErrorValue: '±1%'
      },
      {
        col1: '电压暂降、电压暂升和短时中断',
          col2: '电压幅值',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'电压',
-        condition: '', 
-        maxErrorValue: '±0.2%Un' 
+        condition: '',
+        maxErrorValue: '±0.2%Un'
      },
      {
        col1: '电压暂降、电压暂升和短时中断',
        col2: '持续时间',
-        deviceLevel: 'A', 
+        deviceLevel: 'A',
        measurementType:'时间',
-        condition: '', 
-        maxErrorValue: '±1周波' 
+        condition: '',
+        maxErrorValue: '±1周波'
      },
    ])
    
--- a/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
+++ b/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
@@ -78,58 +78,58 @@ const spanMethod = ({
  rowIndex,
  columnIndex,
 }: SpanMethodProps) => {
- 
-  if (columnIndex === 0  ) { // 检查是否为第一列
-  
-    if (rowIndex === 2||rowIndex === 5 ||rowIndex === 21||rowIndex === 23) { // 检查是否为第三行
+  if (columnIndex === 0) {
+    if (rowIndex <= 1 || rowIndex === 7 || rowIndex == 20) {
      return {
-        rowspan: 2, // 合并行数
-        colspan: 1,  // 单元格列数
-      };
-    }else if (rowIndex === 8) { // 
+        rowspan: 1, 
+        colspan: 2,
+      }
+    }
+    if (rowIndex === 2) {
      return {
-        rowspan: 8, 
-        colspan: 1,
-      };
-    } 
-    else if (rowIndex === 16) { // 
-      return {
-        rowspan: 4, 
-        colspan: 1,
-      };
-    } 
-    else if (rowIndex === 3 ||rowIndex === 6 ||rowIndex === 9 || rowIndex === 10|| rowIndex === 11
-            || rowIndex === 12|| rowIndex === 13|| rowIndex === 14|| rowIndex === 15
-            || rowIndex === 17 || rowIndex === 18|| rowIndex === 19
-            || rowIndex === 22 ||rowIndex === 24) { // 检查是否为第四行
+        rowspan: 3, // 不显示该单元格
+        colspan: 2,
+      }
+    }
+    if (rowIndex === 3 || rowIndex === 4 || rowIndex === 6 || rowIndex >= 9 && rowIndex <= 15 || rowIndex >= 17 && rowIndex <= 19 || rowIndex === 22 || rowIndex === 24) {
      return {
        rowspan: 0, // 不显示该单元格
        colspan: 0,
-      };
+      }
    }
-  }
-
-  if (columnIndex === 1 || columnIndex === 2){
-  
-    if (rowIndex === 2 
-        || rowIndex === 8|| rowIndex === 10|| rowIndex === 12|| rowIndex === 14
-        || rowIndex === 16|| rowIndex === 18
-        || rowIndex === 21) { 
+    if (rowIndex === 5 || rowIndex === 23) {
      return {
        rowspan: 2, 
        colspan: 1,
-      };
-    } 
-    else if (rowIndex === 3
-            || rowIndex === 9|| rowIndex === 11|| rowIndex === 13|| rowIndex === 15
-            || rowIndex === 17|| rowIndex === 19
-            || rowIndex === 22) { // 检查是否为第四行
-      return {
-        rowspan: 0, // 不显示该单元格
-        colspan: 0,
-      };
+      }
    }
-  } 
+    if (rowIndex === 8) {
+      return {
+        rowspan: 8, 
+        colspan: 2,
+      }
+    }
+    if (rowIndex === 16) {
+      return {
+        rowspan: 4, 
+        colspan: 2,
+      }
+    }
+    if (rowIndex === 21 || rowIndex === 22) {
+      return {
+        rowspan: 2, 
+        colspan: 2,
+      }
+    }
+  }
+  if (columnIndex === 1) {
+    if (rowIndex <= 4 || rowIndex >= 7 && rowIndex <= 22) {
+      return {
+        rowspan: 0, 
+        colspan: 0,
+      }
+    }
+  }
 };

    // 关闭弹窗