From b3830f2cc5dd314ce3328252d1a76811fc6de1eb Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Wed, 25 Sep 2019 10:46:35 +0800
Subject: [PATCH] =?UTF-8?q?desc:=20=E6=96=B0=E5=A2=9E=E7=8E=B0=E5=9C=B0=20?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dialog/childDialog/passwordInputBox.vue   |   7 +-
 .../chengdu_03/menus/dialog/routeControl.vue  |   7 +-
 src/jmap/theme/chengdu_03/menus/menuBar.vue   | 182 +----------
 src/jmap/theme/chengdu_03/menus/menuLimit.vue | 228 +++++++-------
 .../theme/chengdu_03/menus/menuSection.vue    |   6 -
 .../theme/chengdu_03/menus/menuSignal.vue     |  14 +-
 .../theme/chengdu_03/menus/menuStation.vue    |  18 +-
 .../chengdu_03/menus/menuStationControl.vue   | 128 ++++----
 .../chengdu_03/menus/menuStationStand.vue     |  36 ---
 .../theme/chengdu_03/menus/menuSwitch.vue     |  12 -
 src/jmap/theme/chengdu_03/menus/menuTool.vue  | 291 +++++++++---------
 src/jmap/theme/chengdu_03/menus/statusBar.vue |  31 --
 .../menus/statusDownTrainDetail.vue           |  31 --
 .../chengdu_03/menus/statusUpTrainDetail.vue  |  31 --
 src/scripts/ConstDic.js                       |   4 +-
 src/scripts/OperationConfig.js                |  35 ++-
 .../SignalRouteOperationConverter.js          |  22 +-
 src/scripts/plugin/converter/manager.js       |   3 +-
 src/views/demonstration/detail/index.vue      |  18 +-
 src/views/jointTraining/chatWindow.vue        |  17 +-
 src/views/jointTraining/menuDemon.vue         |  24 +-
 src/views/map/mapdraft/mapedit/configMap.vue  |  19 +-
 .../mapdraft/mapedit/dataRelation/index.vue   |  29 +-
 23 files changed, 424 insertions(+), 769 deletions(-)
 delete mode 100644 src/jmap/theme/chengdu_03/menus/statusBar.vue
 delete mode 100644 src/jmap/theme/chengdu_03/menus/statusDownTrainDetail.vue
 delete mode 100644 src/jmap/theme/chengdu_03/menus/statusUpTrainDetail.vue

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 7fed4b130..a03d5a05c 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
@@ -134,9 +134,12 @@ export default {
 			const operate = {
 				send: true,
 				type: this.operate.type,
-				operation: this.operate.operateCode,
-				val: this.operate.val
+				operation: this.operate.operateCode
 			};
+			if (this.operate.val) {
+				operate['val'] = this.operate.val;
+			}
+			console.log(operate);
 			if (this.passwordCheck === this.correctPassword) {
 				this.$store.dispatch('training/next', operate).then(({ valid }) => {
 					this.loading = false;
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue
index 003a0b7d6..d959ba7e3 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/routeControl.vue
@@ -203,12 +203,14 @@ export default {
 		humanTrainRoute() {
 			const operate = {
 				type: MapDeviceType.Signal.type,
-				operation: OperationEvent.Signal.humanTrainRoute.menu.operation
+				operation: OperationEvent.Signal.humanTrainRoute.menu.operation,
+				operateCode: OperationEvent.Signal.humanTrainRoute.confirm.operation
 			};
 
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
 				if (valid) {
-					this.$refs.password.doShow();
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.password.doShow(operate);
 				}
 			}).catch(() => {
 				this.loading = false;
@@ -271,7 +273,6 @@ export default {
 		// 进路收人工控
 		humanControl() {
 			const operate = {
-				// send: true,
 				type: MapDeviceType.Signal.type,
 				operation: OperationEvent.Signal.humanControl.menu.operation,
 				operateCode: OperationEvent.Signal.humanControl.confirm.operation,
diff --git a/src/jmap/theme/chengdu_03/menus/menuBar.vue b/src/jmap/theme/chengdu_03/menus/menuBar.vue
index 29f4231cd..296a52a59 100644
--- a/src/jmap/theme/chengdu_03/menus/menuBar.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuBar.vue
@@ -8,13 +8,7 @@
           </li>
         </template>
         <template v-else>
-          <li
-            v-if="handleShow(item)"
-            :id="getDomId(item)"
-            :key="i"
-            class="nav-li"
-            @click.stop="selectedClassA(item, i)"
-          >
+          <li v-if="handleShow(item)" :id="getDomId(item)" :key="i" class="nav-li" @click.stop="selectedClassA(item, i)">
             <span class="nav-li-text">{{ item.title }}</span>
             <ul class="nav-ul" :class="{'active' :i==classA}">
               <template v-for="(child,j) in item.children">
@@ -23,13 +17,7 @@
                     <span class="status">&ensp;</span>
                     <span class="separator">&ensp;</span>
                   </li>
-                  <li
-                    v-else
-                    :id="getDomId(child)"
-                    :key="j"
-                    class="menu-li"
-                    @click.stop="selectedClassB(child, j)"
-                  >
+                  <li v-else :id="getDomId(child)" :key="j" class="menu-li" @click.stop="selectedClassB(child, j)">
                     <div class="menu-li-block">
                       <span class="menu-li-text">
                         <span class="status">&ensp;</span>
@@ -42,13 +30,7 @@
                           <span class="status">&ensp;</span>
                           <span class="separator">&ensp;</span>
                         </li>
-                        <li
-                          v-else-if="grandchild.show"
-                          :id="getDomId(grandchild)"
-                          :key="k"
-                          class="menu-li"
-                          @click.stop="hookClick(grandchild)"
-                        >
+                        <li v-else-if="grandchild.show" :id="getDomId(grandchild)" :key="k" class="menu-li" @click.stop="hookClick(grandchild)">
                           <div class="menu-li-block">
                             <span class="menu-li-text">
                               <span class="status">&ensp;</span>
@@ -65,13 +47,7 @@
                     <span class="status">&ensp;</span>
                     <span class="separator">&ensp;</span>
                   </li>
-                  <li
-                    v-else-if="child.show"
-                    :id="getDomId(child)"
-                    :key="j"
-                    class="menu-li"
-                    @click.stop="hookClick(child)"
-                  >
+                  <li v-else-if="child.show" :id="getDomId(child)" :key="j" class="menu-li" @click.stop="hookClick(child)">
                     <div class="menu-li-block">
                       <span class="menu-li-text">
                         <span class="status">&ensp;</span>
@@ -812,7 +788,7 @@ export default {
 			this.clickEvent();
 			const operate = {
 				type: 'bar',
-				operation: item.operate.operation
+				operation: item.operate
 			};
 			this.tempClassA = index;
 			this.tempClassB = -1;
@@ -834,7 +810,7 @@ export default {
 			this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
 			const operate = {
 				type: 'bar',
-				operation: item.operate.operation
+				operation: item.operate
 			};
 			this.tempClassB = index;
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -850,151 +826,11 @@ export default {
 				this.closeMenu(true);
 			}
 		},
-		// 转为站控
-		turnToStationControl(order) {
-			const operate = {
-				type: 'bar',
-				operation: order.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.closeMenu(true);
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.stationControlConvert.doShow(operate);
-				}
-			});
-		},
-		// 强制转为站控
-		mandatoryStationControl(order) {
-			const operate = {
-				type: 'bar',
-				operation: order.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.closeMenu(true);
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.passwordBox.doShow(operate);
-				}
-			});
-		},
-		// 请求中控
-		conterStationControl(order) {
-			const operate = {
-				type: 'bar',
-				operation: order.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.closeMenu(true);
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.stationControlConvert.doShow(operate);
-				}
-			});
-		},
-		// 设置列车识别号显示
-		setTrainIdDisplay(order) {
-			const operate = {
-				type: 'bar',
-				operation: order.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.closeMenu(true);
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.viewTrainId.doShow(operate);
-				}
-			});
-		},
-		// 设置设备显示
-		setNameDisplay(order) {
-			const operate = {
-				type: 'bar',
-				operation: order.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.closeMenu(true);
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.viewName.doShow(operate);
-				}
-			});
-		},
-		// 设置名称显示
-		setDeviceDisplay(order) {
-			const operate = {
-				type: 'bar',
-				operation: order.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.closeMenu(true);
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.viewDevice.doShow(operate);
-				}
-			});
-		},
-		// 添加计划车
-		addPlanTrain(order) {
-			const operate = {
-				type: 'bar',
-				operation: order.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.closeMenu(true);
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.trainAdd.doShow(operate);
-				}
-			});
-		},
-		// 平移计划车
-		translatPlanTrain(order) {
-			const operate = {
-				type: 'bar',
-				operation: order.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.closeMenu(true);
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.trainTranstalet.doShow(operate);
-				}
-			});
-		},
-		// 删除计划车
-		delPlanTrain(order) {
-			const operate = {
-				type: 'bar',
-				operation: order.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.closeMenu(true);
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.trainDelete.doShow(operate);
-				}
-			});
-		},
-		// 用户管理
-		userManage(order) {
-			const operate = {
-				type: 'bar',
-				operation: order.operation
-			};
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.closeMenu(true);
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.manageUser.doShow(operate);
-				}
-			});
-		},
 		// 关于
 		about(order) {
 			const operate = {
 				type: 'bar',
-				operation: order.operation
+				operation: order.operate
 			};
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
 				if (valid) {
@@ -1021,7 +857,7 @@ export default {
 		setLimitSpeed(order) {
 			const operate = {
 				type: 'bar',
-				operation: order.operation
+				operation: order.operate
 			};
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
 				if (valid) {
@@ -1034,7 +870,7 @@ export default {
 		cancleLimitSpeed(order) {
 			const operate = {
 				type: 'bar',
-				operation: order.operation
+				operation: order.operate
 			};
 			this.$store.dispatch('training/next', operate).then(({ valid }) => {
 				if (valid) {
diff --git a/src/jmap/theme/chengdu_03/menus/menuLimit.vue b/src/jmap/theme/chengdu_03/menus/menuLimit.vue
index d8600220a..938e1b368 100644
--- a/src/jmap/theme/chengdu_03/menus/menuLimit.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuLimit.vue
@@ -1,118 +1,120 @@
 <template>
-    <div>
-        <pop-menu ref="popMenu" :menu="menu"></pop-menu>
-        <cancel-all-limit ref="cancelAllLimit"></cancel-all-limit>
-    </div>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <cancel-all-limit ref="cancelAllLimit" />
+  </div>
 </template>
 
 <script>
-    import PopMenu from '@/components/PopMenu';
-    import CancelAllLimit from './dialog/cancelAllLimit';
-    import { mapGetters } from 'vuex';
-    import { TrainingMode, OperateMode } from '@/scripts/ConstDic';
-    import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-    import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
-    import { mouseCancelState } from './utils/menuItemStatus';
+import PopMenu from '@/components/PopMenu';
+import CancelAllLimit from './dialog/cancelAllLimit';
+import { mapGetters } from 'vuex';
+import { OperateMode } from '@/scripts/ConstDic';
+import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import { MenuDisabledState } from './utils/menuItemStatus';
 
-    export default {
-        name: 'MenuLimit',
-        components: {
-            PopMenu,
-            CancelAllLimit,
-        },
-        props: {
-            selected: {
-                type: Object
-            }
-        },
-        data() {
-            return {
-                menu: [{
-                    label: '取消全线临时限速',
-                    handler: this.cancelSpeed,
-                    disabledCallback: '',
-                    auth: { station: true, center: false }
-                }],
-                menuNormal: {
-                    local: [
-                        {
-                            label: '取消全线临时限速',
-                            handler: this.cancelSpeed,
-                            disabledCallback: MenuDisabledState.Section.cancelSpeed,
-                            auth: { station: true, center: false }
-                        }
-                    ],
-                    central: [
-                        {
-                            label: '取消全线临时限速',
-                            handler: this.cancelSpeed,
-                            disabledCallback: MenuDisabledState.Section.cancelSpeed,
-                            auth: { station: false, center: true }
-                        }
-                    ]
-                },
-            }
-        },
-        watch: {
-            '$store.state.menuOperation.menuCount': function (val) {
-                if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.LimitControl) && !this.buttonOperation) {
-                    this.doShow(this.$store.state.menuOperation.menuPosition);
-                } else {
-                    this.doClose();
-                }
-            }
-        },
-        computed: {
-            ...mapGetters('training', [
-                'mode',
-                'operatemode'
-            ]),
-            ...mapGetters('menuOperation', [
-                'buttonOperation'
-            ])
-        },
-        methods: {
-            clickEvent() {
-                let self = this;
-                window.onclick = function (e) {
-                    self.doClose();
-                }
-            },
-            initMenu() {
-                //编辑模式菜单列表
-                if (this.operatemode === OperateMode.ADMIN) {
-                    this.menu = [...this.menu]
-                }
-            },
-            doShow(point) {
-                this.clickEvent();
-                this.initMenu();
-                if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                    this.$refs.popMenu.resetShowPosition(point);
-                }
-            },
-            doClose() {
-                if (this.$refs && this.$refs.popMenu) {
-                    this.$refs.popMenu.close();
-                }
-            },
-            //取消速度
-            cancelSpeed() {
-                let operate = {
-                    start: true,
-                    send: true,
-                    code: this.selected.code,
-                    type: MapDeviceType.LimitControl.type,
-                    label: MapDeviceType.LimitControl.label,
-                    operation: OperationEvent.LimitControl.CancelAllLimit.menu.operation
-                };
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.$refs.cancelAllLimit.doShow(operate, this.selected);
-                    }
-                });
-            },
-        }
-    }
-</script>
\ No newline at end of file
+export default {
+	name: 'MenuLimit',
+	components: {
+		PopMenu,
+		CancelAllLimit
+	},
+	props: {
+		selected: {
+			type: Object,
+			default() {
+				return null;
+			}
+		}
+	},
+	data() {
+		return {
+			menu: [{
+				label: '取消全线临时限速',
+				handler: this.cancelSpeed,
+				disabledCallback: '',
+				auth: { station: true, center: false }
+			}],
+			menuNormal: {
+				local: [
+					{
+						label: '取消全线临时限速',
+						handler: this.cancelSpeed,
+						disabledCallback: MenuDisabledState.Section.cancelSpeed,
+						auth: { station: true, center: false }
+					}
+				],
+				central: [
+					{
+						label: '取消全线临时限速',
+						handler: this.cancelSpeed,
+						disabledCallback: MenuDisabledState.Section.cancelSpeed,
+						auth: { station: false, center: true }
+					}
+				]
+			}
+		};
+	},
+	computed: {
+		...mapGetters('training', [
+			'mode',
+			'operatemode'
+		]),
+		...mapGetters('menuOperation', [
+			'buttonOperation'
+		])
+	},
+	watch: {
+		'$store.state.menuOperation.menuCount': function (val) {
+			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.LimitControl) && !this.buttonOperation) {
+				this.doShow(this.$store.state.menuOperation.menuPosition);
+			} else {
+				this.doClose();
+			}
+		}
+	},
+	methods: {
+		clickEvent() {
+			const self = this;
+			window.onclick = function (e) {
+				self.doClose();
+			};
+		},
+		initMenu() {
+			// 编辑模式菜单列表
+			if (this.operatemode === OperateMode.ADMIN) {
+				this.menu = [...this.menu];
+			}
+		},
+		doShow(point) {
+			this.clickEvent();
+			this.initMenu();
+			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+				this.$refs.popMenu.resetShowPosition(point);
+			}
+		},
+		doClose() {
+			if (this.$refs && this.$refs.popMenu) {
+				this.$refs.popMenu.close();
+			}
+		},
+		// 取消速度
+		cancelSpeed() {
+			const operate = {
+				start: true,
+				send: true,
+				code: this.selected.code,
+				type: MapDeviceType.LimitControl.type,
+				label: MapDeviceType.LimitControl.label,
+				operation: OperationEvent.LimitControl.CancelAllLimit.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.cancelAllLimit.doShow(operate, this.selected);
+				}
+			});
+		}
+	}
+};
+</script>
diff --git a/src/jmap/theme/chengdu_03/menus/menuSection.vue b/src/jmap/theme/chengdu_03/menus/menuSection.vue
index 6ee2a8376..71cb9d830 100644
--- a/src/jmap/theme/chengdu_03/menus/menuSection.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuSection.vue
@@ -56,12 +56,6 @@ export default {
 						handler: this.fault,
 						disabledCallback: MenuDisabledState.Section.fault,
 						auth: { station: true, center: false }
-					},
-					{
-						label: '属性',
-						handler: this.detail,
-						disabledCallback: MenuDisabledState.Section.setSpeed,
-						auth: { station: false, center: true }
 					}
 				],
 				central: [
diff --git a/src/jmap/theme/chengdu_03/menus/menuSignal.vue b/src/jmap/theme/chengdu_03/menus/menuSignal.vue
index 7c6f70b3d..34dc0f814 100644
--- a/src/jmap/theme/chengdu_03/menus/menuSignal.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuSignal.vue
@@ -64,7 +64,7 @@ export default {
 						auth: { station: true, center: false }
 					},
 					{
-						label: '总人解',
+						label: '总人解', // 取消引导进路
 						handler: this.humanTrainRoute,
 						disabledCallback: MenuDisabledState.Signal.humanTrainRoute,
 						auth: { station: true, center: false }
@@ -92,18 +92,6 @@ export default {
 						handler: this.humanControl,
 						disabledCallback: MenuDisabledState.Signal.humanControl,
 						auth: { station: false, center: true }
-					},
-					{
-						label: '进路交自动控',
-						handler: this.atsAutoControl,
-						disabledCallback: MenuDisabledState.Signal.atsAutoControl,
-						auth: { station: false, center: true }
-					},
-					{
-						label: '查询进路控制状态',
-						handler: this.detail,
-						disabledCallback: MenuDisabledState.Signal.detail,
-						auth: { station: true, center: true }
 					}
 				],
 				central: [
diff --git a/src/jmap/theme/chengdu_03/menus/menuStation.vue b/src/jmap/theme/chengdu_03/menus/menuStation.vue
index 6c27312ea..f865e6cc3 100644
--- a/src/jmap/theme/chengdu_03/menus/menuStation.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuStation.vue
@@ -51,15 +51,6 @@ export default {
 			]
 		};
 	},
