gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:asset 添加bug修复

Browse Source
This commit is contained in:
wangwenrui
2020-05-25 14:00:39 +08:00
parent 6fce2c7909
commit d6f34421c4
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nezha-fronted/src/components/charts/chart-list.vue
View File

@@ -1103,16 +1103,20 @@ export default {
} }
}, },
getAssetInfoChartData(chartInfo){ 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=>{ this.$get('/asset/info?id='+this.additionalInfo.id).then(response=>{
if(response.code == 200){ if(response.code == 200){
let data=response.data; let data=response.data;
this.$refs['editChart'+chartInfo.id][0].setData(chartInfo, data, this.filter.panelId, this.filter); this.$refs['editChart'+chartInfo.id][0].setData(chartInfo, data, this.filter.panelId, this.filter);
}else{ }else{
this.$refs['editChart'+chartInfo.id][0].setData(chartInfo, {}, this.filter.panelId, this.filter,reponse.msg); 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) { setSize(size, index) {

5
nezha-fronted/src/components/common/rightBox/assetBox.vue
View File

@@ -98,6 +98,7 @@
<el-cascader <el-cascader
:options="vendorTypeOptionData" :options="vendorTypeOptionData"
:key="isResourceShow" :key="isResourceShow"
:props="{emitPath:false}"
:disabled="this.assetType!=''?false:true" :disabled="this.assetType!=''?false:true"
v-model="assetData.modelId" v-model="assetData.modelId"
clearable clearable
@@ -965,13 +966,13 @@
this.$emit('refreshData', 'true'); this.$emit('refreshData', 'true');
this.sendStateData('close'); this.sendStateData('close');
} else { } else {
this.assetData.modelId = tempModelId; // this.assetData.modelId = tempModelId;
this.$message.error(res.msg); this.$message.error(res.msg);
} }
}); });
} }
} else { } else {
this.assetData.modelId = tempModelId; // this.assetData.modelId = tempModelId;
return false; return false;
} }
}); });