From b24569fe4bfb9939af43926cfd4bc03d38d09c87 Mon Sep 17 00:00:00 2001
From: Yjhon <hbzgyjh@126.com>
Date: Thu, 24 Feb 2022 17:35:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/ProjectList.vue             | 20 +++++++++----------
 .../terminalTrain/TerminalTrainDetail.vue     |  3 ++-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/views/project/ProjectList.vue b/src/views/project/ProjectList.vue
index 976c2a6..463b2a6 100644
--- a/src/views/project/ProjectList.vue
+++ b/src/views/project/ProjectList.vue
@@ -7,9 +7,10 @@
         项目状态:
         <a-select v-model="queryParam.status" placeholder="请选择" default-value="null" style="width: 120px">
           <a-select-option value="null">全部</a-select-option>
-          <a-select-option value="1">运行中</a-select-option>
+          <a-select-option value="1">未发布</a-select-option>
+          <a-select-option value="2">未开始</a-select-option>
+          <a-select-option value="3">进行中</a-select-option>
           <a-select-option value="2">已结束</a-select-option>
-          <a-select-option value="3">未发布</a-select-option>
         </a-select>
         开始时间:
         <a-date-picker v-model="queryParam.startDate" style="width: 100%" placeholder="请输入开始时间" valueFormat="YYYY-MM-DD HH:mm:ss" />
@@ -18,10 +19,10 @@
         培训方式:
         <a-select v-model="queryParam.trainWay" placeholder="请选择" default-value="null" style="width: 120px">
           <a-select-option value="null">全部</a-select-option>
-          <a-select-option value="1">培训</a-select-option>
-          <a-select-option value="2">考试</a-select-option>
-          <a-select-option value="3">培训-练习</a-select-option>
-          <a-select-option value="4">培训-练习-考试</a-select-option>
+          <a-select-option value="1">   培训   </a-select-option>
+          <a-select-option value="2">   考试   </a-select-option>
+          <a-select-option value="3">  培训/练习</a-select-option>
+          <a-select-option value="4">培训/练习/考试</a-select-option>
         </a-select>
 
         <a-button type="primary" icon="search" @click="$refs.table.refresh(true)">查询</a-button>
@@ -109,7 +110,7 @@ export default {
           title: '项目状态',
           dataIndex: 'status',
           customRender: (text, record, index) => {
-            //项目状态 1-未发布 2-未开始 3-进行中  4-已完成  5-已中止
+            //项目状态 1-未发布 2-未开始 3-进行中  4-已完成
             if (text == 1) {
               return '未发布'
             }
@@ -122,9 +123,6 @@ export default {
             if (text == 4) {
               return '已完成'
             }
-            if (text == 5) {
-              return '已中止'
-            }
           },
         },
         { title: '创建人员', key: 'createBy', dataIndex: 'createBy' },
@@ -132,7 +130,7 @@ export default {
         {
           title: '操作',
           width: 200,
-          align: 'right',
+          align: 'center',
           scopedSlots: { customRender: 'action' },
         },
       ],
diff --git a/src/views/project/terminalTrain/TerminalTrainDetail.vue b/src/views/project/terminalTrain/TerminalTrainDetail.vue
index a329aca..d33846a 100644
--- a/src/views/project/terminalTrain/TerminalTrainDetail.vue
+++ b/src/views/project/terminalTrain/TerminalTrainDetail.vue
@@ -8,10 +8,11 @@
       <a-descriptions-item label="培训时间"
         >{{ detailData.trainSdate }} 至 {{ detailData.trainEdate }}</a-descriptions-item
       >
+      <a-descriptions-item label="培训地点">{{ detailData.trainAddress }}</a-descriptions-item>
       <a-descriptions-item label="主持人">{{ detailData.host }}</a-descriptions-item>
       <a-descriptions-item label="会议人数">{{ detailData.personNum }}</a-descriptions-item>
       <a-descriptions-item label="学习内容">{{ detailData.learningContent }}</a-descriptions-item>
-      <a-descriptions-item label="联系人">{{ detailData.contact }}:{{ detailData.phone }}</a-descriptions-item>
+      <a-descriptions-item label="联系人">{{ detailData.contact }}({{ detailData.phone }})</a-descriptions-item>
       <a-descriptions-item label="备注">{{ detailData.remark }}</a-descriptions-item>
     </a-descriptions>
     <br />