gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复detection顶部柱状图数据没有按时间排序的问题，修复app图逻辑问题

Browse Source
This commit is contained in:
chenjinsong
2023-02-10 14:20:07 +08:00
parent 6f8631f947
commit 6ed9c4f5fe
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
View File

@@ -247,7 +247,7 @@ export default {
handleData (prevRequest, request, _t) { handleData (prevRequest, request, _t) {
this.toggleLoading(true) this.toggleLoading(true)
Promise.all([prevRequest, request]).then(res => { Promise.all([prevRequest, request]).then(res => {
this.isNoData = (res[0].data.result.length && res[1].data.result.length) === 0 this.isNoData = res[0].data.result.length === 0 && res[1].data.result.length === 0
if (this.isNoData) { if (this.isNoData) {
this.appData = this.appData.map(t => { this.appData = this.appData.map(t => {
return { return {

5
src/views/detections/Index.vue
View File

@@ -294,7 +294,7 @@ export default {
const chartDom = document.getElementById(`eventSeverityTrendBar${this.pageType}`) const chartDom = document.getElementById(`eventSeverityTrendBar${this.pageType}`)
const eventSeverityTrendOption = this.$_.cloneDeep(multipleBarOption) const eventSeverityTrendOption = this.$_.cloneDeep(multipleBarOption)
const xData = [] let xData = []
dataMap.forEach(function (value) { dataMap.forEach(function (value) {
// 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 => { value.forEach(item => {
@@ -303,6 +303,9 @@ export default {
} }
}) })
}) })
xData = xData.sort((a, b) => {
return new Date(a) - new Date(b)
})
eventSeverityTrendOption.series.forEach(serie => { eventSeverityTrendOption.series.forEach(serie => {
const seriesData = [] const seriesData = []
xData.forEach(item => { xData.forEach(item => {