Merge branch 'dev-新新版' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-新新版

src/assets/scss/common-dai.scss

@@ -406,6 +406,12 @@ img {
                 color: #333;
                 font-size: 16px;
             }
+            .img-nav {
+                position: relative;
+                width: 24px;
+                height: 24px;
+                vertical-align: middle;
+            }
             .nav-item {
                 display: flex;
                 align-items: center;

src/main.js

@@ -1,7 +1,5 @@
 import Vue from "vue";
 import Element from "element-ui";
-// import Mint from "mint-ui";
-// import "mint-ui/lib/style.css";
 
 import App from "@/App";
 import i18n from "@/i18n";
@@ -12,14 +10,6 @@ import "@/assets/scss/aui.scss";
 //按钮
 
 import http from "@/utils/request";
-// import renRadioGroup from "@/components/ren-radio-group";
-// import renSelect from "@/components/ren-select";
-// import renProcessMultiple from "@/components/ren-process-multiple";
-// import renProcessStart from "@/components/ren-process-start";
-// import renProcessRunning from "@/components/ren-process-running";
-// import renProcessDetail from "@/components/ren-process-detail";
-// import renDeptTree from "@/components/ren-dept-tree";
-// import renRegionTree from "@/components/ren-region-tree";
 import cloneDeep from "lodash/cloneDeep";
 
 // axios封装
@@ -51,17 +41,6 @@ window.app = Object.assign(
 
 Vue.config.productionTip = false;
 
-// Vue.use(renRadioGroup);
-// Vue.use(renSelect);
-// Vue.use(renDeptTree);
-// Vue.use(renRegionTree);
-// Vue.use(renProcessMultiple);
-// Vue.use(renProcessStart);
-// Vue.use(renProcessRunning);
-// Vue.use(renProcessDetail);
-// Vue.use(Element);
-// Vue.use(Mint);
-
 Vue.use(Element, {
   size: "default",
   i18n: (key, value) => i18n.t(key, value),

src/views/main-navbar.vue

@@ -33,7 +33,7 @@
             </svg>
           </el-menu-item>
 
-          <el-menu-item index="2" @click="refresh()">
+          <el-menu-item v-if="false" index="2" @click="refresh()">
             <svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true">
               <use xlink:href="#icon-sync"></use>
             </svg>
@@ -47,10 +47,22 @@
         >
           <el-menu-item index="3" @click="fullscreenHandle()">
             <div class="nav-item">
-              <img src="~@/assets/img/staff-default-avatar-girl.png" />
+              <img src="~@/assets/images/main/nav-sjdb.png" />
               <span>数据对比</span>
             </div>
           </el-menu-item>
+          <el-menu-item index="3" @click="fullscreenHandle()">
+            <div class="nav-item">
+              <img src="~@/assets/images/main/nav-zntb.png" />
+              <span>智能填报</span>
+            </div>
+          </el-menu-item>
+          <el-menu-item index="3" @click="fullscreenHandle()">
+            <div class="nav-item">
+              <img src="~@/assets/images/main/nav-sjjy.png" />
+              <span>数据校验</span>
+            </div>
+          </el-menu-item>
         </el-menu>
 
         <el-menu
@@ -59,11 +71,11 @@
           style="min-width: 180px"
         >
           <el-menu-item index="3" @click="fullscreenHandle()">
-            <i class="icon-nav el-icon-time"></i>
+            <img class="img-nav" src="~@/assets/images/main/time.png" />
           </el-menu-item>
 
           <el-menu-item index="2" @click="fullscreenHandle()">
-            <i class="icon-nav el-icon-bell"></i>
+            <img class="img-nav" src="~@/assets/images/main/hint.png" />
           </el-menu-item>
 
           <el-menu-item index="1" class="aui-navbar__avatar">
@@ -71,9 +83,9 @@
               <span class="el-dropdown-link">
                 <img
                   v-if="$store.state.user.gender === '2'"
-                  src="~@/assets/img/staff-default-avatar-girl.png"
+                  src="~@/assets/images/main/default-avatar.png"
                 />
-                <img v-else src="~@/assets/img/staff-default-avatar-boy.png" />
+                <img v-else src="~@/assets/images/main/default-avatar.png" />
                 <span>{{ $store.state.user.realName }}</span>
                 <i class="el-icon-arrow-down"></i>
               </span>

src/views/main-sidebar.vue

@@ -36,8 +36,26 @@
         v-show="$store.state.sidebarActiveSubMenuList.length != 0"
         @click="$store.state.sidebarFold = !$store.state.sidebarFold"
       >
-        <i class="el-icon-s-fold" v-show="!$store.state.sidebarFold"></i>
+        <img
-        <i class="el-icon-s-unfold" v-show="$store.state.sidebarFold"></i>
+          v-show="!$store.state.sidebarFold"
+          class="z-normal"
+          src="~@/assets/images/main/fold.png"
+        />
+        <img
+          v-show="!$store.state.sidebarFold"
+          class="z-on"
+          src="~@/assets/images/main/fold-on.png"
+        />
+        <img
+          v-show="$store.state.sidebarFold"
+          class="z-normal"
+          src="~@/assets/images/main/unfold.png"
+        />
+        <img
+          v-show="$store.state.sidebarFold"
+          class="z-on"
+          src="~@/assets/images/main/unfold-on.png"
+        />
       </div>
 
       <div
@@ -109,6 +127,8 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+@import "~@/assets/scss/c/function.scss";
+
 .el-menu--collapse .el-submenu__title span,
 .el-menu--collapse .el-menu-item span {
   display: none;
@@ -135,6 +155,28 @@ export default {
   border-radius: 100%;
   overflow: hidden;
   cursor: pointer;
+  &:hover {
+    .z-on {
+      display: block;
+    }
+    .z-normal {
+      display: none;
+    }
+  }
+
+  .z-on {
+    display: none;
+  }
+  .z-normal {
+    display: block;
+  }
+  img {
+    position: absolute;
+    display: block;
+    width: 16px;
+    height: 16px;
+    @include hub;
+  }
 }
 
 /deep/ .m-nav {