From 764f2ec5662a65bb228bbd97473436a47f041562 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期二, 11 一月 2022 17:21:06 +0800
Subject: [PATCH] Merge branch 'Phase3' of ssh://dev.pollex.com.tw:29418/pcalife/PAM into Phase3
---
PAMapp/components/NavBar.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index 2a64377..44664b0 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -34,17 +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.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],
@@ -92,12 +96,8 @@
title: '憿批��',
},
];
- login_role = Role.NOT_LOGIN;
- isOpenDropdown = false;
- get loginRole(): Role {
- return this.idToken && this.currentRole ? (this.currentRole as Role): Role.NOT_LOGIN;
- }
+ //////////////////////////////////////////////////////////////////////
routerNavigateTo(url: string): void {
(this.$refs.dropdown as any).hide();
@@ -115,6 +115,11 @@
this.storageClear();
_.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