diff --git a/src/views/charts/PanelChart.vue b/src/views/charts/PanelChart.vue index 71b6fced..38614e9a 100644 --- a/src/views/charts/PanelChart.vue +++ b/src/views/charts/PanelChart.vue @@ -191,7 +191,6 @@ export default { const requestUrl = url || (chartParams && chartParams.url) if (requestUrl) { get(replaceUrlPlaceholder(requestUrl, this.queryParams)).then(response => { - 1 // if (this.chartInfo.type === 23 && testData) { // response = testData.data // } else if (this.chartInfo.type === 24 && testData) { diff --git a/src/views/charts/charts/ChartEchartWithTable.vue b/src/views/charts/charts/ChartEchartWithTable.vue index d420c237..d2c6531b 100644 --- a/src/views/charts/charts/ChartEchartWithTable.vue +++ b/src/views/charts/charts/ChartEchartWithTable.vue @@ -47,7 +47,7 @@ export default { }, methods: { handleQueryParams (queryParams) { - return this.timeFilter = { + this.timeFilter = { startTime: Number(queryParams.startTime) * 1000, endTime: Number(queryParams.endTime) * 1000 } @@ -126,7 +126,7 @@ export default { self.loadPieTableData(this.allSelectPieChartName) } else { // 否则查询当前name数据 self.selectPieChartName = echartParams.name - self.loadPieTableData(echartParams.name) + self.loadPieTableData(echartParams.data.data.appRisk || echartParams.name) } }) }, diff --git a/src/views/charts/charts/ChartMap.vue b/src/views/charts/charts/ChartMap.vue index 755232e0..0c8eeef2 100644 --- a/src/views/charts/charts/ChartMap.vue +++ b/src/views/charts/charts/ChartMap.vue @@ -110,7 +110,7 @@ export default { ...r, showValue: (r.value || r.value === 0) ? valueToRangeValue(r.value, chartParams.unitType).join(' ') : '' })) - polygonSeries.data = [...seriesData] + !this.$_.isEmpty(seriesData) && (polygonSeries.data = [...seriesData]) const sorted = seriesData.sort((a, b) => b.value - a.value) const allZero = this.$_.isEmpty(sorted) || Number(sorted[0].value) === 0 // 数据全为0的情况,legend只显示1个颜色 diff --git a/src/views/detections/Index.vue b/src/views/detections/Index.vue index 20c32479..6aa60f8f 100644 --- a/src/views/detections/Index.vue +++ b/src/views/detections/Index.vue @@ -85,7 +85,7 @@ import { defaultPageSize, detectionPageType } from '@/utils/constants' import { getNowTime, getSecond } from '@/utils/date-util' import { ref } from 'vue' import * as echarts from 'echarts' -import { multipleBarOption, pieForSeverity, activeAttackBar, getAttackColor, getSeverityColor,getSeriesIndex } from '@/views/detections/options/detectionOptions' +import { multipleBarOption, pieForSeverity, activeAttackBar, getAttackColor, getSeverityColor, getSeriesIndex } from '@/views/detections/options/detectionOptions' import { api, getData } from '@/utils/api' import { useRoute } from 'vue-router' @@ -201,21 +201,21 @@ export default { getData(api.detection[this.pageType].eventSeverityTrend, params).then(data => { data = [ { - legend: "critical", - values: [[1435781430781, "5"], [1435781431781, "3"],[1435781432781, "5"], [1435781433781, "3"]] + legend: 'critical', + values: [[1435781430781, '5'], [1435781431781, '3'], [1435781432781, '5'], [1435781433781, '3']] }, { - legend: "high", - values: [[1435781430781, "2"], [1435781431781, "3"],[1435781432781, "6"], [1435781433781, "4"]] + legend: 'high', + values: [[1435781430781, '2'], [1435781431781, '3'], [1435781432781, '6'], [1435781433781, '4']] }, { - legend: "medium", - values: [[1435781430781, "4"], [1435781431781, "1"],[1435781432781, "5"], [1435781433781, "3"]] + legend: 'medium', + values: [[1435781430781, '4'], [1435781431781, '1'], [1435781432781, '5'], [1435781433781, '3']] }, { - legend: "low", - values: [[1435781430781, "1"], [1435781431781, "4"],[1435781432781, "1"], [1435781433781, "3"]] + legend: 'low', + values: [[1435781430781, '1'], [1435781431781, '4'], [1435781432781, '1'], [1435781433781, '3']] }, { - legend: "info", - values: [[1435781430781, "5"], [1435781431781, "7"],[1435781432781, "5"], [1435781433781, "8"]] + legend: 'info', + values: [[1435781430781, '5'], [1435781431781, '7'], [1435781432781, '5'], [1435781433781, '8']] } ] const chartDom = document.getElementById(`eventSeverityTrendBar${this.pageType}`) diff --git a/src/views/detections/options/detectionOptions.js b/src/views/detections/options/detectionOptions.js index 3468b453..bd2ae5f6 100644 --- a/src/views/detections/options/detectionOptions.js +++ b/src/views/detections/options/detectionOptions.js @@ -9,7 +9,7 @@ const severitySeriesIndexMappings = [ { value: 'critical', index: '0' }, { value: 'high', index: '1' }, { value: 'medium', index: '2' }, - { value: 'low', index: '3'}, + { value: 'low', index: '3' }, { value: 'info', index: '4' } ] diff --git a/src/views/entityExplorer/entityList/detailOverview/App.vue b/src/views/entityExplorer/entityList/detailOverview/App.vue index b341b800..d8486f05 100644 --- a/src/views/entityExplorer/entityList/detailOverview/App.vue +++ b/src/views/entityExplorer/entityList/detailOverview/App.vue @@ -171,7 +171,7 @@ :chart-info="chart" :chart-data="chartData" :entity="entityCopy" - :query-params="getQueryParams" + :query-params="queryParams" :hide-header="true" @getCurrentTimeRange="getCurrentTimeRange" > @@ -281,7 +281,7 @@ export default { } }, watch: { - 'entityData.appName': { + entityData: { immediate: true, deep: true, handler (n) { @@ -290,6 +290,7 @@ export default { this.singleValues.chartDatas.splice(1, 1, this.$_.get(n, 'httpResponseLatency')) this.singleValues.chartDatas.splice(2, 1, this.$_.get(n, 'sslConLatency')) this.singleValues.chartDatas.splice(3, 1, this.$_.get(n, 'sequenceGapLossPercent')) + this.singleValues.chartDatas.splice(4, 1, this.$_.get(n, 'pktRetransPercent')) this.$nextTick(() => { this.getRelatedServerDataOne(this.relatedServerDomainUrl) this.getRelatedServerDataTow(this.relatedServerIpUrl) @@ -299,6 +300,7 @@ export default { } }, mounted () { + this.queryParams = this.getQueryParams() this.$nextTick(() => { setTimeout(() => { this.chartGetMap() diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue index 2dff081a..e54237b5 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue @@ -179,7 +179,7 @@ :chart-info="chart" :chart-data="chartData" :entity="entityCopy" - :query-params="getQueryParams" + :query-params="queryParams" :hide-header="true" @getCurrentTimeRange="getCurrentTimeRange" > @@ -288,7 +288,7 @@ export default { } }, watch: { - 'entityData.domainName': { + entityData: { immediate: true, deep: true, handler (n) { @@ -307,6 +307,7 @@ export default { } }, mounted () { + this.queryParams = this.getQueryParams() this.$nextTick(() => { setTimeout(() => { this.chartGetMap() diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue index 484cd5c6..06c18516 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue @@ -163,7 +163,7 @@ :chart-info="chart" :chart-data="chartData" :entity="entityCopy" - :query-params="getQueryParams" + :query-params="queryParams" :hide-header="true" @getCurrentTimeRange="getCurrentTimeRange" > @@ -275,7 +275,7 @@ export default { } }, watch: { - 'entityData.ipAddr': { + entityData: { deep: true, handler (n) { if (n) { @@ -293,6 +293,7 @@ export default { } }, mounted () { + this.queryParams = this.getQueryParams() this.$nextTick(() => { setTimeout(() => { this.chartGetMap() diff --git a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js index 459236bf..78512b6a 100644 --- a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js +++ b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js @@ -23,7 +23,8 @@ export default { chartOption: null, sentChart: null, receivedChart: null - } + }, + queryParams: {} } }, computed: {