diff --git a/src/assets/css/components/views/charts2/npmAppCategoryScore.scss b/src/assets/css/components/views/charts2/npmAppCategoryScore.scss
index 5feb9de8..6caf02fd 100644
--- a/src/assets/css/components/views/charts2/npmAppCategoryScore.scss
+++ b/src/assets/css/components/views/charts2/npmAppCategoryScore.scss
@@ -69,6 +69,7 @@
height: 100%;
border: 1px solid #E2E5EC;
border-radius: 4px;
+ padding: 1px;
.app-table.el-table {
.el-table__header-wrapper {
tr th {
diff --git a/src/assets/css/components/views/charts2/npmEventsByType.scss b/src/assets/css/components/views/charts2/npmEventsByType.scss
index bc019c70..3ad0b4ac 100644
--- a/src/assets/css/components/views/charts2/npmEventsByType.scss
+++ b/src/assets/css/components/views/charts2/npmEventsByType.scss
@@ -1,6 +1,6 @@
.npm-event {
- height: calc(100% - 24px);
width: 100%;
+ height: 100%;
.npm-event-title {
font-family: NotoSansHans-Medium;
font-size: 14px;
@@ -10,7 +10,7 @@
}
.npm-event-pie {
width: 100%;
- height: 100%;
+ height: calc(100% - 30px);
border: 1px solid #E2E5EC;
border-radius: 4px;
display: flex;
diff --git a/src/assets/css/components/views/charts2/npmRecentEvents.scss b/src/assets/css/components/views/charts2/npmRecentEvents.scss
index 15f6da5f..72eb7265 100644
--- a/src/assets/css/components/views/charts2/npmRecentEvents.scss
+++ b/src/assets/css/components/views/charts2/npmRecentEvents.scss
@@ -1,5 +1,6 @@
.npm-recent {
- height: calc(100% - 24px);
+ height: 100%;
+ width: 100%;
.npm-recent-title {
font-family: NotoSansHans-Medium;
font-size: 14px;
@@ -8,11 +9,13 @@
margin-bottom: 10px;
}
.npm-recent-table {
+ height: calc(100% - 30px) !important;
border: 1px solid #E2E5EC;
border-radius: 4px;
+ padding: 1px;
.el-table__header-wrapper {
tr th {
- padding: 5px 0;
+ padding: 4px 0;
.data-column__span {
font-family: NotoSansHans-Medium;
font-size: 12px;
@@ -23,7 +26,7 @@
}
.el-table__body-wrapper.is-scrolling-none {
tr td {
- padding: 7px 0;
+ padding: 7.5px 0;
}
}
}
diff --git a/src/utils/constants.js b/src/utils/constants.js
index 96f90fea..ffdc7efb 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -216,8 +216,7 @@ export const chartColor2 = ['#86B565', '#A37FA7', '#EFAFC7', '#EFC48F', '#B4B1A8
export const chartColor3 = ['#00A7AB', '#7FA054', '#35ADDA', '#E48F3E', '#9FBC1D', '#98709B']
export const chartColor4 = ['#E5F6F6', '#F2F6EE', '#EBF7FC', '#FCF4EB', '#9FBC1D', '#F5F1F5']
-export const chartColor5 = ['#749F4D', '#98709B', '#E5A219']
-export const chartColor6 = ['#E26154', '#E48E4D', '#E7B34E', '#DAC74B', '#88AF65']
+export const chartColor5 = ['#E26154', '#E48E4D', '#E7B34E', '#DAC74B', '#88AF65']
export const iso36112 = {
[storageKey.iso36112Capital]: 'data/countriesWithCapital',
diff --git a/src/views/charts2/charts/NpmLine.vue b/src/views/charts2/charts/NpmLine.vue
index 746024d7..d650c0ae 100644
--- a/src/views/charts2/charts/NpmLine.vue
+++ b/src/views/charts2/charts/NpmLine.vue
@@ -1,9 +1,139 @@
-
+
diff --git a/src/views/charts2/charts/options/echartOption.js b/src/views/charts2/charts/options/echartOption.js
index d09a9242..779620c6 100644
--- a/src/views/charts2/charts/options/echartOption.js
+++ b/src/views/charts2/charts/options/echartOption.js
@@ -4,7 +4,6 @@ import {
chartColor2,
chartColor3,
chartColor5,
- chartColor6,
unitTypes
} from '@/utils/constants'
import unitConvert from '@/utils/unit-convert'
@@ -119,7 +118,7 @@ export const pieChartOption2 = {
]
}
export const pieChartOption3 = {
- color: chartColor6,
+ color: chartColor5,
series: [
{
name: 'Access From',
@@ -241,7 +240,6 @@ export const appListChartOption = {
}
export const npmLineChartOption = {
- color: chartColor5,
title: {
text: '',
top: 20,