From 16dc07cd9b9da473bd337f4cd12466d2d2767ed7 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Tue, 9 Nov 2021 14:29:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=A0=E6=B2=B9=E6=9C=BAUI=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../left-domain/left-domain.component.html | 25 +++++++++++++- .../left-domain/left-domain.component.scss | 34 ++++++++++++++----- src/styles.scss | 10 ++++++ 3 files changed, 60 insertions(+), 9 deletions(-) diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html index 9a9c897..7f3fd0c 100644 --- a/src/app/pages/left-domain/left-domain.component.html +++ b/src/app/pages/left-domain/left-domain.component.html @@ -2,7 +2,7 @@
-
+

北京市第十九加油站

北京市朝阳区朝外大街关东店33号

@@ -16,6 +16,29 @@
+ +
+
+

一类加油机

+
+
+

品牌

+

超大牌

+

油枪数量

+

油品品号

+

油泵类型

+
+
+

超大牌

+

2

+

4

+

92#

+

自吸泵

+
+
+
+
+
diff --git a/src/app/pages/left-domain/left-domain.component.scss b/src/app/pages/left-domain/left-domain.component.scss index f21190a..1b22cdf 100644 --- a/src/app/pages/left-domain/left-domain.component.scss +++ b/src/app/pages/left-domain/left-domain.component.scss @@ -33,16 +33,34 @@ } } -.interval{ margin-top: 10px; border-bottom: 1px solid rgb(197, 226, 245); } -.baseInfo{ - width: 100%; - height: 100%; - overflow-y: auto; - padding: 0 10px; - p{ height: 20px; line-height: 20px; padding-left: 10px; } - .title{ font-size: 16px; margin-bottom: 20px; } +.title{ font-size: 16px; height: 20px; line-height: 20px; margin-bottom: 20px; } //头部header +.publicBox{ width: 100%; height: 100%; overflow-y: auto; padding: 0 20px; } +.baseInfo{ //基本信息 + .interval{ margin-top: 10px; border-bottom: 1px solid rgb(197, 226, 245); } //分隔div + p{ height: 20px; line-height: 20px; } .titleBotton{ background: #2399FF; border-radius: 3px; height: 20px; line-height: 20px; font-size: 12px; margin-left: 5px; padding: 0 5px; border: none; outline: none; } .text{ font-size: 14px; margin-bottom: 15px; } .textIcon{ width: 20px; height: 20px; vertical-align: top; margin-right: 5px; } .textImage{ margin-bottom: 15px; height: auto; line-height: normal; img{ width: auto; height: 130px; } } +} +.refueller{ //加油机 + .interval{ margin-top: 10px; } //分隔div + .table{ + width: 100%; + border: 1px solid #91CCFF; + border-bottom: none; + display: flex; + p{ height: 32px; line-height: 32px; margin: 0px; } + .tableHeader{ + flex: 4; + text-align: right; + color: #23D9FF; + p{ padding-right: 15px; border-right: 1px solid #91CCFF; border-bottom: 1px solid #91CCFF; background: rgba(145, 204, 255, 0.2); } + } + .tableContent{ + flex: 6; + text-align: left; + p{ padding-left: 20px; border-bottom: 1px solid #91CCFF; } + } + } } \ No newline at end of file diff --git a/src/styles.scss b/src/styles.scss index f53bed5..e2f0095 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -102,5 +102,15 @@ h1 { font-size: 16px; } +//滚动条样式 +::-webkit-scrollbar { + width: 5px; +} +::-webkit-scrollbar-thumb { + background-image: linear-gradient(#2495f8,#1c73c2,#02233f,); +} +::-webkit-scrollbar-track { + background-color: #0d4070; +} From 4da00987ea7e7de5bce1f119b0a90b3b6dea004c Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Tue, 9 Nov 2021 15:36:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/plan/plan.component.html | 9 ++++++--- src/app/pages/plan/plan.component.scss | 20 ++++++++++++-------- src/app/pages/plan/plan.component.ts | 18 +++++++++++++----- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html index d626cd2..d872530 100644 --- a/src/app/pages/plan/plan.component.html +++ b/src/app/pages/plan/plan.component.html @@ -59,7 +59,7 @@
- +
@@ -73,10 +73,13 @@
-
+
+ + +
- +
diff --git a/src/app/pages/plan/plan.component.scss b/src/app/pages/plan/plan.component.scss index c98eb3c..789ec7e 100644 --- a/src/app/pages/plan/plan.component.scss +++ b/src/app/pages/plan/plan.component.scss @@ -212,27 +212,31 @@ //右上角快捷栏 .rightTopFast{ - width: 340px; + width: 400px; height: 38px; position: absolute; right: 1px; top: 3%; - overflow: hidden; - box-sizing: border-box; display: flex; >div { height: 38px; border-radius: 5px; } button { - width: 36px; - height: 36px; + width: 38px; + height: 38px; border: none; outline: none; background-color: transparent; color: #fff; cursor: pointer; + padding: 0; + } + .save{ + margin: 0 10px; + button{ background-color: #0080FF; border-radius: 5px; } + button:first-child{ margin-right: 10px; } + .anticon{ font-size: 20px; line-height: 40px; } //字体图标 } .publicFast { - box-sizing: border-box; - padding: 1px 3px; + padding: 0px 3px; background-color: rgba(0,0,0,0.5); } .leftFast { @@ -244,7 +248,7 @@ .leftFastIsTure { border: 1px solid #fff; } //吸附样式 } .leftFunction { - margin: 0 10px; + margin-right: 10px; } .selectRightTopFast { border: 1px solid #fff; } //选种样式 } \ No newline at end of file diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index 2bd0841..c87e627 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -110,18 +110,20 @@ export class PlanComponent implements OnInit { this.isShowChildComponent && this.leftDomain ? this.leftDomain.initComponent(type) : null; //手动初始化子组件 this.selectFence = type this.isShowChildComponent = true - type > 0 && type < 7 ? buildingWindow.showJYZInfoModel(fenceType, true) : null + buildingWindow.showJYZInfoModel(fenceType, true) } else { //取消选中 this.selectFence = -1 this.isShowChildComponent = false - type > 0 && type < 7 ? buildingWindow.showJYZInfoModel(fenceType, false) : null + buildingWindow.showJYZInfoModel(fenceType, false) } } //获取 头部功能栏Type getFenceType(type: number): JYZInfoMoudleType { let fenceType - if (type === 1) { + if (type === 0) { + fenceType = JYZInfoMoudleType.JBXX + } else if (type === 1) { fenceType = JYZInfoMoudleType.JYJ } else if (type === 2) { fenceType = JYZInfoMoudleType.YG @@ -133,6 +135,8 @@ export class PlanComponent implements OnInit { fenceType = JYZInfoMoudleType.SYG } else if (type === 6) { fenceType = JYZInfoMoudleType.YQHSGX + } else if (type === 7) { + fenceType = JYZInfoMoudleType.YJCZ } return fenceType } @@ -324,8 +328,12 @@ export class PlanComponent implements OnInit { } //保存 - preserve() { - ToolbarWindow.instance.onBtnSave(); + preserve(type: boolean) { + if (type) { + ToolbarWindow.instance.onBtnSave(); + } else { + ToolbarWindow.instance.saveShowMoudleData(); + } } //通用 消息通知栏 From 3b49df5e249305707e00f6d681ef1cdffcd93613 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Tue, 9 Nov 2021 16:37:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B6=88=E9=98=B2=E8=AE=BE=E6=96=BDUI?= =?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 | 32 +++++++++++++++++- .../left-domain/left-domain.component.scss | 11 +++++++ .../left-domain/left-domain.component.ts | 33 ++++++++++++++++++- src/app/pages/pages.module.ts | 4 ++- 4 files changed, 77 insertions(+), 3 deletions(-) diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html index 7f3fd0c..73e12e9 100644 --- a/src/app/pages/left-domain/left-domain.component.html +++ b/src/app/pages/left-domain/left-domain.component.html @@ -19,7 +19,7 @@
-

一类加油机

+

1类加油机

品牌

@@ -39,6 +39,36 @@
+ +
+
+

1号油罐

+
+
+

油品品号

+

油罐容积

+

安全容积

+

数量

+

罐区

+

油罐类型

+
+
+

92#

+

200L

+

180L

+

1

+

独立罐区

+

防渗罐池

+
+
+
+
+ + +
+ +
+
diff --git a/src/app/pages/left-domain/left-domain.component.scss b/src/app/pages/left-domain/left-domain.component.scss index 1b22cdf..fe01a1e 100644 --- a/src/app/pages/left-domain/left-domain.component.scss +++ b/src/app/pages/left-domain/left-domain.component.scss @@ -63,4 +63,15 @@ p{ padding-left: 20px; border-bottom: 1px solid #91CCFF; } } } +} +.oilTank{ //油管设备 + +} +.fireFacilities{ //消防设施 + .ant-tree{ + height: 32px; + line-height: 32px; + background-color: transparent; + color: #C4E2FC; + } } \ 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 a2e06bc..80e56ad 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 { Component, OnInit, ViewChild } from '@angular/core'; +import { NzTreeComponent, NzTreeNodeOptions } from 'ng-zorro-antd/tree'; import { PlanComponent } from '../plan/plan.component'; @Component({ @@ -15,6 +16,8 @@ export class LeftDomainComponent implements OnInit { } beforeFence: number; //当前选中功能栏 + @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent; + treeData: NzTreeNodeOptions[] = treeData.nodes; //tree data //初始化组件 initComponent(type?: number) { @@ -38,3 +41,31 @@ export class LeftDomainComponent implements OnInit { } + +export class treeData { + static nodes: NzTreeNodeOptions[] = [ + { + title: '灭火器', + key: '1', + selectable: false, + children: [ + { title: '4KG手提干粉灭火器', key: '1', selectable: false, }, + { title: '4KG手提泡沫灭火器', key: '2', selectable: false, }, + { title: '4KG手提二氧化碳灭火器', key: '3', selectable: false, }, + { title: '35KG手推灭火器', key: '4', selectable: false, }, + ] + }, + { + title: '灭火毯', + key: '2', + selectable: false, + children: [] + }, + { + title: '消防锹', + key: '3', + selectable: false, + children: [] + }, + ]; +} diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 5cb9708..2780709 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -29,6 +29,7 @@ import { NzPaginationModule } from 'ng-zorro-antd/pagination'; import { NzDropDownModule } from 'ng-zorro-antd/dropdown'; import { NzMessageModule } from 'ng-zorro-antd/message'; import { NzSpinModule } from 'ng-zorro-antd/spin'; +import { NzTreeModule } from 'ng-zorro-antd/tree'; import { TodayWarningAdminComponent } from './today-warning-admin/today-warning-admin.component'; import { CriminalRecordsAdminComponent } from './criminal-records-admin/criminal-records-admin.component'; import { EquipmentInfoComponent } from './equipment-info/equipment-info.component'; @@ -63,7 +64,8 @@ import { EditequipmentComponent } from './equipment-info/editequipment/editequip NzPaginationModule, NzDropDownModule, NzMessageModule, - NzSpinModule + NzSpinModule, + NzTreeModule ] }) export class PagesModule { }