前端

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'">
+<!--      <template v-if="device!=='mobile'">-->
-        <search id="header-search" class="right-menu-item" />
+<!--        <search id="header-search" class="right-menu-item" />-->
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
+<!--        <screenfull id="screenfull" class="right-menu-item hover-effect" />-->
-        <FuintDoc id="fuint-doc" class="right-menu-item hover-effect" />
+<!--        <FuintDoc id="fuint-doc" class="right-menu-item hover-effect" />-->
-      </template>
+<!--      </template>-->
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+      <div class="d-s"style="margin-right: 20px">
-        <div class="avatar-wrapper">
+          <img src="../../assets/images/qp.png" style="width: 28px;height: 28px;margin-right: 5px">
-          <img :src="avatar" class="user-avatar">
+        <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;

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>