diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index f19e1a403..91f9a9848 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -90,7 +90,7 @@ export default { }else { this.dataList = response.data; } - if (this.dataList.length > 0) { + if (this.dataList.length > 0 && this.$refs.editChart) { this.$refs.editChart.forEach((item) => { item.showLoad();//之后要实现 }); diff --git a/nezha-fronted/src/components/charts/line-chart-block.scss b/nezha-fronted/src/components/charts/line-chart-block.scss index 11b6098f3..a27f7fb39 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.scss +++ b/nezha-fronted/src/components/charts/line-chart-block.scss @@ -93,4 +93,7 @@ border-bottom: 1px solid #dfe7f2; margin-bottom:-20px; } + .pt10{ + padding-top:10px; + } } diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 49971b09f..015483502 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -31,7 +31,7 @@ :before-close="handleClose" @opened="initDialog"> -
+
"+"
"+"{b}"+"
"+"
{c}", }, legend: { type:'scroll', @@ -371,9 +372,6 @@ export default { return `${parseFloat(kbNum.toFixed(2))}K`; } return parseFloat(num.toFixed(2)); - //alert(1); - //return value; - //return this.getNumStr(value); }, }, //boundaryGap:[0,0.2] diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index a72a12ac1..52d0fd9c8 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -89,7 +89,14 @@ const cn = { expert:"Expert", label:"指标标签", addMetric:"添加指标", - expertTip:"请输入表达式" + expertTip:"请输入表达式", + goPanelTip:"是否前去看板,查看创建的图表?", + previewChart:"预览图表", + singleChartShow:"单图展示", + multiChartsShow:"多图展示", + createPanel:"创建面板", + selectPanel:"选择已有面板", + saveChartToPanel:"保存图表到看板" }, metricPreview:{ title:'指标预览', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 8e9d3ff10..ca77113b4 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -98,11 +98,17 @@ const en = { expert:"Expert", label:"MetricLabel", addMetric:"Create Metric", - expertTip:"Please enter an expression" - + expertTip:"Please enter an expression", + goPanelTip:"Go to the panel to view the created chart ?", + previewChart:"Preview Chart", + singleChartShow:"Single Graph Display", + multiChartsShow:"Multi Graph Display", + createPanel:"Create Panel", + selectPanel:"Select Panel", + saveChartToPanel:"Save Chart To Panel" }, metricPreview:{ - title:'MetricPreview', + title:'Metric Preview', }, refresh:'refresh', edit:'edit', diff --git a/nezha-fronted/src/components/common/popBox/cabinetConfig.vue b/nezha-fronted/src/components/common/popBox/cabinetConfig.vue index 28d88e6f3..6c7ae7607 100644 --- a/nezha-fronted/src/components/common/popBox/cabinetConfig.vue +++ b/nezha-fronted/src/components/common/popBox/cabinetConfig.vue @@ -1,5 +1,5 @@