From 1afdff8de1441a1cf5f576ac26b294fd2989c19f Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Thu, 2 Sep 2021 14:43:06 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-963=20chart=20=E9=BC=A0=E6=A0=87=E7=A7=BB?= =?UTF-8?q?=E5=85=A5=E6=82=AC=E6=B5=AE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/charts/chart-alert-list.vue | 10 +++++-- .../charts/chart-bar-statistics.vue | 8 +++++- .../src/components/charts/chart-pie.vue | 8 +++++- .../components/charts/chart-single-stat.vue | 9 +++++-- .../src/components/charts/chart-table.vue | 8 +++++- .../src/components/charts/chart-url.vue | 8 +++++- .../src/components/charts/chart.scss | 13 ++++++++++ .../src/components/charts/diagram-chart.vue | 8 +++++- .../components/charts/line-chart-block.vue | 14 ++++++++-- .../src/components/charts/text-chart.vue | 8 +++++- .../components/common/mixin/chartDataList.js | 26 +++++++++++++++++++ 11 files changed, 108 insertions(+), 12 deletions(-) create mode 100644 nezha-fronted/src/components/common/mixin/chartDataList.js diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue index e2dbe69f6..5e4426f50 100644 --- a/nezha-fronted/src/components/charts/chart-alert-list.vue +++ b/nezha-fronted/src/components/charts/chart-alert-list.vue @@ -23,7 +23,11 @@ - {{chartData?chartData.name:'-'}} + + {{chartData?chartData.name:'-'}} + + {{chartData.name}} + @@ -144,6 +148,7 @@ import axios from 'axios' import pickTime from '../common/pickTime' import chart from '../page/dashboard/overview/chart' import alertMessageTable from '@/components/common/table/alert/alertMessageTable.vue' +import chartDataList from '@/components/common/mixin/chartDataList' export default { name: 'chartTable', components: { @@ -176,6 +181,7 @@ export default { from: { type: String }, isLock: { type: Boolean, default: false } }, + mixins: [chartDataList], data () { return { currentMsg: null, @@ -884,7 +890,7 @@ export default { } this.$set(this.searchLabel, 'orderBy', orderBy) this.getAlertList() - } + }, }, created () { diff --git a/nezha-fronted/src/components/charts/chart-bar-statistics.vue b/nezha-fronted/src/components/charts/chart-bar-statistics.vue index abac0b23f..d01f122d4 100644 --- a/nezha-fronted/src/components/charts/chart-bar-statistics.vue +++ b/nezha-fronted/src/components/charts/chart-bar-statistics.vue @@ -23,7 +23,11 @@ - {{chartData.name}} + + {{chartData.name}} + + {{chartData.name}} + @@ -95,6 +99,7 @@ import { getChart, setChart, getMousePoint } from '../common/js/common' import chartConfig from '../page/dashboard/overview/chartConfig' import { randomcolor } from '../common/js/radomcolor/randomcolor' import {formatScientificNotation} from "@/components/common/js/tools"; +import chartDataList from '@/components/common/mixin/chartDataList' export default { name: 'pieChart', // 饼图 或者 柱状图的统计 components: { @@ -121,6 +126,7 @@ export default { from: { type: String }, isLock: { type: Boolean, default: false } }, + mixins: [chartDataList], data () { return { data: {}, // 该图表信息,chartItem diff --git a/nezha-fronted/src/components/charts/chart-pie.vue b/nezha-fronted/src/components/charts/chart-pie.vue index e508da630..55b88d92a 100644 --- a/nezha-fronted/src/components/charts/chart-pie.vue +++ b/nezha-fronted/src/components/charts/chart-pie.vue @@ -23,7 +23,11 @@ - {{chartData.name}} + + {{chartData.name}} + + {{chartData.name}} + @@ -94,6 +98,7 @@ import * as echarts from 'echarts' import { getChart, setChart, getMousePoint } from '../common/js/common' import chartConfig from '../page/dashboard/overview/chartConfig' import { randomcolor } from '../common/js/radomcolor/randomcolor' +import chartDataList from '@/components/common/mixin/chartDataList' export default { name: 'pieChart', components: { @@ -120,6 +125,7 @@ export default { from: { type: String }, isLock: { type: Boolean, default: false } }, + mixins: [chartDataList], data () { return { data: {}, // 该图表信息,chartItem diff --git a/nezha-fronted/src/components/charts/chart-single-stat.vue b/nezha-fronted/src/components/charts/chart-single-stat.vue index 3755d36dc..dd1d3bd9f 100644 --- a/nezha-fronted/src/components/charts/chart-single-stat.vue +++ b/nezha-fronted/src/components/charts/chart-single-stat.vue @@ -23,8 +23,11 @@ - {{chartData.name}} - + {{chartData.name}} + + {{chartData.name}} + + @@ -85,9 +88,11 @@