From 42106949ad385a8b8c69c545dda6d236cfefe5de Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Thu, 4 Jul 2024 16:00:32 +0800
Subject: [PATCH] no message

---
 .../src/components/HeaderSearch/index.vue     | 22 +++++++++++++++++--
 fuintAdmin/src/layout/components/Navbar.vue   | 13 ++++++-----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/fuintAdmin/src/components/HeaderSearch/index.vue b/fuintAdmin/src/components/HeaderSearch/index.vue
index 83548d57f..46a47a66b 100644
--- a/fuintAdmin/src/components/HeaderSearch/index.vue
+++ b/fuintAdmin/src/components/HeaderSearch/index.vue
@@ -1,6 +1,10 @@
 <template>
-  <div :class="{'show':show}" class="header-search" title="查找功能">
-    <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
+  <div :class="{'show':show}" class="header-search" title="查找功能" style="display: flex;align-items: center;">
+<!--    <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />-->
+
+            <div class="icon-img" @click.stop="click">
+              <img src="../../../src/assets/new/t-sousuo.png" alt="">
+            </div>
     <el-select
       ref="headerSearchSelect"
       v-model="search"
@@ -148,6 +152,20 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+//.el-range-editor.is-active, .el-range-editor.is-active:hover, .el-select .el-input.is-focus .el-input__inner {
+//  border-color: #2d2f30 !important;
+//}
+.icon-img{
+  width: 28px;
+  height: 28px;
+  margin-right: 5px;
+  img{
+    width: 100%;
+    height: 100%;
+  }
+}
+
+
 .header-search {
   font-size: 0 !important;
 
diff --git a/fuintAdmin/src/layout/components/Navbar.vue b/fuintAdmin/src/layout/components/Navbar.vue
index 3ccf3d9d3..148910527 100644
--- a/fuintAdmin/src/layout/components/Navbar.vue
+++ b/fuintAdmin/src/layout/components/Navbar.vue
@@ -13,11 +13,13 @@
     </div>
     <div class="right-box">
       <div class="d-s">
-        <div class="icon-img">
-          <img src="../../../src/assets/new/t-sousuo.png" alt="">
-        </div>
-        搜索
-        </div>
+<!--        <div class="icon-img">-->
+<!--          <img src="../../../src/assets/new/t-sousuo.png" alt="">-->
+<!--        </div>-->
+<!--        搜索-->
+<!--        </div>-->
+        <search id="header-search" class="right-menu-item" />
+        <span style="margin-right: 10px; ">搜索</span>
       <div class="d-s">
         <div class="icon-img">
           <img src="../../../src/assets/new/t-fangda.png" alt="">
@@ -260,6 +262,7 @@ export default {
     //top: 50%; /* 将元素垂直向上移动容器高度的50% */
     //left: 50%; /* 将元素水平向左移动容器宽度的50% */
     //transform: translate(-50%, -50%); /* 通过移动元素的左上角使其居中 */
+    margin-left: 150px;
     color: #333;
     font-size: 24px;
     font-weight: bold;