latest ui 08/12/2019 17:20:51

src/app/main/main.component.html

@@ -184,7 +184,7 @@
     <span class="tooltiptextx">视频监控</span>
   </div>
   <div class="tooltip">
-    <a href="http://47.92.203.246/pcByFullScreen/#/pcByFullScreen/">
+    <a href="http://47.92.203.246/pcByFullScreen/#/pcByFullScreen/" target="_blank">
       <img alt="质量安全监管"   class="tooltip" src="/assets/baseline-security.svg">
     </a>
     

src/app/main/main.component.ts

@@ -514,7 +514,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"}); //建立多边形覆盖物
             _this.map.addOverlay(ply1);//遮罩物是半透明的，如果需要纯色可以多添加几层
             //4. 给目标行政区划添加边框，其实就是给目标行政区划添加一个没有填充物的遮罩层
-            var ply = new BMap.Polygon(rs.boundaries[0], {strokeWeight:0,strokeColor:"rgb(50, 131, 253)",fillColor:"#dde7f6",fillOpacity:"0.2"});
+            var ply = new BMap.Polygon(rs.boundaries[0], {strokeWeight:0,strokeColor:"#0000C6",fillColor:"#dde7f6",fillOpacity:"0.2"});
            // var ply = new BMap.Polygon(rs.boundaries[0], {strokeWeight:0,strokeColor:"#16e8d6",fillColor:"",fillOpacity:"0"});
             _this.map.addOverlay(ply);
             _this.map.setViewport(ply.getPath());//调整视野

src/app/video/video.component.html

@@ -9,7 +9,7 @@
     <button (click)="back()">返回</button>
 
     <nz-tree [nzShowIcon]="true" [nzTreeTemplate]="nzTreeTemplate" [nzData]="nodes" nzAsyncData
-      (nzClick)="addVCR($event)" (nzExpandChange)="nzEvent($event)">
+       (nzExpandChange)="nzEvent($event)">
       <ng-template #nzTreeTemplate let-node>
         <!-- <span class="custom-node" [class.active]="activedNode?.key === node.key">
             <span *ngIf="!node.isLeaf" (contextmenu)="contextMenu($event, menu)">
@@ -26,6 +26,8 @@
         <span *ngIf="node.isLeaf">
           <i nz-icon nzType="video-camera" nzTheme="outline"></i>
           {{node.title}}
+         
+          <i nz-icon nzType="sound" (click)="goTo('https://221.131.9.172:1443')" nzTheme="outline"></i>
         </span>
         <span *ngIf="!node.isLeaf">
 

src/app/video/video.component.ts

@@ -333,6 +333,9 @@ oWebControl.JS_RepairPartWindow(0, 0, 1001, 700);    // 多1个像素点防止
 			});
         }
   }
+  goTo(url){
+    location.href=url;
+  }
   back(){
     if (this.oWebControl != null){
 			this.oWebControl.JS_HideWnd();   // 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题 

src/assets/mapv.js

@@ -491,8 +491,9 @@
             var step = 0.5;
             var currency = 1;
             if(map.getZoom()>=10){
-                step = 2;
-                currency=1.4;
+                step = 1.4;
+                currency=1.2;
+
             }else{
                  step = 0.5;
                  currency = .5;
@@ -524,7 +525,7 @@
             function drawLine( moveStart,current) {
                 context.restore();
                 context.lineCap = "round";    
-                context.strokeStyle =  '#fff';
+                context.strokeStyle =  '#007979';
                 context.shadowColor="#015293";
                 context.shadowBlur="0";
                 context.beginPath();

src/assets/outline/sound.svg

+<svg viewBox="64 64 896 896" fill="currentColor" width="1em" height="1em" data-icon="sound" aria-hidden="true"><path d="M625.9 115c-5.9 0-11.9 1.6-17.4 5.3L254 352H90c-8.8 0-16 7.2-16 16v288c0 8.8 7.2 16 16 16h164l354.5 231.7c5.5 3.6 11.6 5.3 17.4 5.3 16.7 0 32.1-13.3 32.1-32.1V147.1c0-18.8-15.4-32.1-32.1-32.1zM586 803L293.4 611.7l-18-11.7H146V424h129.4l17.9-11.7L586 221v582zm348-327H806c-8.8 0-16 7.2-16 16v40c0 8.8 7.2 16 16 16h128c8.8 0 16-7.2 16-16v-40c0-8.8-7.2-16-16-16zm-41.9 261.8l-110.3-63.7a15.9 15.9 0 0 0-21.7 5.9l-19.9 34.5c-4.4 7.6-1.8 17.4 5.8 21.8L856.3 800a15.9 15.9 0 0 0 21.7-5.9l19.9-34.5c4.4-7.6 1.7-17.4-5.8-21.8zM760 344a15.9 15.9 0 0 0 21.7 5.9L892 286.2c7.6-4.4 10.2-14.2 5.8-21.8L878 230a15.9 15.9 0 0 0-21.7-5.9L746 287.8a15.99 15.99 0 0 0-5.8 21.8L760 344z"></path></svg>
\ No newline at end of file