diff --git a/src/app/ui/similar-plans/similar-plans.component.scss b/src/app/ui/similar-plans/similar-plans.component.scss
index 5fd855a..0a6ac4c 100644
--- a/src/app/ui/similar-plans/similar-plans.component.scss
+++ b/src/app/ui/similar-plans/similar-plans.component.scss
@@ -7,6 +7,7 @@
table{
width: 100%;
height: 100%;
+ border-collapse:collapse;
thead{
td{
color:#F7BA2A;
@@ -15,5 +16,20 @@
border-bottom: 1px solid #0E79A9;
}
}
+ tbody{
+ td{
+ text-align:center;
+
+ }
+ }
}
+}
+.tdyanse56{
+ color:#3BA9F2
+}
+.tdyanse78{
+ color:#28BC69
+}
+.tdyanse{
+ color: #FFFFFF;
}
\ No newline at end of file
diff --git a/src/app/ui/similar-plans/similar-plans.component.ts b/src/app/ui/similar-plans/similar-plans.component.ts
index 41004a0..078b54c 100644
--- a/src/app/ui/similar-plans/similar-plans.component.ts
+++ b/src/app/ui/similar-plans/similar-plans.component.ts
@@ -1,4 +1,5 @@
import { Component, OnInit } from '@angular/core';
+import { Color } from 'cesium';
@Component({
selector: 'app-similar-plans',
@@ -10,46 +11,25 @@ export class SimilarPlansComponent implements OnInit {
constructor() { }
ngOnInit(): void {
- this.tableData()
+
}
+
leisiYuan=[
- {danweiName:"广西钦州志诚化工有限公司",year:"XXXX年",zhoahuo:"XXX",weizhi:"2#储罐",xiangjin:"80%"},
- {danweiName:"南宁交能石化有限责任公司",year:"",zhoahuo:"XXX",weizhi:"3#储罐",xiangjin:"75%"},
- {danweiName:"广西藤县通轩立信化学有限公司",year:"",zhoahuo:"XXX",weizhi:"1#储罐",xiangjin:"70%"},
- {danweiName:"广西田东锦盛化工科技有限公司",year:"",zhoahuo:"XXXXXX",weizhi:"12#储罐",xiangjin:"60%"},
- {danweiName:"梧州市联溢化工有限公司",year:"",zhoahuo:"XXX",weizhi:"5#储罐",xiangjin:"50%"},
- {danweiName:"田东石油化工钦州港油品储运库",year:"",zhoahuo:"XXX",weizhi:"4-1#储罐",xiangjin:"40%"},
- {danweiName:"中国石油进德油库",year:"",zhoahuo:"XXX",weizhi:"3#储罐",xiangjin:"45%"},
- {danweiName:"广西华鑫化工有限公司",year:"",zhoahuo:"XXX",weizhi:"11#储罐",xiangjin:"42%"},
- {danweiName:"广西中油能源有限公司",year:"",zhoahuo:"XXX",weizhi:"6#储罐",xiangjin:"39%"},
- {danweiName:"广西钦州澄星化工科技有限公司",year:"",zhoahuo:"XXX",weizhi:"5-2#储罐",xiangjin:"35%"},
- {danweiName:"中油广西田东石油化工总厂有限公司",year:"",zhoahuo:"XXX",weizhi:"3-1#储罐",xiangjin:"35%"}
+ {danweiName:"广西钦州志诚化工有限公司",year:"XXXX年",zhoahuo:"XXX",weizhi:"2#储罐",xiangjin:parseFloat("80%")},
+ {danweiName:"南宁交能石化有限责任公司",year:"",zhoahuo:"XXX",weizhi:"3#储罐",xiangjin:parseFloat("75%")},
+ {danweiName:"广西藤县通轩立信化学有限公司",year:"",zhoahuo:"XXX",weizhi:"1#储罐",xiangjin:parseFloat("70%")},
+ {danweiName:"广西田东锦盛化工科技有限公司",year:"",zhoahuo:"XXXXXX",weizhi:"12#储罐",xiangjin:parseFloat("60%")},
+ {danweiName:"梧州市联溢化工有限公司",year:"",zhoahuo:"XXX",weizhi:"5#储罐",xiangjin:parseFloat("50%")},
+ {danweiName:"田东石油化工钦州港油品储运库",year:"",zhoahuo:"XXX",weizhi:"4-1#储罐",xiangjin:parseFloat("40%")},
+ {danweiName:"中国石油进德油库",year:"",zhoahuo:"XXX",weizhi:"3#储罐",xiangjin:parseFloat("45%")},
+ {danweiName:"广西华鑫化工有限公司",year:"",zhoahuo:"XXX",weizhi:"11#储罐",xiangjin:parseFloat("42%")},
+ {danweiName:"广西中油能源有限公司",year:"",zhoahuo:"XXX",weizhi:"6#储罐",xiangjin:parseFloat("39%")},
+ {danweiName:"广西钦州澄星化工科技有限公司",year:"",zhoahuo:"XXX",weizhi:"5-2#储罐",xiangjin:parseFloat("35%")},
+ {danweiName:"中油广西田东石油化工总厂有限公司",year:"",zhoahuo:"XXX",weizhi:"3-1#储罐",xiangjin:parseFloat("30%")}
]
- tableData(){
- var res=''
- for(var i=0;i
'
- res+=''+"" +' | '
- res+=''+""+' | '
- res+=''+this.leisiYuan[i].weizhi+' | '
- if(parseFloat(this.leisiYuan[i].xiangjin)'
- }
- else if(parseFloat(this.leisiYuan[i].xiangjin)<=parseFloat('60%')&&parseFloat(this.leisiYuan[i].xiangjin)>=parseFloat('50%')){
- res+=''+this.leisiYuan[i].xiangjin+' | '
- }
- else{
- res+=''+this.leisiYuan[i].xiangjin+' | '
- }
- res+='查看详情 | '
- }
- res+=''
- var shuju = document.getElementById('shujubody')
- shuju.innerHTML=res
- }
- openResponsePlans(){
- console.log(123)
- }
+
+
+
+
}
diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index b6a977b..016f93f 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -786,6 +786,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
} else {
this.paintingArrows.ready = true;
this.paintingArrows = null;
+ this.paintMode = PaintMode.endPaint;
}
break;
}
@@ -1811,18 +1812,25 @@ export class Pipeline extends PIXI.Graphics {
this.moveTo(pointA.x, pointA.y);
} else {
this.lineTo(pointA.x, pointA.y);
+ if (i === count - 1) {
+ const pointB = this.assetData.MultiPoint[i - 1];
+ const angle = Math.atan2((pointA.y - pointB.y), (pointA.x - pointB.x)) * (180 / Math.PI) + 90;
+ this.beginFill(0x0000ff);
+ this.drawStar(pointA.x, pointA.y, 3, 5, 0, (Math.PI / 180 * angle));
+ } else {
+ this.drawCircle(pointA.x, pointA.y, 5);
+ }
}
}
- if (this.assetData.MultiPoint.length >= 2) {
- const pointA = this.assetData.MultiPoint[0];
- const pointB = this.assetData.MultiPoint[this.assetData.MultiPoint.length - 1];
- const angle = Math.atan2((pointB.y - pointA.y), (pointB.x - pointA.x)) * (180 / Math.PI) + 90;
- this.beginFill(0x0000ff);
- this.drawStar(pointB.x, pointB.y, 3, 5, 0, (Math.PI / 180 * angle));
- // this.drawCircle(pointA.x, pointA.y, 5);
- // this.drawCircle(pointB.x, pointB.y, 5);
- this.endFill();
- }
+ this.endFill();
+ // if (this.assetData.MultiPoint.length >= 2) {
+ // const pointA = this.assetData.MultiPoint[this.assetData.MultiPoint.length - 2];
+ // const pointB = this.assetData.MultiPoint[this.assetData.MultiPoint.length - 1];
+ // const angle = Math.atan2((pointB.y - pointA.y), (pointB.x - pointA.x)) * (180 / Math.PI) + 90;
+ // this.beginFill(0x0000ff);
+ // this.drawStar(pointB.x, pointB.y, 3, 5, 0, (Math.PI / 180 * angle));
+ // this.endFill();
+ // }
}
}
/**