joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1

Browse Source
This commit is contained in:
fan 2023-01-13 09:12:08 +08:00
commit 3e6d8941c1
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue
View File

@ -193,12 +193,12 @@ export default {
stationCode: stationCode
}
};
this.$store.dispatch('trainingNew/next', operate).then(({valid, resp}) => {
this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {
if (valid) {
this.stationCode = stationCode;
this.trainFixedPathList = resp.data.data;
this.trainFixedPathList = response.data.data;
this.dialogShow = true;
this.title = title + ' 版本:' + resp.data.version;
this.title = title + ' 版本:' + response.data.version;
this.$nextTick(() => { this.$store.dispatch('training/emitTipFresh'); });
}
}).catch(e => {
@ -246,7 +246,7 @@ export default {
};
this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
if (valid) {
sendCommandNew(this.$route.query.group, menuOperate.CTC.getStationTrainFixedPath.cmdType, { stationCode: this.stationCode }).then(resp => {
sendCommandNew(this.$route.query.group, menuOperate.CTC.getStationTrainFixedPath.cmdType.value, { stationCode: this.stationCode }).then(resp => {
const title = '固定径路信息';
this.trainFixedPathList = resp.data.data;
this.title = title + ' 版本 :' + resp.data.version;
@ -260,7 +260,6 @@ export default {
},
cancel() {
const operate = {
over: true,
userOperationType: UserOperationType.LEFTCLICK,
operation: OperationEvent.Command.cancel.menu.operation
};

6
src/views/jlmap3d/simulation/jl3dsimulation.vue
View File

@ -91,9 +91,9 @@ export default {
};
},
watch: {
'$store.state.socket.simulationOver':function(val) {
this.back();
},
// '$store.state.socket.simulationOver':function(val) {
// this.back();
// },
},
beforeDestroy() {
// console.log("destroy");

2
src/views/newMap/display/terminals/index.vue
View File

@ -272,6 +272,8 @@ export default {
}
} else if (val === 'scheduleWork') {
this.mapViewLoaded(true);
} else if (val === 'dispatcherManage') {
this.mapViewLoaded(true);
}
this.$nextTick(() => { this.loading = false; });
},