From f0829b768bb7eba00a9ed8a5cdda8eb9edb29448 Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Thu, 21 Jan 2021 10:42:17 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=9B=E5=B7=9E?=
 =?UTF-8?q?=E7=BA=BF=E5=AE=9E=E8=AE=AD=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/foshan_01/menus/menuBar.vue |  40 ++---
 .../menus/menuDialog/stationControl.vue       |   5 +-
 .../theme/foshan_01/operationConfig.js        | 138 +++++++++++++-----
 src/scripts/cmdPlugin/OperationHandler.js     |  12 +-
 .../mapsystemNew/plugin/trainingtip.vue       | 116 +++++++--------
 5 files changed, 193 insertions(+), 118 deletions(-)

diff --git a/src/jmapNew/theme/foshan_01/menus/menuBar.vue b/src/jmapNew/theme/foshan_01/menus/menuBar.vue
index 7914f5e85..4b2c3a155 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuBar.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="menuBar">
-    <div class="nav">
+    <div class="nav" style="padding-left:40px">
       <template v-for="(item,i) in menu">
         <template v-if="noShowingChildren(item.children)">
           <li :id="getDomId(item)" :key="i" class="nav-li" @click="hookClick(item)">
@@ -769,7 +769,7 @@ export default {
         },
         getDomId(item) {
             if (item && item.operate) {
-                return item.operate.domId;
+				return item.operate.domId;
             }
             return '';
         },
