From 9826b6b6f202277f3816557f04eaa93a6755b978 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 8 Jun 2022 13:05:54 +0800
Subject: [PATCH] =?UTF-8?q?ctc=E8=B0=83=E6=95=B4=20=E6=80=BB=E4=BA=BA?=
 =?UTF-8?q?=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/datie_02/menus/menuButtonCtc.vue    | 68 ++++++++++++-------
 .../datie_02/menus/menuDialog/routeCancel.vue |  4 ++
 .../theme/datie_02/menus/menuSignal.vue       |  8 +--
 3 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
index 830decd2e..d6dec40a7 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
@@ -30,7 +30,7 @@
 				<center><b>总</b><b>锁</b></center>
 			</span>
 		</button>
-		<button :id="Signal.humanTrainRoute.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.humanTrainRoute.button.operation, ['Signal','SignalButton'])">
+		<button :id="Signal.humanTrainRoute.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.humanTrainRoute.button.operation, ['Signal'])">
       		<span style="color: #800000">
 				<center><b>总</b></center>
         		<center><b>人</b><b>解</b></center>
@@ -536,38 +536,48 @@
 			// 引导信号
 			handleGuideSignal(model) {
 				const operate = {
-					over: true,
+					// over: true,
 					code: model.code,
 					operation: this.Signal.guide.button.operation,
-					cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
+					// cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
 					param: {signalCode: model.signalCode}
 				};
-				const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode);
+				this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+					this.$store.dispatch('training/updateMapState', [{code: model.code, _type: model._type, hasSelected: 1}]);
+				}).catch((error) => {
+					this.$refs.noticeInfo.doShow();
+				});
+				// const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode);
 				// 信号机引导时间15s以内再次点击引导不需要进行密码输入
-				if (signal.guideTime) {
-					this.sendCommand(operate);
-				} else {
-					operate.nextCmdType = CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE;
-					this.$refs.password.doShow(operate);
-				}
+				// if (signal.guideTime) {
+				// 	this.sendCommand(operate);
+				// } else {
+				// 	operate.nextCmdType = CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE;
+				// 	this.$refs.password.doShow(operate);
+				// }
 			},
 			// 人解进路
 			handleTotalHumanSolution(model) {
 				const operate = {
-					over: true,
+					// over: true,
 					code: model.code,
 					operation: this.$store.state.menuOperation.buttonOperation,
 					val: model.code,
-					cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
+					param: { signalCode: model.code }
+					// cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
 				};
-				const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode || model.code);
-				if (model._type === 'SignalButton' && model.type === 'PICK' && signal.routeLock) {
-					operate.param = {signalCode: model.signalCode};
-					this.sendCommand(operate);
-				} else if (model._type === 'Signal' && model.type === 'SHUNTING' && signal.routeLock) {
-					operate.param = {signalCode: model.code};
-					this.sendCommand(operate);
-				}
+				this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+				}).catch((error) => {
+					this.$refs.noticeInfo.doShow();
+				});
+				// const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode || model.code);
+				// if (model._type === 'SignalButton' && model.type === 'PICK' && signal.routeLock) {
+				// 	operate.param = {signalCode: model.signalCode};
+				// 	this.sendCommand(operate);
+				// } else if (model._type === 'Signal' && model.type === 'SHUNTING' && signal.routeLock) {
+				// 	operate.param = {signalCode: model.code};
+				// 	this.sendCommand(operate);
+				// }
 			},
 			handelSwitchOperate(model) {
 				const operate = {
@@ -669,9 +679,11 @@
 				];
 				console.log(buttonOperation, this.Signal.arrangementRoute.button.operation, 'buttonOperation', this.commandTypeList.includes(model._type));
 
-				if (model._type === 'SignalButton' && model.type === 'GUIDE') {
-					this.handleGuideLock(model);
-				} else if (buttonOperation && this.commandTypeList.includes(model._type)) {
+				// if (model._type === 'SignalButton' && model.type === 'GUIDE') {
+					// this.handleGuideLock(model);
+					// this.handleGuideSignal(model);
+				// } else
+				if (buttonOperation && this.commandTypeList.includes(model._type)) {
 					if (buttonOperation === this.MixinCommand.totalCancel.button.operation) {
 						this.handelTotalCancel(model);
 					} else if (buttonOperation === this.Signal.humanTrainRoute.button.operation) {
@@ -687,6 +699,8 @@
 					} else if (buttonOperation === this.Signal.arrangementRoute.button.operation) {
 						this.deviceList.push(model);
 						this.arrangementRouteOperation(this.deviceList);
+					} else if (buttonOperation === this.Signal.guide.button.operation ) {
+						this.handleGuideSignal(model);
 					} else {
 						this.clearOperate();
 					}
@@ -754,11 +768,19 @@
 				} else if (this.operation === OperationEvent.Signal.guide.button.operation) {
 					const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE};
 					this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+						this.$store.dispatch('training/updateMapState', [{code: this.selected.code, _type: this.selected._type, hasSelected: 0}]);
 						this.clearOperate();
 					}).catch(() => {
+						this.$store.dispatch('training/updateMapState', [{code: this.selected.code, _type: this.selected._type, hasSelected: 0}]);
 						this.$refs.noticeInfo.doShow();
 						this.clearOperate();
 					})
+				} else if (this.operation === OperationEvent.Signal.humanTrainRoute.button.operation) {
+					const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE};
+					this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+					}).catch((e) => {
+						this.$refs.noticeInfo.doShow();
+					}).finally(() => { this.clearOperate() });
 				}
 			},
 			commandClear() {
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/routeCancel.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/routeCancel.vue
index dd881882b..fe6eaff6d 100644
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/routeCancel.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuDialog/routeCancel.vue
@@ -78,6 +78,8 @@
 					this.showMessage = `下发“信号重开”命令吗？`;
 				} else if (this.operation === OperationEvent.Signal.guide.menu.operation) {
 					this.showMessage = `下发“引导进路”命令吗？`;
+				} else if (this.operation === OperationEvent.Signal.humanTrainRoute.menu.operation) {
+					this.showMessage = `下发“总人解”命令吗？`
 				} else {
 					this.showMessage = '';
 				}
@@ -93,6 +95,8 @@
         			this.sendCommand(menuOperate.Signal.reopenSignal);
 				} else if (this.operation === OperationEvent.Signal.guide.menu.operation) {
 					this.$refs.passwordBox.doShow({ operation: OperationEvent.Signal.guide.menu.operation });
+				} else if (this.operation === OperationEvent.Signal.humanTrainRoute.menu.operation) {
+        			this.sendCommand(menuOperate.Signal.humanTrainRoute);
 				}
 			},
 			cancel() {
diff --git a/src/jmapNew/theme/datie_02/menus/menuSignal.vue b/src/jmapNew/theme/datie_02/menus/menuSignal.vue
index 709b20f02..ed63959c9 100644
--- a/src/jmapNew/theme/datie_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuSignal.vue
@@ -102,11 +102,6 @@ export default {
 						handler: this.guide,
 						cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
 					},
-					{
-						label: '点灯/灭灯',
-						handler: '',
-						cmdType: ''
-					},
 					{
 						label: '坡道解锁',
 						handler: '',
@@ -301,8 +296,7 @@ export default {
         humanTrainRoute() {
             commitOperate(menuOperate.Signal.humanTrainRoute, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    Object.assign(operate, {operation: OperationEvent.Signal.humanTrainRoute.button.operation });
-                    this.$refs.passwordBox.doShow({...operate, ...{selected: this.selected}});
+                	this.$refs.routeCancel.doShow(operate, this.selected);
                 }
             });
         },