Merge branch 'cherry-pick-16a255be' into 'dev-22.10'

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

See merge request cyber-narrator/cn-ui!6

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

src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue

@@ -5,7 +5,7 @@
     </div>
 
     <div class="app-cards">
-      <div class="app-card" @mouseenter="mouseenter(app)" @mouseleave="mouseleave(app)" v-for="(app, index) in appData" :key="index">
+      <div class="app-card" @mouseenter="mouseenter(app)" @mouseleave="mouseleave(app)" v-for="(app, index) in appData" :key="app.type + app.name">
         <div class="app-card-title">
           <div class="app-card-title-name">
             <i class="cn-icon" :class="app.type === 'provider' ? 'cn-icon-entity' : 'cn-icon-app2'"></i>
@@ -461,7 +461,7 @@ export default {
       } else {
         params.pageNo = 1
       }
-      if (this.appTypeTab === 0) {
+      if (parseFloat(this.appTypeTab) === 0) {
         params.type = 'overviewProvide'
         get(api.dict, params).then(res => {
           if (res.code === 200) {
@@ -486,7 +486,7 @@ export default {
           this.loading = false
           this.loadingBody = false
         })
-      } else if (this.appTypeTab === 1) {
+      } else if (parseFloat(this.appTypeTab) === 1) {
         params.type = 'overviewApp'
         get(api.dict, params).then(res => {
           res.data.list = res.data.list.filter(l => !this.appData.some(pd => pd.type === 'app' && pd.name === l.value))

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
+      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
+      } 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) => {

src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue

@@ -169,7 +169,7 @@
               </li>
             </transition-group>
           </el-tab-pane>
-          <el-tab-pane :label="$t('network.direction')" name="metrics" width="50%" >
+          <el-tab-pane :label="tableType==='networkOverview'?$t('network.direction'):$t('network.metrics')" name="metrics" width="50%" >
             <transition-group name="dragMetric" class="list" tag="ul" ref="metric">
               <template v-for="(item, index) in customTableTitles"  :key="item.label">
                 <li v-if="index>0"