From e40973680e8842a0797ca2e1cd45ec5e6bf0f3d8 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 18 十月 2023 13:47:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/page/index/top/index.vue | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/Source/UBCS-WEB/src/page/index/top/index.vue b/Source/UBCS-WEB/src/page/index/top/index.vue
index 443db48..5ba68fe 100644
--- a/Source/UBCS-WEB/src/page/index/top/index.vue
+++ b/Source/UBCS-WEB/src/page/index/top/index.vue
@@ -18,7 +18,13 @@
<top-search></top-search>
</span>
</div>
+ <div></div>
<div class="top-bar__right">
+ <div class="container">
+ <div class="content">
+ 鏈郴缁熶负闈炴秹瀵嗗簲鐢ㄧ郴缁燂紝绂佹澶勭悊銆佸瓨鍌ㄣ�佷紶杈撴秹瀵嗕俊鎭�
+ </div>
+ </div>
<el-tooltip v-if="showColor"
effect="dark"
:content="$t('navbar.color')"
@@ -101,6 +107,9 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
+ <div style="margin-left: 15px">
+ <p style="font-size: 16px">褰撳墠鐧诲綍鐢ㄦ埛锛歿{storedUsername}}</p>
+ </div>
<el-dialog title="鐢ㄦ埛淇℃伅閫夋嫨"
append-to-body
:visible.sync="userBox"
@@ -137,6 +146,7 @@
name: "top",
data() {
return {
+ storedUsername: '',
userBox: false,
userForm: {
deptId: '',
@@ -191,6 +201,7 @@
},
mounted() {
listenfullscreen(this.setScreen);
+ this.storedUsername = localStorage.getItem('username');
},
computed: {
...mapState({
@@ -259,4 +270,22 @@
</script>
<style lang="scss" scoped>
+.container {
+ max-width: 100%;
+ padding: 0 20px;
+ margin: 0 auto;
+ box-sizing: border-box;
+}
+
+.content {
+ font-size: 20px;
+ line-height: 20px;
+ margin-right: 35px;
+}
+
+@media screen and (max-width: 768px) {
+ .content {
+ margin-right: 0;
+ }
+}
</style>
--
Gitblit v1.9.3