From 956f583b9c087de2ddb1a238adec8f5016121846 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 10 Apr 2023 16:29:37 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]superadmin=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=9C=8B=E5=88=B0isForceMake=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 proxy.config.json                             |  4 +-
 .../oil-unloading-process.component.html      | 96 ++-----------------
 .../oil-unloading-process.component.scss      |  3 +
 .../oil-unloading-process.component.ts        |  6 +-
 4 files changed, 20 insertions(+), 89 deletions(-)

diff --git a/proxy.config.json b/proxy.config.json
index 07408fe..e2148be 100644
--- a/proxy.config.json
+++ b/proxy.config.json
@@ -1,6 +1,6 @@
 {
   "/api": {
-    "target": "http://121.36.37.70:8906/",
+    "target": "https://znaq.sinochemoilmarketing.com/",
     "测试1": "http://121.36.37.70:8906/",
     "测试2": "https://znaq.sinochemoilmarketing.com/",
     "测试3": "https://gas.anxincloud.cn/",
@@ -8,7 +8,7 @@
     "changeOrigin": true
   },
   "/signalr": {
-    "target": "http://121.36.37.70:8906/",
+    "target": "https://znaq.sinochemoilmarketing.com/",
     "secure": false,
     "ws": true,
     "logLevel": "debug"
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
index cbb3ee9..71ffa7a 100644
--- a/src/app/pages/oil-unloading-process/oil-unloading-process.component.html
+++ b/src/app/pages/oil-unloading-process/oil-unloading-process.component.html
@@ -23,7 +23,7 @@
                             alt="">
                         <img *ngIf="!data[0].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
                     </div>
-                    <span class="name">油罐车进场</span>
+                    <span class="name" [ngClass]="{'isForceMake': data[0].isForceMake && isSuperAdmin}">油罐车进场</span>
                 </div>
                 <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
                 <div class="imgbox">
@@ -36,22 +36,9 @@
                             alt="">
                         <img *ngIf="!data[1].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
                     </div>
-                    <span class="name">设置隔离区域</span>
+                    <span class="name" [ngClass]="{'isForceMake': data[1].isForceMake && isSuperAdmin}">设置隔离区域</span>
                 </div>
                 <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
-                <!-- <div class="imgbox">
-                    <span class="timespan"
-                        [ngClass]="{'timespanerr': !data.oilUnloadingNodes[4].isCorrect || !data.oilUnloadingNodes[4].violateImage}"><i
-                            nz-icon nzType="clock-circle" nzTheme="outline"></i>{{data.oilUnloadingNodes[4].violateTime ? (data.oilUnloadingNodes[4].violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
-                    <div class="img" (click)="lookImg(data.oilUnloadingNodes[4].violateImage)" [ngClass]="{'selectedimg': !data.oilUnloadingNodes[4].violateImage}">
-                        <img [src]="data.oilUnloadingNodes[4].violateImage ? data.oilUnloadingNodes[4].violateImage : '../../../../assets/images/nopng.png'"
-                            alt="">
-                        <img *ngIf="!data.oilUnloadingNodes[4].isCorrect" class="err"
-                            src="../../../../assets/images/err.png" alt="">
-                    </div>
-                    <span class="name">固定罐车轮胎</span>
-                </div>
-                <img src="../../../assets/images/rightArrow.png" alt=""> -->
                 <div class="imgbox">
                     <span class="timespan" [ngClass]="{'timespanerr': !data[2].isCorrect}"><i nz-icon
                             nzType="clock-circle" nzTheme="outline"></i>{{data[2].violateTime
@@ -62,7 +49,7 @@
                             alt="">
                         <img *ngIf="!data[2].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
                     </div>
-                    <span class="name">连接静电接地</span>
+                    <span class="name" [ngClass]="{'isForceMake': data[2].isForceMake && isSuperAdmin}">连接静电接地</span>
                 </div>
                 <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
                 <div class="imgbox">
@@ -75,7 +62,7 @@
                             alt="">
                         <img *ngIf="!data[3].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
                     </div>
-                    <span class="name">放置消防器材</span>
+                    <span class="name" [ngClass]="{'isForceMake': data[3].isForceMake && isSuperAdmin}">放置消防器材</span>
                 </div>
             </div>
         </div>
@@ -89,53 +76,8 @@
                 卸油操作
             </div>
             <div class="content content2">
-                <!-- <div class="colimglist">
-                    <div class="imgbox">
-                        <span class="timespan"
-                            [ngClass]="{'timespanerr': !data.oilUnloadingNodes[7].isCorrect || !data.oilUnloadingNodes[7].violateImage}"><i
-                                nz-icon nzType="clock-circle" nzTheme="outline"></i>{{data.oilUnloadingNodes[7].violateTime ? (data.oilUnloadingNodes[7].violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
-                        <div class="img" (click)="lookImg(data.oilUnloadingNodes[7].violateImage)" [ngClass]="{'selectedimg': !data.oilUnloadingNodes[7].violateImage}">
-                            <img [src]="data.oilUnloadingNodes[7].violateImage ? data.oilUnloadingNodes[7].violateImage : '../../../../assets/images/nopng.png'"
-                                alt="">
-                            <img *ngIf="!data.oilUnloadingNodes[7].isCorrect" class="err"
-                                src="../../../../assets/images/err.png" alt="">
-                        </div>
-                        <span class="name">取样检查</span>
-                    </div>
-
-                    <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
-                    <div class="imgbox">
-                        <span class="timespan"
-                            [ngClass]="{'timespanerr': !data.oilUnloadingNodes[8].isCorrect || !data.oilUnloadingNodes[8].violateImage}"><i
-                                nz-icon nzType="clock-circle" nzTheme="outline"></i>{{data.oilUnloadingNodes[8].violateTime ? (data.oilUnloadingNodes[8].violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
-                        <div class="img" (click)="lookImg(data.oilUnloadingNodes[8].violateImage)" [ngClass]="{'selectedimg': !data.oilUnloadingNodes[8].violateImage}">
-                            <img [src]="data.oilUnloadingNodes[8].violateImage ? data.oilUnloadingNodes[8].violateImage : '../../../../assets/images/nopng.png'"
-                                alt="">
-                            <img *ngIf="!data.oilUnloadingNodes[8].isCorrect" class="err"
-                                src="../../../../assets/images/err.png" alt="">
-                        </div>
-                        <span class="name">连接卸油管</span>
-                    </div>
-                    <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
-                    <div class="imgbox">
-                        <span class="timespan"
-                            [ngClass]="{'timespanerr': !data.oilUnloadingNodes[9].isCorrect || !data.oilUnloadingNodes[9].violateImage}"><i
-                                nz-icon nzType="clock-circle" nzTheme="outline"></i>{{data.oilUnloadingNodes[9].violateTime ? (data.oilUnloadingNodes[9].violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
-                        <div class="img" (click)="lookImg(data.oilUnloadingNodes[9].violateImage)" [ngClass]="{'selectedimg': !data.oilUnloadingNodes[9].violateImage}">
-                            <img [src]="data.oilUnloadingNodes[9].violateImage ? data.oilUnloadingNodes[9].violateImage : '../../../../assets/images/nopng.png'"
-                                alt="">
-                            <img *ngIf="!data.oilUnloadingNodes[9].isCorrect" class="err"
-                                src="../../../../assets/images/err.png" alt="">
-                        </div>
-                        <span class="name">第三方确认</span>
-                    </div>
-
-                </div> -->
 
                 <div class="colimglist">
-                    <!-- <div class="imgbox">
-                        <span class="name">开始卸油</span>
-                    </div> -->
                     <div class="imgbox">
                         <span class="timespan" [ngClass]="{'timespanerr': !data[4].isCorrect}"><i nz-icon
                                 nzType="clock-circle" nzTheme="outline"></i>{{data[4].violateTime ?
@@ -146,7 +88,7 @@
                                 alt="">
                             <img *ngIf="!data[4].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
                         </div>
-                        <span class="name">连接卸油管</span>
+                        <span class="name" [ngClass]="{'isForceMake': data[4].isForceMake && isSuperAdmin}">连接卸油管</span>
                     </div>
                     <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
                     <div class="imgbox">
@@ -159,7 +101,7 @@
                                 alt="">
                             <img *ngIf="!data[5].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
                         </div>
-                        <span class="name">全程监卸</span>
+                        <span class="name" [ngClass]="{'isForceMake': data[5].isForceMake && isSuperAdmin}">全程监卸</span>
                     </div>
                     <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
                     <div class="imgbox">
@@ -172,7 +114,7 @@
                                 alt="">
                             <img *ngIf="!data[6].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
                         </div>
-                        <span class="name">拆除卸油管</span>
+                        <span class="name" [ngClass]="{'isForceMake': data[6].isForceMake && isSuperAdmin}">拆除卸油管</span>
                     </div>
                     <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
                     <div class="imgbox">
@@ -185,29 +127,11 @@
                                 alt="">
                             <img *ngIf="!data[7].isCorrect" class="err" src="../../../../assets/images/err.png" alt="">
                         </div>
-                        <span class="name">油罐车离场</span>
+                        <span class="name" [ngClass]="{'isForceMake': data[7].isForceMake && isSuperAdmin}">油罐车离场</span>
                     </div>
-                    <!-- <img class="rightArrow" src="../../../assets/images/rightArrow.png" alt="">
-                    <div class="imgbox">
-                        <span class="timespan"
-                            [ngClass]="{'timespanerr': !data.oilUnloadingNodes[12].isCorrect || !data.oilUnloadingNodes[12].violateImage}"><i
-                                nz-icon nzType="clock-circle"
-                                nzTheme="outline"></i>{{data.oilUnloadingNodes[12].violateTime ?
-                            (data.oilUnloadingNodes[12].violateTime | date:"MM-dd HH:mm:ss") : '/'}}</span>
-                        <div class="img" (click)="lookImg(data.oilUnloadingNodes[12].violateImage)"
-                            [ngClass]="{'selectedimg': !data.oilUnloadingNodes[12].violateImage}">
-                            <img [src]="data.oilUnloadingNodes[12].violateImage ? data.oilUnloadingNodes[12].violateImage : '../../../../assets/images/nopng.png'"
-                                alt="">
-                            <img *ngIf="!data.oilUnloadingNodes[12].isCorrect" class="err"
-                                src="../../../../assets/images/err.png" alt="">
-                        </div>
-                        <span class="name">清理现场</span>
-                    </div> -->
+
                 </div>
-                <!-- 
-                <div class="line"></div>
-                <div class="line2"></div>
-                <img class="bottomArrow2" src="../../../assets/images/bottomArrow2.png" alt=""> -->
+
             </div>
         </div>
     </div>
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
index 308b97d..0e16010 100644
--- a/src/app/pages/oil-unloading-process/oil-unloading-process.component.scss
+++ b/src/app/pages/oil-unloading-process/oil-unloading-process.component.scss
@@ -241,6 +241,9 @@
       color: #FFFFFF;
       font-size: 14px;
     }
+    .isForceMake{
+      color: red;
+    }
 
   }
 }
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
index 620f0b3..8550b96 100644
--- a/src/app/pages/oil-unloading-process/oil-unloading-process.component.ts
+++ b/src/app/pages/oil-unloading-process/oil-unloading-process.component.ts
@@ -11,8 +11,12 @@ export class OilUnloadingProcessComponent implements OnInit {
   @Input() data: any;
   constructor(private message: NzMessageService) {}
 
+  isSuperAdmin = false;
   ngOnInit(): void {
-    // console.log(this.data)
+    let userName = JSON.parse(sessionStorage.getItem("userdata")).userName;
+    if (userName === "superadmin") {
+      this.isSuperAdmin = true;
+    }
   }
   lookImg(url) {
     if (url) {