diff --git a/package-lock.json b/package-lock.json index 830e3f5..8bf22ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,8 @@ "@angular/platform-browser": "~13.1.0", "@angular/platform-browser-dynamic": "~13.1.0", "@angular/router": "~13.1.0", + "@types/file-saver": "^2.0.5", + "file-saver": "^2.0.5", "js-base64": "^3.7.2", "ng-zorro-antd": "^13.0.1", "ngx-cookie-service": "^13.1.2", @@ -29,6 +31,7 @@ "@angular/compiler-cli": "~13.1.0", "@types/jasmine": "~3.10.0", "@types/node": "^12.11.1", + "html-docx-js-typescript": "^0.1.5", "jasmine-core": "~3.10.0", "karma": "~6.3.0", "karma-chrome-launcher": "~3.1.0", @@ -2636,6 +2639,11 @@ "integrity": "sha1-Hgyqk2TT/M0pMcPtlv2+ql1MyoM=", "dev": true }, + "node_modules/@types/file-saver": { + "version": "2.0.5", + "resolved": "https://registry.npmmirror.com/@types/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-zv9kNf3keYegP5oThGLaPk8E081DFDuwfqjtiTzm6PoxChdJ1raSuADf2YGCVIyrSynLrgc8JWv296s7Q7pQSQ==" + }, "node_modules/@types/http-proxy": { "version": "1.17.8", "resolved": "https://registry.npmmirror.com/@types/http-proxy/download/@types/http-proxy-1.17.8.tgz", @@ -3398,6 +3406,12 @@ "node": ">=8" } }, + "node_modules/browser-or-node": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/browser-or-node/-/browser-or-node-1.3.0.tgz", + "integrity": "sha512-0F2z/VSnLbmEeBcUrSuDH5l0HxTXdQQzLjkmBR4cYfvg1zJrKSlmIZFqyFR8oX0NrwPhy3c3HQ6i3OxMbew4Tg==", + "dev": true + }, "node_modules/browserslist": { "version": "4.19.1", "resolved": "https://registry.npmmirror.com/browserslist/download/browserslist-4.19.1.tgz", @@ -5253,6 +5267,11 @@ "node": ">=8" } }, + "node_modules/file-saver": { + "version": "2.0.5", + "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" + }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.nlark.com/fill-range/download/fill-range-7.0.1.tgz", @@ -5683,6 +5702,23 @@ "safe-buffer": "~5.1.0" } }, + "node_modules/html-docx-js-typescript": { + "version": "0.1.5", + "resolved": "https://registry.npmmirror.com/html-docx-js-typescript/-/html-docx-js-typescript-0.1.5.tgz", + "integrity": "sha512-GNojWFDYbpHSIgKml6/0oAom8mtHrHRTWKMyLRdeJQHO/CyeM6H39DYgzYvPp4OhBp2Ti8dxMKFq0/FkpYD4bg==", + "dev": true, + "dependencies": { + "browser-or-node": "^1.2.1", + "jszip": "^3.4.0", + "tslib": "^1.13.0" + } + }, + "node_modules/html-docx-js-typescript/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/html-entities": { "version": "2.3.2", "resolved": "https://registry.npm.taobao.org/html-entities/download/html-entities-2.3.2.tgz?cache=0&sync_timestamp=1617031553039&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhtml-entities%2Fdownload%2Fhtml-entities-2.3.2.tgz", @@ -5868,6 +5904,12 @@ "node": ">=0.10.0" } }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmmirror.com/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", + "dev": true + }, "node_modules/immutable": { "version": "4.0.0", "resolved": "https://registry.npmmirror.com/immutable/download/immutable-4.0.0.tgz", @@ -6527,6 +6569,42 @@ "node >= 0.2.0" ] }, + "node_modules/jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmmirror.com/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "dev": true, + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, + "node_modules/jszip/node_modules/readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/jszip/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, "node_modules/karma": { "version": "6.3.11", "resolved": "https://registry.npmmirror.com/karma/download/karma-6.3.11.tgz", @@ -6831,6 +6909,15 @@ } } }, + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmmirror.com/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dev": true, + "dependencies": { + "immediate": "~3.0.5" + } + }, "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmmirror.com/lines-and-columns/download/lines-and-columns-1.2.4.tgz", @@ -9478,6 +9565,12 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true }, + "node_modules/setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmmirror.com/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "dev": true + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.2.0.tgz", @@ -12662,6 +12755,11 @@ "integrity": "sha1-Hgyqk2TT/M0pMcPtlv2+ql1MyoM=", "dev": true }, + "@types/file-saver": { + "version": "2.0.5", + "resolved": "https://registry.npmmirror.com/@types/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-zv9kNf3keYegP5oThGLaPk8E081DFDuwfqjtiTzm6PoxChdJ1raSuADf2YGCVIyrSynLrgc8JWv296s7Q7pQSQ==" + }, "@types/http-proxy": { "version": "1.17.8", "resolved": "https://registry.npmmirror.com/@types/http-proxy/download/@types/http-proxy-1.17.8.tgz", @@ -13310,6 +13408,12 @@ "fill-range": "^7.0.1" } }, + "browser-or-node": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/browser-or-node/-/browser-or-node-1.3.0.tgz", + "integrity": "sha512-0F2z/VSnLbmEeBcUrSuDH5l0HxTXdQQzLjkmBR4cYfvg1zJrKSlmIZFqyFR8oX0NrwPhy3c3HQ6i3OxMbew4Tg==", + "dev": true + }, "browserslist": { "version": "4.19.1", "resolved": "https://registry.npmmirror.com/browserslist/download/browserslist-4.19.1.tgz", @@ -14769,6 +14873,11 @@ "escape-string-regexp": "^1.0.5" } }, + "file-saver": { + "version": "2.0.5", + "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.nlark.com/fill-range/download/fill-range-7.0.1.tgz", @@ -15119,6 +15228,25 @@ } } }, + "html-docx-js-typescript": { + "version": "0.1.5", + "resolved": "https://registry.npmmirror.com/html-docx-js-typescript/-/html-docx-js-typescript-0.1.5.tgz", + "integrity": "sha512-GNojWFDYbpHSIgKml6/0oAom8mtHrHRTWKMyLRdeJQHO/CyeM6H39DYgzYvPp4OhBp2Ti8dxMKFq0/FkpYD4bg==", + "dev": true, + "requires": { + "browser-or-node": "^1.2.1", + "jszip": "^3.4.0", + "tslib": "^1.13.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + } + } + }, "html-entities": { "version": "2.3.2", "resolved": "https://registry.npm.taobao.org/html-entities/download/html-entities-2.3.2.tgz?cache=0&sync_timestamp=1617031553039&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhtml-entities%2Fdownload%2Fhtml-entities-2.3.2.tgz", @@ -15266,6 +15394,12 @@ "dev": true, "optional": true }, + "immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmmirror.com/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", + "dev": true + }, "immutable": { "version": "4.0.0", "resolved": "https://registry.npmmirror.com/immutable/download/immutable-4.0.0.tgz", @@ -15785,6 +15919,44 @@ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", "dev": true }, + "jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmmirror.com/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "dev": true, + "requires": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "karma": { "version": "6.3.11", "resolved": "https://registry.npmmirror.com/karma/download/karma-6.3.11.tgz", @@ -16011,6 +16183,15 @@ "webpack-sources": "^3.0.0" } }, + "lie": { + "version": "3.3.0", + "resolved": "https://registry.npmmirror.com/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dev": true, + "requires": { + "immediate": "~3.0.5" + } + }, "lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmmirror.com/lines-and-columns/download/lines-and-columns-1.2.4.tgz", @@ -18044,6 +18225,12 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmmirror.com/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "dev": true + }, "setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.2.0.tgz", diff --git a/package.json b/package.json index f67166b..1ea62e3 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,8 @@ "@angular/platform-browser": "~13.1.0", "@angular/platform-browser-dynamic": "~13.1.0", "@angular/router": "~13.1.0", + "@types/file-saver": "^2.0.5", + "file-saver": "^2.0.5", "js-base64": "^3.7.2", "ng-zorro-antd": "^13.0.1", "ngx-cookie-service": "^13.1.2", @@ -31,6 +33,7 @@ "@angular/compiler-cli": "~13.1.0", "@types/jasmine": "~3.10.0", "@types/node": "^12.11.1", + "html-docx-js-typescript": "^0.1.5", "jasmine-core": "~3.10.0", "karma": "~6.3.0", "karma-chrome-launcher": "~3.1.0", diff --git a/src/app/home/basic-info/add-unit/add-unit.component.html b/src/app/home/basic-info/add-unit/add-unit.component.html index 338456d..7304300 100644 --- a/src/app/home/basic-info/add-unit/add-unit.component.html +++ b/src/app/home/basic-info/add-unit/add-unit.component.html @@ -4,7 +4,7 @@ 单位名称 - + @@ -29,7 +29,7 @@ - + diff --git a/src/app/home/basic-info/add-unit/add-unit.component.ts b/src/app/home/basic-info/add-unit/add-unit.component.ts index dfe04fe..42dc884 100644 --- a/src/app/home/basic-info/add-unit/add-unit.component.ts +++ b/src/app/home/basic-info/add-unit/add-unit.component.ts @@ -18,11 +18,15 @@ export class AddUnitComponent implements OnInit { ngOnInit(): void { this.validateForm = this.fb.group({ - account: [null, [Validators.required]], + unit: [null, [Validators.required]], name: [null, [Validators.required]], - organization: [null, [Validators.required]], + iphone: [null, [Validators.required]], + addr: [null, [Validators.required]], role: [[], [Validators.required]], role2: [[]], + role3: [[]], + role4: [[]], + role5: [[]], phonenum: [null, [Validators.required]] }); diff --git a/src/app/home/basic-info/unit-details/unit-details.component.html b/src/app/home/basic-info/unit-details/unit-details.component.html index 1fb862f..1e526ae 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.html +++ b/src/app/home/basic-info/unit-details/unit-details.component.html @@ -1 +1,595 @@ - \ No newline at end of file + +
+
单位名称
+
+
+ + +
+
+
+
单位信息
+
+
+
+ + 所属救援站 + + + + + Please input your username! + + + The username is redundant! + + + + + + 所属大队 + + + + + The input is not valid E-mail! + + + Please input your E-mail! + + + + + + 建筑类型 + + + + + + + Comment + + + + + +
+
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

