diff --git a/src/store/modules/training.js b/src/store/modules/training.js index c581fda2d..547888a91 100644 --- a/src/store/modules/training.js +++ b/src/store/modules/training.js @@ -192,7 +192,6 @@ const training = { state.prdType = prdType; }, setRoles: (state, roles) => { - console.log(roles, '***********'); state.roles = roles; }, setCenterStationCode:(state, centerStationCode) => { diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue index 96f09db33..d1d1777d6 100644 --- a/src/views/newMap/display/terminals/index.vue +++ b/src/views/newMap/display/terminals/index.vue @@ -16,7 +16,7 @@ - + diff --git a/src/views/newMap/display/terminals/psl.vue b/src/views/newMap/display/terminals/psl.vue index fab5c6da9..ad085317a 100644 --- a/src/views/newMap/display/terminals/psl.vue +++ b/src/views/newMap/display/terminals/psl.vue @@ -93,6 +93,14 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import CMD from '@/scripts/cmdPlugin/CommandEnum'; export default { name: 'PSL', + props: { + nowTerminal: { + type: Object, + default() { + return {}; + } + } + }, data() { return { indicators: { @@ -127,7 +135,7 @@ export default { } }, mounted() { - const stationCode = this.$store.state.training.roleDeviceCode; + const stationCode = this.nowTerminal.deviceCode || this.$store.state.training.roleDeviceCode; this.standCode = ''; this.standList = []; this.stationStandList.forEach(stand => { diff --git a/src/views/newMap/display/terminals/terminalMenu.vue b/src/views/newMap/display/terminals/terminalMenu.vue index 39b99b52a..ac4b6fcc0 100644 --- a/src/views/newMap/display/terminals/terminalMenu.vue +++ b/src/views/newMap/display/terminals/terminalMenu.vue @@ -3,7 +3,6 @@
客户端
-