From 5036229c4732ee919bc35d9ad5c2af923695c1b6 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 9 Apr 2020 16:51:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=AE=9A=E4=B9=89=E8=80=81?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lesson/home.vue              |   2 +-
 src/views/lesson/trainingRule/list.vue | 144 ++++++++++++++++++-------
 2 files changed, 106 insertions(+), 40 deletions(-)

diff --git a/src/views/lesson/home.vue b/src/views/lesson/home.vue
index 93600be5d..00e334f32 100644
--- a/src/views/lesson/home.vue
+++ b/src/views/lesson/home.vue
@@ -216,7 +216,7 @@ export default {
             }
         },
         operationManage() {
-            this.$router.push({path: `${UrlConfig.design.trainingRule}`, query: {mapId: this.$route.params.mapId, lineCode: this.$route.query.lineCode}});
+            this.$router.push({path: `${UrlConfig.design.trainingRule}`, query: {mapId: this.$route.params.mapId, lineCode: this.$route.query.lineCode, drawWay: this.$route.query.drawWay}});
         },
         revertLesson(index, row) {
             this.$confirm(this.$t('tip.cancelCoursePublicationHint'), this.$t('global.tips'), {
diff --git a/src/views/lesson/trainingRule/list.vue b/src/views/lesson/trainingRule/list.vue
index a43353005..2e44ef2f6 100644
--- a/src/views/lesson/trainingRule/list.vue
+++ b/src/views/lesson/trainingRule/list.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height: 100%; overflow-y: auto;">
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 98%;margin-left:1%;margin-top:20px;"  />
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 98%;margin-left:1%;margin-top:20px;" />
     <training-edit ref="create" type="ADD" @reloadTable="reloadTable" />
     <training-edit ref="edit" type="EDIT" @reloadTable="reloadTable" />
     <add-batch ref="addBatch" @reloadTable="reloadTable" />
@@ -23,6 +23,9 @@ import TrainingEdit from './addEdit';
 import AddBatch from './addBatch';
 import SaveAs from './saveAs.vue';
 import { UrlConfig } from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import ConstConfig from '@/scripts/ConstConfig';
+import Cookies from 'js-cookie';
 
 export default {
     name: 'TrainingRule',
@@ -97,7 +100,7 @@ export default {
                             return this.$convertField(
                                 row.operateType,
                                 this.trainingOperateTypeMap[row.trainingType],
-                                ['code', 'name']
+                                ['value', 'label']
                             );
                         },
                         tagType: row => {
@@ -159,31 +162,106 @@ export default {
     },
     methods: {
         init() {
-            this.trainingOperateTypeMap = {};
-            this.$Dictionary.stationControl().then(list => {
-                this.trainingOperateTypeMap['01'] = list; // 控制权实训
-            });
-            this.$Dictionary.signalOperation().then(list => {
-                this.trainingOperateTypeMap['02'] = list; // 信号机实训
-            });
-            this.$Dictionary.switchOperation().then(list => {
-                this.trainingOperateTypeMap['03'] = list; // 道岔实训
-            });
-            this.$Dictionary.sectionOperation().then(list => {
-                this.trainingOperateTypeMap['04'] = list; // 区段实训
-            });
-            this.$Dictionary.stationStandOperation().then(list => {
-                this.trainingOperateTypeMap['05'] = list; // 站台实训
-            });
-            this.$Dictionary.trainPlanOperation().then(list => {
-                this.trainingOperateTypeMap['06'] = list; // 行车计划实训
-            });
-            this.$Dictionary.trainOperation().then(list => {
-                this.trainingOperateTypeMap['07'] = list; // 列车实训
-            });
-            this.$Dictionary.limitOperation().then(list => {
-                this.trainingOperateTypeMap['08'] = list; // 限速实训
-            });
+            if (this.$route.query.drawWay + '' === 'true') {
+                this.trainingOperateTypeMap = {
+                    Switch: [],
+                    Section: [],
+                    Signal: [],
+                    Stand: [],
+                    Station: [],
+                    ControlConvertMenu: [],
+                    TrainWindow: []
+                };
+                let val;
+                for ( val in CMD['Switch']) {
+                    this.trainingOperateTypeMap['Switch'].push(CMD['Switch'][val]);
+                }
+                for ( val in CMD['Section']) {
+                    this.trainingOperateTypeMap['Section'].push(CMD['Section'][val]);
+                }
+                for ( val in CMD['Signal']) {
+                    this.trainingOperateTypeMap['Signal'].push(CMD['Signal'][val]);
+                }
+                for ( val in CMD['Stand']) {
+                    this.trainingOperateTypeMap['Stand'].push(CMD['Stand'][val]);
+                }
+                for ( val in CMD['Station']) {
+                    this.trainingOperateTypeMap['Station'].push(CMD['Station'][val]);
+                }
+                for ( val in CMD['ControlConvertMenu']) {
+                    this.trainingOperateTypeMap['ControlConvertMenu'].push(CMD['ControlConvertMenu'][val]);
+                }
+                for ( val in CMD['Train']) {
+                    this.trainingOperateTypeMap['TrainWindow'].push(CMD['Train'][val]);
+                }
+                const trainingDeviceTypeList = ConstConfig.ConstSelect.trainingDeviceType || {};
+                for (val in trainingDeviceTypeList) {
+                    this.trainingTypeList.push({code: val, name: Cookies.get('user_lang') == 'en' ? trainingDeviceTypeList[val].enlabel : trainingDeviceTypeList[val].label});
+                    this.queryForm.queryObject.trainingType.config.data.push({value: val, label: Cookies.get('user_lang') == 'en' ? trainingDeviceTypeList[val].enlabel : trainingDeviceTypeList[val].label});
+                }
+            } else {
+                this.trainingOperateTypeMap = {};
+                this.$Dictionary.stationControl().then(list => {
+                    this.trainingOperateTypeMap['01'] = []; // 控制权实训
+                    list.forEach(item => {
+                        this.trainingOperateTypeMap['01'].push({value: item.code, label: item.name});
+                    });
+                });
+                this.$Dictionary.signalOperation().then(list => {
+                    this.trainingOperateTypeMap['02'] = []; // 信号机实训
+                    list.forEach(item => {
+                        this.trainingOperateTypeMap['02'].push({value: item.code, label: item.name});
+                    });
+                });
+                this.$Dictionary.switchOperation().then(list => {
+                    this.trainingOperateTypeMap['03'] = []; // 道岔实训
+                    list.forEach(item => {
+                        this.trainingOperateTypeMap['03'].push({value: item.code, label: item.name});
+                    });
+                });
+                this.$Dictionary.sectionOperation().then(list => {
+                    this.trainingOperateTypeMap['04'] = []; // 区段实训
+                    list.forEach(item => {
+                        this.trainingOperateTypeMap['04'].push({value: item.code, label: item.name});
+                    });
+                });
+                this.$Dictionary.stationStandOperation().then(list => {
+                    this.trainingOperateTypeMap['05'] = []; // 站台实训
+                    list.forEach(item => {
+                        this.trainingOperateTypeMap['05'].push({value: item.code, label: item.name});
+                    });
+                });
+                this.$Dictionary.trainPlanOperation().then(list => {
+                    this.trainingOperateTypeMap['06'] = []; // 行车计划实训
+                    list.forEach(item => {
+                        this.trainingOperateTypeMap['06'].push({value: item.code, label: item.name});
+                    });
+                });
+                this.$Dictionary.trainOperation().then(list => {
+                    this.trainingOperateTypeMap['07'] = []; // 列车实训
+                    list.forEach(item => {
+                        this.trainingOperateTypeMap['07'].push({value: item.code, label: item.name});
+                    });
+                });
+                this.$Dictionary.limitOperation().then(list => {
+                    this.trainingOperateTypeMap['08'] = []; // 限速实训
+                    list.forEach(item => {
+                        this.trainingOperateTypeMap['08'].push({value: item.code, label: item.name});
+                    });
+                });
+                // 获取实训类型
+                this.trainingTypeList = [];
+                this.$Dictionary.trainingType().then(list => {
+                    this.trainingTypeList = list;
+                    list.forEach(elem => {
+                        this.queryForm.queryObject.trainingType.config.data.push({
+                            value: elem.code,
+                            label: elem.name
+                        });
+                    });
+                });
+            }
+
             this.placeholderMap = {};
             getPlaceholderList({ trainingType: '' }).then(res => {
                 res.data.forEach(item => {
@@ -194,18 +272,6 @@ export default {
                 });
             });
 
-            // 获取实训类型
-            this.trainingTypeList = [];
-            this.$Dictionary.trainingType().then(list => {
-                this.trainingTypeList = list;
-                list.forEach(elem => {
-                    this.queryForm.queryObject.trainingType.config.data.push({
-                        value: elem.code,
-                        label: elem.name
-                    });
-                });
-            });
-
             this.reloadTable();
         },
         repliceName(fieldValue, enumList) {