diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue index caec6129..5a5f8375 100644 --- a/src/components/layout/Header.vue +++ b/src/components/layout/Header.vue @@ -546,7 +546,9 @@ export default { this.urlChangeParams[this.curTabState.tabOperationBeforeType] = this.getUrlParam(this.curTabState.tabOperationType, '', true) this.urlChangeParams[this.curTabState.tabOperationType] = opeType if (opeType === 3) { - this.urlChangeParams.queryCondition = '' + if (route !== '/panel/networkOverview') { + this.urlChangeParams.queryCondition = '' + } } } else { this.urlChangeParams[this.curTabState.tabOperationType] = operationType.mainMenu diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue index 1a073290..d5ec7766 100644 --- a/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue +++ b/src/views/charts2/charts/networkOverview/NetworkOverviewLine.vue @@ -81,10 +81,14 @@ export default { const lineRefer = ref(query.lineRefer || 'Average') const lineTab = ref(query.lineTab || '') const queryCondition = ref(query.queryCondition || '') + const tabOperationType = ref(query.tabOperationType) + const networkOverviewBeforeTab = ref(query.networkOverviewBeforeTab) return { lineRefer, lineTab, queryCondition, + tabOperationType, + networkOverviewBeforeTab, myChart: shallowRef(null) } }, @@ -171,10 +175,22 @@ export default { startTime: getSecond(this.timeFilter.startTime), endTime: getSecond(this.timeFilter.endTime) } - // const condition = this.$store.getters.getQueryCondition - // const condition = this.$route.query.queryCondition ? this.$route.query.queryCondition : '' - if (this.queryCondition) { + let condition = '' + if (this.queryCondition && this.tabOperationType !== '3') { params.q = this.queryCondition + } else if (this.tabOperationType == '3' && this.queryCondition) { + if (this.queryCondition.indexOf(' OR ') > -1) { + if (this.networkOverviewBeforeTab === 'isp') { + condition = this.queryCondition.split(/["|'= ](.*?)["|'= ]/) + params.q = `notEmpty(${condition[0]}) OR notEmpty(${condition[9]})` + } else { + condition = this.queryCondition.split(/["|'= ](.*?)["|'= ]/) + params.q = `notEmpty(${condition[0]}) OR notEmpty(${condition[5]})` + } + } else { + condition = this.queryCondition.split(/['=](.*?)['=]/) + params.q = `notEmpty(${condition[0]})` + } } this.toggleLoading(true) get(api.netWorkOverview.totalTrafficAnalysis, params).then((res) => {