From b02d6adac6c8815981ee81f9ea2910418db66d2b Mon Sep 17 00:00:00 2001 From: hyx Date: Thu, 10 Mar 2022 13:54:09 +0800 Subject: [PATCH] =?UTF-8?q?CN-365=20Detection--=E6=9C=8D=E5=8A=A1=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E4=BA=8B=E4=BB=B6=E9=A1=B6=E9=83=A8=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E4=B8=8D=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/detections/Index.vue | 37 ++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/src/views/detections/Index.vue b/src/views/detections/Index.vue index 28bf6705..c2c0f5e8 100644 --- a/src/views/detections/Index.vue +++ b/src/views/detections/Index.vue @@ -334,19 +334,48 @@ export default { data.forEach(item => { if (item.eventSeverity) { if (!dataMap.has(item.eventSeverity)) { - const count = [[item.statTime, item.count]] + const count = [[rTime(item.statTime), item.count]] dataMap.set(item.eventSeverity, count) } else { - dataMap.get(item.eventSeverity).push([item.statTime, item.count]) + dataMap.get(item.eventSeverity).push([rTime(item.statTime), item.count]) } } }) + const chartDom = document.getElementById(`eventSeverityTrendBar${this.pageType}`) const eventSeverityTrendOption = this.$_.cloneDeep(multipleBarOption) + + let xData = [] dataMap.forEach(function (value, key) { - eventSeverityTrendOption.series[Number(getSeriesIndex(key))].data = value.map(v => Number(v[1])) + //eventSeverityTrendOption.series[Number(getSeriesIndex(key))].data = value.map(v => Number(v[1])) + value.forEach(item => { + if(xData.indexOf(item[0]) < 0){ + xData.push(item[0]) + } + }) }) - eventSeverityTrendOption.xAxis.data = dataMap.get('critical').map(v => rTime(v[0])) + eventSeverityTrendOption.series.forEach(serie => { + let seriesData = [] + xData.forEach(item => { + if(dataMap.has(serie.name)){ + let hasX = dataMap.get(serie.name).some(function(v) { + if (item == v[0]) { + seriesData.push(Number(v[1])) + return true; + } + }) + if(!hasX){ + seriesData.push(0) + } + }else { + seriesData.push(0) + } + }) + serie.data = seriesData + }) + + //eventSeverityTrendOption.xAxis.data = dataMap.get('info').map(v => rTime(v[0])) + eventSeverityTrendOption.xAxis.data = xData const detectionChart = echarts.init(chartDom) detectionChart.setOption(eventSeverityTrendOption) // this.isEventSeverityNoData = false