diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue index aebbad7f..0182bfc5 100644 --- a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue +++ b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue @@ -247,7 +247,7 @@ export default { handleData (prevRequest, request, _t) { this.toggleLoading(true) 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) { this.appData = this.appData.map(t => { return { diff --git a/src/views/detections/Index.vue b/src/views/detections/Index.vue index 3c30171e..257fcb11 100644 --- a/src/views/detections/Index.vue +++ b/src/views/detections/Index.vue @@ -294,7 +294,7 @@ export default { const chartDom = document.getElementById(`eventSeverityTrendBar${this.pageType}`) const eventSeverityTrendOption = this.$_.cloneDeep(multipleBarOption) - const xData = [] + let xData = [] dataMap.forEach(function (value) { // eventSeverityTrendOption.series[Number(getSeriesIndex(key))].data = value.map(v => Number(v[1])) 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 => { const seriesData = [] xData.forEach(item => {