From e81c57105e1ee50657c71a3f025605aa5e9bccf5 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Thu, 2 Dec 2021 08:49:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=9D=83=E9=99=90=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/init3D.guard.ts        | 12 +++++++++---
 src/app/pages/plan/plan.component.ts | 10 +---------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/init3D.guard.ts b/src/app/pages/init3D.guard.ts
index 10bbb1b..82b2034 100644
--- a/src/app/pages/init3D.guard.ts
+++ b/src/app/pages/init3D.guard.ts
@@ -16,10 +16,16 @@ export class init3DGuard implements CanActivate {
   canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot,): Promise<boolean> {
     return this.getGasStationBaseInfo().then((res: any) => {
       sessionStorage.setItem("3dSceneData", JSON.stringify(res))
-      let isMakeMode = ModeManager.s_isMakeMode
-      if (isMakeMode || res.hasBuildingInfo) {
+      let userdata = JSON.parse(sessionStorage.getItem('userdata'))
+      if (userdata.userName == 'superadmin') { //是superadmin，是内部制作账号
+        ModeManager.s_isMakeMode = true;
         return true
-      } else if (!res.hasBuildingInfo) {
+      } else {
+        ModeManager.s_isMakeMode = false;
+      }
+      if (res.hasBuildingInfo) {
+        return true
+      } else {
         this.message.info("当前站点没有数字油站!");
         return false
       }
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts
index abb0a52..9b460cb 100644
--- a/src/app/pages/plan/plan.component.ts
+++ b/src/app/pages/plan/plan.component.ts
@@ -50,7 +50,7 @@ export class PlanComponent implements OnInit {
   public beforeOneSatus; //当前 satus
   public canvas: HTMLCanvasElement; //canvas 实例
   public editMode: boolean = true; //编辑/查看 模式
-  public userMode: boolean = false; //是否为 内部权限
+  public userMode: boolean = ModeManager.s_isMakeMode; //是否为 内部权限
   public bucketName: string = ObjectsService.getFullPath("文件路径"); //当前桶名
   public isShowLoading: boolean = true; //显隐 loading加载条
   public companyData: any; //当前加油站所属组织机构 data
@@ -72,14 +72,6 @@ export class PlanComponent implements OnInit {
       this.editMode = false
       ModeManager.currentMode = ModeType.Look
     }
-    let userdata = JSON.parse(sessionStorage.getItem('userdata'))
-    if (userdata.userName == 'superadmin') { //是superadmin，是内部制作账号
-      this.userMode = true
-      ModeManager.s_isMakeMode = true;
-    } else {
-      this.userMode = false
-      ModeManager.s_isMakeMode = false;
-    }
     //监听 delete键盘事件
     this.eventManager.addGlobalEventListener('window', 'keydown', (event: any) => {
       if (event.keyCode == 46) { //delete