From b0660c8df9a076ed81200a0610afe2acb9e7d6c1 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Mon, 25 May 2020 18:47:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dasset=20detail=20?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=88=A0=E9=99=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/charts/chart-asset-info.vue         |  2 +-
 .../src/components/common/bottomBox/tabs/panelTab.vue  | 10 +++++-----
 .../src/components/common/rightBox/assetBox.vue        |  6 +++---
 .../src/components/page/dashboard/chartBox.vue         |  4 +---
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-asset-info.vue b/nezha-fronted/src/components/charts/chart-asset-info.vue
index 61f05d291..4e34a1a01 100644
--- a/nezha-fronted/src/components/charts/chart-asset-info.vue
+++ b/nezha-fronted/src/components/charts/chart-asset-info.vue
@@ -180,7 +180,7 @@
       },
       replaceSplit(key){
         if(key){
-          return key.replace('$_$',' ')
+          return key.replace(/\$_\$/g,' ')
         }
       },
       dragResize:function(e){
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
index 0faaeb6ae..08b47a1f3 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
@@ -202,7 +202,7 @@
     methods: {
       //刷新
       Refresh() {
-        this.getTableData();
+        this.getTableData(this.obj.id);
       },
       refreshTime(st, et) {
         const startTime = bus.timeFormate(st, 'yyyy-MM-dd hh:mm');
@@ -210,7 +210,7 @@
         this.searchTime = [startTime, endTime];
       },
       panelReloadForDel: function () {
-        this.getTableData();
+        this.getTableData(this.obj.id);
       },
       /*图表相关操作--start*/
       toAddChart: function () {
@@ -269,7 +269,7 @@
                   break;
                 }
               }
-              this.getTableData(); //删除相关图表后，刷新面板数据
+              this.getTableData(this.obj.id); //删除相关图表后，刷新面板数据
             } else {
               console.error(response.msg);
               this.$message.error(response.msg);
@@ -376,11 +376,11 @@
       },
       pageNo(val) {
         this.pageObj.pageNo = val;
-        this.getTableData();
+        this.getTableData(this.obj.id);
       },
       pageSize(val) {
         this.pageObj.pageSize = val;
-        this.getTableData();
+        this.getTableData(this.obj.id);
       },
       search:function(){
         if(this.$refs.chartList){
diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue
index 77c4b13fd..55ab0252f 100644
--- a/nezha-fronted/src/components/common/rightBox/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue
@@ -907,9 +907,9 @@
               if (this.pageObj.id) {
                 this.assetData.id=this.pageObj.id;
                 let reqData = JSON.parse(JSON.stringify(this.assetData));
-                if (reqData.modelId) {
-                  reqData.modelId = reqData.modelId.join(',').split(',')[1];
-                }
+                // if (reqData.modelId) {
+                //   reqData.modelId = reqData.modelId.join(',').split(',')[1];
+                // }
                 this.$put('asset', reqData).then(res => {
                   const h = this.$createElement;
                   if (res.code === 200) {
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index 39989e417..03a50c726 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -361,9 +361,7 @@
       'chart-preview':chartPreview,
     },
     mounted() {
-      this.$nextTick(()=>{
-        console.log(!this.isUrl && !this.isSingleStat)
-      })
+
     },
     methods: {
       show(show) {