微调

frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue

@@ -78,56 +78,56 @@ 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) { // 
-      return {
-        rowspan: 8, 
-        colspan: 1,
-      };
+        rowspan: 1, 
+        colspan: 2,
+      }
     }
-    else if (rowIndex === 16) { // 
+    if (rowIndex === 2) {
       return {
-        rowspan: 4, 
-        colspan: 1,
-      };
+        rowspan: 3, // 不显示该单元格
+        colspan: 2,
+      }
     }
-    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) { // 检查是否为第四行
+    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) { // 检查是否为第四行
+    if (rowIndex === 8) {
       return {
-        rowspan: 0, // 不显示该单元格
+        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,
-      };
+      }
     }
   }
 };