From 26efdd150211c431a09cb7dcac3e4fcf948ada0f Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Mon, 8 Nov 2021 11:03:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../left-domain/left-domain.component.html | 1 + .../left-domain/left-domain.component.scss | 0 .../left-domain/left-domain.component.ts | 15 +++++ src/app/pages/pages.module.ts | 3 +- src/app/pages/plan/plan.component.html | 11 ++++ src/app/pages/plan/plan.component.scss | 56 ++++++++++++++++++- src/styles.scss | 4 +- 7 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 src/app/pages/left-domain/left-domain.component.html create mode 100644 src/app/pages/left-domain/left-domain.component.scss create mode 100644 src/app/pages/left-domain/left-domain.component.ts diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html new file mode 100644 index 0000000..3c1d0af --- /dev/null +++ b/src/app/pages/left-domain/left-domain.component.html @@ -0,0 +1 @@ +

left-domain works!

diff --git a/src/app/pages/left-domain/left-domain.component.scss b/src/app/pages/left-domain/left-domain.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts new file mode 100644 index 0000000..b814f02 --- /dev/null +++ b/src/app/pages/left-domain/left-domain.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-left-domain', + templateUrl: './left-domain.component.html', + styleUrls: ['./left-domain.component.scss'] +}) +export class LeftDomainComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index ddab50b..2401970 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -31,8 +31,9 @@ import { NzMessageModule } from 'ng-zorro-antd/message'; import { NzSpinModule } from 'ng-zorro-antd/spin'; import { TodayWarningAdminComponent } from './today-warning-admin/today-warning-admin.component'; import { CriminalRecordsAdminComponent } from './criminal-records-admin/criminal-records-admin.component'; +import { LeftDomainComponent } from './left-domain/left-domain.component'; @NgModule({ - declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent,], + declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent,], imports: [ PagesRoutingModule, CommonModule, diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html index f526646..4fd0425 100644 --- a/src/app/pages/plan/plan.component.html +++ b/src/app/pages/plan/plan.component.html @@ -15,6 +15,17 @@
+ +
+
+
+

{{allFence[selectFence]}}

