diff --git a/src/scripts/cmdPlugin/MenuContextHandler.js b/src/scripts/cmdPlugin/MenuContextHandler.js index 85835dc0e..e8bc0e8e6 100644 --- a/src/scripts/cmdPlugin/MenuContextHandler.js +++ b/src/scripts/cmdPlugin/MenuContextHandler.js @@ -64,7 +64,7 @@ class MenuContextHandler { const control = this.getStationControl(selected); // (!store.state.scriptRecord.bgSet || store.state.scriptRecord.isScriptCommand) if (control) { - if (this.getPrdType() != '') { + if (this.getPrdType() != '' && this.getPrdType() != null) { const type = State2SimulationMap[this.getPrdType()]; const status = State2ControlMap[control.controlMode]; // 判断当前模式 menu = [...menuList[type]]; diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue index b7cae596b..ec52b14be 100644 --- a/src/views/newMap/displayNew/chatView/chatBox.vue +++ b/src/views/newMap/displayNew/chatView/chatBox.vue @@ -2,7 +2,7 @@
- +
@@ -84,6 +84,7 @@ export default { bottom:15, recordSending:false, currentCoversition:{}, + memberListCoversition:{}, seconds:0, inter:null, isHasCoversition:false, @@ -100,10 +101,10 @@ export default { }, computed:{ isShow() { - return this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE' && !this.isHasCoversition; + return this.userRole != '' && this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE' && !this.isHasCoversition; }, isButtonShow() { - return this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE' && this.isHasCoversition; + return this.userRole != '' && this.userRole != 'ADMIN' && this.userRole != 'AUDIENCE' && this.isHasCoversition; } }, watch: { @@ -166,6 +167,7 @@ export default { if (this.recordSending) { this.cancleRecording(); } + this.memberListCoversition = coversition || {id:null}; this.$refs.chatContent.scrollTop(); }, getCoversitionList() { diff --git a/src/views/newMap/displayNew/chatView/chatMemberList.vue b/src/views/newMap/displayNew/chatView/chatMemberList.vue index 9312509d7..a58adb699 100644 --- a/src/views/newMap/displayNew/chatView/chatMemberList.vue +++ b/src/views/newMap/displayNew/chatView/chatMemberList.vue @@ -1,7 +1,7 @@