From 9ae4453587d7954cce278ced8c8a5e9d60bb6eed Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Thu, 11 Jan 2024 11:42:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dsubscriber=E5=AE=9E?= =?UTF-8?q?=E4=BD=93app=E6=9B=B2=E7=BA=BF=E4=B8=ADapp=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=A4=A7=E4=BA=8E6=E6=97=B6=E6=98=BE=E7=A4=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charts2/charts/entityDetail/lines/App.vue | 25 +++++++++++-------- .../charts2/charts/options/echartOption.js | 2 +- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/views/charts2/charts/entityDetail/lines/App.vue b/src/views/charts2/charts/entityDetail/lines/App.vue index d52ade8d..1d7ea55e 100644 --- a/src/views/charts2/charts/entityDetail/lines/App.vue +++ b/src/views/charts2/charts/entityDetail/lines/App.vue @@ -71,7 +71,14 @@ import chartMixin from '@/views/charts2/chart-mixin' import * as echarts from 'echarts' import { stackedLineWithLegendChartOption } from '@/views/charts2/charts/options/echartOption' import unitConvert, { valueToRangeValue } from '@/utils/unit-convert' -import { unitTypes, chartColor3, chartColor4, metricType, metricOptions } from '@/utils/constants.js' +import { + unitTypes, + chartColor3, + chartColor4, + metricType, + metricOptions, + chartColorForBehaviorPattern +} from '@/utils/constants.js' import { ref, shallowRef } from 'vue' import { stackedLineWithLegendTooltipFormatter } from '@/views/charts/charts/tools' import _ from 'lodash' @@ -205,7 +212,7 @@ export default { axios.get(`${api.entity.throughput}/${this.entity.entityType}/relate/app`, { params: params }).then(response => { const res = response.data if (response.status === 200) { - this.chartDateObject = res.data.result + this.chartDateObject = res.data.result.slice(0, 10) this.isNoData = res.data.result.length === 0 this.showError = false if (!active) { @@ -215,7 +222,7 @@ export default { this.lineTab = '' this.tabs = _.cloneDeep(this.tabsTemplate) } else { - this.initData(res.data.result, newVal, active) + this.initData(res.data.result.slice(0, 10), newVal, active) } } else { this.httpError(res) @@ -269,9 +276,7 @@ export default { }, emphasis: { itemStyle: { - borderColor: chartColor4[i], - borderWidth: 2, - shadowColor: chartColor4[i] + borderWidth: 2 } }, areaStyle: { @@ -279,23 +284,23 @@ export default { color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ { offset: 0, - color: chartColor3[i] + color: chartColorForBehaviorPattern[i] }, { offset: 1, - color: chartColor3[i] + color: chartColorForBehaviorPattern[i] } ]) }, data: t.values.map(v => [Number(v[0]) * 1000, Number(v[1]), 'number']) } }) - + this.chartOption.legend.data = echartsData.map(t => t.name).reverse() this.chartOption.tooltip.formatter = (params) => { params.forEach(t => { echartsData.forEach((e, i) => { if (e.name === t.seriesName) { - t.borderColor = chartColor3[i] + t.borderColor = chartColorForBehaviorPattern[i] } }) }) diff --git a/src/views/charts2/charts/options/echartOption.js b/src/views/charts2/charts/options/echartOption.js index 0f03d459..6af6701c 100644 --- a/src/views/charts2/charts/options/echartOption.js +++ b/src/views/charts2/charts/options/echartOption.js @@ -327,7 +327,7 @@ export const stackedLineChartOption = { } // subscriber的app页签 export const stackedLineWithLegendChartOption = { - color: chartColor3, + color: chartColorForBehaviorPattern, tooltip: { trigger: 'axis', className: 'echarts-tooltip echarts-tooltip-dark'