From 861861215a93330076c5de1bd6077256fbc2b3c0 Mon Sep 17 00:00:00 2001
From: "jialong.yu" <Yujialong.123>
Date: Tue, 8 Feb 2022 17:56:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Program.vue     | 18 ++++++++++++++--
 src/views/Transaction.vue | 43 +++++++++++++++++----------------------
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/views/Program.vue b/src/views/Program.vue
index be09038..e455c38 100644
--- a/src/views/Program.vue
+++ b/src/views/Program.vue
@@ -69,7 +69,11 @@
               header-align="center"
               :header-cell-style="headClass"
           >
-            <el-table-column prop="id" type="index" label="序号" width="80"></el-table-column>
+            <el-table-column prop="id" type="index" label="序号" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.isSubject && scope.row.index + 1 }}
+              </template>
+            </el-table-column>
             <el-table-column label="编译器中正确答案" align="center">
               <template slot-scope="scope" v-if="scope.row.isSubject">
                 <p class="p">字段一致性规则：用户编辑器中至少出现如下语句</p>
@@ -199,6 +203,13 @@ export default {
         console.log(err)
       });
     },
+    // 设置序号
+    setIndex() {
+      let i = 0
+      this.tableData.map(e => {
+        if (e.isSubject) e.index = i++
+      })
+    },
     // 重新封装数据
     anewPosttingData(judgmentRule){
       let length = judgmentRule.length;
@@ -239,7 +250,7 @@ export default {
           tempArr.push({ruleOperation: item.ruleOperation});
         }
         this.tableData = tempArr;
-        console.log(this.tableData)
+        this.setIndex()
       });
     },
     handleBlur() { // 新增/编辑判分点名称判重
@@ -372,6 +383,7 @@ export default {
             value5: ""
           });
         }
+        this.setIndex()
       }
     },
     changeResult(row) { // （左右）结果运算符(0：且 1：或 默认0)
@@ -402,6 +414,7 @@ export default {
         // this.tableData.splice(index, 1);
         this.isAddRule = false;
       }
+      this.setIndex()
     },
     handleDelete(index) { // 处理删除规则
       this.$confirm("此操作将永久删除该规则, 是否继续?", "提示", {
@@ -417,6 +430,7 @@ export default {
         }
         this.itemkey = Math.random()
         this.isAddRule = false;
+        this.setIndex()
       }).catch(() => {})
     },
     // 表头样式设置
diff --git a/src/views/Transaction.vue b/src/views/Transaction.vue
index 7f26a09..2dfaa80 100644
--- a/src/views/Transaction.vue
+++ b/src/views/Transaction.vue
@@ -85,6 +85,9 @@
               header-align="center"
           >
             <el-table-column prop="indexNo" type="index" label="序号" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.isSubject && scope.row.index + 1 }}
+              </template>
             </el-table-column>
             <el-table-column label="流程类考核点">
               <template slot-scope="scope" v-if="scope.row.isSubject">
@@ -92,25 +95,12 @@
                 <div class="tree-con">
                   <div class="block1" :id="'divTree'+scope.$index">
                     <el-tree :data="scope.row.operationIData" :props="defaultProp" :default-expand-all="true"></el-tree>
-<!--                    <my-tree-->
-<!--                        :id="'depTree'+scope.$index"-->
-<!--                        class="action"-->
-<!--                        :ref="'tree-'+scope.$index"-->
-<!--                        :data="treeData"-->
-<!--                        :props="defaultProps"-->
-<!--                        default-expand-all-->
-<!--                        node-key="operationIds"-->
-<!--                        show-checkbox-->
-<!--                        @check-change="(data, checked, indeterminate) => {-->
-<!--                          handleCheckChange(data, checked, indeterminate, scope.row, scope.$index);-->
-<!--                        }"-->
-<!--                    ></my-tree>-->
                   </div>
                   <div v-show="scope.row.isDisabled" class="mask"></div>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label=" " width="150">
+            <el-table-column label=" " width="150" align="center">
               <template slot-scope="scope">
                 <el-button
                     circle
@@ -118,7 +108,6 @@
                     v-if="scope.row.isSubject"
                     :disabled="isView || scope.row.isDisabled"
                     @click="changeResult(scope.row)"
-                    style="position: absolute; right: 55px"
                 >
                   {{ scope.row.resultOperation === 0 ? "且" : "或" }}
                 </el-button>
@@ -446,6 +435,7 @@ export default {
               // await this.getSubjectData(item.emptyOne, index);
             }
           });
+          this.setIndex()
           this.loading = false
         } else {
           this.$message.warning(res.message);
@@ -476,7 +466,7 @@ export default {
       this.counts = this.counts+1
       let list = []
       if (this.SelectedObj.checkedNodes.length > 0){
-        for (var i=0;i<this.SelectedObj.checkedNodes.length;i++){
+        for (let i=0;i<this.SelectedObj.checkedNodes.length;i++){
           if(this.SelectedObj.checkedNodes[i].children.length > 0){
 
           }else{
@@ -488,6 +478,7 @@ export default {
         }
       }
       this.anewPosttingDatas(list)
+      let i = 0
       this.tableData.forEach(async (item, index) => {
         // 勾选树节点
         if (!item.type){
@@ -512,6 +503,7 @@ export default {
           item.operationIData.push(testObj)
         }
       });
+      this.setIndex()
       this.configVisible = false
     },
     anewPosttingDatas(judgmentRuleList){
@@ -823,15 +815,10 @@ export default {
     addRules(){
       this.configVisible = true;
       let operationIds = []
-      console.log(this.treeData)
-      for (var i=0;i<this.tableData.length;i++){
-        if (this.tableData[i].operationIds){
-          operationIds.push(this.tableData[i].operationIds)
-        }
-      }
-      console.log(operationIds)
+      this.tableData.map((e, i) => {
+        e.operationIds && operationIds.push(e.operationIds)
+      })
       this.$refs.tree.setCheckedKeys([]);
-
     },
     addRule() { // 新增规则
       this.changeArr.splice(0, this.changeArr.length)
@@ -884,6 +871,13 @@ export default {
       row.ruleOperation = row.ruleOperation === 0 ? 1 : 0;
       this.tableData[index - 1].ruleOperation = row.ruleOperation;
     },
+    // 设置序号
+    setIndex() {
+      let i = 0
+      this.tableData.map(e => {
+        if (e.isSubject) e.index = i++
+      })
+    },
     handleEdit(row) { // 处理编辑规则
       this.judgePoints = true
       this.tableDataCopy = deepCopy(this.tableData); // 深拷贝
@@ -954,6 +948,7 @@ export default {
         }
         this.isAddRule = false;
       }
+      this.setIndex()
     },
     handleDelete(row, index) { // 处理删除规则
       this.$confirm("此操作将永久删除该规则, 是否继续?", "提示", {