diff --git a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
index 68a8db975..b706da32d 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
@@ -107,11 +107,7 @@ export default {
 			}
 		},
 		domIdConfirm() {
-			if (this.operate && this.operate.operateCode) {
-				return this.dialogShow ? getDomIdByOperation(this.operate.operateCode) : '';
-			} else {
-				return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-			}
+			return this.dialogShow ? getDomIdByOperation(this.operate.operateNext) : '';
 		}
 	},
 	mounted() {
@@ -135,29 +131,10 @@ export default {
 			this.$store.dispatch('training/emitTipFresh');
 		},
 		commit() {
-			const operate = {
-				send: this.operate.operateCode != null,
-				type: this.operate.type,
-				operation: this.operate.operateCode != null ? this.operate.operateCode : OperationEvent.Command.close.confirm.operation
-			};
-			if (this.operate.val) {
-				operate['val'] = this.operate.val;
-			}
-
 			if (this.passwordCheck === this.correctPassword) {
-				this.$store.dispatch('training/next', operate).then(({ valid }) => {
-					this.loading = false;
-
-					if (valid) {
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-						this.$emit('checkOver');
-						this.doClose();
-						this.inputClear();
-					}
-				}).catch(() => {
-					this.loading = false;
-					this.$refs.noticeInfo && this.$refs.noticeInfo.doShow(operate);
-				});
+				this.$emit('checkOver', this.operate);
+				this.doClose();
+				this.inputClear();
 			} else {
 				this.showMistake = true;
 			}
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue
index d959ba7e3..6af5a13b5 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue
@@ -27,7 +27,7 @@
       </el-col>
     </el-row>
     <confirm-control ref="confirmControl" />
-    <password-box ref="password" @checkOver="doClose" />
+    <password-box ref="password" @checkOver="passWordCommit" />
     <notice-info ref="noticeInfo" />
   </el-dialog>
 </template>
@@ -79,10 +79,6 @@ export default {
 				return '信号封锁';
 			} else if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
 				return '信号解封';
-			} else if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-				return '进路收人工控';
-			} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-				return '进路交自动控';
 			} else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
 				return '信号关灯';
 			}
@@ -138,17 +134,26 @@ export default {
 			} else if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
 				/** 信号解封*/
 				this.unlock();
-			} else if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-				/** 进路收人工控*/
-				this.humanControl();
-			} else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-				/** 进路交自动控*/
-				this.atsAutoControl();
 			} else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
 				/** 信号关灯*/
 				this.signalClose();
 			}
 		},
+		passWordCommit(data) {
+			const operate = {
+				send: true,
+				type: data.type,
+				operation: data.operateNext
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) { this.doClose(); }
+			}).catch(() => {
+				this.doClose();
+				this.$refs.noticeInfo.doShow(operate);
+			});
+
+		},
 		// 取消列车进路
 		cancelTrainRoute() {
 			if (this.$store.state.training.prdType == '01') {
@@ -174,7 +179,6 @@ export default {
 					this.doClose();
 				}
 			}).catch(() => {
-				this.loading = false;
 				this.doClose();
 				this.$refs.noticeInfo.doShow(operate);
 			});
@@ -194,7 +198,6 @@ export default {
 					this.doClose();
 				}
 			}).catch(() => {
-				this.loading = false;
 				this.doClose();
 				this.$refs.noticeInfo.doShow(operate);
 			});
@@ -204,7 +207,7 @@ export default {
 			const operate = {
 				type: MapDeviceType.Signal.type,
 				operation: OperationEvent.Signal.humanTrainRoute.menu.operation,
-				operateCode: OperationEvent.Signal.humanTrainRoute.confirm.operation
+				operateNext: OperationEvent.Signal.humanTrainRoute.confirm.operation
 			};
 
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -213,7 +216,6 @@ export default {
 					this.$refs.password.doShow(operate);
 				}
 			}).catch(() => {
-				this.loading = false;
 				this.doClose();
 				this.$refs.noticeInfo.doShow(operate);
 			});
@@ -233,7 +235,6 @@ export default {
 					this.doClose();
 				}
 			}).catch(() => {
-				this.loading = false;
 				this.doClose();
 				this.$refs.noticeInfo.doShow(operate);
 			});
@@ -243,7 +244,7 @@ export default {
 			const operate = {
 				type: MapDeviceType.Signal.type,
 				operation: OperationEvent.Signal.lock.menu.operation,
-				operateCode: OperationEvent.Signal.lock.confirm.operation
+				operateNext: OperationEvent.Signal.lock.confirm.operation
 			};
 
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -259,7 +260,7 @@ export default {
 			const operate = {
 				type: MapDeviceType.Signal.type,
 				operation: OperationEvent.Signal.unlock.menu.operation,
-				operateCode: OperationEvent.Signal.unlock.confirm.operation
+				operateNext: OperationEvent.Signal.unlock.confirm.operation
 			};
 
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -270,51 +271,6 @@ export default {
 			}).catch(() => {
 			});
 		},
-		// 进路收人工控
-		humanControl() {
-			const operate = {
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Signal.humanControl.menu.operation,
-				operateCode: OperationEvent.Signal.humanControl.confirm.operation,
-				val: this.operateCode
-			};
-
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.password.doShow(operate);
-				}
-			}).catch(() => {
-				this.loading = false;
-				// this.doClose();
-				// this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		// 进路交自动控
-		atsAutoControl() {
-			const operate = {
-				// send: true,
-				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Signal.atsAutoControl.menu.operation,
-				operateCode: OperationEvent.Signal.atsAutoControl.confirm.operation,
-				val: this.operateCode
-			};
-
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.password.doShow(operate);
-				}
-			}).catch(() => {
-				this.loading = false;
-				// this.doClose();
-				// this.$refs.noticeInfo.doShow(operate);
-			});
-		},
 		// 信号关灯
 		signalClose() {
 			const operate = {
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue
index a17a5c0a5..847ab9fd2 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/routeGuide.vue
@@ -45,7 +45,7 @@
       </el-col>
     </el-row>
     <notice-info ref="noticeInfo" />
-    <password-box ref="passwordBox" @checkOver="doClose" />
+    <password-box ref="passwordBox" @checkOver="passWordCommit" />
   </el-dialog>
 </template>
 
@@ -149,6 +149,25 @@ export default {
 				this.$store.dispatch('training/emitTipFresh');
 			});
 		},