@@ -809,17 +809,20 @@ export default {
         popupMenuA(item, index) {
             this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
             this.clickEvent();
-            const operate = {
+            this.tempClassA = index;
+			this.tempClassB = -1;
+
+			const operate = {
                 type: 'bar',
                 operation: item.operate.operation
             };
-            this.tempClassA = index;
-            this.tempClassB = -1;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
+			this.$nextTick(() => {
+				this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+					if (valid) {
+						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					}
+				});
+			})
         },
         selectedClassB(item, index) {
             const order = this.order || 0;
@@ -831,16 +834,19 @@ export default {
         },
         popupMenuB(item, index) {
             this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-            const operate = {
+			this.tempClassB = index;
+
+			const operate = {
                 type: 'bar',
                 operation: item.operate.operation
             };
-            this.tempClassB = index;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
+			this.$nextTick(() => {
+				this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+					if (valid) {
+						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					}
+				});
+			});
         },
         // 设置地图定位
         mapLocation(code) {
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue
index 5784a6bc2..637ec1bbe 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue
@@ -30,7 +30,7 @@
       <el-form-item prop="stationType">
         <el-radio-group :id="domIdChooseControl" v-model="formModel.stationType">
           <el-row v-for="item in Object.keys(controlProps)" :key="item" style="padding-bottom: 10px">
-            <el-radio :label="item" :disabled="!controlModeList.includes(item)" @change="handleChooseChangeControl">
+            <el-radio :label="item" :disabled="!controlModeList.includes(item)" @change="handleChooseChangeControl(item)">
               {{ controlProps[item] }}</el-radio>
           </el-row>
         </el-radio-group>
@@ -218,7 +218,8 @@ export default {
         },
         handleChooseChangeControl(val) {
             const operate = {
-				operation: OperationEvent.Command.order.choose.operation
+				operation: OperationEvent.Command.order.choose.operation,
+				val
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
diff --git a/src/jmapNew/theme/foshan_01/operationConfig.js b/src/jmapNew/theme/foshan_01/operationConfig.js
index 563a33a8b..425acb169 100644
--- a/src/jmapNew/theme/foshan_01/operationConfig.js
+++ b/src/jmapNew/theme/foshan_01/operationConfig.js
@@ -33,42 +33,42 @@
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 export default {
     list: [
-		// {
-        //     maxDuration: 15,
-        //     minDuration: 8,
-        //     operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL.value,
-        //     skinCode: '02',
-        //     trainingName: '系统/站遥控({1})',
-        //     trainingRemark: '控制模式转换，中控转站控',
-        //     trainingType: 'ControlConvertMenu',
-        //     productTypes: ['01'],
-        //     stepVOList: [
-        //         { deviceType: 'bar', orderNum: 1, operateCode: '002', tip: '鼠标左键点击顶部菜单栏【系统】' },
-        //         { deviceType: 'bar', orderNum: 2, operateCode: '2999', tip: '鼠标左键点击【站遥控】' },
-		// 		{ deviceType: '05', orderNum: 3, operateCode: '0071', tip: '鼠标左键选择所需要转换的集中站【{1}】', val: '{2}' },
-		// 		{ deviceType: '05', orderNum: 4, operateCode: '007', tip: '鼠标左键选择【站控】'},
-		// 		{ deviceType: '05', orderNum: 5, operateCode: '202', tip: '鼠标左键点击【设置】按钮' },
-		// 		{ deviceType: '05', orderNum: 6, operateCode: '2023', tip: '鼠标左键点击【确认】按钮' },
-        //     ]
-		// },
-		// {
-        //     maxDuration: 15,
-        //     minDuration: 8,
-        //     operateType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL.value,
-        //     skinCode: '02',
-        //     trainingName: '系统/站遥控({1})',
-        //     trainingRemark: '控制模式转换，中控转紧急站控',
-        //     trainingType: 'ControlConvertMenu',
-        //     productTypes: ['01'],
-        //     stepVOList: [
-        //         { deviceType: 'bar', orderNum: 1, operateCode: '002', tip: '鼠标左键点击顶部菜单栏【系统】' },
-        //         { deviceType: 'bar', orderNum: 2, operateCode: '2999', tip: '鼠标左键点击【站遥控】' },
-		// 		{ deviceType: '05', orderNum: 3, operateCode: '0071', tip: '鼠标左键选择所需要转换的集中站【{1}】', val: '{2}' },
-		// 		{ deviceType: '05', orderNum: 4, operateCode: '007', tip: '鼠标左键选择【紧急站控】'},
-		// 		{ deviceType: '05', orderNum: 5, operateCode: '201', tip: '鼠标左键点击【设置】按钮' },
-		// 		{ deviceType: '05', orderNum: 6, operateCode: '2013', tip: '鼠标左键点击【确认】按钮' },
-        //     ]
-        // },
+		{
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL.value,
+            skinCode: '02',
+            trainingName: '系统/站遥控({1})',
+            trainingRemark: '控制模式转换，中控转站控',
+            trainingType: 'ControlConvertMenu',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: 'bar', orderNum: 1, operateCode: '002', tip: '鼠标左键点击顶部菜单栏【系统】' },
+                { deviceType: 'bar', orderNum: 2, operateCode: '2999', tip: '鼠标左键点击【站遥控】' },
+				{ deviceType: '05', orderNum: 3, operateCode: '0071', tip: '鼠标左键选择所需要转换的集中站【{1}】', val: '{2}' },
+				{ deviceType: '05', orderNum: 4, operateCode: '007', tip: '鼠标左键选择【站控】', val: 'Local'},
+				{ deviceType: '05', orderNum: 5, operateCode: '202', tip: '鼠标左键点击【设置】按钮' },
+				{ deviceType: '05', orderNum: 6, operateCode: '2023', tip: '鼠标左键点击【确认】按钮' },
+            ]
+		},
+		{
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL.value,
+            skinCode: '02',
+            trainingName: '系统/站遥控({1})',
+            trainingRemark: '控制模式转换，中控转紧急站控',
+            trainingType: 'ControlConvertMenu',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: 'bar', orderNum: 1, operateCode: '002', tip: '鼠标左键点击顶部菜单栏【系统】' },
+                { deviceType: 'bar', orderNum: 2, operateCode: '2999', tip: '鼠标左键点击【站遥控】' },
+				{ deviceType: '05', orderNum: 3, operateCode: '0071', tip: '鼠标左键选择所需要转换的集中站【{1}】', val: '{2}' },
+				{ deviceType: '05', orderNum: 4, operateCode: '007', tip: '鼠标左键选择【紧急站控】', val: 'Emergency'},
+				{ deviceType: '05', orderNum: 5, operateCode: '201', tip: '鼠标左键点击【设置】按钮' },
+				{ deviceType: '05', orderNum: 6, operateCode: '2013', tip: '鼠标左键点击【确认】按钮' },
+            ]
+        },
         {
             maxDuration: 8,
             minDuration: 5,
@@ -182,6 +182,20 @@ export default {
                 { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
                 { deviceType: '06', orderNum: 2, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
             ]
+		},
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN.value,
+            skinCode: '02',
+            trainingName: '强制取消扣车({10}-{12}站台)',
+            trainingRemark: '强制取消扣车功能',
+            trainingType: 'Stand',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '06', orderNum: 1, operateCode: '506', tip: '鼠标右键菜单选择【强制取消扣车】' },
+                { deviceType: '06', orderNum: 2, operateCode: '506', tip: '鼠标左键点击【确定】按钮' }
+            ]
         },
         {
             maxDuration: 15,
@@ -291,7 +305,37 @@ export default {
                 { deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【区段激活】' },
                 { deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' }
             ]
+		},
+
+		{
+            maxDuration: 15,
+            minDuration: 8,
+            operateType:CMD.Switch.CMD_SWITCH_CUT_OFF.value,
+            skinCode: '08',
+            trainingName: '区段切除({7} 道岔)',
+            trainingRemark: '区段切除功能',
+            trainingType:'Switch',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '111', tip: '鼠标右键菜单选择【区段切除】' },
+                { deviceType: '02', orderNum: 2, operateCode: '111', tip: '鼠标左键点击【确定】按钮' }
+            ]
         },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType:CMD.Switch.CMD_SWITCH_ACTIVE.value,
