From 5e2e219adaf7a23e4a7724ad9cc117c114229c6e Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 8 Nov 2021 17:20:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=AE=8C=E6=88=90=E5=99=A8?= =?UTF-8?q?=E6=9D=90=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addequipment/addequipment.component.html | 1 + .../addequipment/addequipment.component.scss | 0 .../addequipment/addequipment.component.ts | 15 +++ .../editequipment.component.html | 1 + .../editequipment.component.scss | 0 .../editequipment/editequipment.component.ts | 15 +++ .../equipment-info.component.html | 83 ++++++++++++- .../equipment-info.component.scss | 117 ++++++++++++++++++ .../equipment-info.component.ts | 16 ++- src/app/pages/pages.module.ts | 4 +- src/theme.less | 5 +- 11 files changed, 249 insertions(+), 8 deletions(-) create mode 100644 src/app/pages/equipment-info/addequipment/addequipment.component.html create mode 100644 src/app/pages/equipment-info/addequipment/addequipment.component.scss create mode 100644 src/app/pages/equipment-info/addequipment/addequipment.component.ts create mode 100644 src/app/pages/equipment-info/editequipment/editequipment.component.html create mode 100644 src/app/pages/equipment-info/editequipment/editequipment.component.scss create mode 100644 src/app/pages/equipment-info/editequipment/editequipment.component.ts diff --git a/src/app/pages/equipment-info/addequipment/addequipment.component.html b/src/app/pages/equipment-info/addequipment/addequipment.component.html new file mode 100644 index 0000000..39fbbb6 --- /dev/null +++ b/src/app/pages/equipment-info/addequipment/addequipment.component.html @@ -0,0 +1 @@ +

addequipment works!

diff --git a/src/app/pages/equipment-info/addequipment/addequipment.component.scss b/src/app/pages/equipment-info/addequipment/addequipment.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/equipment-info/addequipment/addequipment.component.ts b/src/app/pages/equipment-info/addequipment/addequipment.component.ts new file mode 100644 index 0000000..d4bf6b1 --- /dev/null +++ b/src/app/pages/equipment-info/addequipment/addequipment.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-addequipment', + templateUrl: './addequipment.component.html', + styleUrls: ['./addequipment.component.scss'] +}) +export class AddequipmentComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/pages/equipment-info/editequipment/editequipment.component.html b/src/app/pages/equipment-info/editequipment/editequipment.component.html new file mode 100644 index 0000000..f5d5238 --- /dev/null +++ b/src/app/pages/equipment-info/editequipment/editequipment.component.html @@ -0,0 +1 @@ +

editequipment works!

diff --git a/src/app/pages/equipment-info/editequipment/editequipment.component.scss b/src/app/pages/equipment-info/editequipment/editequipment.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/equipment-info/editequipment/editequipment.component.ts b/src/app/pages/equipment-info/editequipment/editequipment.component.ts new file mode 100644 index 0000000..6aacf38 --- /dev/null +++ b/src/app/pages/equipment-info/editequipment/editequipment.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-editequipment', + templateUrl: './editequipment.component.html', + styleUrls: ['./editequipment.component.scss'] +}) +export class EditequipmentComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/pages/equipment-info/equipment-info.component.html b/src/app/pages/equipment-info/equipment-info.component.html index 47b9f19..d7c1748 100644 --- a/src/app/pages/equipment-info/equipment-info.component.html +++ b/src/app/pages/equipment-info/equipment-info.component.html @@ -1 +1,82 @@ -

equipment-info works!

