From a8fcc0fdb7f274e4cb76b696e9ed4cb039685aac Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Thu, 14 Jul 2022 10:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B9=E7=AB=99=E9=AB=98=E4=BA=AE=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E7=99=BB=E5=BD=95=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/home/home.component.ts   | 13 ++++++++-----
 src/app/pages/init3D.guard.ts          |  2 +-
 src/app/pages/login/login.component.ts |  4 ++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts
index 3c0ea97..9155ef7 100644
--- a/src/app/pages/home/home.component.ts
+++ b/src/app/pages/home/home.component.ts
@@ -75,12 +75,15 @@ export class HomeComponent implements OnInit {
   menuList2 = []
   selectedItem
   routerChange(item) {
-    // console.log( sessionStorage.getItem("3dSceneData"));
-    let a=JSON.parse(sessionStorage.getItem("3dSceneData"))
-    if(!a.hasBuildingInfo && item.url == "/plan/petrolStation"){
-      this.message.info("当前油站未开通!");
-      return
+    console.log( sessionStorage.getItem("3dSceneData"));
+    if(JSON.parse(sessionStorage.getItem('isGasStation'))){
+      let a=JSON.parse(sessionStorage.getItem("3dSceneData"))
+      if(!a.hasBuildingInfo && item.url == "/plan/petrolStation"){
+        this.message.info("当前油站未开通!");
+        return
+      }
     }
+    
     if (item.name == this.selectedItem) {
       return
     }
diff --git a/src/app/pages/init3D.guard.ts b/src/app/pages/init3D.guard.ts
index 8662653..54851ac 100644
--- a/src/app/pages/init3D.guard.ts
+++ b/src/app/pages/init3D.guard.ts
@@ -16,7 +16,7 @@ export class init3DGuard implements CanActivate {
   // 路由守卫
   canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot,): Promise<boolean> {
     return this.getGasStationBaseInfo().then((res: any) => {
-      sessionStorage.setItem("3dSceneData", JSON.stringify(res))
+      // sessionStorage.setItem("3dSceneData", JSON.stringify(res))
       let userdata = JSON.parse(sessionStorage.getItem('userdata'))
       if (userdata.userName == 'superadmin') { //是superadmin，是内部制作账号
         ModeManager.s_isMakeMode = true;
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index 9c69e7d..9d8e8c8 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -101,6 +101,10 @@ export class LoginComponent implements OnInit {
       let params = { organizationUnitId: (JSON.parse(sessionStorage.getItem('userdataOfgasstation'))).organization.id }
       this.http.get('/api/services/app/GasStation/Get', { params: params }).subscribe((data: any) => {
         resolve(data.result)
+        
+        
+        sessionStorage.setItem("3dSceneData", JSON.stringify(data.result))
+        console.log(sessionStorage.getItem("3dSceneData"),208);
         this.init3D = data.result.hasBuildingInfo
         
       })