latest

src/app/api/api/default.service.ts

@@ -41,8 +41,8 @@ import { Observable } from 'rxjs';
 @Injectable()
 export class DefaultService {
 
-   public basePath = 'http://localhost:8081';
-    // public basePath = 'http://192.168.19.200:8081';
+  // public basePath = 'http://localhost:8081';
+ public basePath = 'http://192.168.19.200:8081';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 

src/app/main/main.component.html

@@ -301,25 +301,25 @@
 <div class="function">
   <div class="tooltip">
     <img alt="视频监控" (click)="goToVideo()" class="tooltip" src="/assets/video.svg">
-    <span class="tooltiptext">视频监控</span>
+    <span class="tooltiptextx">视频监控</span>
   </div>
   <div class="tooltip">
     <img alt="视频监控" (click)="goToVideo()" class="tooltip" src="/assets/baseline-security.svg">
   
-    <span class="tooltiptext">质量安全监管
+    <span class="tooltiptextx">质量安全监管
       </span>
   </div>
   <div class="tooltip">
     <img alt="视频监控" (click)="goToVideo()" class="tooltip" src="/assets/baseline-assessment.svg">
-    <span class="tooltiptext">建设程序监管        </span>
+    <span class="tooltiptextx">建设程序监管        </span>
   </div>
   <div class="tooltip">
     <img alt="视频监控" (click)="goToVideo()" class="tooltip" src="/assets/baseline-featured_play.svg">
-    <span class="tooltiptext">视频监控</span>
+    <span class="tooltiptextx">视频监控</span>
   </div>
   <div class="tooltip">
     <img alt="视频监控" (click)="goToVideo()" class="tooltip" src="/assets/baseline-table_chart-24px.svg">
-    <span class="tooltiptext">造价监管</span>
+    <span class="tooltiptextx">造价监管</span>
     
 
   </div>

src/app/main/main.component.less

@@ -77,12 +77,17 @@ baidu-map{
 
 .function{
     position: absolute;
-    right: 80px;
-    bottom: 1px;
+    right: 128px;
+    /* bottom: 60px; */
+    top: 106px;
+    width: 35px;
     img{
-        margin-left:2em;
+       
+        box-shadow: 0 0 5px #fff, 0 0 10px #fff, 0 0 15px #fff, 0 0 20px #4a83b4, 0 0 35px #4a83b4, 0 0 40px #4a83b4, 0 0 50px #4a83b4, 0 0 75px #4a83b4;
+        border-radius: 14px;
+
         cursor: pointer;
-        width: 37px;
+        width: 63px;
     }
   
 }
@@ -95,28 +100,32 @@ baidu-map{
 .proj-info{
   
     label{
-                    display: grid;
-            grid-template-columns: 70% auto;
-            color: #eaab4e;
+        display: grid;
+        grid-template-columns: 70% auto;
+        color: #eaab4e;
+        padding-top: 1em;
             div:nth-of-type(1){
                 color:white;
             }
+
     }
 }
 fieldset{
-    border: 1px solid #03A9F4;
+    border:3px solid #bdc5d4;
     padding: 1em;
-    background: #3885b338;
+    background: #202734;
     margin: 5px;
-    border-radius: 4px;
+    border-radius: 13px;
     margin-bottom: 1em;
     margin-left: 2em;
     width:120%;
     legend{
-        color: #16e8d6;
-        
-        // border-top: 1px solid;
-        border-radius: 7px;
+        color: #0089ea;
+        padding: 0.5em;
+        background: #c1d9ef;
+        font-weight: bolder;
+        font-size: larger;
+    
         &:hover{
             background: #00daff33;
             padding: 0.5em;
@@ -150,6 +159,9 @@ fieldset{
     position: relative;
     display: inline-block;
     border-bottom: 1px dotted black;
+    margin-top: 1em;
+    text-align: center;
+    width:70px;
   }
   
   .tooltip .tooltiptext {

src/app/video/video.component.html

@@ -5,6 +5,7 @@
 
 <div class="main">
  <div>
+   <button (click)="back()">返回</button>
    <tree-ngx  [nodeItems]="nodeItems"> </tree-ngx>
    <a (click)="preview()" style="    color: white;
    text-decoration: none;

src/app/video/video.component.less

@@ -31,4 +31,21 @@
 #playWnd{
     width:1000px;
     height: 500px;
+}
+button{
+
+
+       //position: absolute;
+       background: #dbdbc90f;
+       color: #16e8d6;
+       border-radius: 9px;
+       width: 130px;
+       height: 39px;
+       display: block;
+       margin: 0.3em;
+       font-size: initial;
+       top: -41px;
+       left: -8px;
+       border: 2px solid #f3f42678;
+
 }
\ No newline at end of file

src/app/video/video.component.ts

@@ -351,7 +351,16 @@ oWebControl.JS_RepairPartWindow(0, 0, 1001, 700);    // 多1个像素点防止
 			});
         }
   }
-  
+  back(){
+    if (this.oWebControl != null){
+			this.oWebControl.JS_HideWnd();   // 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题 
+            this.oWebControl.JS_Disconnect().then(function(){  // 断开与插件服务连接成功
+			}, 
+			function() {  // 断开与插件服务连接失败
+			});
+        }
+        history.back();
+  }
 
  
 }