From fb7aadc6817e4194f6c2c423348d3964fc15b584 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 9 Jul 2024 18:43:16 +0800
Subject: [PATCH] =?UTF-8?q?WMS+SCP=E7=94=B5=E8=84=91=E7=AB=AF=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80UI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/RouterSearch/index.vue           |  2 +-
 src/layout/components/CategoryHeader.vue        |  9 ++++++++-
 src/layout/components/Message/src/Message.vue   |  2 +-
 src/layout/components/ToolHeader.vue            | 16 ++++++++--------
 src/layout/components/UserInfo/src/UserInfo.vue |  4 ++--
 src/layout/components/useRenderLayout.tsx       |  4 ++--
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/components/RouterSearch/index.vue b/src/components/RouterSearch/index.vue
index 0966638e6..b15f88066 100644
--- a/src/components/RouterSearch/index.vue
+++ b/src/components/RouterSearch/index.vue
@@ -18,7 +18,7 @@
     </el-select> -->
   </ElDialog>
   <div v-else class="custom-hover" @click.stop="showTopSearch = !showTopSearch">
-    <Icon icon="ep:search" />
+    <Icon icon="ep:search" color="#ffffff"/>
     <el-select
       filterable
       :reserve-keyword="false"
diff --git a/src/layout/components/CategoryHeader.vue b/src/layout/components/CategoryHeader.vue
index 824731f8b..e0f6ee0f3 100644
--- a/src/layout/components/CategoryHeader.vue
+++ b/src/layout/components/CategoryHeader.vue
@@ -9,6 +9,8 @@ import { ElMenu, ElMenuItem } from 'element-plus'
 import { usePermissionStore } from '@/store/modules/permission'
 import { hasOneShowingChild } from '@/layout/components/Menu/src/helper'
 import { useRenderMenuTitle } from '@/layout/components/Menu/src/components/useRenderMenuTitle'
+import ToolHeader from './ToolHeader.vue'
+
 // 头部工具
 import { useDesign } from '@/hooks/web/useDesign'
 const { getPrefixCls, variables } = useDesign()
@@ -101,6 +103,7 @@ export default defineComponent({
             }
         }}
       </ElMenu>
+      <ToolHeader class="tool-header"></ToolHeader>
       </div>
     )
   }
@@ -127,7 +130,11 @@ $prefix-cls: #{$namespace}-tool-header;
     left:0;
     z-index: 999;
   }
-
+  .tool-header{
+    position: absolute;
+    right: 0px;
+    top: 0px;
+  }
 }
 .categoryheader{
   padding-left: 20px;
diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue
index 4ca667fbd..67ea37a33 100644
--- a/src/layout/components/Message/src/Message.vue
+++ b/src/layout/components/Message/src/Message.vue
@@ -62,7 +62,7 @@ onBeforeUnmount(() => {
     <ElPopover :width="400" placement="bottom" trigger="click">
       <template #reference>
         <ElBadge :is-dot="unreadCount > 0" class="item">
-          <Icon :size="18" class="cursor-pointer" icon="ep:bell" @click="getList" />
+          <Icon :size="18" class="cursor-pointer" color="#ffffff" icon="ep:bell" @click="getList" />
         </ElBadge>
       </template>
       <ElTabs v-model="activeName">
diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue
index 22d7a457c..ca7328fb9 100644
--- a/src/layout/components/ToolHeader.vue
+++ b/src/layout/components/ToolHeader.vue
@@ -54,28 +54,28 @@ export default defineComponent({
           'dark:bg-[var(--el-bg-color)]'
         ]}
       >
-        {layout.value !== 'top' ? (
+        {/* {layout.value !== 'top' ? (
           <div class="h-full flex items-center">
             {hamburger.value && layout.value !== 'cutMenu' ? (
               <Collapse class="custom-hover" color="var(--top-header-text-color)"></Collapse>
             ) : undefined}
             {breadcrumb.value ? <Breadcrumb class="lt-md:hidden"></Breadcrumb> : undefined}
           </div>
-        ) : undefined}
+        ) : undefined} */}
         <div class="h-full flex items-center">
           {search.value ? (<RouterSearch isModal={false} />) : undefined}
-          {screenfull.value ? (
+          {/* {screenfull.value ? (
             <Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull>
-          ) : undefined}
-          {size.value ? (
+          ) : undefined} */}
+          {/* {size.value ? (
             <SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown>
-          ) : undefined}
-          {locale.value ? (
+          ) : undefined} */}
+          {/* {locale.value ? (
             <LocaleDropdown
               class="custom-hover"
               color="var(--top-header-text-color)"
             ></LocaleDropdown>
-          ) : undefined}
+          ) : undefined} */}
           {message.value ? (
             <Message class="custom-hover" color="var(--top-header-text-color)"></Message>
           ) : undefined}
diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue
index 3c03ea7d2..3521bd443 100644
--- a/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
@@ -54,7 +54,7 @@ const toDocument = () => {
   <ElDropdown class="custom-hover" :class="prefixCls" trigger="click">
     <div class="flex items-center">
       <ElAvatar :src="avatar" alt="" class="w-[calc(var(--logo-height)-25px)] rounded-[50%]" />
-      <span class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden">
+      <span class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden" style="color:#ffffff">
         {{ userName }}
       </span>
     </div>
@@ -62,7 +62,7 @@ const toDocument = () => {
       <ElDropdownMenu>
         <ElDropdownItem>
           <Icon icon="ep:tools" />
-          <div @click="toProfile">{{ t('common.profile') }}</div>
+          <div @click="toProfile" >{{ t('common.profile') }}</div>
         </ElDropdownItem>
         <!-- <ElDropdownItem>
           <Icon icon="ep:menu" />
diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx
index e9340b5db..393d2e8c6 100644
--- a/src/layout/components/useRenderLayout.tsx
+++ b/src/layout/components/useRenderLayout.tsx
@@ -114,14 +114,14 @@ export const useRenderLayout = () => {
             style="transition: all var(--transition-time-02);width:100%;"
           >
             
-            <ToolHeader
+            {/* <ToolHeader
               class={[
                 'bg-[var(--top-header-bg-color)]',
                 {
                   'layout-border__bottom': !tagsView.value
                 }
               ]}
-            ></ToolHeader>
+            ></ToolHeader> */}
 
             {tagsView.value ? (
               <TagsView class="layout-border__bottom layout-border__top"></TagsView>