From 8a4d90d80c6ae8472bf11a1c1f148ca49c90f0a7 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 29 五月 2025 15:42:59 +0800
Subject: [PATCH] 1、设备TEEP、设备开动率以及班次利用率页面时间选择器新增用户选择时对时间范围的限制功能并测试大数据导出功能 2、生产设备自主维护点检表设备编号的输入方式由手动输入调整为弹窗选择输入 3、生产设备自主维护点检表页面调整周保执行记录渲染逻辑（日期对应到周）

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

diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue
index 83f62a2..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"
       >
@@ -50,10 +50,10 @@
             <!--<span>璐︽埛璁剧疆</span>-->
           <!--</router-link>-->
         <!--</a-menu-item>-->
-        <a-menu-item key="3"  @click="systemSetting">
-           <a-icon type="tool"/>
-           <span>绯荤粺璁剧疆</span>
-        </a-menu-item>
+        <!--<a-menu-item key="3"  @click="systemSetting">-->
+           <!--<a-icon type="tool"/>-->
+           <!--<span>绯荤粺璁剧疆</span>-->
+        <!--</a-menu-item>-->
         <a-menu-item key="4" @click="updatePassword">
           <a-icon type="setting"/>
           <span>瀵嗙爜淇敼</span>
@@ -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