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 f0a7e5d..7c301fa 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,6 @@ box-sizing: border-box; padding: 10px; font-size: 16px; - // 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 e157894..4eb6f15 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,6 @@ box-sizing: border-box; padding: 10px; font-size: 16px; - // font-family: Source Han Sans CN; font-weight: 400; color: #000000; } 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 774617c..f0376c1 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,6 @@ box-sizing: border-box; padding: 10px; font-size: 16px; - // 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 7e2a4bc..282cfe8 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,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;} width: 100%; height: 100%; overflow-y: auto; - // font-family: Source Han Sans CN; color: #333333; padding: 10px; box-sizing: border-box; @@ -31,7 +30,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;} p{ height: 14px; font-size: 14px; - // font-family: Source Han Sans CN; font-weight: 400; line-height: 14px; color: #333333; @@ -54,7 +52,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;} p{ height: 14px; font-size: 14px; - // 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 1c21446..dab5edb 100644 --- a/src/app/gis-management/gis-labeling/shareUrl.scss +++ b/src/app/gis-management/gis-labeling/shareUrl.scss @@ -8,7 +8,6 @@ position: relative; .name{ font-size: 20px; - // font-family: Source Han Sans CN; font-weight: 400; color: #FFFFFF; } @@ -37,7 +36,6 @@ line-height: 36px; background: #EEF1F5; font-size: 16px; - // font-family: Source Han Sans CN; font-weight: 400; color: #333333; opacity: 0.4; diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts index 75909dc..660976b 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts +++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts @@ -568,7 +568,7 @@ export class KeyUnitManagementComponent implements OnInit { //跳转查看基本信息页面 unitdetails(element){ - console.log(element) + // console.log(element) sessionStorage.setItem("editable","0") sessionStorage.setItem("companyName",element.name) sessionStorage.setItem("companyId",element.id) diff --git a/src/app/pages/lockscreen/lockscreen.component.scss b/src/app/pages/lockscreen/lockscreen.component.scss index 041d3ab..932df87 100644 --- a/src/app/pages/lockscreen/lockscreen.component.scss +++ b/src/app/pages/lockscreen/lockscreen.component.scss @@ -22,7 +22,6 @@ width: 100%; height: 100%; color: #fff; - font-family: Roboto, sans-serif; background: url('../../../assets/images/background.jpg'); &::before { position: fixed; diff --git a/src/app/plan-audit/basic-info/basic-info.component.scss b/src/app/plan-audit/basic-info/basic-info.component.scss index c44b0de..abf4034 100644 --- a/src/app/plan-audit/basic-info/basic-info.component.scss +++ b/src/app/plan-audit/basic-info/basic-info.component.scss @@ -18,7 +18,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;} width: 100%; height: 760px; overflow-y: auto; - // font-family: Source Han Sans CN; color: #333333; padding: 10px; box-sizing: border-box; @@ -31,7 +30,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;} p{ height: 14px; font-size: 14px; - // font-family: Source Han Sans CN; font-weight: 400; line-height: 14px; color: #333333; @@ -54,7 +52,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;} p{ height: 14px; font-size: 14px; - // font-family: Source Han Sans CN; font-weight: 400; line-height: 14px; color: #333333; diff --git a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.html b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.html index 070bd78..5744a5b 100644 --- a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.html +++ b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.html @@ -36,25 +36,25 @@ * 队站名称: - + 联系电话: - + 传真: - + 辖区面积: - + @@ -69,17 +69,17 @@ 地址: - + 经度: - + 纬度: - + @@ -89,19 +89,19 @@ 现役官兵人数: - + 政府专职消防员数: - + 消防文员数: - +

联系方式

@@ -110,25 +110,25 @@ 总队长名称: - + 总队长联系方式: - + 总队政委姓名: - + 总队政委联系方式: - + @@ -136,25 +136,25 @@ 支队长姓名: - + 支队长联系方式: - + 支队政委姓名: - + 支队政委联系方式: - + @@ -167,19 +167,19 @@ * 队站名称: - + 值班电话: - + 辖区面积: - + @@ -194,17 +194,17 @@ 地址: - + 经度: - + 纬度: - + @@ -214,19 +214,19 @@ 现役人数: - + 政府专职消防员数: - + 每日执勤人数: - +

联系方式

@@ -235,73 +235,73 @@ 站长姓名: - + 站长联系方式: - + 指导员姓名: - + 指导员联系方式: - + 副指导员姓名: - + 副指导员联系方式: - + 副站长一姓名: - + 副站长一联系方式: - + 副站长二姓名: - + 副站长二联系方式: - + 副站长三姓名: - + 副站长三联系方式: - + @@ -326,33 +326,33 @@ * 队伍名称: - + 管辖单位: - + 队长: - - + + 值班电话: - + 传真: - + @@ -367,17 +367,17 @@ 地址: - + 经度: - + 纬度: - + @@ -388,20 +388,20 @@ 每日执勤人数: - + 消防队员总人数: - + 执勤车辆数:
- +
@@ -410,7 +410,7 @@ 灭火剂总量:
- +
diff --git a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.scss b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.scss index 516a831..6178b1b 100644 --- a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.scss +++ b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.scss @@ -132,6 +132,7 @@ margin-left: 5px; border: 1px solid #EBEBEB; border-radius: 5px; + font-family: Regular; } textarea{ width: 89%; diff --git a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.html b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.html index 03f770c..8aa823a 100644 --- a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.html +++ b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.html @@ -43,25 +43,25 @@ * 名称: - + 单位联系电话: - + 单位传真: - + 备注: - +

位置信息

@@ -70,21 +70,21 @@ 行政区: - + 地址: - + 经度: - + 纬度: - + @@ -94,19 +94,19 @@ 联系人: - + 职务: - + 电话: - +

应急信息

@@ -115,13 +115,13 @@ 服务内容: - + 资源说明: - + diff --git a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.scss b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.scss index ade0459..5af678b 100644 --- a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.scss +++ b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.scss @@ -6,7 +6,7 @@ box-sizing: border-box; padding: 10px; font-size: 16px; - // font-family: Source Han Sans CN; + font-family: Regular; font-weight: 400; color: #000000; } @@ -136,6 +136,7 @@ margin-left: 5px; border: 1px solid #EBEBEB; border-radius: 5px; + font-family: Regular; } textarea{ width: 89%; @@ -143,6 +144,7 @@ height: 85%; border: 1px solid #EBEBEB; border-radius: 5px; + font-family: Regular; } .longinput{ width: 74%; @@ -154,6 +156,7 @@ width: 100%; box-sizing: border-box; padding-right: 50px; + font-family: Regular; } .unit{ position: absolute; diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html index 9719e05..2c3a4ea 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -269,9 +269,9 @@ --> - +