From 4217b149df56372cfb7acd424bd3781f7817b274 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 28 Sep 2022 16:57:35 +0800
Subject: [PATCH 1/8] =?UTF-8?q?ISCS=E9=97=B8=E6=9C=BA=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/iscs/iscs.js                              | 35 +++++++++++++++++--
 src/utils/stomp.js                            |  5 ++-
 .../stationConfig/ticketOrEntrance/index.vue  | 27 +++++++++++++-
 3 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/src/iscs/iscs.js b/src/iscs/iscs.js
index d6adbfee3..4b5fa2b43 100644
--- a/src/iscs/iscs.js
+++ b/src/iscs/iscs.js
@@ -299,14 +299,43 @@ class Iscs {
                         this.$painter.update(this.iscsDevice[psdCode]);
                     }
                 });
-            } else if (elem.deviceType === 'men') {
+            } else if (elem.deviceType === 'GATE') {
                 const checkArrowDoubleCodeList = ['IscsPicture_2', 'IscsPicture_8', 'IscsPicture_27', 'IscsPicture_33'];
                 const checkArrowLeftCodeList = ['IscsPicture_3', 'IscsPicture_4', 'IscsPicture_5', 'IscsPicture_6', 'IscsPicture_7', 'IscsPicture_28', 'IscsPicture_29',
                     'IscsPicture_30', 'IscsPicture_31', 'IscsPicture_34', 'IscsPicture_35', 'IscsPicture_36', 'IscsPicture_37'];
                 const checkArrowRightCodeList = ['IscsPicture_10', 'IscsPicture_11', 'IscsPicture_12', 'IscsPicture_13', 'IscsPicture_14'];
+
                 [...checkArrowDoubleCodeList, ...checkArrowLeftCodeList, ...checkArrowRightCodeList].forEach(checkCode => {
-                    this.iscsDevice[checkCode].model.picture = elem.picture;
-                    this.$painter.update(this.iscsDevice[checkCode]);
+                    let picture = '';
+                    if (elem.status === 1) {
+                        if (checkArrowDoubleCodeList.includes(checkCode)) {
+                            picture = 'checkArrowDoubleLv';
+                        } else if (checkArrowLeftCodeList.includes(checkCode)) {
+                            picture = 'checkArrowLeftLv';
+                        } else if (checkArrowRightCodeList.includes(checkCode)) {
+                            picture = 'checkArrowRightLv';
+                        }
+                    } else if (elem.status === 0) {
+                        if (checkArrowDoubleCodeList.includes(checkCode)) {
+                            picture = 'checkArrowDoubleHong';
+                        } else if (checkArrowLeftCodeList.includes(checkCode)) {
+                            picture = 'checkArrowLeftHong';
+                        } else if (checkArrowRightCodeList.includes(checkCode)) {
+                            picture = 'checkArrowRightHong';
+                        }
+                    } else if (elem.status === -1) {
+                        if (checkArrowDoubleCodeList.includes(checkCode)) {
+                            picture = 'checkArrowDouble';
+                        } else if (checkArrowLeftCodeList.includes(checkCode)) {
+                            picture = 'checkArrowLeft';
+                        } else if (checkArrowRightCodeList.includes(checkCode)) {
+                            picture = 'checkArrowRight';
+                        }
+                    }
+                    if (picture) {
+                        this.iscsDevice[checkCode].model.picture = picture;
+                        this.$painter.update(this.iscsDevice[checkCode]);
+                    }
                 });
             } else {
                 const oDevice = this.iscsDevice[code];
diff --git a/src/utils/stomp.js b/src/utils/stomp.js
index ba80b426f..5b4f5ec3f 100644
--- a/src/utils/stomp.js
+++ b/src/utils/stomp.js
@@ -31,6 +31,9 @@ export function getTopic(type, group, param) {
     case 'ISCSPIS':
         topic = `/queue/simulation/${group}/iscs/pis`;
         break;
+    case 'ISCSGATE':
+        topic = `/queue/simulation/${group}/iscs/gate/${param.stationCode}`;
+        break;
     case 'PIS_STAND':
         topic = `/queue/simulation/${group}/standPis/${param.standCode}`;
         break;
@@ -75,7 +78,7 @@ function callback(Response) {
             store.dispatch('socket/setSimulationTimeSync', Number.parseInt(Response.body));
         } else if (Response.headers.destination.includes('state')) {
             store.dispatch('socket/handleSimulationState', Number.parseInt(Response.body));
-        } else if (Response.headers.destination.includes('iscs/psd')) {
+        } else if (Response.headers.destination.includes('iscs/psd') || Response.headers.destination.includes('iscs/gate')) {
             store.dispatch('socket/handleIscsState', JSON.parse(Response.body));
         } else if (Response.headers.destination.includes('iscs/pa')) {
             store.dispatch('socket/handleIscsPaState', JSON.parse(Response.body));
diff --git a/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue b/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
index 0e0a5ddd9..4555edfe8 100644
--- a/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
@@ -11,6 +11,8 @@
 <script>
 import iscsSystem from '../canvas/iscsCanvas';
 import {getIscsData} from '@/api/iscs';
+import { creatSubscribe, clearSubscribe, getTopic } from '@/utils/stomp';
+import { getToken } from '@/utils/auth';
 export default {
     name:'TicketOrEntrance',
     components:{
@@ -23,7 +25,8 @@ export default {
             loading:false,
             width:window.innerWidth,
             scaleRate:window.innerWidth / 2200,
-            height: 1000
+            height: 1000,
+            flag: false
         };
     },
     computed:{
@@ -41,6 +44,12 @@ export default {
         $route() {
             this.mode = this.$route.params.mode;
             this.getInitData();
+        },
+        '$route.query.stationId': function (val, oldVal) {
+            if (this.flag && this.mode == 'autoTicket') {
+                this.clearSubscribe(oldVal);
+                this.subscribe(val);
+            }
         }
     },
     created() {
@@ -49,6 +58,9 @@ export default {
     mounted() {
         this.getInitData();
     },
+    beforeDestroy() {
+        this.clearSubscribe(this.$route.query.stationId);
+    },
     methods:{
         getInitData() {
             const params = {
@@ -84,10 +96,23 @@ export default {
                     const data = JSON.parse(resp.data.graphData);
                     this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
                     document.querySelector('.fasIndex').scrollTop = 0;
+                    if (this.mode == 'autoTicket') {
+                        this.subscribe(this.$route.query.stationId);
+                        this.flag = true;
+                    }
                 } else {
                     this.loading = false;
                 }
             });
+        },
+        subscribe(stationCode) {
+            this.clearSubscribe();
+            const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
+            creatSubscribe(getTopic('ISCSGATE', this.$route.query.group, {stationCode} ), header);
+            this.$store.dispatch('app/animationsClose');
+        },
+        clearSubscribe(stationCode) {
+            clearSubscribe(getTopic('ISCSGATE', this.$route.query.group, {stationCode}));
         }
     }
 };

From 9f792f26674f0d48059d18d49e78b8208cab945e Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 28 Sep 2022 17:08:29 +0800
Subject: [PATCH 2/8] =?UTF-8?q?iscs=E9=97=B8=E6=9C=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stationConfig/ticketOrEntrance/index.vue         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue b/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
index 4555edfe8..8371db9e7 100644
--- a/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
@@ -44,13 +44,13 @@ export default {
         $route() {
             this.mode = this.$route.params.mode;
             this.getInitData();
-        },
-        '$route.query.stationId': function (val, oldVal) {
-            if (this.flag && this.mode == 'autoTicket') {
-                this.clearSubscribe(oldVal);
-                this.subscribe(val);
-            }
         }
+        // '$route.query.stationId': function (val, oldVal) {
+        //     if (this.flag && this.mode == 'autoTicket') {
+        //         this.clearSubscribe(oldVal);
+        //         this.subscribe(val);
+        //     }
+        // }
     },
     created() {
         this.mode = this.$route.params.mode;

From e2b51b6737acc5e9f416b5f65ebad83ad211c4d5 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Wed, 28 Sep 2022 17:38:30 +0800
Subject: [PATCH 3/8] =?UTF-8?q?iscs=E9=97=B8=E6=9C=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stationConfig/ticketOrEntrance/index.vue         | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue b/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
index 8371db9e7..510918ec3 100644
--- a/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
@@ -44,13 +44,12 @@ export default {
         $route() {
             this.mode = this.$route.params.mode;
             this.getInitData();
+        },
+        '$route.query.stationId': function (val, oldVal) {
+            if (this.flag && this.mode == 'autoTicket') {
+                this.clearSubscribe(oldVal);
+            }
         }
-        // '$route.query.stationId': function (val, oldVal) {
-        //     if (this.flag && this.mode == 'autoTicket') {
-        //         this.clearSubscribe(oldVal);
-        //         this.subscribe(val);
-        //     }
-        // }
     },
     created() {
         this.mode = this.$route.params.mode;
@@ -106,7 +105,6 @@ export default {
             });
         },
         subscribe(stationCode) {
-            this.clearSubscribe();
             const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
             creatSubscribe(getTopic('ISCSGATE', this.$route.query.group, {stationCode} ), header);
             this.$store.dispatch('app/animationsClose');

From 1f8bb3c80b1f796b2095dcdf5bb10321d0dcb759 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 29 Sep 2022 15:54:18 +0800
Subject: [PATCH 4/8] =?UTF-8?q?iscs=20=E9=97=B8=E6=9C=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/iscs.js                     | 16 ++++++++++-
 .../stationConfig/dialog/malfunction.vue      | 23 +++++++++++++---
 .../stationConfig/ticketOrEntrance/index.vue  | 27 ++++---------------
 src/views/iscs/iscsSystem/stationNav.vue      | 14 ++++++----
 4 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/src/store/modules/iscs.js b/src/store/modules/iscs.js
index 2ad62748f..e9a954abc 100644
--- a/src/store/modules/iscs.js
+++ b/src/store/modules/iscs.js
@@ -14,7 +14,9 @@ const iscs = {
         closeMusicNum: 0, // 关闭音乐标识
         faultList: [], // 故障 元素状态
         incidentList: [], // 事件列表
-        alarmList: [] // 报警列表
+        alarmList: [], // 报警列表
+        gateFaultList: [], // 闸机故障
+        gateFaultCount: 0
     },
 
     getters: {
@@ -184,6 +186,15 @@ const iscs = {
         },
         updateIscsState: (state, deviceStatus) => {
             Vue.prototype.$iscs && Vue.prototype.$iscs.update(deviceStatus);
+        },
+        handlerGateFaultList: (state, data) => {
+            if (data.type === 'SET') {
+                state.gateFaultList.push(data.stationCode);
+            } else if (data.type === 'CANCEL') {
+                const index = state.gateFaultList.findIndex(item => item === data.stationCode);
+                state.gateFaultList.splice(index, 1);
+            }
+            state.gateFaultCount++;
         }
     },
 
@@ -224,6 +235,9 @@ const iscs = {
         },
         setDelIncidentList: ( { commit }) => {
             commit('setDelIncidentList');
+        },
+        handlerGateFaultList: ({ commit }, data) => {
+            commit('handlerGateFaultList', data);
         }
     }
 };
diff --git a/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue b/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue
index 7f764c25c..e8a153d94 100644
--- a/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/dialog/malfunction.vue
@@ -3,7 +3,7 @@
     <el-dialog
       v-dialogDrag
       class="iscs_fuzhou-01__systerm route-detail"
-      title="故障设置"
+      :title="title"
       :visible.sync="show"
       width="300px"
       :before-close="doClose"
@@ -60,12 +60,14 @@ export default {
             options: [
                 { label: '104A断路器故障', value: 'group_2' },
                 { label: '104B断路器故障', value: 'group_52' },
-                { label: '框架电流保护故障', value: 'frame_group' }
+                { label: '框架电流保护故障', value: 'frame_group' },
+                { label: '闸机故障', value: 'gate_fault' }
             ],
             list: {
                 valve: ['控分', '控合']
             },
-            farmed: ''
+            farmed: '',
+            type: ''
         };
     },
     computed: {
@@ -74,10 +76,17 @@ export default {
         ]),
         show() {
             return this.dialogShow;
+        },
+        title() {
+            return this.type === 'CANCEL' ? '故障取消' : '故障设置';
         }
     },
     methods: {
-        doShow() {
+        doShow(type) {
+            this.type = type;
+            if (type === 'CANCEL') {
+                this.options = [{ label: '闸机故障', value: 'gate_fault' }];
+            }
             this.dialogShow = true;
             this.elemList = [];
         },
@@ -91,6 +100,12 @@ export default {
                     this.farmed = '';
                     if (this.formModel.value == 'frame_group') {
                         this.setMalfunction();
+                    } else if (this.formModel.value === 'gate_fault') {
+                        if (this.$route.query.stationId && this.$route.params.mode === 'autoTicket') {
+                            this.$store.dispatch('iscs/handlerGateFaultList', { type: this.type, stationCode: this.$route.query.stationId });
+                        } else {
+                            this.$message.error('请在车站自动售检票系统中设置或取消故障！');
+                        }
                     } else {
                         this.setModelMalfunction(this.$iscs.iscsDevice[this.formModel.value].model);
                     }
diff --git a/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue b/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
index 510918ec3..f21e20670 100644
--- a/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/ticketOrEntrance/index.vue
@@ -11,8 +11,6 @@
 <script>
 import iscsSystem from '../canvas/iscsCanvas';
 import {getIscsData} from '@/api/iscs';
-import { creatSubscribe, clearSubscribe, getTopic } from '@/utils/stomp';
-import { getToken } from '@/utils/auth';
 export default {
     name:'TicketOrEntrance',
     components:{
@@ -25,8 +23,7 @@ export default {
             loading:false,
             width:window.innerWidth,
             scaleRate:window.innerWidth / 2200,
-            height: 1000,
-            flag: false
+            height: 1000
         };
     },
     computed:{
@@ -45,10 +42,8 @@ export default {
             this.mode = this.$route.params.mode;
             this.getInitData();
         },
-        '$route.query.stationId': function (val, oldVal) {
-            if (this.flag && this.mode == 'autoTicket') {
-                this.clearSubscribe(oldVal);
-            }
+        '$store.state.iscs.gateFaultCount': function(val) {
+            this.$store.dispatch('iscs/updateIscsState', [{deviceType: 'GATE', status: this.$store.state.iscs.gateFaultList.includes(this.stationId) ? 0 : 1}]);
         }
     },
     created() {
@@ -57,9 +52,6 @@ export default {
     mounted() {
         this.getInitData();
     },
-    beforeDestroy() {
-        this.clearSubscribe(this.$route.query.stationId);
-    },
     methods:{
         getInitData() {
             const params = {
@@ -95,22 +87,13 @@ export default {
                     const data = JSON.parse(resp.data.graphData);
                     this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
                     document.querySelector('.fasIndex').scrollTop = 0;
-                    if (this.mode == 'autoTicket') {
-                        this.subscribe(this.$route.query.stationId);
-                        this.flag = true;
+                    if (this.mode === 'autoTicket') {
+                        this.$store.dispatch('iscs/updateIscsState', [{deviceType: 'GATE', status: this.$store.state.iscs.gateFaultList.includes(this.stationId) ? 0 : 1}]);
                     }
                 } else {
                     this.loading = false;
                 }
             });
-        },
-        subscribe(stationCode) {
-            const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
-            creatSubscribe(getTopic('ISCSGATE', this.$route.query.group, {stationCode} ), header);
-            this.$store.dispatch('app/animationsClose');
-        },
-        clearSubscribe(stationCode) {
-            clearSubscribe(getTopic('ISCSGATE', this.$route.query.group, {stationCode}));
         }
     }
 };
diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue
index 88ea5bb97..d56187e81 100644
--- a/src/views/iscs/iscsSystem/stationNav.vue
+++ b/src/views/iscs/iscsSystem/stationNav.vue
@@ -4,15 +4,15 @@
       <div class="station-nav">
         <div class="stationList">
           <div class="station-line" />
-            <div v-for="(item, index) in stationList" :key="index" class="station-box-out">
-              <div class="station-box">
+          <div v-for="(item, index) in stationList" :key="index" class="station-box-out">
+            <div class="station-box">
               <div class="leftRect" />
               <div class="rightRect" />
               <div class="station-list-box" :class="{'active': selectStation == item.id,'currentStation':tractionList.includes(item.name)}" @click="changeStation(item.id)" />
-              </div>
-              <div class="station-name" :class="index==0?'station-name-first':index%2==1?'station-name-up':'station-name-down'">{{ item.name }}</div>
             </div>
+            <div class="station-name" :class="index==0?'station-name-first':index%2==1?'station-name-up':'station-name-down'">{{ item.name }}</div>
           </div>
+        </div>
         <div class="rightButtonGroup">
           <div class="rightButtonGroupL">
             <div class="controlCenter">
@@ -64,6 +64,7 @@
         <!-- <span v-show="!alarmInfo" class="point_box" /> -->
       </div>
       <div class="bottom-back" @click="getIncidentList">事件</div>
+      <div class="bottom-back" @click="cancelMalfunction">故障取消</div>
       <div class="bottom-back" @click="handleMalfunction">故障设置</div>
     </div>
     <alarm-config ref="alarmConfig" />
@@ -460,7 +461,10 @@ export default {
         },
         // 设置故障
         handleMalfunction() {
-            this.$refs.malfunction.doShow();
+            this.$refs.malfunction.doShow('SET');
+        },
+        cancelMalfunction() {
+            this.$refs.malfunction.doShow('CANCEL');
         },
         selectChildren(type, isReplace = false) { // 选择菜单
             let stationName = '';

From ace0f3d0aed70d0e4979540d1bc2e015f401ad33 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 30 Sep 2022 15:58:50 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=A4=A7=E9=93=81=E5=AE=9E=E8=AE=AD?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/datie_02/menus/menuButton.vue       |   4 +-
 src/jmapNew/theme/datie_02/operationConfig.js | 858 +-----------------
 src/store/modules/training.js                 |   1 -
 3 files changed, 6 insertions(+), 857 deletions(-)

diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue
index be6de9955..a82f7f385 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue
@@ -581,7 +581,7 @@ export default {
             }
         },
         // 总取消
-        handelTotalCancel(model) {
+        handleTotalCancel(model) {
             const operate = {
                 over: true,
                 code: model.code,
@@ -778,7 +778,7 @@ export default {
                 this.handleGuideLock(model);
             } else if (buttonOperation && this.commandTypeList.includes(model._type)) {
                 if (buttonOperation === this.MixinCommand.totalCancel.button.operation) {
-                    this.handelTotalCancel(model);
+                    this.handleTotalCancel(model);
                 } else if (buttonOperation === this.Signal.humanTrainRoute.button.operation) {
                     this.handleTotalHumanSolution(model);
                 } else if (switchOperation.includes(buttonOperation)) {
diff --git a/src/jmapNew/theme/datie_02/operationConfig.js b/src/jmapNew/theme/datie_02/operationConfig.js
index 1a6e6e84d..c242db8b5 100644
--- a/src/jmapNew/theme/datie_02/operationConfig.js
+++ b/src/jmapNew/theme/datie_02/operationConfig.js
@@ -1,14 +1,3 @@
-// SECTION 区段
-// SWITCH 道岔
-// SIGNAL 信号机
-// START_SIGNAL 进路起始信号机
-// END_SIGNAL   进路终端信号机
-
-// STATION 车站
-// STAND 站台
-// ROUTE 进路
-// CYCLE 自动折返
-
 // {id: "1", trainingType: "ControlConvertMenu", name: "车站名称"}
 // {id: "2", trainingType: "ControlConvertMenu", name: "车站控制模式编号"}
 // {id: "3", trainingType: "Signal", name: "进路名称"}
@@ -46,83 +35,6 @@
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 export default {
     list: [
-        // 控制模式
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL.value,
-            skinCode: '04',
-            trainingName: '请求站控({2})',
-            trainingRemark: '请求站控功能',
-            trainingType: 'ControlConvertMenu',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【站控】', codeType:'STATION', subType:'substation' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL.value,
-            skinCode: '04',
-            trainingName: '请求紧急站控({2})',
-            trainingRemark: '请求紧急站控功能',
-            trainingType: 'ControlConvertMenu',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【紧急站控】', codeType:'STATION', subType:'emergency' },
-                { deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL.value,
-            skinCode: '04',
-            trainingName: '请求中控({2})',
-            trainingRemark: '请求中控功能',
-            trainingType: 'ControlConvertMenu',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【中控】', codeType:'STATION', subType:'center' },
-                { deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.ControlConvertMenu.CMD_CM_INTERLOCK_CONTROL.value,
-            skinCode: '04',
-            trainingName: '请求联锁控({2})',
-            trainingRemark: '请求联锁控功能',
-            trainingType: 'ControlConvertMenu',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【联锁控】', codeType:'STATION', subType:'interconnected' },
-                { deviceType: '04', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        // 信号机列表
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_SET_ROUTE.value,
-            skinCode: '04',
-            trainingName: '办理进路({3} 进路)',
-            trainingRemark: '办理进路功能',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【办理进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
-                { deviceType: '04', orderNum: 3, operateCode: '3012', tip: '鼠标左键点击【执行】按钮' },
-                { deviceType: '04', orderNum: 4, operateCode: '301', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
         {
             maxDuration: 15,
             minDuration: 8,
@@ -133,54 +45,8 @@ export default {
             trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'START_SIGNAL' },
-                { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE.value,
-            skinCode: '04',
-            trainingName: '办理引导进路({3})',
-            trainingRemark: '进路办理信号引导',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【办理引导进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '308', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '3086', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
-                { deviceType: '04', orderNum: 4, operateCode: '3082', tip: '鼠标左键点击【执行】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE.value,
-            skinCode: '04',
-            trainingName: '引导进路({3})[进路已锁闭]',
-            trainingRemark: '进路办理信号引导',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '3080', tip: '鼠标左键点击【引导进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3080', tip: '鼠标左键点击【{5}】', codeType:'START_SIGNAL'}, // 进路编号值不正确
-                { deviceType: 'mbm', orderNum: 3, operateCode: '0011', tip: '输入密码123，点击【确定】按钮', codeType: 'START_SIGNAL' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE.value,
-            skinCode: '04',
-            trainingName: '取消进路({3} 进路)',
-            trainingRemark: '取消进路功能',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【取消进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'START_SIGNAL' },
+                { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' }
             ]
         },
         {
@@ -196,226 +62,6 @@ export default {
                 { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' },
                 { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
             ]
-        },
-		{
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE.value,
-            skinCode: '04',
-            trainingName: '取消引导({3})',
-            trainingRemark: '取消引导进路功能（总取消）',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE.value,
-            skinCode: '04',
-            trainingName: '总人解({3})',
-            trainingRemark: '总人解',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【总人解】' },
-				{ deviceType: '04', orderNum: 2, operateCode: '3050', tip: '输入密码123，点击【执行】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '305', tip: '鼠标左键点击【确定】按钮' },
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE.value,
-            skinCode: '04',
-            trainingName: '总人解({3})',
-            trainingRemark: '总人解',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '3050', tip: '鼠标左键点击【总人解】' },
-                { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '3050', tip: '鼠标左键点击【{5}】', val: '{6}', codeType:'SIGNAL' }
-            ]
-        },
-        {
-            maxDuration: 8,
-            minDuration: 5,
-            operateType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL.value,
-            skinCode: '04',
-            trainingName: '信号重开({5})',
-            trainingRemark: '信号重开功能',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' },
-                { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 8,
-            minDuration: 5,
-            operateType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL.value,
-            skinCode: '04',
-            trainingName: '信号重开({5})',
-            trainingRemark: '信号重开功能',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_BLOCK.value,
-            skinCode: '04',
-            trainingName: '信号封锁({5})',
-            trainingRemark: '信号封锁',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封锁】' },
-                { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_BLOCK.value,
-            skinCode: '04',
-            trainingName: '信号封锁({5})',
-            trainingRemark: '信号封锁功能',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2991', tip: '鼠标左键点击【封锁】' },
-                { deviceType: '04', orderNum: 1, operateCode: '2991', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_UNBLOCK.value,
-            skinCode: '04',
-            trainingName: '信号解封({5})',
-            trainingRemark: '信号解封',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3072', tip: '鼠标左键点击【确认】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '307', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_UNBLOCK.value,
-            skinCode: '04',
-            trainingName: '信号解封({5})',
-            trainingRemark: '信号解封功能',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2992', tip: '鼠标左键点击【解封】' },
-                { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING.value,
-            skinCode: '04',
-            trainingName: '进路收人工控({3})',
-            trainingRemark: '进路收人工控',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路收人工控】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
-                { deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING.value,
-            skinCode: '04',
-            trainingName: '人工控({5})',
-            trainingRemark: '人工控',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '3140', tip: '鼠标左键点击【人工控】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3140', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
-            ],
-            // 成都三号线  特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
-            config:{onlySignalOP:true}
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING.value,
-            skinCode: '04',
-            trainingName: '进路交自动控({3})',
-            trainingRemark: '进路交自动控',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交自动控】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
-                { deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING.value,
-            skinCode: '04',
-            trainingName: '自动控({5})',
-            trainingRemark: '自动控',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '3150', tip: '鼠标左键点击【自动控】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3150', tip: '鼠标左键点击【{5}】', codeType:'SIGNAL' }
-            ],
-            config:{onlySignalOP:true}
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType:CMD.Signal.CMD_SIGNAL_DETAIL.value,
-            skinCode: '04',
-            trainingName: '查询进路信息({5} 信号机)',
-            trainingRemark: '查询进路信息',
-            trainingType:'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【进路信息】' },
-                { deviceType: '04', orderNum: 2, operateCode: '316', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        // 道岔列表
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION.value, // 0312 新增定位字典
-            skinCode: '04',
-            trainingName: '单操到定位({7})',
-            trainingRemark: '单操到定位({15})',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '101', tip: '鼠标右键菜单选择【单操到定位】' },
-                { deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【确定】按钮' }
-            ]
         },
         {
             maxDuration: 15,
@@ -427,24 +73,10 @@ export default {
             trainingType: 'Switch',
             productTypes: ['01'],
             stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键点击【道岔定操】' },
+                { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键点击【总定位】' },
                 { deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
             ]
         },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION.value, // 0313 新增定位字典
-            skinCode: '04',
-            trainingName: '单操到反位({7})',
-            trainingRemark: '单操到反位({7})',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '102', tip: '鼠标右键菜单选择【单操到反位】' },
-                { deviceType: '02', orderNum: 2, operateCode: '102', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
         {
             maxDuration: 15,
             minDuration: 8,
@@ -455,491 +87,9 @@ export default {
             trainingType: 'Switch',
             productTypes: ['01'],
             stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '1020', tip: '鼠标左键点击【道岔反操】' },
+                { deviceType: '02', orderNum: 1, operateCode: '1020', tip: '鼠标左键点击【总反位】' },
                 { deviceType: '02', orderNum: 2, operateCode: '1020', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
             ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK.value,
-            skinCode: '04',
-            trainingName: '道岔单锁({7})',
-            trainingRemark: '道岔单锁功能',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK.value,
-            skinCode: '04',
-            trainingName: '道岔单锁({7})',
-            trainingRemark: '道岔单锁功能',
-            trainingType: 'Switch',
-            productTypes: ['01'], // 现地操作
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '1030', tip: '鼠标左键点击【道岔单锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '1030', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK.value,
-            skinCode: '04',
-            trainingName: '道岔解锁({7})',
-            trainingRemark: '道岔解锁功能',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔解锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '104', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK.value,
-            skinCode: '04',
-            trainingName: '道岔解锁({7})',
-            trainingRemark: '道岔解锁功能',
-            trainingType: 'Switch',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键点击【道岔解锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '02', orderNum: 3, operateCode: '1040', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_BLOCK.value,
-            skinCode: '04',
-            trainingName: '道岔封锁({7})',
-            trainingRemark: '道岔封锁功能',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '1051', tip: '鼠标左键点击【确定】按钮' },
-                { deviceType: '02', orderNum: 3, operateCode: '105', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_BLOCK.value,
-            skinCode: '04',
-            trainingName: '道岔封锁({7})',
-            trainingRemark: '道岔封锁功能',
-            trainingType: 'Switch',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '2991', tip: '鼠标左键点击【封锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '2991', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_UNBLOCK.value,
-            skinCode: '04',
-            trainingName: '道岔解封({7})',
-            trainingRemark: '道岔解封功能',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔解封】' },
-                { deviceType: '02', orderNum: 2, operateCode: '1062', tip: '鼠标左键点击【确定】按钮' },
-                { deviceType: '02', orderNum: 3, operateCode: '106', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Switch.CMD_SWITCH_UNBLOCK.value,
-            skinCode: '04',
-            trainingName: '道岔解封({7})',
-            trainingRemark: '道岔解封功能',
-            trainingType: 'Switch',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '2992', tip: '鼠标左键点击【解封】' },
-                { deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '02', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{7}】', codeType:'SWITCH' }
-            ]
-        },
-        {
-            maxDuration: 20,
-            minDuration: 10,
-            operateType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK.value,
-            skinCode: '04',
-            trainingName: '区故解({7})',
-            trainingRemark: '道岔区段故障解锁功能',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【区故解】' },
-                { deviceType: '02', orderNum: 2, operateCode: '1092', tip: '鼠标左键点击【确定】按钮' },
-                { deviceType: '02', orderNum: 3, operateCode: '109', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        // 区段列表
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Section.CMD_SECTION_FAULT_UNLOCK.value,
-            skinCode: '04',
-            trainingName: '区故解({8}{9})',
-            trainingRemark: '故障解锁功能',
-            trainingType: 'Section',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区故解】' },
-                { deviceType: '03', orderNum: 2, operateCode: '4023', tip: '鼠标左键点击【确定】按钮' },
-                { deviceType: '03', orderNum: 3, operateCode: '402', tip: '输入密码123，点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Section.CMD_SECTION_FAULT_UNLOCK.value,
-            skinCode: '04',
-            trainingName: '区故解({8}{9})',
-            trainingRemark: '故障解锁功能',
-            trainingType: 'Section',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '03', orderNum: 1, operateCode: '4020', tip: '鼠标左键点击【区故解】'},
-                { deviceType: '03', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '03', orderNum: 3, operateCode: '4020', tip: '鼠标左键点击【{8}{9}】', codeType:'SECTION' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Section.CMD_SECTION_DETAILS.value,
-            skinCode: '04',
-            trainingName: '属性({8}{9})',
-            trainingRemark: '区段详情({8}{9})',
-            trainingType: 'Section',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '03', orderNum: 1, operateCode: '410', tip: '鼠标右键菜单选择【属性】' },
-                { deviceType: '03', orderNum: 2, operateCode: '410', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        // 站台列表
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN.value,
-            skinCode: '04',
-            trainingName: '设置扣车({10}-{12}站台)',
-            trainingRemark: '设置扣车功能',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【设置扣车】' },
-                { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN.value,
-            skinCode: '04',
-            trainingName: '取消扣车({10}-{12}站台)',
-            trainingRemark: '设置取消扣车功能',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
-                { deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN.value,
-            skinCode: '04',
-            trainingName: '全线取消扣车',
-            trainingRemark: '设置取消扣车功能({12}全线)',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
-                { deviceType: '06', orderNum: 2, operateCode: 'com01', tip: '鼠标左键点击【{12}全线】按钮', val: 'true' },
-                { deviceType: '06', orderNum: 3, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_JUMP_STOP.value,
-            skinCode: '04',
-            trainingName: '设置跳停({10}-{12}站台)',
-            trainingRemark: '设置跳停功能',
-            trainingType: 'Stand',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】'},
-                { deviceType: '06', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【跳停】', codeType:'STAND', subType:'StopJumpLamp' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_JUMP_STOP.value,
-            skinCode: '04',
-            trainingName: '设置跳停({10}-{12}站台)',
-            trainingRemark: '设置跳停功能',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【跳停】' },
-                { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP.value,
-            skinCode: '04',
-            trainingName: '取消跳停({10}-{12}站台)',
-            trainingRemark: '设置取消跳停功能',
-            trainingType: 'Stand',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】'},
-                { deviceType: '06', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【取消跳停】', codeType:'STAND', subType:'CancelStopJumpLamp' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP.value,
-            skinCode: '04',
-            trainingName: '取消跳停({10}-{12}站台)',
-            trainingRemark: '设置取消跳停功能',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' },
-                { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_PARK_TIME.value,
-            skinCode: '04',
-            trainingName: '设置停站时间({10}-{12}站台)',
-            trainingRemark: '设置停站时间(自动, 一直有效)',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
-                { deviceType: '06', orderNum: 3, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_PARK_TIME.value,
-            skinCode: '04',
-            trainingName: '设置停站时间({10}-{12}站台)',
-            trainingRemark: '设置停站时间(人工, 20秒, 一直有效)',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
-                { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【人工】', val: '02' },
-                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
-                { deviceType: '06', orderNum: 4, operateCode: '5093', tip: '标左键点击，选择【一直有效】', val: '02' },
-                { deviceType: '06', orderNum: 5, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_PARK_TIME.value,
-            skinCode: '04',
-            trainingName: '设置停站时间({10}-{12}站台)',
-            trainingRemark: '设置停站时间(人工, 20秒, 一次有效)',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
-                { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【人工】', val: '02' },
-                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
-                { deviceType: '06', orderNum: 4, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_RUN_TIME.value,
-            skinCode: '04',
-            trainingName: '设置站间运行等级({10}-{12}站台)',
-            trainingRemark: '设置站间运行等级(自动, 一直有效)',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置站间运行等级】' },
-                { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_RUN_TIME.value,
-            skinCode: '04',
-            trainingName: '设置站间运行等级({10}-{12}站台)',
-            trainingRemark: '设置站间运行等级(人工, 常速, 一直有效)',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置站间运行等级】' },
-                { deviceType: '06', orderNum: 2, operateCode: '5106', tip: '鼠标左键点击，选择【人工】', val: '02' },
-                { deviceType: '06', orderNum: 3, operateCode: '5107', tip: '鼠标左键点击，取消选择【一直有效】', val: '02' },
-                { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Stand.CMD_STAND_SET_RUN_TIME.value,
-            skinCode: '04',
-            trainingName: '设置站间运行等级({10}-{12}站台)',
-            trainingRemark: '设置站间运行等级(人工, 常速, 一次有效)',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置站间运行等级】' },
-                { deviceType: '06', orderNum: 2, operateCode: '5106', tip: '鼠标左键点击，选择【人工】', val: '02' },
-                { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
-            ]
-        },
-        {
-            maxDuration: 8, // 自动生成实训失败
-            minDuration: 5,
-            operateType: CMD.Stand.CMD_STAND_VIEW_STATUS.value,
-            skinCode: '04',
-            trainingName: '显示站台信息({10}-{12}站台)',
-            trainingRemark: '查询站台状态功能',
-            trainingType: 'Stand',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【显示站台信息】' },
-                { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【退出】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO.value,
-            skinCode: '04',
-            trainingName: '设置自动进路({3})',
-            trainingRemark: '设置自动进路功能',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' }
-            ],
-            // 成都三号线  特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
-            config:{autoRouteBT:true}
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO.value,
-            skinCode: '04',
-            trainingName: '取消自动进路({3})',
-            trainingRemark: '取消自动进路功能',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' }
-            ],
-            // 成都三号线  特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
-            config:{autoRouteBT:true}
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK.value,
-            skinCode: '04',
-            trainingName: '设置自动折返({3})',
-            trainingRemark: '设置自动折返功能',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' }
-            ],
-            // 成都三号线  特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
-            config:{autoCycleBT:true}
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK.value,
-            skinCode: '04',
-            trainingName: '取消自动折返({3})',
-            trainingRemark: '取消自动折返功能',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' },
-                { deviceType: '04', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【{3}】', codeType:'BUTTON' }
-            ],
-            // 成都三号线  特殊配置 类似于哈尔滨线的 atp/联锁进路 配置
-            config:{autoCycleBT:true}
-        },
-        /** 引导总锁 */
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Station.CMD_STATION_SET_MASTER_GUIDE_LOCK.value,
-            skinCode: '04',
-            trainingName: '引导总锁({26})',
-            trainingRemark: '设置引导总锁',
-            trainingType: 'Station',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '609', tip: '鼠标左键点击【引导总锁】' },
-                { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '609', tip: '鼠标左键点击【{26}】', codeType:'BUTTON' }
-            ],
-            config:{guideTotalLockBT:true}
-        },
-        /** 取消引导总锁 */
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: CMD.Station.CMD_STATION_CANCEL_MASTER_GUIDE_LOCK.value,
-            skinCode: '04',
-            trainingName: '取消引导总锁({26})',
-            trainingRemark: '取消引导总锁',
-            trainingType: 'Station',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '609', tip: '鼠标左键点击【引导总锁】' },
-                { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
-                { deviceType: '04', orderNum: 3, operateCode: '609', tip: '鼠标左键点击【{26}】', codeType:'BUTTON' }
-            ],
-            config:{guideTotalLockBT:true}
         }
-        // totalGuideLock
-        //
     ]
 };
diff --git a/src/store/modules/training.js b/src/store/modules/training.js
index e9957519c..86c4e857b 100644
--- a/src/store/modules/training.js
+++ b/src/store/modules/training.js
@@ -183,7 +183,6 @@ const training = {
             state.operate = operate;
         },
         setInitTime: (state, initTime) => {
-            console.log(initTime)
             state.initTime = initTime;
         },
         setPrdType: (state, prdType) => {

From f9fe3ab6152164291f22ca22573c1be99c89a172 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Fri, 30 Sep 2022 17:26:53 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B0=83=E5=BA=A6?=
 =?UTF-8?q?=E5=8F=B0code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/disStation.js                         |   8 +
 .../dataRelation/disStationOperate/detail.vue | 146 ++++++++++++++++++
 .../dataRelation/disStationOperate/index.vue  |  27 +---
 .../dataRelation/disStationOperate/route.vue  |  51 +++---
 4 files changed, 183 insertions(+), 49 deletions(-)
 create mode 100644 src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue

diff --git a/src/api/disStation.js b/src/api/disStation.js
index 74a952d09..06e66e04a 100644
--- a/src/api/disStation.js
+++ b/src/api/disStation.js
@@ -23,3 +23,11 @@ export function deleteDisStation(mapId, code) {
         method: 'delete'
     });
 }
+// 获取调度台逻辑数据
+export function getDisStationList(mapId, data) {
+    return request({
+        url: `/api/draftMap/${mapId}/disStation/page`,
+        method: 'post',
+        data
+    });
+}
diff --git a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue
new file mode 100644
index 000000000..bdf2a3655
--- /dev/null
+++ b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue
@@ -0,0 +1,146 @@
+<template>
+  <el-dialog v-dialogDrag :title="$t('map.routePreview')" :visible.sync="show" width="60%" :before-do-close="doClose" append-to-body>
+    <div>
+      <QueryListPage
+        ref="queryListPage"
+        style="margin-top: 10px;"
+        :pager-config="pagerConfig"
+        :query-form="queryForm"
+        :query-list="queryList"
+      />
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { getDisStationList, deleteDisStation } from '@/api/disStation.js';
+import { mapGetters } from 'vuex';
+export default {
+    name:'BigRouteDetail',
+    props: {
+        mapInfo: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            show:false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                show:false
+            },
+            queryList: {
+                query: this.queryFunction,
+                height:'500px',
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '调度台名称',
+                        width: 150,
+                        prop: 'name'
+                    },
+                    {
+                        title: 'code',
+                        width: 150,
+                        prop: 'code'
+                    },
+                    {
+                        title: '下辖车站',
+                        prop: 'stationList',
+                        type: 'tag',
+                        columnValue: (row) => { return this.getNameList(row.stationList); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '200',
+                        buttons: [
+                            {
+                                name: '删除',
+                                handleClick: this.deleteRoute,
+                                type: 'danger'
+                            },
+                            {
+                                name: '编辑',
+                                handleClick: this.editRouteFn,
+                                type: 'primary'
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    mounted() {
+
+    },
+    methods:{
+        doShow() {
+            this.show = true;
+            this.reloadData();
+        },
+        doClose() {
+            this.show = false;
+        },
+        reloadData() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        },
+        queryFunction(params) {
+            if (this.mapInfo && this.mapInfo.id) {
+                return getDisStationList(this.mapInfo.id, params);
+            }
+        },
+        getNameList(codeList) {
+            const nameList = [];
+            codeList && codeList.forEach(item => {
+                nameList.push(this.formatName(item));
+            });
+            return nameList;
+        },
+        formatName(code) {
+            let name = '';
+            const device = this.$store.getters['map/getDeviceByCode'](code);
+            if (device) {
+                name = device.name || device.code;
+            }
+            return name;
+        },
+        editRouteFn(index, row) {
+            this.$emit('setEditDate', JSON.parse(JSON.stringify(row)));
+            this.doClose();
+        },
+        deleteRoute(index, row) {
+            this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
+                confirmButtonText: this.$t('tip.confirm'),
+                cancelButtonText: this.$t('tip.cancel'),
+                type: 'warning'
+            }).then(() => {
+                deleteDisStation(this.mapInfo.id, row.code).then(res => {
+                    this.$message.success('删除成功！');
+                    this.reloadData();
+                    this.$emit('refresh');
+                }).catch(err => {
+                    console.log('删除失败！', err);
+                    this.$message.error('删除失败！');
+                });
+            }).catch(() => {
+                this.$message.info(this.$t('tip.cancelledDelete'));
+            });
+        }
+    }
+};
+</script>
diff --git a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/index.vue b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/index.vue
index 807c66751..9eb98999f 100644
--- a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/index.vue
@@ -4,18 +4,20 @@
       ref="routeEdit"
       :selected="selected"
       :map-info="mapInfo"
-      :route-data="routeData"
       @setCenter="setCenter"
     />
+    <DisStationDetail ref="routeDetail" :map-info="mapInfo" @refresh="refresh" @setEditDate="setEditDate" />
   </div>
 </template>
 <script>
 import DisStationDraft from './route';
+import DisStationDetail from './detail';
 
 export default {
     name: 'DisStationOperate',
     components: {
-        DisStationDraft
+        DisStationDraft,
+        DisStationDetail
     },
     props: {
         mapInfo: {
@@ -33,21 +35,14 @@ export default {
     },
     data() {
         return {
-            enabledTab: 'Route',
-            routeData: null,
             routeList:[]
         };
     },
-    created() {
-        //         filterRouteList() {
-        //     return this.routeList.filter(route=>{ return !route.multiRoute; });
-        // }            'routeList',
-    },
+    created() {},
     methods: {
-        setEditRouteDate(data) {
-            this.routeData = data;
+        setEditDate(data) {
             this.$nextTick(() => {
-                this.$refs.routeEdit.setEditData();
+                this.$refs.routeEdit.initPage(data);
             });
         },
         clickEvent(e, model) {
@@ -67,12 +62,6 @@ export default {
                 });
             }
         },
-        routeSelected: function (data) {
-            this.routeData = data;
-            if (this.$refs && this.$refs.routeEdit) {
-                this.$refs.routeEdit.isModify = data.id;
-            }
-        },
         previewRouteEvent: function () {
             if (this.$refs && this.$refs.routeDetail) {
                 this.$refs.routeDetail.doShow();
@@ -83,7 +72,7 @@ export default {
         },
         createRouteEvent: function () {
             if (this.$refs && this.$refs.routeEdit) {
-                this.$refs.routeEdit.clear();
+                this.$refs.routeEdit.initPage();
             }
         },
         setSelected(selected) {
diff --git a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/route.vue
index af51ab882..02ff686b8 100644
--- a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/route.vue
@@ -2,7 +2,7 @@
   <div class="BigRouteInfo">
     <el-form ref="form" :model="editModel" :rules="rules" label-width="140px" size="mini" class="bigDefinition">
       <el-form-item label="编号:">
-        <el-select v-model="editModel.code" clearable filterable :placeholder="$t('map.pleaseSelect')" @change="deviceChange">
+        <el-select v-model="editModel.code" disabled :placeholder="$t('map.pleaseSelect')">
           <el-option
             v-for="item in disStationList"
             :key="item.code"
@@ -27,9 +27,8 @@
     </el-form>
     <div class="button_box">
       <el-button-group class="button-group">
-        <el-button :disabled="!!editModel.code" type="success" size="small" @click="create">{{ $t('map.create') }}</el-button>
-        <el-button :disabled="!editModel.code" type="primary" size="small" @click="edit">{{ $t('map.updateObj') }}</el-button>
-        <el-button :disabled="!editModel.code" type="danger" size="small" @click="deleteObj">{{ $t('map.deleteObj') }}</el-button>
+        <el-button v-if="editModel.code" type="primary" size="small" @click="edit">更新</el-button>
+        <el-button v-else type="success" size="small" @click="create">保存</el-button>
       </el-button-group>
     </div>
 
@@ -39,7 +38,7 @@
 import { mapGetters } from 'vuex';
 import { getUID } from '@/jmapNew/utils/Uid';
 import { deepAssign } from '@/utils/index';
-import { createDisStation, updateDisStation, deleteDisStation } from '@/api/disStation.js';
+import { createDisStation, updateDisStation } from '@/api/disStation.js';
 
 export default {
     name:'DisStationDraft',
@@ -49,6 +48,12 @@ export default {
             default() {
                 return null;
             }
+        },
+        mapInfo: {
+            type: Object,
+            default() {
+                return null;
+            }
         }
     },
     data() {
@@ -83,17 +88,19 @@ export default {
             return rules;
         }
     },
-    mounted() {},
+    mounted() {
+        this.initPage();
+    },
     methods: {
-        deviceChange(code) {
-            let obj = {};
-            const findObj = this.disStationList.find(item => {
-                return item.code == code;
-            });
-            if (findObj) {
-                obj = deepAssign({}, findObj);
+        initPage(row) {
+            if (this.mapInfo) {
+                if (row) {
+                    this.editModel = Object.assign({}, row);
+                } else {
+                    this.$refs.form && this.$refs.form.resetFields();
+                    this.editModel.code = '';
+                }
             }
-            this.editModel = deepAssign(this.editModel, obj);
         },
         edit() {
             this.$refs.form.validate((valid) => {
@@ -109,22 +116,6 @@ export default {
                 }
             });
         },
-        deleteObj() {
-            this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
-                confirmButtonText: this.$t('tip.confirm'),
-                cancelButtonText: this.$t('tip.cancel'),
-                type: 'warning'
-            }).then(() => {
-                deleteDisStation(this.mapId, this.editModel.code).then(res => {
-                    this.$refs.form && this.$refs.form.resetFields();
-                }).catch(err => {
-                    console.log('删除失败！', err);
-                    this.$message.error('删除失败！');
-                });
-            }).catch(() => {
-                this.$message.info(this.$t('tip.cancelledDelete'));
-            });
-        },
         create() {
             this.$refs.form.validate((valid) => {
                 if (valid) {

From 79e27bf5dce53d9da88888430a8cb536ba1e1375 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 30 Sep 2022 17:34:23 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E7=94=BB=E9=9D=A2?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=88=87=E6=8D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/baseUrl.js                         |  4 +-
 src/views/newMap/displayNew/exam/index.vue   | 74 ++++++++++++++++----
 src/views/newMap/displayNew/lesson/index.vue | 42 +++++++++--
 3 files changed, 99 insertions(+), 21 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 18cd6450a..0c6bfc252 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -24,12 +24,12 @@ export function handlerUrl(data) {
     if (process.env.NODE_ENV === 'development') {
         // const data = null;
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.233/rtss-server';
         // BASE_API = 'http://114.116.51.125/jlcloud';
         // BASE_API = 'http://192.168.3.90:9100'; // 周寅
         // BASE_API = 'http://192.168.3.94:9000'; // 旭强
-        BASE_API = 'http://192.168.3.15:9000'; // 张赛
+        // BASE_API = 'http://192.168.3.15:9000'; // 张赛
         // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬
         // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
         // BASE_API = 'http://b29z135112.zicp.vip';
diff --git a/src/views/newMap/displayNew/exam/index.vue b/src/views/newMap/displayNew/exam/index.vue
index 6e9e2b1ad..d3cb6c535 100644
--- a/src/views/newMap/displayNew/exam/index.vue
+++ b/src/views/newMap/displayNew/exam/index.vue
@@ -94,13 +94,38 @@ export default {
         '$store.state.training.simulationUserList': function(val) {
             const userInfo = this.$store.state.training.simulationUserList.find(user => user.userId == this.$store.state.user.id );
             if (userInfo.type === 'STATION_SUPERVISOR') {
-                this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
-                const mapDevice = this.$store.state.map.mapDevice;
-                const list = [];
-                for (const key in mapDevice) {
-                    list.push(mapDevice[key]);
+                if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
+                    const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === userInfo.deviceCode && picture.type === 'chainStation');
+                    if (picture) {
+                        const mapDevice = this.$store.state.map.mapDevice;
+                        const list = [];
+                        const deviceList = [];
+                        for (const key in mapDevice) {
+                            list.push(mapDevice[key]);
+                            deviceList.push(key);
+                        }
+                        this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+                        this.$jlmap.updatePicture(deviceList);
+                        // this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                        this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
+                    } else {
+                        this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
+                        const mapDevice = this.$store.state.map.mapDevice;
+                        const list = [];
+                        for (const key in mapDevice) {
+                            list.push(mapDevice[key]);
+                        }
+                        this.$jlmap.updateShowStation(list, userInfo.deviceCode);
+                    }
+                } else {
+                    this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
+                    const mapDevice = this.$store.state.map.mapDevice;
+                    const list = [];
+                    for (const key in mapDevice) {
+                        list.push(mapDevice[key]);
+                    }
+                    this.$jlmap.updateShowStation(list, userInfo.deviceCode);
                 }
-                this.$jlmap.updateShowStation(list, userInfo.deviceCode);
             }
         }
     },
@@ -228,13 +253,38 @@ export default {
         checkRoleChange(list) {
             list.forEach(item => {
                 if (item.messageType === 'PLAY_CHANGE' && item.userId == this.$store.state.user.id && item.type === 'STATION_SUPERVISOR') {
-                    this.$store.dispatch('map/setShowCentralizedStationCode', item.deviceCode);
-                    const mapDevice = this.$store.state.map.mapDevice;
-                    const list = [];
-                    for (const key in mapDevice) {
-                        list.push(mapDevice[key]);
+                    if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
+                        const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === item.deviceCode && picture.type === 'chainStation');
+                        if (picture) {
+                            const mapDevice = this.$store.state.map.mapDevice;
+                            const list = [];
+                            const deviceList = [];
+                            for (const key in mapDevice) {
+                                list.push(mapDevice[key]);
+                                deviceList.push(key);
+                            }
+                            this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+                            this.$jlmap.updatePicture(deviceList);
+                            // this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                            this.$store.dispatch('map/setShowCentralizedStationCode', item.deviceCode);
+                        } else {
+                            this.$store.dispatch('map/setShowCentralizedStationCode', item.deviceCode);
+                            const mapDevice = this.$store.state.map.mapDevice;
+                            const list = [];
+                            for (const key in mapDevice) {
+                                list.push(mapDevice[key]);
+                            }
+                            this.$jlmap.updateShowStation(list, item.deviceCode);
+                        }
+                    } else {
+                        this.$store.dispatch('map/setShowCentralizedStationCode', item.deviceCode);
+                        const mapDevice = this.$store.state.map.mapDevice;
+                        const list = [];
+                        for (const key in mapDevice) {
+                            list.push(mapDevice[key]);
+                        }
+                        this.$jlmap.updateShowStation(list, item.deviceCode);
                     }
-                    this.$jlmap.updateShowStation(list, item.deviceCode);
                 }
             });
         }
diff --git a/src/views/newMap/displayNew/lesson/index.vue b/src/views/newMap/displayNew/lesson/index.vue
index 4c3790fa7..2f8208c4c 100644
--- a/src/views/newMap/displayNew/lesson/index.vue
+++ b/src/views/newMap/displayNew/lesson/index.vue
@@ -129,14 +129,42 @@ export default {
         },
         '$store.state.training.simulationUserList': function(val) {
             const userInfo = this.$store.state.training.simulationUserList.find(user => user.userId == this.$store.state.user.id );
-            if (userInfo.type === 'STATION_SUPERVISOR') {
-                this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
-                const mapDevice = this.$store.state.map.mapDevice;
-                const list = [];
-                for (const key in mapDevice) {
-                    list.push(mapDevice[key]);
+            if (userInfo.type === 'STATION_SUPERVISOR' || userInfo.type === 'STATION_WORKER') {
+                if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
+                    const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === userInfo.deviceCode && picture.type === 'chainStation');
+                    console.log(picture, '----------');
+                    if (picture) {
+                        const mapDevice = this.$store.state.map.mapDevice;
+                        const list = [];
+                        const deviceList = [];
+                        for (const key in mapDevice) {
+                            list.push(mapDevice[key]);
+                            deviceList.push(key);
+                        }
+                        console.log('-------------');
+                        this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+                        this.$jlmap.updatePicture(deviceList);
+                        // this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                        this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
+                    } else {
+                        this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
+                        const mapDevice = this.$store.state.map.mapDevice;
+                        const list = [];
+                        for (const key in mapDevice) {
+                            list.push(mapDevice[key]);
+                        }
+                        this.$jlmap.updateShowStation(list, userInfo.deviceCode);
+                    }
+                } else {
+                    console.log('-------------1');
+                    this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
+                    const mapDevice = this.$store.state.map.mapDevice;
+                    const list = [];
+                    for (const key in mapDevice) {
+                        list.push(mapDevice[key]);
+                    }
+                    this.$jlmap.updateShowStation(list, userInfo.deviceCode);
                 }
-                this.$jlmap.updateShowStation(list, userInfo.deviceCode);
             }
         },
         '$store.state.socket.simulationRoleList':function(list) {

From 97670ddb6359fe1642a42670744f7668950dcf3f Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 30 Sep 2022 17:37:59 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/lesson/index.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/newMap/displayNew/lesson/index.vue b/src/views/newMap/displayNew/lesson/index.vue
index 2f8208c4c..db82672b8 100644
--- a/src/views/newMap/displayNew/lesson/index.vue
+++ b/src/views/newMap/displayNew/lesson/index.vue
@@ -129,10 +129,9 @@ export default {
         },
         '$store.state.training.simulationUserList': function(val) {
             const userInfo = this.$store.state.training.simulationUserList.find(user => user.userId == this.$store.state.user.id );
-            if (userInfo.type === 'STATION_SUPERVISOR' || userInfo.type === 'STATION_WORKER') {
+            if (userInfo.type === 'STATION_SUPERVISOR') {
                 if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
                     const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === userInfo.deviceCode && picture.type === 'chainStation');
-                    console.log(picture, '----------');
                     if (picture) {
                         const mapDevice = this.$store.state.map.mapDevice;
                         const list = [];
@@ -141,7 +140,6 @@ export default {
                             list.push(mapDevice[key]);
                             deviceList.push(key);
                         }
-                        console.log('-------------');
                         this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
                         this.$jlmap.updatePicture(deviceList);
                         // this.$jlmap.updateTransform(picture.scaling, picture.origin);
@@ -156,7 +154,6 @@ export default {
                         this.$jlmap.updateShowStation(list, userInfo.deviceCode);
                     }
                 } else {
-                    console.log('-------------1');
                     this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
                     const mapDevice = this.$store.state.map.mapDevice;
                     const list = [];