odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dj' (#360) from dj into master

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/360
This commit is contained in:
odjbin
2024-06-18 19:07:21 +00:00
parent 6f33aa1114 7ad99048f4
commit 94bb4ce943
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/layout/navbar/index.vue
View File

@@ -6,8 +6,12 @@
<!-- <bell-socket/>--> <!-- <bell-socket/>-->
<div class="user-box"> <div class="user-box">
<div> <div>
<!-- <img :src="userInfo.avatar" alt="" @click.stop="handleVisitedP">--> <el-avatar>{{ userInfo.nickName }}</el-avatar>
<span @click.stop="handleVisitedP">欢迎回来，{{ userInfo.nickName }}</span> <div @click.stop="handleVisitedP">{{ userInfo.nickName }}
<el-icon style="margin-left: 5px">
<ArrowDownBold/>
</el-icon>
</div>
</div> </div>
<div class="person" v-if="visitedP"> <div class="person" v-if="visitedP">
<ul> <ul>
@@ -21,7 +25,7 @@
<span>{{ item.jobActivityDesc }}</span> <span>{{ item.jobActivityDesc }}</span>
</div> </div>
<div> <div>
<span>{{ item.companyName }}/{{ item.departmentName }}</span> <span :title="item.companyName+'/'+item.departmentName">{{ item.companyName }}/{{ item.departmentName }}</span>
</div> </div>
</div> </div>
<div> <div>
@@ -90,8 +94,6 @@ const handleVisitedP = () => {
visitedP.value = !visitedP.value visitedP.value = !visitedP.value
}) })
}) })
} }
const accountChange = (userId) => { const accountChange = (userId) => {
@@ -123,6 +125,14 @@ const handleLogout = () => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.el-avatar--circle) {
margin-right: 10px;
background-color: #8a7243;
white-space: nowrap;
/* width: 30px; */
overflow: hidden;
}
.navbar { .navbar {
height: 65px; height: 65px;
padding: 0 15px 0 0; padding: 0 15px 0 0;
@@ -147,8 +157,9 @@ const handleLogout = () => {
display: flex; display: flex;
align-items: center; align-items: center;
> span { > div {
margin-left: 5px; display: flex;
align-items: center;
} }
img { img {
@@ -168,7 +179,7 @@ const handleLogout = () => {
width: 280px; width: 280px;
right: 0; right: 0;
z-index: 300; z-index: 300;
top: 46px; top: 54px;
padding: 5px 0; padding: 5px 0;
border-radius: 4px; border-radius: 4px;
background-color: #fff; background-color: #fff;
@@ -214,10 +225,6 @@ const handleLogout = () => {
} }
} }
:deep(.el-avatar--circle) {
margin-right: 10px;
background-color: #8a7243;
}
} }