单位基本情况

+
+

单位名称

+
+

{{aaa}}

+
+

单位地址

+
+

+

+

联系电话

+
+

+
+

人员总数

+
+

+
+

建筑高度

+
+

+
+

层数

+
+

+
+

建筑结构

+
+

+
+

占地面积

+
+

+
+

总建筑面积

+
+

+
+

主要使用性质

+
+

+
+

毗邻建筑

+
+

东:

+
+

南:

+
+

西:

+
+

北:

+
+

辖区中队行驶路线及时间

+
+

+
+

单位内部主要消防设施

+
+

消防控制室

+
+

位置

+
+

+
+

消防水源

+
+

消防水池数量

+
+

+
+

位置

+
+

+
+

总容量

+
+

+
+

补给
方式

+
+

+
+

室外其他水源

+
+

 

+
+

位置

+
+

 

+
+

自动报警系统

+ +
+

有(
无(

+
+

自动喷水系统

+
+

有(
无(

+
+

应急广播系统

+
+

有(
无(

+
+

防排烟系统

+
+

有(
无(

+
+

室外消火栓数量

+
+

0

+
+

室外消火栓位置分布

+
+

+
+

消防泵

+
+

消火栓泵

+
+

数量:0

+
+

扬程:0m

+
+

流量0L/S

+
+

水泵接合器

+
+

数量:0

+
+

0

+
+

喷淋泵

+
+

数量:0

+
+

扬程:0m

+
+

流量:0L/S

+
+

水泵接合器

+
+

数量:0

+
+

0

+
+

消防电梯

+

数量及位置

+
+

0 +

+
+

疏散楼梯

+

数量及位置

+
+

0,无

+
+

安全出口

+

数量及位置

+
+

4,南北两侧

+
+

室内消火栓数量

+
+

8

+
+

标准层室内消火栓数量及位置

+
+

5,均匀分布

+
+

重点

+

提示

+
+

 

+
+

 

+
+
+ + +
\ No newline at end of file diff --git a/src/app/home/basic-info/unit-details/unit-details.component.scss b/src/app/home/basic-info/unit-details/unit-details.component.scss index e69de29..c0c9024 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.scss +++ b/src/app/home/basic-info/unit-details/unit-details.component.scss @@ -0,0 +1,50 @@ +.detailsbox { + width: 100%; + + text-align: left; + box-sizing: 100%; + + .top { + text-align: left; + margin: 20px; + border-bottom: 1px solid #eee; + + span { + color: #000D21; + margin-right: 16px; + } + } + .buttons{ + display: flex; + .button-left{ + width: 50%; + button{ + margin: 10px 15px; + } + } + .button-right{ + width: 50%; + text-align: right; + button{ + margin: 10px 15px; + } + } + } + .title{ + color: #000; + margin: 20px 15px; + background: #EFF1F5; + height: 35px; + line-height: 35px; + border-radius: 10px; + padding-left: 10px; + } + .content{ + border: 1px solid; + } + .aaaa{ + // background-color: #eee; + width: 100%; + margin: 0 auto ; + } +} \ No newline at end of file diff --git a/src/app/home/basic-info/unit-details/unit-details.component.ts b/src/app/home/basic-info/unit-details/unit-details.component.ts index 5739971..0a7ac9d 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.ts +++ b/src/app/home/basic-info/unit-details/unit-details.component.ts @@ -1,17 +1,70 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Renderer2, OnDestroy, AfterViewInit,ElementRef, OnInit,ViewChild } from '@angular/core'; import { CustomReuseStrategy } from 'src/app/CustomReuseStrategy'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { asBlob } from 'html-docx-js-typescript' +// 要保存这个docx文件推荐引入file-saver哦,你可以用npm i -D file-saver来安装 +import { saveAs } from 'file-saver' @Component({ selector: 'app-unit-details', templateUrl: './unit-details.component.html', styleUrls: ['./unit-details.component.scss'] }) -export class UnitDetailsComponent implements OnInit { - - constructor() { } +export class UnitDetailsComponent implements OnInit { + @ViewChild('box') box: ElementRef; + constructor(private fb: FormBuilder,private renderer: Renderer2,private el: ElementRef) { + this.validateForm = this.fb.group({ + userName: [''], + email: [''], + password: [''], + confirm: [''], + comment: [''] + }); + } + aaa="山东小满园" + validateForm!: FormGroup; ngOnInit(): void { } + submitForm(value: { userName: string; email: string; password: string; confirm: string; comment: string }): void { + for (const key in this.validateForm.controls) { + this.validateForm.controls[key].markAsDirty(); + this.validateForm.controls[key].updateValueAndValidity(); + } + console.log(value); + } + resetForm(e: MouseEvent): void { + e.preventDefault(); + this.validateForm.reset(); + for (const key in this.validateForm.controls) { + this.validateForm.controls[key].markAsPristine(); + this.validateForm.controls[key].updateValueAndValidity(); + } + } + validateConfirmPassword(): void { + setTimeout(() => this.validateForm.controls.confirm.updateValueAndValidity()); + } + + exportClick() { + console.log(this.box); + // return + const htmlString = ` + + + + Document + + + `+this.box.nativeElement.innerHTML+` + +` + const fileData = asBlob(htmlString).then((data:any) => { + saveAs(data, 'file.docx') // 保存为docx文件 + }) + + } + back() { window.history.back() } + } diff --git a/src/app/home/basic-info/unit/unit.component.html b/src/app/home/basic-info/unit/unit.component.html index be92b1e..8c22bb9 100644 --- a/src/app/home/basic-info/unit/unit.component.html +++ b/src/app/home/basic-info/unit/unit.component.html @@ -1,10 +1,11 @@
+
+ 单位基本信息 + +
- +
@@ -14,7 +15,7 @@ - + @@ -26,26 +27,26 @@ - + - +
- +   - +
- - - + + +
diff --git a/src/app/home/basic-info/unit/unit.component.scss b/src/app/home/basic-info/unit/unit.component.scss index 210d71a..d9814c7 100644 --- a/src/app/home/basic-info/unit/unit.component.scss +++ b/src/app/home/basic-info/unit/unit.component.scss @@ -7,7 +7,19 @@ padding: 20px; font-size: 15px; } - + .lefttop { + text-align: left; + margin-bottom: 10px; + border-bottom: 1px solid #eee; + span { + color: #000D21; + margin-right: 16px; + } + + span:nth-child(2) { + color: rgba(36, 36, 36, 0.24); + } + } .topbox { width: 100%; height: 36px; @@ -15,16 +27,7 @@ align-items: center; justify-content: space-between; - .lefttop { - span:nth-child(1) { - color: #000D21; - margin-right: 16px; - } - - span:nth-child(2) { - color: rgba(36, 36, 36, 0.24); - } - } + .righttop { height: 36px; diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html index 9f8690f..bdb26c0 100644 --- a/src/app/pages/login/login.component.html +++ b/src/app/pages/login/login.component.html @@ -10,7 +10,7 @@