zc

src/views/safetyCheck/checkItemLibrary/index.vue

@@ -304,6 +304,7 @@
         this.$set(this.addDialogForm,'code',obj.key);
         this.$set(this,'addDialogLevel',obj.level);
       },
+      //序号自增
       cascaderCheckData(val,list){
         let self = this;
         for(let i=0;i<list.length;i++){
@@ -316,8 +317,7 @@
             }
             if(list[i].children){
               if(list[i].children[0]){
-                let minList = list[i].children[list[i].children.length-1].code.split('.')
-                obj.key = list[i].code ? list[i].code + '.' + ((parseInt(minList[minList.length-1]))+1) : (parseInt(minList[minList.length-1]))+1
+                obj.key = list[i].code ? list[i].code + '.' + self.getChekeListKey(list[i].children) : self.getChekeListKey(list[i].children)
               }else{
                 obj.key = list[i].code ? list[i].code+'.1':'1'
               }
@@ -339,6 +339,23 @@
           }
         }
       },
+      //自动补位计算
+      getChekeListKey(dataList){
+        let num = 0;
+        for(let i=0;i<dataList.length;i++){
+          let list = dataList[i].code.split('.');
+          if(num === 0 && parseInt(list[list.length-1]) !== 1){
+            return 1
+          }else{
+            if(num+1 === parseInt(list[list.length-1])){
+              num = parseInt(list[list.length-1]);
+            }else{
+              return num+1
+            }
+          }
+        }
+        return num+1
+      },
       //删除
       delItem(row){
         let self = this;

src/views/safetyCheck/dataStatistics/checkIndexStatistics.vue

@@ -61,11 +61,11 @@
       <el-table-column label="计划任务" align="center" prop="title" show-overflow-tooltip/>
       <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="230"/>
       <el-table-column label="隐患总数" align="center" prop="sumTotal" show-overflow-tooltip width="120"/>
-      <el-table-column label="一级指标隐患数" align="center" prop="schoolItemsTotal1" show-overflow-tooltip width="130"/>
+      <el-table-column label="一级指标隐患数" align="center" prop="itemsTotal1" show-overflow-tooltip width="130"/>
       <el-table-column label="一级指标占比" align="center" prop="percent" show-overflow-tooltip width="130"/>
-      <el-table-column label="二级指标隐患数" align="center" prop="schoolItemsTotal2" show-overflow-tooltip width="130"/>
+      <el-table-column label="二级指标隐患数" align="center" prop="itemsTotal2" show-overflow-tooltip width="130"/>
       <el-table-column label="二级指标占比" align="center" prop="percent2" show-overflow-tooltip width="130"/>
-      <el-table-column label="三级指标隐患数" align="center" prop="schoolItemsTotal3" show-overflow-tooltip width="130"/>
+      <el-table-column label="三级指标隐患数" align="center" prop="itemsTotal3" show-overflow-tooltip width="130"/>
       <el-table-column label="三级指标占比" align="center" prop="percent3" show-overflow-tooltip width="130"/>
     </el-table>
     <pagination :page-sizes="[20, 30, 40, 50]"