From 69735e438f7c789b746ae5dd6abe0ffa88979606 Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Mon, 21 Nov 2022 11:28:56 +0800
Subject: [PATCH] =?UTF-8?q?DNS=E7=9A=84qtype=E5=92=8Crcode=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/Header.vue              | 21 +++---
 src/store/modules/panel.js                    | 70 ++++---------------
 src/views/charts2/Panel.vue                   | 11 ++-
 .../networkOverview/NetworkOverviewTabs.vue   | 15 ++--
 4 files changed, 47 insertions(+), 70 deletions(-)

diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue
index 1d6b8984..380f6360 100644
--- a/src/components/layout/Header.vue
+++ b/src/components/layout/Header.vue
@@ -62,10 +62,10 @@
                        :class="showBackground?'breadcrumb-button__active':''">
                     <span id="breadcrumbValue">
                       <template v-if="curTabProp === 'qtype'">
-                        <span>{{ dnsQtypeMapData.get(item) ? dnsQtypeMapData.get(item) : item }}</span>
+                        <span>{{ dnsQtypeMapData.get(item)}}</span>
                       </template>
                       <template v-else-if="curTabProp === 'rcode'">
-                        <span>{{ dnsRcodeMapData.get(item) ? dnsRcodeMapData.get(item) : item }}</span>
+                        <span>{{ dnsRcodeMapData.get(item)}}</span>
                       </template>
                       <template v-else>
                         <span>{{ item }}</span>
@@ -84,10 +84,10 @@
                     <li v-for="item in breadcrumbColumnValueListShow" title='' :key="item" :id="item"
                         class="select-dropdown__item" @click="changeValue(item)" :class="selected?'':''">
                       <template v-if="curTabProp === 'qtype'">
-                        <span>{{ dnsQtypeMapData.get(item) ? dnsQtypeMapData.get(item) : item }}</span>
+                        <span>{{ dnsQtypeMapData.get(item) }}</span>
                       </template>
                       <template v-else-if="curTabProp === 'rcode'">
-                        <span>{{ dnsRcodeMapData.get(item) ? dnsRcodeMapData.get(item) : item }}</span>
+                        <span>{{ dnsRcodeMapData.get(item) }}</span>
                       </template>
                       <template v-else>
                         <span>{{ item }}</span>
