style

src/App.vue

@@ -118,5 +118,9 @@ background: transparent !important;
 .el-scrollbar__wrap{
   margin-bottom:-17px !important;
 }
+.el-menu-item{
+  height:48px;
+  line-height: 48px;
+}
 </style>
 

src/assets/styles/element-ui.scss

@@ -1,92 +1,94 @@
 // cover some element-ui styles
-
 .el-breadcrumb__inner,
 .el-breadcrumb__inner a {
-  font-weight: 400 !important;
+    font-weight: 400 !important;
 }
 
 .el-upload {
-  input[type="file"] {
-    display: none !important;
-  }
+    input[type="file"] {
+        display: none !important;
+    }
 }
 
 .el-upload__input {
-  display: none;
+    display: none;
 }
 
 .cell {
-  .el-tag {
-    margin-right: 0px;
-  }
+    .el-tag {
+        margin-right: 0px;
+    }
 }
 
 .small-padding {
-  .cell {
-    padding-left: 5px;
-    padding-right: 5px;
-  }
+    .cell {
+        padding-left: 5px;
+        padding-right: 5px;
+    }
 }
 
 .fixed-width {
-  .el-button--mini {
-    padding: 7px 10px;
-    width: 60px;
-  }
+    .el-button--mini {
+        padding: 7px 10px;
+        width: 60px;
+    }
 }
 
 .status-col {
-  .cell {
-    padding: 0 10px;
-    text-align: center;
-
-    .el-tag {
-      margin-right: 0px;
+    .cell {
+        padding: 0 10px;
+        text-align: center;
+        .el-tag {
+            margin-right: 0px;
+        }
     }
-  }
 }
 
 // to fixed https://github.com/ElemeFE/element/issues/2461
 .el-dialog {
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
+    transform: none;
+    left: 0;
+    position: relative;
+    margin: 0 auto;
 }
 
 // refine element ui upload
 .upload-container {
-  .el-upload {
-    width: 100%;
-
-    .el-upload-dragger {
-      width: 100%;
-      height: 200px;
+    .el-upload {
+        width: 100%;
+        .el-upload-dragger {
+            width: 100%;
+            height: 200px;
+        }
     }
-  }
 }
 
 // dropdown
 .el-dropdown-menu {
-  a {
-    display: block
-  }
+    a {
+        display: block
+    }
 }
 
 // fix date-picker ui bug in filter-item
 .el-range-editor.el-input__inner {
-  display: inline-flex !important;
+    display: inline-flex !important;
 }
 
 // to fix el-date-picker css style
 .el-range-separator {
-  box-sizing: content-box;
+    box-sizing: content-box;
+}
+
+.el-menu--collapse>div>.el-submenu>.el-submenu__title .el-submenu__icon-arrow {
+    display: none;
+}
+
+.el-input__inner {
+    border: 1px solid rgba(0, 0, 0, 0.15) !important;
+    border-radius: 4px !important;
 }
 
-.el-menu--collapse
-  > div
-  > .el-submenu
-  > .el-submenu__title
-  .el-submenu__icon-arrow {
-  display: none;
+.el-form-item {
+    margin-bottom: 10px;
 }

src/assets/styles/element-variables.scss

@@ -3,29 +3,26 @@
 * So I modified the default color and you can modify it to your liking.
 **/
 
+
 /* theme color */
-$--color-primary: #1890ff;
+
+$--color-primary: #D7000F;
 $--color-success: #13ce66;
 $--color-warning: #ffba00;
 $--color-danger: #ff4949;
 // $--color-info: #1E1E1E;
-
 $--button-font-weight: 400;
-
 // $--color-text-regular: #1f2d3d;
-
 $--border-color-light: #dfe4ed;
 $--border-color-lighter: #e6ebf5;
-
-$--table-border:1px solid#dfe6ec;
+$--table-border:1px solid #dfe6ec;
 
 /* icon font path, required */
-$--font-path: '~element-ui/lib/theme-chalk/fonts';
 
+$--font-path: '~element-ui/lib/theme-chalk/fonts';
 @import "~element-ui/packages/theme-chalk/src/index";
-
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
 :export {
-  theme: $--color-primary;
-}
+    theme: $--color-primary;
+}

src/assets/styles/sidebar.scss

@@ -64,7 +64,8 @@
         .submenu-title-noDropdown,
         .el-submenu__title {
             &:hover {
-                background-color: #004BAD !important;
+                background-color: $subMenuHover !important;
+                color: #fff !important;
             }
         }
         & .theme-dark .is-active>.el-submenu__title {
@@ -74,7 +75,7 @@
         & .el-submenu .el-menu-item {
             min-width: $sideBarWidth !important;
             &:hover {
-                background-color: rgba(0, 0, 0, 0.06) !important;
+                //background-color: rgba(0, 0, 0, 0.06) !important;
             }
         }
         & .theme-dark .nest-menu .el-submenu>.el-submenu__title,

src/assets/styles/variables.scss

@@ -13,7 +13,7 @@ $subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
 $menuBg:#1F1E2E;
 $menuHover:#fff;
 $sidebarTitle: #ccc;
-$menuLightBg:#ccc;
+$menuLightBg:#1F1E2E;
 $menuLightHover:#f0f1f5;
 $sidebarLightTitle: #001529;
 $subMenuBg:#13131C;
@@ -42,4 +42,4 @@ $qt:#FE9627;
     wx: $wx;
     xj: $xj;
     qt: $qt;
-}
+}

src/assets/styles/yongtian.scss

@@ -291,4 +291,25 @@
  .top-right-btn {
      position: relative;
      float: right;
+ }
+ /** 操作类型文字颜色 */
+ 
+ .lans {
+     color: #016de7;
+ }
+ 
+ .lvs {
+     color: #1abc5e;
+ }
+ 
+ .chengs {
+     color: #ff9500;
+ }
+ 
+ .hongs {
+     color: #ff3b30;
+ }
+ 
+ .right {
+     float: right;
  }

src/components/TopNav/index.vue

@@ -171,8 +171,8 @@ export default {
 <style lang="scss">
 .topmenu-container.el-menu--horizontal > .el-menu-item {
   float: left;
-  height: 50px !important;
-  line-height: 50px !important;
+  height: 48px !important;
+  line-height: 48px !important;
   color: #999093 !important;
   padding: 0 5px !important;
   margin: 0 10px !important;
@@ -186,8 +186,8 @@ export default {
 /* submenu item */
 .topmenu-container.el-menu--horizontal > .el-submenu .el-submenu__title {
   float: left;
-  height: 50px !important;
-  line-height: 50px !important;
+  height: 48px !important;
+  line-height: 48px !important;
   color: #999093 !important;
   padding: 0 5px !important;
   margin: 0 10px !important;

src/layout/components/Sidebar/SidebarItem.vue

@@ -97,16 +97,27 @@ export default {
 .item2:last-child{
     margin-bottom:80px !important
 }
-.router-link-active:active,.router-link-active:hover,.item2:hover{
-    // background-color: #004BAD !important;
-    color:#fff !important;
-}
 #app .sidebar-container,.sidebar-container,.sidebar-logo-container{
     background-color: #1F1E2E;
 }
+.el-menu-item.is-active{
+  color:#D7000F !important;
+  .is-opened>.el-submenu__title svg,.is-opened>.el-submenu__title span,.is-opened>.el-submenu__title i{
+    color:#D7000F !important;
+  }
+}
+.el-submenu__title:hover{
+  .is-opened>.el-submenu__title svg,.is-opened>.el-submenu__title span,.is-opened>.el-submenu__title i{
+    color:#fff !important;
+  }
+}
+
 </style>
 <style>
-.el-menu-item.is-active,.is-opened>.el-submenu__title svg,.is-opened>.el-submenu__title span,.is-opened>.el-submenu__title i{
-  color:#D7000F !important;
+
+#app .sidebar-container .theme-dark .nest-menu .el-submenu > .el-submenu__title:hover, #app .sidebar-container .theme-dark .el-submenu .el-menu-item:hover{
+  color:#fff !important;
+  background: #D7000F ;
 }
+
 </style>

src/layout/components/Sidebar/index.vue

@@ -56,3 +56,9 @@ export default {
 };
 </script>
 
+<style>
+.item2:hover{
+    background-color: #D7000F !important;
+    color:#fff !important;
+}
+</style>

src/views/monitor/jobTaskIndex/index.vue

@@ -22,14 +22,16 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="handleAdd">新增</el-button>
-        
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
+        <el-button type="primary"  size="mini" @click="handleAdd">新增</el-button>
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange" height="calc(100vh - 10vh - 120px)">
+    <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange" >
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="任务编号" align="center" prop="jobId" />
       <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
@@ -51,7 +53,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['monitor:job:edit']"
           >修改</el-button>
@@ -63,8 +65,8 @@
             v-hasPermi="['monitor:job:remove']"
           >删除</el-button> -->
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
-            <span class="el-dropdown-link">
-              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+            <span class="el-dropdown-link lvs">
+              更多
             </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="handleRun" icon="el-icon-caret-right"

src/views/monitor/jobTaskLog/log.vue

@@ -40,13 +40,13 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
 
-    <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange" height="calc(100vh - 10vh - 120px)">
+    <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange" >
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="日志编号" width="80" align="center" prop="jobLogId"  show-overflow-tooltip />
       <el-table-column label="任务名称" align="center" prop="jobName"  show-overflow-tooltip  />
@@ -64,7 +64,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-view"
+            class="lvs"
             @click="handleView(scope.row)"
             v-hasPermi="['monitor:job:query']"
           >详细</el-button>

src/views/monitor/logininfor/index.vue

@@ -50,12 +50,12 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-table ref="tables" v-loading="loading" :data="list" height="calc(100vh - 10vh - 120px)" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+    <el-table ref="tables" v-loading="loading" :data="list"  @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="访问编号" align="center" prop="infoId"  show-overflow-tooltip />
       <el-table-column label="用户名称" align="center" prop="userName"  show-overflow-tooltip  sortable="custom" :sort-orders="['descending', 'ascending']" />

src/views/monitor/operlog/index.vue

@@ -66,13 +66,13 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
 
-    <el-table ref="tables" v-loading="loading" :data="list" height="calc(100vh - 10vh - 120px)" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+    <el-table ref="tables" v-loading="loading" :data="list"  @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="日志编号" align="center" prop="operId"  show-overflow-tooltip />
       <el-table-column label="系统模块" align="center" prop="title"  show-overflow-tooltip />
@@ -92,7 +92,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-view"
+            class="lvs"
             @click="handleView(scope.row,scope.index)"
             v-hasPermi="['monitor:operlog:query']"
           >详细</el-button>

src/views/recharge/cateringManagement/foodManagement/index.vue

@@ -29,9 +29,11 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain  size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
         <el-upload
           ref="upload"
           class="upload"
@@ -41,20 +43,16 @@
           :auto-upload="true"
           :file-list="fileList"
           accept=".xlsx,.xls"
-          style="display:inline-block;margin:0 10px;vertical-align: top;"
+          style="display:inline-block;margin:0  10px 0 0px;vertical-align: top;"
           >
           <el-button
-            type="warning"
             plain
-            icon="el-icon-upload"
             size="mini"
             :loading="uploadLoading"
           >上传菜品</el-button>
         </el-upload>
         <el-button
-          type="success"
           plain
-          icon="el-icon-download"
           size="mini"
           @click="handleExport"
         >菜品模板下载</el-button>
@@ -69,7 +67,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh  - 10vh - 170px)">
+    <el-table v-loading="loading" :data="adminList" >
       <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}

src/views/recharge/cateringManagement/personnel/index.vue

@@ -37,32 +37,17 @@
             />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            <el-button type="warning" icon="el-icon-circle-plus-outline" size="mini" @click="peopleChange()">配餐员批量处理</el-button>
-            <!-- <el-button type="warning" icon="el-icon-circle-plus-outline" size="mini" @click="peopleChange(0)">配餐员批量解绑</el-button> -->
-            <el-button type="success" icon="el-icon-circle-plus-outline" size="mini" @click="allPeople">查看所有配送员</el-button>
-            <!-- <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['system:user:add']"
-            >新增</el-button>
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-            >删除</el-button> -->
+            <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+            <el-button plain size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+          <br>
+          <el-form-item>
+            <el-button plain size="mini" @click="peopleChange()">配餐员批量处理</el-button>
+            <el-button plain size="mini" @click="allPeople">查看所有配送员</el-button>
           </el-form-item>
         </el-form>
 
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" height="calc(100vh - 12vh - 120px)">
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" >
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="sid" align="center" key="sid" prop="sid" v-if="columns[0].visible"  show-overflow-tooltip />
           <el-table-column label="用户名称" align="center" key="userName" prop="name" v-if="columns[1].visible"  show-overflow-tooltip  />

src/views/recharge/cateringManagement/record/index.vue

@@ -20,12 +20,13 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
         <el-button
-          type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
@@ -34,7 +35,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh  - 10vh - 170px)">
+    <el-table v-loading="loading" :data="adminList" >
       <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}

src/views/recharge/channel/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="渠道名称" prop="name">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="72px">
+      <el-form-item label="渠道名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入渠道名称"
@@ -12,21 +12,22 @@
 
         />
       </el-form-item>
+      <el-form-item class="right">
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain  size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:admin:add']"
         >新增</el-button>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 10vh - 120px)">
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" >
+      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip border>
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
@@ -285,7 +286,3 @@ export default {
   }
 };
 </script>
