CN-811 feat: networkoverview下钻第三级菜单折线图请求参数调整

This commit is contained in:
changcode
2022-11-23 16:51:38 +08:00
parent ae4ce44eff
commit 16a255be50
2 changed files with 22 additions and 4 deletions

View File

@@ -601,7 +601,9 @@ export default {
this.urlChangeParams[this.curTabState.tabOperationBeforeType] = this.getUrlParam(this.curTabState.tabOperationType, '', true) this.urlChangeParams[this.curTabState.tabOperationBeforeType] = this.getUrlParam(this.curTabState.tabOperationType, '', true)
this.urlChangeParams[this.curTabState.tabOperationType] = opeType this.urlChangeParams[this.curTabState.tabOperationType] = opeType
if (opeType === 3) { if (opeType === 3) {
this.urlChangeParams.queryCondition = '' if (route !== '/panel/networkOverview') {
this.urlChangeParams.queryCondition = ''
}
} }
} else { } else {
this.urlChangeParams[this.curTabState.tabOperationType] = operationType.mainMenu this.urlChangeParams[this.curTabState.tabOperationType] = operationType.mainMenu

View File

@@ -88,10 +88,14 @@ export default {
const lineRefer = ref(query.lineRefer || 'Average') const lineRefer = ref(query.lineRefer || 'Average')
const lineTab = ref(query.lineTab || '') const lineTab = ref(query.lineTab || '')
const queryCondition = ref(query.queryCondition || '') const queryCondition = ref(query.queryCondition || '')
const tabOperationType = ref(query.tabOperationType)
const networkOverviewBeforeTab = ref(query.networkOverviewBeforeTab)
return { return {
lineRefer, lineRefer,
lineTab, lineTab,
queryCondition, queryCondition,
tabOperationType,
networkOverviewBeforeTab,
myChart: shallowRef(null) myChart: shallowRef(null)
} }
}, },
@@ -182,10 +186,22 @@ export default {
startTime: getSecond(this.timeFilter.startTime), startTime: getSecond(this.timeFilter.startTime),
endTime: getSecond(this.timeFilter.endTime) endTime: getSecond(this.timeFilter.endTime)
} }
// const condition = this.$store.getters.getQueryCondition let condition = ''
// const condition = this.$route.query.queryCondition ? this.$route.query.queryCondition : '' if (this.queryCondition && this.tabOperationType !== '3') {
if (this.queryCondition) {
params.q = this.queryCondition 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) this.toggleLoading(true)