WMS+SCP电脑端全局UI调整

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"

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;

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">

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}
+          ) : undefined} */}
-          {size.value ? (
+          {/* {size.value ? (
             <SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown>
-          ) : undefined}
+          ) : undefined} */}
-          {locale.value ? (
+          {/* {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}

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" />

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>