From ac235850a9287dae6977c964213176fa7c86b140 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期四, 09 十二月 2021 14:42:20 +0800
Subject: [PATCH] Merge branch 'refactor/separate-vue' of ssh://192.168.0.10:29418/pcalife/PAM into refactor/separate-vue
---
PAMapp/components/NavBar.vue | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index c3fc5b3..99f3b99 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -34,15 +34,14 @@
<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 '~/assets/ts/models/enum/role.enum';
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;
@@ -63,13 +62,8 @@
title: '���董�����',
},
{
- authorityOfRoleList:[Role.ADMIN],
+ authorityOfRoleList:[Role.ADMIN, Role.USER],
routeUrl: '/record',
- title: '�������',
- },
- {
- authorityOfRoleList: [Role.USER],
- routeUrl: '/userReviewsRecord',
title: '�������',
},
{
@@ -109,8 +103,6 @@
logout(): void {
this.storageClear();
- this.storageClearQuickFilter();
- this.storageClearRecommendConsultant();
_.isEqual(this.$route.name, 'index') ? location.reload() : this.$router.push('/');
}
}
--
Gitblit v1.8.0