微调

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

@@ -65,6 +65,7 @@ const spanMethod = ({
 }: SpanMethodProps) => {
  
   if (columnIndex === 0  ) { // 检查是否为第一列
+    
     if (rowIndex === 2 ||rowIndex === 21) { // 检查是否为第三行
       return {
         rowspan: 2, // 合并行数
@@ -92,7 +93,7 @@ const spanMethod = ({
       };
     }
   }
-  if (columnIndex === 1  ){
+  if (columnIndex === 1 || columnIndex === 2){
     if (rowIndex === 2 
         || rowIndex === 8|| rowIndex === 10|| rowIndex === 12|| rowIndex === 14
         || rowIndex === 16|| rowIndex === 18
@@ -122,29 +123,7 @@ const spanMethod = ({
   //       colspan: 0,
   //     };
   // }
-  }
-  else if(columnIndex === 2) { // 检查是否为第三列
-    if (rowIndex === 2 
-        || rowIndex === 8|| rowIndex === 10|| rowIndex === 12|| rowIndex === 14
-        || rowIndex === 16|| rowIndex === 18
-        || rowIndex === 21) { 
-      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,
-      };
-    }
-  }
- 
-      
+  } 
 };
 
     // 关闭弹窗

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

@@ -1,7 +1,7 @@
 <template>
      <div class="dialog-footer">
                 <el-button :icon='CirclePlus' type="primary" @click="openAddDialog">新增</el-button>
-                <el-button :icon='Delete' type="danger"  plain :disabled='!multipleSelection.length' @click="deleteSelectedRows">批量删除</el-button>
+                <el-button :icon='Delete' type="danger"  plain :disabled='!multipleSelection.length' @click="deleteSelectedRows">删除</el-button>
     </div>
       <div class="table-container">
             <el-table :data="tableData"  
@@ -125,7 +125,7 @@
 const options: Ref<CascaderOption[]> = ref([]); // 修改这里
 
 onMounted(async () => {
-  const dictCode = ''; // 替换为实际需要的字典代码
+  const dictCode = '误差体系指标项'; // 替换为实际需要的字典代码
   const resDictTree: Dict.ResDictTree = {
     name: dictCode,
     id: '',

frontend/src/views/machine/errorSystem/index.vue

@@ -10,7 +10,7 @@
         <el-button type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
         <el-button v-auth.device="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
-          批量删除
+        删除
         </el-button>
       </template>
        <!-- 表格操作 -->