From 7b8e48191125532872b4499a3decb824da7863ff Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Wed, 8 Dec 2021 14:58:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E5=87=BB=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=88=A4=E5=88=86=E7=82=B9=E6=97=B6=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E7=AD=94=E6=A1=88=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Transaction.vue | 68 +++++++++++----------------------------
 1 file changed, 18 insertions(+), 50 deletions(-)

diff --git a/src/views/Transaction.vue b/src/views/Transaction.vue
index 2af80eb..14365f8 100644
--- a/src/views/Transaction.vue
+++ b/src/views/Transaction.vue
@@ -110,6 +110,7 @@
                 <p class="p" style="margin-top: 1px">交易结果一致性规则：用户交易结果需要与下面设置的交易结果指标要求一致</p>
                 <div class="block">
                   <!-- type: 题目类型(1选择 2判断 3填空 4问答 5指标结果) -->
+                  <div v-if="scope.row.operationIds && scope.row.type == null" style="line-height: 65px">需点击</div>
                   <template v-if="scope.row.type == 1">
                     <div class="box">
                       <div class="line">
@@ -137,7 +138,7 @@
                     </div>
                   </template>
 
-                  <template v-else-if="scope.row.type == 2">
+                  <template v-if="scope.row.type == 2">
                     <div class="box">
                       <div class="line">
                         <div>{{ scope.row.name }}</div>
@@ -163,7 +164,7 @@
                     </div>
                   </template>
 
-                  <template v-else-if="scope.row.type == 3">
+                  <template v-if="scope.row.type == 3">
                     <div class="box">
                       <div class="line" style="min-height: 100%;">
                         <span class="label">
@@ -185,7 +186,7 @@
                     </div>
                   </template>
 
-                  <template v-else-if="scope.row.type == 4">
+                  <template v-if="scope.row.type == 4">
                     <div class="box">
                       <div class="line">
                         <span class="label">
@@ -238,7 +239,7 @@
                     </div>
                   </template>
 
-                  <template v-else-if="scope.row.type == 5">
+                  <template v-if="scope.row.type == 5">
                     <div class="box">
                       <div class="line">
                         <!--
@@ -300,14 +301,6 @@
                       </div>
                     </div>
                   </template>
-
-                  <template v-else-if="scope.row.type == 7">
-                    <div style="line-height: 65px">需点击7</div>
-                  </template>
-
-                  <template v-else>
-                    <div style="line-height: 65px">{{ checkChange[scope.$index] ? '需点击' : '' }}</div>
-                  </template>
                 </div>
               </template>
             </el-table-column>
@@ -489,58 +482,33 @@ export default {
       });
     },
     handleCheckChange(data, checked, indeterminate, row, index) { // 处理勾选
-      // console.log(this.fromChange)
-      // console.log(row.operationIds)
-      // console.log(checked)
-      // console.log(this.count)
-      // if(this.fromChange === row.operationIds) {
-      //   this.count++
-      // }else {
-      //   this.fromChange = row.operationIds
-      // }
-      // if(this.count === 2 || this.count === 0) {
-      //   this.checkChange.splice(index, 1, false)
-      //   this.count = 0;
-      // }else {
-      //   this.checkChange.splice(index, 1, true)
-      // }
-      // if(this.fromChange === row.operationIds) {
-      //   this.count++
-      //   this.checkChange.splice(index, 1, checked)
-      // }else {
+      // this.changeArr.push(checked)
+      // if(this.changeArr.length === 4) {
+      //   this.checkChange.splice(index, 1, this.changeArr[2])
+      //   this.changeArr.splice(0, this.changeArr.length)
+      // }else if(this.changeArr.length === 2) {
       //   this.checkChange.splice(index, 1, true)
-      //   this.fromChange = row.operationIds
       // }
-      this.changeArr.push(checked)
-      console.log(this.changeArr)
-      if(this.changeArr.length === 4) {
-        this.checkChange.splice(index, 1, this.changeArr[2])
-        this.changeArr.splice(0, this.changeArr.length)
-      }else if(this.changeArr.length === 2) {
-        this.checkChange.splice(index, 1, true)
+      if (checked){
+      }else{
+        row.operationIds = null
+        row.type = null
       }
-
-      let divTree = '#divTree'+index;
-      let dom = document.querySelector(divTree)
-      let depTree = '#depTree'+index;
-      let dom1 = document.querySelector(depTree)
-      let nodeHight =26
-      dom1.style.height = (data.number * nodeHight) + "px"
-      let contHeight=(data.number * nodeHight)//总高度,盒子高度的一半
-      dom.scrollTo(0, contHeight)
       if (checked && data.isNode === 1) {
         this.tableData[index].operationIds = data.id; // 操作id串
-        // for ()
         row.value1 = "";
         row.value2 = "";
         row.value3 = "";
         row.value4 = "";
         row.value5 = "";
+        // console.log(data)
         if (data.subjectId) { // 是否有题目id
           this.currentNodeData = data;
           this.$refs[`tree-${index}`].setCheckedNodes([data]);
           this.getSubjectData(data.subjectId, index);
         } else {
+          row.type = null;
+          // console.log(row.type)
           this.currentNodeData = {};
           this.$refs[`tree-${index}`].setCheckedNodes([data]);
         }
@@ -647,7 +615,7 @@ export default {
             id: "",
             lcId: i.lcId,
             itemId:'',
-            type: i.type ? i.type : "7",
+            type: i.type ? i.type : "",
             operationIds: i.operationIds,
             resultOperation: i.resultOperation,
             ruleOperation: i.ruleOperation