-<style lang="scss" scoped>
-// .el-button--primary{color:#50B300;border:1px solid #50B300;background: #fff;}
-// .el-button--primary:hover{color:#fff;border:1px solid #50B300;background: #50B300;}
-</style>

src/views/recharge/consumePlaces/bookingManagement/index.vue

@@ -31,21 +31,19 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
         <el-button
-          type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
-          :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['system:admin:export']"
         >导出</el-button>
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:admin:add']"

src/views/recharge/consumption/index.vue

@@ -11,9 +11,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
-
-
       <el-form-item label="消费时间">
          <el-date-picker
          style="margin-top:5px;"
@@ -27,21 +24,11 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <!-- <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['system:admin:export']"
-        >导出</el-button> -->
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain  size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh  - 10vh - 170px)">
+    <el-table v-loading="loading" :data="adminList" >
       <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}

src/views/recharge/department/index.vue

@@ -12,17 +12,20 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="synchrodeptJob">部门信息同步</el-button>
-        <el-button type="primary" icon="el-icon-circle-plus-outline" size="mini" @click="batchChange(1)">部门充值比例绑定</el-button>
-        <el-button type="warning" icon="el-icon-remove-outline" size="mini" @click="batchChange(0)">部门充值比例解除</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
+        <el-button plain size="mini" @click="synchrodeptJob">部门信息同步</el-button>
+        <el-button plain size="mini" @click="batchChange(1)">部门充值比例绑定</el-button>
+        <el-button plain size="mini" @click="batchChange(0)">部门充值比例解除</el-button>
       </el-form-item>
     </el-form>
     <el-table  :data="adminList"  ref="tableRef" :header-cell-class-name="cellClass"
     @select="handletableSelect"
 
