Commit 49bf2c85 by niuxiaolin

latest

parent 0befb261
...@@ -123,7 +123,7 @@ fieldset{ ...@@ -123,7 +123,7 @@ fieldset{
border-radius: 13px; border-radius: 13px;
margin-bottom: 5em; margin-bottom: 5em;
margin-left: 2em; margin-left: 2em;
width:120%; width:180%;
legend{ legend{
color: #0089ea; color: #0089ea;
padding: 0.5em; padding: 0.5em;
...@@ -149,6 +149,8 @@ fieldset{ ...@@ -149,6 +149,8 @@ fieldset{
.item{ .item{
text-align: left; text-align: left;
padding-top: 0.3em; padding-top: 0.3em;
font-size: 22px;
color: white;
} }
label{ label{
......
...@@ -41,7 +41,7 @@ export interface DialogData { ...@@ -41,7 +41,7 @@ export interface DialogData {
export class MainComponent implements OnInit { export class MainComponent implements OnInit {
cameraSum: any={}; cameraSum: any={};
allsecs: any=[]; allsecs: any=[];
curive:boolean = true; curive:boolean = false;
curiveLength:number = 10; curiveLength:number = 10;
theme: any; theme: any;
...@@ -174,6 +174,8 @@ export class MainComponent implements OnInit { ...@@ -174,6 +174,8 @@ export class MainComponent implements OnInit {
this.projects = res.data; this.projects = res.data;
var points = this.loadPolys(res,true); var points = this.loadPolys(res,true);
}); });
}else{
map.centerAndZoom("山西省",8);
} }
} }
...@@ -377,7 +379,7 @@ export class MainComponent implements OnInit { ...@@ -377,7 +379,7 @@ export class MainComponent implements OnInit {
var bdary = new BMap.Boundary(); var bdary = new BMap.Boundary();
bdary.get('山西省', function (rs) { bdary.get('山西省', function (rs) {
map.clearOverlays(); // map.clearOverlays();
//清除地图覆盖物 //清除地图覆盖物
//思路:利用行政区划点的集合与外围自定义东南西北形成一个环形遮罩层 //思路:利用行政区划点的集合与外围自定义东南西北形成一个环形遮罩层
//1.获取选中行政区划边框点的集合rs.boundaries[0] //1.获取选中行政区划边框点的集合rs.boundaries[0]
...@@ -400,7 +402,7 @@ export class MainComponent implements OnInit { ...@@ -400,7 +402,7 @@ export class MainComponent implements OnInit {
var ply1 = new BMap.Polygon(ENWS + E_JW + SE_JW + S_JW + WS_JW + W_JW + NW_JW + N_JW + EN_JW + E_JW, {strokeColor:"none",strokeOpacity:0,fillColor:"#0002069c",fillOpacity:"0.5"}); //建立多边形覆盖物 var ply1 = new BMap.Polygon(ENWS + E_JW + SE_JW + S_JW + WS_JW + W_JW + NW_JW + N_JW + EN_JW + E_JW, {strokeColor:"none",strokeOpacity:0,fillColor:"#0002069c",fillOpacity:"0.5"}); //建立多边形覆盖物
map.addOverlay(ply1);//遮罩物是半透明的,如果需要纯色可以多添加几层 map.addOverlay(ply1);//遮罩物是半透明的,如果需要纯色可以多添加几层
//4. 给目标行政区划添加边框,其实就是给目标行政区划添加一个没有填充物的遮罩层 //4. 给目标行政区划添加边框,其实就是给目标行政区划添加一个没有填充物的遮罩层
var ply = new BMap.Polygon(rs.boundaries[0], {strokeWeight:0,strokeColor:"#114bf3",fillColor:"",fillOpacity:"0"}); var ply = new BMap.Polygon(rs.boundaries[0], {strokeWeight:0,strokeColor:"#16e8d6",fillColor:"",fillOpacity:"0"});
map.addOverlay(ply); map.addOverlay(ply);
map.setViewport(ply.getPath());//调整视野 map.setViewport(ply.getPath());//调整视野
......
...@@ -10,14 +10,7 @@ ...@@ -10,14 +10,7 @@
<nz-tree [nzData]="nodes" nzAsyncData (nzClick)="addVCR($event)" (nzExpandChange)="nzEvent($event)"> </nz-tree> <nz-tree [nzData]="nodes" nzAsyncData (nzClick)="addVCR($event)" (nzExpandChange)="nzEvent($event)"> </nz-tree>
<a (click)="preview()" style=" color: white;
text-decoration: none;
margin-left: 2em;">演示demo1</a>
<a (click)="preview2()" style=" color: white;
text-decoration: none;
margin-left: 2em;
display: inherit;
">演示demo2</a>
</div> </div>
<div class="right"> <div class="right">
<div id="playWnd"> <div id="playWnd">
......
...@@ -155,10 +155,12 @@ export class VideoComponent implements OnInit { ...@@ -155,10 +155,12 @@ export class VideoComponent implements OnInit {
default: default:
break; break;
} }
this.http.get( this.d.basePath+ request+node.key).subscribe(res=>{ if (node && node.getChildren().length === 0 && node.isExpanded) {
console.log(res); this.http.get( this.d.basePath+ request+node.key).subscribe(res=>{
node.addChildren((res as any).data.map((d,index)=>({title:d.name || d.cameraName,key:d.id ||d.cameraIndexCode,index:index }))); console.log(res);
}); node.addChildren((res as any).data.map((d,index)=>({title:d.name || d.cameraName,key:d.id ||d.cameraIndexCode,index:index })));
});
}
// if (node && node.getChildren().length === 0 && node.isExpanded) { // if (node && node.getChildren().length === 0 && node.isExpanded) {
// this.loadNode().then(data => { // this.loadNode().then(data => {
// node.addChildren(data); // node.addChildren(data);
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -240,6 +240,7 @@ body.jw-modal-open { ...@@ -240,6 +240,7 @@ body.jw-modal-open {
//video style //video style
.ant-tree li .ant-tree-node-content-wrapper{ .ant-tree li .ant-tree-node-content-wrapper{
color:white!important; color:white!important;
font-size: 17px;
} }
.ant-tree li span.ant-tree-iconEle, .ant-tree li span.ant-tree-switcher{ .ant-tree li span.ant-tree-iconEle, .ant-tree li span.ant-tree-switcher{
color:white!important; color:white!important;
......
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