From 1b23b4bcc3719f72f56b052b37c5cd85130de95e Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Mon, 24 Jun 2024 16:57:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=20=E7=B3=BB=E7=BB=9F=E3=80=91?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/image/icon/notice.png      | Bin 0 -> 2064 bytes
 src/components/page/GlobalLayout.vue  |   8 ++-
 src/components/tools/HeaderNotice.vue |   7 ++-
 src/components/tools/UserMenu.vue     |  84 ++++++++++++++++++++++++--
 4 files changed, 89 insertions(+), 10 deletions(-)
 create mode 100644 src/assets/image/icon/notice.png

diff --git a/src/assets/image/icon/notice.png b/src/assets/image/icon/notice.png
new file mode 100644
index 0000000000000000000000000000000000000000..aec6f3b57e857a05968031e097c5204c6fcfb269
GIT binary patch
literal 2064
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

literal 0
HcmV?d00001

diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 7e714d3..d089bdd 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -359,16 +359,18 @@ body {
   .header, .top-nav-header-index {
 
     .user-wrapper {
+      display: flex;
       float: right;
       height: 100%;
 
       .action {
         cursor: pointer;
-        padding: 0 14px;
-        display: inline-block;
+        padding: 0 8px;
+        display: inline-flex;
+        align-items: center;
         transition: all .3s;
 
-        height: 70%;
+        //height: 70%;
         line-height: 46px;
 
         &.action-full {
diff --git a/src/components/tools/HeaderNotice.vue b/src/components/tools/HeaderNotice.vue
index 09186d5..a84f677 100644
--- a/src/components/tools/HeaderNotice.vue
+++ b/src/components/tools/HeaderNotice.vue
@@ -30,7 +30,8 @@
     </template>
     <span @click="fetchNotice" class="header-notice">
       <a-badge :count="msgTotal">
-        <a-icon style="font-size: 16px; padding: 4px" type="bell" />
+        <!--<a-icon style="font-size: 16px; padding: 4px" type="bell" />-->
+        <img :src="require('@/assets/image/icon/notice.png')" alt='' class="header-notice-btn">
       </a-badge>
     </span>
     <show-announcement ref="ShowAnnouncement" @ok="modalFormOk"></show-announcement>
@@ -299,4 +300,8 @@ export default {
     vertical-align: initial;
   }
 }
+.header-notice-btn {
+  width: 32px;
+  height: 32px;
+}
 </style>
diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue
index 7b74a5b..a9a5d33 100644
--- a/src/components/tools/UserMenu.vue
+++ b/src/components/tools/UserMenu.vue
@@ -31,6 +31,16 @@
     <!--    <a-icon type="question-circle-o"></a-icon>-->
     <!--  </a>-->
     <!--</span>-->
+    <div class="action">
+      <span class="action-lang" v-show="localeval=='zh-cn'">
+        <span @click="changeLocale('en-us')" v-if="!isLoading">En</span>
+        <a-icon v-else type="sync" spin/>
+      </span>
+      <span class="action-lang" v-show="localeval=='en-us'">
+        <span @click="changeLocale('zh-cn')" v-if="!isLoading">中</span>
+        <a-icon v-else type="sync" spin/>
+      </span>
+    </div>
     <header-notice class="action"/>
     <!--<span style="padding: 12px">-->
     <!--  <a-avatar class="avatar" size="small" :src="getAvatar()"/>-->
@@ -91,12 +101,12 @@
     <!--    </a-menu-item>&ndash;&gt;-->
     <!--  </a-menu>-->
     <!--</a-dropdown>-->
-    <span class="action">
-      <a class="logout_title" href="javascript:;" @click="handleLogout">
-        <a-icon type="logout"/>
-        <span v-if="isDesktop()"> {{ $t('header.logOutOfUserMenu') }}</span>
+    <div class="action-item">
+      <a class="action-btn logout_title" href="javascript:;" @click="handleLogout">
+        <span class="action-btn-icon"><a-icon type="poweroff" style="color:#FFF;"/></span>
+        <span class="action-btn-text" v-if="isDesktop()"> {{ $t('header.logOutOfUserMenu') }}</span>
       </a>
-    </span>
+    </div>
     <user-password ref="userPassword"></user-password>
     <depart-select ref="departSelect" :closable="true" title="部门切换"></depart-select>
     <setting-drawer ref="settingDrawer" :closable="true" title="系统设置"></setting-drawer>
@@ -360,9 +370,71 @@ export default {
   /* update_end author:zhaoxin date:20191129 for: 让搜索框颜色能随主题颜色变换*/
 </style>
 
-<style scoped>
+<style lang="less" scoped>
   .logout_title {
     color: inherit;
     text-decoration: none;
   }
+  // 语言切换按钮样式
+  .action-lang {
+    border: 1px solid @primary-color;
+    background-color: #FFFFFF;
+    width: 32px;
+    height: 32px;
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    border-radius: 50%;
+
+    & > span {
+      display: inline-flex;
+      font-family: sans-serif;
+      width: 20px;
+      height: 20px;
+      align-items: center;
+      justify-content: center;
+      border-radius: 50%;
+      font-size: 12px;
+      background-color: @primary-color;
+      color: #FFFFFF;
+    }
+  }
+  // 退出登录按钮样式
+  .action-item {
+    display: inline-flex;
+    align-items: center;
+    padding: 0 8px;
+    transition: all 0.3s;
+    height: 100%;
+    line-height: 46px;
+
+    // 操作按钮
+    .action-btn {
+      padding: 4px;
+      background-color: white;
+      border-radius: 32px;
+      display: flex;
+      align-items: center;
+      height: 32px;
+      border: 1px solid @primary-color;
+
+      img {
+        width: 24px;
+        height: 24px;
+      }
+
+      &-icon {
+        display: inline-flex;
+        justify-content: center;
+        align-items: center;
+        width: 24px;
+        height: 24px;
+        background-color: @primary-color;
+        border-radius: 50%;
+      }
+      &-text {
+        margin: 0 4px;
+      }
+    }
+  }
 </style>