@@ -382,8 +382,11 @@ export default {
   },
   async mounted () {
     this.from = Object.keys(this.entityType)[0]
-    this.dnsQtypeMapData = await getDnsMapData('dnsQtype')
-    this.dnsRcodeMapData = await getDnsMapData('dnsRcode')
+    // 是否需要dns的qtype和rcode的数据字典
+    if(this.$route.params.typeName === fromRoute.dnsServiceInsights) {
+      this.dnsQtypeMapData = await getDnsMapData('dnsQtype')
+      this.dnsRcodeMapData = await getDnsMapData('dnsRcode')
+    }
     this.initDropdownList()
   },
   setup () {
@@ -460,8 +463,10 @@ export default {
       get(curTableInCode.url.drilldownList, params).then(async response => {
         if (response.code === 200) {
           this.breadcrumbColumnValueListShow = response.data.result
-          this.dnsQtypeMapData = await getDnsMapData('dnsQtype')
-          this.dnsRcodeMapData = await getDnsMapData('dnsRcode')
+          if(this.from === fromRoute.dnsServiceInsights) {
+            this.dnsQtypeMapData = await getDnsMapData('dnsQtype')
+            this.dnsRcodeMapData = await getDnsMapData('dnsRcode')
+          }
           this.$nextTick(() => {
             this.breadcrumbColumnValueListShow.forEach(item => {
               const selectedDom = document.getElementById(item)
diff --git a/src/store/modules/panel.js b/src/store/modules/panel.js
index c272396e..582291b1 100644
--- a/src/store/modules/panel.js
+++ b/src/store/modules/panel.js
@@ -57,7 +57,9 @@ const panel = {
     routerPath: '', // 当前路由路径
     httpCancel: null, // 终止http请求
     rangeEchartsData: {}, // 框选echarts图表
-    routerHistoryList: [] // 路由跳转记录列表
+    routerHistoryList: [], // 路由跳转记录列表
+    dnsQtypeMapData:[],
+    dnsRcodeMapData:[]
   },
   mutations: {
     setShowRightBox (state, flag) {
@@ -108,36 +110,15 @@ const panel = {
     setCurrentMap (state, currentMap) {
       state.currentMap = currentMap
     },
-    // setPanelName (state, panelName) {
-    // state.panelName = panelName
-    // },
-    // setBreadcrumbColumnName (state, breadcrumbColumnName) {
-    // state.breadcrumbColumnName = breadcrumbColumnName
-    // },
-    // setDimensionType (state, dimensionType) {
-    // state.dimensionType = dimensionType
-    // },
-    // setBreadcrumbColumnValue (state, breadcrumbColumnValue) {
-    // state.breadcrumbColumnValue = breadcrumbColumnValue
-    // },
-    // setNetworkOverviewCurrentTab (state, networkOverviewCurrentTab) {
-    // state.networkOverviewCurrentTab = networkOverviewCurrentTab
-    // },
-    // setQueryCondition (state, queryCondition) {
-    // state.queryCondition = queryCondition
-    // },
+    setDnsQtypeMapData (state, dnsQtypeMapData) {
+      state.dnsQtypeMapData = dnsQtypeMapData
+    },
+    setDnsRcodeMapData (state, dnsRcodeMapData) {
+      state.dnsRcodeMapData = dnsRcodeMapData
+    },
     setNetworkOverviewTabList (state, networkOverviewTabList) {
       state.networkOverviewTabList = networkOverviewTabList
     },
-    // setTabOperationType (state, tabOperationType) {
-    // state.tabOperationType = tabOperationType
-    // },
-    // setNetworkOverviewBeforeTab (state, networkOverviewBeforeTab) {
-    // state.networkOverviewBeforeTab = networkOverviewBeforeTab
-    // },
-    // setTabOperationBeforeType (state, tabOperationBeforeType) {
-    // state.tabOperationBeforeType = tabOperationBeforeType
-    // },
     setNpmLocationCountry (state, country) {
       state.npmLocationCountry = country
     },
@@ -215,36 +196,15 @@ const panel = {
     getCurrentMap (state) {
       return state.currentMap
     },
-    // getPanelName (state) {
-    // return state.panelName
-    // },
-    // getBreadcrumbColumnName (state) {
-    // return state.breadcrumbColumnName
-    // },
-    // getDimensionType (state) {
-    // return state.dimensionType
-    // },
-    // getBreadcrumbColumnValue (state) {
-    // return state.breadcrumbColumnValue
-    // },
-    // getNetworkOverviewCurrentTab (state) {
-    // return state.networkOverviewCurrentTab
-    // },
-    // getQueryCondition (state) {
-    // return state.queryCondition
-    // },
+    getDnsQtypeMapData (state) {
+      return state.dnsQtypeMapData
+    },
+    getDnsRcodeMapData (state) {
+      return state.dnsRcodeMapData
+    },
     getNetworkOverviewTabList (state) {
       return state.networkOverviewTabList
     },
-    // getTabOperationType (state) {
-    // return state.tabOperationType
-    // },
-    // getNetworkOverviewBeforeTab (state) {
-    // return state.networkOverviewBeforeTab
-    // },
-    // getTabOperationBeforeType (state) {
-    // return state.tabOperationBeforeType
-    // },
     getNpmLocationCountry (state) {
       return state.npmLocationCountry
     },
diff --git a/src/views/charts2/Panel.vue b/src/views/charts2/Panel.vue
index 7e8cc0ac..ce2b9481 100644
--- a/src/views/charts2/Panel.vue
+++ b/src/views/charts2/Panel.vue
@@ -61,7 +61,8 @@ import {
   panelTypeAndRouteMapping,
   curTabState,
   drillDownPanelTypeMapping,
-  metricOptions
+  metricOptions,
+  fromRoute
 } from '@/utils/constants'
 import { getPanelList, getChartList, api } from '@/utils/api'
 import { getNowTime, getSecond } from '@/utils/date-util'
@@ -112,8 +113,12 @@ export default {
     // this.panelName = this.$store.getters.getPanelName
     const pName = this.$route.query.panelName ? this.$t(this.$route.query.panelName) : ''
     const curTabProp = this.$route.query.dimensionType ? this.$route.query.dimensionType : null
-    this.dnsQtypeMapData = await getDnsMapData('dnsQtype')
-    this.dnsRcodeMapData = await getDnsMapData('dnsRcode')
+    if(this.$route.params.typeName === fromRoute.dnsServiceInsights) {
+      this.dnsQtypeMapData = await getDnsMapData('dnsQtype')
+      this.dnsRcodeMapData = await getDnsMapData('dnsRcode')
+      this.$store.commit('setDnsQtypeMapData', this.dnsQtypeMapData)
+      this.$store.commit('setDnsRcodeMapData', this.dnsRcodeMapData)
+    }
     if (curTabProp === 'qtype') {
       this.panelName = this.dnsQtypeMapData.get(pName)
     } else if (curTabProp === 'rcode') {
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
index ca170d2e..d4a2308d 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
@@ -1156,7 +1156,6 @@ export default {
       }
 
       this.saveUserLocalConfig()
-      // console.log(this.drillDownTableConfigs)
       let forthMenuName = ''
       if (clickTab.prop === 'qtype') {
         forthMenuName = this.dnsQtypeMapData.get(columnValue)
@@ -1768,12 +1767,20 @@ export default {
   },
   async mounted () {
     console.log('mounted start...')
-    // 是否需要dns的qtype和rcode的数据字典
-    this.dnsQtypeMapData = await getDnsMapData('dnsQtype')
-    this.dnsRcodeMapData = await getDnsMapData('dnsRcode')
     this.userId = localStorage.getItem(storageKey.userId)
     this.drillDownTableConfigs = await combinDrilldownTableWithUserConfig()
     this.tableType = this.$route.params ? this.$route.params.typeName : 'networkOverview'
+    // 是否需要dns的qtype和rcode的数据字典
+    if(this.tableType === fromRoute.dnsServiceInsights) {
+      this.dnsQtypeMapData = this.$store.getters.getDnsQtypeMapData
+      this.dnsRcodeMapData = this.$store.getters.getDnsRcodeMapData
+      if(!this.dnsQtypeMapData || this.dnsQtypeMapData.size === 0){
+        this.dnsQtypeMapData = await getDnsMapData('dnsQtype')
+        this.dnsRcodeMapData = await getDnsMapData('dnsRcode')
+        this.$store.commit('setDnsQtypeMapData', this.dnsQtypeMapData)
+        this.$store.commit('setDnsRcodeMapData', this.dnsRcodeMapData)
+      }
+    }
     this.curTableInCode = this.networkTable[this.tableType] ? this.networkTable[this.tableType] : this.networkTable.networkOverview
     // 表格状态初始化(url)
     this.showRecordNum = Number(this.getUrlParam(this.curTabState.tableShowMore, 10))