shaojiahao
/
Sinopec-Anxin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[完善]卸油弹窗增加站名

beijing
邵佳豪 2 years ago
parent
1359fad5f2
commit
597e983c51
5 changed files with 644 additions and 501 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      proxy.config.json
  2. 47
      src/app/pages/oil-unloading-process/oil-unloading-process.component.html
  3. 2
      src/app/pages/oil-unloading-process/oil-unloading-process.component.scss
  4. 33
      src/app/pages/oil-unloading-process/oil-unloading-process.component.ts
  5. 1055
      src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts

8
proxy.config.json
Unescape View File

@ -1,13 +1,13 @@
{ {
"/api": { "/api": {
"生产": "https://znaq.sinochemoilmarketing.com/", "target": "https://znaq.sinochemoilmarketing.com/",
"target": "http://121.36.37.70:8906/", "测试": "http://121.36.37.70:8906/",
"secure": false, "secure": false,
"changeOrigin": true "changeOrigin": true
}, },
"/signalr": { "/signalr": {
"生产": "https://znaq.sinochemoilmarketing.com/", "target": "https://znaq.sinochemoilmarketing.com/",
"target": "http://121.36.37.70:8906/", "测试": "http://121.36.37.70:8906/",
"secure": false, "secure": false,
"ws": true, "ws": true,
"logLevel": "debug" "logLevel": "debug"

47
src/app/pages/oil-unloading-process/oil-unloading-process.component.html
Unescape View File

@ -2,7 +2,7 @@
<div class="titlebox"> <div class="titlebox">
<div class="title"> <div class="title">
<div> <div>
卸油全流程 {{stationName}}卸油全流程
<div class="border"></div> <div class="border"></div>
</div> </div>
</div> </div>
@ -21,8 +21,7 @@
[ngClass]="{'selectedimg': !data[0].violateImage}"> [ngClass]="{'selectedimg': !data[0].violateImage}">
<img [src]="data[0].violateImage ? data[0].violateImage : '../../../../assets/images/nopng.png'" <img [src]="data[0].violateImage ? data[0].violateImage : '../../../../assets/images/nopng.png'"
alt=""> alt="">
<img *ngIf="!data[0].isCorrect" class="err" <img *ngIf="!data[0].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
src="../../../../assets/images/err.png" alt="">
</div> </div>
<span class="name">油罐车进场</span> <span class="name">油罐车进场</span>
</div> </div>
@ -35,8 +34,7 @@
[ngClass]="{'selectedimg': !data[1].violateImage}"> [ngClass]="{'selectedimg': !data[1].violateImage}">
<img [src]="data[1].violateImage ? data[1].violateImage : '../../../../assets/images/nopng.png'" <img [src]="data[1].violateImage ? data[1].violateImage : '../../../../assets/images/nopng.png'"
alt=""> alt="">
<img *ngIf="!data[1].isCorrect" class="err" <img *ngIf="!data[1].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
src="../../../../assets/images/err.png" alt="">
</div> </div>
<span class="name">设置隔离区域</span> <span class="name">设置隔离区域</span>
</div> </div>
@ -62,8 +60,7 @@
[ngClass]="{'selectedimg': !data[2].violateImage}"> [ngClass]="{'selectedimg': !data[2].violateImage}">
<img [src]="data[2].violateImage ? data[2].violateImage : '../../../../assets/images/nopng.png'" <img [src]="data[2].violateImage ? data[2].violateImage : '../../../../assets/images/nopng.png'"
alt=""> alt="">
<img *ngIf="!data[2].isCorrect" class="err" <img *ngIf="!data[2].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
src="../../../../assets/images/err.png" alt="">
</div> </div>
<span class="name">连接静电接地</span> <span class="name">连接静电接地</span>
</div> </div>
@ -76,8 +73,7 @@
[ngClass]="{'selectedimg': !data[3].violateImage}"> [ngClass]="{'selectedimg': !data[3].violateImage}">
<img [src]="data[3].violateImage ? data[3].violateImage : '../../../../assets/images/nopng.png'" <img [src]="data[3].violateImage ? data[3].violateImage : '../../../../assets/images/nopng.png'"
alt=""> alt="">
<img *ngIf="!data[3].isCorrect" class="err" <img *ngIf="!data[3].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
src="../../../../assets/images/err.png" alt="">
</div> </div>
<span class="name">放置消防器材</span> <span class="name">放置消防器材</span>
</div> </div>
@ -141,62 +137,53 @@
<span class="name">开始卸油</span> <span class="name">开始卸油</span>
</div> --> </div> -->
<div class="imgbox"> <div class="imgbox">
<span class="timespan" [ngClass]="{'timespanerr': !data[4].isCorrect}"><i <span class="timespan" [ngClass]="{'timespanerr': !data[4].isCorrect}"><i nz-icon
nz-icon nzType="clock-circle" nzType="clock-circle" nzTheme="outline"></i>{{data[4].violateTime ?
nzTheme="outline"></i>{{data[4].violateTime ?
(data[4].violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span> (data[4].violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
<div class="img" (click)="lookImg(data[4].violateImage)" <div class="img" (click)="lookImg(data[4].violateImage)"
[ngClass]="{'selectedimg': !data[4].violateImage}"> [ngClass]="{'selectedimg': !data[4].violateImage}">
<img [src]="data[4].violateImage ? data[4].violateImage : '../../../../assets/images/nopng.png'" <img [src]="data[4].violateImage ? data[4].violateImage : '../../../../assets/images/nopng.png'"
alt=""> alt="">
<img *ngIf="!data[4].isCorrect" class="err" <img *ngIf="!data[4].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
src="../../../../assets/images/err.png" alt="">
</div> </div>
<span class="name">连接卸油管</span> <span class="name">连接卸油管</span>
</div> </div>
<img class="rightArrow" src="../../../assets/images/rightArrow.png" alt=""> <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
<div class="imgbox"> <div class="imgbox">
<span class="timespan" [ngClass]="{'timespanerr': !data[5].isCorrect}"><i <span class="timespan" [ngClass]="{'timespanerr': !data[5].isCorrect}"><i nz-icon
nz-icon nzType="clock-circle" nzType="clock-circle" nzTheme="outline"></i>{{data[5].violateTime ?
nzTheme="outline"></i>{{data[5].violateTime ?
(data[5].violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span> (data[5].violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
<div class="img" (click)="lookImg(data[5].violateImage)" <div class="img" (click)="lookImg(data[5].violateImage)"
[ngClass]="{'selectedimg': !data[5].violateImage}"> [ngClass]="{'selectedimg': !data[5].violateImage}">
<img [src]="data[5].violateImage ? data[5].violateImage : '../../../../assets/images/nopng.png'" <img [src]="data[5].violateImage ? data[5].violateImage : '../../../../assets/images/nopng.png'"
alt=""> alt="">
<img *ngIf="!data[5].isCorrect" class="err" <img *ngIf="!data[5].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
src="../../../../assets/images/err.png" alt="">
</div> </div>
<span class="name">全程监卸</span> <span class="name">全程监卸</span>
</div> </div>
<img class="rightArrow" src="../../../assets/images/rightArrow.png" alt=""> <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
<div class="imgbox"> <div class="imgbox">
<span class="timespan" [ngClass]="{'timespanerr': !data[6].isCorrect}"><i <span class="timespan" [ngClass]="{'timespanerr': !data[6].isCorrect}"><i nz-icon
nz-icon nzType="clock-circle" nzType="clock-circle" nzTheme="outline"></i>{{data[6].violateTime ?
nzTheme="outline"></i>{{data[6].violateTime ?
(data[6].violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span> (data[6].violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
<div class="img" (click)="lookImg(data[6].violateImage)" <div class="img" (click)="lookImg(data[6].violateImage)"
[ngClass]="{'selectedimg': !data[6].violateImage}"> [ngClass]="{'selectedimg': !data[6].violateImage}">
<img [src]="data[6].violateImage ? data[6].violateImage : '../../../../assets/images/nopng.png'" <img [src]="data[6].violateImage ? data[6].violateImage : '../../../../assets/images/nopng.png'"
alt=""> alt="">
<img *ngIf="!data[6].isCorrect" class="err" <img *ngIf="!data[6].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
src="../../../../assets/images/err.png" alt="">
</div> </div>
<span class="name">拆除卸油管</span> <span class="name">拆除卸油管</span>
</div> </div>
<img class="rightArrow" src="../../../assets/images/rightArrow.png" alt=""> <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
<div class="imgbox"> <div class="imgbox">
<span class="timespan" <span class="timespan" [ngClass]="{'timespanerr': !data[7].isCorrect}"><i nz-icon
[ngClass]="{'timespanerr': !data[7].isCorrect}"><i nzType="clock-circle" nzTheme="outline"></i>{{data[7].violateTime ?
nz-icon nzType="clock-circle"
nzTheme="outline"></i>{{data[7].violateTime ?
(data[7].violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span> (data[7].violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
<div class="img" (click)="lookImg(data[7].violateImage)" <div class="img" (click)="lookImg(data[7].violateImage)"
[ngClass]="{'selectedimg': !data[7].violateImage}"> [ngClass]="{'selectedimg': !data[7].violateImage}">
<img [src]="data[7].violateImage ? data[7].violateImage : '../../../../assets/images/nopng.png'" <img [src]="data[7].violateImage ? data[7].violateImage : '../../../../assets/images/nopng.png'"
alt=""> alt="">
<img *ngIf="!data[7].isCorrect" class="err" <img *ngIf="!data[7].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
src="../../../../assets/images/err.png" alt="">
</div> </div>
<span class="name">油罐车离场</span> <span class="name">油罐车离场</span>
</div> </div>

2
src/app/pages/oil-unloading-process/oil-unloading-process.component.scss
Unescape View File

@ -32,7 +32,7 @@
justify-content: center; justify-content: center;
div { div {
width: 120px; width: 500px;
height: 32px; height: 32px;
text-align: center; text-align: center;
line-height: 32px; line-height: 32px;

33
src/app/pages/oil-unloading-process/oil-unloading-process.component.ts
Unescape View File

@ -1,41 +1,40 @@
import { Component, OnInit, Input } from '@angular/core'; import { Component, OnInit, Input } from "@angular/core";
import Viewer from 'viewerjs' import Viewer from "viewerjs";
import { NzMessageService } from 'ng-zorro-antd/message'; import { NzMessageService } from "ng-zorro-antd/message";
@Component({ @Component({
selector: 'app-oil-unloading-process', selector: "app-oil-unloading-process",
templateUrl: './oil-unloading-process.component.html', templateUrl: "./oil-unloading-process.component.html",
styleUrls: ['./oil-unloading-process.component.scss'] styleUrls: ["./oil-unloading-process.component.scss"],
}) })
export class OilUnloadingProcessComponent implements OnInit { export class OilUnloadingProcessComponent implements OnInit {
@Input() data: any @Input() stationName: any;
constructor(private message: NzMessageService) { } @Input() data: any;
constructor(private message: NzMessageService) {}
ngOnInit(): void { ngOnInit(): void {
// console.log(this.data) // console.log(this.data)
} }
lookImg(url) { lookImg(url) {
if (url) { if (url) {
console.log(url) console.log(url);
let dom = document.getElementById(`viewerjs`) let dom = document.getElementById(`viewerjs`);
let pObjs = dom.childNodes; let pObjs = dom.childNodes;
let node = document.createElement("img") let node = document.createElement("img");
node.style.display = "none"; node.style.display = "none";
node.src = url; node.src = url;
node.id = 'img' node.id = "img";
dom.appendChild(node) dom.appendChild(node);
setTimeout(() => { setTimeout(() => {
let viewer = new Viewer(document.getElementById(`viewerjs`), { let viewer = new Viewer(document.getElementById(`viewerjs`), {
hidden: () => { hidden: () => {
dom.removeChild(pObjs[0]); dom.removeChild(pObjs[0]);
viewer.destroy(); viewer.destroy();
} },
}); });
node.click(); node.click();
}, 0); }, 0);
} else { } else {
this.message.create('warning', `该节点没有图片`); this.message.create("warning", `该节点没有图片`);
} }
} }
} }

1055
src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save