From 91adb083fa05fefd30720feabc47ce9a42a34256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <chenjinsong@zdjizhi.com>
Date: Wed, 16 Dec 2020 16:27:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4trafficSetting?=
 =?UTF-8?q?=E7=AD=89=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/pickTime.vue        |  3 +++
 .../trafficSetting/trafficSettingTab.vue      | 25 +++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/common/pickTime.vue b/nezha-fronted/src/components/common/pickTime.vue
index 3e9531401..e39ee95dc 100644
--- a/nezha-fronted/src/components/common/pickTime.vue
+++ b/nezha-fronted/src/components/common/pickTime.vue
@@ -157,4 +157,7 @@
   .interval-refresh-popover{
     min-width: unset !important;
   }
+  .sub-top-tools .interval-refresh {
+    margin-top: -1px;
+  }
 </style>
diff --git a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
index da7b70dc5..e2ad70532 100644
--- a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
+++ b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
@@ -16,8 +16,8 @@
           :highlight-first-item="true"
           @input="hostInputChange"
           @blur="validateHostEmpty"
-        ></el-autocomplete>
-        <el-popover trigger="click" placement="bottom" @show="popShow" @hide="popHide" popper-class="no-style-class">
+        ></el-autocomplete><el-popover
+        @hide="popHide" @show="popShow" placement="bottom" popper-class="no-style-class" trigger="click">
           <div class="mib-browser-ad-search">
             <el-row class="mib-browser-ad-search-item" style="font-weight: bold">{{$t('config.dc.traffic.snmpSetting')}}</el-row>
             <el-row class="mib-browser-ad-search-item">
@@ -112,7 +112,14 @@
             <i class="el-icon-more"></i>
           </button>
         </el-popover>
-        <span class="right-box-form-minus-box" @click="delSelf" style="vertical-align: middle"><i class="nz-icon nz-icon-minus"></i></span>
+        <span @click="delSelf" class="right-box-form-minus-box"
+              style="vertical-align: middle;right: 0;
+                      position: absolute;
+                      line-height: 21px;
+                      height: 21px;
+                      top: 50%;
+                      transform: translateY(-50%);"
+        ><i class="nz-icon nz-icon-minus"></i></span>
         <div>
           <span style="color:#F56C6C;font-size: 12px;" v-if="hostRepeat">{{$t('validate.repeat')}}</span>
           <span style="color:#F56C6C;font-size: 12px;" v-if="hostInvalid">{{$t('validate.host')}}</span>
@@ -623,8 +630,8 @@
     border-top-left-radius: 0px;
     border-bottom-left-radius: 0px;
     height: 30px;
-    position: relative;
-    left: -3px;
+    top: 1px;
+    left: -1px;
   }
   .asset-config-tab .right-box-row-with-btn{
     width: calc(100% - 69px);
@@ -650,14 +657,15 @@
     margin-bottom: 5px;
     height: 20px;
     line-height: 18px;
-    justify-content: flex-end;
+    justify-content: center;
   }
   .tab-tags-item .tag-item-key{
     border:1px solid #409eff;;
     border-top-left-radius: 3px;
     border-bottom-left-radius: 3px;
     background-color: #409eff;
-    width: 52px;
+    min-width: 40px;
+    padding: 0 8px;
     color: white;
   }
   .tab-tags-item .tag-item-value{
@@ -665,7 +673,8 @@
     border-top-right-radius: 3px;
     border-bottom-right-radius: 3px;
     background-color: #FFF;
-    width: 52px;
+    min-width: 40px;
+    padding: 0 8px;
   }
   .tab-tags-item .tag-item-text{
     background-color: #FFF;

From 807cf49b2a3b8b2c949f93b36ccac9ffa9900d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <chenjinsong@zdjizhi.com>
Date: Wed, 16 Dec 2020 17:09:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E6=BC=8F=E6=8E=89?=
 =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=EF=BC=9B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4login=E9=A1=B5=E5=BA=95=E9=83=A8=E5=AD=97=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/login.vue      | 6 ++++--
 nezha-fronted/src/components/page/alert/config.vue | 2 +-
 nezha-fronted/src/components/page/config/model.vue | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue
index 261637c24..9028d6d09 100644
--- a/nezha-fronted/src/components/common/login.vue
+++ b/nezha-fronted/src/components/common/login.vue
@@ -230,11 +230,13 @@ export default {
 }
 .login-foot-buildOn{
   position: absolute;
-  bottom: 30px;
+  bottom: 20px;
   z-index: 100;
   left: calc(50% - 90px);
   a{
-    color: white;
+    font-size: 14px;
+    color: #eee;
+    text-shadow: 1px 1px 3px #333;
     text-decoration: none;
   }
 }
diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue
index ffb285c69..4bed55f60 100644
--- a/nezha-fronted/src/components/page/alert/config.vue
+++ b/nezha-fronted/src/components/page/alert/config.vue
@@ -48,7 +48,7 @@
               </button>
             </template>
           </export-excel>
-          <delete-button :delete-objs="batchDeleteObjs" api="alert/rule" @after="getTableData"></delete-button>
+          <delete-button :delete-objs="batchDeleteObjs" @after="getTableData" api="alert/rule" v-has="'rule_delete'"></delete-button>
         </div>
         <div class="pagination-top pagination-top-hide display-none"></div>
       </div>
diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue
index 0bfc474f1..74c886489 100644
--- a/nezha-fronted/src/components/page/config/model.vue
+++ b/nezha-fronted/src/components/page/config/model.vue
@@ -15,7 +15,7 @@
           <button :title="$t('overall.createModel')" @click="add" class="nz-btn nz-btn-size-normal nz-btn-style-light margin-l-20" id="model-add" v-has="'model_toAdd'">
             <i class="nz-icon-create-square nz-icon"></i>
           </button>
-          <delete-button :delete-objs="batchDeleteObjs" api="model" @after="getTableData"></delete-button>
+          <delete-button :delete-objs="batchDeleteObjs" @after="getTableData" api="model" v-has="'model_delete'"></delete-button>
         </div>
         <div class="pagination-top pagination-top-hide display-none"></div>
       </div>

From f3e53608a4ad205e8dfe8bd3218aef99703d3f4b Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Wed, 16 Dec 2020 17:35:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4chartBox=20=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/dashboard/chartBox.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index c8f6c0b96..5ef62ed96 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -64,7 +64,7 @@
     height: 100vh;
     top: 0;
     left: 0;
-    z-index: 410;
+    z-index: 2100;
   }
   /deep/ .el-color-picker{
     position: absolute;