From 1e8c92ada15c30a59742f823c8b4a8942ba12421 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Fri, 26 Nov 2021 15:56:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87/?= =?UTF-8?q?=E8=A7=86=E9=A2=91=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 | 12 ++++++++-- src/app/pages/plan/plan.component.scss | 6 +++-- src/app/pages/plan/plan.component.ts | 32 ++++++++++++++++++++++++++ src/app/pages/plan/publicPop.scss | 10 +++++++- tsconfig.json | 8 +++---- 5 files changed, 59 insertions(+), 9 deletions(-) diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html index a182b17..99238e9 100644 --- a/src/app/pages/plan/plan.component.html +++ b/src/app/pages/plan/plan.component.html @@ -146,8 +146,16 @@

-
-
+
+ + + +
+
+ + + +
diff --git a/src/app/pages/plan/plan.component.scss b/src/app/pages/plan/plan.component.scss index 12e7da1..e6e8a68 100644 --- a/src/app/pages/plan/plan.component.scss +++ b/src/app/pages/plan/plan.component.scss @@ -335,8 +335,10 @@ input{ border: none; outline: none; background-color: transparent; width: 100%; height: 100%; } textarea{ width: 100%; height: 50px; background: rgba(145, 204, 255, 0.41); border: 1px solid #91CCFF; padding: 0; resize: none; outline: none; } } - .planHeaderImg{ width: 100px; height: 100%; text-align: center; } - .planHeaderVideo{ width: 120px; height: 100%; text-align: center; } + .planHeaderImg{ width: 140px; height: 100%; text-align: center; line-height: 80px; .imgSrc{ width: 100px; height: auto; max-height: 100%; } } + .uploadImage{ width: 20px; height: 20px; line-height: 20px; float: right; margin-top: 30px; } + .planHeaderVideo{ width: 180px; height: 100%; text-align: center; line-height: 80px; video{ width: 120px; height: auto; max-height: 100%; } } + .uploadVideo{ width: 30px; height: 30px; line-height: 30px; float: right; margin-top: 25px; } } .bottomPlanCenter{ height: 35px; diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index c1cf58c..96ad152 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -1,4 +1,5 @@ import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; +import Viewer from 'viewerjs'; 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'; @@ -23,6 +24,7 @@ import { AllMarkData } from 'src/app/babylon/model/data/mark/all-mark-data'; import { MarkData, MarkTask } from 'src/app/babylon/model/data/mark/mark-data'; import { MarkWindow } from 'src/app/babylon/view/mark-window/mark-window'; import { AllMarkPlanData, MarkNodeData, MarkPlanData } from 'src/app/babylon/model/data/mark/mark-plan-data'; +import { DataManager, ResType } from 'src/app/babylon/controller/data-manager'; @@ -543,6 +545,36 @@ export class PlanComponent implements OnInit { } videoDialogType: videoDialog = new videoDialog(true, null); //全景图/视频 弹窗 + planNodeImg: Viewer; //应急预案图片Viewer 实例 + + //上传 图片/视频 + uploadImgVideo(e, isVideo: boolean) { + if (e.target.files.length) { + let maxSize = 20 * 1024 * 1024 //限制30MB + let file = e.target.files[0] + if (file.size > maxSize) { //超出限制 + this.message.info("上传资源需小于30MB"); + return + } + this.isShowLoading = true //打开遮罩 + let institutionKey = sessionStorage.getItem('unitId') || "ceshi"; //单位id + let resType = isVideo? ResType.Video : ResType.Texture + let key = `${(new Date()).getMonth() + 1}-${(new Date()).getDate()}-${(new Date()).getHours()}` + let url = DataManager.getResPath_mark(institutionKey, resType, key) //url + ServeManager.instance.openFileSelect(file, url, (name: string, path: string) => { //上传 + if (!isVideo) { //img + this.beforePlanNode.texture = path + name + window.setTimeout(() => { + this.planNodeImg = new Viewer(this.element.nativeElement.querySelector('#planNodeImg'), { url: 'data-original' }); + }, 0) + } else { //video + this.beforePlanNode.video = path + name + } + this.isShowLoading = false //关闭遮罩 + this.message.info("上传成功!"); + }) + } + } selectRightTopFast: number = 0; //当前选择功能 快捷栏 selectAdsorb: boolean = false; //吸附状态 diff --git a/src/app/pages/plan/publicPop.scss b/src/app/pages/plan/publicPop.scss index f658838..a221c9b 100644 --- a/src/app/pages/plan/publicPop.scss +++ b/src/app/pages/plan/publicPop.scss @@ -26,7 +26,15 @@ overflow: hidden; display: inline-block; } -.uploadBackGround input,.bottomPlanUpload input { +.imgAndVideoUpload{ + position: relative; + cursor: pointer; + background: rgba(145, 204, 255, 0.41); + border: 1px dashed #91CCFF; + overflow: hidden; + display: inline-block; +} +.uploadBackGround input,.bottomPlanUpload input,.imgAndVideoUpload input { position: absolute; width: 100%; height: 100%; diff --git a/tsconfig.json b/tsconfig.json index b5f130c..e869761 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -31,8 +31,8 @@ "strictInjectionParameters": true, "enableIvy": false }, - "include": [ - "src/**/*.d.ts", - "typings.d.ts" - ] + // "include": [ + // "src/**/*.d.ts", + // "typings.d.ts" + // ] } From f0d4cbdc8cc9706f5af5599dfa654d27f3a40d68 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Fri, 26 Nov 2021 15:56:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=A4=84=E7=BD=AE=E5=8A=9F=E8=83=BD=E5=92=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=EF=BC=9B=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E9=A2=84=E8=AD=A6=E9=80=9A=E7=9F=A5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 24 ++--- .../criminal-records-admin.component.html | 15 +++- .../criminal-records-admin.component.ts | 2 +- .../criminal-records.component.html | 15 +++- .../criminal-records.component.ts | 2 +- .../disposition/disposition.component.html | 21 +++++ .../disposition/disposition.component.scss | 85 ++++++++++++++++++ .../disposition/disposition.component.ts | 33 +++++++ src/app/pages/home/home.component.html | 22 ++++- src/app/pages/home/home.component.ts | 43 +++++++-- src/app/pages/login/login.component.html | 15 ---- src/app/pages/login/login.component.ts | 7 +- src/app/pages/pages.module.ts | 5 +- .../plan-admin/plan-admin.component.html | 20 +++-- .../pages/plan-admin/plan-admin.component.ts | 1 - .../today-warning-admin.component.html | 5 +- .../today-warning-admin.component.scss | 2 +- .../today-warning-admin.component.ts | 62 +++++++++++-- .../get-out-of-line-details.component.html | 6 +- .../get-out-of-line-details.component.ts | 3 +- .../today-warning.component.html | 8 +- .../today-warning.component.scss | 2 +- .../today-warning/today-warning.component.ts | 65 ++++++++++++-- src/assets/images/3d.png | Bin 0 -> 630 bytes src/assets/js/abp.signalr-client.js | 5 +- src/shared/helpers/SignalRAspNetCoreHelper.ts | 4 +- src/theme.less | 44 +++++---- tsconfig.json | 8 +- 28 files changed, 411 insertions(+), 113 deletions(-) create mode 100644 src/app/pages/disposition/disposition.component.html create mode 100644 src/app/pages/disposition/disposition.component.scss create mode 100644 src/app/pages/disposition/disposition.component.ts create mode 100644 src/assets/images/3d.png diff --git a/package-lock.json b/package-lock.json index 1382c9c..381bb38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4874,7 +4874,7 @@ }, "ascli": { "version": "1.0.1", - "resolved": "https://registry.nlark.com/ascli/download/ascli-1.0.1.tgz", + "resolved": "https://registry.npm.taobao.org/ascli/download/ascli-1.0.1.tgz", "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=", "requires": { "colour": "~0.7.1", @@ -5516,7 +5516,7 @@ "dependencies": { "long": { "version": "3.2.0", - "resolved": "https://registry.npmmirror.com/long/download/long-3.2.0.tgz?cache=0&sync_timestamp=1635674102680&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flong%2Fdownload%2Flong-3.2.0.tgz", + "resolved": "https://registry.npm.taobao.org/long/download/long-3.2.0.tgz", "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" } } @@ -5936,7 +5936,7 @@ }, "colour": { "version": "0.7.1", - "resolved": "https://registry.nlark.com/colour/download/colour-0.7.1.tgz", + "resolved": "https://registry.npm.taobao.org/colour/download/colour-0.7.1.tgz", "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=" }, "combined-stream": { @@ -8226,7 +8226,7 @@ }, "grpc": { "version": "1.24.2", - "resolved": "https://registry.npmmirror.com/grpc/download/grpc-1.24.2.tgz", + "resolved": "https://registry.npm.taobao.org/grpc/download/grpc-1.24.2.tgz", "integrity": "sha1-dtBHv6ewW2B8u+OruZBl3O/gwJk=", "requires": { "@types/bytebuffer": "^5.0.40", @@ -8271,7 +8271,7 @@ }, "camelcase": { "version": "2.1.1", - "resolved": "https://registry.npmmirror.com/camelcase/download/camelcase-2.1.1.tgz?cache=0&sync_timestamp=1636945122112&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-2.1.1.tgz", + "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz", "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" }, "chownr": { @@ -8280,7 +8280,7 @@ }, "cliui": { "version": "3.2.0", - "resolved": "https://registry.nlark.com/cliui/download/cliui-3.2.0.tgz", + "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz?cache=0&sync_timestamp=1573943458671&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "requires": { "string-width": "^1.0.1", @@ -8396,7 +8396,7 @@ }, "invert-kv": { "version": "1.0.0", - "resolved": "https://registry.nlark.com/invert-kv/download/invert-kv-1.0.0.tgz?cache=0&sync_timestamp=1630996775723&other_urls=https%3A%2F%2Fregistry.nlark.com%2Finvert-kv%2Fdownload%2Finvert-kv-1.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/invert-kv/download/invert-kv-1.0.0.tgz", "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" }, "is-fullwidth-code-point": { @@ -8537,7 +8537,7 @@ }, "os-locale": { "version": "1.4.0", - "resolved": "https://registry.npmmirror.com/os-locale/download/os-locale-1.4.0.tgz?cache=0&sync_timestamp=1633618260196&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fos-locale%2Fdownload%2Fos-locale-1.4.0.tgz", + "resolved": "https://registry.npm.taobao.org/os-locale/download/os-locale-1.4.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fos-locale%2Fdownload%2Fos-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "requires": { "lcid": "^1.0.0" @@ -8565,7 +8565,7 @@ }, "protobufjs": { "version": "5.0.3", - "resolved": "https://registry.nlark.com/protobufjs/download/protobufjs-5.0.3.tgz", + "resolved": "https://registry.npm.taobao.org/protobufjs/download/protobufjs-5.0.3.tgz", "integrity": "sha1-5N/p+2fJCyYw0VhoJJvMSWFGehc=", "requires": { "ascli": "~1", @@ -8694,7 +8694,7 @@ }, "yargs": { "version": "3.32.0", - "resolved": "https://registry.npmmirror.com/yargs/download/yargs-3.32.0.tgz", + "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-3.32.0.tgz?cache=0&sync_timestamp=1577940861093&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-3.32.0.tgz", "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", "requires": { "camelcase": "^2.0.1", @@ -10875,7 +10875,7 @@ }, "lodash.clone": { "version": "4.5.0", - "resolved": "https://registry.nlark.com/lodash.clone/download/lodash.clone-4.5.0.tgz", + "resolved": "https://registry.npm.taobao.org/lodash.clone/download/lodash.clone-4.5.0.tgz", "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y=" }, "lodash.clonedeep": { @@ -12053,7 +12053,7 @@ }, "optjs": { "version": "3.2.2", - "resolved": "https://registry.nlark.com/optjs/download/optjs-3.2.2.tgz", + "resolved": "https://registry.npm.taobao.org/optjs/download/optjs-3.2.2.tgz", "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4=" }, "ora": { 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 03256b2..a028105 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 @@ -110,7 +110,7 @@
预警类型
-
+
所属公司
@@ -119,7 +119,7 @@
-
+
加油站
@@ -128,6 +128,9 @@
预警时间
+
+ 状态 +
操作
@@ -153,7 +156,7 @@
{{item.violation.violationType}}
-
+
{{item.gasStation.companyName}}
@@ -162,7 +165,7 @@
-
+
{{item.gasStation.stationName}}
@@ -171,6 +174,10 @@
{{item.violateTime | date:"yyyy-MM-dd HH:mm:ss"}}
+
+ 已处置 + 未处置 +
查看
diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts index d76adf5..f61f796 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts @@ -146,7 +146,7 @@ export class CriminalRecordsAdminComponent implements OnInit { left: '42px', right: '30px', bottom: '38px', - top: '60px' + top: '80px' } }; baroption2 = { diff --git a/src/app/pages/criminal-records/criminal-records.component.html b/src/app/pages/criminal-records/criminal-records.component.html index a10f121..847128d 100644 --- a/src/app/pages/criminal-records/criminal-records.component.html +++ b/src/app/pages/criminal-records/criminal-records.component.html @@ -106,10 +106,10 @@
预警级别
-
+
预警类型
-
+
预警信息
@@ -118,6 +118,9 @@
预警时间
+
+ 状态 +
操作
@@ -140,10 +143,10 @@ Ⅲ级 Ⅳ级
-
+
{{item.violation.violationType}}
-
+
{{item.violation.violationName}}
@@ -152,6 +155,10 @@
{{item.violateTime | date:"yyyy-MM-dd HH:mm:ss"}}
+
+ 已处置 + 未处置 +
查看
diff --git a/src/app/pages/criminal-records/criminal-records.component.ts b/src/app/pages/criminal-records/criminal-records.component.ts index b9c18f2..e3c2425 100644 --- a/src/app/pages/criminal-records/criminal-records.component.ts +++ b/src/app/pages/criminal-records/criminal-records.component.ts @@ -143,7 +143,7 @@ export class CriminalRecordsComponent implements OnInit { left: '42px', right: '30px', bottom: '38px', - top: '60px' + top: '80px' } }; baroption2 = { diff --git a/src/app/pages/disposition/disposition.component.html b/src/app/pages/disposition/disposition.component.html new file mode 100644 index 0000000..152f821 --- /dev/null +++ b/src/app/pages/disposition/disposition.component.html @@ -0,0 +1,21 @@ +
+
+
+ 处置 +
+ +
+
+

处置内容

+ + + + + +

处置人: {{peopleName}}

+
+ + +
+
+
\ No newline at end of file diff --git a/src/app/pages/disposition/disposition.component.scss b/src/app/pages/disposition/disposition.component.scss new file mode 100644 index 0000000..b616fdb --- /dev/null +++ b/src/app/pages/disposition/disposition.component.scss @@ -0,0 +1,85 @@ +.box { + .title { + font-family: sybold; + width: 100%; + height: 48px; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%); + display: flex; + align-items: center; + position: relative; + + .titlecontent { + width: 100%; + height: 32px; + line-height: 32px; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%); + text-align: center; + color: #91CCFF; + font-size: 16px; + } + + i { + position: absolute; + right: 12px; + color: #fff; + font-size: 18px; + cursor: pointer; + } + } + + .form { + box-sizing: border-box; + padding: 0 17px; + + p { + margin-bottom: 0; + color: #C4E2FC; + margin: 16px 0; + } + + nz-form-item { + margin-bottom: 0; + + textarea { + color: rgba(145, 204, 255, 0.95) !important; + width: 100%; + height: 300px; + background: #173d60; + } + } + + nz-date-picker { + background-color: #143c61; + width: 100%; + } + + .btnbox { + width: 100%; + margin-top: 24px; + margin-bottom: 17px; + display: flex; + justify-content: flex-end; + + button { + border-radius: 0px; + color: #91CCFF; + } + + button:nth-child(2) { + margin-left: 16px; + } + + .ok { + background: rgba(0, 129, 255, 0.4); + } + + .cancel { + border: 1px solid #C4E2FC; + background: #0c1e38; + color: rgba(99, 102, 105, 0.6); + box-shadow: 0 0 3px 0 #fff inset; + } + } + } + +} diff --git a/src/app/pages/disposition/disposition.component.ts b/src/app/pages/disposition/disposition.component.ts new file mode 100644 index 0000000..93ec6b3 --- /dev/null +++ b/src/app/pages/disposition/disposition.component.ts @@ -0,0 +1,33 @@ +import { Component, OnInit } from '@angular/core'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +@Component({ + selector: 'app-disposition', + templateUrl: './disposition.component.html', + styleUrls: ['./disposition.component.scss'] +}) +export class DispositionComponent implements OnInit { + validateForm!: FormGroup; + constructor(private modal: NzModalRef, private fb: FormBuilder) { } + + + peopleName:string + + ngOnInit(): void { + if(sessionStorage.getItem('isGasStation') == 'true'){ + this.peopleName = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).name + }else{ + this.peopleName = JSON.parse(sessionStorage.getItem('userdata')).name + } + + this.validateForm = this.fb.group({ + content: [null, [Validators.required]] + }); + } + destroyModal(){ + this.modal.destroy(); + } + ok(){ + this.modal.triggerOk() + } +} diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index 46dc0cf..47eef40 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -59,4 +59,24 @@
-
\ No newline at end of file +
+ + +
+
+ +
+
+ 您有一条新的预警提醒! + {{item.id}} +
+
+
+
+ 查看 +
+
+ 忽略 +
+
+ \ No newline at end of file diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index a08734d..5d71b06 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -1,14 +1,14 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild, TemplateRef } from '@angular/core'; import { Router, NavigationEnd, ActivatedRoute } from '@angular/router'; import { Title } from '@angular/platform-browser' import { filter } from 'rxjs/operators'; -import { NavChangeService } from 'src/app/service/navChange.service'; +import { NavChangeService } from '../../service/navChange.service'; import { CacheTokenService } from '../../service/cache-token.service' //引入服务 import { CookieService } from 'ngx-cookie-service'; import { NzMessageService } from 'ng-zorro-antd/message'; import { SignalRAspNetCoreHelper } from '../../../shared/helpers/SignalRAspNetCoreHelper'; - - +import { NzNotificationService } from 'ng-zorro-antd/notification'; +declare var abp: any @Component({ selector: 'app-home', @@ -16,9 +16,10 @@ import { SignalRAspNetCoreHelper } from '../../../shared/helpers/SignalRAspNetCo styleUrls: ['./home.component.scss'] }) export class HomeComponent implements OnInit { - + @ViewChild('warning', { static: false }) template?: TemplateRef<{}>; constructor(private router: Router, private navChangeService: NavChangeService, public token: CacheTokenService, - private cookieService: CookieService, private message: NzMessageService) { } + private cookieService: CookieService, private message: NzMessageService, private notificationService: NzNotificationService) { } + isGasStationNav: boolean isGasStation: boolean isGasStationBack: boolean @@ -78,13 +79,39 @@ export class HomeComponent implements OnInit { this.userName = JSON.parse(sessionStorage.getItem('userdata')).userName } + + + } + ngAfterViewInit() { SignalRAspNetCoreHelper.initSignalR(); - abp.event.on('abp.notifications.received', function (userNotification) { - console.log('abp.notifications.received成功收到了哈哈哈', userNotification); + abp.event.on('abp.notifications.received', (userNotification) => { + console.log('abp.notifications.received收到通知', userNotification); + this.receiptOfNotification(userNotification) }); + } + messageId=[] + receiptOfNotification(userNotification) { + let obj = { + id:'xxx', + messageId:this.notificationService.template(this.template!, {nzPlacement: 'bottomRight', nzClass: 'receiptOfNotification', nzDuration: 0, nzData: userNotification}).messageId + } + this.messageId.push(obj) + console.log(99999,this.messageId) + } + + close(item){ + this.messageId.forEach((element)=>{ + if(element.id == 'xxx'){ + this.notificationService.remove(element.messageId) + } + }) } + + ngOnDestroy() { + abp.signalr.disconnect() + } //获得时间 time: string diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html index ce7ecf1..5fc7bb9 100644 --- a/src/app/pages/login/login.component.html +++ b/src/app/pages/login/login.component.html @@ -61,18 +61,3 @@
- -
-
- -
-
- 您有一条新的预警提醒! - 这是详细描述这是详细描述这是详细描述... -
-
-
- - -
- diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index 1fc96cf..7a6b72d 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, AfterViewInit, ViewChild, TemplateRef } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { HttpClient } from '@angular/common/http' import { Router, ActivatedRoute } from '@angular/router' import { CacheTokenService } from '../../service/cache-token.service'//引入服务 @@ -18,7 +18,6 @@ declare var abp: any export class LoginComponent implements OnInit { validateForm!: FormGroup; - @ViewChild(TemplateRef, { static: false }) template?: TemplateRef<{}>; constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public token: CacheTokenService, private cookieService: CookieService, private fb: FormBuilder, private message: NzMessageService, private notificationService: NzNotificationService) { } ngOnInit() { @@ -149,10 +148,6 @@ export class LoginComponent implements OnInit { ) } - receiptOfNotification() { - this.notificationService.template(this.template!, { nzPlacement: 'bottomRight', nzClass: 'receiptOfNotification', nzDuration: 0 }); - } - roleList = [ '管理员', '职工' ] diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 3324872..26f5b77 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -48,11 +48,12 @@ import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select'; import { PlanAdminComponent } from './plan-admin/plan-admin.component'; import { GetOutOfLineDetailsComponent } from './today-warning/get-out-of-line-details/get-out-of-line-details.component'; import { NzNotificationModule } from 'ng-zorro-antd/notification'; +import { DispositionComponent } from './disposition/disposition.component'; @NgModule({ declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent, - AddequipmentComponent, EditequipmentComponent,PlanAdminComponent, GetOutOfLineDetailsComponent], + AddequipmentComponent, EditequipmentComponent,PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent], imports: [ @@ -92,7 +93,7 @@ import { NzNotificationModule } from 'ng-zorro-antd/notification'; NzNotificationModule, NzPopconfirmModule ], - entryComponents: [AddequipmentComponent, EditequipmentComponent,GetOutOfLineDetailsComponent], + entryComponents: [AddequipmentComponent, EditequipmentComponent,GetOutOfLineDetailsComponent,DispositionComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/pages/plan-admin/plan-admin.component.html b/src/app/pages/plan-admin/plan-admin.component.html index e30c6b0..97fec22 100644 --- a/src/app/pages/plan-admin/plan-admin.component.html +++ b/src/app/pages/plan-admin/plan-admin.component.html @@ -5,9 +5,9 @@
- + @@ -52,10 +52,12 @@
- + - 加油站名称 + + 加油站名称 区域 所属公司 联系人 @@ -70,7 +72,9 @@ - {{item.stationName}} + + {{item.stationName}} {{item.locationName}} {{item.companyName}} {{item.leaderName}} @@ -88,7 +92,7 @@ -
-
+
\ No newline at end of file diff --git a/src/app/pages/plan-admin/plan-admin.component.ts b/src/app/pages/plan-admin/plan-admin.component.ts index 8024f77..eea8d3c 100644 --- a/src/app/pages/plan-admin/plan-admin.component.ts +++ b/src/app/pages/plan-admin/plan-admin.component.ts @@ -181,7 +181,6 @@ export class PlanAdminComponent implements OnInit { // this.list = this.list.concat(data.result.items); this.list = [...data.result.items] resolve(data) - // console.log(999999, data) }) }) } diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.html b/src/app/pages/today-warning-admin/today-warning-admin.component.html index 28baa97..819d8a0 100644 --- a/src/app/pages/today-warning-admin/today-warning-admin.component.html +++ b/src/app/pages/today-warning-admin/today-warning-admin.component.html @@ -164,8 +164,9 @@ {{item.violateTime | date:"yyyy-MM-dd HH:mm:ss"}}
- - + + + 已处置
diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.scss b/src/app/pages/today-warning-admin/today-warning-admin.component.scss index 1f23f6d..e8ae4c0 100644 --- a/src/app/pages/today-warning-admin/today-warning-admin.component.scss +++ b/src/app/pages/today-warning-admin/today-warning-admin.component.scss @@ -95,7 +95,7 @@ background: linear-gradient(180deg, rgba(3, 0, 0, 0) 0%, rgba(0, 46, 91, 0.68) 100%); box-sizing: border-box; padding-left: 20px; - + padding-right: 60px; div { font-size: 15px; text-align: left; diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.ts b/src/app/pages/today-warning-admin/today-warning-admin.component.ts index 5ddb301..d6dcbda 100644 --- a/src/app/pages/today-warning-admin/today-warning-admin.component.ts +++ b/src/app/pages/today-warning-admin/today-warning-admin.component.ts @@ -2,15 +2,19 @@ import { Component, OnInit, ViewContainerRef } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; import { HttpClient } from '@angular/common/http'; -import { TreeService } from 'src/app/service/tree.service'; + import { NzModalService } from 'ng-zorro-antd/modal'; import { GetOutOfLineDetailsComponent } from '../today-warning/get-out-of-line-details/get-out-of-line-details.component'; import * as moment from 'moment'; -import { NavChangeService } from 'src/app/service/navChange.service'; +// import { TreeService } from 'src/app/service/tree.service'; +// import { NavChangeService } from 'src/app/service/navChange.service'; +import { TreeService } from '../../service/tree.service'; +import { NavChangeService } from '../../service/navChange.service'; import 'linqjs'; - +import { DispositionComponent } from '../disposition/disposition.component'; +import { NzMessageService } from 'ng-zorro-antd/message'; @Component({ selector: 'app-today-warning-admin', @@ -20,7 +24,7 @@ import 'linqjs'; export class TodayWarningAdminComponent implements OnInit { validateForm!: FormGroup; - constructor(private http: HttpClient, private fb: FormBuilder, private router: Router, private toTree: TreeService, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private navChangeService: NavChangeService) { } + constructor(private http: HttpClient, private fb: FormBuilder, private router: Router, private toTree: TreeService, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private navChangeService: NavChangeService, private message: NzMessageService) { } ngOnInit(): void { this.validateForm = this.fb.group({ @@ -105,6 +109,8 @@ export class TodayWarningAdminComponent implements OnInit { ViolateArea: this.validateForm.value.area, organizationUnitId: this.validateForm.value.organization, ViolateTime: (this.validateForm.value.datePickerEnd && this.validateForm.value.datePickerStart) ? [moment(this.validateForm.value.datePickerStart).format('yyyy-MM-DD HH:mm:ss'), moment(this.validateForm.value.datePickerEnd).format('yyyy-MM-DD HH:mm:ss')] : null, + // ViolateTime: ['2021-10-27', '2021-11-26'], + IsContainsChildren: 'true', SkipCount: '0', MaxResultCount: '9999' } @@ -155,6 +161,12 @@ export class TodayWarningAdminComponent implements OnInit { look(item) { + let type + if (item.violation.violationType.indexOf('卸油')) { + type = 1 + } else { + type = 0 + } const modal = this.modal.create({ nzContent: GetOutOfLineDetailsComponent, nzViewContainerRef: this.viewContainerRef, @@ -167,7 +179,8 @@ export class TodayWarningAdminComponent implements OnInit { 'background': '#000D21', }, nzComponentParams: { - data: item + data: item, + type: type }, nzFooter: null, nzOnOk: async () => { @@ -176,4 +189,43 @@ export class TodayWarningAdminComponent implements OnInit { }); const instance = modal.getContentComponent(); } + + dispose(item) { + console.log(item) + const modal = this.modal.create({ + nzContent: DispositionComponent, + nzViewContainerRef: this.viewContainerRef, + nzWidth: 380, + nzBodyStyle: { + 'border': '1px solid #91CCFF', + 'border-radius': '0px', + 'padding': '7px', + 'box-shadow': '0 0 8px 0 #fff', + 'background-image': 'linear-gradient(#003665, #000f25)' + }, + nzComponentParams: {}, + nzFooter: null, + nzClosable: false, + nzOnOk: async () => { + if (instance.validateForm.valid) { + await new Promise(resolve => { + let body = { + id: item.id, + handleRecord: instance.validateForm.value.content + } + this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => { + resolve(data) + this.message.create('success', '处置成功！'); + item.handleTime = new Date() + return true + }) + }) + } else { + this.message.create('warning', '请填写完整！'); + return false + } + }, + }); + const instance = modal.getContentComponent(); + } } diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html index eb1904f..1124d5e 100644 --- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html +++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html @@ -19,7 +19,7 @@
-
+
+ + + 已处置
diff --git a/src/app/pages/today-warning/today-warning.component.scss b/src/app/pages/today-warning/today-warning.component.scss index 1707ad9..78a2db0 100644 --- a/src/app/pages/today-warning/today-warning.component.scss +++ b/src/app/pages/today-warning/today-warning.component.scss @@ -88,7 +88,7 @@ margin-bottom: 12px; background: linear-gradient(180deg, rgba(3, 0, 0, 0) 0%, rgba(0, 46, 91, 0.68) 100%); box-sizing: border-box; - padding-right: 36px; + padding-right: 60px; div { font-size: 15px; text-align: center; diff --git a/src/app/pages/today-warning/today-warning.component.ts b/src/app/pages/today-warning/today-warning.component.ts index e4c0bfe..be2c796 100644 --- a/src/app/pages/today-warning/today-warning.component.ts +++ b/src/app/pages/today-warning/today-warning.component.ts @@ -3,9 +3,13 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { HttpClient } from '@angular/common/http'; import { NzModalService } from 'ng-zorro-antd/modal'; import { GetOutOfLineDetailsComponent } from './get-out-of-line-details/get-out-of-line-details.component'; -import { TreeService } from 'src/app/service/tree.service'; -import { NavChangeService } from 'src/app/service/navChange.service'; +// import { TreeService } from 'src/app/service/tree.service'; +// import { NavChangeService } from 'src/app/service/navChange.service'; +import { TreeService } from '../../service/tree.service'; +import { NavChangeService } from '../../service/navChange.service'; import * as moment from 'moment'; +import { DispositionComponent } from '../disposition/disposition.component'; +import { NzMessageService } from 'ng-zorro-antd/message'; @Component({ selector: 'app-today-warning', templateUrl: './today-warning.component.html', @@ -13,7 +17,7 @@ import * as moment from 'moment'; }) export class TodayWarningComponent implements OnInit { validateForm!: FormGroup; - constructor(private http: HttpClient, private fb: FormBuilder, private toTree: TreeService, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private navChangeService: NavChangeService) { } + constructor(private http: HttpClient, private fb: FormBuilder, private toTree: TreeService, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private navChangeService: NavChangeService, private message: NzMessageService) { } ngOnInit(): void { this.validateForm = this.fb.group({ @@ -62,6 +66,8 @@ export class TodayWarningComponent implements OnInit { ViolateArea: this.validateForm.value.area, organizationUnitId: JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id, ViolateTime: (this.validateForm.value.datePickerEnd && this.validateForm.value.datePickerStart) ? [moment(this.validateForm.value.datePickerStart).format('yyyy-MM-DD HH:mm:ss'), moment(this.validateForm.value.datePickerEnd).format('yyyy-MM-DD HH:mm:ss')] : null, + // ViolateTime: ['2021-10-27', '2021-11-26'], + IsContainsChildren: 'true', SkipCount: '0', MaxResultCount: '9999' } @@ -107,6 +113,12 @@ export class TodayWarningComponent implements OnInit { look(item) { + let type + if (item.violation.violationType.indexOf('卸油')) { + type = 1 + } else { + type = 0 + } const modal = this.modal.create({ nzContent: GetOutOfLineDetailsComponent, nzViewContainerRef: this.viewContainerRef, @@ -119,7 +131,8 @@ export class TodayWarningComponent implements OnInit { 'background': '#000D21', }, nzComponentParams: { - data: item + data: item, + // typy: type }, nzFooter: null, nzOnOk: async () => { @@ -129,7 +142,47 @@ export class TodayWarningComponent implements OnInit { const instance = modal.getContentComponent(); } - disposition(item){ - + dispose(item) { + console.log(item) + if (item.isEnableHandle) { + const modal = this.modal.create({ + nzContent: DispositionComponent, + nzViewContainerRef: this.viewContainerRef, + nzWidth: 380, + nzBodyStyle: { + 'border': '1px solid #91CCFF', + 'border-radius': '0px', + 'padding': '7px', + 'box-shadow': '0 0 8px 0 #fff', + 'background-image': 'linear-gradient(#003665, #000f25)' + }, + nzComponentParams: {}, + nzFooter: null, + nzClosable: false, + nzOnOk: async () => { + if (instance.validateForm.valid) { + await new Promise(resolve => { + let body = { + id: item.id, + handleRecord: instance.validateForm.value.content + } + this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => { + resolve(data) + this.message.create('success', '处置成功！'); + item.handleTime = new Date() + return true + }) + }) + } else { + this.message.create('warning', '请填写完整！'); + return false + } + }, + }); + const instance = modal.getContentComponent(); + } else { + this.message.create('warning', '无处置权限！'); + } + } } diff --git a/src/assets/images/3d.png b/src/assets/images/3d.png new file mode 100644 index 0000000000000000000000000000000000000000..bcd6752df89f4fa62c36b8d70a4a7947720275d9 GIT binary patch literal 630 zcmV-+0*U>JP)y;9zlg7zD{w zDShId>S)$E&QaL}ajTTppt7BN z9Nc?9a?3unGNT7rA6$bNmNlb6l`{(`Xjiqs!Rp5lT%Ojz>L&#VXE2AgJgvc_?SAc_ z1ADLAyX9gs>Vx)Ye?_%oG8*g4tzuGx_THZakuZzNsDEj8lVjw1`q`}ShagE#EnEoC zE;z&WFWm|;#TU+N@Mt{T_e=y2yWHvni8@SVLPlN{&Y@Foa-4+B5wS&t1BM*>^uX%v zs&*ZC{&fHxwSZ&QQ2jPxu>QT void): void { + static initSignalR(callback?: () => void): void { const encryptedAuthToken = sessionStorage.getItem("encryptedAccessToken"); let url = "http://39.106.78.171:8906"; abp.signalr = { diff --git a/src/theme.less b/src/theme.less index 7f7917c..97bb476 100644 --- a/src/theme.less +++ b/src/theme.less @@ -68,7 +68,7 @@ .receiptOfNotification { height: 160px; background-color: rgba(1, 13, 27, 0.9); - box-shadow: 0 0 36px 3px #8f1622 inset; + box-shadow: 0 0 28px 3px #8f1622 inset; display: flex; flex-direction: column; padding: 5px; @@ -77,40 +77,48 @@ position: relative; flex: 1; display: flex; - + align-items: center; img { - max-width: 64px; - max-height: 64px; + max-width:70px; + max-height: 62px; } - .text { display: flex; flex-direction: column; - color: white; justify-content: center; + span{ + // display: inline-block; + margin: 6px 0; + } + .name{ + font-size: 16px; + color: #ffaaaa; + } + .details{ + font-size: 14px; + color: white; + } } } .btnbox { - height: 30px; + height: 36px; + line-height: 36px; display: flex; justify-content: center; align-items: center; margin: 12px 0; - - button { - margin: 0 5px; + div{ + width: 80px; + height: 32px; + line-height: 32px; + text-align: center; + margin: 0 8px; + color: #FFFFFF; + cursor: pointer; } } - button { - width: 64px; - height: 30px; - line-height: 30px; - background-color: rgba(1, 13, 27, 0.9); - color: white; - border: 0px; - } .look { box-shadow: 0 0 12px #8f1622 inset; diff --git a/tsconfig.json b/tsconfig.json index b5f130c..e869761 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -31,8 +31,8 @@ "strictInjectionParameters": true, "enableIvy": false }, - "include": [ - "src/**/*.d.ts", - "typings.d.ts" - ] + // "include": [ + // "src/**/*.d.ts", + // "typings.d.ts" + // ] } From 328ab436b1d3998e2e7db70d3144f675a8807d35 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Fri, 26 Nov 2021 16:11:51 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8D=B8=E6=B2=B9=E5=85=A8=E6=B5=81=E7=A8=8B=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../criminal-records-admin.component.ts | 3 + .../oil-unloading-process.component.html | 175 +++++++++++ .../oil-unloading-process.component.scss | 279 ++++++++++++++++++ .../oil-unloading-process.component.ts | 32 ++ src/app/pages/pages.module.ts | 5 +- .../today-warning-admin.component.ts | 3 +- .../get-out-of-line-details.component.html | 175 +---------- .../get-out-of-line-details.component.ts | 21 +- .../today-warning/today-warning.component.ts | 3 +- 9 files changed, 498 insertions(+), 198 deletions(-) create mode 100644 src/app/pages/oil-unloading-process/oil-unloading-process.component.html create mode 100644 src/app/pages/oil-unloading-process/oil-unloading-process.component.scss create mode 100644 src/app/pages/oil-unloading-process/oil-unloading-process.component.ts diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts index f61f796..27e9755 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts @@ -10,6 +10,7 @@ import { debounceTime } from 'rxjs/operators'; import * as moment from 'moment'; import { NzModalService } from 'ng-zorro-antd/modal'; import { GetOutOfLineDetailsComponent } from '../today-warning/get-out-of-line-details/get-out-of-line-details.component'; +import { OilUnloadingProcessComponent } from '../oil-unloading-process/oil-unloading-process.component'; @Component({ selector: 'app-criminal-records-admin', templateUrl: './criminal-records-admin.component.html', @@ -515,6 +516,8 @@ export class CriminalRecordsAdminComponent implements OnInit { look(item) { + // GetOutOfLineDetailsComponent + // OilUnloadingProcessComponent const modal = this.modal.create({ nzContent: GetOutOfLineDetailsComponent, nzViewContainerRef: this.viewContainerRef, diff --git a/src/app/pages/oil-unloading-process/oil-unloading-process.component.html b/src/app/pages/oil-unloading-process/oil-unloading-process.component.html new file mode 100644 index 0000000..43f1d3a --- /dev/null +++ b/src/app/pages/oil-unloading-process/oil-unloading-process.component.html @@ -0,0 +1,175 @@ +
+
+
+
+ 卸油全流程 +
+
+
+
+
+
+
+
+
+ 事前准备 +
+
+
+
+
+ +
+ 油罐车朝向检察 +
+
+
+ +
+ 卸油效率检查 +
+
+
+ +
+ 设置隔离检查 +
+
+
+ +
+ 轮胎固定检察 +
+
+
+ +
+ 放置灭火器检察 +
+
+
+
+
+
+
+
+ +
+
+
+ +
+ 静电接地检查15分钟 +
+
+
+
+ + +
+
+ 事中操作 +
+
+
+
+
+
+ +
+ 卸油车取样 +
+
+
+ +
+ 连接卸油管 +
+
+
+ +
+
+ +
+
+ +
+ 1.第三方确认检查 +
+ +
+
+ +
+ 2.拆除卸油管 +
+ +
+
+ +
+ 3.作业现场清理 +
+ +
+
+ +
+ 车辆出场 +
+
+
+
+
+
+
+
+ +
+ 车辆进场 +
+
+ +
+
+ 卸油过程全程监测 +
+
+
+ 卸油全程监卸 +
+ + +
+
+
+ 卸油员及司押人员服装 +
+ +
+
+
+ 登车防护检查 +
+ +
+
+
+ 油品泄漏检查 +
+ +
+
+
+
+
+
+
+ + +
+ + \ No newline at end of file diff --git a/src/app/pages/oil-unloading-process/oil-unloading-process.component.scss b/src/app/pages/oil-unloading-process/oil-unloading-process.component.scss new file mode 100644 index 0000000..42402a5 --- /dev/null +++ b/src/app/pages/oil-unloading-process/oil-unloading-process.component.scss @@ -0,0 +1,279 @@ +.box { + width: 100%; + height: 700px; + color: #fff; + display: flex; + flex-direction: column; + background-image: linear-gradient(#003B6E, #000D21); + position: relative; +} + +.titlebox { + width: 100%; + height: 48px; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%); + display: flex; + align-items: center; + + .title { + width: 100%; + height: 32px; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%); + display: flex; + justify-content: center; + + div { + width: 120px; + height: 32px; + text-align: center; + line-height: 32px; + font-family: sybold; + font-size: 16px; + position: relative; + cursor: pointer; + margin: 0 18px; + + .border { + position: absolute; + bottom: -7px; + left: -18px; + width: 120px; + height: 4px; + } + } + + .selected { + background: linear-gradient(90deg, rgba(35, 153, 255, 0.57) 0%, #25b7d4 50%, rgba(35, 153, 255, 0.57) 100%); + + .border { + background: linear-gradient(90deg, rgba(35, 217, 255, 0) 0%, #25b7d4 50%, rgba(35, 217, 255, 0) 100%); + } + + } + } +} + +.ant-modal-close { + color: #fff; +} + +.content { + flex: 1; + box-sizing: border-box; + padding: 18px; + overflow: hidden; + .oilbox { + display: flex; + width: 100%; + height: 100%; + box-sizing: border-box; + padding: 18px 20px; + + .title { + width: 100%; + height: 30px; + line-height: 30px; + background: rgba(35, 153, 255, 0.2); + text-align: left; + border-bottom: 1px solid rgba(54, 162, 255, 0.47); + box-sizing: border-box; + padding-left: 16px; + color: #36A2FF; + + } + + .leftbox { + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; + margin-right: 70px; + + .lefttop, + .leftbottom { + width: 840px; + height: 280px; + border: 1px solid rgba(54, 162, 255, 0.47); + display: flex; + flex-direction: column; + + + + .content { + flex: 1; + background: #001d3c; + } + } + + .lefttop { + + .content { + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; + + .imglist1 { + width: 100%; + display: flex; + justify-content: space-around; + } + + .line { + width: 80%; + display: flex; + margin-top: 6px; + + div { + flex: 1; + height: 6px; + border-right: 1px solid #91CCFF; + border-bottom: 1px solid #91CCFF; + } + + div:nth-child(1) { + border-left: 1px solid #91CCFF; + } + } + + .imglist2 { + margin-top: -6px; + width: 100%; + display: flex; + justify-content: center; + } + } + } + + .leftbottom { + .content { + .colimglist { + display: flex; + align-items: center; + + .colimglist1 { + display: flex; + flex-direction: column; + justify-content: space-between; + } + + .colline { + height: 120px; + width: 6px; + border-right: 1px solid #91CCFF; + border-top: 1px solid #91CCFF; + border-bottom: 1px solid #91CCFF; + margin-left: 8px; + } + } + + display: flex; + width: 100%; + justify-content: space-around; + align-items: center; + } + + } + } + + .rightbox { + flex: 1; + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; + + .rightbottom { + width: 160px; + height: 490px; + display: flex; + flex-direction: column; + border: 1px solid rgba(54, 162, 255, 0.47); + + .content { + padding: 6px; + flex: 1; + background: #001d3c; + display: flex; + flex-direction: column; + justify-content: center; + // align-items:; + } + } + } + + .imgbox { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + + .img { + width: 96px; + height: 64px; + box-shadow: 0px 0px 6px #36A2FF; + border: 1px solid #C4E2FC; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + position: relative; + + img { + width: 100%; + height: 100%; + cursor: pointer; + } + + .err { + width: 24px; + height: 24px; + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + } + } + + .selectedimg { + box-shadow: 0px 0px 8px #FF4B65; + border: 1px solid #FF4B65; + background: #3f213b; + + img { + width: 24px; + height: 24px; + } + } + + .errimg { + box-shadow: 0px 0px 8px #FF4B65; + border: 1px solid #FF4B65; + } + + .name { + margin-top: 3px; + color: #FFFFFF; + font-size: 14px; + } + + } + } +} + + +.longleft1, +.longleft2 { + position: absolute; +} + +.longleft1 { + right: 213px; + top: 102px; +} + +.longleft2 { + right: 250px; + bottom: 137px; + width: 100px; +} diff --git a/src/app/pages/oil-unloading-process/oil-unloading-process.component.ts b/src/app/pages/oil-unloading-process/oil-unloading-process.component.ts new file mode 100644 index 0000000..42be27a --- /dev/null +++ b/src/app/pages/oil-unloading-process/oil-unloading-process.component.ts @@ -0,0 +1,32 @@ +import { Component, OnInit, Input } from '@angular/core'; +import Viewer from 'viewerjs' +@Component({ + selector: 'app-oil-unloading-process', + templateUrl: './oil-unloading-process.component.html', + styleUrls: ['./oil-unloading-process.component.scss'] +}) +export class OilUnloadingProcessComponent implements OnInit { + @Input() data: any + constructor() { } + + ngOnInit(): void { + } + lookImg() { + let dom = document.getElementById(`viewerjs`) + let pObjs = dom.childNodes; + let node = document.createElement("img") + node.style.display = "none"; + node.src = "../../../../assets/images/bgImg.png"; + node.id = 'img' + dom.appendChild(node) + setTimeout(() => { + let viewer = new Viewer(document.getElementById(`viewerjs`), { + hidden: () => { + dom.removeChild(pObjs[0]); + viewer.destroy(); + } + }); + node.click(); + }, 0); + } +} diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index b50b995..70eb8c1 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -50,11 +50,12 @@ import { PlanAdminComponent } from './plan-admin/plan-admin.component'; import { GetOutOfLineDetailsComponent } from './today-warning/get-out-of-line-details/get-out-of-line-details.component'; import { NzNotificationModule } from 'ng-zorro-antd/notification'; import { DispositionComponent } from './disposition/disposition.component'; +import { OilUnloadingProcessComponent } from './oil-unloading-process/oil-unloading-process.component'; @NgModule({ declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent, - AddequipmentComponent, EditequipmentComponent,PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent], + AddequipmentComponent, EditequipmentComponent,PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent], imports: [ @@ -95,7 +96,7 @@ import { DispositionComponent } from './disposition/disposition.component'; NzPopconfirmModule, NzBadgeModule ], - entryComponents: [AddequipmentComponent, EditequipmentComponent,GetOutOfLineDetailsComponent,DispositionComponent], + entryComponents: [AddequipmentComponent, EditequipmentComponent,GetOutOfLineDetailsComponent,DispositionComponent,OilUnloadingProcessComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.ts b/src/app/pages/today-warning-admin/today-warning-admin.component.ts index d6dcbda..c0a59c8 100644 --- a/src/app/pages/today-warning-admin/today-warning-admin.component.ts +++ b/src/app/pages/today-warning-admin/today-warning-admin.component.ts @@ -179,8 +179,7 @@ export class TodayWarningAdminComponent implements OnInit { 'background': '#000D21', }, nzComponentParams: { - data: item, - type: type + data: item }, nzFooter: null, nzOnOk: async () => { diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html index 1124d5e..243fa66 100644 --- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html +++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html @@ -1,7 +1,6 @@ -
-
+
预警截图
@@ -11,15 +10,9 @@
-
-
- 卸油作业 -
-
-
-
+
事中操作 @@ -79,7 +79,7 @@
卸油车取样
-
+
@@ -90,29 +90,29 @@
- +
1.第三方确认检查
- +
2.拆除卸油管
- +
3.作业现场清理
- -
+ +
@@ -130,7 +130,7 @@ 车辆进场
- +
卸油过程全程监测 @@ -165,9 +165,16 @@
+ +
+ +
+ +
+ +
+
- -