From 74ee237ab0bb4162691f4f8e21bae46ac5811a69 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 18 May 2021 10:12:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20asset=20chart?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=94=99=E4=B9=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=E4=BB=A5=E5=8F=8A=20asset=20chart=20=E5=AF=BC=E5=87=BA=20?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=94=99=E4=B9=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/tabs/panelTabNew.vue  | 8 ++++----
 .../src/components/common/popBox/topToolMoreOptions.vue   | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index 22b77699e..ec2d29a91 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -10,7 +10,7 @@
     >
       <template v-slot:title><span :title="obj.name">{{obj.name}}</span></template>
       <template v-slot:top-tool-right>
-        <span v-if="from === fromRoute.asset">
+        <div v-if="from === fromRoute.asset" style="display: flex" >
           <div class="top-tool-search margin-r-20">
           <el-input id="queryPanel" ref="queryPanel" v-model="filter.searchName" class="query-input-inactive"  clearable size="small" @blur="blurInput" @clear="clearInput" @focus="focusInput">
             <i slot="suffix" class="el-input__icon nz-icon nz-icon-search" style="float: right" @click="focusInput"></i>
@@ -50,11 +50,11 @@
             @panelLockChange="panelLockChange"
           >
           </top-tool-more-options>
-        </span>
-        <span v-else> <button  @click="panelLock=!panelLock" id="panel-lock"  :title='panelLock ? $t("overall.locked") : $t("overall.unlocked")' class="top-tool-btn margin-r-10"
+        </div>
+        <div v-else> <button  @click="panelLock=!panelLock" id="panel-lock"  :title='panelLock ? $t("overall.locked") : $t("overall.unlocked")' class="top-tool-btn margin-r-10"
                                type="button">
           <i :class="{'nz-icon nz-icon-lock':panelLock,'nz-icon nz-icon-unlock':!panelLock}"></i>
-        </button></span>
+        </button></div>
       </template>
       <template v-slot>
         <div class="panel">
diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
index 2d2f80ccd..653684db7 100644
--- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
+++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
@@ -248,7 +248,7 @@ export default {
       return jsonData.map(v => filterVal.map(j => v[j]))
     },
     exportCur () {
-      const params = Object.assign({}, this.params)
+      const params = JSON.parse(JSON.stringify(this.params))
       if (this.exportUrl.indexOf('panel') > -1) {
         params.pageSize = -1
         delete params.start_time
@@ -284,6 +284,10 @@ export default {
       if (this.paramsType) {
         params.type = this.paramsType
       }
+      if (params.from == 'asset') {
+        delete params.type
+        delete params.from
+      }
       axios.get(url, { responseType: 'blob', params: params }).then(res => {
         if (window.navigator.msSaveOrOpenBlob) {
           // 兼容ie11