+            skinCode: '08',
+            trainingName: '区段激活({7} 道岔)',
+            trainingRemark: '区段激活功能',
+            trainingType:'Switch',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '02', orderNum: 1, operateCode: '112', tip: '鼠标右键菜单选择【区段激活】' },
+                { deviceType: '02', orderNum: 2, operateCode: '112', tip: '鼠标左键点击【确定】按钮' }
+            ]
+		},
+
         {
             maxDuration: 15,
             minDuration: 8,
@@ -512,7 +556,27 @@ export default {
                 { deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键点击【道岔解锁】' },
                 { deviceType: '02', orderNum: 2, operateCode: '104', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
             ]
-        },
+		},
+
+		{
+            maxDuration: 15,
+            minDuration: 8,
+            operateType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED.value,
+            skinCode: '08',
+            trainingName: '设置临时限速({7} 道岔)',
+            trainingRemark: '设置临时限速功能（限速值：15）',
+            trainingType: 'Switch',
+            productTypes: ['01'],
+            stepVOList: [
+				{ deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' },
+                { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值15】', val: '15' },
+                { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
+                { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
+                { deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
+                { deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮', val: '15' },
+				{ deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+            ]
+		},
 
         {
             maxDuration: 15,
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 34f6e8413..1628f28e2 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -2560,25 +2560,29 @@ export const OperationEvent = {
         // 取消故障
         cancelStoppage: {
             menu: {
-                operation: '2995'
+				operation: '2995',
+				domId: '_Tips-CancelStoppage-Menu{TOP}'
             }
         },
         // 道岔故障
         stoppage: {
             menu: {
-                operation: '2996'
+				operation: '2996',
+				domId: '_Tips-Stoppage-Menu{TOP}'
             }
         },
         // 设置托管
         collocation: {
             menu: {
-                operation: '2997'
+				operation: '2997',
+				domId: '_Tips-Collocation-Menu{TOP}'
             }
         },
         // 设置连挂
         setLink: {
             menu: {
-                operation: '2999'
+				operation: '2998',
+				domId: '_Tips-SetLink-Menu{TOP}'
             }
         }
     }
diff --git a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
index 9a7359db2..ad92af037 100644
--- a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
+++ b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
@@ -37,63 +37,63 @@ export default {
     },
     methods: {
         tipInit() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/isTeachMode').then(() => {
-                    this.tipShow = true;
-                    const offset = this.$store.state.config.canvasOffset;
-                    if (this.$store.state.training.trainingStart) {
-                        const order = this.$store.state.training.order;
-                        const steps = this.$store.state.training.steps;
-                        if (order > -1 && order < steps.length) {
-                            const step = steps[order];
-                            const distance = 5;
-                            this.tip = step.tip;
-                            /** 如果mbm或者bar的处理*/
-                            if (step.type === 'mbm' || step.type === 'bar') {
-                                const position = this.getOtherTipPoint(step);
-                                if (position) {
-                                    this.position = position;
-                                    this.position.y -= distance;
-                                    this.popTipShow();
-                                }
-                            } else if (step.code) {
-                                /** 默认是shape类型，如果找不到坐标，则可以认为是存在code的dailog*/
-                                const position = this.getShapeTipPoint(step);
-                                if (position) {
-                                    this.position = {
-                                        x: position.x + offset.x,
-                                        y: position.y + offset.y - distance
-                                    };
-                                    this.popTipShow();
-                                } else {
-                                    const position = this.getOtherTipPoint(step);
-                                    if (position) {
-                                        this.position = position;
-                                        this.position.y -= distance;
-                                        this.popTipShow();
-                                    }
-                                }
-                            } else {
-                                /** 不存在code字段的dialog处理*/
-                                const position = this.getOtherTipPoint(step);
-                                if (position) {
-                                    this.position = position;
-                                    this.position.y -= distance;
-                                    this.popTipShow();
-                                } else {
-                                    this.popTipHide();
-                                }
-                            }
-                        } else {
-                            this.tipShow = false;
-                        }
-                    } else {
-                        this.tipShow = false;
-                    }
-                }).catch(() => {
-                    this.tipShow = false;
-                });
-            });
+			this.$store.dispatch('training/isTeachMode').then(() => {
+				this.tipShow = true;
+				this.$nextTick(() => {
+					const offset = this.$store.state.config.canvasOffset;
+					if (this.$store.state.training.trainingStart) {
+						const order = this.$store.state.training.order;
+						const steps = this.$store.state.training.steps;
+						if (order > -1 && order < steps.length) {
+							const step = steps[order];
+							const distance = 5;
+							this.tip = step.tip;
+							/** 如果mbm或者bar的处理*/
+							if (step.type === 'mbm' || step.type === 'bar') {
+								const position = this.getOtherTipPoint(step);
+								if (position) {
+									this.position = position;
+									this.position.y -= distance;
+									this.popTipShow();
+								}
+							} else if (step.code) {
+								/** 默认是shape类型，如果找不到坐标，则可以认为是存在code的dailog*/
+								const position = this.getShapeTipPoint(step);
+								if (position) {
+									this.position = {
+										x: position.x + offset.x,
+										y: position.y + offset.y - distance
+									};
+									this.popTipShow();
+								} else {
+									const position = this.getOtherTipPoint(step);
+									if (position) {
+										this.position = position;
+										this.position.y -= distance;
+										this.popTipShow();
+									}
+								}
+							} else {
+								/** 不存在code字段的dialog处理*/
+								const position = this.getOtherTipPoint(step);
+								if (position) {
+									this.position = position;
+									this.position.y -= distance;
+									this.popTipShow();
+								} else {
+									this.popTipHide();
+								}
+							}
+						} else {
+							this.tipShow = false;
+						}
+					} else {
+						this.tipShow = false;
+					}
+			});
+			}).catch(() => {
+				this.tipShow = false;
+			});
         },
         popTipShow() {
             this.popShow = true;
@@ -142,7 +142,7 @@ export default {
         // 获取地图菜单按钮和对话框按钮提示显示位置
         getOtherTipPoint(step) {
             const domId = OperationHandler.getDomIdByOperation(step.operation);
-            const btnDom = document.getElementById(domId);
+			const btnDom = document.getElementById(domId);
             if (btnDom) {
                 const offset = getDomOffset(btnDom);
                 if (offset.x == 0 && offset.y == 0) {

From cd9aa6455254a3b67d06b07bd59cfa665f96f04f Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 21 Jan 2021 11:02:04 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BD=9B=E5=B1=B1=E7=BA=BF=E8=B7=AF=20?=
 =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/foshan_01/operationConfig.js        | 57 ++++++++++++++-----
 1 file changed, 42 insertions(+), 15 deletions(-)

diff --git a/src/jmapNew/theme/foshan_01/operationConfig.js b/src/jmapNew/theme/foshan_01/operationConfig.js
index 563a33a8b..66518334e 100644
--- a/src/jmapNew/theme/foshan_01/operationConfig.js
+++ b/src/jmapNew/theme/foshan_01/operationConfig.js
@@ -33,7 +33,7 @@
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 export default {
     list: [
-		// {
+        // {
         //     maxDuration: 15,
         //     minDuration: 8,
         //     operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL.value,
@@ -45,13 +45,13 @@ export default {
         //     stepVOList: [
         //         { deviceType: 'bar', orderNum: 1, operateCode: '002', tip: '鼠标左键点击顶部菜单栏【系统】' },
         //         { deviceType: 'bar', orderNum: 2, operateCode: '2999', tip: '鼠标左键点击【站遥控】' },
-		// 		{ deviceType: '05', orderNum: 3, operateCode: '0071', tip: '鼠标左键选择所需要转换的集中站【{1}】', val: '{2}' },
-		// 		{ deviceType: '05', orderNum: 4, operateCode: '007', tip: '鼠标左键选择【站控】'},
-		// 		{ deviceType: '05', orderNum: 5, operateCode: '202', tip: '鼠标左键点击【设置】按钮' },
-		// 		{ deviceType: '05', orderNum: 6, operateCode: '2023', tip: '鼠标左键点击【确认】按钮' },
+        // 		{ deviceType: '05', orderNum: 3, operateCode: '0071', tip: '鼠标左键选择所需要转换的集中站【{1}】', val: '{2}' },
+        // 		{ deviceType: '05', orderNum: 4, operateCode: '007', tip: '鼠标左键选择【站控】'},
+        // 		{ deviceType: '05', orderNum: 5, operateCode: '202', tip: '鼠标左键点击【设置】按钮' },
+        // 		{ deviceType: '05', orderNum: 6, operateCode: '2023', tip: '鼠标左键点击【确认】按钮' },
         //     ]
-		// },
-		// {
+        // },
+        // {
         //     maxDuration: 15,
         //     minDuration: 8,
         //     operateType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL.value,
@@ -63,10 +63,10 @@ export default {
         //     stepVOList: [
         //         { deviceType: 'bar', orderNum: 1, operateCode: '002', tip: '鼠标左键点击顶部菜单栏【系统】' },
         //         { deviceType: 'bar', orderNum: 2, operateCode: '2999', tip: '鼠标左键点击【站遥控】' },
-		// 		{ deviceType: '05', orderNum: 3, operateCode: '0071', tip: '鼠标左键选择所需要转换的集中站【{1}】', val: '{2}' },
-		// 		{ deviceType: '05', orderNum: 4, operateCode: '007', tip: '鼠标左键选择【紧急站控】'},
-		// 		{ deviceType: '05', orderNum: 5, operateCode: '201', tip: '鼠标左键点击【设置】按钮' },
-		// 		{ deviceType: '05', orderNum: 6, operateCode: '2013', tip: '鼠标左键点击【确认】按钮' },
+        // 		{ deviceType: '05', orderNum: 3, operateCode: '0071', tip: '鼠标左键选择所需要转换的集中站【{1}】', val: '{2}' },
+        // 		{ deviceType: '05', orderNum: 4, operateCode: '007', tip: '鼠标左键选择【紧急站控】'},
+        // 		{ deviceType: '05', orderNum: 5, operateCode: '201', tip: '鼠标左键点击【设置】按钮' },
+        // 		{ deviceType: '05', orderNum: 6, operateCode: '2013', tip: '鼠标左键点击【确认】按钮' },
         //     ]
         // },
         {
@@ -263,7 +263,6 @@ export default {
                 { deviceType: '06', orderNum: 2, operateCode: '501', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
-
         {
             maxDuration: 15,
             minDuration: 8,
@@ -310,8 +309,8 @@ export default {
                 { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '15' },
                 { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
             ]
-		},
-		// {
+        },
+        // {
         //     maxDuration: 15,
         //     minDuration: 8,
         //     operateType:CMD.Section.CMD_SECTION_SET_LIMIT_SPEED.value,
@@ -324,7 +323,7 @@ export default {
         //         { deviceType: '03', orderNum: 1, operateCode: '408', tip: '鼠标右键菜单选择【设置全线取消限速】' },
         //         { deviceType: '03', orderNum: 4, operateCode: '4082', tip: '鼠标左键点击【确定】按钮' },
         //     ]
-		// },
+        // },
         {
             maxDuration: 15,
             minDuration: 8,
@@ -671,6 +670,34 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: '312', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
+        {
+            maxDuration: 8,
+            minDuration: 5,
+            operateType:CMD.Signal.CMD_SIGNAL_SET_CI_AUTO.value,
+            skinCode: '08',
+            trainingName: '设置联锁自动进路({3} 进路)',
+            trainingRemark: '设置联锁自动进路',
+            trainingType: 'Signal',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【设置联锁自动进路】' },
+                { deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
+        {
+            maxDuration: 8,
+            minDuration: 5,
+            operateType:CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO.value,
+            skinCode: '08',
+            trainingName: '取消联锁自动进路({3} 进路)',
+            trainingRemark: '取消联锁自动进路',
+            trainingType: 'Signal',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【取消联锁自动进路】' },
+                { deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' }
+            ]
+        },
         {
             maxDuration: 15,
             minDuration: 8,

From b8a36028fd894b495fdcd0de709abba60e804f22 Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Thu, 21 Jan 2021 11:09:51 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=20=20=E4=BD=9B?=
 =?UTF-8?q?=E5=B1=B1=E7=BA=BF=E5=85=A8=E7=BA=BF=E9=99=90=E9=80=9F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/foshan_01/operationConfig.js        | 44 ++++++++++++-------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/jmapNew/theme/foshan_01/operationConfig.js b/src/jmapNew/theme/foshan_01/operationConfig.js
index 425acb169..7ddd454a0 100644
--- a/src/jmapNew/theme/foshan_01/operationConfig.js
+++ b/src/jmapNew/theme/foshan_01/operationConfig.js
@@ -355,20 +355,6 @@ export default {
                 { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
             ]
 		},
-		// {
-        //     maxDuration: 15,
-        //     minDuration: 8,
-        //     operateType:CMD.Section.CMD_SECTION_SET_LIMIT_SPEED.value,
-        //     skinCode: '08',
-        //     trainingName: '全线取消限速({8}{9} 区段)',
-        //     trainingRemark: '设置全线取消限速',
-        //     trainingType: 'Section',
-        //     productTypes: ['01', '02'],
-        //     stepVOList: [
-        //         { deviceType: '03', orderNum: 1, operateCode: '408', tip: '鼠标右键菜单选择【设置全线取消限速】' },
-        //         { deviceType: '03', orderNum: 4, operateCode: '4082', tip: '鼠标左键点击【确定】按钮' },
-        //     ]
-		// },
         {
             maxDuration: 15,
             minDuration: 8,
@@ -557,7 +543,35 @@ export default {
                 { deviceType: '02', orderNum: 2, operateCode: '104', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
             ]
 		},
-
+		// 全局指令，分属不同设备，暂无法配置
+		// {
+        //     maxDuration: 15,
+        //     minDuration: 8,
+        //     operateType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED.value,
+        //     skinCode: '08',
+        //     trainingName: '全线取消限速',
+        //     trainingRemark: '设置全线取消限速',
+        //     trainingType: 'Switch',
+        //     productTypes: ['01', '02'],
+        //     stepVOList: [
+        //         { deviceType: '02', orderNum: 1, operateCode: '114', tip: '鼠标右键菜单选择【全线取消限速】' },
+        //         { deviceType: '02', orderNum: 2, operateCode: '1142', tip: '鼠标左键点击【确定】按钮' },
+        //     ]
+		// },
+		// {
+        //     maxDuration: 15,
+        //     minDuration: 8,
+        //     operateType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED.value,
+        //     skinCode: '08',
+        //     trainingName: '全线取消限速',
+        //     trainingRemark: '设置全线取消限速',
+        //     trainingType: 'Section',
+        //     productTypes: ['01', '02'],
+        //     stepVOList: [
+        //         { deviceType: '03', orderNum: 1, operateCode: '408', tip: '鼠标右键菜单选择【全线取消限速】' },
+        //         { deviceType: '03', orderNum: 2, operateCode: '4082', tip: '鼠标左键点击【确定】按钮' },
+        //     ]
+		// },
 		{
             maxDuration: 15,
             minDuration: 8,

From 6647ff9b58fd9f7f107e6e460c8ce539abda94cf Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Thu, 21 Jan 2021 11:13:53 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?=
 =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E9=9D=9E=E9=A9=BE=E9=A9=B6=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js |  9 ++++++---
 src/jlmap3d/main/newmodel/TrainListN.js               | 10 +++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
index 3363b0be9..d5116bccd 100644
--- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
+++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js
@@ -320,13 +320,16 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,dri
 	}
 
 		function otherTrainRun(data){
-
-			if(data.length != trainlisttest.otherTrainmodels.length && trainlisttest.updatStatus == false){
+			if(data.length > trainlisttest.otherTrainmodels.length && trainlisttest.updatStatus == false){
 				trainlisttest.addDriveTrain(data);
+			}else if(data.length < trainlisttest.otherTrainmodels.length){
+
+				let removelength = trainlisttest.otherTrainmodels.length - data.length;
+				trainlisttest.removeDriveTrain(removelength);
 			}else{
 
 				for(let i=0,leni=data.length;i<leni;i++){
-					let updateTrain = trainlisttest.otherTrainList[data[i].code];
+					let updateTrain = trainlisttest.otherTrainmodels[i];
 
 					if(data[i].code != trainmodel.code){
 
diff --git a/src/jlmap3d/main/newmodel/TrainListN.js b/src/jlmap3d/main/newmodel/TrainListN.js
index bc511baab..c045767b2 100644
--- a/src/jlmap3d/main/newmodel/TrainListN.js
+++ b/src/jlmap3d/main/newmodel/TrainListN.js
@@ -52,12 +52,18 @@ export function TrainListN() {
     }
     scope.otherTrainList = [];
     for(let j=0,lenj = data.length;j<lenj;j++){
-      this.otherTrainmodels[j].code = data[j].code;
+      scope.otherTrainmodels[j].code = data[j].code;
       scope.otherTrainList[data[j].code] =  this.otherTrainmodels[j];
     }
 
     this.updatStatus = false;
   }
+
+  this.removeDriveTrain = function(removeLength){
+    console.log(removeLength);
+    scope.otherTrainmodels.splice(0,removeLength);
+  }
+
   this.drivertrain = function(data,scene,assetloader,mixers,actionss,mode){
 
     return new Promise(function(resolve, reject){
@@ -170,6 +176,8 @@ export function TrainListN() {
       resolve("loadedtrain");
     });
   }
+
+
   this.initpromise = function(data,scene,assetloader,mixers,actionss,mode){
     return new Promise(function(resolve, reject){
       let selectmesh,ntracks1,ntracks2,tclip,fclip;

From 19fb9718478b8d16dabd824406ecb09eaaa31840 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Thu, 21 Jan 2021 11:16:19 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?=
 =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E9=9D=9E=E9=A9=BE=E9=A9=B6=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jlmap3d/main/newmodel/TrainListN.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/jlmap3d/main/newmodel/TrainListN.js b/src/jlmap3d/main/newmodel/TrainListN.js
index c045767b2..05853a805 100644
--- a/src/jlmap3d/main/newmodel/TrainListN.js
+++ b/src/jlmap3d/main/newmodel/TrainListN.js
@@ -61,6 +61,8 @@ export function TrainListN() {
 
   this.removeDriveTrain = function(removeLength){
     console.log(removeLength);
+
+    scope.group.remove(scope.otherTrainmodels[0]);
     scope.otherTrainmodels.splice(0,removeLength);
   }