From cf912b7834e41267a827b15a75a4ff067a3d0e30 Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Tue, 23 Feb 2021 12:16:54 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=EF=BC=9A=E5=AE=81?=
 =?UTF-8?q?=E6=B3=A23=20=E9=97=AE=E9=A2=98=EF=BC=9A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=B7=B3=E5=81=9C=E7=9A=84=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/haerbin_01/operationConfig.js       |   8 +-
 src/jmapNew/theme/ningbo_03/menus/menuBar.vue |   5 +-
 .../menus/menuDialog/trainJumpStop.vue        | 156 +++++++++++++++---
 .../theme/ningbo_03/operationConfig.js        |  56 ++++++-
 src/scripts/cmdPlugin/CommandEnum.js          |   4 +
 src/scripts/cmdPlugin/OperationHandler.js     |  17 +-
 6 files changed, 205 insertions(+), 41 deletions(-)

diff --git a/src/jmapNew/theme/haerbin_01/operationConfig.js b/src/jmapNew/theme/haerbin_01/operationConfig.js
index 74fc7ad6b..53d5b7082 100644
--- a/src/jmapNew/theme/haerbin_01/operationConfig.js
+++ b/src/jmapNew/theme/haerbin_01/operationConfig.js
@@ -783,7 +783,9 @@ export default {
                 { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'START_SIGNAL'},
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL'},
                 { deviceType: '04', orderNum: 3, operateCode: '3087', tip: '鼠标左键点击【引导进路】按钮' },
-                { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+                { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
+				{ deviceType: '04', orderNum: 5, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
+                { deviceType: '04', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
             ]
         },
         {
@@ -815,7 +817,9 @@ export default {
                 { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'START_SIGNAL'},
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL'},
                 { deviceType: '04', orderNum: 3, operateCode: '3087', tip: '鼠标左键点击【引导进路】按钮' },
-                { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+                { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
+				{ deviceType: '04', orderNum: 5, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
+                { deviceType: '04', orderNum: 6, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
             ]
         },
         {
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
index 3722ff914..b429633e7 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
@@ -291,7 +291,7 @@ export default {
                     // },
                     {
                         title: '列车(T)',
-                        operate: OperationEvent.Command.mBar.check,
+                        operate: OperationEvent.Command.mBar.train,
                         children: [
                             {
                                 title: '排列进路',
@@ -327,7 +327,7 @@ export default {
                             },
                             {
                                 title: '操作',
-                                operate: '',
+                                operate: OperationEvent.Command.commandNingBo3.train_operate,
                                 children: [
                                     {
                                         title: '发车',
@@ -343,6 +343,7 @@ export default {
                                     },
                                     {
                                         title: '跳停',
+										operate: OperationEvent.Command.commandNingBo3.train_operate_jump,
                                         click: this.setJumpStop
                                     },
                                     {
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainJumpStop.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainJumpStop.vue
index 1553b68cc..217aef93a 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainJumpStop.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainJumpStop.vue
@@ -2,26 +2,30 @@
   <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="600px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
     <el-row>
       <el-col :span="20">
-        <el-tabs type="border-card">
-          <el-tab-pane label="运行线">
-            <el-table :data="trainList" height="300px">
+        <el-tabs type="border-card" v-model="activeName" :id="domIdChoose" @change="handleChangeTab">
+          <el-tab-pane label="运行线" name="first">
+            <el-table ref="table0" :data="trainList" height="300px" highlight-current-row :id="domIdChoose1" @current-change="handleRunLineChange">
               <el-table-column prop="interval" label="运行线" />
             </el-table>
           </el-tab-pane>
-          <el-tab-pane label="列车">
+          <el-tab-pane label="列车" name="second">
             <el-row>
-              <el-col :span="14">
-                <el-table :data="trainList" height="300px">
+              <el-col :span="12">
+                <el-table ref="table1" :data="trainList" height="300px" highlight-current-row :id="domIdSelect1" @current-change="handleTrainChange">
                   <el-table-column prop="code" label="列车" />
                   <el-table-column prop="interval" label="运行线" />
                 </el-table>
               </el-col>
-              <el-col :span="10" style="padding-left: 5px;">
-                <el-table :data="stationStandList" height="260px">
+              <el-col :span="12" style="padding-left: 5px;">
+                <el-table ref="table2" :data="stationStandList" height="260px" highlight-current-row :id="domIdSelect2" @current-change="handleStandChange">
                   <el-table-column prop="name" label="站台" />
-                  <el-table-column prop="jump" label="跳停" />
+                  <el-table-column prop="jump" :width="60" label="跳停" >
+					<template slot-scope="scope">
+						<span>{{ getStandStatus(scope.row.code) }}</span>
+					</template>
+				  </el-table-column>
                 </el-table>
-                <el-checkbox v-model="allCheck" style="margin-top: 10px;">所有站台</el-checkbox>
+                <el-checkbox v-model="allCheck" :id="domIdSelect" style="margin-top: 10px;" @change="handleAllStandChange">所有站台</el-checkbox>
               </el-col>
             </el-row>
           </el-tab-pane>
@@ -30,18 +34,18 @@
       <el-col :span="4" style="padding-left: 5px;">
         <div class="set-status-title">跳停</div>
         <div class="set-status-box">
-          <el-radio v-model="command" :disabled="true" :label="true">设置(S)</el-radio>
+          <el-radio v-model="status" :disabled="!allCheck &&!status" :label="true">设置(S)</el-radio>
           <br>
-          <el-radio v-model="command" :label="false">清除(R)</el-radio>
+          <el-radio v-model="status" :disabled="!allCheck && status" :label="false">清除(R)</el-radio>
         </div>
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定(O)</el-button>
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(true)">确定(O)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
-        <el-button>应用(A)</el-button>
+        <el-button :id="domIdApply" @click="commit(false)">应用(A)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
         <el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
@@ -57,7 +61,7 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 
 export default {
@@ -68,11 +72,9 @@ export default {
     data() {
         return {
             status: false,
-            command: true,
-            allChecked: false,
             dialogShow: false,
             loading: false,
-            activeName: 'first',
+            activeName: 'second',
             operate: {},
             allCheck: false
         };
@@ -88,15 +90,33 @@ export default {
         selected() {
             return this.$store.state.menuOperation.selected;
         },
-        domIdClose() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
         domIdChoose() {
-            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
+			return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
         },
+		domIdChoose1() {
+			return this.dialogShow ? OperationEvent.Command.common.choose1.domId : ''
+        },
+		// domIdChoose2() {
+		// 	return this.dialogShow ? OperationEvent.Command.common.choose2.domId : ''
+		// },
+		domIdSelect() {
+			return this.dialogShow ? OperationEvent.Command.common.select.domId : ''
+        },
+		domIdSelect1() {
+			return this.dialogShow ? OperationEvent.Command.common.select1.domId : ''
+        },
+		domIdSelect2() {
+			return this.dialogShow ? OperationEvent.Command.common.select2.domId : ''
+		},
         domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
+            return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
+		},
+		domIdClose() {
+            return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
         },
+        domIdApply() {
+            return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
+		},
         title() {
             return '设置/清除站台跳停';
         }
@@ -106,30 +126,112 @@ export default {
             if (this.show) {
                 this.commit();
             }
-        }
+        },
+		'selected': function(val) {
+            if (val) {
+				const stand = this.$store.getters['map/getDeviceByCode'](val.code);
+				this.status = stand && stand.assignSkip? false: true;
+			}
+		}
     },
     methods: {
+		getStandStatus(code) {
+            const standEle = this.$store.getters['map/getDeviceByCode'](code);
+            if (standEle.assignSkip) {
+                return '是';
+            } else {
+                return '否';
+            }
+        },
         doShow(operate) {
             this.operate = operate;
             // 如果不是断点激活，而是第一次显示，则需要设置初始值
             this.dialogShow = true;
             this.$nextTick(function () {
+				this.$refs.table0 && this.$refs.table0.setCurrentRow();
+				this.$refs.table1 && this.$refs.table1.setCurrentRow();
+				this.$refs.table2 && this.$refs.table2.setCurrentRow();
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+			this.$refs.table0 && this.$refs.table0.setCurrentRow();
+			this.$refs.table1 && this.$refs.table1.setCurrentRow();
+			this.$refs.table2 && this.$refs.table2.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
         },
-        commit() {
+		handleChangeTab(val) {
+		},
+		handleRunLineChange(val) {
+		},
+		handleTrainChange(val) {
+			if (!val) { return; }
+            const step = {
+                operation: OperationEvent.Command.common.select.operation,
+                val: val.code,
+				param: {
+					trainGroupNumber: val.code
+				}
+            };
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow();
+            });
+		},
+		handleStandChange(val) {
+            if (!val) { return; }
+            const step = {
+				code: val.code,
+                operation: OperationEvent.Command.common.select1.operation,
+                val: val.code,
+				param: {
+					standCode: val.code
+				}
+            };
+			this.allCheck = false;
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$store.dispatch('menuOperation/setSelected', {device: val});
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow();
+            });
         },
-        handleClick() {
+		handleAllStandChange(val) {
+			this.$refs.table2 && this.$refs.table2.setCurrentRow();
+		},
+        commit(isClose=false) {
+			const step = {
+                over: true,
+                cmdType:this.status
+					? this.allCheck? CMD.Stand.CMD_STAND_ALL_SET_JUMP_STOP: CMD.Stand.CMD_STAND_SET_JUMP_STOP
+					: this.allCheck? CMD.Stand.CMD_STAND_ALL_CANCEL_JUMP_STOP: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
+                operation: isClose? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation,
+                param: this.allCheck
+					? { standCodes: this.stationStandList.map(el => el.code ) }
+					: { standCode: this.selected.code }
+            };
 
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    isClose && this.doClose();
+                }
+            }).catch((error) => {
+            	console.log(error);
+                isClose && this.doClose();
+                this.$refs.noticeInfo.doShow();
+            });
         },
         cancel() {
             const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
+                 operation: OperationEvent.Command.common.close.operation
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
diff --git a/src/jmapNew/theme/ningbo_03/operationConfig.js b/src/jmapNew/theme/ningbo_03/operationConfig.js
index 8dd03b5b1..6afb2a82d 100644
--- a/src/jmapNew/theme/ningbo_03/operationConfig.js
+++ b/src/jmapNew/theme/ningbo_03/operationConfig.js
@@ -38,7 +38,43 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     list: [
-	    {
+	    // {
+        //     maxDuration: 8,
+        //     minDuration: 5,
+        //     operateType: CMD.Stand.CMD_STAND_SET_JUMP_STOP.value,
+        //     skinCode: '12',
+        //     trainingName: '跳停({10}-{12} 站台)',
+        //     trainingRemark: '设置跳停功能',
+        //     trainingType: 'Stand',
+        //     productTypes: ['01', '02'],
+        //     stepVOList: [
+		// 		{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' },
+		// 		{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' },
+		// 		{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标左键选择【开放/关闭】' },
+		// 		{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
+		// 		{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
+		// 		{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
+        //     ]
+		// },
+		// {
+        //     maxDuration: 8,
+        //     minDuration: 5,
+        //     operateType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP.value,
+        //     skinCode: '12',
+        //     trainingName: '取消跳停({10}-{12} 站台)',
+        //     trainingRemark: '设置取消跳停功能',
+        //     trainingType: 'Stand',
+        //     productTypes: ['01', '02'],
+        //     stepVOList: [
+		// 		{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' },
+		// 		{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' },
+		// 		{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标左键选择【开放/关闭】' },
+		// 		{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
+		// 		{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
+		// 		{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
+		// 	]
+		// },
+		{
             maxDuration: 8,
             minDuration: 5,
             operateType: CMD.Stand.CMD_STAND_SET_JUMP_STOP.value,
@@ -48,10 +84,11 @@ export default {
             trainingType: 'Stand',
             productTypes: ['01', '02'],
             stepVOList: [
-				{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' },
-				{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' },
-				{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标左键选择【开放/关闭】' },
-				{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
+				{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.train.operation, tip: '鼠标左键选择【列车】' },
+				{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.train_operate.operation, tip: '鼠标左键选择【操作】' },
+				{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.train_operate_jump.operation, tip: '鼠标左键选择【跳停】' },
+				{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.select1.operation, tip: '请选择列车【{29}】', val: '{30}' },
+				{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.select2.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
 				{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
 				{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
             ]
@@ -66,10 +103,11 @@ export default {
             trainingType: 'Stand',
             productTypes: ['01', '02'],
             stepVOList: [
-				{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标左键选择【线路】' },
-				{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标左键选择【站台】' },
-				{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标左键选择【开放/关闭】' },
-				{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
+				{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.train.operation, tip: '鼠标左键选择【列车】' },
+				{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.train_operate.operation, tip: '鼠标左键选择【操作】' },
+				{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.train_operate_jump.operation, tip: '鼠标左键选择【跳停】' },
+				{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.select1.operation, tip: '请选择列车【{29}】', val: '{30}' },
+				{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.select2.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
 				{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
 				{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
 			]
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index a92d96ada..a168b8e49 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -157,6 +157,10 @@ export default {
         CMD_STAND_SET_JUMP_STOP: {value:'Stand_Set_Jump_Stop', label: '设置跳停'},
         /** 取消跳停 */
         CMD_STAND_CANCEL_JUMP_STOP: {value:'Stand_Cancel_Jump_Stop', label: '取消跳停'},
+		/** 全站台设置跳停 */
+		CMD_STAND_ALL_SET_JUMP_STOP: {value:'Stand_All_Set_Jump_Stop', label: '全站台设置跳停'},
+		/** 全站台取消跳停 */
+		CMD_STAND_ALL_CANCEL_JUMP_STOP: {value:'Stand_All_Cancel_Jump_Stop', label: '全站台取消跳停'},
         /** 设置扣车 */
         CMD_STAND_SET_HOLD_TRAIN: {value:'Stand_Set_Hold_Train', label: '设置扣车'},
         /** 取消扣车 */
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 5a8fc69ae..c2f7d2649 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -481,7 +481,22 @@ export const OperationEvent = {
             line_user_reclaim: {
                 operation: '00a44',
                 domId: '_Tips-ningBo-line-user-reclaim{TOP}'
-            }
+            },
+			// 列车
+			train: {
+				operation: '00b',
+                domId: '_Tips-ningBo-train{TOP}'
+			},
+			// 列车-操作
+			train_operate: {
+				operation: '00b0',
+                domId: '_Tips-ningBo-train-operate{TOP}'
+			},
+			// 列车-操作-跳停
+			train_operate_jump: {
+				operation: '00b01',
+				domId: '_Tips-ningBo-train-operate-jump{TOP}'
+			},
         }
     },
     // 站台概要表

From 069c1b7203e6816ff212e5c8f2e6dc1d54754c03 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 23 Feb 2021 13:04:29 +0800
Subject: [PATCH 2/7] =?UTF-8?q?ibp=E7=9B=98=E8=AE=A1=E8=BD=B4=E5=A4=8D?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/jmap/map.js                           |  7 +++
 src/api/simulation.js                         |  4 +-
 src/scripts/ConstDic.js                       |  3 +-
 .../ibp/ibpDraw/ibpOperate/ibpButton.vue      | 49 ++++++++++++++++---
 src/views/ibp/ibpsystem/index.vue             | 10 ++--
 5 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js
index f3026cbf5..28ab6b000 100644
--- a/src/api/jmap/map.js
+++ b/src/api/jmap/map.js
@@ -264,3 +264,10 @@ export function getSectionListByStationCode(id, stationCode) {
         method: 'get'
     });
 }
+/** 查询地图下所有的区段 */
+export function getSectionListByMapId(id) {
+    return request({
+        url: `/api/map/${id}/sections`,
+        method: 'get'
+    });
+}
diff --git a/src/api/simulation.js b/src/api/simulation.js
index 9b81181df..a02097d8a 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -221,9 +221,9 @@ export function executeScriptNew(group) {
 }
 
 /** 处理ibp盘事件 */
-export function handlerIbpEvent(group, button, stationCode) {
+export function handlerIbpEvent(group, button, stationCode, buttonCode) {
     return request({
-        url: `/simulation/${group}/ibp/${button}?stationCode=${stationCode}`,
+        url: `/simulation/${group}/ibp/${button}?stationCode=${stationCode}&buttonCode=${buttonCode}`,
         method: 'put'
     });
 }
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index d30a5ab57..de77fb762 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -119,7 +119,8 @@ export const IbpOperation = {
     XXKM: {operate: '08', event: 'XXKM', name: '下行屏蔽门开门'},
     SXKM: {operate: '10', event: 'SXKM', name: '上行屏蔽门开门'},
     XXYS: {operate: '09', event: 'XXYS', name: '下行钥匙'},
-    SXYS: {operate: '11', event: 'SXYS', name: '上行钥匙'}
+    SXYS: {operate: '11', event: 'SXYS', name: '上行钥匙'},
+    PRERESET: {operate: '12', event: 'PRERESET', name: '计轴复位'}
 };
 
 /**
diff --git a/src/views/ibp/ibpDraw/ibpOperate/ibpButton.vue b/src/views/ibp/ibpDraw/ibpOperate/ibpButton.vue
index c3c993d63..3e0c93d05 100644
--- a/src/views/ibp/ibpDraw/ibpOperate/ibpButton.vue
+++ b/src/views/ibp/ibpDraw/ibpOperate/ibpButton.vue
@@ -34,6 +34,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item v-if="form.mean === 'PRERESET'" label="关联区段">
+        <el-select v-model="form.sectionCode" placeholder="请选择">
+          <el-option
+            v-for="item in sectionList"
+            :key="item.code"
+            :label="item.name + '(' + item.code +')'"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="onSubmit('form')">{{ buttonText }}</el-button>
         <el-button v-show="showDeleteButton" type="danger" @click="deleteDevice">{{ $t('global.delete') }}</el-button>
@@ -44,6 +54,7 @@
 </template>
 
 <script>
+import {getSectionListByStationCode, getSectionListByMapId } from '@/api/jmap/map';
 export default {
     name: 'ButtonDraft',
     components: {
@@ -62,14 +73,17 @@ export default {
                 { label: '取消紧急停车', value: 'QXJJTC' },
                 { label: '报警切除', value: 'BJQC' },
                 { label: '下行屏蔽门开门', value: 'XXKM' },
-                { label: '上行屏蔽门开门', value: 'SXKM' }
+                { label: '上行屏蔽门开门', value: 'SXKM' },
+                { label: '计轴复位', value: 'PRERESET' }
             ],
             form: {
                 code: '',
                 buttonColor: 'red',
                 buttonWidth: 25,
                 x: 10,
-                y: 10
+                y: 10,
+                sectionCode: '',
+                mean: ''
             },
             rules: {
                 code: [
@@ -81,7 +95,8 @@ export default {
                 buttonWidth: [
                     { required: true, message: this.$t('ibp.enterTheButtonWidth'), trigger: 'blur' }
                 ]
-            }
+            },
+            sectionList: []
         };
     },
     computed: {
@@ -100,12 +115,31 @@ export default {
                 this.form.x = model.point.x;
                 this.form.y = model.point.y;
                 this.form.mean = model.mean;
+                this.form.sectionCode = model.sectionCode;
             }
         }
     },
     mounted() {
+        if (this.$route.query.stationCode) {
+            getSectionListByStationCode(this.$route.query.mapId, this.$route.query.stationCode).then(resp => {
+                this.sectionList = resp.data;
+                console.log(resp.data);
+            }).catch(() => {
+                this.$message.error('获取区段列表失败！');
+            });
+        } else {
+            getSectionListByMapId(this.$route.query.mapId).then(resp => {
+                this.sectionList = resp.data;
+                console.log(resp.data);
+            }).catch(() => {
+                this.$message.error('获取区段列表失败！');
+            });
+        }
     },
     methods: {
+        // consoleChange() {
+        //     console.log(this.form.mean === 'PRERESET', this.form.mean );
+        // },
         onSubmit(form) {
             this.$refs[form].validate((valid) => {
                 if (valid) {
@@ -119,7 +153,8 @@ export default {
                         color: this.form.buttonColor,
                         status: 'off',
                         width: this.form.buttonWidth,
-                        mean: this.form.mean
+                        mean: this.form.mean,
+                        sectionCode: this.form.sectionCode
                     };
                     this.$emit('createData', buttonModel);
                     this.initPage();
@@ -139,7 +174,8 @@ export default {
                 color: this.form.buttonColor,
                 status: 'off',
                 width: this.form.buttonWidth,
-                mean: this.form.mean
+                mean: this.form.mean,
+                sectionCode: this.form.sectionCode
             };
             this.$emit('deleteDataModel', buttonModel );
             this.initPage();
@@ -154,7 +190,8 @@ export default {
                 buttonWidth: 25,
                 x: 10,
                 y: 10,
-                mean: ''
+                mean: '',
+                sectionCode: ''
             };
         },
         generateCode() {
diff --git a/src/views/ibp/ibpsystem/index.vue b/src/views/ibp/ibpsystem/index.vue
index f177d4b04..3be73e932 100644
--- a/src/views/ibp/ibpsystem/index.vue
+++ b/src/views/ibp/ibpsystem/index.vue
@@ -229,10 +229,12 @@ export default {
 
         },
         onMouseDown(em) {
-            if (em.deviceModel.mean) {
-                if (IbpOperation[em.deviceModel.mean]) {
-                    handlerIbpEvent(this.$route.query.group, IbpOperation[em.deviceModel.mean].event, this.stationCode);
-                }
+            if (em.deviceModel.mean && IbpOperation[em.deviceModel.mean] && em.deviceModel.mean === IbpOperation.PRERESET.event) {
+                handlerIbpEvent(this.$route.query.group, IbpOperation[em.deviceModel.mean].event, this.stationCode, em.deviceModel.sectionCode).then(() => {
+                }).catch(error => { this.$message.error(error.message); });
+            } else if ( em.deviceModel.mean && IbpOperation[em.deviceModel.mean]) {
+                handlerIbpEvent(this.$route.query.group, IbpOperation[em.deviceModel.mean].event, this.stationCode).then(() => {
+                }).catch(error => { this.$message.error(error.message); });
             }
         },
         // 右键点击事件

From 195de40008231126b7328eee682f99552cec7cc9 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 23 Feb 2021 13:34:42 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=BD=A6=E7=AB=99=E8=AE=A1=E8=BD=B4?=
 =?UTF-8?q?=E5=A4=8D=E4=BD=8D=E7=8A=B6=E6=80=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/Station/index.js            |  6 +++++-
 .../ningbo_01/menus/menuAutoTrunRoute.vue     |  8 ++++----
 .../theme/ningbo_01/menus/menuSection.vue     |  8 ++++----
 .../theme/ningbo_01/menus/menuSignal.vue      |  8 ++++----
 .../theme/ningbo_01/menus/menuStation.vue     |  8 ++++----
 .../ningbo_01/menus/menuStationLight.vue      |  8 ++++----
 .../ningbo_01/menus/menuStationPreReset.vue   |  8 ++++----
 .../ningbo_01/menus/menuStationStand.vue      |  9 ++++-----
 .../ningbo_01/menus/menuStationTurnBack.vue   |  9 ++++-----
 .../theme/ningbo_01/menus/menuSwitch.vue      | 20 +++++++++----------
 10 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js
index cf5d1a42a..10db168cc 100644
--- a/src/jmapNew/shape/Station/index.js
+++ b/src/jmapNew/shape/Station/index.js
@@ -495,6 +495,7 @@ export default class Station extends Group {
         this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.text.fontColor);
         this.interconnectedControl && this.interconnectedControl.setColor(this.style.Station.StationControl.lamp.grayColor);
         this.interconnectedControl && this.interconnectedControl.setTextColor(this.style.Station.StationControl.text.fontColor);
+        this.controlPreReset && this.controlPreReset.setColor(this.style.Station.StationControl.lamp.grayColor);
 
         this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
         this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.grayColor);
@@ -522,6 +523,7 @@ export default class Station extends Group {
         //     });
         //     //
         // }
+        model.preResetValidDuration && this.handlePreResetLamp();
         model.controller && this.handleComplexControl(model.controller);
         if (this.style.Station.syncCentralizeStation && (model.controlMode || model.controller) && model.centralized) {
             model.chargeStationCodeList.forEach(item => {
@@ -544,7 +546,9 @@ export default class Station extends Group {
             });
         }
     }
-
+    handlePreResetLamp() {
+        this.controlPreReset && this.controlPreReset.setColor('#f00');
+    }
     handleComplexControl(controller) {
         const memberData = store.state.training.memberData;
         if (memberData[controller].userId) {
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue b/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue
index a157ada12..726f81ac6 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue
@@ -87,10 +87,6 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             this.menu = MenuContextHandler.covert(this.menuNormal);
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
             if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                 const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
                 const memberData = this.$store.state.training.memberData;
@@ -101,6 +97,10 @@ export default {
                     });
                 }
             }
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
         },
         doShow(point) {
             this.clickEvent();
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
index aa5402fa0..d60e20c46 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
@@ -184,10 +184,6 @@ export default {
             } else {
                 this.menu = [];
             }
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT && this.selected.type != '04') {
-                this.menu = this.menuForce;
-            }
             if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                 const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
                 const memberData = this.$store.state.training.memberData;
@@ -198,6 +194,10 @@ export default {
                     });
                 }
             }
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT && this.selected.type != '04') {
+                this.menu = this.menuForce;
+            }
         },
         doShow(point) {
             this.clickEvent();
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
index 5a5e06604..4115724ca 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
@@ -231,10 +231,6 @@ export default {
         },
         initMenu() {
             this.menu = MenuContextHandler.covert(this.menuNormal);
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
             if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                 const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
                 const memberData = this.$store.state.training.memberData;
@@ -245,6 +241,10 @@ export default {
                     });
                 }
             }
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
         },
         executeConfirm(operate) {
             if (operate.operation === OperationEvent.Signal.unlock.confirm.operation) {
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
index fc3d88d1d..4f3813754 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
@@ -131,10 +131,6 @@ export default {
         initMenu() {
             if (this.selected.centralized) {
                 this.menu = MenuContextHandler.covert(this.menuNormal);
-                // 故障模式菜单列表
-                if (this.operatemode === OperateMode.FAULT) {
-                    this.menu = this.menuForce;
-                }
                 if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                     const memberData = this.$store.state.training.memberData;
                     const userId = this.$store.state.user.id;
@@ -144,6 +140,10 @@ export default {
                         });
                     }
                 }
+                // 故障模式菜单列表
+                if (this.operatemode === OperateMode.FAULT) {
+                    this.menu = this.menuForce;
+                }
             }
         },
         doShow(point) {
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue
index 080af2fca..689e94abd 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue
@@ -78,10 +78,6 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             this.menu = MenuContextHandler.covert(this.menuNormal);
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
             if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                 const memberData = this.$store.state.training.memberData;
                 const userId = this.$store.state.user.id;
@@ -92,6 +88,10 @@ export default {
                     });
                 }
             }
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
         },
         doShow(point) {
             this.clickEvent();
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue
index 87a35d381..b6ef04548 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue
@@ -82,10 +82,6 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             this.menu = MenuContextHandler.covert(this.menuNormal);
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
             this.getCurrentStateObject();
             if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                 const memberData = this.$store.state.training.memberData;
@@ -96,6 +92,10 @@ export default {
                     });
                 }
             }
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
         },
         doShow(point) {
             this.clickEvent();
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
index 2ec60a4c3..b71c5840e 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
@@ -185,11 +185,6 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             this.menu = MenuContextHandler.covert(this.menuNormal);
-
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
             if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                 const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
                 const memberData = this.$store.state.training.memberData;
@@ -200,6 +195,10 @@ export default {
                     });
                 }
             }
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
         },
         doShow(point) {
             this.clickEvent();
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue
index 86aab4fdb..01dec98f4 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue
@@ -80,11 +80,6 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             this.menu = MenuContextHandler.covert(this.menuNormal);
-
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
             if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                 const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
                 const memberData = this.$store.state.training.memberData;
@@ -95,6 +90,10 @@ export default {
                     });
                 }
             }
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                this.menu = this.menuForce;
+            }
         },
         doShow(point) {
             this.clickEvent();
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
index 542b45a8f..298dc75fe 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
@@ -186,6 +186,16 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             this.menu = MenuContextHandler.covert(this.menuNormal);
+            if (this.$store.state.training.mode === TrainingMode.NORMAL) {
+                const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
+                const memberData = this.$store.state.training.memberData;
+                const userId = this.$store.state.user.id;
+                if (!station.controller || !memberData[station.controller] || memberData[station.controller].userId != userId) {
+                    this.menu.forEach(item => {
+                        item.disabled = true;
+                    });
+                }
+            }
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 // if (!this.$store.state.scriptRecord.bgSet) {
@@ -198,16 +208,6 @@ export default {
                 //     this.menu = this.menuForce;
                 // }
             }
-            if (this.$store.state.training.mode === TrainingMode.NORMAL) {
-                const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
-                const memberData = this.$store.state.training.memberData;
-                const userId = this.$store.state.user.id;
-                if (!station.controller || !memberData[station.controller] || memberData[station.controller].userId != userId) {
-                    this.menu.forEach(item => {
-                        item.disabled = true;
-                    });
-                }
-            }
         },
         doShow(point) {
             this.clickEvent();

From 6068ea00eff57fb79fb017ccbc73d87edb935674 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 23 Feb 2021 13:43:09 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BA=BF=E8=B7=AF?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AEstationPreResetBeforeAxlePreReset?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/configLine/config.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue
index 6ecc306d9..e574f03c0 100644
--- a/src/views/system/configLine/config.vue
+++ b/src/views/system/configLine/config.vue
@@ -103,7 +103,8 @@ export default {
                 'allowEarlyDepartureWhenHoldTrain',
                 'standSkipSetTrainOnlyOnce',
                 'blockadeCommandOnlyValidInStandbyMode',
-                'ebwhenCancelRoute'
+                'ebwhenCancelRoute',
+                'stationPreResetBeforeAxlePreReset'
             ],
             selectList: ['runMode'],
             generalConfig: [
@@ -137,7 +138,8 @@ export default {
                 'allowEarlyDepartureWhenHoldTrain',
                 'standSkipSetTrainOnlyOnce',
                 'blockadeCommandOnlyValidInStandbyMode',
-                'ebwhenCancelRoute'
+                'ebwhenCancelRoute',
+                'stationPreResetBeforeAxlePreReset'
             ],
             rangeList: ['noParkingSM', 'parkingSM'],
             speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@@ -176,7 +178,8 @@ export default {
                 allowEarlyDepartureWhenHoldTrain: '扣车时是否允许提前发车',
                 standSkipSetTrainOnlyOnce: '站台指定列车跳停仅跳停一次',
                 blockadeCommandOnlyValidInStandbyMode: '封锁命令（状态）仅在后备模式下有效',
-                ebwhenCancelRoute: '取消进路时列车紧急制动'
+                ebwhenCancelRoute: '取消进路时列车紧急制动',
+                stationPreResetBeforeAxlePreReset: '计轴预复位前需要车站预复位'
             }
         };
     },

From 1eb5dd05c3a997c56fb9c2445c98b9ebc2971cbd Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 23 Feb 2021 14:20:05 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/StationTurnBack/index.js | 56 ++++++++++++----------
 src/jmapNew/theme/factory.js               |  2 +-
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/jmapNew/shape/StationTurnBack/index.js b/src/jmapNew/shape/StationTurnBack/index.js
index 4ae460803..e7cc18eab 100644
--- a/src/jmapNew/shape/StationTurnBack/index.js
+++ b/src/jmapNew/shape/StationTurnBack/index.js
@@ -13,11 +13,11 @@ export default class StationTurnBack extends Group {
         this.zlevel = model.zlevel;
         this.z = 40;
         this.model = model;
-		this.style = style;
-		this.lineCode = lineCode;
+        this.style = style;
+        this.lineCode = lineCode;
         this.isShowShape = true;
         this.create();
-		this.createMouseEvent();
+        this.createMouseEvent();
         this.setState(model);
         this.setShowMode();
     }
@@ -75,7 +75,7 @@ export default class StationTurnBack extends Group {
                         textVerticalAlign: 'bottom'
                     }
                 });
-				this.add(this.text);
+                this.add(this.text);
             }
             let turnName = '按计划执行';
             if (this.lineCode == '03') {
@@ -114,11 +114,11 @@ export default class StationTurnBack extends Group {
         }
     }
 
-	createMouseEvent() {
+    createMouseEvent() {
         if (this.style.LcControl.mouseOverStyle) {
-			this.mouseEvent = new EMouse(this);
+            this.mouseEvent = new EMouse(this);
             this.add(this.mouseEvent);
-	        this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
+            this.on('mouseout', (e) => { this.mouseEvent.mouseout(e); });
             this.on('mouseover', (e) => { this.mouseEvent.mouseover(e); });
         }
     }
@@ -158,28 +158,28 @@ export default class StationTurnBack extends Group {
         }
     }
 
-	setAshShow() {
-		this.control &&  this.control.setStyle({fill:'#FFF'});
-	}
+    setAshShow() {
+        this.control && this.control.setStyle({fill:'#FFF'});
+    }
 
     // 设置状态
     setState(model, tbStrategyId = null) {
         if (!this.isShowShape) return;
-		this.recover();
+        this.recover();
 
-		// 只响应前端自定义类型的状态变化
-		if (model._free) {
-			this.setAshShow()
-		} else {
-			if (tbStrategyId) {
-				model.tbStrategyId = tbStrategyId;
-				model.optionList.forEach(item => {
-					if (item.id == tbStrategyId) {
-						this.handleStatus(item.label);
-					}
-				});
-			}
-		}
+        // 只响应前端自定义类型的状态变化
+        if (model._free) {
+            this.setAshShow();
+        } else {
+            if (tbStrategyId) {
+                model.tbStrategyId = tbStrategyId;
+                model.optionList.forEach(item => {
+                    if (item.id == tbStrategyId) {
+                        this.handleStatus(item.label);
+                    }
+                });
+            }
+        }
     }
     getShapeTipPoint() {
         const rect = this.control.getBoundingRect();
@@ -213,7 +213,11 @@ export default class StationTurnBack extends Group {
         return this.model.position;
     }
 
-	getBoundingRect() {
-        return this.strategyText.getBoundingRect()||this.control.getBoundingRect();
+    getBoundingRect() {
+        if (this.strategyText && this.strategyText.getBoundingRect()) {
+            return this.strategyText.getBoundingRect();
+        } else if (this.control && this.control.getBoundingRect()) {
+            return this.control.getBoundingRect();
+        }
     }
 }
diff --git a/src/jmapNew/theme/factory.js b/src/jmapNew/theme/factory.js
index 9b21255df..b7551865b 100644
--- a/src/jmapNew/theme/factory.js
+++ b/src/jmapNew/theme/factory.js
@@ -32,7 +32,7 @@ class Theme {
             '11': 'all',
             '12': 'all',
             '13':'all',
-            '14':'all'
+            '14':'ecStation'
         };
     }
 

From a8a3a8a5ccf2ebf49703db1405f0b8e76a8478fa Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Tue, 23 Feb 2021 14:54:14 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=EF=BC=9A=E5=8D=97?=
 =?UTF-8?q?=E4=BA=AC2=EF=BC=8C=E5=AE=81=E6=B3=A21=EF=BC=8C=E5=AE=81?=
 =?UTF-8?q?=E6=B3=A23=20=E9=97=AE=E9=A2=98=EF=BC=9A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E7=9A=84=E5=AE=9E=E8=AE=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/haerbin_01/model.js         |  3 +-
 .../theme/nanjing_02/menus/menuButton.vue     |  2 +-
 .../theme/nanjing_02/operationConfig.js       | 14 ++++----
 .../ningbo_01/menus/dialog/passwordInput.vue  |  4 +--
 .../ningbo_01/menus/dialog/routerCommand.vue  |  6 +++-
 .../theme/ningbo_01/operationConfig.js        |  6 ++--
 .../menuDialog/initializeSignalGuide.vue      | 33 +++++++++++--------
 .../menus/menuDialog/signalGuide.vue          | 27 +++++++++------
 .../theme/ningbo_03/operationConfig.js        |  3 +-
 src/jmapNew/utils/parser.js                   | 10 ++++++
 10 files changed, 71 insertions(+), 37 deletions(-)

diff --git a/src/jmapNew/theme/haerbin_01/model.js b/src/jmapNew/theme/haerbin_01/model.js
index 53a250e7f..43eb8879e 100644
--- a/src/jmapNew/theme/haerbin_01/model.js
+++ b/src/jmapNew/theme/haerbin_01/model.js
@@ -33,7 +33,8 @@ class Model {
         this['private'][deviceType.Signal] = {
             nameShow: true,										// 信号机名称显示
             linkageAutoRouteShow: true,							// 联锁自动进路表示灯显示
-            atsAutoTriggerShow: true							// ATS自动触发表示灯显示
+            atsAutoTriggerShow: true,							// ATS自动触发表示灯显示
+			aliasCodes: []										// 信号机别名列表
         };
         this['private'][deviceType.Train] = {
         };
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
index c86703dc4..95cd8fd2d 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
@@ -1100,7 +1100,7 @@ export default {
                 { name: '追踪单开', commandTip: '设置单架信号机处于联锁自动排列进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.setAutoTrigger.menuButton, disabledCb: (stationControl) => !this.modeMatch }, //  || stationControl.ciControl
                 { name: '追踪单关', commandTip: '取消单架信号机处于联锁自动排列进路', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.cancelAutoTrigger.menuButton, disabledCb: (stationControl) => !this.modeMatch }, // || !stationControl.ciControl
 
-                { name: '开放引导', commandTip: '开放引导信号', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
+                { name: '开放引导', commandTip: '开放引导信号', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.guide.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '车队单开', commandTip: '对单架信号机开启车队模式，主要是信号机不关闭的情况下排列所有进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '车队单关', commandTip: '对单架信号机关闭车队模式', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
                 { name: '设置保护', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl) => !this.modeMatch },
diff --git a/src/jmapNew/theme/nanjing_02/operationConfig.js b/src/jmapNew/theme/nanjing_02/operationConfig.js
index 05fe88e34..43623fdcc 100644
--- a/src/jmapNew/theme/nanjing_02/operationConfig.js
+++ b/src/jmapNew/theme/nanjing_02/operationConfig.js
@@ -658,16 +658,18 @@ export default {
             minDuration: 8,
             operateType: 'Signal_Set_Guide',
             skinCode: '07',
-            trainingName: '开放引导({3})',
+            trainingName: '开放引导({5})',
             trainingRemark: '开放引导功能',
             trainingType: 'Signal',
             productTypes: ['01', '02'],
             stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'START_SIGNAL'},
-                { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL'},
-                { deviceType: '04', orderNum: 3, operateCode: '3087', tip: '鼠标左键点击【开放引导】按钮' },
-                { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
-            ]
+                { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机' },
+                { deviceType: '04', orderNum: 2, operateCode: '3087', tip: '鼠标左键点击【开放引导】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' },
+				{ deviceType: '04', orderNum: 4, operateCode: '0081', tip: '鼠标左键点击【CR1】按钮' },
+                { deviceType: '04', orderNum: 5, operateCode: '0082', tip: '鼠标左键点击【CR2】按钮' }
+            ],
+			config: {onlySignalOP:true}
         },
         {
             maxDuration: 15,
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/passwordInput.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/passwordInput.vue
index 90a59857a..af9e53bba 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/passwordInput.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/passwordInput.vue
@@ -47,7 +47,7 @@ export default {
     },
     computed: {
         confirmId() {
-            return this.operation.domId;
+            return OperationEvent.Command.close.password.domId;
         }
     },
     methods: {
@@ -67,7 +67,7 @@ export default {
             if ( this.password !== 'root' ) {
                 this.messageShow = true;
             } else {
-                commitOperate({operation: this.operation}, {}, 1).then(({valid, operate}) => {
+                commitOperate({operation: OperationEvent.Command.close.password.operation}, {}, 1, this.password).then(({valid, operate}) => {
                     if (valid && this.operation === OperationEvent.StationLight.SetOrCancelForceLight.password.operation) {
                         this.show = false;
                         this.$emit('confirm');
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue
index 98cde1989..fdbcc9b8f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue
@@ -62,7 +62,11 @@ export default {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
         domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Signal.humanTrainRoute.menu.domId : '';
+			return this.operate == OperationEvent.Signal.humanTrainRoute.menu.operation
+				? OperationEvent.Signal.humanTrainRoute.menu.domId
+				: this.operate == OperationEvent.Signal.guide.confirm.operation
+					? OperationEvent.Signal.guide.menu.domId
+					: ''
         },
         title() {
             if (this.operate == OperationEvent.Signal.humanTrainRoute.menu.operation) {
diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js
index 43215c347..aa4d9524e 100644
--- a/src/jmapNew/theme/ningbo_01/operationConfig.js
+++ b/src/jmapNew/theme/ningbo_01/operationConfig.js
@@ -721,8 +721,10 @@ export default {
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【引导】' },
-                { deviceType: '04', orderNum: 2, operateCode: '308', tip: '鼠标左键点击【确定】按钮' }
-            ]
+				{ deviceType: '04', orderNum: 2, operateCode: '0011', tip: '请输入密码"root",点击【确认】按钮', val: 'root' },
+				{ deviceType: '04', orderNum: 3, operateCode: '308', tip: '鼠标左键点击【确定】按钮' },
+            ],
+			config: {onlySignalOP:true}
         },
         {
             maxDuration: 15,
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalGuide.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalGuide.vue
index b8bde572c..bd871dca3 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalGuide.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalGuide.vue
@@ -7,6 +7,7 @@
           :data="signalList"
           highlight-current-row
           height="300px"
+		  :id="domIdChoose"
           @current-change="handleCurrentChange"
         >
           <el-table-column prop="name" label="信号机" />
@@ -33,7 +34,7 @@
           <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected || !selected.callOn" @click="commit(true)">确定(O)</el-button>
         </el-col>
         <el-col :span="4" :offset="2">
-          <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected || !selected.callOn" @click="commit(false)">应用(A)</el-button>
+          <el-button :id="domIdApply" type="primary" :loading="loading" :disabled="!selected || !selected.callOn" @click="commit(false)">应用(A)</el-button>
         </el-col>
         <el-col :span="4" :offset="2">
           <el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
@@ -83,15 +84,18 @@ export default {
         selected() {
             return this.$store.state.menuOperation.selected;
         },
-        domIdClose() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdChoose() {
-            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
+		domIdChoose() {
+			return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
         },
         domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
+            return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
+		},
+		domIdClose() {
+            return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
         },
+        domIdApply() {
+            return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
+		},
         title() {
             return '初始化引导';
         }
@@ -154,9 +158,9 @@ export default {
         },
         commit(isClose = false) {
             const step = {
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Signal.guide.confirm.operation,
-                param: {}
+                operation: isClose
+					? OperationEvent.Command.common.confirm.operation
+					: OperationEvent.Command.common.apply.operation,
             };
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
@@ -176,8 +180,11 @@ export default {
             this.commandEleCode = null;
             const step = {
                 code: `${val.code}`,
-                operation: OperationEvent.Signal.guide.choose.operation,
-                param: {}
+                operation: OperationEvent.Command.common.choose.operation,
+				val: val.code,
+                param: {
+					signalCode: val.code
+				}
             };
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
@@ -196,7 +203,7 @@ export default {
         },
         cancel() {
             const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
+                operation: OperationEvent.Command.common.close.operation
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
index 13b91463f..c7625f3a6 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
@@ -41,7 +41,7 @@
         <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(true)">确定(O)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(false)">应用(A)</el-button>
+        <el-button :id="domIdApply" type="primary" :loading="loading" @click="commit(false)">应用(A)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
         <el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
@@ -87,15 +87,18 @@ export default {
         selected() {
             return this.$store.state.menuOperation.selected;
         },
-        domIdClose() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdChoose() {
-            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
+		domIdChoose() {
+			return this.dialogShow ? OperationEvent.Command.common.choose1.domId : ''
         },
         domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
+            return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : '';
+		},
+		domIdClose() {
+            return this.dialogShow ? OperationEvent.Command.common.close1.domId : '';
         },
+        domIdApply() {
+            return this.dialogShow ? OperationEvent.Command.common.apply1.domId : '';
+		},
         title() {
             return '确认/取消引导';
         }
@@ -125,8 +128,12 @@ export default {
         },
         commit(isClose = false) {
             const operate = {
-                cmdType: this.command ? CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE : CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE,
-                operation: this.command ? OperationEvent.Signal.guide.confirm1.operation : OperationEvent.Signal.cancelGuide.confirm1.operation,
+                cmdType: this.command
+					? CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
+					: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE,
+                operation: this.command
+					? OperationEvent.Command.common.confirm1.operation
+					: OperationEvent.Command.common.apply1.operation,
                 over: true,
                 param: {signalCode: this.selected.code}
             };
@@ -175,7 +182,7 @@ export default {
         },
         cancel() {
             const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
+                operation: OperationEvent.Command.common.close1.operation
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
diff --git a/src/jmapNew/theme/ningbo_03/operationConfig.js b/src/jmapNew/theme/ningbo_03/operationConfig.js
index 6afb2a82d..afa8f6e8c 100644
--- a/src/jmapNew/theme/ningbo_03/operationConfig.js
+++ b/src/jmapNew/theme/ningbo_03/operationConfig.js
@@ -310,7 +310,8 @@ export default {
 				{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择信号机【{5}】', codeType:'SIGNAL', val: '{6}' },
 				{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
 				{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }
-			]
+			],
+			config: {onlySignalOP:true}
 		},
 		{
 			maxDuration: 15,
diff --git a/src/jmapNew/utils/parser.js b/src/jmapNew/utils/parser.js
index f736a2229..600cf4d87 100644
--- a/src/jmapNew/utils/parser.js
+++ b/src/jmapNew/utils/parser.js
@@ -282,6 +282,16 @@ export function parser(data, skinCode, showConfig) {
         zrUtil.each(data.overlapList || [], elem => {
             mapDevice[elem.code] = createDevice(deviceType.OverAp, elem, propConvert, showConfig);
         });
+
+		// 二次处理
+		// zrUtil.each(data.stationStandList || [], elem => {
+		// 	const device = mapDevice[elem.code];
+		// 	if (device.aliasCodes) {
+		// 		// 信号机别名列表
+		// 		device
+		// 	}
+        //     mapDevice[elem.code] = createDevice(deviceType.StationStand, elem, propConvert, showConfig);
+        // }, this);
     }
 
     return mapDevice;

From d7d3fee04476ce8c6e5d86da02ea46c11f4e11c7 Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Tue, 23 Feb 2021 16:32:42 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=EF=BC=9A=E6=88=90?=
 =?UTF-8?q?=E9=83=BD3=EF=BC=8C=E4=BD=9B=E5=B1=B11=EF=BC=8C=E8=A5=BF?=
 =?UTF-8?q?=E5=AE=892=20=E9=97=AE=E9=A2=98=EF=BC=9A=20a.=E6=88=90=E9=83=BD?=
 =?UTF-8?q?3=E5=AE=9E=E8=AE=AD=E6=8F=8F=E8=BF=B0=E9=97=AE=E9=A2=98=20b.?=
 =?UTF-8?q?=E4=BD=9B=E5=B1=B1=E5=BC=95=E5=AF=BC=E5=AE=9E=E8=AE=AD=E4=B8=8D?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=20c.=E8=A5=BF?=
 =?UTF-8?q?=E5=AE=892=E5=BC=95=E5=AF=BC=E5=AE=9E=E8=AE=AD=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/chengdu_03/operationConfig.js           | 8 +++-----
 .../theme/foshan_01/menus/dialog/routerCommand.vue        | 6 +++++-
 src/jmapNew/theme/foshan_01/operationConfig.js            | 2 +-
 src/jmapNew/theme/xian_02/operationConfig.js              | 3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/jmapNew/theme/chengdu_03/operationConfig.js b/src/jmapNew/theme/chengdu_03/operationConfig.js
index d233080a4..a6d6e9113 100644
--- a/src/jmapNew/theme/chengdu_03/operationConfig.js
+++ b/src/jmapNew/theme/chengdu_03/operationConfig.js
@@ -138,7 +138,6 @@ export default {
                 { deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', codeType:'END_SIGNAL' }
             ]
         },
-        /** 暂不生成实训 */
         {
             maxDuration: 15,
             minDuration: 8,
@@ -152,10 +151,9 @@ export default {
                 { 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: '鼠标左键点击【确认】按钮' }
+                { deviceType: '04', orderNum: 4, operateCode: '3082', tip: '鼠标左键点击【执行】按钮' }
             ]
         },
-        /** 暂不生成实训 */
         {
             maxDuration: 15,
             minDuration: 8,
@@ -212,7 +210,7 @@ export default {
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【总人解】' },
                 { deviceType: '04', orderNum: 2, operateCode: '305', tip: '鼠标左键点击【确定】按钮', val: '{6}' },
-                { deviceType: '04', orderNum: 3, operateCode: '3051', tip: '输入密码123456，点击【确定】按钮' }
+                { deviceType: '04', orderNum: 3, operateCode: '3051', tip: '输入密码123，点击【执行】按钮' }
             ]
         },
         { // 不生成实训
@@ -226,7 +224,7 @@ export default {
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '3050', tip: '鼠标左键点击【总人解】' },
-                { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确定】按钮' },
+                { deviceType: '04', orderNum: 2, operateCode: '0011', tip: '输入密码123，点击【确定】按钮' },
                 { deviceType: '04', orderNum: 3, operateCode: '3050', tip: '鼠标左键点击【{5}】', val: '{6}' }
             ]
         },
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/routerCommand.vue b/src/jmapNew/theme/foshan_01/menus/dialog/routerCommand.vue
index a833b0dcc..f38286c03 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/routerCommand.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/routerCommand.vue
@@ -58,7 +58,11 @@ export default {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
         domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Signal.cancelGuide.menu.domId : '';
+			 if (this.operate == OperationEvent.Signal.cancelGuide.menu.operation) {
+                return OperationEvent.Signal.cancelGuide.menu.domId
+            } else if (this.operate == OperationEvent.Signal.guide.menu.operation) {
+                return OperationEvent.Signal.guide.menu.domId
+            }
         },
         title() {
             if (this.operate == OperationEvent.Signal.cancelGuide.menu.operation) {
diff --git a/src/jmapNew/theme/foshan_01/operationConfig.js b/src/jmapNew/theme/foshan_01/operationConfig.js
index 0baf9d0e0..a2f4ef219 100644
--- a/src/jmapNew/theme/foshan_01/operationConfig.js
+++ b/src/jmapNew/theme/foshan_01/operationConfig.js
@@ -715,7 +715,7 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
-        { // 暂不生成实训
+        {
             maxDuration: 8,
             minDuration: 5,
             operateType:CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE.value,
diff --git a/src/jmapNew/theme/xian_02/operationConfig.js b/src/jmapNew/theme/xian_02/operationConfig.js
index a1896b8ed..3459b2afe 100644
--- a/src/jmapNew/theme/xian_02/operationConfig.js
+++ b/src/jmapNew/theme/xian_02/operationConfig.js
@@ -396,7 +396,8 @@ export default {
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【引导信号】' },
                 { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
-            ]
+            ],
+			config: {onlySignalOP:true}
         },
         {
             maxDuration: 15,