fix: 解决冲突
This commit is contained in:
@@ -87,10 +87,12 @@ export default {
|
||||
const lineMetric = ref(query.lineMetric || 'Bits/s')
|
||||
const lineRefer = ref(query.lineRefer || 'Average')
|
||||
const lineTab = ref(query.lineTab || '')
|
||||
const queryCondition = ref(query.queryCondition || '')
|
||||
return {
|
||||
lineMetric,
|
||||
lineRefer,
|
||||
lineTab,
|
||||
queryCondition,
|
||||
myChart: shallowRef(null)
|
||||
}
|
||||
},
|
||||
@@ -169,6 +171,13 @@ export default {
|
||||
})
|
||||
overwriteUrl(newUrl)
|
||||
},
|
||||
queryCondition (n) {
|
||||
const { query } = this.$route
|
||||
const newUrl = urlParamsHandler(window.location.href, query, {
|
||||
queryCondition: n
|
||||
})
|
||||
overwriteUrl(newUrl)
|
||||
},
|
||||
timeFilter: {
|
||||
deep: true,
|
||||
handler (n) {
|
||||
@@ -189,9 +198,8 @@ export default {
|
||||
startTime: getSecond(this.timeFilter.startTime),
|
||||
endTime: getSecond(this.timeFilter.endTime)
|
||||
}
|
||||
const condition = this.$store.getters.getQueryCondition
|
||||
if (condition) {
|
||||
params.q = condition
|
||||
if (this.queryCondition) {
|
||||
params.q = this.queryCondition
|
||||
}
|
||||
this.toggleLoading(true)
|
||||
get(api.netWorkOverview.totalTrafficAnalysis, params).then((res) => {
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
<template v-slot:empty>
|
||||
<div class="table-no-data" v-show="isNoData">
|
||||
<svg class="icon" aria-hidden="true">
|
||||
<use xlink:href="#cn-icon-a-allclear"></use>
|
||||
<use xlink:href="#cn-icon-good"></use>
|
||||
</svg>
|
||||
<div class="table-no-data__title">{{ $t('npm.thereNoEvents') }}</div>
|
||||
</div>
|
||||
|
||||
@@ -129,7 +129,7 @@ export default {
|
||||
methods: {
|
||||
init (val) {
|
||||
if (!val) {
|
||||
val = 'Bits/s'
|
||||
val = this.metricFilter
|
||||
}
|
||||
let condition = ''
|
||||
if (this.$store.getters.getQueryCondition.indexOf('OR') > -1) {
|
||||
|
||||
Reference in New Issue
Block a user