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

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

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

8
src/jmapNew/theme/beijing_01/menus/dispatchWorkMenu.vue
View File

@ -56,7 +56,13 @@ export default {
'width'
])
},
watch: {},
watch: {
'$store.state.trainingNew.trainingSwitch': function (val) {
if (val) {
this.$store.dispatch('menuOperation/setButtonOperation', null);
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('config/updateMenuBar');

2
src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue
View File

@ -151,7 +151,7 @@ export default {
moduleName: this.$t('menu.passiveDialog.cmmControlModeConversionMode'),
level: this.$t('menu.passiveDialog.zeroLevelAlarm'),
confirm: this.$t('menu.passiveDialog.confirmStatus'),
alarmDate: parseTime(this.$store.state.training.initTime),
alarmDate: parseTime(this.$store.state.socket.simulationTimeSync),
type: this.$t('menu.passiveDialog.systemEvent'),
childType: this.$t('menu.passiveDialog.childTypeTips'),
timeSummary: this.$t('menu.passiveDialog.controlModeSummary'),

2
src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
View File

@ -147,7 +147,7 @@ export default {
moduleName: this.$t('menu.passiveDialog.cmmControlModeConversionMode'),
level: this.$t('menu.passiveDialog.zeroLevelAlarm'),
confirm: this.$t('menu.passiveDialog.confirmStatus'),
alarmDate: parseTime(this.$store.state.training.initTime),
alarmDate: parseTime(this.$store.state.socket.simulationTimeSync),
type: this.$t('menu.passiveDialog.systemEvent'),
childType: this.$t('menu.passiveDialog.childTypeTips'),
timeSummary: this.$t('menu.passiveDialog.controlModeSummary'),