From 0bf5378baaee29fe942a9cbbfdada9975cdb3aac Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Sat, 28 May 2022 10:59:20 +0800 Subject: [PATCH] =?UTF-8?q?CN-593=20fix:=20=E8=B0=83=E6=95=B4endtime?= =?UTF-8?q?=E7=9A=84=E5=AE=9E=E7=8E=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config.json | 2 +- src/permission.js | 1 - src/utils/constants.js | 3 +- .../entityList/detailOverview/Ip.vue | 6 ++-- .../detailOverview/entityDetailMixin.js | 34 ++++++++----------- 5 files changed, 20 insertions(+), 26 deletions(-) diff --git a/public/config.json b/public/config.json index c852aa67..2fb81cba 100644 --- a/public/config.json +++ b/public/config.json @@ -1 +1 @@ -{"baseUrl": "http://192.168.44.53:8090/", "version": "2.0.2021.05.11.19.43","performanceEndTimeInterval": 86400} \ No newline at end of file +{"baseUrl": "http://192.168.44.53:8090/", "version": "2.0.2021.05.11.19.43"} diff --git a/src/permission.js b/src/permission.js index e05ebeed..d49ce0f7 100644 --- a/src/permission.js +++ b/src/permission.js @@ -20,7 +20,6 @@ router.beforeEach(async (to, from, next) => { if (!axios.defaults.baseURL) { const config = await getConfigJson() axios.defaults.baseURL = config.baseUrl - axios.defaults.performanceEndTimeInterval = config.performanceEndTimeInterval } if (localStorage.getItem(storageKey.token)) { // 加载i18n diff --git a/src/utils/constants.js b/src/utils/constants.js index 6be0a9ac..55b4e4d8 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -25,8 +25,7 @@ export const storageKey = { entitySearchHistory: 'cn-entity-search-history', echartLegendFontSize: 'echartLegendFontSize', echartLabelFontSize: 'echartLabelFontSize', - tokenExpireCurrentPath: 'token-expire-current-path', - performanceEndTimeInterval: 'performance-endTime-interval' + tokenExpireCurrentPath: 'token-expire-current-path' } // 统一定义跳转来源 diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue index 74d5287c..9e94fcaf 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue @@ -180,13 +180,13 @@
{{dateFormatByAppearance(performance.startTime) || '-'}}
-
+
{{performance.eventSeverity}}
{{performance.eventType}}
-
+
-
+
diff --git a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js index 1e0151c8..571d5a5a 100644 --- a/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js +++ b/src/views/entityExplorer/entityList/detailOverview/entityDetailMixin.js @@ -45,7 +45,9 @@ export default { }, metricChart: null, performanceChartList: [], - loadingPerformance: [] + loadingPerformance: [], + + performanceMetricEndTimeInterval: 3600 // 服务质量事件指标的结束时间与开始时间的秒间隔 } }, computed: { @@ -191,18 +193,14 @@ export default { }, queryEntityDetailPerformanceChart (performanceList, startIndex) { if (performanceList && performanceList.length > 0) { - const self = this - const performanceEndTimeInterval = axios.defaults.performanceEndTimeInterval - const allTime = Number(performanceEndTimeInterval || 86401) - performanceList.forEach((item, i) => { const index = startIndex + i this.loadingPerformance[index] = true const startTime = getSecond(item.startTime) - const endTime = getSecond(item.startTime) + allTime + const endTime = getSecond(item.startTime) + this.performanceMetricEndTimeInterval const nowTime = getSecond(new Date()) - this.searchStartTime = startTime - allTime / 2 - this.searchEndTime = _.min([nowTime, endTime + allTime / 2]) + const searchStartTime = startTime - this.performanceMetricEndTimeInterval / 2 + const searchEndTime = _.min([nowTime, endTime + this.performanceMetricEndTimeInterval / 2]) let url if (item.eventType === 'dns error') { url = api.detection.performanceEvent.dnsErrorMetric @@ -214,9 +212,9 @@ export default { if (url) { get(url, { - ...self.getPerformanceQueryParams(), - startTime: self.searchStartTime, - endTime: self.searchEndTime, + ...this.getPerformanceQueryParams(), + startTime: searchStartTime, + endTime: searchEndTime, eventType: item.eventType }).then((response) => { if (response.code === 200) { @@ -224,12 +222,10 @@ export default { this.$nextTick(() => { if (metricDataList && metricDataList.length > 0) { metricDataList.sort(reverseSortBy(0))// 将返回的数据按时间降序排序，方便找到实线和虚线的交点 - // let endIndex = (self.metricList). findIndex ((item) => item[0] <= 1435781434781 ); let endIndex = (metricDataList).findIndex((item) => item[0] <= endTime) endIndex = metricDataList.length - endIndex metricDataList.sort(sortBy(0))// 将返回的数据按时间升序排序，方便找到实线和虚线的交点 - // let startIndex = (self.metricList). findIndex ((item) => item[0] >= 1435781432781 ); const startIndex = metricDataList.findIndex((item) => item[0] >= startTime) const performanceChartOption = _.cloneDeep(metricOption) @@ -238,25 +234,25 @@ export default { performanceChartOption.series[1].data = metricDataList.slice(startIndex - 1, endIndex).map(v => [Number(v[0]) * 1000, Number(v[1]), unitTypes.number]) performanceChartOption.series[2].data = metricDataList.slice(endIndex - 1, metricDataList.length).map(v => [Number(v[0]) * 1000, Number(v[1]), unitTypes.number]) } - const metricChart = markRaw(echarts.init(document.getElementById(`entityPerformanceChart${self.entityName}_${index}`))) + const metricChart = markRaw(echarts.init(document.getElementById(`entityPerformanceChart${this.entityName}_${index}`))) performanceChartOption && metricChart.setOption(performanceChartOption) - self.performanceChartList.push(metricChart) + this.performanceChartList.push(metricChart) this.echartsArray.push(shallowRef(metricChart)) } else { - const chartDom = document.getElementById(`entityPerformanceChart${self.entityName}${index}`) + const chartDom = document.getElementById(`entityPerformanceChart${this.entityName}${index}`) chartDom.innerHTML = '-' } }) } }).catch(error => { - console.log(error) - const chartDom = document.getElementById(`entityPerformanceChart${self.entityName}${index}`) + console.error(error) + const chartDom = document.getElementById(`entityPerformanceChart${this.entityName}${index}`) chartDom.innerHTML = '-' }).finally(() => { setTimeout(() => { try { this.$nextTick(() => { - self.performanceChartList.forEach(item => { + this.performanceChartList.forEach(item => { item && item.resize() }) this.loadingPerformance[index] = false