From 0bcbf95952c5b2b304b290d0694cc817bbb9182f Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Tue, 21 Dec 2021 15:26:44 +0800
Subject: [PATCH] =?UTF-8?q?py=E9=A1=B9=E7=9B=AE=E5=A2=9E=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8B=E4=B8=94=E6=88=96=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Program.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/Program.vue b/src/views/Program.vue
index 07b0792..7d78fa0 100644
--- a/src/views/Program.vue
+++ b/src/views/Program.vue
@@ -84,13 +84,14 @@
             <el-table-column label=" " width="150">
               <template slot-scope="scope">
                 <el-button
+                    circle
+                    type="primary"
                     v-if="scope.row.isSubject"
                     :disabled="isView || scope.row.isDisabled"
-                    type="primary" circle
                     @click="changeResult(scope.row)"
                     style="position: absolute; right: 55px"
                 >
-                  {{ scope.row.withOr === 0 ? '且' : '或' }}
+                  {{ scope.row.resultOperation === 0 ? '且' : '或' }}
                 </el-button>
                 <el-button v-else type="primary" circle @click="changeRule(scope.row, scope.$index)">
                   {{ scope.row.ruleOperation === 0 ? "且" : "或" }}
@@ -299,7 +300,7 @@ export default {
           bcId: i.bcId,
           required: i.required,
           result: i.result,
-          withOr: i.withOr
+          resultOperation: i.resultOperation
         };
         tempArr.push(obj)
       });
@@ -370,7 +371,7 @@ export default {
       }
     },
     changeResult(row) { // （左右）结果运算符(0：且 1：或 默认0)
-      row.withOr = row.withOr === 0 ? 1 : 0;
+      row.resultOperation = row.resultOperation === 0 ? 1 : 0;
     },
     changeRule(row, index) { // （上下）规则运算符(0：且 1：或 默认0)
       row.ruleOperation = row.ruleOperation === 0 ? 1 : 0;