diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue index 80a30980b..f89871a67 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue @@ -158,7 +158,7 @@ export default { this.commit(); } }, - '$store.state.menuOperation.selectedCount': function(val) { + 'selected': function(val) { if (this.selected) { const stand = this.$store.getters['map/getDeviceByCode'](this.selected.code); this.currentTime = stand.parkingTime diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue index 1f48a1b1a..278b0337a 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue @@ -68,7 +68,6 @@ export default { allChecked: false, dialogShow: false, loading: false, - isBlock: true, initEle: null, commandEleCode: null }; @@ -88,6 +87,9 @@ export default { selected() { return this.$store.state.menuOperation.selected; }, + isBlock() { + return this.operate && this.operate.operation === OperationEvent.Signal.block.button.operation; + }, domIdChoose() { return this.dialogShow ? OperationEvent.Command.common.choose.domId : '' }, diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue index 39e8792cf..8f46a0488 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue @@ -105,7 +105,7 @@ export default { this.commit(); } }, - '$store.state.menuOperation.selectedCount': function(val) { + 'selected': function(val) { console.log(this.selected) if (this.selected) { const signal = this.$store.getters['map/getDeviceByCode'](this.selected.code); diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue index ffab7cf72..5562606fa 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue @@ -98,7 +98,7 @@ export default { this.commit(); } }, - '$store.state.menuOperation.selectedCount': function(val) { + 'selected': function(val) { if (this.selected) { const stand = this.$store.getters['map/getDeviceByCode'](this.selected.code); this.status = !!stand.allSkip diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue index 0aa117a35..89eafb9bc 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue @@ -115,7 +115,7 @@ export default { this.commit(); } }, - '$store.state.menuOperation.selectedCount': function(val) { + 'selected': function(val) { if (this.selected) { const stand = this.$store.getters['map/getDeviceByCode'](this.selected.code); if (stand && !stand.stationHoldTrain && !stand.centerHoldTrain) { diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue index ba300183c..5b8e1f94e 100644 --- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue +++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue @@ -96,7 +96,7 @@ export default { this.commit(); } }, - '$store.state.menuOperation.selectedCount': function(val) { + 'selected': function(val) { if (this.selected) { const swch = this.$store.getters['map/getDeviceByCode'](this.selected.code); if (swch) {