+		passWordCommit(data) {
+			const operate = {
+				send: true,
+				type: data.type,
+				operation: data.operateNext
+			};
+
+			this.loading = true;
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				this.loading = false;
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.loading = false;
+				this.doClose();
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
 		doClose() {
 			this.loading = false;
 			this.dialogShow = false;
@@ -179,7 +198,7 @@ export default {
 				const operate = {
 					type: MapDeviceType.Signal.type,
 					operation: OperationEvent.Signal.guide.menu.operation,
-					operateCode: OperationEvent.Signal.guide.confirm.operation
+					operateNext: OperationEvent.Signal.guide.confirm.operation
 				};
 
 				this.loading = true;
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue
index 3b262fa86..ddf690e1e 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/sectionControl.vue
@@ -27,7 +27,7 @@
       </el-col>
     </el-row>
     <notice-info ref="noticeInfo" />
-    <password-box ref="passwordBox" @checkOver="doClose" />
+    <password-box ref="passwordBox" @checkOver="passWordCommit" />
   </el-dialog>
 </template>
 
@@ -129,6 +129,22 @@ export default {
 				this.fault();
 			}
 		},
+		passWordCommit(data) {
+			const operate = {
+				send: true,
+				type: data.type,
+				operation: data.operateNext
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.doClose();
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
 		// 道岔单锁
 		lock() {
 			const operate = {
@@ -192,10 +208,9 @@ export default {
 		// 区故解
 		fault() {
 			const operate = {
-				// send: true,
 				type: MapDeviceType.Section.type,
 				operation: OperationEvent.Section.fault.menu.operation,
-				operateCode: OperationEvent.Section.fault.confirm.operation
+				operateNext: OperationEvent.Section.fault.confirm.operation
 			};
 
 			this.loading = true;
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue
index 4de269dad..911e471b5 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/switchControl.vue
@@ -31,7 +31,7 @@
       </el-col>
     </el-row>
     <notice-info ref="noticeInfo" />
-    <password-box ref="passwordBox" @checkOver="doClose" />
+    <password-box ref="passwordBox" @checkOver="passWordCommit" />
   </el-dialog>
 </template>
 
@@ -153,6 +153,22 @@ export default {
 				this.openPasswordBox(this.operation, OperationEvent.Switch.fault.confirm.operation);
 			}
 		},
+		passWordCommit(data) {
+			const operate = {
+				send: true,
+				type: data.type,
+				operation: data.operateNext
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.doClose();
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
 		// 道岔单锁
 		lock() {
 			const operate = {
@@ -311,11 +327,11 @@ export default {
 			});
 		},
 		// 打开密码输入框
-		openPasswordBox(operation, code) {
+		openPasswordBox(operation, operateNext) {
 			const operate = {
 				type: MapDeviceType.Switch.type,
 				operation: operation,
-				operateCode: code
+				operateNext: operateNext
 			};
 			this.loading = true;
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue
index c778ce917..210adccf0 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue
@@ -1,158 +1,153 @@
 <template>
-    <el-dialog class="chengdou-03__systerm route-create" :title="title" :visible.sync="show" width="580px"
-        label-position="top" :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false"
-        v-dialogDrag>
-        <div style="padding: 10px 20px; border: 1px solid lightgray;">
-            <el-form size="small" label-width="100px">
-                <el-form-item label="列车:" prop="trainCode">
-                    <el-select v-model="trainCode" filterable placeholder="列车">
-                        <el-option v-for="item in trainList" :key="item.code" :label="item.groupNumber"
-                            :value="item.code"></el-option>
-                    </el-select>
-                </el-form-item>
-                <!-- <el-form-item label="列车车次:" prop="tripNumber">
-                    <el-select v-model="tripNumber" filterable placeholder="列车车次">
-                        <el-option v-for="no in trainNoList" :key="no" :label="no" :value="no"></el-option>
-                    </el-select>
-                    <div style="font-size: 12px;">(上行路线车次号选择偶数，下行路线车次号选择基数)</div>
-                </el-form-item> -->
-                <el-form-item label="列车方向:" prop="direction">
-                    <el-select v-model="direction" filterable placeholder="列车方向">
-                        <el-option v-for="no in directionList" :key="no.value" :label="no.label" :value="no.value">
-                        </el-option>
-                    </el-select>
-                    <!-- <div style="font-size: 12px;">(上行路线车次号选择偶数，下行路线车次号选择基数)</div> -->
-                </el-form-item>
-            </el-form>
-            <el-row>
-                <el-col style="text-align: right;">
-                    <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-                    <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-                </el-col>
-            </el-row>
-        </div>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog v-dialogDrag class="chengdou-03__systerm route-create" :title="title" :visible.sync="show" width="380px" label-position="top" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <div style="padding: 10px 20px; border: 1px solid lightgray;">
+      <el-form size="small" label-width="100px">
+        <el-form-item label="列车:" prop="trainCode">
+          <el-select v-model="trainCode" filterable placeholder="列车">
+            <el-option
+              v-for="item in trainList"
+              :key="item.code"
+              :label="item.groupNumber"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="列车方向:" prop="direction">
+          <el-select v-model="direction" filterable placeholder="列车方向">
+            <el-option v-for="no in directionList" :key="no.value" :label="no.label" :value="no.value" />
+          </el-select>
+          <!-- <div style="font-size: 12px;">(上行路线车次号选择偶数，下行路线车次号选择基数)</div> -->
+        </el-form-item>
+      </el-form>
+      <el-row>
+        <el-col style="text-align: right;">
+          <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+          <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { getPublishTrainList } from '@/api/jmap/map';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { getPublishTrainList } from '@/api/jmap/map';
+import { mouseCancelState } from '../utils/menuItemStatus';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
-    export default {
-        name: 'RouteCreate',
-        components: {
-            NoticeInfo
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                trainList: [],
-                trainNoList: [],
-                directionList: [
-                    {
-                        value: '2',
-                        label: '上行'
-                    },
-                    {
-                        value: '1',
-                        label: '下行'
-                    }
-                ],
-                trainCode: '',
-                tripNumber: '',
-                direction: '',
-                selected: null
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'map'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return OperationEvent.Section.newtrain.menu.domId;
-            },
-            title() {
-                return '设置列车';
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadInitData(map) {
-                if (Object.keys(map || {}).length) {
-                    getPublishTrainList(map.skinCode).then(response => {
-                        this.trainList = response.data;
-                    }).catch(error => {
-                        this.$messageBox(`获取列车列表失败`);
-                    })
-                }
-            },
-            doShow(operate, selected) {
-                this.dialogShow = true;
-                this.selected = selected;
+export default {
+	name: 'RouteCreate',
+	components: {
+		NoticeInfo
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			trainList: [],
+			trainNoList: [],
+			directionList: [
+				{
+					value: '2',
+					label: '上行'
+				},
+				{
+					value: '1',
+					label: '下行'
+				}
+			],
+			trainCode: '',
+			tripNumber: '',
+			direction: '',
+			selected: null
+		};
+	},
+	computed: {
+		...mapGetters('map', [
+			'map'
+		]),
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		domIdConfirm() {
+			return OperationEvent.Section.newtrain.menu.domId;
+		},
+		title() {
+			return '设置列车';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		loadInitData(map) {
+			if (Object.keys(map || {}).length) {
+				getPublishTrainList(map.skinCode).then(response => {
+					this.trainList = response.data;
+				}).catch(() => {
+					this.$messageBox(`获取列车列表失败`);
+				});
+			}
+		},
+		doShow(operate, selected) {
+			this.dialogShow = true;
+			this.selected = selected;
+			console.log(this.map);
+			/** 加载列车数据*/
+			this.loadInitData(this.map);
 
-                /** 加载列车数据*/
-                this.loadInitData(this.map);
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.trainCode = '';
+			this.direction = '';
+			this.loading = false;
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+			mouseCancelState(this.selected);
+		},
+		commit() {
+			const operate = {
+				send: true,
+				type: MapDeviceType.Section.type,
+				operation: OperationEvent.Section.newtrain.menu.operation,
+				val: '' + this.direction + '::' + this.trainCode
+			};
+			this.loading = true;
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				this.loading = false;
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.loading = false;
+				this.doClose();
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
+		cancel() {
+			const operate = {
+				type: MapDeviceType.Section.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
 
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.trainCode = '';
-                this.direction = '';
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                mouseCancelState(this.selected);
-            },
-            commit() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Section.type,
-                    operation: OperationEvent.Section.newtrain.menu.operation,
-                    val: '' + this.direction + '::' + this.trainCode
-                }
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
-                    this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Section.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.doClose();
-                });
-            }
-        }
-    }
-</script>
\ No newline at end of file
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.doClose();
+			});
+		}
+	}
+};
+</script>
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue
index 2cf5460f1..f13e64a16 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue
@@ -1,180 +1,174 @@
 <template>
-    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="480px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div class="el-dialog-div">
-          <el-form size="small" label-width="80px" :model="addModel" :rules="rules" ref="form" label-position="left">
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="stationName">
-                  <span slot="label">车站</span>
-                  <el-input v-model="addModel.stationName" :disabled="true"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="trainWindowCode">
-                  <span slot="label">车次窗</span>
-                  <el-input v-model="addModel.trainWindowCode" :disabled="true"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item label="旧车组号" prop="oldGroupNumber">
-                  <el-select v-model="addModel.oldGroupNumber" filterable  disabled>
-                    <el-option v-for="train in trainList" :key="train.oldGroupNumber" :label="train.oldGroupNumber"
-                               :value="train.oldGroupNumber">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item label="新车组号" prop="newGroupNumber">
-                  <el-select v-model="addModel.newGroupNumber">
-                    <el-option v-for="train in trainList" :key="train.newGroupNumber" :label="train.newGroupNumber"
-                               :value="train.newGroupNumber">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-        <el-row justify="center" class="button-group-train">
-          <el-col :span="10" :offset="2">
-            <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+  <el-dialog v-dialogDrag class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="480px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <div class="el-dialog-div">
+      <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules" label-position="left">
+        <el-form-item>
+          <el-col :span="11">
+            <el-form-item prop="stationName">
+              <span slot="label">车站</span>
+              <el-input v-model="addModel.stationName" :disabled="true" />
+            </el-form-item>
           </el-col>
-          <el-col :span="8" :offset="4">
-            <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+          <el-col :span="11" :offset="1">
+            <el-form-item prop="trainWindowCode">
+              <span slot="label">车次窗</span>
+              <el-input v-model="addModel.trainWindowCode" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-form-item>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="旧车组号" prop="oldGroupNumber">
+              <el-select v-model="addModel.oldGroupNumber" filterable disabled>
+                <el-option v-for="train in trainList" :key="train.oldGroupNumber" :label="train.oldGroupNumber" :value="train.oldGroupNumber" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="1">
+            <el-form-item label="新车组号" prop="newGroupNumber">
+              <el-select v-model="addModel.newGroupNumber">
+                <el-option v-for="train in trainList" :key="train.newGroupNumber" :label="train.newGroupNumber" :value="train.newGroupNumber" />
+              </el-select>
+            </el-form-item>
           </el-col>
         </el-row>
-    </el-dialog>
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group-train">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import { getPublishTrainList } from '@/api/jmap/map';
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mouseCancelState } from '../utils/menuItemStatus';
+import { getPublishTrainList } from '@/api/jmap/map';
 
-    export default {
-        name: 'TrainEditNumber',
-        components: {
-        },
-        data() {
-            return {
-                trainNoList: [],
-                trainList: [],
-                selected: null,
-                addModel: {
-                    stationName:'',
-                    trainWindowCode: '',
-                    oldGroupNumber:'',
-                    newGroupNumber:'',
-                },
+export default {
+	name: 'TrainEditNumber',
+	components: {
+	},
+	data() {
+		return {
+			trainNoList: [],
+			trainList: [],
+			selected: null,
+			addModel: {
+				stationName: '',
+				trainWindowCode: '',
+				oldGroupNumber: '',
+				newGroupNumber: ''
+			},
 
-                rules: {
-                    newGroupNumber: [
-                        { required: true, message: '请输入新车组号', trigger: 'blur'}
-                    ],
-                },
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
-            },
-            title() {
-                return '修改车组号'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadInitData(map) {
-              if (map) {
-                getPublishTrainList(map.skinCode).then(resp => {
-                  this.trainList = resp.data;
-                }).catch(error => {
-                  this.$messageBox(`获取列车车组号失败`);
-                });
-              }
-            },
-            doShow(operate, selected) {
-                this.selected = selected;
-                //如果不是断点激活，则需要对初始值进行初始化
-                if (!this.dialogShow) {
-                    this.addModel ={
-                        stationName:'',
-                        trainWindowCode: '',
-                        oldGroupNumber:'',
-                        newGroupNumber:'',
-                    }
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                this.$store.dispatch('map/setTrainWindowShow', false);
-                mouseCancelState(this.selected);
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Train.editTrainNo.menu.operation,
-                        }
+			rules: {
+				newGroupNumber: [
+					{ required: true, message: '请输入新车组号', trigger: 'blur'}
+				]
+			},
+			dialogShow: false,
+			loading: false
+		};
+	},
+	computed: {
+		...mapGetters('map', [
+			'stationStandList'
+		]),
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		domIdConfirm() {
+			return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
+		},
+		title() {
+			return '修改车组号';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		loadInitData(map) {
+			if (map) {
+				getPublishTrainList(map.skinCode).then(resp => {
+					this.trainList = resp.data;
+				}).catch(() => {
+					this.$messageBox(`获取列车车组号失败`);
+				});
+			}
+		},
+		doShow(operate, selected) {
+			this.selected = selected;
+			// 如果不是断点激活，则需要对初始值进行初始化
+			if (!this.dialogShow) {
+				this.addModel ={
+					stationName: '',
+					trainWindowCode: '',
+					oldGroupNumber: '',
+					newGroupNumber: ''
+				};
+			}
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+			this.$store.dispatch('map/setTrainWindowShow', false);
+			mouseCancelState(this.selected);
+		},
+		commit() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					const operate = {
+						send: true,
+						type: MapDeviceType.Train.type,
+						operation: OperationEvent.Train.editTrainNo.menu.operation
+					};
 
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            }
-                        }).catch(error => {
-                            this.loading = false;
-                            this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
+					this.loading = true;
+					this.$store.dispatch('training/next', operate).then(({ valid }) => {
+						this.loading = false;
+						if (valid) {
+							this.doClose();
+						}
+					}).catch(() => {
+						this.loading = false;
+						this.doClose();
+					});
+				} else {
+					return false;
+				}
+			});
+		},
+		cancel() {
+			const operate = {
+				type: MapDeviceType.Train.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
-        }
-    }
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => { this.doClose(); });
+		}
+	}
+};
 </script>
 <style scoped>
     .chengdou-03__systerm .el-dialog .base-label {
diff --git a/src/jmap/theme/chengdu_03/menus/menuButton.vue b/src/jmap/theme/chengdu_03/menus/menuButton.vue
index bda9c78d6..b8bc3cea8 100644
--- a/src/jmap/theme/chengdu_03/menus/menuButton.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuButton.vue
@@ -97,13 +97,13 @@
         <center><b>工</b><b>控</b></center>
       </span>
     </button>
-    <button id="mbm_clear" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown('mbm_clear')">
+    <button :id="Command.cancel.clearMbm.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Command.cancel.clearMbm.operation)">
       <span style="color: black">
         <center><b>清</b></center>
         <center><b>除</b></center>
       </span>
     </button>
-    <password-box ref="password" @checkOver="doClose" />
+    <password-box ref="password" @checkOver="passWordCommit" />
   </div>
 </template>
 
@@ -146,6 +146,9 @@ export default {
 		MixinCommand() {
 			return OperationEvent.MixinCommand;
 		},
+		Command() {
+			return OperationEvent.Command;
+		},
 		isShowBtn() {
 			return this.$store.state.training.prdType == '01';
 		}
@@ -165,8 +168,19 @@ export default {
 		this.resetPosition();
 	},
 	methods: {
-		doClose() {
+		passWordCommit(data) {
+			const operate = {
+				type: 'mbm',
+				operation: data.operateNext
+			};
 
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			}).catch(() => {
+				this.$refs.noticeInfo.doShow(operate);
+			});
 		},
 		resetPosition() {
 			this.$nextTick(() => {
@@ -199,31 +213,50 @@ export default {
 			}
 		},
 		buttonDown(operation) {
-			if (operation != 'mbm_clear') {
+			if (operation != this.Command.cancel.clearMbm.operation) {
 				const operate = {
 					type: 'mbm',
 					operation: operation
 				};
 				this.$store.dispatch('training/next', operate).then(({ valid }) => {
 					if (valid) {
+						this.operation = operation;
 						this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下
 						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
 						if (operation == this.Signal.humanTrainRoute.button.operation) { // 总人解操作 显示密码窗
-							operate['operateCode'] = this.Signal.humanTrainRoute.button.operation;
+							operate['operateNext'] = this.Command.close.password.operation;
+							this.$refs.password.doShow(operate);
+						} else if (operation == this.Section.fault.button.operation) { // 区故解操作 显示密码窗
+							operate['operateNext'] = this.Command.close.password.operation;
+							this.$refs.password.doShow(operate);
+						} else if (operation == this.Switch.unlock.button.operation) { // 道岔解锁操作 显示密码窗
+							operate['operateNext'] = this.Command.close.password.operation;
+							this.$refs.password.doShow(operate);
+						} else if (operation == this.MixinCommand.unblock.button.operation) { // 解封操作 显示密码窗
+							operate['operateNext'] = this.Command.close.password.operation;
 							this.$refs.password.doShow(operate);
 						}
 						this.$store.dispatch('training/emitTipFresh');
 					}
 				});
 			} else {
-				OperateHandler.cleanOperates(); // 清空操作组
-				this.$store.dispatch('menuOperation/setButtonOperation', null);
+				const operate = {
+					type: 'mbm',
+					operation: operation
+				};
+				this.$store.dispatch('training/next', operate).then(({ valid }) => {
+					if (valid) {
+						this.$store.dispatch('menuOperation/setButtonOperation', null);
+						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+						OperateHandler.cleanOperates(); // 清空操作组
+					}
+				});
 			}
 		},
 		selectedChange() {
 			// 按钮按下时
 			if (this.$store.state.menuOperation.buttonOperation) {
-				const model = this.$store.state.menuOperation.selected;
+				const model = this.$store.state.menuOperation.selected; // 选择设备
 				if (model._type) {
 					const deviceType = MapDeviceType[model._type];
 					const modelData = deepAssign({}, model);
@@ -240,7 +273,12 @@ export default {
 						if (valid) {
 							if (response) {
 								this.tempData = response.data;
-								// console.log(this.tempData, '步骤数据');
+							}
+							if (this.operation == this.Signal.guide.button.operation) { // 引导进路操作 显示密码窗
+								this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+								operate['operateNext'] = this.Command.close.password.operation;
+								this.operation = '0';
+								this.$refs.password.doShow(operate);
 							}
 						}
 					});
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
index 807438db6..f82e528a6 100644
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
+++ b/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
@@ -1,15 +1,5 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm train-control"
-    :title="title"
-    :visible.sync="show"
-    width="370px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
+  <el-dialog v-dialogDrag class="fuzhou-01__systerm train-control" :title="title" :visible.sync="show" width="370px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
     <el-form ref="form" size="small" label-width="120px" :model="formModel" :rules="rules">
       <el-form-item :label="this.$t('menu.groupNumber')+this.$t('global.colon')" prop="groupNumber">
         <el-select
@@ -32,46 +22,59 @@
           :id="domIdTrainType"
           v-model="formModel.trainType"
           style="margin-left: 15px;"
-          :disabled="trainTypeIsDisabled"
           @change="trainTypeChange"
         >
-          <el-radio :label="'01'">{{$t('menu.planTrain')}}</el-radio>
-          <el-radio :label="'02'">{{$t('menu.headCodeTrain')}}</el-radio>
-          <el-radio :label="'03'" style="margin-top:5px;">{{$t('menu.artificialTrain')}}</el-radio>
+          <el-radio :label="'01'">{{ $t('menu.planTrain') }}</el-radio>
+          <el-radio :label="'02'">{{ $t('menu.headCodeTrain') }}</el-radio>
+          <el-radio :label="'03'" style="margin-top:5px;">{{ $t('menu.artificialTrain') }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item prop="serviceNumber">
-        <span slot="label">{{$t('menu.serviceNumber')}}</span>
+      <el-form-item v-if="formModel.trainType == '01'" prop="serviceNumber">
+        <span slot="label">{{ $t('menu.serviceNumber') }}</span>
         <el-input
           :id="domIdServerNo"
           v-model="formModel.serviceNumber"
           :disabled="serverNoIsDisabled"
-          @change="serverNoChange"
         />
       </el-form-item>
-      <el-form-item :label="this.$t('menu.tripNumber')+this.$t('global.colon')" prop="tripNumber">
+      <el-form-item v-if="formModel.trainType == '01'" :label="this.$t('menu.tripNumber')+this.$t('global.colon')" prop="tripNumber">
         <el-input
           :id="domIdTrainNo"
           v-model="formModel.tripNumber"
           :disabled="trainNoIsDisabled"
-          @change="trainNoChange"
+          maxlength="4"
         />
       </el-form-item>
-      <el-form-item :label="this.$t('menu.targetCode')+this.$t('global.colon')" prop="targetCode">
+      <el-form-item v-if="formModel.trainType == '01'" :label="this.$t('menu.targetCode')+this.$t('global.colon')" prop="targetCode">
         <el-input
           :id="domIdTargetCode"
           v-model="formModel.targetCode"
           :disabled="targetCodeIsDisabled"
-          @change="targetCodeChange"
         />
       </el-form-item>
+      <el-form-item v-if="formModel.trainType == '03'" :label="this.$t('menu.groupNumber')+this.$t('global.colon')" prop="groupNumber">
+        <el-select
+          :id="domIdTrainNumber"
+          v-model="formModel.groupNumber"
+          filterable
+          :disabled="trainNumberIsDisabled"
+          @change="trainNumberChange"
+        >
+          <el-option
+            v-for="train in trainList"
+            :key="train.groupNumber"
+            :label="train.groupNumber"
+            :value="train.groupNumber"
+          />
+        </el-select>
+      </el-form-item>
     </el-form>
     <el-row justify="center" class="button-group">
       <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{$t('global.confirm')}}</el-button>
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="istargetCode" @click="commit">{{ $t('global.confirm') }}</el-button>
       </el-col>
       <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">{{$t('global.cancel')}}</el-button>
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('global.cancel') }}</el-button>
       </el-col>
     </el-row>
     <confirm-train ref="confirmTrain" />
@@ -85,6 +88,7 @@ import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 import { getPublishTrainList } from '@/api/jmap/map';
 import ConfirmTrain from './childDialog/confirmTrain';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
+import OperateHandler from '@/scripts/plugin/trainingOperateHandler';
 
 export default {
 	name: 'TrainControl',
@@ -134,10 +138,10 @@ export default {
 			return false;
 		},
 		serverNoIsDisabled() {
-			return false;
+			return true;
 		},
 		targetCodeIsDisabled() {
-			return false;
+			return true;
 		},
 		trainNumberIsDisabled() {
 			if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
@@ -145,12 +149,12 @@ export default {
 			}
 			return '';
 		},
-		trainTypeIsDisabled() {
-			if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
-				return true;
-			}
-			return '';
-		},
+		// trainTypeIsDisabled() {
+		// 	if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
+		// 		return true;
+		// 	}
+		// 	return '';
+		// },
 		show() {
 			return this.dialogShow && !this.$store.state.menuOperation.break;
 		},
@@ -236,6 +240,19 @@ export default {
 				return this.$t('menu.menuTrain.editTrainId');
 			}
 			return '';
+		},
+		istargetCode() {
+			if (this.formModel.serviceNumber && this.formModel.targetCode) {
+				return false;
+			}
+			return true;
+		}
+	},
+	watch: {
+		'formModel.tripNumber': function(val) {
+			if (val.length == 4) {
+				this.trainNoChange(val);
+			}
 		}
 	},
 	mounted() {
@@ -262,10 +279,11 @@ export default {
 			this.formModel = {
 				groupNumber: model.groupNumber,
 				tripNumber: model.tripNumber,
-				trainType: '01',
-				serviceNumber: model.serviceNumber,
-				targetCode: model.targetCode
+				trainType: model.type,
+				serviceNumber: '',
+				targetCode: ''
 			};
+			debugger;
 
 			/** 加载列车数据*/
 			this.loadInitData(this.map);
@@ -318,27 +336,9 @@ export default {
 				}
 			});
 		},
-		serverNoChange(serviceNumber) {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				val: `${serviceNumber}`,
-				operation: ''
-			};
-
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.addTrainId.serverNoChange.operation;
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.editTrainId.serverNoChange.operation;
-			}
-
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
 		trainNoChange(tripNumber) {
 			const operate = {
+				send: true,
 				type: MapDeviceType.Train.type,
 				val: `${tripNumber}`,
 				operation: ''
@@ -349,28 +349,17 @@ export default {
 			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
 				operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
 			}
-
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		targetCodeChange(targetCode) {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				val: `${targetCode}`,
-				operation: ''
-			};
-
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.addTrainId.targetCodeChange.operation;
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.editTrainId.targetCodeChange.operation;
-			}
-
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
+			OperateHandler.backStep(1);
+			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+				console.log(valid, response, 111);
+				if (valid && response.data) {
+					this.formModel = {
+						groupNumber: this.formModel.groupNumber,
+						tripNumber: tripNumber,
+						trainType: '01',
+						serviceNumber: response.data.serviceNumber,
+						targetCode: response.data.tripNumber
+					};
 					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
 				}
 			});
@@ -424,7 +413,7 @@ export default {
 						type: MapDeviceType.Train.type,
 						operation: OperationEvent.Train.editTrainId.menu.operation,
 						messages: [this.$t('tip.editTrainIdTip')],
-						val: this.formModel.tripNumber
+						val: `01::${this.formModel.tripNumber}`
 					};
 
 					this.loading = true;
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue
index 80e2dc550..f6a2d90a5 100644
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue
+++ b/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue
@@ -1,16 +1,5 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    class="fuzhou-01__systerm route-create"
-    :title="title"
-    :visible.sync="show"
-    width="580px"
-    label-position="top"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
+  <el-dialog v-dialogDrag class="fuzhou-01__systerm route-create" :title="title" :visible.sync="show" width="380px" label-position="top" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
     <div style="padding: 10px 20px; border: 1px solid lightgray;">
       <el-form size="small" label-width="100px">
         <el-form-item :label="this.$t('menu.train')+this.$t('global.colon')" prop="trainCode">
@@ -50,7 +39,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { getPublishTrainList } from '@/api/jmap/map';
+// import { getPublishTrainList } from '@/api/jmap/map';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
 export default {
@@ -104,18 +93,16 @@ export default {
 	},
 	methods: {
 		loadInitData(map) {
-			if (Object.keys(map || {}).length) {
-				getPublishTrainList(map.skinCode).then(response => {
-					this.trainList = response.data;
-				}).catch(() => {
-					this.$messageBox(this.$t('error.getTrainListFailed'));
-				});
+			if (map.trainList.length) {
+				this.trainList = map.trainList;
+			} else {
+				this.$messageBox(this.$t('error.getTrainListFailed'));
 			}
 		},
 		doShow(operate, selected) {
 			this.dialogShow = true;
 			this.selected = selected;
-
+			console.log(this.map, 111);
 			/** 加载列车数据*/
 			this.loadInitData(this.map);
 
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index d52f4d6a5..d8153b2e0 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -139,6 +139,10 @@ export const OperationEvent = {
 			menu: {
 				operation: '000',
 				domId: '_Tips-Cancel-Menu'
+			},
+			clearMbm: {
+				operation: '00012',
+				domId: '_Tips-mbm_clear{TOP}'
 			}
 		},
 		// 关闭对话框
@@ -1094,7 +1098,7 @@ export const OperationEvent = {
 			event: '2',
 			button: {
 				operation: '4020',
-				domId: '_Tips-Section-Fault-Mbm'
+				domId: '_Tips-Section-Fault-Mbm{TOP}'
 			},
 			menu: {
 				operation: '402',
@@ -1868,7 +1872,7 @@ export const OperationEvent = {
 		},
 		// 修改列车识别号
 		editTrainId: {
-			event: '2',
+			event: { query: '9', confirm: '2' },
 			menu: {
 				operation: '702',
 				domId: '_Tips-Train-EditTrainId-Menu'
diff --git a/src/scripts/GlobalPlugin.js b/src/scripts/GlobalPlugin.js
index ac3383427..8c78dc5fb 100644
--- a/src/scripts/GlobalPlugin.js
+++ b/src/scripts/GlobalPlugin.js
@@ -87,7 +87,7 @@ Vue.prototype.$convertSpecifiedField = function(dataDict, enumList, key, value,
 			});
 		});
 	}
-},
+};
 
 Vue.prototype.$convertList = function(FromList, ToList, checktypeFunction) {
 	if (FromList) {
diff --git a/src/scripts/OperationConfig.js b/src/scripts/OperationConfig.js
index e6a086424..afea2e812 100644
--- a/src/scripts/OperationConfig.js
+++ b/src/scripts/OperationConfig.js
@@ -6,8 +6,10 @@
 // {id: "5", trainingType: "02", name: "信号机名称"}
 // {id: "6", trainingType: "02", name: "信号机编号"}
 // {id: "7", trainingType: "03", name: "道岔名称"}
+// {id: "17", trainingType: "03", name: "道岔编码"}
 // {id: "8", trainingType: "04", name: "物理区段名称"}
 // {id: "9", trainingType: "04", name: "逻辑区段名称"}
+// {id: "18", trainingType: "04", name: "逻辑区段编码"}
 // {id: "10", trainingType: "05", name: "车站名称"}
 // {id: "11", trainingType: "05", name: "站台行驶方向编号"}
 // {id: "12", trainingType: "05", name: "站台行驶方向"}
@@ -1296,6 +1298,21 @@ export const OperationList = {
 					{ deviceType: '04', orderNum: 3, operateCode: '301', tip: '鼠标左键点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0201',
+				skinCode: '04',
+				trainingName: '办理进路({3} 进路)',
+				trainingRemark: '办理进路功能',
+				trainingType: '02',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '3010', tip: '鼠标左键点击【排列进路】' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3010', tip: '鼠标左键点击【{5}】', val: '{6}' },
+					{ deviceType: '04', orderNum: 3, operateCode: '3010', tip: '鼠标左键点击【{5}】', val: '{6}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1311,6 +1328,22 @@ export const OperationList = {
 					{ deviceType: '04', orderNum: 3, operateCode: '308', tip: '鼠标左键点击【确认】按钮' }
 				]
 			},
+			// {
+			// 	maxDuration: 15,
+			// 	minDuration: 8,
+			// 	operateType: '0207',
+			// 	skinCode: '04',
+			// 	trainingName: '引导进路({3})',
+			// 	trainingRemark: '进路办理信号引导',
+			// 	trainingType: '02',
+			// 	productTypes: ['01'],
+			// 	stepVOList: [
+			// 		{ deviceType: 'mbm', orderNum: 1, operateCode: '3080', tip: '鼠标左键点击【引导进路】' },
+			// 		{ deviceType: '04', orderNum: 2, operateCode: '3080', tip: '鼠标左键点击【{5}】', val: '{6}' }, // 进路编号值不正确
+			// 		{ deviceType: 'mbm', orderNum: 3, operateCode: '0011', tip: '输入密码123456，点击【确定】按钮' },
+			// 		{ deviceType: '04', orderNum: 4, operateCode: '3080', tip: '鼠标左键点击【{5}】', val: '{6}' }
+			// 	]
+			// },
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1325,6 +1358,20 @@ export const OperationList = {
 					{ deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0202',
+				skinCode: '04',
+				trainingName: '总取消({3} 进路)',
+				trainingRemark: '总取消功能',
+				trainingType: '02',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '3030', tip: '鼠标左键点击【总取消】' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3030', tip: '鼠标左键点击【{5}】按钮', val: '{6}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1340,6 +1387,21 @@ export const OperationList = {
 					{ deviceType: '04', orderNum: 3, operateCode: '3051', tip: '输入密码123456，点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0215', // 新增数据字典code
+				skinCode: '04',
+				trainingName: '总人解({3})',
+				trainingRemark: '总人解',
+				trainingType: '02',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '3050', tip: '鼠标左键点击【总人解】' },
+					{ deviceType: 'mbm', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确定】按钮' },
+					{ deviceType: '04', orderNum: 3, operateCode: '3050', tip: '鼠标左键点击【{5}】', val: '{6}' }
+				]
+			},
 			{
 				maxDuration: 8,
 				minDuration: 5,
@@ -1369,6 +1431,20 @@ export const OperationList = {
 					{ deviceType: '04', orderNum: 3, operateCode: '3061', tip: '输入密码123456，点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0203',
+				skinCode: '04',
+				trainingName: '信号封锁({5})',
+				trainingRemark: '信号封锁功能',
+				trainingType: '02',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '2991', tip: '鼠标左键菜单选择【封锁】' },
+					{ deviceType: '04', orderNum: 1, operateCode: '2991', tip: '鼠标左键点击【{5}】', val: '{6}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1384,6 +1460,21 @@ export const OperationList = {
 					{ deviceType: '04', orderNum: 3, operateCode: '3072', tip: '输入密码123456，点击【确认】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0204',
+				skinCode: '04',
+				trainingName: '信号解封({5})',
+				trainingRemark: '信号解封功能',
+				trainingType: '02',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '2992', tip: '鼠标左键菜单选择【解封】' },
+					{ deviceType: 'mbm', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确认】按钮' },
+					{ deviceType: '04', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{5}】', val: '{6}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1399,6 +1490,20 @@ export const OperationList = {
 					{ deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0208',
+				skinCode: '04',
+				trainingName: '人工控({5})',
+				trainingRemark: '人工控',
+				trainingType: '02',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '3140', tip: '鼠标左键点击【人工控】' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3140', tip: '鼠标左键点击【{3}】', val: '{4}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1414,6 +1519,20 @@ export const OperationList = {
 					{ deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0209',
+				skinCode: '04',
+				trainingName: '自动控({5})',
+				trainingRemark: '自动控',
+				trainingType: '02',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '3150', tip: '鼠标左键点击【自动控】' },
+					{ deviceType: '04', orderNum: 2, operateCode: '3150', tip: '鼠标左键点击【{3}】', val: '{4}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1432,7 +1551,7 @@ export const OperationList = {
 			{
 				maxDuration: 15,
 				minDuration: 8,
-				operateType: '0305', // 0312 新增定位字典
+				operateType: '0312', // 0312 新增定位字典
 				skinCode: '04',
 				trainingName: '单操到定位({7})',
 				trainingRemark: '单操到定位({15})',
@@ -1446,7 +1565,21 @@ export const OperationList = {
 			{
 				maxDuration: 15,
 				minDuration: 8,
-				operateType: '0305', // 0313 新增定位字典
+				operateType: '0313',
+				skinCode: '04',
+				trainingName: '单操到定位({7})',
+				trainingRemark: '单操到定位({7})',
+				trainingType: '03',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键菜单选择【道岔定操】' },
+					{ deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】按钮', val: '{17}' }
+				]
+			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0313', // 0313 新增定位字典
 				skinCode: '04',
 				trainingName: '单操到反位({7})',
 				trainingRemark: '单操到反位({7})',
@@ -1457,6 +1590,20 @@ export const OperationList = {
 					{ deviceType: '02', orderNum: 2, operateCode: '102', tip: '鼠标左键点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0313',
+				skinCode: '04',
+				trainingName: '单操到反位({7})',
+				trainingRemark: '单操到反位({7})',
+				trainingType: '03',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: '02', orderNum: 1, operateCode: '1020', tip: '鼠标左键菜单选择【道岔反操】' },
+					{ deviceType: '02', orderNum: 2, operateCode: '1020', tip: '鼠标左键点击【{7}】按钮', val: '{17}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1479,10 +1626,10 @@ export const OperationList = {
 				trainingName: '道岔单锁({7})',
 				trainingRemark: '道岔单锁功能',
 				trainingType: '03',
-				productTypes: ['01'],
+				productTypes: ['01'], // 现地操作
 				stepVOList: [
 					{ deviceType: '02', orderNum: 1, operateCode: '1030', tip: '鼠标左键菜单选择【道岔单锁】' },
-					{ deviceType: '02', orderNum: 2, operateCode: '1030', tip: '鼠标左键点击【{{7}}】', val: '{8}' }
+					{ deviceType: '02', orderNum: 2, operateCode: '1030', tip: '鼠标左键点击【{{7}}】', val: '{17}' }
 				]
 			},
 			{
@@ -1499,6 +1646,21 @@ export const OperationList = {
 					{ deviceType: '02', orderNum: 5, operateCode: '104', tip: '鼠标左键点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0305',
+				skinCode: '04',
+				trainingName: '道岔解锁({7})',
+				trainingRemark: '道岔解锁功能',
+				trainingType: '03',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键菜单选择【道岔解锁】' },
+					{ deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确认】按钮' },
+					{ deviceType: '02', orderNum: 3, operateCode: '1040', tip: '鼠标左键点击【{7}】按钮', val: '{17}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1514,6 +1676,20 @@ export const OperationList = {
 					{ deviceType: '02', orderNum: 3, operateCode: '1051', tip: '输入密码123456，点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0305',
+				skinCode: '04',
+				trainingName: '道岔封锁({7})',
+				trainingRemark: '道岔封锁功能',
+				trainingType: '03',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: '02', orderNum: 1, operateCode: '2991', tip: '鼠标左键菜单选择【封锁】' },
+					{ deviceType: '02', orderNum: 2, operateCode: '2991', tip: '鼠标左键点击【{7}】按钮', val: '{17}' }
+				]
+			},
 			{
 				maxDuration: 15,
 				minDuration: 8,
@@ -1529,6 +1705,21 @@ export const OperationList = {
 					{ deviceType: '02', orderNum: 3, operateCode: '1062', tip: '输入密码123456，点击【确认】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0305',
+				skinCode: '04',
+				trainingName: '道岔解封({7})',
+				trainingRemark: '道岔解封功能',
+				trainingType: '03',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: '02', orderNum: 1, operateCode: '2992', tip: '鼠标左键菜单选择【解封】' },
+					{ deviceType: '02', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确认】按钮' },
+					{ deviceType: '02', orderNum: 3, operateCode: '2992', tip: '鼠标左键点击【{7}】按钮', val: '{17}' }
+				]
+			},
 			{
 				maxDuration: 20,
 				minDuration: 10,
@@ -1560,6 +1751,22 @@ export const OperationList = {
 					{ deviceType: '03', orderNum: 3, operateCode: '4023', tip: '输入密码123456，点击【确认】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0401',
+				skinCode: '04',
+				trainingName: '区故解({9})',
+				trainingRemark: '故障解锁功能',
+				trainingType: '04',
+				productTypes: ['01'],
+				stepVOList: [
+					{ deviceType: 'mbm', orderNum: 1, operateCode: '4020', tip: '鼠标右键菜单选择【区故解】' },
+					{ deviceType: 'mbm', orderNum: 2, operateCode: '0011', tip: '输入密码123456，点击【确认】按钮' },
+					{ deviceType: '03', orderNum: 3, operateCode: '4020', tip: '鼠标左键点击【{9}】', val: '{18}' },
+					{ deviceType: 'mbm', orderNum: 4, operateCode: '00012', tip: '鼠标左键点击【清除】' }
+				]
+			},
 			{
 				maxDuration: 15, // 自动生成实训失败
 				minDuration: 8,
diff --git a/src/scripts/plugin/converter/SectionOperationConverter.js b/src/scripts/plugin/converter/SectionOperationConverter.js
index afe0f63ba..7c1f8bcbd 100644
--- a/src/scripts/plugin/converter/SectionOperationConverter.js
+++ b/src/scripts/plugin/converter/SectionOperationConverter.js
@@ -407,7 +407,7 @@ function handleButtonFault(operates) {
 			return {
 				type: operate.type,
 				code: operate.code,
-				over: true,
+				// over: true,
 				operation: SectionOperation.fault.event
 			};
 		}
diff --git a/src/scripts/plugin/converter/SignalRouteOperationConverter.js b/src/scripts/plugin/converter/SignalRouteOperationConverter.js
index 4c29b472a..33e85c4e9 100644
--- a/src/scripts/plugin/converter/SignalRouteOperationConverter.js
+++ b/src/scripts/plugin/converter/SignalRouteOperationConverter.js
@@ -105,22 +105,19 @@ export default {
 function handleButtonArrangementRoute(operates) {
 	if (operates.length === 2) {
 		const operate = operates[1];
-		if (operate.type === SignalType && operate.code &&
-            operate.model && operate.model._viewVal) {
+		if (operate.type == SignalType && operate.code) {
 			return {
 				type: operate.type,
 				code: operate.code,
-				operation: SignalOperation.arrangementRoute.event.query,
-				val: operate.model._viewVal
+				operation: SignalOperation.arrangementRoute.event.query
+				// val: operate.model._viewVal
 			};
 		}
 		return { error: true };
 	} else if (operates.length >= 3) {
-		const operateBeg = operates[1];
-		const operateEnd = operates[operates.length - 1];
-		if (operateEnd.type === SignalType && operateEnd.code &&
-            operateEnd.model && operateBeg.val === operateEnd.model._viewVal &&
-            operateEnd.tempData && operateEnd.tempData.length) {
+		const operateBeg = operates[1]; // 起始信号灯
+		const operateEnd = operates[operates.length - 1]; // 终端信号灯
+		if (operateEnd.type == SignalType && operateEnd.code && operateEnd.tempData && operateEnd.tempData.length) {
 			for (let i = 0; i < operateEnd.tempData.length; i++) {
 				const elem = operateEnd.tempData[i];
 				if (elem.startSignalCode === operateBeg.code && elem.endSignalCode == operateEnd.code) {
@@ -128,8 +125,8 @@ function handleButtonArrangementRoute(operates) {
 						type: operateEnd.type,
 						code: operateEnd.code,
 						over: true,
-						operation: SignalOperation.arrangementRoute.event.confirm,
-						val: elem.code
+						operation: SignalOperation.arrangementRoute.event.confirm
+						// val: elem.code
 					};
 				}
 			}
@@ -139,6 +136,38 @@ function handleButtonArrangementRoute(operates) {
 	return null;
 }
 
+/**
+ * 处理右键菜单 排列进路 操作
+ * @param {*} operates
+ */
+function handleMenuArrangementRoute(operates) {
+	if (operates.length == 1) {
+		const operate = operates[0];
+		if (operate.type === SignalType && operate.code) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				operation: SignalOperation.arrangementRoute.event.query
+			};
+		}
+		return { error: true };
+	} else if (operates.length >= 3) {
+		const operate = operates[operates.length - 1];
+		if (operate.type === SignalType && operates[0].code && (operates[operates.length - 2].val || operates[operates.length - 3].val)) {
+			return {
+				over: true,
+				type: operate.type,
+				code: operates[0].code,
+				operation: SignalOperation.arrangementRoute.event.confirm,
+				val: operates[operates.length - 2].val || operates[operates.length - 3].val
+			};
+		}
+		return { error: true };
+	}
+
+	return null;
+}
+
 /**
  * 处理点击按钮 取消进路 操作
  * @param {*} operates
@@ -184,6 +213,7 @@ function handleButtonReopenSignal(operates) {
  * @param {*} operates
  */
 function handleButtonHumanTrainRoute(operates) {
+	debugger;
 	if (operates.length >= 2) {
 		const operate = operates[operates.length - 1];
 		if (operate.type === SignalType && operate.code) {
@@ -245,38 +275,6 @@ function handleMenuStoppage(operates) {
 	return null;
 }
 
-/**
- * 处理右键菜单 排列进路 操作
- * @param {*} operates
- */
-function handleMenuArrangementRoute(operates) {
-	if (operates.length == 1) {
-		const operate = operates[0];
-		if (operate.type === SignalType && operate.code) {
-			return {
-				type: operate.type,
-				code: operate.code,
-				operation: SignalOperation.arrangementRoute.event.query
-			};
-		}
-		return { error: true };
-	} else if (operates.length >= 3) {
-		const operate = operates[operates.length - 1];
-		if (operate.type === SignalType && operates[0].code && (operates[operates.length - 2].val || operates[operates.length - 3].val)) {
-			return {
-				over: true,
-				type: operate.type,
-				code: operates[0].code,
-				operation: SignalOperation.arrangementRoute.event.confirm,
-				val: operates[operates.length - 2].val || operates[operates.length - 3].val
-			};
-		}
-		return { error: true };
-	}
-
-	return null;
-}
-
 /**
  * 处理右键菜单 取消进路 操作
  * @param {*} operates
@@ -661,17 +659,33 @@ function handleButtonSetAutoInterlock(operates) {
  * @param {*} operates
  */
 function handleButtonGuideRoute(operates) {
-	if (operates.length >= 2) {
+	if (operates.length == 2) {
 		const operate = operates[operates.length - 1];
 		if (operate.type === SignalType && operate.code) {
 			return {
 				type: operate.type,
 				code: operate.code,
-				over: true,
 				operation: SignalOperation.guide.event.confirm
 			};
 		}
 		return { error: true };
+	} else if (operates.length >= 3) {
+		const operateBeg = operates[1];
+		const operateEnd = operates[operates.length - 1];
+		if (operateEnd.type === SignalType && operateEnd.code && operateEnd.tempData && operateEnd.tempData.length) {
+			for (let i = 0; i < operateEnd.tempData.length; i++) {
+				const elem = operateEnd.tempData[i];
+				if (elem.startSignalCode === operateBeg.code && elem.endSignalCode == operateEnd.code) {
+					return {
+						type: operateEnd.type,
+						code: operateEnd.code,
+						over: true,
+						operation: SignalOperation.guide.event.confirm
+					};
+				}
+			}
+		}
+		return { error: true };
 	}
 	return null;
 }
diff --git a/src/scripts/plugin/converter/TrainOperationConverter.js b/src/scripts/plugin/converter/TrainOperationConverter.js
index 95e46fe14..f16069f7a 100644
--- a/src/scripts/plugin/converter/TrainOperationConverter.js
+++ b/src/scripts/plugin/converter/TrainOperationConverter.js
@@ -114,14 +114,25 @@ function handleMenuAddTrainId(operates) {
  * @param {*} operates
  */
 function handleMenuEditTrainId(operates) {
-	if (operates.length >= 1) {
+	if (operates.length == 2) {
+		const operate = operates[operates.length - 1];
+		if (operate.type === TrainType && operate.val) {
+			return {
+				type: operate.type,
+				code: operates[0].code,
+				operation: TrainOperation.editTrainId.event.query,
+				val: operate.val
+			};
+		}
+		return { error: true };
+	} else if (operates.length > 2) {
 		const operate = operates[operates.length - 1];
 		if (operate.type === TrainType && operate.val) {
 			return {
 				type: operate.type,
 				code: operates[0].code,
 				over: true,
-				operation: TrainOperation.editTrainId.event,
+				operation: TrainOperation.editTrainId.event.confirm,
 				val: operate.val
 			};
 		}
diff --git a/src/scripts/plugin/trainingOperateHandler.js b/src/scripts/plugin/trainingOperateHandler.js
index 422e6e929..0283e06b5 100644
--- a/src/scripts/plugin/trainingOperateHandler.js
+++ b/src/scripts/plugin/trainingOperateHandler.js
@@ -14,6 +14,10 @@ OperateHandler.prototype = {
 	/** 操作组 */
 	operates: [],
 
+	backStep: function(num) {
+		this.operates = this.operates.slice(0, num);
+	},
+
 	/** 清空操作组 */
 	cleanOperates: function () {
 		this.operates.splice(0, this.operates.length);
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index f997f31f4..5935e41a6 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -4,8 +4,8 @@ export function getBaseUrl() {
 	if (process.env.NODE_ENV === 'development') {
 		// BASE_API = 'https://joylink.club/jlcloud';
 		// BASE_API = 'https://test.joylink.club/jlcloud';
-		BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-		// BASE_API = 'http://192.168.3.6:9000'; // 旭强
+		// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
+		BASE_API = 'http://192.168.3.6:9000'; // 旭强
 		// BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
 	} else {
 		BASE_API = process.env.VUE_APP_BASE_API;
diff --git a/src/views/display/designIndex.vue b/src/views/display/designIndex.vue
index cf674769b..8fa96b575 100644
--- a/src/views/display/designIndex.vue
+++ b/src/views/display/designIndex.vue
@@ -38,7 +38,7 @@
         @runPlanViewShow="runPlanViewShow"
         @faultChooseShow="faultChooseShow"
         @runQuestLoadShow="runQuestLoadShow"
-		@runAddRolesLoadShow="runAddRolesLoadShow"
+        @runAddRolesLoadShow="runAddRolesLoadShow"
         @switchMode="switchMode"
       />
 
@@ -83,7 +83,7 @@ import { loadMapData, loadMapDataById } from '@/utils/loaddata';
 import { EventBus } from '@/scripts/event-bus';
 import Vue from 'vue';
 import { UrlConfig } from '@/router/index';
-import {loadDraftScript} from '@/api/designPlatform'
+import {loadDraftScript} from '@/api/designPlatform';
 
 // 三维
 import Jl3dSimulation from '@/views/jlmap3d/simulation/jl3dsimulation';
@@ -140,9 +140,9 @@ export default {
 				'02': '02', 	// 行调 => 行调
 				'04': '02', 	// 司机 => 行调
 				'05': ''		// 派班 => null
-            },
-            isDrive:this.prdType == '04',
-            isShowScheduling:this.prdType == '05'
+			},
+			isDrive: this.prdType == '04',
+			isShowScheduling: this.prdType == '05'
 		};
 	},
 	computed: {
@@ -151,8 +151,7 @@ export default {
 			'canvasHeight'
 		]),
 		...mapGetters('map', [
-			'map',
-			'mapDeviceStatus'
+			'map'
 		]),
 		...mapGetters('training', [
 			'offsetStationCode'
@@ -176,8 +175,8 @@ export default {
 			return this.$route.query.mapId;
 		},
 		prdType() {
-            // return this.$route.query.prdType;
-            return this.$store.state.training.prdType;
+			// return this.$route.query.prdType;
+			return this.$store.state.training.prdType;
 		},
 		skinCode() {
 			return this.$route.query.skinCode;
@@ -202,7 +201,7 @@ export default {
 		},
 		isPlan() {
 			return this.mode === 'plan';
-		},
+		}
 		// isDrive() {
 		// 	return this.prdType == '04';
 		// },
@@ -225,12 +224,12 @@ export default {
 				});
 			}
 
-        },
-        '$store.state.training.prdType':function(val){
-            // this.prdType=val;
-            this.isDrive=(val == '04');
-            this.isShowScheduling=(val == '05');
-        },
+		},
+		'$store.state.training.prdType': function(val) {
+			// this.prdType=val;
+			this.isDrive=(val == '04');
+			this.isShowScheduling=(val == '05');
+		},
 		'$store.state.socket.permissionOver': function () {
 			this.$alert('用户权限已被收回', '提示', {
 				confirmButtonText: '确定',
@@ -479,38 +478,38 @@ export default {
 		async runQuestLoadShow() {
 			this.$refs.addQuest.doShow();
 		},
-		async runAddRolesLoadShow(){
+		async runAddRolesLoadShow() {
 			// this.$refs.addQuest.doShow();
-			let row={id:this.$route.query.scriptId}
+			const row={id: this.$route.query.scriptId};
 			this.$refs.addQuest.handleLoad(1, row);
 		},
 		// 选择脚本
-		async selectQuest(row, id,mapLocation,roleName) {
+		async selectQuest(row, id, mapLocation, roleName) {
 			try {
-                let prdType="";
-                switch(roleName){
-                    case 'Attendant':{
-                        prdType="01";
-                        break;
-                    }
-                    case 'Dispatcher':{
-                        prdType="02";
-                        break;
-                    }
-                    case 'Driver':{
-                        prdType="04";
-                        break;
-                    }
-                    case 'Repair':{
-                        prdType="";
-                        break;
-                    }
-                }
-                this.switchMode(prdType);
+				let prdType='';
+				switch (roleName) {
+				case 'Attendant': {
+					prdType='01';
+					break;
+				}
+				case 'Dispatcher': {
+					prdType='02';
+					break;
+				}
+				case 'Driver': {
+					prdType='04';
+					break;
+				}
+				case 'Repair': {
+					prdType='';
+					break;
+				}
+				}
+				this.switchMode(prdType);
 				const res = await loadDraftScript(row.id, id, this.group);
 				if (res && res.code == 200) {
 					this.questId = parseInt(row.id);
-					if(mapLocation){
+					if (mapLocation) {
 						const newMapLocation={'offsetX': mapLocation.x, 'offsetY': mapLocation.y, 'scaleRate': mapLocation.scale};
 						Vue.prototype.$jlmap.setOptions(newMapLocation);
 					}
@@ -518,14 +517,14 @@ export default {
 					// 	const mapLocation={'offsetX': res.data.mapLocation.x, 'offsetY': res.data.mapLocation.y, 'scaleRate': res.data.mapLocation.scale};
 					// 	Vue.prototype.$jlmap.setOptions(mapLocation);
 					// }
-                }
-                if (this.$refs.menuDemon) {
-                    await this.$refs.menuDemon.initLoadPage();
-                }
+				}
+				if (this.$refs.menuDemon) {
+					await this.$refs.menuDemon.initLoadPage();
+				}
 
-                if (this.$refs.menuScript) {
-                    await this.$refs.menuScript.initLoadPage();
-                }
+				if (this.$refs.menuScript) {
+					await this.$refs.menuScript.initLoadPage();
+				}
 			} catch (error) {
 				this.$messageBox(error.message);
 			}
diff --git a/src/views/lesson/trainingrecord/category/tree.vue b/src/views/lesson/trainingrecord/category/tree.vue
index f7b5a2a83..af283369d 100644
--- a/src/views/lesson/trainingrecord/category/tree.vue
+++ b/src/views/lesson/trainingrecord/category/tree.vue
@@ -19,17 +19,17 @@
         @node-click="clickEvent"
       >
         <div slot-scope="{ node: nodeScop }">
-          <span v-if="nodeScop.data.type == 'skin'" class="el-icon-news"></span>
-          <span v-else-if="nodeScop.data.type == 'prd'" class="el-icon-tickets"></span>
+          <span v-if="nodeScop.data.type == 'skin'" class="el-icon-news" />
+          <span v-else-if="nodeScop.data.type == 'prd'" class="el-icon-tickets" />
           <span
             v-else-if="nodeScop.data.type == 'trainingType'"
             class="el-icon-document"
-          ></span>
+          />
           <span
             v-else-if="nodeScop.data.type == 'training'"
             class="el-icon-edit-outline"
-          ></span>
-            <span>&nbsp;{{ nodeScop.label }}</span>
+          />
+          <span>&nbsp;{{ nodeScop.label }}</span>
         </div>
       </el-tree>
     </el-scrollbar>
diff --git a/src/views/map/product/edit.vue b/src/views/map/product/edit.vue
index fdefad6fa..be3700aec 100644
--- a/src/views/map/product/edit.vue
+++ b/src/views/map/product/edit.vue
@@ -95,23 +95,23 @@ export default {
 	computed: {
 		title() {
 			if (this.node && this.node.data) {
-				if (this.node.data.type === 'skin') {
+				if (this.node.data.type === 'Skin') {
 					return this.$t('map.createProductCategories');
-				} else if (this.node.data.type === 'prd' ||
-                        this.node.data.type === 'prd') {
+				} else if (this.node.data.type === 'Prd' ||
+                        this.node.data.type === 'Prd') {
 					return this.$t('map.editTraining');
 				}
 			}
 			return this.$t('map.selectOperation');
 		},
 		isCreate() {
-			return this.node && this.node.data.type === 'skin';
+			return this.node && this.node.data.type === 'Skin';
 		},
 		isUpdate() {
-			return this.node && this.node.data.type === 'prd';
+			return this.node && this.node.data.type === 'Prd';
 		},
 		isDelete() {
-			return this.node && this.node.data.type === 'prd';
+			return this.node && this.node.data.type === 'Prd';
 		},
 		isShowTrainTypes() {
 			return this.addModel.prdType != '03' && this.addModel.prdType != '04';
diff --git a/src/views/map/product/tree.vue b/src/views/map/product/tree.vue
index 4355d62c6..cff6d790a 100644
--- a/src/views/map/product/tree.vue
+++ b/src/views/map/product/tree.vue
@@ -17,10 +17,10 @@
         @node-click="clickEvent"
       >
         <span slot-scope="{ node }">
-          <span v-if="node.data.type == 'skin'" class="el-icon-news"></span>
-          <span v-if="node.data.type == 'prd'" class="el-icon-tickets"></span>
-          <span v-if="node.data.type == 'trainingType'" class="el-icon-document"></span>
-          <span v-if="node.data.type == 'trainingType'" class="el-icon-edit"></span>
+          <span v-if="node.data.type == 'skin'" class="el-icon-news" />
+          <span v-if="node.data.type == 'prd'" class="el-icon-tickets" />
+          <span v-if="node.data.type == 'trainingType'" class="el-icon-document" />
+          <span v-if="node.data.type == 'trainingType'" class="el-icon-edit" />
           <span>&nbsp;{{ node.label }}</span>
         </span>
       </el-tree>