Commit eac98587 by niuxiaolin

latest

parent 499754e5
...@@ -75,9 +75,34 @@ ...@@ -75,9 +75,34 @@
</button> </button>
<div *ngIf="!normalShow"> <div *ngIf="!normalShow">
<label>项目总数:{{staticNormal.total}}个</label>
<label>总建设里程:{{staticNormal.mileage}}Km </label> <label>
<label>总投资:{{staticNormal.capital}}亿</label> <div>
项目总数:
</div>
<div>
{{staticNormal.total}}个
</div>
</label>
<label>
<div>
总建设里程:
</div>
<div>
{{staticNormal.mileage}}Km
</div>
</label>
<label>
<div>
总投资:
</div>
<div>
{{staticNormal.capital}}亿
</div>
</label>
</div> </div>
<section *ngIf="normalShow" class="sub"> <section *ngIf="normalShow" class="sub">
...@@ -94,7 +119,7 @@ ...@@ -94,7 +119,7 @@
</div> </div>
<div class="right"> <div class="right">
<section> <!-- <section>
<button (click)="goToVideo()">视频监管 <button (click)="goToVideo()">视频监管
</button> </button>
...@@ -120,7 +145,7 @@ ...@@ -120,7 +145,7 @@
<label></label> <label></label>
<label> </label> <label> </label>
<label></label> <label></label>
</section> </section> -->
<!-- <section> <!-- <section>
<button>数据信息 <button>数据信息
</button> </button>
...@@ -130,7 +155,13 @@ ...@@ -130,7 +155,13 @@
</section> --> </section> -->
</div> </div>
</div> </div>
<div class="function">
<img alt="视频监控" src="/assets/video.svg">
<img src="/assets/video.svg">
<img src="/assets/video.svg">
<img src="/assets/video.svg">
<img src="/assets/video.svg">
</div>
<jw-modal id="custom-modal-1"> <jw-modal id="custom-modal-1">
<h1>添加项目</h1> <h1>添加项目</h1>
......
...@@ -51,9 +51,7 @@ ...@@ -51,9 +51,7 @@
.map{ .map{
} }
.right{
}
} }
.focus{ .focus{
background: #ea262d96!important; background: #ea262d96!important;
...@@ -63,3 +61,15 @@ baidu-map{ ...@@ -63,3 +61,15 @@ baidu-map{
height: 1000px; height: 1000px;
display: block; display: block;
} }
.function{
position: absolute;
right: 80px;
bottom: 20px;
img{
margin-left:2em;
cursor: pointer;
width: 59px;
}
}
\ No newline at end of file
...@@ -114,7 +114,8 @@ export class MainComponent implements OnInit { ...@@ -114,7 +114,8 @@ export class MainComponent implements OnInit {
var newPolyLine = new window.BMap.Polyline(toPoints, { strokeColor: proj.lineStyle, strokeWeight: proj.lineWidth }); var newPolyLine = new window.BMap.Polyline(toPoints, { strokeColor: proj.lineStyle, strokeWeight: proj.lineWidth });
(newPolyLine as any).id = (proj.course ? "p" : "s") + proj.id; (newPolyLine as any).id = (proj.course ? "p" : "s") + proj.id;
map.addOverlay(newPolyLine); map.addOverlay(newPolyLine);
this.m.animationLine(points); var newPoints = this.corToPoint(proj.coordinate);
this.m.animationLine(newPoints);
} }
goToVideo(){ goToVideo(){
...@@ -221,7 +222,7 @@ export class MainComponent implements OnInit { ...@@ -221,7 +222,7 @@ export class MainComponent implements OnInit {
//标段不定位 //标段不定位
if(type!='s'){ if(type!='s'){
// map.setViewport(points); map.setViewport(points);
} }
......
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512" fill="white"><path d="M336.2 64H47.8C21.4 64 0 85.4 0 111.8v288.4C0 426.6 21.4 448 47.8 448h288.4c26.4 0 47.8-21.4 47.8-47.8V111.8c0-26.4-21.4-47.8-47.8-47.8zm189.4 37.7L416 177.3v157.4l109.6 75.5c21.2 14.6 50.4-.3 50.4-25.8V127.5c0-25.4-29.1-40.4-50.4-25.8z"/></svg>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment