diff --git a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue index 72099f239..dd97cec0b 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue +++ b/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() { @@ -234,13 +237,13 @@ export default { this.$nextTick(() => { EventBus.$emit('closeMenu'); }); - }, - checkRoleChange(list) { - list.forEach(item => { - if (item.messageType === 'PLAY_CHANGE' && item.userId == this.userId && item.type === 'STATION_SUPERVISOR') { - this.switchShowStation(this.centralizedMap[item.deviceCode]); - } - }); + }, + checkRoleChange(list) { + list.forEach(item => { + if (item.messageType === 'PLAY_CHANGE' && item.userId == this.userId && item.type === 'STATION_SUPERVISOR') { + this.switchShowStation(this.centralizedMap[item.deviceCode]); + } + }); } } }; diff --git a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue index 45b095191..e30fbb18a 100644 --- a/src/views/jlmap3d/maintainer/jl3dmaintainer.vue +++ b/src/views/jlmap3d/maintainer/jl3dmaintainer.vue @@ -4,7 +4,7 @@
- + 成员管理 {{ $t('global.back') }} @@ -14,26 +14,24 @@ v-show="faultlistshow" :devicelist="devicelist" @selectdevice="selectdevice" - > - + />
-
+
- {{controlmsg}} + {{ controlmsg }}
-
- +
@@ -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; @@ -137,19 +142,19 @@ export default { } }, init: function (skinCode, group) { - const mapdata = this.$store.getters['map/map']; - const dom = document.getElementById('app'); - const project = this.$route.query.project; - // console.log(project); - this.deviceShow = false; - if (project) { + const mapdata = this.$store.getters['map/map']; + const dom = document.getElementById('app'); + const project = this.$route.query.project; + // console.log(project); + this.deviceShow = false; + if (project) { this.jlmap3d = new JLmap3dMaintainer(dom, mapdata, skinCode, this.$store, group, project); - } else { + } else { - this.jlmap3d = new JLmap3dMaintainer(dom, mapdata, skinCode, this.$store, group, ''); - } - this.jlmap3d.eventon(); + this.jlmap3d = new JLmap3dMaintainer(dom, mapdata, skinCode, this.$store, group, ''); + } + this.jlmap3d.eventon(); }, raystand() { this.jlmap3d.rayswitch('stand'); @@ -175,53 +180,55 @@ export default { showtrainmsg(showtype) { this.jlmap3d.showtrainmsg(showtype); }, - resetfaultlist(){ - this.devicelist = []; + resetfaultlist() { + this.devicelist = []; }, updatefault(fault) { - this.devicelist.push(fault); + this.devicelist.push(fault); }, - deletefault(code){ - console.log(code); - console.log(this.devicelist); - for(let i=0,leni=this.devicelist.length;i @@ -324,5 +331,4 @@ export default { z-index: -12; } - diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index b2cfd76b6..90cdd426f 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -1,7 +1,7 @@