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/home/home.component.html b/src/app/pages/home/home.component.html index 47eef40..f8c1dbb 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -64,15 +64,15 @@
- +
您有一条新的预警提醒! - {{item.id}} + {{item.notification.data.properties.ViolationName}}
-
+
查看
diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index 5d71b06..dfe18f8 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild, TemplateRef } from '@angular/core'; +import { Component, OnInit, ViewChild, TemplateRef, ViewContainerRef } from '@angular/core'; import { Router, NavigationEnd, ActivatedRoute } from '@angular/router'; import { Title } from '@angular/platform-browser' import { filter } from 'rxjs/operators'; @@ -8,6 +8,9 @@ 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'; +import { GetOutOfLineDetailsComponent } from '../today-warning/get-out-of-line-details/get-out-of-line-details.component'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { HttpClient } from '@angular/common/http'; declare var abp: any @Component({ @@ -17,8 +20,8 @@ declare var abp: any }) 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 notificationService: NzNotificationService) { } + constructor(private http: HttpClient, private router: Router, private navChangeService: NavChangeService, public token: CacheTokenService, + private cookieService: CookieService, private message: NzMessageService, private notificationService: NzNotificationService, private modal: NzModalService, private viewContainerRef: ViewContainerRef) { } isGasStationNav: boolean isGasStation: boolean @@ -89,26 +92,60 @@ export class HomeComponent implements OnInit { this.receiptOfNotification(userNotification) }); } - messageId=[] + messageId = [] receiptOfNotification(userNotification) { let obj = { - id:'xxx', - messageId:this.notificationService.template(this.template!, {nzPlacement: 'bottomRight', nzClass: 'receiptOfNotification', nzDuration: 0, nzData: userNotification}).messageId + id: userNotification.notification.entityId, + messageId: this.notificationService.template(this.template!, { nzPlacement: 'bottomRight', nzClass: 'receiptOfNotification', nzDuration: 0, nzData: userNotification }).messageId } this.messageId.push(obj) - console.log(99999,this.messageId) } + look(item) { + let params = { + id: item.notification.entityId + } + this.http.get('/api/services/app/ViolateRecord/Get', { + params: params + }).subscribe((data: any) => { + const modal = this.modal.create({ + nzContent: GetOutOfLineDetailsComponent, + nzViewContainerRef: this.viewContainerRef, + nzWidth: 1200, + nzBodyStyle: { + 'border': '1px solid #6d9cc7', + 'border-radius': '0px', + 'padding': '0px', + 'box-shadow': '0 0 8px 0 #fff', + 'background': '#000D21', + }, + nzComponentParams: { + data: data.result + }, + nzFooter: null, + nzOnOk: async () => { + + } + }); + const instance = modal.getContentComponent(); + this.messageId.forEach((element) => { + if (element.id == item.notification.entityId) { + this.notificationService.remove(element.messageId) + } + }) + }) - close(item){ - this.messageId.forEach((element)=>{ - if(element.id == 'xxx'){ + } + close(item) { + // console.log(item) + this.messageId.forEach((element) => { + if (element.id == item.notification.entityId) { this.notificationService.remove(element.messageId) } }) } - + ngOnDestroy() { abp.signalr.disconnect() } 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..fa9eb0d --- /dev/null +++ b/src/app/pages/oil-unloading-process/oil-unloading-process.component.html @@ -0,0 +1,182 @@ +
+
+
+
+ 卸油全流程 +
+
+
+
+
+
+
+
+
+ 事前准备 +
+
+
+
+
+ +
+ 油罐车朝向检察 +
+
+
+ +
+ 卸油效率检查 +
+
+
+ +
+ 设置隔离检查 +
+
+
+ +
+ 轮胎固定检察 +
+
+
+ +
+ 放置灭火器检察 +
+
+
+
+
+
+
+
+ +
+
+
+ +
+ 静电接地检查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..bfa4b73 --- /dev/null +++ b/src/app/pages/oil-unloading-process/oil-unloading-process.component.scss @@ -0,0 +1,344 @@ +.box { + width: 100%; + // height: 700px; + color: #fff; + display: flex; + flex-direction: column; + background-image: linear-gradient(#003B6E, #000D21); + position: relative; + + ::-webkit-scrollbar { + display: none; /* Chrome Safari */ + } + scrollbar-width: none; /* firefox */ + -ms-overflow-style: none; /* IE 10+ */ +} + +.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; + max-height: 700px; + overflow-y: auto; + position: relative; + + .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; + border: 1px solid rgba(54, 162, 255, 0.47); + display: flex; + + .title { + height: 100%; + width: 26px; + text-align: center; + padding: 0; + } + + .content { + flex: 1; + background: #001d3c; + } + } + + .lefttop { + margin-bottom: 16px; + + .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 { + position: relative; + display: flex; + flex-direction: column; + justify-content: space-around; + align-items: center; + + .colimglist { + display: flex; + flex-direction: column; + align-items: center; + + .colimglist1 { + display: flex; + align-items: center; + justify-content: center; + + .img { + margin: 0 50px; + } + } + + .colline { + height: 6px; + width: 200px; + border-right: 1px solid #91CCFF; + border-left: 1px solid #91CCFF; + border-bottom: 1px solid #91CCFF; + } + } + + width: 100%; + + .goout1 { + position: absolute; + bottom: 52px; + right: 280px; + } + + .goout2 { + position: absolute; + bottom: 18px; + right: 160px; + } + } + + } + } + + .rightbox { + flex: 1; + display: flex; + flex-direction: column; + align-items: center; + + .rightbottom { + width: 160px; + height: 538px; + 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: space-around; + // align-items:; + .imgbox{ + .name{ + margin-bottom: 3px; + } + } + } + } + } + + .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; + } + + } + } + + .topline{ + position: absolute; + top: 18px; + right: 136px; + width: 576px; + height:16px; + border-top: 1px solid #91CCFF; + border-right: 1px solid #91CCFF; + } + .toplinearrows{ + position: absolute; + top: 5px; + right: 690px; + } + .bottomlinearrows{ + position: absolute; + bottom: -88px; + right: 428px; + } + .bottomline{ + position: absolute; + bottom: -68px; + right: 136px; + width: 300px; + height: 17px; + border-bottom: 1px solid #91CCFF; + border-right: 1px solid #91CCFF; + } +} + + +.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 @@
-
-
- 卸油作业 -
-
-
-
+