[回退] GIS模块版本回退

src/app/gis-management/gis-labeling/gis-labeling.component.ts

@@ -712,7 +712,7 @@ export class GisLabelingComponent implements OnInit {
       let markerContent = `<div style="font-size: 14px" id="gispopupbox">
       <div style="color: #0080FF;"><span style="margin-left:8px">${e.name}</span><label style="font-size: 12px; color: #999; margin-left: 10px">${e.address}</label> </div>
       <div style="display: flex; margin-top: 10px;margin-left:8px">
-        <div style="width:240px; overflow: hidden;">单位性质: <label style="margin-left: 10px;font-size: 12px;">${e.buildingTypes[0].name || "暂无数据"}</label></div>
+        <div style="width:240px; overflow: hidden;">单位性质: <label style="margin-left: 10px;font-size: 12px;">${e.buildingTypes.length? e.buildingTypes[0].name : "暂无数据"}</label></div>
         <div style="flex: 1; margin-left: 25px;">消防负责人: <label style="margin-left: 10px;font-size: 12px;">${e.contacts || "暂无数据"}</label></div>
       </div>
       <div style="display: flex; margin-top: 10px;margin-left:8px"">
@@ -793,7 +793,6 @@ export class GisLabelingComponent implements OnInit {
     this.leftDivState = false
     this.showLeftDiv = false
     this.isShowRouteGIS = true
-    // console.log(1,e)
     this.routeEnd = e.name
     this.endCoordinate = new AMap.LngLat(e.location.x, e.location.y)
   }
@@ -868,20 +867,18 @@ export class GisLabelingComponent implements OnInit {
           var autoComplete = new AMap.Autocomplete(autoOptions);
           autoComplete.search(keywords, function(status, result) {
             if (result && result.tips && result.tips.length) { //搜索到数据时
+
               that._ngZone.run(()=>{ 
                 if(e == 0){
                   that.routeStartList = result.tips
-                
-              
                   that.startCoordinate = new AMap.LngLat(result.tips[0].location.lng, result.tips[0].location.lat)
-                  // console.log(666,result)
                 }else{
                   that.routeEndList = result.tips 
                   that.endCoordinate = new AMap.LngLat(result.tips[0].location.lng, result.tips[0].location.lat)
                 }
               });
             
-            }
+            } //if
           })
         })
       }); //获取当前 city 
@@ -912,7 +909,6 @@ export class GisLabelingComponent implements OnInit {
     this.endCoordinate = null
     this.routeGIS? this.routeGIS.clear() : null
     this.routes = { distance: 0, time: 0, steps: [], }
-    // console.log(this.selectedUnit)
     this.map.setZoomAndCenter(13,[this.selectedUnit.location.x,this.selectedUnit.location.y]); //设置地图中心点
   }
 
@@ -941,10 +937,7 @@ export class GisLabelingComponent implements OnInit {
     this.routeGIS? this.routeGIS.clear() : null
     this.routeGIS = new AMap.Driving({
       map: this.map,
-    }); 
-    // console.log(1,this.startCoordinate)
-    // console.log(2,this.endCoordinate)
-    // 根据起终点名称规划驾车导航路线
+    });
     this.routeGIS.search(this.startCoordinate,this.endCoordinate,
       function(status, result) {
         if (status === 'complete') {

src/app/plan-audit/plan-pass/plan-pass.component.html

@@ -1,36 +1,36 @@
-<div style="height: 100%; overflow: hidden;">
+<div style="height: 100%; overflow: hidden; display: flex; flex-direction: column;">
   
-<mat-accordion>
-  <mat-expansion-panel disabled>
-    <mat-expansion-panel-header>
-      <div class="planHeader">
+  <mat-accordion>
+    <mat-expansion-panel disabled>
+      <mat-expansion-panel-header>
+        <div class="planHeader">
 
-        <div class="planBox">
-          <span>单位名称: </span>
-          <span>{{compantData.name?compantData.name : '暂无数据'}}</span>
+          <div class="planBox">
+            <span>单位名称: </span>
+            <span>{{compantData.name?compantData.name : '暂无数据'}}</span>
+          </div>
+          <div class="planBox">
+            <span>消防救援站: </span>
+            <span>{{organizationName}}</span>
+          </div>
+          <div class="planBox">
+            <span>单位类型: </span>
+            <span>{{compantData.buildingTypes.length?compantData.buildingTypes[0].name : '暂无数据'}}</span>
+          </div>
+          <div class="planBox">
+            <span>单位地址: </span>
+            <span>{{compantData.address?compantData.address : '暂无数据'}}</span>
+          </div>
+          <div>
+            <button mat-raised-button color="primary" (click)='toExamine()' *ngIf="type != 6">审核</button>
+          </div>
+        
         </div>
-        <div class="planBox">
-          <span>消防救援站: </span>
-          <span>{{organizationName}}</span>
-        </div>
-        <div class="planBox">
-          <span>单位类型: </span>
-          <span>{{compantData.buildingTypes.length?compantData.buildingTypes[0].name : '暂无数据'}}</span>
-        </div>
-        <div class="planBox">
-          <span>单位地址: </span>
-          <span>{{compantData.address?compantData.address : '暂无数据'}}</span>
-        </div>
-        <div>
-          <button mat-raised-button color="primary" (click)='toExamine()' *ngIf="type != 6">审核</button>
-        </div>
-      
-      </div>
-    </mat-expansion-panel-header>
-  </mat-expansion-panel>
-</mat-accordion>
+      </mat-expansion-panel-header>
+    </mat-expansion-panel>
+  </mat-accordion>
 
-  <div class="planBody" style="width: 100%;height: 100%;padding: 10px;box-sizing: border-box;overflow-y: auto;">
+  <div class="planBody" style="flex: 1; overflow: hidden;">
 
     <div class="table" style="width: 100%;" *ngIf="planType==0">
       <table mat-table [dataSource]="allFile">

src/styles.scss

@@ -5,7 +5,8 @@ html,body{
   width: 100%;
   height: 100%;
   margin:0 auto;
-	padding:0;
+  padding:0;
+  overflow: hidden;
 }
 ul,ol,dl,li,dt,dd,p,form,input,h1,h2,h3,h4,h5,h6,section,article,aside,header,footer,nav,figure,time,mark,main,canvas{
 	margin:0;
@@ -171,7 +172,7 @@ table td.mat-footer-cell:last-of-type{
 			cursor: pointer;
 		}
 	}
-	
+
 	.custom-content-marker .close-btn:hover{
 		background: #666;
 	}