From 9ebb13d87f090608a77936a96199b481b4de5655 Mon Sep 17 00:00:00 2001 From: baozw Date: Mon, 21 Sep 2020 19:31:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E5=A4=84=E7=BD=AE=E8=A6=81=E7=82=B9]?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E8=B0=83=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../disposal-node.component.html | 27 ++++++- .../disposal-node.component.scss | 73 ++++++++++++++++++- .../disposal-node/disposal-node.component.ts | 16 ++-- 3 files changed, 105 insertions(+), 11 deletions(-) diff --git a/src/app/ui/disposal-node/disposal-node.component.html b/src/app/ui/disposal-node/disposal-node.component.html index 2d1a5a6..3b3975f 100644 --- a/src/app/ui/disposal-node/disposal-node.component.html +++ b/src/app/ui/disposal-node/disposal-node.component.html @@ -12,12 +12,35 @@
组织指挥要点
+
+ volume_up +
+
+
泵房
+
控制室
+ +
+
+
+ settings_voice +
+
+ 按住说话 +
+
+ search +
+
+
+
+ +
-
+
-
\ No newline at end of file +
\ No newline at end of file diff --git a/src/app/ui/disposal-node/disposal-node.component.scss b/src/app/ui/disposal-node/disposal-node.component.scss index 468948e..a7a769f 100644 --- a/src/app/ui/disposal-node/disposal-node.component.scss +++ b/src/app/ui/disposal-node/disposal-node.component.scss @@ -13,12 +13,12 @@ align-items:center; min-height: 40px; box-sizing: border-box; - margin: 3px 0; + margin: 0 0; .bigeditdeletebtn{ - border:1px solid #0E79A9; + margin-right: 0px; - height: 80%; + height: 100%; display: flex; flex-direction: column; // align-items:center;/*由于flex-direction: column，因此align-items代表的是水平方向*/ @@ -37,10 +37,74 @@ cursor: pointer; //background-image: url("../../../assets/images/标签经过.png") ; } + .bigTalkBox{ + user-select: none; + .titleIcon{ + font-size: 33px; + vertical-align: sub; + color: white; + } + .talkBox{ + width: 309px; + height: 326px; + border: 1px solid #30bbec; + background-color: #013a64; + opacity: .9 ; + position: absolute; + top: 32px; + right:4px; + z-index: 2000; + .btndiv{ + div{ + border-radius: 18px; + width: 70px; + height: 30px; + text-align: center; + line-height: 30px; + display: inline-block; + font-size: 13px; + color: white; + cursor: pointer; + + } + div:nth-child(1){ + background-color: #fe9400; + margin: 10px; + } + div:nth-child(2){ + background-color: #f95e5a; + } + } + .bottomDiv{ + position: absolute; + bottom:6px; + width: 100%; + height: 32px; + line-height: 32px; + display: flex; + color: white; + text-align: center; + div:nth-child(1){ + flex: 1; + } + div:nth-child(2){ + flex: 6; + color: #409eff; + background: url('../../../assets/images/输入框.png'); + background-size: 100% 100%; + } + div:nth-child(3){ + flex: 1; + + } + } + } + } } //中间文字区域 .wenzi{ + border-top:1px solid #30bbec; overflow:auto; height: 85%; width: 100%; @@ -48,6 +112,9 @@ .h3{ color: #CC5D13; } + + font-size: 20px; + .scrollbar{ width: 30px; height: 300px; diff --git a/src/app/ui/disposal-node/disposal-node.component.ts b/src/app/ui/disposal-node/disposal-node.component.ts index c337470..7effea5 100644 --- a/src/app/ui/disposal-node/disposal-node.component.ts +++ b/src/app/ui/disposal-node/disposal-node.component.ts @@ -21,7 +21,11 @@ export class DisposalNodeComponent implements OnInit { } checkedBuildingIndex:number = -1 chooseBiaoti=1 - + //打开说话框 + isOpenTalk = false + openTalkDiv(){ + this.isOpenTalk = !this.isOpenTalk + } //鼠标移入边框变颜色 yiru(yirunum){ var tedian=document.getElementById(yirunum) @@ -45,8 +49,8 @@ export class DisposalNodeComponent implements OnInit { tedian.style.border="1px solid #0E79A9" zhuyi.style.border="1px solid #0E79A9" chuzhi.style.border="1px solid #0E79A9" - chuzhiYuanze+=`

一、处置原则

`; - chuzhiYuanze+='（一）灾情处置应坚持“' + chuzhiYuanze+=`

一、处置原则

`; + chuzhiYuanze+='（一）灾情处置应坚持“' chuzhiYuanze+='救人第一、科学施救' chuzhiYuanze+='”的原则，严禁在不熟悉情况时擅自行动，严禁冒险蛮干。
' chuzhiYuanze+='（二）现场情况基本清楚，无爆炸等次生灾害风险，灾情易于辨识研判，在技术人员指导下，果断下达指令开展灭火救援行动。
' @@ -67,7 +71,7 @@ export class DisposalNodeComponent implements OnInit { tedian.style.border="1px solid #30BBEC" zhuyi.style.border="1px solid #0E79A9" chuzhi.style.border="1px solid #0E79A9" - chuzhiYuanze+='（1） 爆炸引起燃烧。油罐发生爆炸后，随即易形成稳定燃烧。爆炸后，从罐顶或裂口处流出的油品或因罐体移位流出的油品，易造成地面流淌性燃烧。
' + chuzhiYuanze+='
（1） 爆炸引起燃烧。油罐发生爆炸后，随即易形成稳定燃烧。爆炸后，从罐顶或裂口处流出的油品或因罐体移位流出的油品，易造成地面流淌性燃烧。
' chuzhiYuanze+='（2） 燃烧引起爆炸。在形成稳定燃烧的油罐的邻近油罐，在热辐射的作用下易发生爆炸，扩大火势。
' chuzhiYuanze+='（3） 火焰高，辐射热强。爆炸后在油罐破裂位置形成的稳定燃烧，其火焰高达几十米，并对其四周产生强烈的热辐射。
' chuzhiYuanze+='（4） 易形成沸溢与喷溅。由于重质油品具有“热波特性”，对含有一定水分或有水垫层的重质油品储罐发生火灾后，如果不能及时进行冷却控制，在其“热波特性”的作用下就会使油品内的乳化水或油层下的水垫层产生过热蒸汽，而导致发生油品的沸溢或喷溅现象。
' @@ -78,7 +82,7 @@ export class DisposalNodeComponent implements OnInit { tedian.style.border="1px solid #0E79A9" zhuyi.style.border="1px solid #30BBEC" chuzhi.style.border="1px solid #0E79A9" - chuzhiYuanze+='1、油罐火灾的辐射热强，参战人员应配有防高温、防辐射、防毒的防护装备。
' + chuzhiYuanze+='
1、油罐火灾的辐射热强，参战人员应配有防高温、防辐射、防毒的防护装备。
' chuzhiYuanze+='2、正确选择停车位置。消防车尽量停在上风或侧上风向，与燃烧油罐保持一定的安全距离。扑救重质油罐火灾时，消防车头应背向油罐，以备紧急撤离。作战行动中的部分车辆动画加上文字配音说明
' chuzhiYuanze+='3、注意观察火场情况变化，及时发现沸溢、喷溅征兆。
' chuzhiYuanze+='4、充分冷却，防止复燃。燃烧罐的火势被扑灭后，要继续对其实施冷却，直至使罐内油品温度降到燃点以下为止。设有保温层的原油罐可不予以冷却。轻质油品罐不会形成高温层，冷却的重点是液面以上的罐壁。救活的图片加上文字配音说明。
' @@ -95,7 +99,7 @@ export class DisposalNodeComponent implements OnInit { tedian.style.border="1px solid #0E79A9" zhuyi.style.border="1px solid #0E79A9" chuzhi.style.border="1px solid #30BBEC" - chuzhiYuanze+='

1、安全防护

' + chuzhiYuanze+='

1、安全防护

' chuzhiYuanze+='①应综合考虑风力风向、工艺流程、地形地势、封闭管井等因素，' chuzhiYuanze+='科学选择车辆站位和阵地设置；' chuzhiYuanze+='②科学设置内、外观察哨，通过单位DCS系统设内观察哨，重点监测着火罐及周边邻近罐的介质、压力、温度、液位以及预警等级；通过在外部设观察哨，实时观察燃烧烟雾、火焰以及罐体外形变化、颤动声响等，确保整个作战行动安全可控；
' From 14a06dffc2bbed3a23b8c29ea787c2581a424b08 Mon Sep 17 00:00:00 2001 From: Shaojihao <55341701@qq.com> Date: Mon, 21 Sep 2020 19:32:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/ui/dangerous/dangerous.component.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/ui/dangerous/dangerous.component.scss b/src/app/ui/dangerous/dangerous.component.scss index 3c70771..488243e 100644 --- a/src/app/ui/dangerous/dangerous.component.scss +++ b/src/app/ui/dangerous/dangerous.component.scss @@ -8,6 +8,7 @@ flex: 2%; width: 100%; padding-top: 10px; + font-size: 20px; div{ display: inline-block; width: 126px; From 449159634baab9dde38c2e212b35042e4bb3bc63 Mon Sep 17 00:00:00 2001 From: Shaojihao <55341701@qq.com> Date: Mon, 21 Sep 2020 19:40:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B9=B3=E9=9D=A2=E5=9B=BE=E6=9C=80=E5=B0=8F=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/ui/plan/collection-tools.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/ui/plan/collection-tools.component.scss b/src/app/ui/plan/collection-tools.component.scss index 8af5ded..435f3b1 100644 --- a/src/app/ui/plan/collection-tools.component.scss +++ b/src/app/ui/plan/collection-tools.component.scss @@ -148,7 +148,7 @@ flex-direction: column; margin-left: 0px; transition: margin-left 0.5s; - min-width: 235px; + // min-width: 235px; border: 1px solid #30bbec; width: 235px; left: 0; From 9831f1272096aba7185c4f730be87ba5327b08c3 Mon Sep 17 00:00:00 2001 From: username <1105965053@qq.com> Date: Mon, 21 Sep 2020 19:46:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E5=80=92=E8=AE=A1?= =?UTF-8?q?=E6=97=B6=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan-assistance.component.html | 10 ++++--- .../plan-assistance.component.scss | 14 ++++++++++ .../plan-assistance.component.ts | 26 +++++++++---------- src/app/ui/ui.module.ts | 4 +-- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/src/app/ui/plan-assistance/plan-assistance.component.html b/src/app/ui/plan-assistance/plan-assistance.component.html index dfabde3..4d9ed9b 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.html +++ b/src/app/ui/plan-assistance/plan-assistance.component.html @@ -3,14 +3,16 @@
到场力量
-
+

{{item.Name}}

{{item.FireTeamName}}

-
已到场
-
- +
已到场
+
+
diff --git a/src/app/ui/plan-assistance/plan-assistance.component.scss b/src/app/ui/plan-assistance/plan-assistance.component.scss index c1ea7e3..a13bb04 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.scss +++ b/src/app/ui/plan-assistance/plan-assistance.component.scss @@ -69,6 +69,12 @@ text-overflow:ellipsis; white-space: nowrap; } + .countdown{ + flex: 40%; + line-height: 50px; + font-weight: 550; + text-align: center; + } } } @@ -76,6 +82,14 @@ .selectIcon { background-color: rgba(13, 139, 241, 0.7); } +//小于五分钟 css +.smallFive { + color: rgb(245, 166, 19); +} +//大于十分钟 css +.bigTen { + color: #fff; +} //右侧工作区 .center { diff --git a/src/app/ui/plan-assistance/plan-assistance.component.ts b/src/app/ui/plan-assistance/plan-assistance.component.ts index c706246..f641a67 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.ts +++ b/src/app/ui/plan-assistance/plan-assistance.component.ts @@ -1747,7 +1747,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { }, Name: '水罐消防车', FireTeamName: '八塘消防救援站', //所属消防队 - ReachTime: 3, //到场剩余时间 + ReachTime: 240, //到场剩余时间 WaterYield: '12t',//载水量 Foam: '0t', //载泡沫 PeopleNum: 6, //载人数 @@ -1797,7 +1797,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { }, Name: '水罐泡沫消防车', FireTeamName: '八塘消防救援站', //所属消防队 - ReachTime: 3, //到场剩余时间 + ReachTime: 240, //到场剩余时间 WaterYield: '6t',//载水量 Foam: '2t', //载泡沫 PeopleNum: 6, //载人数 @@ -1847,7 +1847,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { }, Name: '水罐泡沫消防车', FireTeamName: '八塘消防救援站', //所属消防队 - ReachTime: 3, //到场剩余时间 + ReachTime: 240, //到场剩余时间 WaterYield: '3t',//载水量 Foam: '1t', //载泡沫 PeopleNum: 8, //载人数 @@ -1897,7 +1897,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { }, Name: '举高喷射消防车', FireTeamName: '八塘消防救援站', //所属消防队 - ReachTime: 4, //到场剩余时间 + ReachTime: 300, //到场剩余时间 WaterYield: '16t',//载水量 Foam: '2t', //载泡沫 PeopleNum: 4, //载人数 @@ -1947,7 +1947,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { }, Name: '水罐泡沫消防车', FireTeamName: '龚州消防救援站', //所属消防队 - ReachTime: 11, //到场剩余时间 + ReachTime: 660, //到场剩余时间 WaterYield: '6t',//载水量 Foam: '2t', //载泡沫 PeopleNum: 6, //载人数 @@ -1997,7 +1997,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { }, Name: '水罐泡沫消防车', FireTeamName: '龚州消防救援站', //所属消防队 - ReachTime: 15, //到场剩余时间 + ReachTime: 720, //到场剩余时间 WaterYield: '5t',//载水量 Foam: '1t', //载泡沫 PeopleNum: 6, //载人数 @@ -2047,7 +2047,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { }, Name: '水罐泡沫消防车', FireTeamName: '龚州消防救援站', //所属消防队 - ReachTime: 15, //到场剩余时间 + ReachTime: 960, //到场剩余时间 WaterYield: '3t',//载水量 Foam: '1t', //载泡沫 PeopleNum: 6, //载人数 @@ -2097,7 +2097,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { }, Name: '举高喷射消防车', FireTeamName: '龚州消防救援站', //所属消防队 - ReachTime: 15, //到场剩余时间 + ReachTime: 960, //到场剩余时间 WaterYield: '18t',//载水量 Foam: '2t', //载泡沫 PeopleNum: 4, //载人数 @@ -2137,6 +2137,11 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { rightIsShow:boolean = true; //右侧楼层是否展示 rightSayIsShow:boolean = false; //右侧语音是否展示 + //倒计时结束 + handleEvent (e,item) { + e.left==0? item.ReachTime=0 : null + } + //选择 车辆 selectCar (e) { console.log(e) @@ -2144,11 +2149,6 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { this.bottomIsShow = true } - //倒计时结束 - handleEvent (e,item) { - console.log(e,item) - } - //关闭 底部车辆信息 closeBottom () { this.bottomIsShow = false diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index e7da62d..99dc8d3 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -62,7 +62,7 @@ import { DangerousComponent } from './dangerous/dangerous.component'; import { SimilarPlansComponent } from './similar-plans/similar-plans.component'; import { RealCasesComponent } from './real-cases/real-cases.component'; import { PlanAssistanceComponent } from './plan-assistance/plan-assistance.component'; - +import { CountdownModule } from 'ngx-countdown'; @NgModule({ declarations: [UiComponent,PersonaldataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent, DisposalNodeComponent, DangerousComponent, SimilarPlansComponent, RealCasesComponent, PlanAssistanceComponent,planComponent], @@ -112,7 +112,7 @@ import { PlanAssistanceComponent } from './plan-assistance/plan-assistance.compo MatTreeModule, PortalModule, ScrollingModule, - + CountdownModule, ReactiveFormsModule, FormsModule, FileUploadModule