+
+
+
+
+ +
diff --git a/src/app/pages/plan/plan.component.scss b/src/app/pages/plan/plan.component.scss index 11fe2a3..0364b27 100644 --- a/src/app/pages/plan/plan.component.scss +++ b/src/app/pages/plan/plan.component.scss @@ -62,6 +62,60 @@ .selectRightTopFast { border: 1px solid #fff; } //选种样式 } +//左侧子组件 +.leftChildComponent{ + width: 300px; + height: 90%; + position: absolute; + left: 3%; + top: 0; + bottom: 0; + margin: auto;/*这行代码是关键*/ + z-index: 10; + box-sizing: border-box; + padding: 5px; + color: #fff; + background: linear-gradient(360deg, #000D21 0%, rgba(0, 59, 110, 0.8) 100%); + display: flex; + flex-direction: column; + .leftChildHeader{ + display: flex; + width: 95%; + height: 30px; + line-height: 30px; + margin: 10px auto; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.8) 50%, rgba(35, 153, 255, 0) 100%); + div:first-child{ + width: 30px; + height: 30px; + border: 1px solid #2399FF; + box-shadow: 0px 2px 8px #2399FF; + border-radius: 50%; + text-align: center; + } + div:nth-child(2){ + box-sizing: border-box; + margin: 0 10px; + font-weight: 900; + font-size: 16px; + letter-spacing: 3px; + font-style: italic; + flex: 1; + } + div:last-child{ + width: 30px; + height: 30px; + text-align: center; + cursor: pointer; + .anticon{ color: #91CCFF; } //字体图标 + } + } + .leftChildCenter{ + flex: 1; + overflow: hidden; + } +} + //左侧建筑 .showLeftBuilding{ width: 30px; @@ -90,7 +144,7 @@ transition: margin-left 0.5s; display: flex; flex-direction: column; - .hideLeft { text-align: right; color: #fff; padding: 3px 5px; z-index: 10; } + .hideLeft { text-align: right; color: #fff; padding: 3px 5px; z-index: 1; } .leftHeader { overflow: hidden; text-align: center; diff --git a/src/styles.scss b/src/styles.scss index 92c1a83..e52ce64 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -107,10 +107,10 @@ h1 { width: 10px; } ::-webkit-scrollbar-thumb { - background-image: linear-gradient(#2495f8, #1c73c2,#0a3d6a, #061d3c); + background-image: inear-gradient(180deg, #2399FF 0%, rgba(0, 13, 33, 0.4) 100%); } ::-webkit-scrollbar-track { - background-color: #061d3c; + background-color: rgba(0, 13, 33, 0.41); } From ef1c86f596bf70ff6a79143dac9ad2a85671bbf5 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Mon, 8 Nov 2021 14:54:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=AD=90=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../left-domain/left-domain.component.html | 13 ++++++- .../left-domain/left-domain.component.scss | 34 +++++++++++++++++++ .../left-domain/left-domain.component.ts | 25 ++++++++++++++ src/app/pages/plan/plan.component.html | 4 +-- src/app/pages/plan/plan.component.scss | 5 ++- src/app/pages/plan/plan.component.ts | 6 +++- 6 files changed, 80 insertions(+), 7 deletions(-) diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html index 3c1d0af..037c440 100644 --- a/src/app/pages/left-domain/left-domain.component.html +++ b/src/app/pages/left-domain/left-domain.component.html @@ -1 +1,12 @@ -

left-domain works!

+
+ +
+ +
+ +
+ + +
+ +
diff --git a/src/app/pages/left-domain/left-domain.component.scss b/src/app/pages/left-domain/left-domain.component.scss index e69de29..6f18b6c 100644 --- a/src/app/pages/left-domain/left-domain.component.scss +++ b/src/app/pages/left-domain/left-domain.component.scss @@ -0,0 +1,34 @@ +.childContent{ + width: 100%; + height: 100%; + overflow: hidden; + display: flex; + flex-direction: column; + font-family: Source Han Sans CN; + color: #fff; + .childCenter{ + flex: 1; + overflow-x: hidden; + overflow-y: auto; + } + .childBottom{ + width: 100%; + height: 50px; + line-height: 50px; + text-align: center; + background: linear-gradient(360deg, #000D21 0%, #003B6E 100%); + box-shadow: 0px -2px 6px #36A2FF; + button{ + width: 35%; + height: 32px; + line-height: 32px; + padding: 0; + margin: 0 10px; + color: #91CCFF; + background: rgba(0, 129, 255, 0.61); + border: 1px solid #36A2FF; + cursor: pointer; + .anticon{ margin-right: 3px; } //字体图标 + } + } +} \ No newline at end of file diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts index b814f02..a2e06bc 100644 --- a/src/app/pages/left-domain/left-domain.component.ts +++ b/src/app/pages/left-domain/left-domain.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { PlanComponent } from '../plan/plan.component'; @Component({ selector: 'app-left-domain', @@ -10,6 +11,30 @@ export class LeftDomainComponent implements OnInit { constructor() { } ngOnInit(): void { + this.initComponent() } + beforeFence: number; //当前选中功能栏 + + //初始化组件 + initComponent(type?: number) { + if (type != undefined && type != null) { + this.beforeFence = type + } else { + this.beforeFence = PlanComponent.instance.selectFence + } + } + + //编辑信息 + editInfo() { + + } + + //导出Excel + deriveExcel() { + + } + + + } diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html index 4fd0425..d626cd2 100644 --- a/src/app/pages/plan/plan.component.html +++ b/src/app/pages/plan/plan.component.html @@ -16,13 +16,13 @@ -
+

{{allFence[selectFence]}}

-
+
diff --git a/src/app/pages/plan/plan.component.scss b/src/app/pages/plan/plan.component.scss index 0364b27..c98eb3c 100644 --- a/src/app/pages/plan/plan.component.scss +++ b/src/app/pages/plan/plan.component.scss @@ -72,9 +72,8 @@ bottom: 0; margin: auto;/*这行代码是关键*/ z-index: 10; - box-sizing: border-box; - padding: 5px; color: #fff; + transition: left 0.5s; background: linear-gradient(360deg, #000D21 0%, rgba(0, 59, 110, 0.8) 100%); display: flex; flex-direction: column; @@ -83,7 +82,7 @@ width: 95%; height: 30px; line-height: 30px; - margin: 10px auto; + margin: 15px auto; background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.8) 50%, rgba(35, 153, 255, 0) 100%); div:first-child{ width: 30px; diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index ee714f7..4c1043f 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, OnInit } from '@angular/core'; +import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { Game } from 'src/app/babylon/game'; import { LoginSatus } from 'src/app/babylon/controller/status/login-status'; import { StatusManager } from 'src/app/babylon/controller/status/status-manager'; @@ -17,6 +17,7 @@ import { FacilityWindow } from 'src/app/babylon/view/facility-window/facility-wi import { FacilityInfoUIItem } from 'src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item'; import { EventManager } from '@angular/platform-browser'; import { NzMessageService } from 'ng-zorro-antd/message'; +import { LeftDomainComponent } from '../left-domain/left-domain.component'; @@ -95,6 +96,7 @@ export class PlanComponent implements OnInit { allFence: string[] = ["基本信息", "加油机", "油罐设备", "消防设施", "安全疏散", "输油管线", "油气回收", "应急处置"]; //头部 功能栏 selectFence: number = -1; //选中 头部功能栏 isShowChildComponent: boolean = false; //是否 显示左侧子组件 + @ViewChild('leftDomain')leftDomain: LeftDomainComponent; //子组件引用 isOpenAwning: boolean = true; //是否 打开罩棚 selectMeasure: number = 0; //当前选择 测量工具 @@ -104,6 +106,7 @@ export class PlanComponent implements OnInit { let buildingWindow: BuildingWindow = this.beforeOneSatus.buildingWindow; let fenceType: JYZInfoMoudleType = this.getFenceType(type) if (this.selectFence != type) { + this.isShowChildComponent && this.leftDomain? this.leftDomain.initComponent(type) : null; //手动初始化子组件 this.selectFence = type this.isShowChildComponent = true type>0 && type<7? buildingWindow.showJYZInfoModel(fenceType, true) : null @@ -136,6 +139,7 @@ export class PlanComponent implements OnInit { //切换 头部罩棚 toggleHeaderAwning(isOpen: boolean) { this.isOpenAwning = isOpen + ToolbarWindow.instance.showZP(isOpen) } //切换 测量工具 From 73a26b2cbf27c856409a49eaaabd1973a510abf5 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 8 Nov 2021 16:01:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=EF=BC=8C=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../criminal-records-admin.component.html | 2 +- .../criminal-records.component.html | 2 +- .../equipment-info.component.html | 1 + .../equipment-info.component.scss | 0 .../equipment-info.component.ts | 15 ++ src/app/pages/home/home.component.html | 6 + .../oil-station-info.component.html | 1 + .../oil-station-info.component.scss | 0 .../oil-station-info.component.ts | 15 ++ src/app/pages/pages-routing.module.ts | 7 +- src/app/pages/pages.module.ts | 4 +- .../today-warning-admin.component.html | 2 +- .../today-warning-admin.component.scss | 34 +--- .../today-warning.component.html | 2 +- .../today-warning.component.scss | 27 --- src/app/service/tree.service.ts | 14 +- .../navigation/navigation.component.html | 39 +++- .../navigation/navigation.component.scss | 78 ++++++++ .../navigation/navigation.component.ts | 4 +- .../organization/addor/addor.component.html | 21 ++ .../organization/addor/addor.component.scss | 0 .../organization/addor/addor.component.ts | 26 +++ .../organization/editor/editor.component.html | 21 ++ .../organization/editor/editor.component.scss | 0 .../organization/editor/editor.component.ts | 27 +++ .../organization/organization.component.html | 44 ++++- .../organization/organization.component.scss | 78 ++++++++ .../organization/organization.component.ts | 175 +++++++++++++++- .../role/addrole/addrole.component.html | 21 ++ .../role/addrole/addrole.component.scss | 0 .../role/addrole/addrole.component.ts | 38 ++++ .../role/editrole/editrole.component.html | 18 ++ .../role/editrole/editrole.component.scss | 0 .../role/editrole/editrole.component.ts | 38 ++++ .../role/role.component.html | 39 +++- .../role/role.component.scss | 54 +++++ .../system-management/role/role.component.ts | 127 +++++++++++- .../system-management-routing.module.ts | 13 +- .../system-management.module.ts | 48 ++++- .../user/adduser/adduser.component.html | 39 ++++ .../user/adduser/adduser.component.scss | 0 .../user/adduser/adduser.component.ts | 54 +++++ .../user/edituser/edituser.component.html | 39 ++++ .../user/edituser/edituser.component.scss | 0 .../user/edituser/edituser.component.ts | 57 ++++++ .../user/user.component.html | 64 +++++- .../user/user.component.scss | 87 ++++++++ .../system-management/user/user.component.ts | 186 +++++++++++++++++- src/app/ui/tabbar/tabbar.component.html | 4 +- src/app/ui/tabbar/tabbar.component.ts | 7 +- src/assets/images/icon/admin.png | Bin 0 -> 346 bytes src/assets/images/icon/organization.png | Bin 0 -> 329 bytes src/assets/images/icon/orgrey.png | Bin 0 -> 387 bytes src/assets/images/icon/power.png | Bin 0 -> 484 bytes src/assets/images/icon/role.png | Bin 0 -> 438 bytes src/assets/images/icon/user.png | Bin 0 -> 404 bytes src/assets/images/user.png | Bin 0 -> 2372 bytes src/assets/images/userbig.png | Bin 0 -> 8500 bytes src/styles.scss | 10 - src/theme.less | 172 +++++++++++----- 60 files changed, 1605 insertions(+), 155 deletions(-) create mode 100644 src/app/pages/equipment-info/equipment-info.component.html create mode 100644 src/app/pages/equipment-info/equipment-info.component.scss create mode 100644 src/app/pages/equipment-info/equipment-info.component.ts create mode 100644 src/app/pages/oil-station-info/oil-station-info.component.html create mode 100644 src/app/pages/oil-station-info/oil-station-info.component.scss create mode 100644 src/app/pages/oil-station-info/oil-station-info.component.ts create mode 100644 src/app/system-management/organization/addor/addor.component.html create mode 100644 src/app/system-management/organization/addor/addor.component.scss create mode 100644 src/app/system-management/organization/addor/addor.component.ts create mode 100644 src/app/system-management/organization/editor/editor.component.html create mode 100644 src/app/system-management/organization/editor/editor.component.scss create mode 100644 src/app/system-management/organization/editor/editor.component.ts create mode 100644 src/app/system-management/role/addrole/addrole.component.html create mode 100644 src/app/system-management/role/addrole/addrole.component.scss create mode 100644 src/app/system-management/role/addrole/addrole.component.ts create mode 100644 src/app/system-management/role/editrole/editrole.component.html create mode 100644 src/app/system-management/role/editrole/editrole.component.scss create mode 100644 src/app/system-management/role/editrole/editrole.component.ts create mode 100644 src/app/system-management/user/adduser/adduser.component.html create mode 100644 src/app/system-management/user/adduser/adduser.component.scss create mode 100644 src/app/system-management/user/adduser/adduser.component.ts create mode 100644 src/app/system-management/user/edituser/edituser.component.html create mode 100644 src/app/system-management/user/edituser/edituser.component.scss create mode 100644 src/app/system-management/user/edituser/edituser.component.ts create mode 100644 src/assets/images/icon/admin.png create mode 100644 src/assets/images/icon/organization.png create mode 100644 src/assets/images/icon/orgrey.png create mode 100644 src/assets/images/icon/power.png create mode 100644 src/assets/images/icon/role.png create mode 100644 src/assets/images/icon/user.png create mode 100644 src/assets/images/user.png create mode 100644 src/assets/images/userbig.png diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html index 8ad4b46..050e9bd 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html @@ -1,4 +1,4 @@ -
+