diff --git a/nezha-fronted/src/components/chart/chart/chartBar.vue b/nezha-fronted/src/components/chart/chart/chartBar.vue index 4a3ebae64..8053f560f 100644 --- a/nezha-fronted/src/components/chart/chart/chartBar.vue +++ b/nezha-fronted/src/components/chart/chart/chartBar.vue @@ -87,7 +87,6 @@ export default { chartOption.axisLabel = { margin: 8, formatter (params) { - console.log(document.getElementById('chart-canvas-' + self.chartInfo.id)) const dataLength = chartOption.series.data.length || 1 const chartWidth = (document.getElementById('chart-canvas-' + self.chartInfo.id).offsetWidth - 80) / dataLength// 容器宽 - padding - 空余 const length = Math.ceil((chartWidth) / 16) diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index 36109da01..5a7ccfe0a 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -136,11 +136,11 @@ export default { this.noData = !n || n.length < 1 this.copyDataList = n.map(item => { let param = item.param - try { - param = JSON.parse(item.param) - } catch (e) { - console.info(e) - } + // try { + // param = JSON.parse(item.param) + // } catch (e) { + // console.info(e) + // } param.showHeader = true return { ...item, diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue index 31009c4da..c84409661 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue @@ -513,6 +513,7 @@ size="small" v-model.number="item.value" placeholder="value" + @change="change" > @@ -551,6 +554,7 @@ size="small" v-model="item.regx" placeholder="regx" + @change="change" > @@ -559,7 +563,7 @@
Display
- + @@ -605,7 +609,7 @@
Title
- +
Unit
@@ -624,7 +628,7 @@
Display
- + diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue index fce4848b9..cc6cda34f 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue @@ -67,7 +67,7 @@ class="form-item--half-width" prop="param.limit" > - + @@ -258,6 +258,7 @@ size="small" v-model.number="item.value" placeholder="value" + @change="change" > @@ -304,7 +308,7 @@
Display
- + @@ -350,7 +354,7 @@
Title
- +
Unit
@@ -369,7 +373,7 @@
Display
- + diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 6a43637d9..c0e392640 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -399,7 +399,6 @@ export default { this.chart.panelId = this.showPanel.id this.chart.panelName = this.showPanel.name this.chart.param = JSON.parse(this.chart.param) - this.chart.datasource = 'metrics' if (!this.chart.groupId || this.chart.groupId == -1) { this.chart.groupId = '' } @@ -502,7 +501,7 @@ export default { this.$get('visual/panel/chart?panelId=' + params.panelId + '&groupId=0' + '&pageSize=-1').then(response => { if (response.code === 200) { this.chartListLoading = false - this.dataList = chartData.data.list.map(item => { + this.dataList = response.data.list.map(item => { return { ...item, hide: item.name.indexOf(this.filter.searchName) === -1, // 搜索条件