+ +
+
+
+ +
+
+
+ 消防器材列表 +
+
+
+ + + + + + + + +
+ +
+
+
+
+
+
+ 消防器材 +
+
+ 规格 +
+
+ 购入日期 +
+
+ 生产日期 +
+
+ 有效期至 +
+
+ 操作 +
+
+
+
+
+ 干粉灭火器 +
+
+ 普通 +
+
+ 2021.01.05 +
+
+ 2021.01.05 +
+
+ 2021.01.05 +
+
+ + 编辑 + + + 删除 + +
+
+
+
+ +
+
+
diff --git a/src/app/pages/equipment-info/equipment-info.component.scss b/src/app/pages/equipment-info/equipment-info.component.scss index e69de29..251eb3c 100644 --- a/src/app/pages/equipment-info/equipment-info.component.scss +++ b/src/app/pages/equipment-info/equipment-info.component.scss @@ -0,0 +1,117 @@ +.box { + width: 100%; + height: 100%; + display: flex; + justify-content: center; +} + +.content { + width: 1000px; + height: 100%; + display: flex; + flex-direction: column; + + .title { + height: 48px; + width: 100%; + margin: 16px 0; + } + + .topbox { + width: 1000px; + height: 34px; + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 16px; + + .lefttop { + span { + color: #C4E2FC; + font-size: 16px; + } + } + + .righttop { + height: 34px; + display: flex; + + button { + margin-left: 16px; + background: #143c61; + color: #91CCFF; + border-radius: 0px; + border: 1px solid #36A2FF; + width: 64px; + } + + nz-input-group { + height: 32px; + } + } + } + + .tablebox { + flex: 1; + display: flex; + flex-direction: column; + align-items: center; + overflow: hidden; + + .table { + color: white; + flex: 1; + width: 100%; + display: flex; + flex-direction: column; + overflow: hidden; + font-size: 16px; + + .th { + height: 40px; + line-height: 40px; + color: #23D9FF; + background: rgba(35, 153, 255, 0.2); + border: 1px solid rgba(35, 217, 255, 0.4); + // box-shadow: 0 0 3px 1px rgba(35, 217, 255, 0.4); + } + + .tbody { + flex: 1; + overflow-y: auto; + color: #C4E2FC; + font-size: 15px; + + .tr { + height: 40px; + line-height: 40px; + border-bottom: 1px solid #115188; + + .btn { + span { + color: #2399FF; + cursor: pointer; + } + + span:nth-child(1) { + margin-right: 18px; + } + } + } + } + } + + .pagination { + height: 32px; + margin: 15px 0; + display: flex; + align-items: center; + justify-content: center; + } + + ::-webkit-scrollbar { + width: 0px; + } + + } +} diff --git a/src/app/pages/equipment-info/equipment-info.component.ts b/src/app/pages/equipment-info/equipment-info.component.ts index e6bbd00..0acf9db 100644 --- a/src/app/pages/equipment-info/equipment-info.component.ts +++ b/src/app/pages/equipment-info/equipment-info.component.ts @@ -1,15 +1,23 @@ import { Component, OnInit } from '@angular/core'; - +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @Component({ selector: 'app-equipment-info', templateUrl: './equipment-info.component.html', styleUrls: ['./equipment-info.component.scss'] }) export class EquipmentInfoComponent implements OnInit { - - constructor() { } - + validateForm!: FormGroup; + constructor(private fb: FormBuilder) { } + arr = [1,1,1,1,1,1,1,1,1] ngOnInit(): void { + this.validateForm = this.fb.group({ + search: [null] + }); } + submitForm(){ + } + add(){ + + } } diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 9068a3d..5cb9708 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -34,8 +34,10 @@ import { CriminalRecordsAdminComponent } from './criminal-records-admin/criminal import { EquipmentInfoComponent } from './equipment-info/equipment-info.component'; import { OilStationInfoComponent } from './oil-station-info/oil-station-info.component'; import { LeftDomainComponent } from './left-domain/left-domain.component'; +import { AddequipmentComponent } from './equipment-info/addequipment/addequipment.component'; +import { EditequipmentComponent } from './equipment-info/editequipment/editequipment.component'; @NgModule({ - declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent], + declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent, AddequipmentComponent, EditequipmentComponent], imports: [ PagesRoutingModule, CommonModule, diff --git a/src/theme.less b/src/theme.less index 88ed239..60a9c9b 100644 --- a/src/theme.less +++ b/src/theme.less @@ -4,7 +4,8 @@ //分页器 #recordsboxadmin, -#recordsbox { +#recordsbox, +#equipmentInfo { .ant-pagination-total-text, .ant-pagination-options-quick-jumper { @@ -111,7 +112,7 @@ //登录页input -#login { +#login,#equipmentInfo { nz-input-group, input {