-	watch: {
-		'$store.state.menuOperation.menuCount': function (val) {
-			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Station) && !this.buttonOperation) {
-				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
-				this.doClose();
-			}
-		}
-	},
 	computed: {
 		...mapGetters('training', [
 			'mode',
@@ -69,6 +60,15 @@ export default {
 			'buttonOperation'
 		])
 	},
+	watch: {
+		'$store.state.menuOperation.menuCount': function (val) {
+			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Station) && !this.buttonOperation) {
+				this.doShow(this.$store.state.menuOperation.menuPosition);
+			} else {
+				this.doClose();
+			}
+		}
+	},
 	methods: {
 		clickEvent() {
 			const self = this;
diff --git a/src/jmap/theme/chengdu_03/menus/menuStationControl.vue b/src/jmap/theme/chengdu_03/menus/menuStationControl.vue
index b569ec165..6e394cecd 100644
--- a/src/jmap/theme/chengdu_03/menus/menuStationControl.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuStationControl.vue
@@ -1,69 +1,69 @@
 <template>
-    <pop-menu ref="popMenu" :menu="menu"></pop-menu>
+  <pop-menu ref="popMenu" :menu="menu" />
 </template>
 
 <script>
-    import PopMenu from '@/components/PopMenu';
-    import { mapGetters } from 'vuex';
-    import { TrainingMode, OperateMode } from '@/scripts/ConstDic';
-    import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-    import { MenuDisabledState, menuConvert } from './utils/menuItemStatus';
-    import { mouseCancelState } from './utils/menuItemStatus';
+import PopMenu from '@/components/PopMenu';
+import { mapGetters } from 'vuex';
+import { DeviceMenu } from '@/scripts/ConstDic';
 
-    export default {
-        name: 'StationControlMenu',
-        props: {
-            selected: {
-                type: Object
-            }
-        },
-        components: {
-            PopMenu
-        },
-        data() {
-            return {
-                menu: [],
-                menuNormal: [
-                ],
-                menuForce: [
-                ]
-            }
-        },
-        watch: {
-            '$store.state.menuOperation.menuCount': function (val) {
-                if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationControl) && !this.buttonOperation) {
-                    this.doShow(this.$store.state.menuOperation.menuPosition);
-                } else {
-                    this.doClose();
-                }
-            }
-        },
-        computed: {
-            ...mapGetters('training', [
-                'mode',
-                'operatemode'
-            ]),
-            ...mapGetters('menuOperation', [
-                'buttonOperation'
-            ])
-        },
-        methods: {
-            clickEvent() {
-                let self = this;
-                window.onclick = function (e) {
-                    self.doClose();
-                }
-            },
-            doShow(point) {
-                if (this.$refs && this.$refs.popMenu) {
-                    this.$refs.popMenu.close();
-                }
-            },
-            doClose() {
-                if (this.$refs && this.$refs.popMenu) {
-                    this.$refs.popMenu.close();
-                }
-            }
-        }
-    }
-</script>
\ No newline at end of file
+export default {
+	name: 'StationControlMenu',
+	components: {
+		PopMenu
+	},
+	props: {
+		selected: {
+			type: Object,
+			default() {
+				return null;
+			}
+		}
+	},
+	data() {
+		return {
+			menu: [],
+			menuNormal: [
+			],
+			menuForce: [
+			]
+		};
+	},
+	computed: {
+		...mapGetters('training', [
+			'mode',
+			'operatemode'
+		]),
+		...mapGetters('menuOperation', [
+			'buttonOperation'
+		])
+	},
+	watch: {
+		'$store.state.menuOperation.menuCount': function (val) {
+			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationControl) && !this.buttonOperation) {
+				this.doShow(this.$store.state.menuOperation.menuPosition);
+			} else {
+				this.doClose();
+			}
+		}
+	},
+	methods: {
+		clickEvent() {
+			const self = this;
+			window.onclick = function (e) {
+				self.doClose();
+			};
+		},
+		doShow(point) {
+			if (this.$refs && this.$refs.popMenu) {
+				this.$refs.popMenu.close();
+			}
+		},
+		doClose() {
+			if (this.$refs && this.$refs.popMenu) {
+				this.$refs.popMenu.close();
+			}
+		}
+	}
+};
+</script>
diff --git a/src/jmap/theme/chengdu_03/menus/menuStationStand.vue b/src/jmap/theme/chengdu_03/menus/menuStationStand.vue
index 0951baf3f..ff2f216e5 100644
--- a/src/jmap/theme/chengdu_03/menus/menuStationStand.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuStationStand.vue
@@ -39,47 +39,11 @@ export default {
 			menu: [],
 			menuNormal: {
 				local: [
-					{
-						label: '设置扣车',
-						handler: this.setDetainTrain,
-						disabledCallback: MenuDisabledState.StationStand.setDetainTrain,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '取消扣车',
-						handler: this.cancelDetainTrain,
-						disabledCallback: MenuDisabledState.StationStand.cancelDetainTrain,
-						auth: { station: true, center: true }
-					},
 					{
 						label: '设置跳停',
 						handler: this.setJumpStop,
 						disabledCallback: MenuDisabledState.StationStand.setJumpStop,
 						auth: { station: true, center: true }
-					},
-					{
-						label: '取消跳停',
-						handler: this.cancelJumpStop,
-						disabledCallback: MenuDisabledState.StationStand.cancelJumpStop,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '设置停站时间',
-						handler: this.setStopTime,
-						disabledCallback: MenuDisabledState.StationStand.setStopTime,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '设置站间运行等级',
-						handler: this.setRunLevel,
-						disabledCallback: MenuDisabledState.StationStand.setRunLevel,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '属性',
-						handler: this.detail,
-						disabledCallback: MenuDisabledState.StationStand.detail,
-						auth: { station: true, center: true }
 					}
 				],
 				central: [
diff --git a/src/jmap/theme/chengdu_03/menus/menuSwitch.vue b/src/jmap/theme/chengdu_03/menus/menuSwitch.vue
index a1193427c..324892031 100644
--- a/src/jmap/theme/chengdu_03/menus/menuSwitch.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuSwitch.vue
@@ -74,18 +74,6 @@ export default {
 						handler: this.unblock,
 						disabledCallback: MenuDisabledState.Switch.unblock,
 						auth: { station: true, center: true }
-					},
-					{
-						label: '区故解',
-						handler: this.fault,
-						disabledCallback: MenuDisabledState.Switch.fault,
-						auth: { station: true, center: true }
-					},
-					{
-						label: '属性',
-						handler: this.undeveloped,
-						disabledCallback: MenuDisabledState.Switch.property,
-						auth: { station: true, center: true }
 					}
 				],
 				central: [
diff --git a/src/jmap/theme/chengdu_03/menus/menuTool.vue b/src/jmap/theme/chengdu_03/menus/menuTool.vue
index dc32a9673..8c96fd532 100644
--- a/src/jmap/theme/chengdu_03/menus/menuTool.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuTool.vue
@@ -1,149 +1,159 @@
 <template>
-    <div id="menuTool">
-        <div class="nav">
-            <div class="tool" v-for="(item,index) in tools" :key="index">
-                <img :src="item.src" :alt="item.title" />
-            </div>
-            <img class="logo" :src="logoImg" />
-            <system-time class="time" v-if="isShowSystemTime" :time="time" :zoom="2" :width="180" :height="48" :fine="2"
-                :top="6"></system-time>
-        </div>
+  <div id="menuTool">
+    <div class="nav">
+      <div v-for="(item,index) in tools" :key="index" class="tool">
+        <img :src="item.src" :alt="item.title">
+      </div>
+      <img class="logo" :src="logoImg">
+      <system-time
+        v-if="isShowSystemTime"
+        class="time"
+        :time="time"
+        :zoom="2"
+        :width="180"
+        :height="48"
+        :fine="2"
+        :top="6"
+      />
     </div>
+  </div>
 </template>
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, TrainingMode, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-    import { OperateMode } from '@/scripts/ConstDic';
-    import { prefixIntrger } from '@/utils/date';
-    import SystemTime from '@/views/components/systemTime/index';
-    import logo_ from '@/assets/logo_.png';
+// import { mapGetters } from 'vuex';
+// import { MapDeviceType, TrainingMode, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+// import { OperateMode } from '@/scripts/ConstDic';
+import { prefixIntrger } from '@/utils/date';
+import SystemTime from '@/views/components/systemTime/index';
+import logo_ from '@/assets/logo_.png';
 
-
-    export default {
-        name: 'MenuTool',
-        props: {
-            selected: {
-                type: Object
-            }
-        },
-        components: {
-            SystemTime
-        },
-        data() {
-            return {
-                logoImg: logo_,
-                time: '00:0000',
-                tools: [
-                    {
-                        title: '服务器1',
-                        operate: '',
-                        src: logo_,
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '服务器2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '前置机1',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '前置机2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '主调',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台1',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台2',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '调度台3',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '大屏',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '维护工作站',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '运行图显示人工站',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '跳停',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '扣车',
-                        operate: '',
-                        src: '',
-                        click: this.undeveloped,
-                    },
-                    {
-                        title: '列车报警',
-                        operate: '',
-                        src: logo_,
-                        click: this.undeveloped,
-                    }
-                ]
-            }
-        },
-        watch: {
-            '$store.state.training.initTime': function (initTime) {
-                let date = new Date(initTime);
-                this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`
-            }
-        },
-        computed: {
-            isShowSystemTime() {
-                return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
-            }
-        },
-        mounted() {
-            this.initTools();
-        },
-        methods: {
-            initTools() {
-                this.tools = [];
-            }
-        }
-    }
+export default {
+	name: 'MenuTool',
+	components: {
+		SystemTime
+	},
+	props: {
+		selected: {
+			type: Object,
+			default() {
+				return null;
+			}
+		}
+	},
+	data() {
+		return {
+			logoImg: logo_,
+			time: '00:0000',
+			tools: [
+				{
+					title: '服务器1',
+					operate: '',
+					src: logo_,
+					click: this.undeveloped
+				},
+				{
+					title: '服务器2',
+					operate: '',
+					src: '',
+					click: this.undeveloped
+				},
+				{
+					title: '前置机1',
+					operate: '',
+					src: '',
+					click: this.undeveloped
+				},
+				{
+					title: '前置机2',
+					operate: '',
+					src: '',
+					click: this.undeveloped
+				},
+				{
+					title: '主调',
+					operate: '',
+					src: '',
+					click: this.undeveloped
+				},
+				{
+					title: '调度台1',
+					operate: '',
+					src: '',
+					click: this.undeveloped
+				},
+				{
+					title: '调度台2',
+					operate: '',
+					src: '',
+					click: this.undeveloped
+				},
+				{
+					title: '调度台3',
+					operate: '',
+					src: '',
+					click: this.undeveloped
+				},
+				{
+					title: '大屏',
+					operate: '',
+					src: '',
+					click: this.undeveloped
+				},
+				{
+					title: '维护工作站',
+					operate: '',
+					src: '',
+					click: this.undeveloped
+				},
+				{
+					title: '运行图显示人工站',
+					operate: '',
+					src: '',
+					click: this.undeveloped
+				},
+				{
+					title: '跳停',
+					operate: '',
+					src: '',
+					click: this.undeveloped
+				},
+				{
+					title: '扣车',
+					operate: '',
+					src: '',
+					click: this.undeveloped
+				},
+				{
+					title: '列车报警',
+					operate: '',
+					src: logo_,
+					click: this.undeveloped
+				}
+			]
+		};
+	},
+	computed: {
+		isShowSystemTime() {
+			return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
+		}
+	},
+	watch: {
+		'$store.state.training.initTime': function (initTime) {
+			const date = new Date(initTime);
+			this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`;
+		}
+	},
+	mounted() {
+		this.initTools();
+	},
+	methods: {
+		initTools() {
+			this.tools = [];
+		}
+	}
+};
 </script>
 
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
+<style scoped rel="stylesheet/scss" lang="scss">
     @import "src/styles/mixin.scss";
     $top: 30px;
     $width: 50px;
@@ -187,7 +197,6 @@
         }
     }
 
-
     .time {
         position: relative;
         float: right;
@@ -202,4 +211,4 @@
         height: $height - 4;
         width: $width - 4;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmap/theme/chengdu_03/menus/statusBar.vue b/src/jmap/theme/chengdu_03/menus/statusBar.vue
deleted file mode 100644
index 46a07d747..000000000
--- a/src/jmap/theme/chengdu_03/menus/statusBar.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-    <div id="statusBar"></div>
-</template>
-
-<script>
-    export default {
-        name: 'StatusBar',
-        props: {
-            selected: {
-                type: Object
-            }
-        },
-        data() {
-            return {
-            }
-        },
-        mounted() {
-        }
-    }
-</script>
-<style>
-    #statusBar {
-        z-index: 1000;
-        position: absolute;
-        height: $height;
-        line-height: $height;
-        border-radius: 0px !important;
-        top: 0px;
-        left: 0px;
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmap/theme/chengdu_03/menus/statusDownTrainDetail.vue b/src/jmap/theme/chengdu_03/menus/statusDownTrainDetail.vue
deleted file mode 100644
index 14f092b23..000000000
--- a/src/jmap/theme/chengdu_03/menus/statusDownTrainDetail.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-    <div id="statusDownTrainDetail"></div>
-</template>
-
-<script>
-    export default {
-        name: 'StatusDownTrainDetail',
-        props: {
-            selected: {
-                type: Object
-            }
-        },
-        data() {
-            return {
-            }
-        },
-        mounted() {
-        }
-    }
-</script>
-<style>
-    #statusDownTrainDetail {
-        z-index: 1000;
-        position: absolute;
-        height: $height;
-        line-height: $height;
-        border-radius: 0px !important;
-        top: 0px;
-        left: 0px;
-    }
-</style>
\ No newline at end of file
diff --git a/src/jmap/theme/chengdu_03/menus/statusUpTrainDetail.vue b/src/jmap/theme/chengdu_03/menus/statusUpTrainDetail.vue
deleted file mode 100644
index afafa39cf..000000000
--- a/src/jmap/theme/chengdu_03/menus/statusUpTrainDetail.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-    <div id="statusUpTrainDetail"></div>
-</template>
-
-<script>
-    export default {
-        name: 'StatusUpTrainDetail',
-        props: {
-            selected: {
-                type: Object
-            }
-        },
-        data() {
-            return {
-            }
-        },
-        mounted() {
-        }
-    }
-</script>
-<style>
-    #statusUpTrainDetail {
-        z-index: 1000;
-        position: absolute;
-        height: $height;
-        line-height: $height;
-        border-radius: 0px !important;
-        top: 0px;
-        left: 0px;
-    }
-</style>
\ No newline at end of file
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index 825aa3f80..1ab58c416 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -858,11 +858,11 @@ export const OperationEvent = {
 				domId: '_Tips-Signal-HumanTrainRoute-Mbm'
 			},
 			menu: {
-				operation: '3051',
+				operation: '305',
 				domId: '_Tips-Signal-HumanTrainRoute-Menu'
 			},
 			confirm: {
-				operation: '3052',
+				operation: '3051',
 				domId: '_Tips-Signal-HumanTrainRoute-Confirm'
 			}
 		},
