调整角色切换bug&通号界面添加成员管理&仿真按钮offset位置修复

src/jmapNew/theme/haerbin_01/menus/menuBar.vue

@@ -157,6 +157,9 @@ export default {
     mounted() {
         this.version = this.$store.state.map.version;
         this.initMenu();
+        if (this.$store.state.socket.simulationRoleList && this.$store.state.socket.simulationRoleList.length) {
+            this.checkRoleChange(this.$store.state.socket.simulationRoleList);
+        }
     },
     methods: {
         initMenu() {

src/views/jlmap3d/maintainer/jl3dmaintainer.vue

@@ -4,7 +4,7 @@
 
     <div class="display-draft">
       <el-button-group>
-
+        <el-button v-if="isAdmin" @click="memberManage">成员管理</el-button>
         <el-button type="primary" @click="back">{{ $t('global.back') }}</el-button>
       </el-button-group>
 
@@ -14,8 +14,7 @@
       v-show="faultlistshow"
       :devicelist="devicelist"
       @selectdevice="selectdevice"
-    >
+    />
-    </Devicefault-List>
     <Fault-Device
       v-show="deviceShow"
       ref="faultdevice"
@@ -26,14 +25,13 @@
       <canvas id="canvastexture" />
     </div>
 
-    <div class="msg" v-show ="msgshow">
+    <div v-show="msgshow" class="msg">
       <div class="msgtext">
         {{ controlmsg }}
       </div>
     </div>
 
-    <div id="jl3droom" class="roombutton" @click="showroom"></div>
+    <div id="jl3droom" class="roombutton" @click="showroom" />
-
 
   </div>
 
@@ -55,7 +53,6 @@ import { JLmap3dMaintainer } from '@/jlmap3d/jl3dmaintainer/jlmap3dmaintainer.js
 import DevicefaultList from '@/views/jlmap3d/maintainer/component/devicefaultlist';
 import FaultDevice from '@/views/jlmap3d/maintainer/component/faultdevice';
 
-
 import Jlmap3dConfig from '@/views/jlmap3d/simulation/show/configmenu';
 import { ProjectIcon } from '@/scripts/ProjectConfig';
 
@@ -66,11 +63,19 @@ export default {
     name: 'Jl3dMaintainer',
     components: {
         DevicefaultList,
-        FaultDevice,
+        FaultDevice
 
         // Jlmap3dMsg
         // ShowProperty
     },
+    props: {
+        isAdmin: {
+            type: Boolean,
+            default() {
+                return false;
+            }
+        }
+    },
     data() {
         return {
             training: {
@@ -89,7 +94,7 @@ export default {
             devicelist:[],
             deviceShow:true,
             msgshow:false,
-            controlmsg:"",
+            controlmsg:''
 
         };
     },
@@ -98,7 +103,7 @@ export default {
         if (this.jlmap3d) {
             this.jlmap3d.webwork.postMessage('off');
             this.jlmap3d.webwork.terminate();
-            console.log("www");
+            console.log('www');
             this.jlmap3d.jsonwebworknew.terminate();
             this.jlmap3d.dispose();
             this.jlmap3d = null;
@@ -221,7 +226,9 @@ export default {
             this.$emit('back');
             this.isswitch = false;
         },
-
+        memberManage() {
+            this.$emit('handlerMemberManage');
+        }
     }
 };
 </script>
@@ -324,5 +331,4 @@ export default {
     z-index: -12;
   }
 
-
 </style>

src/views/newMap/jointTrainingNew/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main" :style="{width: canvasWidth+'px'}">
     <Jl3d-Drive v-show="drivingShow" ref="Jl3dDrive" :panel-show="drivingShow" @showdriving="showdriving" />
-    <Jl3d-Maintainer v-if="jl3dmaintainershow" @back="back" />
+    <Jl3d-Maintainer v-if="jl3dmaintainershow" :is-admin="isAdmin" @back="back" @handlerMemberManage="handlerMemberManage" />
     <ibp-plate v-show="ibpShow" ref="ibpPlate" @hideIbp="hideIbp" />
     <template v-show="panelShow" :panelShow="panelShow">
       <transition name="el-zoom-in-bottom">
@@ -247,6 +247,8 @@ export default {
         // 设置菜单和工具栏位置
         setPosition() {
             this.$nextTick(() => {
+                this.offset = 10;
+                this.offsetBottom = 15;
                 const menuBar = document.getElementById('menuBar');
                 const menuTool = document.getElementById('menuTool');
                 const menuBottom = document.getElementById('menuButton');
@@ -394,9 +396,10 @@ export default {
                 this.$store.dispatch('training/setRoles', 'DISPATCHER');
                 this.hideIbp();
                 this.drivingShow = false;
-                if ((this.lineCode === '07' || this.lineCode === '06') && deviceCode) {
+                if (this.lineCode === '07' || this.lineCode === '06') {
                     this.mapViewLoadedOver && this.setShowStation('');
                 }
+                this.jl3dmaintainershow = false;
                 break;
             case 'STATION_SUPERVISOR':
                 this.$store.dispatch('training/setPrdType', '01');
@@ -406,22 +409,27 @@ export default {
                     this.$refs.menuSchema.chiShowStation = deviceCode;
                     this.mapViewLoadedOver && this.switchStationMode(deviceCode);
                 }
+                this.jl3dmaintainershow = false;
                 this.drivingShow = false;
                 break;
             case 'AUDIENCE':
                 this.$store.dispatch('training/setPrdType', '');
                 this.$store.dispatch('training/setRoles', 'AUDIENCE');
+                this.jl3dmaintainershow = false;
+                this.drivingShow = false;
                 this.hideIbp();
                 break;
             case 'DRIVER':
                 this.$store.dispatch('training/setPrdType', '');
                 this.$store.dispatch('training/setRoles', 'DRIVER');
+                this.jl3dmaintainershow = false;
                 break;
             case 'MAINTAINER':
                 this.$store.dispatch('training/setPrdType', '');
                 this.$store.dispatch('training/setRoles', 'MAINTAINER');
                 this.hideIbp();
                 this.jl3dmaintainershow = true;
+                this.drivingShow = false;
                 break;
             }
         },