Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/pages/home/home.component.ts

@@ -42,34 +42,36 @@ export class HomeComponent implements OnInit {
   surname: string
   userName: string
   ngOnInit(): void {
-
+    this.isGasStation = JSON.parse(sessionStorage.getItem('isGasStation'))
-    // this.navChangeService.getMessage().subscribe((message: any) => {
+    //初始化登陆 如果是油站用户
-    //   console.log(message);//send a message
+    if (this.isGasStation) {
-    //   if (message.name == 'oilstation') {
-    //     this.isGasStationNav = true
-    //   }
-    // });
-
-    if (this.router.url.indexOf('petrolStation') != -1 && sessionStorage.getItem('isGasStation') == 'false') {//控制返回按钮显示
       this.isGasStationNav = true
-      this.isGasStationBack = true
+    } else {//初始化登陆 如果是管理者用户
-    } else {
       this.isGasStationNav = false
       this.isGasStationBack = false
     }
 
-    if (sessionStorage.getItem('isGasStation') == 'true') {
-      this.isGasStation = true
-      this.isGasStationNav = true
-    }
-
     this.router.events.pipe(
       filter(event => event instanceof NavigationEnd)
     ).subscribe((event: any) => {
-      if (event.url.indexOf('petrolStation') != -1 && sessionStorage.getItem('isGasStation') == 'false') {//控制返回按钮显示
+      //管理者进入油站页面
+      if (event.url.indexOf('petrolStation') != -1 && !this.isGasStation) {//控制返回按钮显示
         this.isGasStationNav = true
         this.isGasStationBack = true
-      } else {
+      }
+      //管理者进入非油站页面
+      if (event.url.indexOf('petrolStation') == -1 && !this.isGasStation) {//控制返回按钮显示
+        this.isGasStationNav = false
+        this.isGasStationBack = false
+      }
+      //油站人员进入管理页面
+      if (event.url.indexOf('petrolStation') == -1 && this.isGasStation) {//控制返回按钮显示
+        this.isGasStationNav = false
+        this.isGasStationBack = false
+      }
+      //油站人员进入油站
+      if (event.url.indexOf('petrolStation') != -1 && this.isGasStation) {//控制返回按钮显示
+        this.isGasStationNav = true
         this.isGasStationBack = false
       }
     });
@@ -77,7 +79,7 @@ export class HomeComponent implements OnInit {
     setInterval(() => {
       this.getTime()
     }, 1000);
-    this.isGasStation = JSON.parse(sessionStorage.getItem('isGasStation'))
+
     if (this.isGasStation) {
       this.surname = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).name
       this.userName = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).userName
@@ -93,6 +95,7 @@ export class HomeComponent implements OnInit {
 
   }
 
+
   //初次登陆修改密码弹窗
   isVisible = false
   isConfirmLoading = false
@@ -303,6 +306,7 @@ export class HomeComponent implements OnInit {
       console.log('标记已读成功')
     })
   }
+
   close(item) {
     this.messageId.forEach((element) => {
       if (element.id == item.notification.entityId) {
@@ -310,6 +314,7 @@ export class HomeComponent implements OnInit {
       }
     })
   }
+
   //处置
   updateState(item, type) {
     let body = {