diff --git a/src/scripts/OperationConfig.js b/src/scripts/OperationConfig.js
index 88f0f6c7d..ab2bb769d 100644
--- a/src/scripts/OperationConfig.js
+++ b/src/scripts/OperationConfig.js
@@ -1304,7 +1304,7 @@ export const OperationList = {
 				trainingName: '办理引导进路({3})',
 				trainingRemark: '进路办理信号引导',
 				trainingType: '02',
-				productTypes: ['02'],
+				productTypes: ['01,02'],
 				stepVOList: [
 					{ deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【办理引导进路】' },
 					{ deviceType: '04', orderNum: 2, operateCode: '3085', tip: '鼠标左键选择进路名称【{3}】' },
@@ -1320,12 +1320,27 @@ export const OperationList = {
 				trainingName: '取消进路({3} 进路)',
 				trainingRemark: '取消进路功能',
 				trainingType: '02',
-				productTypes: ['02'],
+				productTypes: ['01,02'],
 				stepVOList: [
 					{ deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【取消进路】' },
 					{ deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' }
 				]
 			},
+			{
+				maxDuration: 15,
+				minDuration: 8,
+				operateType: '0207',
+				skinCode: '04',
+				trainingName: '总人解({3})',
+				trainingRemark: '总人解',
+				trainingType: '02',
+				productTypes: ['01,02'],
+				stepVOList: [
+					{ deviceType: '04', orderNum: 1, operateCode: '305', tip: '鼠标右键菜单选择【总人解】' },
+					{ deviceType: '04', orderNum: 2, operateCode: '305', tip: '鼠标左键点击【确定】按钮' },
+					{ deviceType: '04', orderNum: 3, operateCode: '3051', tip: '输入密码123456，点击【确定】按钮' }
+				]
+			},
 			{
 				maxDuration: 8,
 				minDuration: 5,
@@ -1378,7 +1393,7 @@ export const OperationList = {
 				trainingName: '进路收人工控({5})',
 				trainingRemark: '进路收人工控',
 				trainingType: '02',
-				productTypes: ['02'],
+				productTypes: ['01,02'],
 				stepVOList: [
 					{ deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【自排开】' },
 					{ deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择控制状态为"人工"的进路', val: '{6}' },
@@ -1509,7 +1524,7 @@ export const OperationList = {
 				trainingName: '区故解({7})',
 				trainingRemark: '道岔区段故障解锁功能',
 				trainingType: '03',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '02', orderNum: 1, operateCode: '109', tip: '鼠标右键菜单选择【区故解】' },
 					{ deviceType: '02', orderNum: 2, operateCode: '109', tip: '鼠标左键点击【确认】按钮' },
@@ -1540,7 +1555,7 @@ export const OperationList = {
 				trainingName: '属性({8}{9})',
 				trainingRemark: '区段详情({8}{9})',
 				trainingType: '04',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '03', orderNum: 1, operateCode: '410', tip: '鼠标右键菜单选择【属性】' },
 					{ deviceType: '03', orderNum: 2, operateCode: '410', tip: '鼠标左键点击【确认】按钮' }
@@ -1555,7 +1570,7 @@ export const OperationList = {
 				trainingName: '设置扣车({10}-{12}站台)',
 				trainingRemark: '设置扣车功能',
 				trainingType: '05',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【设置扣车】' },
 					{ deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' }
@@ -1569,7 +1584,7 @@ export const OperationList = {
 				trainingName: '取消扣车({10}-{12}站台)',
 				trainingRemark: '设置取消扣车功能',
 				trainingType: '05',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
 					{ deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
@@ -1583,7 +1598,7 @@ export const OperationList = {
 				trainingName: '取消扣车({10}-{12}站台)',
 				trainingRemark: '设置取消扣车功能(上行全线)',
 				trainingType: '05',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
 					{ deviceType: '06', orderNum: 2, operateCode: '5051', tip: '鼠标左键点击【上行全线】按钮', val: '02' },
@@ -1612,7 +1627,7 @@ export const OperationList = {
 				trainingName: '取消跳停({10}-{12}站台)',
 				trainingRemark: '设置取消跳停功能',
 				trainingType: '05',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' },
 					{ deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮', val: '{11}' }
@@ -1720,7 +1735,7 @@ export const OperationList = {
 				trainingName: '属性({10}-{12}站台)',
 				trainingRemark: '查询站台状态功能',
 				trainingType: '05',
-				productTypes: ['01,02'],
+				productTypes: ['02'],
 				stepVOList: [
 					{ deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【属性】' },
 					{ deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【确定】按钮' }
diff --git a/src/scripts/plugin/converter/SignalRouteOperationConverter.js b/src/scripts/plugin/converter/SignalRouteOperationConverter.js
index cda788326..37bea440e 100644
--- a/src/scripts/plugin/converter/SignalRouteOperationConverter.js
+++ b/src/scripts/plugin/converter/SignalRouteOperationConverter.js
@@ -326,17 +326,17 @@ function handleMenuHumanTrainRoute(operates) {
 		const operate = operates[0];
 		if (operate.type === SignalType && operate.code) {
 			if (operate.code) {
-				const counter = store.getters['map/getCounterBySingalCode'](operate.code, '02');
-				if (counter) {
-					const val = localStore.get(counter.code) || '';
-					return {
-						type: operate.type,
-						code: operate.code,
-						over: true,
-						operation: SignalOperation.humanTrainRoute.event,
-						val: val
-					};
-				}
+				// const counter = store.getters['map/getCounterBySingalCode'](operate.code, '02');
+				// if (counter) {
+				// const val = localStore.get(counter.code) || '';
+				return {
+					type: operate.type,
+					code: operate.code,
+					over: true,
+					operation: SignalOperation.humanTrainRoute.event
+					// val: val
+				};
+				// }
 			}
 		}
 		return { error: true };
diff --git a/src/scripts/plugin/converter/manager.js b/src/scripts/plugin/converter/manager.js
index 1b19e8c9e..5e9d7f963 100644
--- a/src/scripts/plugin/converter/manager.js
+++ b/src/scripts/plugin/converter/manager.js
@@ -8,7 +8,6 @@ import StationStandOperationConverter from './StationStandOperationConverter';
 import CancelLimitOperationConverter from './CancelLimitOperationConverter';
 import MixinOperationConverter from './MixinOperationConverter';
 
-
 export function getConverter(operates) {
 	if (SwitchOperationConverter.test(operates)) {
 		return SwitchOperationConverter;
@@ -36,4 +35,4 @@ export function getConverter(operates) {
 	} else if (MixinOperationConverter.test(operates)) {
 		return MixinOperationConverter;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index 28b3d5762..3e086f79e 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -4,22 +4,9 @@
       <span v-if="hasProduct"><b>{{ $t('demonstration.simulationName') + courseModel.name }}</b></span>
       <span v-else>{{ $t('demonstration.noSimulationProducts') }}</span>
     </div>
-    <el-tabs
-      type="border-card"
-      :value="currentPrdCode"
-      :style="{ height: height-50 +'px' }"
-      @tab-click="handleLeave"
-    >
-      <el-tab-pane
-        v-for="item in productList"
-        :key="item.code"
-        :name="item.code"
-        :label="item.name"
-        style="padding: 5px"
-        :style="{ height: height-160 +'px' }"
-      >
+    <el-tabs type="border-card" :value="currentPrdCode" :style="{ height: height-50 +'px' }" @tab-click="handleLeave">
+      <el-tab-pane v-for="item in productList" :key="item.code" :name="item.code" :label="item.name" style="padding: 5px" :style="{ height: height-160 +'px' }">
         <div>
-          <!-- <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: height-170 +'px' }"> -->
           <p class="list-item">
             <span class="list-label">{{ $t('demonstration.productDescription') }}</span>
             <span class="list-elem">{{ courseModel.remarks }}</span>
@@ -28,7 +15,6 @@
             <span class="list-label">{{ $t('global.permissionList') }}</span>
           </p>
           <limit-list :ref="`limit_${item.code}`" :course-model="courseModel" @initLoadPage="initLoadPage" />
-        <!-- </el-scrollbar> -->
         </div>
       </el-tab-pane>
       <div v-if="hasProduct" class="btn-buy">
diff --git a/src/views/jointTraining/chatWindow.vue b/src/views/jointTraining/chatWindow.vue
index a6a710fe5..9f893156e 100644
--- a/src/views/jointTraining/chatWindow.vue
+++ b/src/views/jointTraining/chatWindow.vue
@@ -36,17 +36,11 @@
       </div>
       <div class="footChat">
         <div class="inputBox">
-          <div
-            class="sendBtn zIndex1"
-            :style="{background: background, color: color,}"
-            :disabled="true"
-            @mousedown="startRecording()"
-            @mouseup="stopRecording()"
-          >{{ speak }}</div>
-          <div v-show="sending" class="sendBtn zIndex2" :style="{background: background}">{{$t('joinTraining.sending')}}</div>
+          <div class="sendBtn zIndex1" :style="{background: background, color: color}" :disabled="true" @mousedown="startRecording()" @mouseup="stopRecording()">{{ speak }}</div>
+          <div v-show="sending" class="sendBtn zIndex2" :style="{background: background}">{{ $t('joinTraining.sending') }}</div>
         </div>
         <div v-if="isShowAuto" class="switch-box">
-          <span style="font-size: 12px;">{{$t('joinTraining.autoplay')}}</span>
+          <span style="font-size: 12px;">{{ $t('joinTraining.autoplay') }}</span>
           <el-switch v-model="isAutoPlay" active-color="#13ce66" inactive-color="#d6d6d6" />
         </div>
       </div>
@@ -59,12 +53,9 @@
 </template>
 
 <script>
-// import Vue from 'vue';
 import HZRecorder from '@/utils/HZRecorder';
 import ChatFomat from '@/utils/chatFomat';
-// import StompClient from '@/utils/sock';
 import { postDataBd, getConversation } from '@/api/chat';
-// import { handleToken } from '@/utils/auth';
 import { displayTopic, clearSubscribe } from '@/utils/stomp';
 import { sendCommand } from '@/api/jmap/training';
 import { EventBus } from '@/scripts/event-bus';
@@ -213,7 +204,7 @@ export default {
 						conversationId: this.conversationId
 					};
 
-					await postDataBd(param).catch(error => {
+					postDataBd(param).catch(error => {
 						this.sending = false;
 						this.speakOf = false;
 						const message = JSON.parse(error.message);
diff --git a/src/views/jointTraining/menuDemon.vue b/src/views/jointTraining/menuDemon.vue
index 0fbe01420..1e76ed953 100644
--- a/src/views/jointTraining/menuDemon.vue
+++ b/src/views/jointTraining/menuDemon.vue
@@ -2,13 +2,13 @@
   <div>
     <div class="display-draft">
       <el-button-group>
-        <el-button v-if="isIBP" type="warning" @click="jumpIbp">{{$t('joinTraining.iBPDisk')}}</el-button>
-        <el-button v-if="isDriver" type="jumpjlmap3d" @click="jumpjlmap3d">{{$t('joinTraining.driverPerspective')}}</el-button>
+        <el-button v-if="isIBP" type="warning" @click="jumpIbp">{{ $t('joinTraining.iBPDisk') }}</el-button>
+        <el-button v-if="isDriver" type="jumpjlmap3d" @click="jumpjlmap3d">{{ $t('joinTraining.driverPerspective') }}</el-button>
         <template v-if="isAdmin">
-          <el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{$t('joinTraining.drivingByPlan')}}</el-button>
-          <el-button type="danger" :disabled="!isDisable" @click="end">{{$t('joinTraining.exitPlan')}}</el-button>
+          <el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{ $t('joinTraining.drivingByPlan') }}</el-button>
+          <el-button type="danger" :disabled="!isDisable" @click="end">{{ $t('joinTraining.exitPlan') }}</el-button>
         </template>
-        <el-button v-if="!isBigScreen" type="primary" @click="back">{{$t('global.back')}}</el-button>
+        <el-button v-if="!isBigScreen" type="primary" @click="back">{{ $t('global.back') }}</el-button>
       </el-button-group>
     </div>
     <qr-code ref="qrCode" />
@@ -40,12 +40,12 @@ export default {
 			type: String,
 			required: true
 		},
-        deviceCode: {
-		    type: String,
-            default() {
-                return '';
-            }
-        }
+		deviceCode: {
+			type: String,
+			default() {
+				return '';
+			}
+		}
 	},
 	data() {
 		return {
@@ -311,7 +311,7 @@ export default {
 			this.$emit('hidepanel');
 		},
 		jumpIbp() {
-			this.$emit('showIbp',this.deviceCode);
+			this.$emit('showIbp', this.deviceCode);
 		}
 	}
 };
diff --git a/src/views/map/mapdraft/mapedit/configMap.vue b/src/views/map/mapdraft/mapedit/configMap.vue
index 428a27e64..6aa56ac55 100644
--- a/src/views/map/mapdraft/mapedit/configMap.vue
+++ b/src/views/map/mapdraft/mapedit/configMap.vue
@@ -1,20 +1,5 @@
 <template>
-  <!-- <transition name="fade"> -->
-  <el-dialog
-    :title="$t('map.layerDisplay')"
-    :visible.sync="dialogTableVisible"
-    class="view_box"
-    width="460px"
-    :before-close="doClose"
-    :modal-append-to-body="false"
-  >
-    <!-- <div class="dialog-box"> -->
-    <!-- <div class="title">
-        <div class="fl-title">{{ $t('map.layerDisplay') }}</div>
-        <div class="fr-title" @click="doClose">
-          <i class="el-icon-close" />
-        </div>
-      </div> -->
+  <el-dialog :title="$t('map.layerDisplay')" :visible.sync="dialogTableVisible" class="view_box" width="460px" :before-close="doClose" :modal-append-to-body="false">
     <el-row type="flex" justify="center" class="content_box">
       <el-form label-width="80px" class="demo-ruleForm">
         <el-form-item :label="$t('map.viewShows')">
@@ -45,9 +30,7 @@
         </el-form-item>
       </el-form>
     </el-row>
-    <!-- </div> -->
   </el-dialog>
-  <!-- </transition> -->
 </template>
 
 <script>
diff --git a/src/views/map/mapdraft/mapedit/dataRelation/index.vue b/src/views/map/mapdraft/mapedit/dataRelation/index.vue
index 3468150f5..bc8693a03 100644
--- a/src/views/map/mapdraft/mapedit/dataRelation/index.vue
+++ b/src/views/map/mapdraft/mapedit/dataRelation/index.vue
@@ -7,26 +7,10 @@
             {{ $t('map.mapName') }}
             <b>{{ mapInfo.name }}</b>
           </span>
-          <el-button
-            type="text"
-            style="float: right; padding: 3px 0; margin-right: 5px;"
-            @click="previewRouteEvent"
-          >{{ $t('map.preview') }}</el-button>
-          <el-button
-            type="text"
-            style="float: right; padding: 3px 0; margin-right: 5px;"
-            @click="createRouteEvent"
-          >{{ $t('map.newConstruction') }}</el-button>
-          <el-button
-            type="text"
-            style="float: right; padding: 3px 0; margin-right: 5px;"
-            @click="drawMap"
-          >{{ $t('map.drawMap') }}</el-button>
-          <el-button
-            type="text"
-            style="float: right; padding: 3px 0; margin-right: 5px;"
-            @click="showMap"
-          >{{ $t('map.viewLayer') }}</el-button>
+          <el-button type="text" class="mapEdit_box" @click="previewRouteEvent">{{ $t('map.preview') }}</el-button>
+          <el-button type="text" class="mapEdit_box" @click="createRouteEvent">{{ $t('map.newConstruction') }}</el-button>
+          <el-button type="text" class="mapEdit_box" @click="drawMap">{{ $t('map.drawMap') }}</el-button>
+          <el-button type="text" class="mapEdit_box" @click="showMap">{{ $t('map.viewLayer') }}</el-button>
         </div>
         <el-tabs v-model="enabledTab" type="card" class="map_card" @tab-click="changePane">
           <el-tab-pane label="进路" name="route">
@@ -216,6 +200,11 @@ export default {
         float: right;
         width: 100%;
     }
+	.mapEdit_box{
+		float: right;
+		padding: 3px 0;
+		margin-right: 5px;
+	}
 
     .physical-view {
         line-height: 25px;