diff --git a/src/jmapNew/theme/beijing_01/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/beijing_01/menus/dispatchWorkMenu.vue index 9e3fff807..a13efd21a 100644 --- a/src/jmapNew/theme/beijing_01/menus/dispatchWorkMenu.vue +++ b/src/jmapNew/theme/beijing_01/menus/dispatchWorkMenu.vue @@ -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'); diff --git a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue index 48d629e50..d00f00c8c 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue @@ -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'), diff --git a/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue index 2106869af..a0b6c6545 100644 --- a/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue +++ b/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue @@ -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'),