From 9df5ee4f7dceb8cb3584a0485f9eae1906299159 Mon Sep 17 00:00:00 2001
From: xvv <cccccc420590@163.com>
Date: Mon, 8 Jul 2024 17:51:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin_zt/src/assets/images/add.png       | Bin 0 -> 400 bytes
 fuintAdmin_zt/src/assets/images/detele.png    | Bin 0 -> 249 bytes
 fuintAdmin_zt/src/assets/images/qp.png        | Bin 0 -> 571 bytes
 fuintAdmin_zt/src/assets/images/tzzx.png      | Bin 0 -> 338 bytes
 .../src/layout/components/Navbar.vue          |  63 ++++++++++++------
 fuintAdmin_zt/src/views/Site/index.vue        |  35 +++-------
 6 files changed, 53 insertions(+), 45 deletions(-)
 create mode 100644 fuintAdmin_zt/src/assets/images/add.png
 create mode 100644 fuintAdmin_zt/src/assets/images/detele.png
 create mode 100644 fuintAdmin_zt/src/assets/images/qp.png
 create mode 100644 fuintAdmin_zt/src/assets/images/tzzx.png

diff --git a/fuintAdmin_zt/src/assets/images/add.png b/fuintAdmin_zt/src/assets/images/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..766a9aded992a9c393e78878aa410c93f92213e0
GIT binary patch
literal 400
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxK#^NA%Cx&(BWL^R}Q2{<7u0Wc5
ze;3F8er_N-+RuG(BKIK(If>`sM4m$vpyZ*6yay-n0?9)YrH@XRIXd0y?9$c;C)ysK
zSp4GZk{8!DzqzyJ&D}#E9v}Yj<iU@R|Ns9NPE30SG+m%1$S;^dLczcwJ|VxLp?|{u
z1NR@yvR@hllsn<+;uvCa`t6j9LQM(+u7R8vT_$V^c>KTKII)S7<;c9f{s-pWJpE3G
zq2Ogt!riji=)=rBU*D|$H|>B|cjlIkLebA5sYQaDOfEWh99-l4?h1>$rhD~y+xAF~
z6peWoSj#mPxtn?1=GqEWKZw0<t)&~JSG6!Z-)6!JXGK}gQn!DsTTScNzP8bP?b+GB
zW^;Gp?aw{ikLUhKGB2^;lqj&Y-RX!hQ@{*``S<&;%t+<W`xkuU&P#o_?kmMxHC)~0
k8S*$X4fgCi6#R>!^OthXVtJw6KtC~fy85}Sb4q9e07h=Df&c&j

literal 0
HcmV?d00001

diff --git a/fuintAdmin_zt/src/assets/images/detele.png b/fuintAdmin_zt/src/assets/images/detele.png
new file mode 100644
index 0000000000000000000000000000000000000000..48aa8859279fad773f353bfab152b51e5633efc7
GIT binary patch
literal 249
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxK#^NA%Cx&(BWL^R}mH|E?u0Z;~
zgU5d-xBt#S<o@3;@PB0N|J02CX_@~EOa2#?{;zHLKV|y=1&jW#S@-|Q(f=1N{(t`B
z|NsBT8(8XqnpsMM{DK)28WyB=OWy?Y<2+p)Lo80ez2wPtK!L|0uy_Ar-}XEIH{9iN
zov75>RR5QQ^T^J)-!`867@WDBpB}j5VN}cD`edcclDxBLE*@B+?9!SzzbnA^p-F^~
r^&iz3-9v>3bD{;q>iv^%RNv>F{+*jsg7KL&&?W{?S3j3^P6<r_%!g*W

literal 0
HcmV?d00001

diff --git a/fuintAdmin_zt/src/assets/images/qp.png b/fuintAdmin_zt/src/assets/images/qp.png
new file mode 100644
index 0000000000000000000000000000000000000000..07832f1be0834e7413e7f6052004bcbe99197fa6
GIT binary patch
literal 571
zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q3?%1AoYnzSjKx9jP7LeL$-D$|8UuVnT!Hle
z{(%3}1O879{XaeA|FmEb0<wW<S_nvFDo_we!bGNl#X%$(0c9a7fm{#+NCMTv*wevW
zh+dFN7=kO97ApIA^Aw;Xv`T{ff*Ax93>*UD6Y>k{8~P{AU$B1vfs?1spFe-$^5yF{
zZr;9g@810fk6*q2@bS};x!P$!?-+TyIEHu}e|znAP_uym+XG&9Lj{(NN?V_YdH=ls
zpK&jPRnJ|W7VYB?_ow_wGoN{&E#u_>?(b9femXhN);d^!!X(Yv+Kpe2Ei%hq@Fh3z
zyQ;_@*?>)^!EY3vGaP=)ec<Zq!wY;P9<v!(i#(jXdJ>=2A+BG7QaP40?#FvH2zR+h
zM2Jm0UU<WKhr@!P&k4`xBrfgH;F^>8`T>vibDrw<o{*PJ&F2`ee>)g5<IB49PfVYw
zK0A2-XY&TW!&Q81YL(uy_}<$6ZHZ57n@9P%{ksmdXiS*Hp{ni}UnHb*ve#j^bhD#?
zZ#&!V>eVhO7T?Y~_KLD?Uijnz`*-#44QwYKnOQ!UDl40Cu<prai%pliLRxE;H$3a$
zwx9f$tHL_^#!uNDKek2Y9r5cG%9Gu-!L|DI(wvhD_Opu*+9e)-c?lTi44$rjF6*2U
FngH`t9H9UJ

literal 0
HcmV?d00001

diff --git a/fuintAdmin_zt/src/assets/images/tzzx.png b/fuintAdmin_zt/src/assets/images/tzzx.png
new file mode 100644
index 0000000000000000000000000000000000000000..08685a99c1ec7f2b44894471b03a667840e8b4b9
GIT binary patch
literal 338
zcmeAS@N?(olHy`uVBq!ia0vp^79h;Q3?%1AoYnzSjKx9jP7LeL$-D$|Yyx~jT!Hle
z{(%3}1O879{XaeA|FmEb0<t08sUcAIG@uliJq;)YWB|FLnt{$h?F_;tL4Lsu0tyBW
z0r3g>^$io|FW7(n{)6|+4VPR7N-y<vaSZV|{`QJD-(dwF*T6bX&IuPjeA|DWPb-v%
z;kevZ!SXtl9#w7A>WZ}cy+>X$iRd=SG3;SrW8nD1c%6r#@@a3T&^}eRudJb|iM8Hy
z#dpoVv}od9#`9t}na?krnfM{&aC6I2-uNf4E_$AJThczK;L!huG;iA(W{0hUOaB_r
zJZ@0_(6nv(mzB-0vkoh)uG{isruL?XPH*#SE-iktQIBPL8vlFVj>)F;652buKpygR
L^>bP0l+XkKTlJBx

literal 0
HcmV?d00001

diff --git a/fuintAdmin_zt/src/layout/components/Navbar.vue b/fuintAdmin_zt/src/layout/components/Navbar.vue
index f1fe76bb9..5a6088ce4 100644
--- a/fuintAdmin_zt/src/layout/components/Navbar.vue
+++ b/fuintAdmin_zt/src/layout/components/Navbar.vue
@@ -1,19 +1,38 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <div style="display: flex;align-items: center" >
+      <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+      <div class="title-logo">
+
+        <div>
+          百业兴智慧油站欢迎您
+        </div>
+
+      </div>
+    </div>
+
 <!--    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>-->
 
-    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
+<!--    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>-->
 
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
-        <FuintDoc id="fuint-doc" class="right-menu-item hover-effect" />
-      </template>
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
-        <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+<!--      <template v-if="device!=='mobile'">-->
+<!--        <search id="header-search" class="right-menu-item" />-->
+<!--        <screenfull id="screenfull" class="right-menu-item hover-effect" />-->
+<!--        <FuintDoc id="fuint-doc" class="right-menu-item hover-effect" />-->
+<!--      </template>-->
+      <div class="d-s"style="margin-right: 20px">
+          <img src="../../assets/images/qp.png" style="width: 28px;height: 28px;margin-right: 5px">
+        <div>全屏</div>
+      </div>
+      <div class="d-s"style="margin-right: 20px">
+        <img src="../../assets/images/tzzx.png" style="width: 28px;height: 28px;margin-right: 5px">
+        <div>通知中心</div>
+      </div>
+      <el-dropdown class="d-s" trigger="click">
+        <div class="d-s">
+          <div class="title_">百业兴总部</div>
+          <img :src="avatar" style="width: 28px;height: 28px;margin: 0px 10px" />
           <span class="user-name">{{ name }}</span>
           <i class="el-icon-caret-bottom"/>
         </div>
@@ -27,13 +46,7 @@
         </el-dropdown-menu>
       </el-dropdown>
     </div>
-    <div class="title-logo">
 
-      <div>
-        百业兴智慧油站欢迎您
-      </div>
-
-    </div>
   </div>
 </template>
 
@@ -101,6 +114,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
+.d-s{
+  display: flex;
+  align-items: center;
+}
+.title_{
+  font-weight: bold;
+  font-size: 18px;
+  color: #333333;
+}
 .navbar {
   height: 90px;
   overflow: hidden;
@@ -113,7 +136,9 @@ export default {
 
   box-shadow: 0 1px 4px rgba(0,21,41,.08);
   box-sizing: border-box;
-  padding-top:25px ;
+ display: flex;
+  align-items: center;
+  justify-content: space-between;
   .hamburger-container {
     line-height: 46px;
     height: 100%;
@@ -154,9 +179,9 @@ export default {
   }
 
   .right-menu {
-    float: right;
+    display: flex;
     height: 100%;
-    line-height: 50px;
+   align-items: center;
 
     &:focus {
       outline: none;
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index e405ccc2c..ab4d0b9af 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -381,24 +381,11 @@
                             </el-input>
                           </el-form-item>
                         </el-col>
-
                       </template>
-
-
-
                       <template v-if="ruleForm.turnoverType === '5'">
                         <el-col :span="10">
                           <el-row>
                             <el-form-item label="时间范围">
-<!--                              <el-date-picker-->
-<!--                                :disabled="isTopDept"-->
-<!--                                v-model="timeFrame"-->
-<!--                                value-format="yyyy-MM-dd"-->
-<!--                                type="daterange"-->
-<!--                                range-separator="至"-->
-<!--                                start-placeholder="开始日期"-->
-<!--                                end-placeholder="结束日期">-->
-<!--                              </el-date-picker>-->
                               <el-date-picker
                                 :disabled="isTopDept"
                                 v-model="beginTime"
@@ -498,10 +485,6 @@
                           </el-row>
                         </el-col>
                       </template>
-
-
-
-
                       <template v-if="ruleForm.turnoverType === '5'">
                         <el-col :span="10">
                           <el-row>
@@ -526,7 +509,6 @@
                             </el-form-item>
                           </el-row>
                         </el-col>
-
                         <el-col :span="8">
                           <el-form-item label="价格">
                             <el-input :disabled="isTopDept" v-model="ruleForm.prepaidAmount">
@@ -535,9 +517,6 @@
                           </el-form-item>
                         </el-col>
                       </template>
-
-
-
                       <template v-if="ruleForm.turnoverType === '6'">
                         <el-col :span="10">
 
@@ -1774,19 +1753,22 @@ export default {
         console.log("store",store)
         let isAdd =  data.deptType == '3'
         return (
-          <span class="custom-tree-node">
+
+          <div class="custom-tree-node" style="display: flex;align-items: center;">
           <span class="custom-tree-box">{node.label}</span>
-          <span>
+          <span style="display: flex;align-items: center;">
             {!isAdd ?
-              <el-button size="mini" type="text" on-click={() => this.append(data)}>新增</el-button>
+
+              < img alt="" src="http://47.95.206.185:83/add.png" style=" width: 20px;height: 20px;  " on-click={() => this.append(data)}/>
               : null
             }
             {node.level !== 1 ?
-              <el-button size="mini" type="text" on-click={() => this.remove(node, data)}>删除</el-button>
+              < img alt="" src="http://47.95.206.185:83/del.png" style=" width: 20px;height: 20px;  " on-click={() => this.remove(node, data)}/>
+
               : null
             }
           </span>
-        </span>);
+        </div>);
       },
 
 
@@ -2189,6 +2171,7 @@ export default {
   }
   .custom-tree-box{
     margin-right: 10px;
+
   }
 </style>