From d6f34421c4974c6daf04f48ea933e7a5df82b044 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Mon, 25 May 2020 14:00:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:asset=20=E6=B7=BB=E5=8A=A0bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/charts/chart-list.vue      | 22 +++++++++++--------
 .../components/common/rightBox/assetBox.vue   |  5 +++--
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index d5d88cfcb..e8be12cd0 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -1103,16 +1103,20 @@ export default {
       }
     },
     getAssetInfoChartData(chartInfo){
-      this.$refs['editChart'+chartInfo.id][0].showLoad(chartInfo);
+      if(!this.isModel){
+        this.$refs['editChart'+chartInfo.id][0].showLoad(chartInfo);
 
-      this.$get('/asset/info?id='+this.additionalInfo.id).then(response=>{
-        if(response.code == 200){
-          let data=response.data;
-          this.$refs['editChart'+chartInfo.id][0].setData(chartInfo, data, this.filter.panelId, this.filter);
-        }else{
-          this.$refs['editChart'+chartInfo.id][0].setData(chartInfo, {}, this.filter.panelId, this.filter,reponse.msg);
-        }
-      })
+        this.$get('/asset/info?id='+this.additionalInfo.id).then(response=>{
+          if(response.code == 200){
+            let data=response.data;
+            this.$refs['editChart'+chartInfo.id][0].setData(chartInfo, data, this.filter.panelId, this.filter);
+          }else{
+            this.$refs['editChart'+chartInfo.id][0].setData(chartInfo, {}, this.filter.panelId, this.filter,reponse.msg);
+          }
+        })
+      }else{
+        this.$refs['editChart'+chartInfo.id][0].endLoading();
+      }
     },
     // 设置图表的宽度
     setSize(size, index) {
diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue
index a52c051e5..77c4b13fd 100644
--- a/nezha-fronted/src/components/common/rightBox/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue
@@ -98,6 +98,7 @@
               <el-cascader
                 :options="vendorTypeOptionData"
                 :key="isResourceShow"
+                :props="{emitPath:false}"
                 :disabled="this.assetType!=''?false:true"
                 v-model="assetData.modelId"
                 clearable
@@ -965,13 +966,13 @@
                     this.$emit('refreshData', 'true');
                     this.sendStateData('close');
                   } else {
-                    this.assetData.modelId = tempModelId;
+                    // this.assetData.modelId = tempModelId;
                     this.$message.error(res.msg);
                   }
                 });
               }
             } else {
-              this.assetData.modelId = tempModelId;
+              // this.assetData.modelId = tempModelId;
               return false;
             }
           });