From aaa1118154505ce15c49228bdab415ed21e17ffc Mon Sep 17 00:00:00 2001
From: wujiawen <wujiawen@geedgenetworks.com>
Date: Wed, 15 Jan 2020 15:31:41 +0800
Subject: [PATCH] =?UTF-8?q?header=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/nzIcon.css       |  6 ++-
 nezha-fronted/src/assets/stylus/main.scss     |  4 ++
 .../src/components/common/header.vue          | 41 +++++++++++++++----
 .../src/components/page/asset/asset.vue       |  8 +++-
 4 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/assets/css/nzIcon.css b/nezha-fronted/src/assets/css/nzIcon.css
index 7f0da261c..4c7763a49 100644
--- a/nezha-fronted/src/assets/css/nzIcon.css
+++ b/nezha-fronted/src/assets/css/nzIcon.css
@@ -13,6 +13,7 @@
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  
 }
 
 .nz-icon-lang-en:before {
@@ -50,7 +51,7 @@
 .nz-icon-equal:before {
   content: "\e61a";
 }
-
+                               
 .nz-icon-delete:before {
   content: "\e61b";
 }
@@ -65,6 +66,7 @@
 
 .nz-icon-create-square:before {
   content: "\e61f";
+  
 }
 
 .nz-icon-zoomin:before {
@@ -73,6 +75,8 @@
 
 .nz-icon-gear:before {
   content: "\e61d";
+  color: #BA3939;
+  font-size:12px;
 }
 
 .nz-icon-view:before {
diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index 68f9028fe..bc0866b92 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -718,3 +718,7 @@ html {
 .nz-submenu .el-menu--popup .el-menu-item .menu-item-active{
   color:$global-text-color-active !important;
 }
+.el-icon-setting:before {
+  content: "\E6CA";
+  color: #BA3939;
+}
\ No newline at end of file
diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue
index 06fc73855..9c98ce110 100644
--- a/nezha-fronted/src/components/common/header.vue
+++ b/nezha-fronted/src/components/common/header.vue
@@ -8,8 +8,10 @@
       <el-submenu index="0" popper-class="nz-submenu">
         <template slot="title">
           <div class="menu-create">
-            &nbsp;&nbsp;<i class="el-icon-plus"></i>
-            <div>{{$t('overall.create')}}</div>
+            <div class="menu-icon-create">
+             <i class="nz-icon-create-square nz-icon"></i>
+            </div>
+            <div class='menu-create-title'>{{$t('overall.create')}}</div>
           </div>
         </template>
         <template v-for="(item, index) in createMenu">
@@ -91,7 +93,7 @@
       </el-submenu>
       <el-submenu index="6" popper-class="nz-submenu">
         <template slot="title">
-          <div>{{username}}<i class="el-icon-arrow-down"></i></div>
+          <div class='nz-user'>{{username}}<i class="el-icon-arrow-down"></i></div>
         </template>
         <el-menu-item index="6-0">
           <div :style="language=='en'?'color:#f90':''" @click="changeLocal('en')">English</div>
@@ -379,6 +381,10 @@
       this.getUserData();
       this.getAssetData();
       this.getProjectList();
+      // 刷新后有高亮
+      let activePath = this.$route.path.slice(1)
+      this.activeIndex = activePath
+      // console.log(activePath,this.activeIndex)
     },
     computed: {
       projectListReloadWatch() {
@@ -386,7 +392,8 @@
       },
       getIdcData() {
         return this.$store.state.assetDcList;
-      }
+      },
+
     },
     watch: {
       getIdcData: {
@@ -413,16 +420,21 @@
   .header .el-menu--horizontal>.el-submenu .el-submenu__title .menu-active{
     border-bottom:$global-text-color-active solid 2px;
     border-radius: 2px;
-    height: 22px;
+    height: 26px;
     line-height: 16px;
     display: inline-block;
     font-size: 16px;
-    margin: 0 auto ;
+    margin: 0 auto -8px;
+    font-weight: 500;
+    
   }
   .header .el-menu--horizontal>.el-submenu .el-submenu__title i {
     color: inherit;
   }
-  .el-submenu__title .el-icon-arrow-down {
+  .el-submenu__title{
+    font-size: 16px;
+  }
+  .el-submenu__title .el-icon-arrow-down ,.el-submenu__title>.nz-user{
     font-size: 14px;
   }
   .nz-submenu .el-menu--popup {
@@ -431,11 +443,11 @@
   .header .el-menu--horizontal>.el-submenu .el-submenu__title {
     min-width: 120px;
     text-align: center; 
-    color: $header-text-color;
+    color:$header-text-color;
     padding: 0;
   }
   .header .el-menu--horizontal>.el-submenu .el-submenu__title:hover {
-    color: #444;
+    color: #444 !important;
   }
 
   .el-menu.el-menu--horizontal {
@@ -458,6 +470,17 @@
   }*/
   .el-submenu.is-active .el-submenu__title{
     border-bottom-color: transparent !important;
+  } 
+  .menu-create .menu-icon-create .nz-icon:before{
+    height: 20px;
+    line-height: 20px;
+    display: inline-block;
+    font-size: 20px;
+    margin-top:-4px;
+    margin-bottom:6px;
+  } 
+  .el-submenu__icon-arrow .el-icon-arrow-down{
+    display: none;
   }
   .el-menu--horizontal.nz-submenu {
     border: 1px solid #bbbbbb;
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index cd510b30e..c72ccb7fe 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -26,7 +26,8 @@
     <div class="content-right">
       <div class="top-tools">
         <button @click.stop="tagShow('showAdd')" class="nz-btn nz-btn-size-normal nz-btn-style-normal float-right" id="asset-add">
-          <span class="top-tool-btn-txt">{{$t('overall.add')}}</span>
+          <span class="top-tool-btn-txt">{{$t('overall.add')}}</span>  
+          <!-- ADD按钮 -->
         </button>
         <div class="top-tool-search float-right"><search-input :searchMsg="searchMsg" @search="search"></search-input></div>
       </div>
@@ -48,7 +49,7 @@
           <template slot="header" slot-scope="scope">
             <span v-if="index==0">
                 <span @click.stop="elementsetShow('shezhi',$event)" id="asset-tab-set">
-                    <i class="el-icon-setting"></i>
+                    <i class="nz-icon nz-icon-gear"></i>
                 </span>
                 <span>{{item.label}}</span>
             </span>
@@ -655,6 +656,9 @@
   .tab-input-square-high {
     border: 1px solid #1166bb;
   }
+  #asset-tab-set{
+    
+  }
 </style>
 <style lang="scss">
   .asset .content-left .el-checkbox__input.is-focus .el-checkbox__inner,