diff --git a/src/app/data-collection/fire-force/fire-force.component.scss b/src/app/data-collection/fire-force/fire-force.component.scss index 42dbcf1..2865ab8 100644 --- a/src/app/data-collection/fire-force/fire-force.component.scss +++ b/src/app/data-collection/fire-force/fire-force.component.scss @@ -6,7 +6,7 @@ box-sizing: border-box; padding: 10px; font-size: 16px; - font-family: Source Han Sans CN; + // font-family: Source Han Sans CN; font-weight: 400; color: #000000; } diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.scss b/src/app/data-collection/linkage-forces/linkage-forces.component.scss index 9fbcf0f..355c8ae 100644 --- a/src/app/data-collection/linkage-forces/linkage-forces.component.scss +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.scss @@ -6,7 +6,7 @@ box-sizing: border-box; padding: 10px; font-size: 16px; - font-family: Source Han Sans CN; + // font-family: Source Han Sans CN; font-weight: 400; color: #000000; } diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.ts b/src/app/data-collection/linkage-forces/linkage-forces.component.ts index 21ef260..e130b0a 100644 --- a/src/app/data-collection/linkage-forces/linkage-forces.component.ts +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.ts @@ -168,7 +168,7 @@ export class LinkageForcesComponent implements OnInit { } ngOnInit(): void { this.getAllFireForce() - window.onload = () => { + setTimeout(() => { var mySwiper = new Swiper('.swiper-container', { slidesPerView: 10,//每页显示的个数 slidesPerGroup: 3,//点击一次需要跳多少次 @@ -178,9 +178,6 @@ export class LinkageForcesComponent implements OnInit { prevEl: '.swiper-button-prev', }, }) - } - setTimeout(() => { - this.createMap() }, 0); } diff --git a/src/app/data-collection/water-collection/water-collection.component.scss b/src/app/data-collection/water-collection/water-collection.component.scss index debc2c4..c0707dd 100644 --- a/src/app/data-collection/water-collection/water-collection.component.scss +++ b/src/app/data-collection/water-collection/water-collection.component.scss @@ -6,7 +6,7 @@ box-sizing: border-box; padding: 10px; font-size: 16px; - font-family: Source Han Sans CN; + // font-family: Source Han Sans CN; font-weight: 400; color: #000000; } diff --git a/src/app/gis-management/basic-info/basic-info.component.scss b/src/app/gis-management/basic-info/basic-info.component.scss index 390b7eb..7e2a4bc 100644 --- a/src/app/gis-management/basic-info/basic-info.component.scss +++ b/src/app/gis-management/basic-info/basic-info.component.scss @@ -18,7 +18,7 @@ table { text-align: center; border-collapse: collapse; padding:2px;} width: 100%; height: 100%; overflow-y: auto; - font-family: Source Han Sans CN; + // font-family: Source Han Sans CN; color: #333333; padding: 10px; box-sizing: border-box; @@ -31,7 +31,7 @@ table { text-align: center; border-collapse: collapse; padding:2px;} p{ height: 14px; font-size: 14px; - font-family: Source Han Sans CN; + // font-family: Source Han Sans CN; font-weight: 400; line-height: 14px; color: #333333; @@ -54,7 +54,7 @@ table { text-align: center; border-collapse: collapse; padding:2px;} p{ height: 14px; font-size: 14px; - font-family: Source Han Sans CN; + // font-family: Source Han Sans CN; font-weight: 400; line-height: 14px; color: #333333; diff --git a/src/app/gis-management/gis-labeling/shareUrl.scss b/src/app/gis-management/gis-labeling/shareUrl.scss index bec775b..1c21446 100644 --- a/src/app/gis-management/gis-labeling/shareUrl.scss +++ b/src/app/gis-management/gis-labeling/shareUrl.scss @@ -8,7 +8,7 @@ position: relative; .name{ font-size: 20px; - font-family: Source Han Sans CN; + // font-family: Source Han Sans CN; font-weight: 400; color: #FFFFFF; } @@ -37,7 +37,7 @@ line-height: 36px; background: #EEF1F5; font-size: 16px; - font-family: Source Han Sans CN; + // font-family: Source Han Sans CN; font-weight: 400; color: #333333; opacity: 0.4; diff --git a/src/assets/font/SourceHanSansCN-Regular.otf b/src/assets/font/SourceHanSansCN-Regular.otf new file mode 100644 index 0000000..886f82f Binary files /dev/null and b/src/assets/font/SourceHanSansCN-Regular.otf differ diff --git a/src/styles.scss b/src/styles.scss index 7c77928..6e9b18a 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,12 +1,19 @@ @import './app/theme.scss'; @import "./app/ngZorroTree.css"; /* 引入组件样式 */ + +@font-face +{ + font-family: Regular; + src: url('./assets/font/SourceHanSansCN-Regular.otf'), +} html,body{ width: 100%; height:100%; margin:0 auto; padding:0; overflow: hidden; + font-family: Regular } ul,ol,dl,li,dt,dd,p,form,input,h1,h2,h3,h4,h5,h6,section,article,aside,header,footer,nav,figure,time,mark,main,canvas{ margin:0; @@ -112,7 +119,7 @@ table td.mat-footer-cell:last-of-type{ border-radius: 4px; margin: 0 5px; font-size: 14px; - font-family: Source Han Sans CN; + // font-family: Source Han Sans CN; font-weight: 400; line-height: 36px; color: #0080FF;