From aa84ac15ed832152d080f60320d3647c4b870a80 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期三, 12 一月 2022 11:18:50 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into Phase3
---
PAMapp/components/NavBar.vue | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index ba27b33..44664b0 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -7,8 +7,8 @@
<div class="pam-header__title--sub">�����兢蝳�風��</div>
</div>
<div class="pam-header__action-bar">
- <i class="icon-bell text--dark-blue cursor--pointer fix-chrome-click--issue"
- @click="$router.push('/notification')"></i>
+ <!-- <i class="icon-bell text--dark-blue cursor--pointer fix-chrome-click--issue"
+ @click="$router.push('/notification')"></i> -->
<el-dropdown :class="{'is-open':isOpenDropdown}"
ref="dropdown"
trigger="click"
@@ -34,18 +34,21 @@
<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 { Role } from '~/shared/models/enum/Role';
import * as _ from 'lodash';
const roleStorage = namespace('localStorage');
@Component
export default class NavBar extends Vue {
- @roleStorage.Mutation storageClear!: () => void;
- @roleStorage.Mutation storageClearQuickFilter!: () => void;
- @roleStorage.Mutation storageClearRecommendConsultant!: () => void;
+
@roleStorage.Getter idToken!: string | null;
@roleStorage.Getter currentRole!: string | null;
@roleStorage.Getter consultantId!: string | null;
+
+ @roleStorage.Mutation storageClear!: () => void;
+
+ isOpenDropdown = false;
+ login_role = Role.NOT_LOGIN;
navBarList = [{
authorityOfRoleList: [Role.NOT_LOGIN],
@@ -78,6 +81,11 @@
title: '���“���',
},
{
+ authorityOfRoleList: [Role.NOT_LOGIN, Role.USER],
+ routeUrl: '/faq',
+ title: 'F&Q 撣貉����',
+ },
+ {
authorityOfRoleList: [Role.USER, Role.ADMIN],
routeUrl: '',
title: '��',
@@ -88,12 +96,8 @@
title: '憿批��',
},
];
- login_role = Role.NOT_LOGIN;
- isOpenDropdown = false;
- get loginRole(): string {
- return this.idToken && this.currentRole ? this.currentRole : Role.NOT_LOGIN;
- }
+ //////////////////////////////////////////////////////////////////////
routerNavigateTo(url: string): void {
(this.$refs.dropdown as any).hide();
@@ -109,10 +113,13 @@
logout(): void {
this.storageClear();
- this.storageClearQuickFilter();
- this.storageClearRecommendConsultant();
_.isEqual(this.$route.name, 'index') ? location.reload() : this.$router.push('/');
}
+
+ get loginRole(): Role {
+ return this.idToken && this.currentRole ? (this.currentRole as Role): Role.NOT_LOGIN;
+ }
+
}
</script>
--
Gitblit v1.8.0