-          @selection-change="handletableSelectionChange" height="calc(100vh - 10vh - 120px)" row-key="id"
+          @selection-change="handletableSelectionChange" height="calc(100vh - 12vh - 120px)" row-key="id"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
 
       <el-table-column type="selection" width="50" align="center" />
@@ -417,6 +420,4 @@ export default {
             ::v-deep .el-table .disabledCheck .cell .el-checkbox__inner {
                 display: none;
             }
-// .el-button--primary{color:#50B300;border:1px solid #50B300;background: #fff;}
-// .el-button--primary:hover{color:#fff;border:1px solid #50B300;background: #50B300;}
 </style>

src/views/recharge/detailed/index.vue

@@ -69,12 +69,13 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain  size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
         <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
+          type="primary"
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
@@ -83,7 +84,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh  - 10vh - 170px)">
+    <el-table v-loading="loading" :data="adminList" >
       <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}

src/views/recharge/fileExport/index.vue

@@ -22,12 +22,12 @@
         />
       </el-form-item>
       <el-form-item >
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 10vh - 120px)">
+    <el-table v-loading="loading" :data="adminList" >
       <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}

src/views/recharge/fileManagement/index.vue

@@ -24,8 +24,11 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
         <el-upload
           ref="upload"
           class="upload-demo"
