Merge remote-tracking branch 'origin/develop'

src/scripts/cmdPlugin/newHandler.js

@@ -122,7 +122,7 @@ class Handler {
         const group = router.currentRoute.query.group;
         const stepInfo = store.state.trainingNew.stepInfo;
         endTrainingStep(group, stepInfo.id).then(resp => {
-            store.dispatch('trainingNew/clearOperateOrder');
+            // store.dispatch('trainingNew/clearOperateOrder');
         }).catch(e => {
             console.error('进入下一步失败！', e);
         });

src/store/modules/trainingNew.js

@@ -83,6 +83,7 @@ const training = {
             if (store.state.training.myMemberId == state.stepInfo.memberId) {
                 state.stepRecord.push({ stepId: state.stepInfo.id, success: false, clientOperations: [] });
             }
+            state.operateOrder = 0;
             Handler.judgeIsTextSendOperation();
         },
         clearStepInfo: (state, stepInfo) => {

src/utils/stomp.js

@@ -35,7 +35,7 @@ export function getTopic(type, group, param) {
         topic = `/queue/simulation/${group}/iscs/gate/${param.stationCode}`;
         break;
     case 'TMS':
-        topic = `/queue/simulation/${group}/train/001/tms`;
+        topic = `/queue/simulation/${group}/train/${param.groupNumber}/tms`;
         break;
     case 'PIS_STAND':
         topic = `/queue/simulation/${group}/standPis/${param.standCode}`;

src/views/jlmap3d/drive/sceneview/tmsPage.vue

@@ -8,7 +8,7 @@
 						<td>网压</td>
 						<td>网流</td>
 						<td>速度</td>
-						<td>牵引/制动级位</td>
+						<td>牵引/制动级位111</td>
 						<td>里程标</td>
 						<td>下一站</td>
 						<td>目的站</td>
@@ -143,7 +143,7 @@
 								</div>
 							</td></template
 						>
-						<template v-else-if="k === '交流输出电压'">
+						<template v-else-if="k === '交流输出电压111'">
 							<td v-for="(item, j) in v" :key="j">
 								{{ item }}
 							</td></template
@@ -230,6 +230,7 @@ export default {
 	data() {
 		return {
 			localStatic: JL3D_LOCAL_STATIC,
+			groupNumber: '001',
 			trainInfo: {
 				voltage: 1600,
 				current: 317,
@@ -260,6 +261,14 @@ export default {
 				牵引脉冲使能: [true, false, false, false, false, true]
 			}
 		};
+	},
+	watch: {
+        '$store.state.training.roleDeviceCode': function (val) {
+			if(val) {
+				this.unsubscribe();
+				this.subscribe();
+			}
+        }
     },
 	mounted() {
 		this.group = this.$route.query.group;
@@ -275,7 +284,8 @@ export default {
 	methods: {
 		subscribe() {
 			const header = { group: this.group || "", "X-Token": getToken() };
-			creatSubscribe(getTopic("TMS", this.group), header, msg => {
+			this.groupNumber = this.$store.state.training.roleDeviceCode
+			creatSubscribe(getTopic("TMS", this.group, { groupNumber: this.groupNumber }), header, msg => {
 				let res = JSON.parse(msg.body);
 				console.log(res);
 				console.log(res.parkingBreakPressure);
@@ -315,7 +325,7 @@ export default {
 			});
 		},
 		unsubscribe() {
-			clearSubscribe(getTopic("TMS", this.group));
+			clearSubscribe(getTopic("TMS", this.group, { groupNumber: this.groupNumber }));
 		},
 		setTractionWave(flag) {
 			if (timer) {

src/views/newMap/display/terminals/diagramEdit/components/menus/addTask.vue

@@ -418,7 +418,7 @@ export default {
                     // this.$emit('dispatchOperate', {
                     // 	dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
                     // });
-                        this.$emit('refresh');
+						this.$store.dispatch('runPlan/refresh');
                         this.$message.success(this.$t('tip.addTaskSuccessfully'));
                     }).catch((error) => {
                         this.$messageBox(this.$t('tip.addTaskFailed') + ': ' + error.message);

src/views/newMap/display/terminals/diagramEdit/components/menus/deleteTask.vue

@@ -61,7 +61,7 @@ export default {
                 deletePlanTrip(model).then(resp => {
                     this.$store.dispatch('runPlan/setSelected', {});
                     this.$store.dispatch('runPlan/setDraftSelected', {});
-                    this.$emit('refresh');
+					this.$store.dispatch('runPlan/refresh');
                     // this.$emit('dispatchOperate', {
                     //     dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
                     // });

src/views/newMap/display/terminals/diagramEdit/menuBar.vue

@@ -714,6 +714,14 @@ export default {
         confirmPublish() {
             publishRunPlanAllUser(this.loadRunPlanId, this.publishName || this.loadRunPlanName).then(resp => {
                 this.$message.success(this.$t('tip.publishRunPlanSuccess'));
+				if (resp.data && resp.data.length > 0) {
+					let message = '';
+					resp.data.forEach(msg =>  message += (msg + ';'))
+					this.$confirm(message, this.$t('global.tips'), {
+						confirmButtonText: this.$t('global.confirm'),
+						showCancelButton: false
+					})
+                }
                 this.publishVisible = false;
             }).catch(() => {
                 this.$messageBox(this.$t('tip.publishRunPlanFail'));

src/views/newMap/display/terminals/terminalMenu.vue

@@ -205,7 +205,11 @@ export default {
                 // 司机模拟
                 const trainingDesign = this.$store.state.training.domConfig ? this.$store.state.training.domConfig.trainingDesign : false;
                 const terminal = this.findTerminalFromMap(trainingDesign ? 'driverAtsWork' : 'drivingPlan');
+                if (this.$route.query.type === 'TMS') {
+                    this.changePictureShow(this.findTerminalFromMap('tms'));
+                } else {
                     this.changePictureShow(terminal);
+                }
             } else if (this.roles === 'NCC_DISPATCHER') {
                 const terminal = this.findTerminalFromMap('nccWork');
                 this.changePictureShow(terminal);

src/views/planMonitor/newEditTool/menuBar.vue

@@ -717,6 +717,13 @@ export default {
         confirmPublish() {
             publishRunPlanAllUser(this.loadRunPlanId, this.publishName || this.loadRunPlanName).then(resp => {
                 this.$message.success(this.$t('tip.publishRunPlanSuccess'));
+                if (resp.data && resp.data.length > 0) {
+					let message = '';
+					resp.data.forEach(msg =>  message += (msg + ';'))
+					this.$confirm(message, this.$t('global.tips'), {
+						confirmButtonText: this.$t('global.confirm')
+					})
+                }
                 this.publishVisible = false;
             }).catch(() => {
                 this.$messageBox(this.$t('tip.publishRunPlanFail'));