diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 1ad306437..f5ca3dfd5 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -31,9 +31,6 @@ const user = { SET_NICKNAME: (state, nickname) => { state.nickname = nickname; }, - SET_PROJECTDEVICE: (state, projectDevice) => { - state.projectDevice = projectDevice; - }, SET_ROLES: (state, roles) => { state.roles = roles; }, @@ -110,9 +107,6 @@ const user = { }); }); }, - SetProjecteDevice({ commit }, deviceVo) { - commit('SET_PROJECTDEVICE', deviceVo); - }, // 获取用户信息 GetInfo({ commit }, token) { return new Promise((resolve, reject) => { diff --git a/src/views/ibp/ibpsystem/index.vue b/src/views/ibp/ibpsystem/index.vue index 18e6f3f7f..1d1a98e5c 100644 --- a/src/views/ibp/ibpsystem/index.vue +++ b/src/views/ibp/ibpsystem/index.vue @@ -268,7 +268,10 @@ export default { float: right; right: 20px; bottom: 15px; + z-index: 38; } .ibp-canvas{ + position: absolute; + z-index: 37; } diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 7e76e1c03..0e8e68cc4 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -339,7 +339,7 @@ export default { this.$store.dispatch('training/setRoleDeviceCode', data.deviceCode); this.isAdmin = data.admin; - const deviceVO = this.$store.state.user.projectDevice; + const deviceVO = JSON.parse(getSessionStorage('projectDevice')); if (deviceVO && deviceVO.type === 'VR_IBP') { this.showIbp(this.deviceCode); const config = JSON.parse(deviceVO.config); @@ -405,7 +405,6 @@ export default { case 'STATION_SUPERVISOR': this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR'); - this.hideIbp(); if (this.lineCode === '06' && deviceCode) { this.$refs.menuSchema.chiShowStation = deviceCode; this.mapViewLoadedOver && this.switchStationMode(deviceCode); @@ -499,6 +498,7 @@ export default { window.open(routeData.href, '_blank', 'noopener noreferrer'); }, showdriving() { + console.log('***************'); this.panelShow = true; this.drivingShow = false; this.ibpShow = false; diff --git a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue index 89ecdbce3..c487ce492 100644 --- a/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue +++ b/src/views/newMap/jointTrainingNew/memberManage/membersManage.vue @@ -131,9 +131,6 @@ export default { }, username() { return this.$store.state.user.nickname; - }, - projectDevice() { - return this.$store.state.user.projectDevice; } }, watch: {