From 557d942e6fcf7664c5daa396c3c68fbdd9644f3f Mon Sep 17 00:00:00 2001
From: 劉鈞霖 <benson@gmail.com>
Date: 星期二, 30 十一月 2021 13:10:47 +0800
Subject: [PATCH] [ Update ] 補上一個commit issue 導回首頁

---
 PAMapp/components/NavBar.vue |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index 4dc5d23..d9dfe90 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -9,11 +9,11 @@
     <div class="pam-header__action-bar">
       <i class="icon-bell text--dark-blue cursor--pointer fix-chrome-click--issue"
         @click="$router.push('/notification')"></i>
-        <el-dropdown :class="{'is-open':isOpenDropdown}" 
+        <el-dropdown :class="{'is-open':isOpenDropdown}"
           ref="dropdown"
           trigger="click"
           @command="routerNavigateTo">
-          <i class="icon-avatar text--dark-blue cursor--pointer fix-chrome-click--issue" @click="isOpenDropdown =!isOpenDropdown" ></i>
+          <i class="icon-avatar text--dark-blue cursor--pointer fix-chrome-click--issue" @click="isOpenDropdown =!isOpenDropdown" @blur="isOpenDropdown =false"></i>
           <el-dropdown-menu
             class="pam-header__dropdown">
             <template v-for="(item,index) in navBarList">
@@ -34,18 +34,20 @@
 <script lang="ts">
   import { Vue, Component } from 'vue-property-decorator';
   import { namespace } from 'nuxt-property-decorator';
+  import { Role } from '~/assets/ts/models/enum/Role';
   import * as _ from 'lodash';
-  const localStorage = namespace('localStorage');
+
+  const roleStorage = namespace('localStorage');
   @Component
   export default class NavBar extends Vue {
-    @localStorage.Mutation storageClear!: () => void;
-    @localStorage.Getter idToken!: string | null;
-    @localStorage.Getter currentRole!: string | null;
+    @roleStorage.Mutation storageClear!: () => void;
+    @roleStorage.Getter idToken!: string | null;
+    @roleStorage.Getter currentRole!: string | null;
 
     navBarList = [{
         authorityOfRoleList: [Role.NOT_LOGIN],
         routeUrl: '/login',
-        title: '��',
+        title: '�� | 閮餃��',
       },
       {
         authorityOfRoleList: [Role.USER],
@@ -86,7 +88,6 @@
     }
 
     routerNavigateTo(url: string): void {
-      this.isOpenDropdown = !this.isOpenDropdown;
       (this.$refs.dropdown as any).hide();
       _.isEqual(url, '') ? this.fakeLogout() : this.$router.push(url);
     }
@@ -101,11 +102,6 @@
       _.isEqual(this.$route.name, 'index') ? location.reload() : this.$router.push('/');
     }
   }
-  export enum Role {
-    USER = 'user',
-    ADMIN = 'admin',
-    NOT_LOGIN = '',
-  }
 
 </script>
 
@@ -118,7 +114,7 @@
     display: flex;
     align-items: center;
     background-color: $PRIMARY_WHITE;
-    z-index: 3;
+    z-index: 6;
 
     .pam-header__logo {
       height: 30px;
@@ -188,7 +184,7 @@
         color: $PRIMARY_WHITE;
       }
     }
-  } 
+  }
 
   @include desktop {
     .pam-header {
@@ -206,7 +202,7 @@
 
       .pam-header__title {
         display: flex;
-        justify-content: start;
+        justify-content: flex-start;
         align-items: center;
         border: none;
         padding-left: 30px;

--
Gitblit v1.8.0