diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue index d571f636d..632162aeb 100644 --- a/nezha-fronted/src/components/charts/chart-alert-list.vue +++ b/nezha-fronted/src/components/charts/chart-alert-list.vue @@ -7,7 +7,7 @@ } + + @@ -139,12 +143,14 @@ import chartDataFormat from './chartDataFormat' import {randomcolor} from '../common/js/radomcolor/randomcolor.js' import timePicker from '../common/timePicker' + import chartAlertList from './chart-alert-list' export default { name: 'chartPreview', components: { 'loading': loading, - 'time-picker':timePicker + 'time-picker':timePicker, + 'chart-alert-list':chartAlertList, }, props: { panelId:Number, @@ -320,9 +326,17 @@ this.dailogWidth = `${containerWidth*(size / 12)}px`; }); }, + getAlertListChartData:function(chartInfo,filterType){ + this.$refs.alertListChart.getAlertList(filterType,true); + this.$refs.loadingPreview.endLoading(); + }, // 获取一个图表具体数据 getChartData() { const chartItem = this.chart; + if(chartItem.type === 'alertList'){ + this.getAlertListChartData(chartItem,null); + return; + } const len = chartItem.elements.length; // 没有数据的设置提示信息暂无数据-针对每一个图 if (len === 0) { diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index b4ae63354..72327a5bd 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -131,7 +131,8 @@ const cn = { label: "面积图" }, url: { - label: "URL" + label: "URL", + staticTip:'双大括号中的内容将会在asset页面被替换', }, singleStat:{ label:"SingleStat" diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 5781e7545..6a3e470e6 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -142,7 +142,8 @@ const en = { label:"Stack Area" }, url:{ - label:"URL" + label:"URL", + staticTip:'The content in the double curly braces will be replaced on the Asset page', }, singleStat:{ label:"SingleStat" diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue index cd4d306ef..a50681322 100644 --- a/nezha-fronted/src/components/page/dashboard/chartBox.vue +++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue @@ -949,6 +949,8 @@ }else{ if((this.chart.type==='line'||this.chart.type==='bar'||this.chart.type==='stackArea')&&data.param){ this.chart.param.threshold=data.param.threshold; + }else{ + this.chart.param.threshold=''; } this.setIsOtherChart(); //this.getSuggestMetric();//获得指标列表 @@ -982,6 +984,8 @@ this.chart.span = 12; this.chart.height = 400+''; this.chart.unit=2; + this.chart.param.url=''; + this.chart.param.threshold=''; this.elements = [1]; this.elementTarget = []; bus.chartAddInfo.metricTarget = [];