From 0496faa586224dff0a93ba4abcaeafab6df83aa2 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期五, 26 十一月 2021 10:19:18 +0800
Subject: [PATCH] fix: TODO#130846 各內頁加上 navbar (web 跑版)
---
PAMapp/components/NavBar.vue | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index 85e5ac2..d9dfe90 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -9,7 +9,7 @@
<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">
@@ -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],
@@ -100,11 +102,6 @@
_.isEqual(this.$route.name, 'index') ? location.reload() : this.$router.push('/');
}
}
- export enum Role {
- USER = 'user',
- ADMIN = 'admin',
- NOT_LOGIN = '',
- }
</script>
@@ -117,7 +114,7 @@
display: flex;
align-items: center;
background-color: $PRIMARY_WHITE;
- z-index: 3;
+ z-index: 6;
.pam-header__logo {
height: 30px;
@@ -187,7 +184,7 @@
color: $PRIMARY_WHITE;
}
}
- }
+ }
@include desktop {
.pam-header {
@@ -205,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