From 1e44b63b0e25c43074f697dc6c46a9dc612aa922 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Tue, 4 Jan 2022 15:24:52 +0800
Subject: [PATCH] =?UTF-8?q?Python=E5=88=A4=E5=88=86=E7=82=B9=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E6=97=B6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE=E9=9A=90=E8=97=8F=20=E9=93=B6?=
 =?UTF-8?q?=E8=A1=8C=E5=88=A4=E5=88=86=E7=82=B9=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api.js          | 3 ++-
 src/views/Program.vue     | 2 +-
 src/views/Transaction.vue | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/utils/api.js b/src/utils/api.js
index da514af..df99a16 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -20,7 +20,8 @@ if(isKd){
         host = 'http://www.huorantech.cn:9000'; // 中台线上
     } else {
         console.log("本地-中台测试服");
-        host = 'http://39.108.250.202:9000';
+        host = 'http://39.108.250.202:9000'; //线上
+        // host = 'http://192.168.31.137:9000'; //赓
     }
 
     // host = 'http://192.168.31.137:9000' // 坤
diff --git a/src/views/Program.vue b/src/views/Program.vue
index 723e01d..be09038 100644
--- a/src/views/Program.vue
+++ b/src/views/Program.vue
@@ -114,7 +114,7 @@
                 <el-button v-show="scope.row.isDisabled" size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>
                 <el-button v-show="!scope.row.isDisabled" size="mini" type="text" @click="handleSave(scope.row)">保存</el-button>
                 <el-button v-show="!scope.row.isDisabled" size="mini" type="text" @click="handleCancel(scope.row, scope.$index)">取消</el-button>
-                <el-button size="mini" type="text" @click="handleDelete(scope.$index)">删除</el-button>
+                <el-button v-show="scope.row.isDisabled" size="mini" type="text" @click="handleDelete(scope.$index)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
diff --git a/src/views/Transaction.vue b/src/views/Transaction.vue
index 68068dc..6819e33 100644
--- a/src/views/Transaction.vue
+++ b/src/views/Transaction.vue
@@ -146,7 +146,7 @@
                               style="width: 100%"
                           >
                             <el-option
-                                v-for="(item, index) in scope.row.items"
+                                v-for="(item, index) in scope.row.lcItems"
                                 :key="index"
                                 :label="item.options"
                                 :value="item.itemId"
@@ -172,7 +172,7 @@
                               style="width: 100%"
                           >
                             <el-option
-                                v-for="(item, index) in scope.row.items"
+                                v-for="(item, index) in scope.row.lcItems"
                                 :key="index"
                                 :label="item.options"
                                 :value="item.subjectId"
@@ -420,7 +420,7 @@ export default {
             }
             // 根据题目id,获取题目信息
             if (item.isSubject && item.type && item.type != 4 && item.emptyOne) {
-              await this.getSubjectData(item.emptyOne, index);
+              // await this.getSubjectData(item.emptyOne, index);
             }
           });
         } else {
@@ -571,7 +571,7 @@ export default {
           let item = {
             ...this.tableData[index],
             ...res.subject,
-            items: res.items
+            lcItems: res.items
           };
           this.$set(this.tableData, index, item);
         }