@@ -34,14 +37,14 @@
           :on-change="handleChange"
           :auto-upload="false"
           accept=".xlsx,.xls"
-          style="display:inline-block;margin-left:10px;vertical-align: top;"
+          style="display:inline-block;vertical-align: top;"
           >
-          <el-button size="mini" type="primary">上传文件</el-button>
+          <el-button size="mini" plain>上传文件</el-button>
         </el-upload>
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 10vh - 120px)">
+    <el-table v-loading="loading" :data="adminList" >
       <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}

src/views/recharge/personnel/index.vue

@@ -32,11 +32,14 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="synchroPersonnel" v-hasPermi="['recharge:batch:synchro']">人员信息同步</el-button>
-        <el-button type="primary" icon="el-icon-circle-plus-outline" size="mini" @click="batchChange(1)" v-hasPermi="['recharge:batch:binding']">批量绑定</el-button>
-        <el-button type="warning" icon="el-icon-remove-outline" size="mini" @click="batchChange(0)" v-hasPermi="['recharge:batch:relieve']">批量解除</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain  size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
+        <el-button plain size="mini" @click="synchroPersonnel" v-hasPermi="['recharge:batch:synchro']">人员信息同步</el-button>
+        <el-button plain size="mini" @click="batchChange(1)" v-hasPermi="['recharge:batch:binding']">批量绑定</el-button>
+        <el-button plain size="mini" @click="batchChange(0)" v-hasPermi="['recharge:batch:relieve']">批量解除</el-button>
         <el-upload
           ref="upload"
           class="upload-demo"
