diff --git a/src/assets/css/components/views/charts/NetworkOverviewDdosDetection.scss b/src/assets/css/components/views/charts/NetworkOverviewDdosDetection.scss index 37d2ee0d..821318c8 100644 --- a/src/assets/css/components/views/charts/NetworkOverviewDdosDetection.scss +++ b/src/assets/css/components/views/charts/NetworkOverviewDdosDetection.scss @@ -1,8 +1,9 @@ .ddos-detection { display: flex; height: 100%; - width: 85%; - margin: auto; + padding: 0 20px; + border: 1px solid #E2E5EC; + border-radius: 4px; flex-direction: column; justify-content: space-evenly; .ddos-detection-type { diff --git a/src/assets/css/components/views/charts/NetworkOverviewLine.scss b/src/assets/css/components/views/charts/NetworkOverviewLine.scss index 0a9d1bca..0948f961 100644 --- a/src/assets/css/components/views/charts/NetworkOverviewLine.scss +++ b/src/assets/css/components/views/charts/NetworkOverviewLine.scss @@ -2,6 +2,25 @@ height: 100%; width: 100%; position: relative; + border: 1px solid #E2E5EC; + border-radius: 4px; + .chart-drawing { + div:nth-of-type(2) { + .cn-chart-tooltip { + display: flex; + justify-content: space-between; + .cn-chart-tooltip-box { + .cn-chart-tooltip__color.cn-chart-tooltip-value { + font-family: NotoSansHans-Medium; + font-size: 12px; + color: #353636; + line-height: 12px; + font-weight: 500; + } + } + } + } + } #chart { width: 1288px; height: 340px; diff --git a/src/assets/css/components/views/charts/NetworkOverviewPerformanceEvent.scss b/src/assets/css/components/views/charts/NetworkOverviewPerformanceEvent.scss index 526c0d8d..7ee562e1 100644 --- a/src/assets/css/components/views/charts/NetworkOverviewPerformanceEvent.scss +++ b/src/assets/css/components/views/charts/NetworkOverviewPerformanceEvent.scss @@ -1,9 +1,11 @@ .performance-event { - width: 100%; + height: 100%; + border: 1px solid #E2E5EC; + border-radius: 4px; .performance-event-pie { width: 100%; div { - height: 175px; + height: 165px; width: 324px; } .performance-event-pie-hr { diff --git a/src/utils/constants.js b/src/utils/constants.js index de84ad96..f8697ada 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -195,6 +195,8 @@ export const chartColor2 = ['#86B565', '#A37FA7', '#EFAFC7', '#EFC48F', '#B4B1A8 export const chartColor3 = ['#00A7AB', '#7FA054', '#35ADDA', '#E48F3E', '#98709B'] +export const chartColor4 = ['#E5F6F6', '#F2F6EE', '#EBF7FC', '#FCF4EB', '#F5F1F5'] + export const iso36112 = { [storageKey.iso36112Capital]: 'data/countriesWithCapital', [storageKey.iso36112WorldLow]: 'worldChinaLow', diff --git a/src/views/charts/charts/tools.js b/src/views/charts/charts/tools.js index 3897ee43..2b9eac76 100644 --- a/src/views/charts/charts/tools.js +++ b/src/views/charts/charts/tools.js @@ -459,3 +459,28 @@ export function categoryBarTooltipFormatter (params, type) { str += '' return str } + +export function stackedLineTooltipFormatter (params) { + let str = '
' + params.forEach((item, i) => { + const tData = item.data[0] + if (i === 0) { + str += '
' + str += dateFormatByAppearance(tData) + str += '
' + } + str += '
' + str += '' + str += item.marker + str += ` + ${item.seriesName} + ` + str += '' + str += ` + ${unitConvert(item.data[1], 'number').join(' ')} + ` + str += '
' + }) + str += '
' + return str +} diff --git a/src/views/charts2/Chart.vue b/src/views/charts2/Chart.vue index b1af4993..28e6e356 100644 --- a/src/views/charts2/Chart.vue +++ b/src/views/charts2/Chart.vue @@ -1,5 +1,5 @@