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

Merge remote-tracking branch 'origin/test_dispaly' into test

Browse Source
This commit is contained in:
fan 2023-01-13 18:12:59 +08:00
commit aee86e8024
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
View File

@ -6,13 +6,13 @@
<center><b>建</b><b>立</b></center>
</span>
</button>
<button :id="MixinCommand.totalCancel.button.domId" class="button_box" @click="buttonDown(MixinCommand.totalCancel.button.operation, [])">
<button :id="MixinCommand.totalCancel.button.domId" class="button_box" @click="buttonDown(MixinCommand.totalCancel.button.operation, ['Signal','SignalButton'])">
<span :style="{color: operation === MixinCommand.totalCancel.button.operation ? '#ccc': 'black'}">
<center><b>总</b></center>
<center><b>取</b><b>消</b></center>
</span>
</button>
<button :id="Signal.reopenSignal.button.domId" class="button_box" @click="buttonDown(Signal.reopenSignal.button.operation, ['Signal'])">
<button :id="Signal.reopenSignal.button.domId" class="button_box" @click="buttonDown(Signal.reopenSignal.button.operation, ['Signal','SignalButton'])">
<span :style="{color: operation === Signal.reopenSignal.button.operation ? '#ccc': 'black'}">
<center><b>信</b><b>号</b></center>
<center><b>重</b><b>开</b></center>
@ -30,7 +30,7 @@
<center><b>总</b><b>锁</b></center>
</span>
</button>
<button :id="Signal.humanTrainRoute.button.domId" class="button_box" @click="buttonDown(Signal.humanTrainRoute.button.operation, ['Signal'])">
<button :id="Signal.humanTrainRoute.button.domId" class="button_box" @click="buttonDown(Signal.humanTrainRoute.button.operation, ['Signal','SignalButton'])">
<span :style="{color: operation === Signal.humanTrainRoute.button.operation ? '#ccc':'#800000'}">
<center><b>总</b></center>
<center><b>人</b><b>解</b></center>
@ -461,7 +461,9 @@ export default {
operation: this.Signal.reopenSignal.button.operation,
userOperationType: UserOperationType.LEFTCLICK,
code: device.code,
param: { signalCode: device.code }
param:{
signalCode: device._type === 'Signal' ? device.code : device.signalCode
}
};
this.$store.dispatch('trainingNew/next', operate);
},
@ -555,7 +557,10 @@ export default {
operation: this.$store.state.menuOperation.buttonOperation,
userOperationType: UserOperationType.LEFTCLICK,
val: model.code,
param: { signalCode: model.code }
// param: { signalCode: model.code }
param:{
signalCode: model._type === 'Signal' ? model.code : model.signalCode
}
};
this.$store.dispatch('trainingNew/next', operate);
},

7
src/views/newMap/display/simulationMenu/simulationMenu.vue
View File

@ -193,8 +193,11 @@ export default {
this.logout();
});
} else if (this.$route.query.third) {
// this.$router.push({ path: `/trainingPlatform/simulation/${this.$route.query.mapId}`, query: { lineCode: this.$route.query.lineCode } });
window.close();
if (this.$route.query.project === 'cgy') {
window.parent.postMessage('back', '*');
} else {
window.close();
}
} else if (this.projectDevice) {
this.logout();
} else {