feat:新增功能

1.panel创建图表时metric相关下拉框增加搜索功能
fix:修改BUG
1.panel图表展示network error异常捕获处理
This commit is contained in:
hanyuxia
2020-01-13 09:07:35 +08:00
parent 898eee2340
commit da8a573b30
3 changed files with 14 additions and 3 deletions

View File

@@ -228,6 +228,12 @@ export default {
} }
}); });
} }
}else{
if(response.msg){
this.$message.error(response.msg);
}else {
this.$message.error(response);
}
} }
}); });
// chartData, seriesItem, panelsId, filter // chartData, seriesItem, panelsId, filter
@@ -253,7 +259,7 @@ export default {
} }
}).catch((error) => { }).catch((error) => {
if (error) { if (error) {
this.$message.warning({ this.$message.error({
content: this.$t("tip.refreshLater"),//'Please refesh later',//请稍后刷新 content: this.$t("tip.refreshLater"),//'Please refesh later',//请稍后刷新
duration: 3, duration: 3,
}); });

View File

@@ -96,7 +96,7 @@
<el-row v-if="tableShow == 1"> <el-row v-if="tableShow == 1">
<el-col span="22"> <el-col span="22">
<el-form-item :label-width="80" prop="metric" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur' }"><!--:rules="{ required: true, type: 'string', message: '', trigger: 'change' }"--> <el-form-item :label-width="80" prop="metric" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur' }"><!--:rules="{ required: true, type: 'string', message: '', trigger: 'change' }"-->
<el-select ref="metricSelect" placeholder="" popper-class="" size="small" v-model="elementInfo.metric" @change="selectMetric"> <el-select ref="metricSelect" filterable placeholder="" popper-class="" size="small" v-model="elementInfo.metric" @change="selectMetric">
<el-option v-for="(item, index) in metricShowList.arr" :key="item.metric + index" <el-option v-for="(item, index) in metricShowList.arr" :key="item.metric + index"
:value="item.metric">{{item.metric}}</el-option> :value="item.metric">{{item.metric}}</el-option>
</el-select> </el-select>
@@ -133,6 +133,7 @@
<el-select v-model="item.value" ref="tagSelect" size="small" <el-select v-model="item.value" ref="tagSelect" size="small"
placeholder="" placeholder=""
collapse-tags collapse-tags
filterable
multiple> multiple>
<el-option v-for="(op, j) in elementInfo.selectedTagList[index].list" :key="op + j" :value="op">{{op}}</el-option> <el-option v-for="(op, j) in elementInfo.selectedTagList[index].list" :key="op + j" :value="op">{{op}}</el-option>
</el-select> </el-select>

View File

@@ -42,7 +42,11 @@ export function get(url, params) {
}).then(response => { }).then(response => {
resolve(response.data) resolve(response.data)
}).catch(err => { }).catch(err => {
//resolve(err.response.data) if(err.response){
resolve(err.response.data);
}else if(err.message){
resolve(err.message);
}
}) })
}) })
} }