From 55d2a38283a76d0f766b357b4c0881ae31cf5c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <523037378@qq.com>
Date: Thu, 20 Feb 2020 10:47:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9A=82=E6=97=B6=E5=9B=9E=E6=BB=9Aasse?=
 =?UTF-8?q?t=E4=BE=A7=E6=BB=91=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/header.vue   |  4 ++--
 .../src/components/page/asset/asset.vue          | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue
index a08d2a895..09fd3354b 100644
--- a/nezha-fronted/src/components/common/header.vue
+++ b/nezha-fronted/src/components/common/header.vue
@@ -114,8 +114,8 @@
     <panel-box :panel="editPanel" @reload="panelListReload" @reloadForDel="" ref="panelBox"></panel-box>
     <project-box :project="editProject" ref="projectBox"></project-box>
     <module-box :currentProject="currentProject" :module="editModule" @reload="" ref="moduleBox"></module-box>
-    <asset-box :currentProject="currentProject" :currentModule="currentModule" @reload=""
-                      ref="addEndpointBox"></asset-box>
+    <!--<asset-box :currentProject="currentProject" :currentModule="currentModule" @reload=""
+                      ref="addEndpointBox"></asset-box>-->
     <asset-add-unit :add-unit-show='addUnitShow' @refreshData="refreshAsset" ref="assetAddUnit"
                     @sendStateData="closeAsset"></asset-add-unit>
     <alert-config-box :parentAlertRule="alertRule" @reload="" ref="alertConfigBox"></alert-config-box>
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 5d22dbf30..5d1eed226 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -167,10 +167,12 @@
       <Pagination :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>
     </div>
 
-    <!--<asset-add-unit :add-unit-show='addUnitShow' @refreshData="flushData" ref="assetAddUnit"
-                    @sendStateData="tabControl"></asset-add-unit>-->
-    <asset-box :edit-unit-show='editUnitShow' @refreshData="flushData" @sendStateData="tabControl"
-                     ref="assetEditUnit"></asset-box>
+    <asset-add-unit :add-unit-show='addUnitShow' @refreshData="flushData" ref="assetAddUnit"
+                    @sendStateData="tabControl"></asset-add-unit>
+    <asset-edit-unit :edit-unit-show='editUnitShow' @refreshData="flushData" @sendStateData="tabControl"
+               ref="assetEditUnit"></asset-edit-unit>
+    <!--<asset-box :edit-unit-show='editUnitShow' @refreshData="flushData" @sendStateData="tabControl"
+                     ref="assetEditUnit"></asset-box>-->
     <element-set
       v-clickoutside="elementsetHide"
       :drop-col="dropCol"
@@ -600,9 +602,9 @@
       },
       tagShow(data, id, type) {
         if (data === 'showAdd') {
-          //this.addUnitShow = true;
-          this.editUnitShow = true;
-          this.$refs['assetEditUnit'].getAssetData('');
+          this.addUnitShow = true;
+          /*this.editUnitShow = true;
+          this.$refs['assetEditUnit'].getAssetData('');*/
         }
         if (data === 'showEdit') {
           this.editUnitShow = true;