@@ -48,11 +51,11 @@
           style="display:inline-block;margin-left:10px;vertical-align: top;"
           v-hasPermi="['recharge:batch:recharge']"
           >
-          <el-button size="mini" type="warning">上传充值文件</el-button>
+          <el-button size="mini" plain>上传充值文件</el-button>
         </el-upload>
       </el-form-item>
     </el-form>
-    <el-table  :data="adminList" @selection-change="handleSelectionChange" height="calc(100vh - 10vh - 120px)">
+    <el-table  :data="adminList" @selection-change="handleSelectionChange" >
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="id" align="center" prop="id"  show-overflow-tooltip />
       <el-table-column label="人员名称" align="center" prop="name"  show-overflow-tooltip />

src/views/recharge/qrCode/index.vue

@@ -12,12 +12,13 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:admin:add']"
@@ -25,7 +26,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange" height="calc(100vh - 10vh - 120px)">
+    <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange" >
       <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}

src/views/recharge/radio/index.vue

@@ -12,12 +12,13 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain  size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:admin:add']"
@@ -26,7 +27,7 @@
     </el-form>
 
 
-    <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange" height="calc(100vh - 10vh - 120px)">
+    <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange" >
       <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}

src/views/recharge/reportForm/index.vue

@@ -22,12 +22,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain  size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
         <el-button
-          type="warning"
           plain
-          icon="el-icon-download"
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
@@ -36,7 +37,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 10vh - 120px)">
+    <el-table v-loading="loading" :data="adminList" >
       <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}

src/views/system/dept/index.vue

@@ -22,12 +22,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:dept:add']"
@@ -54,14 +55,14 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dept:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-plus"
+            class="lvs"
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:dept:add']"
           >新增</el-button>
@@ -69,7 +70,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="hongs"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:dept:remove']"
           >删除</el-button>
@@ -229,7 +230,7 @@ export default {
       setTimeout(()=>{
         this.reset();
       },500)
-      
+
     },
     // 表单重置
     reset() {

src/views/system/menu/index.vue

@@ -22,12 +22,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:menu:add']"
@@ -60,21 +61,21 @@
         <template slot-scope="scope">
           <el-button size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:menu:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-plus"
+            class="lvs"
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:menu:add']"
           >新增</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="hongs"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:menu:remove']"
           >删除</el-button>

src/views/system/product/index.vue

@@ -12,11 +12,9 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:admin:add']"
@@ -52,14 +50,14 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="hongs"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:admin:remove']"
           >删除</el-button>
@@ -435,8 +433,5 @@ export default {
   }
 };
 </script>
-<style lang="scss" scoped>
-// .el-button--primary{color:#50B300;border:1px solid #50B300;background: #fff;}
-// .el-button--primary:hover{color:#fff;border:1px solid #50B300;background: #50B300;}
-</style>
+
 

src/views/system/role/authUser.vue

@@ -22,8 +22,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -210,4 +210,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/system/role/index.vue

@@ -50,20 +50,19 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:role:add']"
         >新增</el-button>
         <el-button
-          type="danger"
           plain
