From 08a33ae6aa60fd6f682d0a5f5f4f894d5634fc5a Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 26 Aug 2020 17:09:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=99=BB=E5=BD=95=E8=99=9A?=
 =?UTF-8?q?=E6=8B=9Fibp=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js                                   | 6 ------
 src/views/login/index.vue                                   | 1 -
 src/views/newMap/jointTrainingNew/index.vue                 | 4 ++--
 .../newMap/jointTrainingNew/memberManage/membersManage.vue  | 3 ---
 4 files changed, 2 insertions(+), 12 deletions(-)

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/login/index.vue b/src/views/login/index.vue
index d6c1a735c..30aa15095 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -493,7 +493,6 @@ export default {
                 }
             } else if (this.$route.query.projectDevice) {
                 getLoginInfo(getToken()).then(res => {
-                    this.$store.dispatch('SetProjecteDevice', res.data.deviceVO);
                     getSimulationInfoNew(res.data.group).then(resp => {
                         const query = {
                             group: res.data.group,
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: {