From b8b97d75dcfce3de0f33071ae554e055b371809b Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期五, 21 一月 2022 16:15:06 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://192.168.0.10:8443/r/pcalife/PAM into Phase3
---
PAMapp/components/NavBar.vue | 66 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/PAMapp/components/NavBar.vue b/PAMapp/components/NavBar.vue
index b59834f..3754bfb 100644
--- a/PAMapp/components/NavBar.vue
+++ b/PAMapp/components/NavBar.vue
@@ -7,13 +7,29 @@
<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
+ v-if="currentRole"
+ 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"
@command="routerNavigateTo">
- <i class="icon-avatar text--dark-blue cursor--pointer fix-chrome-click--issue" @click="isOpenDropdown =!isOpenDropdown" @blur="isOpenDropdown =false"></i>
+ <div
+ @click="isOpenDropdown =!isOpenDropdown"
+ @blur="isOpenDropdown =false">
+ <template v-if="isAdminLogin">
+ <UiAvatar
+ :size="30"
+ :agentNo="consultantId"
+ class="admin-avatar"
+ ></UiAvatar>
+ </template>
+ <template v-else>
+ <i class="icon-avatar text--dark-blue cursor--pointer fix-chrome-click--issue"></i>
+ </template>
+ </div>
<el-dropdown-menu
class="pam-header__dropdown">
<template v-for="(item,index) in navBarList">
@@ -40,11 +56,23 @@
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.Getter
+ idToken!: string | null;
+
+ @roleStorage.Getter
+ currentRole!: string | null;
+
+ @roleStorage.Getter
+ consultantId!: string | null;
+
+ @roleStorage.Mutation
+ storageClear!: () => void;
+
+ @roleStorage.Getter
+ isAdminLogin!: boolean;
+
+ isOpenDropdown = false;
navBarList = [{
authorityOfRoleList: [Role.NOT_LOGIN],
@@ -92,12 +120,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 +139,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>
@@ -185,6 +214,13 @@
padding: 0px 10px;
}
}
+
+ .admin-avatar {
+ margin: 0px 15px;
+ @media screen and (max-width: 352px) {
+ margin: 0px 10px;
+ }
+ }
}
}
@@ -205,11 +241,11 @@
height: $DESKTOP_NAV_BAR;
.pam-header__logo {
- width: 180px;
- height: 100%;
+ width: 160px;
+ height: 70px;
margin: 0;
background-image: url('~/assets/images/logo.png');
- background-size: cover;
+ background-size: contain;
background-repeat: no-repeat;
background-position: center;
}
--
Gitblit v1.8.0