From 2f2f95f5509841c7ccfe2c369d6c8387b32d4708 Mon Sep 17 00:00:00 2001
From: CherrysChang <1935003650@qq.com>
Date: Tue, 21 Apr 2020 17:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=A1=88=E4=BE=8B=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E3=80=81=E6=96=B0=E5=A2=9E=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0init?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/server.js               |  9 +++++++++
 src/common/js/interceptor.js    |  1 -
 src/views/train/case-detail.vue | 15 ++++++++++++++-
 src/views/train/case-list.vue   | 31 ++++++++++++-------------------
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/api/server.js b/src/api/server.js
index 1023f50..bf03faf 100644
--- a/src/api/server.js
+++ b/src/api/server.js
@@ -38,6 +38,8 @@ export const Train = new (class {
         this.insertCaseApi = trainApi + "/trainCaseManage/add";//添加
         this.updCaseApi = trainApi + "/trainCaseManage/edit";//修改
         this.delCaseApi = trainApi + "/trainCaseManage/remove";//删除
+
+        this.getTargetListApi = trainApi + "/trainCaseManage/targetList";//量化指标列表
     }
 
     //实训案例管理列表
@@ -64,6 +66,13 @@ export const Train = new (class {
             .post(this.delCaseApi, qs.stringify(params))
             .then(res => res.data);
     }
+
+    //量化指标列表
+    getTargetList(params) {
+        return axios
+            .get(this.getTargetListApi, {params: params})
+            .then(res => res.data);
+    }
 })();
 
 /**
diff --git a/src/common/js/interceptor.js b/src/common/js/interceptor.js
index 8a3d6d6..10606d4 100644
--- a/src/common/js/interceptor.js
+++ b/src/common/js/interceptor.js
@@ -5,7 +5,6 @@ import store from '@/vuex/store.js';
 axios.defaults.timeout = 10000;
 axios.interceptors.request.use(
     function(config){
-        debugger;
     //     return config;
     // }
         // config.url = process.env.BASEAPI+process.env.ROOT+config.url;
diff --git a/src/views/train/case-detail.vue b/src/views/train/case-detail.vue
index bc7f119..9264b10 100644
--- a/src/views/train/case-detail.vue
+++ b/src/views/train/case-detail.vue
@@ -25,7 +25,7 @@
                     <el-row :gutter="20" type="flex">
                         <el-col :span="1" style="text-align:center;padding-top: 182px;width: 88px;" class="item-required">量化指标</el-col>
                         <el-col :span="7">
-                            <el-table ref="leftTable" :data="tableData.filter(data => !searchName || data.name.toLowerCase().includes(searchName.toLowerCase()))"
+                            <el-table ref="leftTable" :data="leftListData.filter(data => !searchName || data.name.toLowerCase().includes(searchName.toLowerCase()))"
                                       height="400" border highlight-current-row tooltip-effect="dark" @selection-change="handleSelectionChange">
                                 <el-table-column type="selection" width="55"></el-table-column>
                                 <el-table-column header-align="right" label="未选择 10/10">
@@ -89,6 +89,8 @@
 </template>
 
 <script>
+    import {Train} from "@/api/server.js";
+
     export default {
         name: 'case-detail',
         data() {
@@ -112,6 +114,7 @@
                 }
             };
             return {
+                leftListData: [],
                 tableData: [{
                     name: '王小虎',
                 }, {
@@ -195,12 +198,22 @@
                     }
                 });
             }
+            this.initTargetList();
         },
         methods: {
             goBackList() {
                 // this.$router.push({name: 'CaseList'});
                 this.$router.go(-1);
             },
+            initTargetList(searchObj) {
+              Train.getTargetList(searchObj).then(res => {
+                  if (res.code == 200) {
+                      this.leftListData = res.data;
+                  }
+              }).catch(error => {
+                  console.info(error)
+              });
+            },
             goBackAdd() {
                 this.isShowData = false;
             },
diff --git a/src/views/train/case-list.vue b/src/views/train/case-list.vue
index e0ea89d..121cbc1 100644
--- a/src/views/train/case-list.vue
+++ b/src/views/train/case-list.vue
@@ -39,31 +39,26 @@
                 <el-table-column prop="name" label="实训名称" width="400"></el-table-column>
                 <el-table-column prop="type" label="实训用途" width="160">
                     <template slot-scope="scope">
-                        {{ scope.row.type === 1 ? '练习': '' }}
-                        {{ scope.row.type === 2 ? '考核': '' }}
+                        {{ scope.row.type === 1 ? '考核': '' }}
+                        {{ scope.row.type === 2 ? '练习': '' }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="isAdmin" label="创建人" width="160">
                     <template slot-scope="scope">
                         {{ scope.row.isAdmin === 1 ? '管理员': '' }}
-                        {{ scope.row.isAdmin === 2 ? '教师': '' }}
+                        {{ scope.row.isAdmin === 0 ? '教师': '' }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="updateTime" label="编辑时间" width="240"></el-table-column>
                 <el-table-column label="操作">
                     <template slot-scope="scope">
-                        <div v-if="showSearchDiv==1">
-                            <el-button @click="toInputForm(scope.row,0)" type="text" size="small">查看</el-button>
-                            <el-button @click="toInputForm(scope.row,1)" type="text" size="small"
-                                       v-if="isShowEditOrDelBtn(scope.row)">编辑
-                            </el-button>
-                            <el-button @click="doSingleDel(scope.row)" type="text" size="small" v-if="isShowEditOrDelBtn(scope.row)">
-                                删除
-                            </el-button>
-                        </div>
-                        <!--<div v-else>
-                            <el-button @click="gotoDb(scope.row)" type="text" size="small">进入</el-button>
-                        </div>-->
+                        <el-button @click="toInputForm(scope.row,0)" type="text" size="small">查看</el-button>
+                        <el-button @click="toInputForm(scope.row,1)" type="text" size="small"
+                                   v-if="isShowEditOrDelBtn(scope.row)">编辑
+                        </el-button>
+                        <el-button @click="doSingleDel(scope.row)" type="text" size="small" v-if="isShowEditOrDelBtn(scope.row)">
+                            删除
+                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -89,9 +84,7 @@
                 searchObj: {
                     type: '',
                     isAdmin: '',
-                    name: '',
-                    showSearchDiv: 1,
-                    selfIsAdmin:1
+                    name: ''
                 },
                 listData: [],
                 delProjectItems: [],
@@ -108,7 +101,7 @@
             initList(searchObj) {
                 Train.getCaseList(searchObj).then(res => {
                     if (res.code == 200) {
-                        this.listData = res.data;
+                        this.listData = res.data.rows;
                         this.totalCount = res.totalCount;
                     }
                 }).catch(error => {