-
- 卸油过程全程监测
+
+
+
+
+ 开始卸油
-
-
-
卸油全程监卸
-
-
-
-
-
-
-
卸油员及司押人员服装
-
-
-
+
+
+
{{data.oilUnloadingNodes[10].violateTime ? (data.oilUnloadingNodes[10].violateTime | date:"MM-dd HH:mm:ss") : '/'}}
+
+
![]()
+
-
-
登车防护检查
-
-
-
+
全程监卸
+
+
+
+
{{data.oilUnloadingNodes[11].violateTime ? (data.oilUnloadingNodes[11].violateTime | date:"MM-dd HH:mm:ss") : '/'}}
+
+
![]()
+
-
-
油品泄漏检查
-
-
-
+
拆除卸油管
+
+
+
+
{{data.oilUnloadingNodes[12].violateTime ? (data.oilUnloadingNodes[12].violateTime | date:"MM-dd HH:mm:ss") : '/'}}
+
+
![]()
+
+
清理现场
-
-
-
-
-
-
-
-
+
+
+
+
-
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 bfa4b73..2ea7f3b 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
@@ -1,17 +1,20 @@
.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 */
+ display: none;
+ /* Chrome Safari */
}
- scrollbar-width: none; /* firefox */
- -ms-overflow-style: none; /* IE 10+ */
+
+ scrollbar-width: none;
+ /* firefox */
+ -ms-overflow-style: none;
+ /* IE 10+ */
}
.titlebox {
@@ -63,282 +66,175 @@
color: #fff;
}
-.content {
+.contentbox {
flex: 1;
+ width: 100%;
box-sizing: border-box;
padding: 18px;
max-height: 700px;
overflow-y: auto;
position: relative;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
- .oilbox {
+ .topbox,
+ .bottombox {
display: flex;
- width: 100%;
- height: 100%;
- box-sizing: border-box;
- padding: 18px 20px;
+ border: 1px solid rgba(54, 162, 255, 0.4);
.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;
+ width: 28px;
+ height: 100%;
+ border-right: 1px solid rgba(54, 162, 255, 0.4);
+ background: #052c53;
+ line-height: 20px;
+ font-size: 14px;
color: #36A2FF;
+ text-align: center;
+ box-sizing: border-box;
+ padding-top: 20px;
+ }
+ .content {
+ flex: 1;
+ background: #001631;
}
- .leftbox {
+ .content1 {
display: flex;
- flex-direction: column;
- justify-content: space-between;
align-items: center;
- margin-right: 70px;
+ justify-content: space-around;
+ box-sizing: border-box;
+ padding: 0 30px;
+ }
- .lefttop,
- .leftbottom {
- width: 840px;
- border: 1px solid rgba(54, 162, 255, 0.47);
+ .content2 {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ align-content: center;
+ position: relative;
+
+ .colimglist {
display: flex;
+ justify-content: center;
+ align-items: center;
+ }
- .title {
- height: 100%;
- width: 26px;
- text-align: center;
- padding: 0;
- }
-
- .content {
- flex: 1;
- background: #001d3c;
- }
+ .rightArrow {
+ width: 40px;
+ height: 38px;
+ margin: 0 12px;
}
- .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;
- }
- }
+ .line {
+ position: absolute;
+ width: 465px;
+ height: 10px;
+ border-bottom: 1px solid #91CCFF;
+ border-right: 1px solid #91CCFF;
+ left: 190px;
+ top: 180px;
+
}
- .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;
- }
- }
+ .line2 {
+ position: absolute;
+ width: 1px;
+ height: 6px;
+ border-right: 1px solid #91CCFF;
+ left: 190px;
+ top: 190px;
+ }
+ .bottomArrow2 {
+ position: absolute;
+ left: 172px;
+ top: 187px;
}
}
+ }
- .rightbox {
- flex: 1;
- display: flex;
- flex-direction: column;
- align-items: center;
+ .topbox {
+ width: 100%;
+ height: 184px;
+ }
- .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;
- }
- }
- }
+ .bottombox {
+ width: 100%;
+ height: 384px;
+ }
+
+ .bottomArrow {
+ margin: 13px 0;
+ }
+
+ .imgbox {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+
+ .timespan {
+ i {
+ margin-right: 6px;
}
+ color: #36A2FF;
}
-
- .imgbox {
+ .timespanerr{
+ color: #FF4B65;
+ }
+ .img {
+ width: 120px;
+ height: 80px;
+ box-shadow: 0px 0px 6px #36A2FF;
+ border: 1px solid #C4E2FC;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
+ position: relative;
+ margin: 8px 0;
- .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;
- }
- }
+ img {
+ width: 100%;
+ height: 100%;
+ cursor: pointer;
- .errimg {
- box-shadow: 0px 0px 8px #FF4B65;
- border: 1px solid #FF4B65;
}
- .name {
- margin-top: 3px;
- color: #FFFFFF;
- font-size: 14px;
+ .err {
+ width: 24px;
+ height: 24px;
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
}
-
}
- }
- .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;
- }
-}
+ .selectedimg {
+ box-shadow: 0px 0px 8px #FF4B65;
+ border: 1px solid #FF4B65;
+ background: #3f213b;
+ img {
+ width: 24px;
+ height: 24px;
+ }
+ }
-.longleft1,
-.longleft2 {
- position: absolute;
-}
+ .errimg {
+ box-shadow: 0px 0px 8px #FF4B65;
+ border: 1px solid #FF4B65;
+ }
-.longleft1 {
- right: 213px;
- top: 102px;
-}
+ .name {
+ margin-top: 3px;
+ color: #FFFFFF;
+ font-size: 14px;
+ }
-.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
index 42be27a..c2629d4 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
@@ -1,5 +1,6 @@
import { Component, OnInit, Input } from '@angular/core';
import Viewer from 'viewerjs'
+import { NzMessageService } from 'ng-zorro-antd/message';
@Component({
selector: 'app-oil-unloading-process',
templateUrl: './oil-unloading-process.component.html',
@@ -7,26 +8,31 @@ import Viewer from 'viewerjs'
})
export class OilUnloadingProcessComponent implements OnInit {
@Input() data: any
- constructor() { }
+ constructor(private message: NzMessageService) { }
ngOnInit(): void {
+ console.log(this.data)
}
- 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);
+ lookImg(url) {
+ if (url) {
+ 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);
+ }else{
+ this.message.create('warning', `该节点没有图片`);
+ }
}
}
diff --git a/src/app/pages/plan-admin/plan-admin.component.html b/src/app/pages/plan-admin/plan-admin.component.html
index 97fec22..fcd62fe 100644
--- a/src/app/pages/plan-admin/plan-admin.component.html
+++ b/src/app/pages/plan-admin/plan-admin.component.html
@@ -53,7 +53,7 @@
+ [nzScroll]="{ y:tableheight() }" [nzNoResult]='null'>
|
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts
index 52e03eb..3f662bd 100644
--- a/src/app/pages/plan/plan.component.ts
+++ b/src/app/pages/plan/plan.component.ts
@@ -477,6 +477,13 @@ export class PlanComponent implements OnInit {
})
}
+ /**
+ * 更新BeforePlanNode，与三维同步
+ */
+ updateBeforePlanNode() {
+ this.beforePlanNode = MarkWindow.instance.currentMarkNodeInfo.nodeData
+ }
+
//选中 底部一级节点 开启自动播放
selectChildNode(item: MarkPlanData) {
if (item.nodes.length) {
@@ -693,6 +700,9 @@ export class PlanComponent implements OnInit {
ServeManager.instance.openFileSelect(file, url, (name: string, path: string) => { //上传
if (!isVideo) { //img
this.beforePlanNode.texture = ObjectsService.getFullPath(path + name)
+
+ console.log("上传图片保存数据", this.beforePlanNode);
+
this.initViewer()
} else { //video
this.beforePlanNode.video = ObjectsService.getFullPath(path + name)
diff --git a/src/assets/images/bluebg.png b/src/assets/images/bluebg.png
deleted file mode 100644
index 89ab55d..0000000
Binary files a/src/assets/images/bluebg.png and /dev/null differ
diff --git a/src/assets/images/bottomArrow.png b/src/assets/images/bottomArrow.png
new file mode 100644
index 0000000..b794bb2
Binary files /dev/null and b/src/assets/images/bottomArrow.png differ
diff --git a/src/assets/images/bottomArrow2.png b/src/assets/images/bottomArrow2.png
new file mode 100644
index 0000000..27e8185
Binary files /dev/null and b/src/assets/images/bottomArrow2.png differ
diff --git a/src/assets/images/down.png b/src/assets/images/down.png
deleted file mode 100644
index 7d30fe4..0000000
Binary files a/src/assets/images/down.png and /dev/null differ
diff --git a/src/assets/images/left.png b/src/assets/images/left.png
deleted file mode 100644
index 1fb4fc0..0000000
Binary files a/src/assets/images/left.png and /dev/null differ
diff --git a/src/assets/images/left2.png b/src/assets/images/left2.png
deleted file mode 100644
index 7c59007..0000000
Binary files a/src/assets/images/left2.png and /dev/null differ
diff --git a/src/assets/images/left3.png b/src/assets/images/left3.png
deleted file mode 100644
index 94bc679..0000000
Binary files a/src/assets/images/left3.png and /dev/null differ
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
deleted file mode 100644
index 08456b2..0000000
Binary files a/src/assets/images/logo.png and /dev/null differ
diff --git a/src/assets/images/longleft.png b/src/assets/images/longleft.png
deleted file mode 100644
index 847e141..0000000
Binary files a/src/assets/images/longleft.png and /dev/null differ
diff --git a/src/assets/images/noImg.png b/src/assets/images/noImg.png
deleted file mode 100644
index f9e4db7..0000000
Binary files a/src/assets/images/noImg.png and /dev/null differ
diff --git a/src/assets/images/right.png b/src/assets/images/right.png
deleted file mode 100644
index 0342bf4..0000000
Binary files a/src/assets/images/right.png and /dev/null differ
diff --git a/src/assets/images/right2.png b/src/assets/images/right2.png
deleted file mode 100644
index 67be955..0000000
Binary files a/src/assets/images/right2.png and /dev/null differ
diff --git a/src/assets/images/right3.png b/src/assets/images/right3.png
deleted file mode 100644
index 8b66629..0000000
Binary files a/src/assets/images/right3.png and /dev/null differ
diff --git a/src/assets/images/rightArrow.png b/src/assets/images/rightArrow.png
new file mode 100644
index 0000000..58f9f39
Binary files /dev/null and b/src/assets/images/rightArrow.png differ
diff --git a/src/assets/images/upload.jpg b/src/assets/images/upload.jpg
deleted file mode 100644
index 99442bd..0000000
Binary files a/src/assets/images/upload.jpg and /dev/null differ
diff --git a/src/assets/images/upload.png b/src/assets/images/upload.png
deleted file mode 100644
index b331d99..0000000
Binary files a/src/assets/images/upload.png and /dev/null differ
diff --git a/src/assets/images/yellowbg.png b/src/assets/images/yellowbg.png
deleted file mode 100644
index 38f6bdf..0000000
Binary files a/src/assets/images/yellowbg.png and /dev/null differ
- 近一个月卸油预警走势
+ 近30天卸油作业总数走势
+
+
+ 
-