Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/canvas-share-data.service.ts

@@ -23,23 +23,24 @@ export class CanvasShareDataService {
   selectTemplateData: any; // 选择当前 模板数据
 
   // 总平面图/建筑 楼层
-  selectStorey: any = { area: '', details: '' }; // 选择当前 楼层 数据
-  originalcompanyBuildingData: any; // 单位/建筑 数据
-  originaleveryStoreyData: any; // 总平面图/楼层/区域 楼层数据
+  selectStorey:any = {area: '', details: ''}; // 选择当前 楼层 数据
+  originalcompanyBuildingData:any; // 单位/建筑 数据
+  originaleveryStoreyData:any; // 总平面图/楼层/区域 楼层数据
   // 总平面图/建筑 楼层
 
   // 处置 节点
-  allDisposalNode: any = []; // 所有 处置节点
-  allNodeMarkers: any = { highlightMarkers: {}, markers: {} }; // 灾情 标签信息
-  selectPanelPoint: DisposalNodeData = new DisposalNodeData(); // 当前数据节点
-  selectPanelPointBaseData: any = { description: '', notes: '', weather: '', airTemperature: '', windDirection: '', windScale: '' }; // 当前 数据节点 对应 父级节点
-  customizeDisposalNode: any; // 新建 自定义数据节点 底图+名称
+  allDisposalNode:any = []; // 所有 处置节点
+  allNodeMarkers:any = { highlightMarkers:{}, markers:{} }; // 灾情 标签信息
+  selectPanelPoint:DisposalNodeData = new DisposalNodeData(); // 当前数据节点
+  selectPanelPointBaseData:any = {description: '', notes: '', weather: '', airTemperature: '', windDirection: '', windScale: ''}; // 当前 数据节点 对应 父级节点
+  isInheritSky:any; //缓存 节点 天气
+  customizeDisposalNode:any; // 新建 自定义数据节点 底图+名称
   // 处置 节点
 
   /**
   * 游戏模式
   */
-  gameMode: GameMode = GameMode.BasicInformation;
+  gameMode:GameMode = GameMode.BasicInformation;
 
   facilityAssetsName = new Map<string, string>([
     ['消防水池', '消防水池'],

src/app/data-collection/fire-force/fire-force.component.ts

@@ -118,7 +118,7 @@ export class FireForceComponent implements OnInit {
       };
       var _renderMarker = (context)=> {
         var content = `<img class='clusterImgCollection' src="${context.data[0].image}" alt="">`;
-        var offset = new AMap.Pixel(-12.5, -12.5);
+        var offset = new AMap.Pixel(-15, -15);
         context.marker.setContent(content)
         context.marker.setOffset(offset)
       }

src/app/data-collection/linkage-forces/linkage-forces.component.ts

@@ -148,7 +148,7 @@ export class LinkageForcesComponent implements OnInit {
       };
       var _renderMarker = (context)=> {
         var content = `<img class='clusterImgCollection' src="${context.data[0].image}" alt="">`;
-        var offset = new AMap.Pixel(-12.5, -12.5);
+        var offset = new AMap.Pixel(-15, -15);
         context.marker.setContent(content)
         context.marker.setOffset(offset)
       }

src/app/data-collection/water-collection/water-collection.component.ts

@@ -106,7 +106,7 @@ export class WaterCollectionComponent implements OnInit {
       var _renderMarker = (context)=> {
         var content = `<img class='clusterImgCollection' src="${context.data[0].image}" alt="">`;
         context.marker.setContent(content)
-        var offset = new AMap.Pixel(-12.5, -12.5);
+        var offset = new AMap.Pixel(-15, -15);
         context.marker.setOffset(offset)
       }
       this.cluster = new AMap.MarkerCluster(this.map, markerArrcluster, {

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

@@ -274,7 +274,7 @@ export class GisLabelingComponent implements OnInit {
       };
       var _renderMarker = (context)=> {
         var content = `<img class='clusterImg' src="${context.data[0].image}" alt="">`;
-        var offset = new AMap.Pixel(-15, -25);
+        var offset = new AMap.Pixel(-15, -15);
         context.marker.setContent(content)
         context.marker.setOffset(offset)
       }
@@ -480,7 +480,7 @@ export class GisLabelingComponent implements OnInit {
       };
       var _renderMarker = (context)=> {
         var content = `<img class='clusterImgCollection' src="${context.data[0].image}" alt="">`;
-        var offset = new AMap.Pixel(-12.5, -12.5);
+        var offset = new AMap.Pixel(-15, -15);
         context.marker.setContent(content)
         context.marker.setOffset(offset)
       }

src/app/key-unit/allaround/allaround.component.html

@@ -1,39 +1,41 @@
 <div class="content">
   <mat-tab-group style="height: 100%;">
 
-    <mat-tab label="{{item.name}}" *ngFor="let item of AllBuilding">
+    <mat-tab label="单位毗邻">
       <div class="allImgs">
 
-        <div class="imgBox" *ngFor="let items of item.allImgs">
-          <div class="fixedImg" *ngIf="items.imageUrls.length">
-            <img [src]="items.imgURL" onerror="javascript:this.src='../../../assets/images/upload.png'" (click)='imgdetails(items.imageUrls)'>
+        <div class="imgBox" *ngFor="let item of AllAdjoining" >
+          <div class="fixedImg" *ngIf="item.imageUrls.length">
+            <img [src]="item.imgURL" onerror="javascript:this.src='../../../assets/images/upload.png'" (click)='imgdetails(item.imageUrls)'>
+          </div>
+          <div class="fixedImg" *ngIf="!item.imageUrls.length">
+            <img src="../../../assets/images/upload.png" (click)='imgdetails(item.imageUrls)'>
           </div>
-          <div class="fixedImg" *ngIf="!items.imageUrls.length"><img src="../../../assets/images/upload.png" (click)='imgdetails(items.imageUrls)'></div>
           <div style="margin-top: 5px;">
             <label style="margin-left: 25px;">建筑物名称:</label>
-            <label style="margin-left: 25px;">{{items.name}}</label>
+            <label style="margin-left: 25px;">{{item.name}}</label>
           </div>
           <div style="margin-top: 5px;">
             <label style="margin-left: 25px;">建筑物方向:</label>
             <label style="margin-left: 25px;">
-              <label *ngIf="items.direction==0">东</label>
-              <label *ngIf="items.direction==1">西</label>
-              <label *ngIf="items.direction==2">南</label>
-              <label *ngIf="items.direction==3">北</label>
-              <label *ngIf="items.direction==4">东南</label>
-              <label *ngIf="items.direction==5">西南</label>
-              <label *ngIf="items.direction==6">东北</label>
-              <label *ngIf="items.direction==7">西北</label>
+              <label *ngIf="item.direction==0">东</label>
+              <label *ngIf="item.direction==1">西</label>
+              <label *ngIf="item.direction==2">南</label>
+              <label *ngIf="item.direction==3">北</label>
+              <label *ngIf="item.direction==4">东南</label>
+              <label *ngIf="item.direction==5">西南</label>
+              <label *ngIf="item.direction==6">东北</label>
+              <label *ngIf="item.direction==7">西北</label>
             </label>
           </div>
           <div style="margin-top: 5px;">
             <label style="margin-left: 25px;">图片数量:</label>
-            <label style="margin-left: 25px;" *ngIf="items.imageUrls.length">{{items.imageUrls.length}}张</label>
-            <label style="margin-left: 25px;" *ngIf="!items.imageUrls.length">0张</label>
+            <label style="margin-left: 25px;" *ngIf="item.imageUrls.length">{{item.imageUrls.length}}张</label>
+            <label style="margin-left: 25px;" *ngIf="!item.imageUrls.length">0张</label>
           </div>
         </div>
 
-        <p style="width: 100%;text-align: center;margin-top: 25px;" *ngIf="!item.allImgs.length">暂无数据,请前往平面图进行相关数据录入</p>
+        <p style="width: 100%;text-align: center;margin-top: 25px;" *ngIf="!AllAdjoining.length">暂无数据,请前往平面图进行相关数据录入</p>
       </div>
     </mat-tab>
 

src/app/key-unit/allaround/allaround.component.ts

@@ -17,7 +17,7 @@ export class AllaroundComponent implements OnInit {
   constructor(private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private route:ActivatedRoute,) { }
 
   ngOnInit(): void {
-    this.getAllBuilding()
+    this.getAllCompany()
   }
 
   AllAdjoining:any = []; //所有单位毗邻

src/app/key-unit/edit-plan-info/edit-plan-info.component.html

@@ -12,7 +12,7 @@
           <app-collection-tools-plan></app-collection-tools-plan>
         </ng-template>
     </mat-tab>
-    <mat-tab label="3.平面图">
+    <mat-tab label="3.层平面图">
       <ng-template matTabContent>
         <app-collection-tools-building></app-collection-tools-building>
       </ng-template>

src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html

@@ -1,6 +1,101 @@
 <div class="content">
   <mat-tab-group>
 
+    <mat-tab label="单位消防设施">
+      <div class="contentBox">
+
+        <p style="width: 100%; margin: 30px auto; text-align: center;" *ngIf="!companyBuiltInGrouping.length">暂无数据,请完善单位基本信息</p>
+        <div style="width: 100%;margin-top: 25px;" *ngFor="let item of companyBuiltInGrouping;let key = index">
+          <h3 style="text-align: center;font-weight: 550;">{{item.name}}</h3>
+          <div style="margin-bottom: 10px;">
+            <!-- <mat-icon title="创建" (click)='addCompanyGrouping(item)'>add_circle_outline</mat-icon>
+            <mat-icon title="保存" style="margin-left: 25px;" (click)='editCompanyGrouping(item)'>description</mat-icon>
+            <mat-icon title="删除" style="margin-left: 25px;" (click)='deleteCompanyGrouping(item)'>delete</mat-icon> -->
+          </div>
+          <div>
+            <mat-accordion multi>
+              <mat-expansion-panel disabled>
+                <mat-expansion-panel-header>
+                  <label class="firstContent"></label>
+                  <label class="textContent">项目</label>
+                  <label class="textContent">照片</label>
+                  <label class="totalContent">总数</label>
+                  <label class="lastTextContent">主要情况</label>
+                </mat-expansion-panel-header>
+              </mat-expansion-panel>
+
+              <mat-expansion-panel *ngFor="let items of item.facilityItems" disabled [expanded]=items.expanded>
+                <mat-expansion-panel-header>
+                  <label class="firstContent">
+                    <mat-checkbox (change)='checkedCompany($event,item,items)' [disabled]='items.isBuiltin'></mat-checkbox>
+                  </label>
+                  <label class="textContent">{{items.name}}</label>
+                  <label class="textContent"><a href="javascript:void(0)" (click)='previewImg(items)'>查看图片</a></label>
+                  <label class="totalContent">{{items.total ? items.total : '总数: 0'}}</label>
+
+                  <label class="lastTextContent">
+                    <textarea readonly maxlength="250" [(ngModel)]="items.details" style="width: 80%;"></textarea>
+                  </label>
+
+                  <label><mat-icon (click)='SwitchBoard(items)' *ngIf="items.isBuiltin">keyboard_arrow_down</mat-icon></label>
+                </mat-expansion-panel-header>
+
+                <div class="overflowTable">
+                  <div class="detailsTable">
+                    <table>
+                      <tr>
+                        <th *ngFor="let header of items.header">{{header}}</th>
+                      </tr>
+                      <tr *ngFor="let body of items.body">
+                        <td *ngFor="let header of items.header">{{body[header]? body[header] : '暂无数据'}}</td>
+                      </tr>
+                    </table>
+                  </div>
+                  <div *ngFor="let tableMsg of items.loopTable" class="detailsTable">
+                    <p style="text-align: center; font-size: 16px; margin: 5px 0;">楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}</p>
+                    <table>
+                      <tr>
+                        <th *ngFor="let header of tableMsg.header">{{header}}</th>
+                      </tr>
+                      <tr *ngFor="let body of tableMsg.body">
+                        <td *ngFor="let header of tableMsg.header">{{body[header]? body[header] : '暂无数据'}}</td>
+                      </tr>
+                    </table>
+                  </div>
+                </div>
+              </mat-expansion-panel>
+  
+            </mat-accordion>
+          </div>
+        </div>
+
+        <div style="width: 100%;margin-top: 25px;" *ngFor="let item of companyOptionalGrouping;let key = index">
+          <mat-accordion multi>
+
+            <mat-expansion-panel>
+              <mat-expansion-panel-header>
+                <h3 style="text-align: center;font-weight: 550;">{{item.name}}</h3>
+                <!-- <mat-icon title="保存" style="margin-left: 25px;" (click)='editCompanyOptional($event,item)'>description</mat-icon> -->
+              </mat-expansion-panel-header>
+              <div *ngFor="let items of item.propertyInfos" class="InputField">
+                <label>{{items.propertyName}}:</label>
+
+                <input readonly type="text" *ngIf="items.propertyType!=1&&items.propertyType!=2&&items.propertyType!=4&&items.propertyType!=6"
+                [(ngModel)]="items.propertyValue" name="propertyValue">
+                <textarea readonly maxlength="250" *ngIf="items.propertyType==1" [(ngModel)]="items.propertyValue" name="propertyValue"></textarea>
+                <input readonly type="number" *ngIf="items.propertyType==2 ||items.propertyType==4" [(ngModel)]="items.propertyValue" name="propertyValue">
+                <mat-radio-group *ngIf="items.propertyType==6" [(ngModel)]="items.propertyValue" name="propertyValue">
+                  <mat-radio-button style="margin-left: 5px;" [value]='radio.value' *ngFor="let radio of singleElection">{{radio.name}}</mat-radio-button>
+                </mat-radio-group>
+              </div>
+            </mat-expansion-panel>
+
+          </mat-accordion>
+        </div>
+
+      </div>
+    </mat-tab>
+
     <mat-tab label="{{newItem.name}}" *ngFor="let newItem of allBuildingGrouping">
       <div class="contentBox">
 

src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.ts

@@ -21,6 +21,7 @@ export class FireFightingDeviceLookComponent implements OnInit {
   constructor(private router:Router,private route:ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { }
 
   ngOnInit(): void {
+    this.getCompanyInformation()
     this.getAllBuilding()
   }
 

src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html

@@ -1,6 +1,101 @@
 <div class="content">
   <mat-tab-group>
 
+    <mat-tab label="单位消防设施">
+      <div class="contentBox">
+
+        <p style="width: 100%; margin: 30px auto; text-align: center;" *ngIf="!companyBuiltInGrouping.length">暂无数据,请完善单位基本信息</p>
+        <div style="width: 100%;margin-top: 25px;" *ngFor="let item of companyBuiltInGrouping;let key = index">
+          <h3 style="text-align: center;font-weight: 550;">{{item.name}}</h3>
+          <div style="margin-bottom: 10px;">
+            <mat-icon title="创建" (click)='addCompanyGrouping(item)'>add_circle_outline</mat-icon>
+            <mat-icon title="保存" style="margin-left: 25px;" (click)='editCompanyGrouping(item)'>description</mat-icon>
+            <mat-icon title="删除" style="margin-left: 25px;" (click)='deleteCompanyGrouping(item)'>delete</mat-icon>
+          </div>
+          <div>
+            <mat-accordion multi>
+              <mat-expansion-panel disabled>
+                <mat-expansion-panel-header>
+                  <label class="firstContent"></label>
+                  <label class="textContent">项目</label>
+                  <label class="textContent">照片</label>
+                  <label class="totalContent">总数</label>
+                  <label class="lastTextContent">主要情况</label>
+                </mat-expansion-panel-header>
+              </mat-expansion-panel>
+
+              <mat-expansion-panel *ngFor="let items of item.facilityItems" disabled [expanded]=items.expanded>
+                <mat-expansion-panel-header>
+                  <label class="firstContent">
+                    <mat-checkbox (change)='checkedCompany($event,item,items)' [disabled]='items.isBuiltin'></mat-checkbox>
+                  </label>
+                  <label class="textContent">{{items.name}}</label>
+                  <label class="textContent"><a href="javascript:void(0)" (click)='previewImg(items)'>查看图片</a></label>
+                  <label class="totalContent">{{items.total ? items.total : '总数: 0'}}</label>
+
+                  <label class="lastTextContent">
+                    <textarea maxlength="250" [(ngModel)]="items.details" style="width: 80%;"></textarea>
+                  </label>
+
+                  <label><mat-icon (click)='SwitchBoard(items)' *ngIf="items.isBuiltin">keyboard_arrow_down</mat-icon></label>
+                </mat-expansion-panel-header>
+
+                <div class="overflowTable">
+                  <div class="detailsTable">
+                    <table>
+                      <tr>
+                        <th *ngFor="let header of items.header">{{header}}</th>
+                      </tr>
+                      <tr *ngFor="let body of items.body">
+                        <td *ngFor="let header of items.header">{{body[header]? body[header] : '暂无数据'}}</td>
+                      </tr>
+                    </table>
+                  </div>
+                  <div *ngFor="let tableMsg of items.loopTable" class="detailsTable">
+                    <p style="text-align: center; font-size: 16px; margin: 5px 0;">楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}</p>
+                    <table>
+                      <tr>
+                        <th *ngFor="let header of tableMsg.header">{{header}}</th>
+                      </tr>
+                      <tr *ngFor="let body of tableMsg.body">
+                        <td *ngFor="let header of tableMsg.header">{{body[header]? body[header] : '暂无数据'}}</td>
+                      </tr>
+                    </table>
+                  </div>
+                </div>
+              </mat-expansion-panel>
+  
+            </mat-accordion>
+          </div>
+        </div>
+
+        <div style="width: 100%;margin-top: 25px;" *ngFor="let item of companyOptionalGrouping;let key = index">
+          <mat-accordion multi>
+
+            <mat-expansion-panel>
+              <mat-expansion-panel-header>
+                <h3 style="text-align: center;font-weight: 550;">{{item.name}}</h3>
+                <mat-icon title="保存" style="margin-left: 25px;" (click)='editCompanyOptional($event,item)'>description</mat-icon>
+              </mat-expansion-panel-header>
+              <div *ngFor="let items of item.propertyInfos" class="InputField">
+                <label>{{items.propertyName}}:</label>
+
+                <input type="text" *ngIf="items.propertyType!=1&&items.propertyType!=2&&items.propertyType!=4&&items.propertyType!=6"
+                [(ngModel)]="items.propertyValue" name="propertyValue">
+                <textarea maxlength="250" *ngIf="items.propertyType==1" [(ngModel)]="items.propertyValue" name="propertyValue"></textarea>
+                <input type="number" *ngIf="items.propertyType==2 ||items.propertyType==4" [(ngModel)]="items.propertyValue" name="propertyValue">
+                <mat-radio-group *ngIf="items.propertyType==6" [(ngModel)]="items.propertyValue" name="propertyValue">
+                  <mat-radio-button style="margin-left: 5px;" [value]='radio.value' *ngFor="let radio of singleElection">{{radio.name}}</mat-radio-button>
+                </mat-radio-group>
+              </div>
+            </mat-expansion-panel>
+
+          </mat-accordion>
+        </div>
+
+      </div>
+    </mat-tab>
+
     <mat-tab label="{{newItem.name}}" *ngFor="let newItem of allBuildingGrouping">
       <div class="contentBox">
 

src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts

@@ -22,6 +22,7 @@ export class FireFightingDeviceComponent implements OnInit {
   constructor(private tabbarService: TabbarAndScoreService,private router:Router,private route:ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { }
 
   ngOnInit(): void {
+    this.getCompanyInformation()
     this.getAllBuilding()
   }
 

src/app/key-unit/key-unit-management/key-unit-management.component.html

@@ -104,7 +104,7 @@
                     <th mat-header-cell *matHeaderCellDef> 
                     </th>
                     <td mat-cell *matCellDef="let element">
-                        <mat-checkbox color="primary" (change)="checkChange($event,element)"></mat-checkbox>      
+                        <mat-checkbox color="primary" (change)="checkChange($event,element)" [disabled]="element.contentVerify!=null&&(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3)" (click)='checkClick(element)'></mat-checkbox>      
                     </td>
                 </ng-container>
                 <ng-container matColumnDef="Follow">
@@ -264,8 +264,9 @@
                     <th mat-header-cell *matHeaderCellDef>操作</th>
                     <td mat-cell *matCellDef="let element"  class="operation">
                         <span (click)="unitdetails(element)" >查看详情</span>
-                        <span style="color: blue;margin-left: 4px;"  *ngIf="element.contentVerify==null||element.contentVerify.verifyState==-1" (click)='submitAudit(element)'>提交审核</span>
-                        <span style="color: blue;margin-left: 4px;"  *ngIf="element.contentVerify!=null&&element.contentVerify.verifyState==3" (click)="cancelAudit(element)">撤销审核</span>
+                        <span style="color: blue;margin-left: 4px;"  *ngIf="element.contentVerify==null||element.contentVerify.verifyState==-1||element.contentVerify.verifyState==1||element.contentVerify.verifyState==2||element.contentVerify.verifyState==4||element.contentVerify.verifyState==5" (click)='submitAudit(element)'>提交审核</span>
+                        <span style="color: blue;margin-left: 4px;"  *ngIf="element.contentVerify!=null&&(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3) " (click)="cancelAudit(element)">撤销审核</span>
+                        <span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span>
                         <span (click)="Follow(element)" *ngIf="!element.isFollowed">关注单位</span>
                         <span (click)="unFollow(element)" *ngIf="element.isFollowed">取消关注</span>
                     </td>

src/app/key-unit/key-unit-management/key-unit-management.component.scss

@@ -263,4 +263,12 @@
 .excellent{
     // background : #32cd32;
     // background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32);
+}
+
+//审核结果
+.auditDiv{
+    p{
+        margin: 8px 0;
+        margin-left: 16px;
+    }
 }

src/app/key-unit/key-unit-management/key-unit-management.component.ts

@@ -353,7 +353,6 @@ export class KeyUnitManagementComponent implements OnInit {
       IntegrityScoreMax:this.integrityScoreMax/100||1
     }
     this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{
-      console.log(data)
       this.length = data.totalCount
       this.allKeyUnitInfo = data
       // data.items.sort( (a,b) => {
@@ -429,11 +428,33 @@ export class KeyUnitManagementComponent implements OnInit {
   }
   selectedunitArr:any =[] //选中单位的数组
   //勾选框事件
+  verifyState //判断是否可以修改
   checkChange(e,element){
+    console.log(element)
+    if(element.contentVerify!=null){
+      this.verifyState=element.contentVerify.verifyState
+    }else{
+      this.verifyState=null
+    }
     element.checked = e.checked
+    
+  }
+  checkClick(element){
+    if(element.contentVerify!=null){
+      if(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3){
+        const config = new MatSnackBarConfig();
+        config.verticalPosition = 'top';
+        config.duration = 3000
+        this.snackBar.open('该单位正在审核不能选中','确定',config);
+      }
+      
+    }
   }
   //编辑单位信息
   editunit(){
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
     let selectedunitArr = []
     let selectedunitobj = []
     this.allKeyUnitInfo.items.forEach(item => {
@@ -444,9 +465,6 @@ export class KeyUnitManagementComponent implements OnInit {
     });
 
     if(selectedunitArr.length == 0){
-      const config = new MatSnackBarConfig();
-      config.verticalPosition = 'top';
-      config.duration = 3000
       this.snackBar.open('请先选择要修改的单位','确定',config);
     }
     if(selectedunitArr.length != 1 && selectedunitArr.length != 0){
@@ -460,6 +478,7 @@ export class KeyUnitManagementComponent implements OnInit {
         if(item.id == selectedunitArr[0]){
           let companyName = item.name
           sessionStorage.setItem("companyName",companyName)
+          sessionStorage.setItem("companyId",item.id)
         }
       });
       sessionStorage.setItem("editable","1")
@@ -492,7 +511,13 @@ export class KeyUnitManagementComponent implements OnInit {
   }
   //删除单位信息
   deleteunit(){
-    let selectedunitArr = []
+    if(this.verifyState==0||this.verifyState==3){
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open('审核中，不能删除','确定',config);
+    }else{
+      let selectedunitArr = []
     this.allKeyUnitInfo.items.forEach(item => {
       if(item.checked){
         selectedunitArr.push(item.id)
@@ -524,6 +549,8 @@ export class KeyUnitManagementComponent implements OnInit {
       }
      
     }
+    }
+    
   }
 
 
@@ -666,10 +693,20 @@ export class KeyUnitManagementComponent implements OnInit {
       verifyState:-1,
       contentType:11
      }
-     this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
+     this.http.delete(`/api/ContentVerifies/${element.contentVerify.id}`).subscribe(data=>{
       this.getAllKeyUnit()
     })
   }
+  //审核结果
+  auditResult(element){
+    // console.log(element)
+    const dialogRef = this.dialog.open(companyAuditResult, {
+      width:"400px",
+      //height:"300px",
+      data: {element:element}
+    });
+
+  }
 }
 
 
@@ -791,4 +828,34 @@ export class upname{
     }
     
   }
+}
+
+//查看审核结果
+@Component({
+  selector: 'resultmeet',
+  templateUrl: './resultcompanyPlan.html',
+  styleUrls: ['./key-unit-management.component.scss']
+})
+export class companyAuditResult{
+  constructor(private http: HttpClient,public dialogRef: MatDialogRef<companyAuditResult>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
+  planName:any = this.data.element.name
+  createTime=''
+  organizationName=this.data.element.organizationName
+  verifyTime=''
+  remark=''
+  verifyOrganizationName
+  verifyState=100
+  ngOnInit(): void {
+    if(this.data.element.contentVerify!=null){
+      this.createTime=this.data.element.contentVerify.createTime
+      //this.organizationName=this.data.element.organizationName
+      this.verifyTime=this.data.element.contentVerify.verifyTime
+      this.remark=this.data.element.remark
+      this.verifyState=this.data.element.contentVerify.verifyState
+      this.verifyOrganizationName=this.data.element.contentVerify.verifyOrganizationName
+    }
+  }
+  onNoClick(): void {
+    this.dialogRef.close();
+  }
 }

src/app/key-unit/key-unit-management/resultcompanyPlan.html

@@ -0,0 +1,27 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2021-01-20 09:31:24
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2021-03-03 11:03:19
+-->
+<div style="text-align: center;">
+    <span  mat-dialog-title>审批结果</span>
+</div>
+
+<div class="auditDiv">
+    <p>预案名称：{{planName}}</p>
+    <p>提交时间：{{createTime| date:'yyyy-MM-dd HH:mm:ss'||''}}</p>
+    <p>发起申请：{{organizationName ||''}}</p>
+    <mat-divider></mat-divider>
+    <p>审核时间：{{verifyTime| date:'yyyy-MM-dd HH:mm:ss'||''}}</p>
+    <p>审核机构：{{verifyOrganizationName||''}}</p>
+    <p>审核意见：{{remark||''}}</p>
+    <p>审核结果：{{verifyState==4?'审核通过':verifyState==5?'审核退回':''||''}}</p>
+</div>
+
+
+<div style="text-align: center;margin-top: 18px; ">
+    <button mat-raised-button  (click)="onNoClick()">关闭</button>
+</div>

src/app/key-unit/key-unit.module.ts

@@ -84,10 +84,11 @@ import { WaterRoadComponent } from './water-road/water-road.component';
 import { PhotoofthesceneComponent } from './photoofthescene/photoofthescene.component';
 import { KnowRouteComponent } from './know-route/know-route.component';
 import { FindProblemComponent } from './find-problem/find-problem.component';
-import { upname } from './key-unit-management/key-unit-management.component'
+import { upname } from './key-unit-management/key-unit-management.component';
+import { companyAuditResult } from './key-unit-management/key-unit-management.component'
 
 @NgModule({
-  declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeyImgDetail,KeySiteImgs,UploadingCADComponent,readFile,editFile,KeySiteLookComponent,KeySiteImgs2,FunctionDivisionLookComponent,RealisticPictureLookComponent,previewImg3,UploadingCADLookComponent,FireFightingDeviceComponent,ImagesData,previewBigImg,ImgsDataDetail,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,previewBigImg2,LookMaster2,addPartitionAttribute2, SixFamiliarityComponent, ActualCombatDrillComponent,routerMapComponent, SixFamiliarListComponent,TrainingRecordinfoComponent,RouterGISComponent,WaterRoadComponent,PhotoofthesceneComponent,KnowRouteComponent,FindProblemComponent,upname],
+  declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeyImgDetail,KeySiteImgs,UploadingCADComponent,readFile,editFile,KeySiteLookComponent,KeySiteImgs2,FunctionDivisionLookComponent,RealisticPictureLookComponent,previewImg3,UploadingCADLookComponent,FireFightingDeviceComponent,ImagesData,previewBigImg,ImgsDataDetail,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,previewBigImg2,LookMaster2,addPartitionAttribute2, SixFamiliarityComponent, ActualCombatDrillComponent,routerMapComponent, SixFamiliarListComponent,TrainingRecordinfoComponent,RouterGISComponent,WaterRoadComponent,PhotoofthesceneComponent,KnowRouteComponent,FindProblemComponent,upname,companyAuditResult],
   exports:[ViewUnitDetailsPlanComponent],
   imports: [
     CommonModule,

src/app/key-unit/view-unit-details/view-unit-details.component.html

@@ -9,7 +9,7 @@
             <app-collection-tools-plan></app-collection-tools-plan>
         </ng-template>
     </mat-tab>
-    <mat-tab label="3.平面图">
+    <mat-tab label="3.层平面图">
       <ng-template matTabContent>
         <app-collection-tools-building></app-collection-tools-building>
       </ng-template>

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

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 10:19:31
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-02-20 10:40:25
+ * @LastEditTime: 2021-03-03 13:54:44
 -->
 <div class="box">
     <div class="boxleft">
@@ -118,60 +118,48 @@
         
     </div>
     <div class="boxright">
-        <mat-tab-group *ngIf="showtype==3" style="flex: 1;overflow-y: auto;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
-
-            <mat-tab label="基本信息">
-              <ng-template matTabContent>
-                <app-basic-info></app-basic-info>
-              </ng-template>
-            </mat-tab>
-            <mat-tab label="平面图">
-              <ng-template matTabContent>
-                平面图
-              </ng-template>
-            </mat-tab>
-            <mat-tab label="四周毗邻">
-              <ng-template matTabContent>
-                四周毗邻
-              </ng-template>
-            </mat-tab>
-            <mat-tab label="消防设施">
-              <ng-template matTabContent>
-                消防设施
-              </ng-template>
-            </mat-tab>
-            <mat-tab label="重点部位">
-              <ng-template matTabContent>
-                重点部位
-              </ng-template>
-            </mat-tab>
-            <mat-tab label="功能分区">
-              <ng-template matTabContent>
-                功能分区
-              </ng-template>
-            </mat-tab>
-            <mat-tab label="实景图">
-              <ng-template matTabContent>
-                实景图
-              </ng-template>
-            </mat-tab>
-            <mat-tab label="CAD">
-              <ng-template matTabContent>
-                cad
-              </ng-template>
-            </mat-tab>
-            <!-- <mat-tab label="六熟悉">
-              <ng-template matTabContent>
-                六熟悉
-              </ng-template>
-            </mat-tab>
-            <mat-tab label="实战演练">
-              <ng-template matTabContent>
-                实战演练
-              </ng-template>
-            </mat-tab> -->
-        
-          </mat-tab-group>
+      <mat-tab-group  *ngIf="showtype == 3" style="flex: 1;overflow-y: auto;margin-top: 10px;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
+        <mat-tab label="基本信息">
+          <ng-template matTabContent>
+            <app-basic-info></app-basic-info>
+          </ng-template>
+        </mat-tab>
+        <mat-tab label="平面图">
+          <ng-template matTabContent>
+            <app-plan-list></app-plan-list>
+          </ng-template>
+        </mat-tab>
+        <mat-tab label="四周毗邻">
+          <ng-template matTabContent>
+            <app-allaround></app-allaround>
+          </ng-template>
+        </mat-tab>
+        <mat-tab label="消防设施">
+          <ng-template matTabContent>
+            <app-fire-facilities></app-fire-facilities>
+          </ng-template>
+        </mat-tab>
+        <mat-tab label="重点部位">
+          <ng-template matTabContent>
+            <app-key-site-look></app-key-site-look>
+          </ng-template>
+        </mat-tab>
+        <mat-tab label="功能分区">
+          <ng-template matTabContent>
+            <app-function-partition></app-function-partition>
+          </ng-template>
+        </mat-tab>
+        <mat-tab label="实景图">
+          <ng-template matTabContent>
+            <app-realistic-picture-look></app-realistic-picture-look>
+          </ng-template>
+        </mat-tab>
+        <mat-tab label="CAD">
+          <ng-template matTabContent>
+            <app-cad-draw></app-cad-draw>
+          </ng-template>
+        </mat-tab>
+      </mat-tab-group>
           <div class="word" *ngIf="showtype==0">
             <iframe [src]='iframeSrc'></iframe>
         </div>

src/app/plan-audit/plan-record/plan-record.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 10:19:31
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-02-22 10:49:38
+ * @LastEditTime: 2021-03-03 14:01:47
  */
 import { Component, OnInit,Inject } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -133,48 +133,67 @@ export class PlanRecordComponent implements OnInit {
   //表格点击事件
   viewer//全景图对象
   tableClick(e,item){
+    this.showtype = -1
     //e.target.parentElement.bgColor='#2196F3'
     //console.log(e,item)
     this.organizationName=''
     this.id=item.id
     this.fetchUrl=''
-    
-    this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data:any)=>{
-      this.companyId=data.companyId
-      this.companyName=data.companyName
-      if(data.planType!=2&&data.planType!=1){
-        this.fetchUrl=data.attachmentUrls[0]
-        var index=this.fetchUrl.indexOf("\/")
-        if(this.fetchUrl.substr(0,index)=='psw'){
-          this.showtype=1
-          var obj=document.getElementById('viewer')
-          if(obj!=null){
-            obj.innerHTML=''
+    this.viewer={}
+    if(item.contentType == 11){
+      window.setTimeout(()=>{
+        this.showtype = 3
+        sessionStorage.setItem('companyId',item.itemId)
+      },0)
+    }else if(item.contentType == 12){
+      //水源
+      this.showtype = 12
+    }else if(item.contentType == 13){
+      //消防力量
+      this.showtype = 13
+    }else if(item.contentType == 14){
+      //联动力量
+      this.showtype = 14
+    }else{
+      this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data:any)=>{
+        this.companyId=data.companyId
+        this.companyName=data.companyName
+        if(data.planType!=2&&data.planType!=1){
+          this.fetchUrl=data.attachmentUrls[0]
+          var index=this.fetchUrl.indexOf("\/")
+          if(this.fetchUrl.substr(0,index)=='psw'){
+            this.showtype=1
+            var obj=document.getElementById('viewer')
+            if(obj!=null){
+              obj.innerHTML=''
+            }
+            window.setTimeout(()=>{
+              this.viewer = new Viewer({
+                container: document.querySelector('#viewer'),
+                panorama:'/api/Objects/PlanPlatform/'+ this.fetchUrl,
+                
+              });
+            })
+            
+          }else{
+            this.lookWord()
           }
-          window.setTimeout(()=>{
-            this.viewer = new Viewer({
-              container: document.querySelector('#viewer'),
-              panorama:'/api/Objects/PlanPlatform/'+ this.fetchUrl,
-              
-            });
-          })
-          
         }else{
-          this.lookWord()
+          this.organizationName=item.organizationName
+          this.planData = data
+          this.handleData()
+          return
+          
+          //this.src=`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`
+          //this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
+          //window.open(`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`)
         }
-      }else{
-        this.organizationName=item.organizationName
-        this.planData = data
-        this.handleData()
-        return
         
-        //this.src=`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`
-        //this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
-        //window.open(`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`)
-      }
-      
-      
-     })
+        
+       })
+    }
+    
+    
       
     if(e.checked){
       this.shenheTable.push(item)

src/app/plan-audit/wait-examineer/wait-examineer.component.html

@@ -81,7 +81,7 @@
           <button mat-raised-button style="color: #FFFFFF;background-color: #FF7161;float: right;" (click)='refuse()'>拒绝</button>
           <button mat-raised-button style="color: #FFFFFF;background-color: #38D984;float: right;" (click)='agree()'>同意</button>
         </div>
-        <div class="rightheadone"  *ngIf="showtype==3">
+        <div class="rightheadone"  style="display: none;">
           <button mat-raised-button color="primary" (click)="buttonChange()"><img src="../../../assets/images/preview.png" style="margin-right: 3px;margin-bottom: 3px;display: none;">{{isallDate?'显示变更数据':'显示完整数据'}} </button>
           <button mat-raised-button *ngIf="isallDate" style="background-color: #FFCC00; color: #FFFFFF;" (click)="preview()"><img src="../../../assets/images/change.png" style="margin-bottom: 2px;" > 预览得分</button>
         </div>

src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 16:13:50
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-02 15:12:43
+ * @LastEditTime: 2021-03-03 15:13:25
  */
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -163,8 +163,10 @@ export class WaitExamineerComponent implements OnInit {
     this.fetchUrl=''
     this.viewer={}
     if(item.contentType == 11){
-      this.showtype = 3
-      sessionStorage.setItem('companyId',item.itemId)
+      window.setTimeout(()=>{
+        this.showtype = 3
+        sessionStorage.setItem('companyId',item.itemId)
+      },0)
     }else if(item.contentType == 12){
       //水源
       
@@ -492,7 +494,7 @@ export class WaitExamineerComponent implements OnInit {
             var body={
               id:this.shenheTable[i].id,
               itemId:this.shenheTable[i].itemId,
-              verifyState:4
+              verifyState:5
             }
             companyrefuseList.push(body)
           }

src/app/ui/collection-tools-building/collection-tools.component.ts

@@ -1502,7 +1502,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
     // }
     for(let key in storeyData.data){ //筛选数据 没有匹配全部放入到   其他   数组
       let noMatch = this.allFireElements.find( every=> every.id===storeyData.data[key].FireElementId )
-      if (!noMatch) {
+      if (!noMatch && storeyData.data[key].Id != "图例") {
         this.allFireElements[this.allFireElements.length-1].children.push(storeyData.data[key])
       }
     }
@@ -1706,19 +1706,26 @@ export class CollectionToolsBuildingComponent implements OnInit {
   //新增平面图 楼层/区域
   foundPanel (e) {
     e.stopPropagation()
-    let data = {
-      isBuilding: this.checkedBuildingIndex==-1? false:true,
-      Panel: this.beforeOneCheckedBuilding,
-      order: this.sitePlanData.length? this.sitePlanData[this.sitePlanData.length-1].order+1:0,
-    }
-    let dialogRef = this.dialog.open(leftFunctionalDomainBuildingComponent,{data});
-    dialogRef.afterClosed().subscribe(data=>{
-      if (data =='总平面图') {
-        this.renovateSitePlan()
-      } else if (data =='建筑') {
-        this.renovateBuilding()
+    if (this.beforeOneCheckedBuilding.id) {
+      let data = {
+        isBuilding: this.checkedBuildingIndex==-1? false:true,
+        Panel: this.beforeOneCheckedBuilding,
+        order: this.sitePlanData.length? this.sitePlanData[this.sitePlanData.length-1].order+1:0,
       }
-    })
+      let dialogRef = this.dialog.open(leftFunctionalDomainBuildingComponent,{data});
+      dialogRef.afterClosed().subscribe(data=>{
+        if (data =='总平面图') {
+          this.renovateSitePlan()
+        } else if (data =='建筑') {
+          this.renovateBuilding()
+        }
+      })
+    } else {
+      const config = new MatSnackBarConfig();
+      config.verticalPosition = 'top';
+      config.duration = 3000
+      this.snackBar.open('请选择建筑','确定',config);
+    }
   }
 
   //编辑平面图 楼层/区域

src/app/ui/collection-tools-plan/collection-tools.component.ts

@@ -1513,7 +1513,7 @@ export class CollectionToolsPlanComponent implements OnInit {
     // }
     // for(let key in storeyData.data){ //筛选数据 没有匹配全部放入到   其他   数组
     //   let noMatch = this.allFireElements.find( every=> every.id===storeyData.data[key].FireElementId )
-    //   if (!noMatch) {
+    //   if (!noMatch && storeyData.data[key].Id != "图例") {
     //     this.allFireElements[this.allFireElements.length-1].children.push(storeyData.data[key])
     //   }
     // }

src/app/ui/collection-tools/collection-tools.component.ts

@@ -641,7 +641,7 @@ export class CollectionToolsComponent implements OnInit {
   firstMultipleAssetData:any//当前多选的第一个素材
   ngOnInit(): void {
 
-    let _this = this
+    this.canvasData.isInheritSky = { weather:'', airTemperature:'', windDirection:'', windScale:'', }; //缓存 节点 天气
     AxMessageSystem.addListener('selectionChanged', ()=>{
 
       if(this.canvas.selection.size() == 1){//如果是单选
@@ -2320,10 +2320,10 @@ export class CollectionToolsComponent implements OnInit {
     e.stopPropagation()
     let dialogRef = this.dialog.open(addBGCDisposalNodeComponent);
     dialogRef.afterClosed().subscribe(data=>{
-      if (data) { 
+      if (data) {
         this.canvasData.customizeDisposalNode = data //自定义数据节点
         let imgURL = window.URL.createObjectURL(data.file) //将图片生成 url地址
-        this.canvasData.selectPanelPointBaseData = {description: '', notes: '', weather: '', airTemperature: '', windDirection: '', windScale: ''} //更新 当前数据节点对应父级节点
+        // this.canvasData.selectPanelPointBaseData = {description: '', notes: '', weather: '', airTemperature: '', windDirection: '', windScale: ''} //更新 当前数据节点对应父级节点
         this.selectDisposalNode = ''
         this.canvasData.selectPanelPoint = new DisposalNodeData() //更新 当前数据节点
         this.canvasData.selectPanelPoint.BackgroundImageUrl = imgURL
@@ -2349,6 +2349,10 @@ export class CollectionToolsComponent implements OnInit {
       disasterId: this.allFirePlan[0].id || '',
       parentId: item? item.id : null,
       planComponentId: sessionStorage.getItem('planId') || '',
+      weather: this.canvasData.isInheritSky.weather,
+      airTemperature: Number(this.canvasData.isInheritSky.airTemperature),
+      windDirection: Number(this.canvasData.isInheritSky.windDirection),
+      windScale: Number(this.canvasData.isInheritSky.windScale),
     }
     let dialogRef = this.dialog.open(addDisposalNodeComponent,{data});
     dialogRef.afterClosed().subscribe(data=>{

src/app/ui/collection-tools/save.ts

@@ -85,10 +85,18 @@ export class saveOneDialog {
           }
         })
       })
+      //保存到已有节点 自动选择父节点
+      if (this.data.type == 'old' && this.canvasData.selectPanelPointBaseData.id) {
+        this.selectedOld = this.canvasData.selectPanelPointBaseData.id
+        let item = this.allPlanDisposalNode.find(item=>{ return item.id === this.canvasData.selectPanelPointBaseData.id })
+        this.clickNode(item)
+      }
     }
+  
     onNoClick(): void {
       this.dialogRef.close();
     }
+    selectedOld:any; //当前选中的要保存到的父节点ID
     nodeItem:any//当前选中的要保存到的父节点
     itemChildNum = 0 //点击处置节点子数据节点的数量（赋值order）
     clickNode(item){
@@ -140,12 +148,18 @@ export class saveOneDialog {
       if(type == 'old'){
         let istrue = this.canvasData.findDisposalNode(this.nodeItem.id,name)
         let putdata = this.nodeItem
-            putdata.weather = this.canvasData.selectPanelPointBaseData.weather
-            putdata.airTemperature = Number(this.canvasData.selectPanelPointBaseData.airTemperature)
-            putdata.windScale = Number(this.canvasData.selectPanelPointBaseData.windScale) 
-            putdata.windDirection = Number(this.canvasData.selectPanelPointBaseData.windDirection) 
-            putdata.description = this.canvasData.selectPanelPointBaseData.description
-            putdata.notes = this.canvasData.selectPanelPointBaseData.notes
+          if (!this.canvasData.selectPanelPointBaseData.weather && !this.canvasData.selectPanelPointBaseData.airTemperature && !this.canvasData.selectPanelPointBaseData.windScale && !this.canvasData.selectPanelPointBaseData.windDirection) { //继承 天气
+            this.canvasData.selectPanelPointBaseData.weather = JSON.parse(JSON.stringify(this.canvasData.isInheritSky.weather))
+            this.canvasData.selectPanelPointBaseData.airTemperature = JSON.parse(JSON.stringify(this.canvasData.isInheritSky.airTemperature))
+            this.canvasData.selectPanelPointBaseData.windScale = JSON.parse(JSON.stringify(this.canvasData.isInheritSky.windScale))
+            this.canvasData.selectPanelPointBaseData.windDirection = JSON.parse(JSON.stringify(this.canvasData.isInheritSky.windDirection))
+          }
+          putdata.weather = this.canvasData.selectPanelPointBaseData.weather
+          putdata.airTemperature = Number(this.canvasData.selectPanelPointBaseData.airTemperature)
+          putdata.windScale = Number(this.canvasData.selectPanelPointBaseData.windScale)
+          putdata.windDirection = Number(this.canvasData.selectPanelPointBaseData.windDirection) 
+          putdata.description = this.canvasData.selectPanelPointBaseData.description
+          putdata.notes = this.canvasData.selectPanelPointBaseData.notes
 
         if(istrue){//如果该处置节点下已有同名数据节点 则只修改 2个接口
           new Promise((resolve,reject)=>{
@@ -178,6 +192,7 @@ export class saveOneDialog {
                   config.duration = 3000
                   this.snackBar.open('保存失败','确定',config)
                 })
+                this.cacheWeather()
                 this.dialogRef.close();
                 this.canvasData.sendMessage('send a message');//发布一条消息
               }) //imgURL
@@ -219,6 +234,7 @@ export class saveOneDialog {
                   config.duration = 3000
                   this.snackBar.open('保存失败','确定',config)
                 })
+                this.cacheWeather()
                 this.dialogRef.close();
                 this.canvasData.sendMessage('send a message');//发布一条消息
               }) //imgURL
@@ -272,10 +288,15 @@ export class saveOneDialog {
           buildingId: null,
           buildingAreaId: null
         }
-
+        if (!this.canvasData.selectPanelPointBaseData.weather && !this.canvasData.selectPanelPointBaseData.airTemperature && !this.canvasData.selectPanelPointBaseData.windScale && !this.canvasData.selectPanelPointBaseData.windDirection) { //继承 天气
+          this.canvasData.selectPanelPointBaseData.weather = JSON.parse(JSON.stringify(this.canvasData.isInheritSky.weather))
+          this.canvasData.selectPanelPointBaseData.airTemperature = JSON.parse(JSON.stringify(this.canvasData.isInheritSky.airTemperature))
+          this.canvasData.selectPanelPointBaseData.windScale = JSON.parse(JSON.stringify(this.canvasData.isInheritSky.windScale))
+          this.canvasData.selectPanelPointBaseData.windDirection = JSON.parse(JSON.stringify(this.canvasData.isInheritSky.windDirection))
+        }
         dispositionNodeData.weather = this.canvasData.selectPanelPointBaseData.weather
         dispositionNodeData.airTemperature = Number(this.canvasData.selectPanelPointBaseData.airTemperature)
-        dispositionNodeData.windScale = Number(this.canvasData.selectPanelPointBaseData.windScale) 
+        dispositionNodeData.windScale = Number(this.canvasData.selectPanelPointBaseData.windScale)
         dispositionNodeData.windDirection = Number(this.canvasData.selectPanelPointBaseData.windDirection) 
         dispositionNodeData.description = this.canvasData.selectPanelPointBaseData.description
         dispositionNodeData.notes = this.canvasData.selectPanelPointBaseData.notes
@@ -319,6 +340,7 @@ export class saveOneDialog {
                   config.duration = 3000
                   this.snackBar.open('保存失败','确定',config)
                 })
+                this.cacheWeather()
                 this.dialogRef.close();
                 this.canvasData.sendMessage("send a message")
               }) //imgURL
@@ -327,6 +349,14 @@ export class saveOneDialog {
       }
     }
 
+  //缓存节点 天气
+  cacheWeather () {
+    this.canvasData.isInheritSky.weather = JSON.parse(JSON.stringify(this.canvasData.selectPanelPointBaseData.weather))
+    this.canvasData.isInheritSky.airTemperature = JSON.parse(JSON.stringify(this.canvasData.selectPanelPointBaseData.airTemperature))
+    this.canvasData.isInheritSky.windDirection = JSON.parse(JSON.stringify(this.canvasData.selectPanelPointBaseData.windDirection))
+    this.canvasData.isInheritSky.windScale = JSON.parse(JSON.stringify(this.canvasData.selectPanelPointBaseData.windScale))
+  }
+
   //封装方法 上传 自定义底图
   uploadBGC () {
     return new Promise((resolve,reject)=>{

src/app/ui/collection-tools/saveTwo.html

@@ -34,7 +34,7 @@
         <form (ngSubmit)="onSubmit(form.value,'old')" #form="ngForm" class="example-container">
             <div mat-dialog-content>
                 <mat-form-field>
-                    <mat-select required ngModel placeholder="父节点名称" name="nodeId">
+                    <mat-select required [(ngModel)]="selectedOld" placeholder="父节点名称" name="nodeId">
                         <mat-option *ngFor="let item of allPlanDisposalNode" [value]="item.id"  (click)="clickNode(item)">
                             {{item.name}}
                         </mat-option>

src/styles.scss

@@ -204,6 +204,6 @@ table td.mat-footer-cell:last-of-type{
 }
 //水源采集点聚合
 .clusterImgCollection{
-	width:25px;
-	height:25px;
+	width:30px;
+	height:30px;
 }