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=""> - 油罐车进场 + 油罐车进场
@@ -36,22 +36,9 @@ alt="">
- 设置隔离区域 + 设置隔离区域 -
{{data[2].violateTime @@ -62,7 +49,7 @@ alt="">
- 连接静电接地 + 连接静电接地
@@ -75,7 +62,7 @@ alt="">
- 放置消防器材 + 放置消防器材 @@ -89,53 +76,8 @@ 卸油操作
-
-
{{data[4].violateTime ? @@ -146,7 +88,7 @@ alt="">
- 连接卸油管 + 连接卸油管
@@ -159,7 +101,7 @@ alt="">
- 全程监卸 + 全程监卸
@@ -172,7 +114,7 @@ alt="">
- 拆除卸油管 + 拆除卸油管
@@ -185,29 +127,11 @@ alt="">
- 油罐车离场 + 油罐车离场 - + - + 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) {