diff --git a/src/assets/css/components/views/charts2/networkOverviewApps.scss b/src/assets/css/components/views/charts2/networkOverviewApps.scss
index e87d18fb..2f42942b 100644
--- a/src/assets/css/components/views/charts2/networkOverviewApps.scss
+++ b/src/assets/css/components/views/charts2/networkOverviewApps.scss
@@ -93,7 +93,7 @@
position: relative;
.app-card-title-more-delete {
z-index: 1;
- font-family: Helvetica;
+ font-family: Helvetica-Bold;
position: absolute;
min-width: 96px;
line-height: 32px;
diff --git a/src/assets/css/components/views/charts2/networkOverviewLine.scss b/src/assets/css/components/views/charts2/networkOverviewLine.scss
index 029445c4..efd3cd62 100644
--- a/src/assets/css/components/views/charts2/networkOverviewLine.scss
+++ b/src/assets/css/components/views/charts2/networkOverviewLine.scss
@@ -148,7 +148,7 @@
.el-scrollbar__view.el-select-dropdown__list {
.el-select-dropdown__item {
padding: 0 8px;
- font-family: Helvetica;
+ font-family: Helvetica-Bold;
height: 24px;
line-height: 24px;
font-size: 12px;
diff --git a/src/assets/css/components/views/charts2/panel.scss b/src/assets/css/components/views/charts2/panel.scss
index bddab859..b0d6da97 100644
--- a/src/assets/css/components/views/charts2/panel.scss
+++ b/src/assets/css/components/views/charts2/panel.scss
@@ -18,7 +18,7 @@
}
}
.chart-list {
- height: calc(100% - 46px);
+ height: calc(100% - 68px);
overflow: auto;
&>.vue-grid-layout {
margin-top: -20px;
diff --git a/src/views/charts2/Chart.vue b/src/views/charts2/Chart.vue
index 2a78f5f0..7e59ec5e 100644
--- a/src/views/charts2/Chart.vue
+++ b/src/views/charts2/Chart.vue
@@ -30,6 +30,14 @@
v-else-if="chart.type === typeMapping.npm.npmNetworkQuantity"
:chart="chart"
>
+
+
@@ -44,9 +52,13 @@ import NetworkOverviewTabs from '@/views/charts2/charts/NetworkOverviewTabs'
import NetworkOverviewApps from '@/views/charts2/charts/NetworkOverviewApps'
import NpmTabs from '@/views/charts2/charts/NpmTabs'
import NpmNetworkQuantity from '@/views/charts2/charts/NpmNetworkQuantity'
+import NpmAppCategoryScore from '@/views/charts2/charts/NpmAppCategoryScore'
+import NpmMap from '@/views/charts2/charts/NpmMap'
export default {
name: 'Chart',
components: {
+ NpmMap,
+ NpmAppCategoryScore,
Loading,
ChartNoData,
NetworkOverviewLine,
diff --git a/src/views/charts2/ChartList.vue b/src/views/charts2/ChartList.vue
index 9407824a..90a941c8 100644
--- a/src/views/charts2/ChartList.vue
+++ b/src/views/charts2/ChartList.vue
@@ -19,21 +19,11 @@
:h="item.h"
:i="item.i"
:key="item.i">
-
-
-
-
@@ -71,13 +61,19 @@ export default {
Chart
},
watch: {
- chartList: {
- deep: true,
- handler (n) {
- if (!_.isEmpty(n)) {
+ chartList (n) {
+ if (!_.isEmpty(n)) {
+ if (this.panelType === panelTypeAndRouteMapping.networkAppPerformance) {
+ this.layout = n.filter(c => c.type === typeMapping.npm.npmTabs || c.params.tabIndex === this.npmTabIndex)
+ } else {
this.layout = [...n]
}
}
+ },
+ npmTabIndex (n) {
+ if (this.panelType === panelTypeAndRouteMapping.networkAppPerformance) {
+ this.layout = this.chartList.filter(c => c.type === typeMapping.npm.npmTabs || c.params.tabIndex === this.npmTabIndex)
+ }
}
},
methods: {
diff --git a/src/views/charts2/chart-tools.js b/src/views/charts2/chart-tools.js
index 77112bf4..f74ac794 100644
--- a/src/views/charts2/chart-tools.js
+++ b/src/views/charts2/chart-tools.js
@@ -7,6 +7,8 @@ export const typeMapping = {
ddosDetection: 701
},
npm: {
+ npmMap: 1,
+ npmAppCategoryScore: 702,
npmTabs: 704,
npmNetworkQuantity: 703
}
diff --git a/src/views/charts2/charts/NpmAppCategoryScore.vue b/src/views/charts2/charts/NpmAppCategoryScore.vue
new file mode 100644
index 00000000..ea5a99b6
--- /dev/null
+++ b/src/views/charts2/charts/NpmAppCategoryScore.vue
@@ -0,0 +1,9 @@
+
+
+
+
+
diff --git a/src/views/charts2/charts/NpmMap.vue b/src/views/charts2/charts/NpmMap.vue
new file mode 100644
index 00000000..eb041a74
--- /dev/null
+++ b/src/views/charts2/charts/NpmMap.vue
@@ -0,0 +1,9 @@
+
+
+
+
+
diff --git a/src/views/charts2/charts/NpmTabs.vue b/src/views/charts2/charts/NpmTabs.vue
index 6b168842..28f68919 100644
--- a/src/views/charts2/charts/NpmTabs.vue
+++ b/src/views/charts2/charts/NpmTabs.vue
@@ -52,6 +52,7 @@ export default {
const { offsetLeft, clientWidth, clientLeft } = document.querySelector('.npm-tabs .el-tabs__item.is-active')
const activeBar = document.querySelector('.npm-tabs .npm-tabs__active-bar')
activeBar.style.cssText += `width: ${clientWidth + 2}px; left: ${offsetLeft + this.leftOffset + clientLeft - 1}px;`
+ console.info(activeBar.style.left)
}
},
mounted () {