diff --git a/src/assets/css/components/views/charts2/networkOverviewTabs.scss b/src/assets/css/components/views/charts2/networkOverviewTabs.scss index e726df89..07c27333 100644 --- a/src/assets/css/components/views/charts2/networkOverviewTabs.scss +++ b/src/assets/css/components/views/charts2/networkOverviewTabs.scss @@ -4,7 +4,7 @@ height:calc(100% - 64px); font-size:12px; .tab-hide{ - margin-top:40px; + margin-top:42px; } .cn-chart__tabs { height:100%; diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue index 6d67cdd0..ebdf3496 100644 --- a/src/components/layout/Header.vue +++ b/src/components/layout/Header.vue @@ -277,8 +277,8 @@ export default { dropDownValue: '', breadcrumbColumnValueListShow: [], curTabProp: '', - dnsRcodeMapData: [], - dnsQtypeMapData: [], + dnsRcodeMapData: new Map(), + dnsQtypeMapData: new Map(), isDnsMapType: false, valueMeta: [], showBackground: false, diff --git a/src/utils/tools.js b/src/utils/tools.js index 6a583419..2ffce8e8 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -2,7 +2,7 @@ import { ElMessageBox, ElMessage } from 'element-plus' import i18n from '@/i18n' import _ from 'lodash' import { storageKey, iso36112, topDomain, echartsFontSize, dbGeoDataTableName, networkTable, dbDrilldownTableConfig } from '@/utils/constants' -import { getIso36112JsonData,getDictList } from '@/utils/api' +import { getIso36112JsonData, getDictList } from '@/utils/api' import { format } from 'echarts' import router from '@/router' import { db } from '@/indexedDB' @@ -855,24 +855,24 @@ export function getTabList (curTable, curMetric) { } return tabs } -export async function getDnsMapData(type){ - let codeValueMap = new Map() - const dnsData = await getDictList({ type:type,pageSize: -1 }) - if(dnsData && dnsData.length>0) { +export async function getDnsMapData (type) { + const codeValueMap = new Map() + const dnsData = await getDictList({ type: type, pageSize: -1 }) + if (dnsData && dnsData.length > 0) { dnsData.forEach(mapData => { - let code = mapData.code - if(code.indexOf('-')>-1){ - let range = mapData.code.split('-') - if(range && range.length >= 2){ - let start = range[0].trim() - let eEnd = range[1].trim() + const code = mapData.code + if (code.indexOf('-') > -1) { + const range = mapData.code.split('-') + if (range && range.length >= 2) { + const start = range[0].trim() + const eEnd = range[1].trim() mapData.value = (start <= code && code <= eEnd) ? mapData.value : code for (let i = start; i <= eEnd; i++) { - codeValueMap.set(i,mapData.value) + codeValueMap.set(i, mapData.value) } } - }else { - codeValueMap.set(code,mapData.value) + } else { + codeValueMap.set(code, mapData.value) } }) } diff --git a/src/views/charts2/Panel.vue b/src/views/charts2/Panel.vue index 667af98d..31cbfe26 100644 --- a/src/views/charts2/Panel.vue +++ b/src/views/charts2/Panel.vue @@ -66,7 +66,7 @@ import { import { getPanelList, getChartList } from '@/utils/api' import { getNowTime, getSecond } from '@/utils/date-util' import { getTypeCategory } from '@/views/charts/charts/tools' -import { urlParamsHandler, overwriteUrl,getDnsMapData } from '@/utils/tools' +import { urlParamsHandler, overwriteUrl, getDnsMapData } from '@/utils/tools' import ChartList from '@/views/charts2/ChartList' import { useStore } from 'vuex' @@ -109,15 +109,15 @@ export default { }, async mounted () { // this.panelName = this.$store.getters.getPanelName - let pName = this.$route.query.panelName ? this.$t(this.$route.query.panelName) : '' - let curTabProp = this.$route.query.dimensionType ? this.$route.query.dimensionType : null + 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(curTabProp === 'qtype'){ + if (curTabProp === 'qtype') { this.panelName = this.dnsQtypeMapData.get(pName) - }else if(curTabProp === 'rcode'){ + } else if (curTabProp === 'rcode') { this.panelName = this.dnsRcodeMapData.get(pName) - }else { + } else { this.panelName = pName } diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue index 9801802d..638ba928 100644 --- a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue +++ b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue @@ -1,7 +1,7 @@