ncc报警客户端切换调整&角色变更客户端切换调整

src/views/newMap/display/simulationMenu/simulationMenu.vue

@@ -91,6 +91,9 @@ export default {
     },
     watch: {
         '$store.state.socket.simulationOver':function(val) {
+            if (this.$store.state.training.simulationCreator) {
+                return;
+            }
             this.$alert('您所在仿真已被销毁', '提示', {
                 confirmButtonText: '确定',
                 showClose: false,

src/views/newMap/display/terminals/index.vue

@@ -195,9 +195,11 @@ export default {
             }
         },
         '$store.state.socket.simulationAlarmInfo': function(val) {
-            if (val && val.handleMethod === 'NCC' && this.picture === 'nccWork') {
-                this.pictureChangeByType('lineMonitor');
-            }
+            (val || []).forEach(alarm => {
+                if (alarm && alarm.handleMethod === 'NCC' && this.picture === 'nccWork') {
+                    this.pictureChangeByType('lineMonitor');
+                }
+            });
         }
     },
     mounted() {

src/views/newMap/display/terminals/terminalMenu.vue

@@ -13,7 +13,7 @@
       direction="rtl"
       :before-close="handleClose"
     >
-      <div class="my-drawer-body">k
+      <div class="my-drawer-body">
         <div class="my-drawer-title">客户端列表</div>
         <div style="width: 100%;height: calc(100% - 80px);overflow-y: auto;">
           <template v-for="terminal in terminalList">
@@ -57,10 +57,12 @@ export default {
             const clientIdList = this.$store.state.training.domConfig ? this.$store.state.training.domConfig.clientList : [];
             if (!clientIdList || !clientIdList.length) {
                 this.initTerminalList();
-                if ((!this.$store.state.trainingNew.trainingDetail || !this.$store.state.trainingNew.trainingDetail.client) && !this.$route.query.client) {
-                    this.initPictureShow();
-                } else if (!this.$store.state.trainingNew.trainingDetail || !this.$store.state.trainingNew.trainingDetail.client) {
-                    this.changeQueryClient();
+                if (!this.$store.state.trainingNew.trainingDetail || !this.$store.state.trainingNew.trainingDetail.client) {
+                    if (this.$route.query.client && !this.nowTerminal) {
+                        this.changeQueryClient();
+                    } else {
+                        this.initPictureShow();
+                    }
                 }
             } else if (!this.terminalList.length) {
                 this.initTerminalList();