-          icon="el-icon-delete"
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
@@ -72,7 +71,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange" height="calc(100vh - 10vh - 120px)">
+    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange" >
       <el-table-column type="selection" width="55" align="center"  show-overflow-tooltip />
       <el-table-column label="角色编号" prop="roleId"  show-overflow-tooltip />
       <el-table-column label="角色名称" prop="roleName"  show-overflow-tooltip  />
@@ -98,21 +97,21 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:role:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="hongs"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
           >删除</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-circle-check"
+            class="chengs"
             @click="handleDataScope(scope.row)"
             v-hasPermi="['system:role:edit']"
           >数据权限</el-button>

src/views/system/role/selectUser.vue

@@ -21,8 +21,8 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <el-row>

src/views/system/security/index.vue

@@ -4,15 +4,13 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
-          icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:role:add']"
         >新增</el-button>
       </el-col>
     </el-row>
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 10vh - 120px)">
+    <el-table v-loading="loading" :data="adminList" >
       <el-table-column label="编号" prop="id"   show-overflow-tooltip />
       <el-table-column label="密码长度不少于" prop="pwdLength"  show-overflow-tooltip >
         <template slot-scope="scope">
@@ -22,8 +20,8 @@
       <el-table-column label="账号锁定次数" prop="lockNumber"  show-overflow-tooltip />
       <el-table-column label="锁定时间" prop="loseDate" >
         <template slot-scope="scope">
-          <span>{{scope.row.loseDate == 1 ? "1分钟" : scope.row.loseDate == 5 ? "5分钟" 
-            : scope.row.loseDate == 15 ? "15分钟" : scope.row.loseDate == 30 ? "30分钟" : scope.row.loseDate == 120 ? "2小时" 
+          <span>{{scope.row.loseDate == 1 ? "1分钟" : scope.row.loseDate == 5 ? "5分钟"
+            : scope.row.loseDate == 15 ? "15分钟" : scope.row.loseDate == 30 ? "30分钟" : scope.row.loseDate == 120 ? "2小时"
             : scope.row.loseDate == 1440 ? "1天" : ""}}</span>
         </template>
       </el-table-column>
@@ -31,13 +29,11 @@
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.isEnable"
-            active-color="#13ce66"
-            inactive-color="#ff4949"
              @change="handleStatusChange(scope.row)"
           ></el-switch>
         </template>
       </el-table-column>
-      
+
       <!-- <el-table-column label="大小写敏感" align="center" width="100">
         <template slot-scope="scope">
           <el-switch
@@ -57,14 +53,14 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:role:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="hongs"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
           >删除</el-button>
@@ -205,7 +201,7 @@ export default {
           this.adminList = response.data.records;
           this.total = response.data.total;
           this.loading = false;
-          
+
         }
       );
     },

src/views/system/user/index.vue

@@ -75,20 +75,19 @@
             ></el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+            <el-button plain size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+          <br>
+          <el-form-item>
             <el-button
               type="primary"
-              plain
-              icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
               v-hasPermi="['system:user:add']"
             >新增</el-button>
             <el-button
-              type="danger"
               plain
-              icon="el-icon-delete"
               size="mini"
               :disabled="multiple"
               @click="handleDelete"
@@ -97,14 +96,14 @@
           </el-form-item>
         </el-form>
 
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" height="calc(100vh - 12vh - 120px)">
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" >
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"  show-overflow-tooltip />
-          <el-table-column label="账户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"  show-overflow-tooltip  />
+          <el-table-column label="用户编号" width="80" lign="center" key="userId" prop="userId" v-if="columns[0].visible"  show-overflow-tooltip />
+          <el-table-column label="账户名称" width="120" align="center" key="userName" prop="userName" v-if="columns[1].visible"  show-overflow-tooltip  />
           <el-table-column label="用户名称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"  show-overflow-tooltip  />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"  show-overflow-tooltip  />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"  show-overflow-tooltip />
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+          <el-table-column label="状态" width="80" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -129,21 +128,21 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-edit"
+                class="lans"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:user:edit']"
               >修改</el-button>
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-delete"
+                class="hongs"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']"
               >删除</el-button>
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-key"
+                class="lans"
                 @click="handleResetPwd(scope.row)"
                 v-hasPermi="['system:user:resetPwd']"
               >重置密码</el-button>