diff --git a/src/assets/css/components/index.scss b/src/assets/css/components/index.scss index 97003e48..cf782f8b 100644 --- a/src/assets/css/components/index.scss +++ b/src/assets/css/components/index.scss @@ -25,7 +25,7 @@ @import './views/detections/detection-list/row'; @import './views/detections/detection-overview'; // @import './views/charts/panel'; -@import 'views/charts/chartIpOpenPortBar'; +/*@import 'views/charts/chartIpOpenPortBar'; @import './views/charts/chartTable'; @import './views/charts/chartSingleValue'; @import './views/charts/chartCryptocurrencyEventList'; @@ -41,13 +41,13 @@ @import './views/charts/chartAlarmInfo'; @import './views/chartHeader'; @import './views/charts/chartMap'; -@import 'views/charts/chartRelationShipList'; +@import 'views/charts/chartRelationShipList';*/ @import './views/report/builtinReport'; @import './components/rightBox/report/builtinReportBox'; @import './views/charts2/panel'; -@import 'views/charts/NetworkOverviewLine'; -@import 'views/charts/NetworkOverviewDdosDetection'; -@import 'views/charts/NetworkOverviewPerformanceEvent'; +@import 'views/charts2/networkOverviewLine'; +@import 'views/charts2/networkOverviewDdosDetection'; +@import 'views/charts2/networkOverviewPerformanceEvent'; @import 'views/charts2/networkOverviewTabs'; //@import '../chart'; diff --git a/src/assets/css/components/views/charts/NetworkOverviewDdosDetection.scss b/src/assets/css/components/views/charts2/networkOverviewDdosDetection.scss similarity index 100% rename from src/assets/css/components/views/charts/NetworkOverviewDdosDetection.scss rename to src/assets/css/components/views/charts2/networkOverviewDdosDetection.scss diff --git a/src/assets/css/components/views/charts/NetworkOverviewLine.scss b/src/assets/css/components/views/charts2/networkOverviewLine.scss similarity index 97% rename from src/assets/css/components/views/charts/NetworkOverviewLine.scss rename to src/assets/css/components/views/charts2/networkOverviewLine.scss index 0948f961..fa984942 100644 --- a/src/assets/css/components/views/charts/NetworkOverviewLine.scss +++ b/src/assets/css/components/views/charts2/networkOverviewLine.scss @@ -98,9 +98,9 @@ .line-value-mpackets { margin-right: 30px; span:nth-of-type(1) { - font-size: 28px; + font-family: 'Helvetica-Bold'; + font-size: 20px; color: #353636; - font-weight: 700; margin-right: 4px; } span:nth-of-type(2) { diff --git a/src/assets/css/components/views/charts/NetworkOverviewPerformanceEvent.scss b/src/assets/css/components/views/charts2/networkOverviewPerformanceEvent.scss similarity index 100% rename from src/assets/css/components/views/charts/NetworkOverviewPerformanceEvent.scss rename to src/assets/css/components/views/charts2/networkOverviewPerformanceEvent.scss diff --git a/src/assets/css/font/Helvetica-Bold-02.ttf b/src/assets/css/font/Helvetica-Bold-02.ttf new file mode 100644 index 00000000..2bbc0ca7 Binary files /dev/null and b/src/assets/css/font/Helvetica-Bold-02.ttf differ diff --git a/src/assets/css/font/NotoSansHans-Regular-2.ttf b/src/assets/css/font/NotoSansHans-Regular-2.ttf new file mode 100644 index 00000000..0c4e8e94 Binary files /dev/null and b/src/assets/css/font/NotoSansHans-Regular-2.ttf differ diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index ad85ef80..02ab7b44 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -8,7 +8,22 @@ } $--font-path: '~@/assets/css/themes/src/fonts'; // 避免ele原字体加载语句出错 -@import './common'; +@font-face { + font-family: 'NotoSansSChineseRegular'; + src: url('~@/assets/css/font/NotoSansHans-Regular-2.ttf') format('truetype'); + font-weight: normal; + font-display: auto; + font-style: normal; +} +@font-face { + font-family: 'Helvetica-Bold'; + src: url('~@/assets/css/font/Helvetica-Bold-02.ttf') format('truetype'); + font-weight: normal; + font-display: auto; + font-style: normal; +} + +@import './common.scss'; /* 主题 */