From d55fef9c7205b412cadc99c2bb2dea9329b7a2c9 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 31 七月 2024 09:39:19 +0800
Subject: [PATCH] 1、公司级与分厂级看板调整OEE图表样式 2、各看板中的饼图图表增加随分辨率变化而改变自身半径功能，从而更清晰的展示内容标题指示箭头 3、OEE综合效率分析页面新增车间字段

---
 src/components/tools/UserMenu.vue |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue
index 8f462d8..54fe97a 100644
--- a/src/components/tools/UserMenu.vue
+++ b/src/components/tools/UserMenu.vue
@@ -16,7 +16,7 @@
         :filterOption="filterOption"
         :open="isMobile()?true:null"
         :getPopupContainer="(node) => node.parentNode"
-        :style="isMobile()?{width: '100%',marginBottom:'50px'}:{}"
+        :style="isMobile()?{width: '100%',marginBottom:'50px',color:theme=='dark'?'#fff':'#000'}:{color:theme=='dark'?'#fff':'#000'}"
         @change="searchMethods"
         @blur="hiddenClick"
       >
@@ -79,8 +79,8 @@
         </a-menu-item>-->
       </a-menu>
     </a-dropdown>
-    <span class="action">
-      <a class="logout_title" href="javascript:;" @click="handleLogout">
+    <span class="action" @click="handleLogout">
+      <a class="logout_title" href="javascript:;" >
         <a-icon type="logout"/>
         <span v-if="isDesktop()">&nbsp;閫�鍑虹櫥褰�</span>
       </a>
@@ -185,7 +185,7 @@
             return that.Logout({}).then(() => {
               // update-begin author:wangshuai date:20200601 for: 閫�鍑虹櫥褰曡烦杞櫥褰曢〉闈�
               that.$router.push({ path: '/user/login' });
-              window.location.reload()
+              // window.location.reload()
               // update-end author:wangshuai date:20200601 for: 閫�鍑虹櫥褰曡烦杞櫥褰曢〉闈�
             }).catch(err => {
               that.$message.error({
@@ -268,7 +268,6 @@
   /* update-begin author:sunjianlei date:20191220 for: 瑙ｅ喅鍏ㄥ眬鏍峰紡鍐茬獊闂 */
   .user-wrapper .search-input {
     width: 180px;
-    color: inherit;
 
     /deep/ .ant-select-selection {
       background-color: inherit;

--
Gitblit v1.9.3