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

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

@@ -79,8 +79,13 @@
                     </div>
                 </div>
                 <div class="btnbox">
-                    <span class="save" (click)="save()"><mat-icon>save</mat-icon>保存</span>
-                    <span class="submitAudit"><mat-icon>open_in_browser</mat-icon>提交审核</span>
+                    <span class="state" *ngIf="waterData.verifyState == 3">(待审核)</span>
+                    <span class="state" style="color: rgb(92, 214, 78);" *ngIf="waterData.verifyState == 4">(审核通过)</span>
+                    <span class="state" *ngIf="waterData.verifyState == 5">(审核驳回)</span>
+                    
+                    <span class="submitAudit" *ngIf="waterData.verifyState != 3 && waterData.verifyState != 4" (click)="submitAudit()"><mat-icon>open_in_browser</mat-icon>提交审核</span>
+                    <span class="state" *ngIf="waterData.verifyState == 3 || waterData.verifyState == 4" (click)="cancelAudit()">撤销审核</span>
+                    <span class="save state" *ngIf="waterData.verifyState == 5 || waterData.verifyState != 3 && waterData.verifyState != 4" (click)="save()"><mat-icon>save</mat-icon>保存</span>
                     <span class="close" (click)="close()"><mat-icon>close</mat-icon>关闭</span>
                 </div>
             </div>

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

@@ -254,8 +254,11 @@
                 span:hover{
                     text-decoration: underline;
                 }
+                .state{
+                    margin-right:30px;
+                }
                 .submitAudit{
-                    margin: 0 30px;
+                    margin-right:30px;
                 }
                 .close{
                     margin-right: 30px;

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

@@ -198,7 +198,7 @@ export class WaterCollectionComponent implements OnInit {
   //点击水源列表
   selectedLiIndex:any 
   clickWaterLi(item,index){
-    // console.log(item)
+    console.log(item)
     if(this.selectedLiIndex != index){
       this.selectedLiIndex = index
       this.clearData()
@@ -430,6 +430,29 @@ export class WaterCollectionComponent implements OnInit {
       })
     }
    
+  }
+  //提交审核
+  submitAudit(){
+    let isTrue = window.confirm('请确认保存后提交审核，否则将无法审核最新内容，是否继续？')
+    if(isTrue){
+      console.log('提交审核的水源',this.waterData)
+      let body = {
+        title: this.waterData.name,
+        operation: this.waterData.verifyState == -1 ? 0 : 1,//操作方式
+        contentType: 12,//水源类型
+        itemId: this.waterData.id,
+        verifyState: 3,
+      }
+      this.http.post('/api/ContentVerifies',body).subscribe((data) => {
+        console.log('提交成功',data)
+        this.waterData.verifyState = 3
+      })
+    }
+   
+  }
+  //撤销审核
+  cancelAudit(){
+    
   }
   //关闭
   close(){

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

@@ -54,12 +54,11 @@
                   </table>
                     <div class="tbodycss" id="tbodydiv" >
                       <table cellspacing="0" cellpadding="0" id="table" >
-                        <tr *ngFor="let item of tableDate;let key = index" (click)='radioClick($event,item)'>
+                        <tr [ngClass]="{'selectedTr': item.id == id}" *ngFor="let item of tableDate;let key = index" (click)='radioClick($event,item)'>
                           <td style="width: 15%;">
                             <mat-checkbox color="primary" (change)='radioClick($event,item)'></mat-checkbox>
-                            <!-- <input type="checkbox" name="yuan"  value={{item.id}}  (click)='radioClick($event,item)'> -->
                             {{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'?
-                            'Ⅴ级预案':item.contentType=='6'?'应急预案（国家级）':item.contentType=='7'?'应急预案（市级）':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':'消防车辆'}}</td>
+                            'Ⅴ级预案':item.contentType=='6'?'应急预案（国家级）':item.contentType=='7'?'应急预案（市级）':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}</td>
                           <td style="width: 15%;" [ngClass]="{'green': item.operation == '1','red':item.operation == '2','blue':item.operation == '0'}">{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
                           <td style="width: 15%;">{{item.verifyOrganizationName}}</td>
                           <td style="width: 15%;" [ngClass]="{'green': item.verifyState == '1'||item.verifyState == '4','red':item.verifyState == '2'||item.verifyState == '5'}">{{item.verifyState=='0'?'待初审':item.verifyState=='1'?
@@ -90,7 +89,7 @@
         
       </div>
       <div id="company">
-        <mat-tab-group  *ngIf="showtype==3" style="flex: 1;overflow-y: auto;margin-top: 10px;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
+        <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>
@@ -134,7 +133,7 @@
         </mat-tab-group>
       </div>
       
-      <div id="firefacilities" *ngIf="showtype==3 && !isallDate"  style="margin: 10px;">
+      <div id="firefacilities" *ngIf="showtype == 3 && !isallDate"  style="margin: 10px;">
         <mat-accordion class="tableContent" >
           <mat-expansion-panel expanded style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;">
             <mat-expansion-panel-header  collapsedHeight ='40px' expandedHeight='40px' class="panelhead" style="background-color: #2196F3;">
@@ -242,11 +241,11 @@
         </mat-expansion-panel>
   </mat-accordion>
       </div>
-      <div class="word" *ngIf="showtype==0">
+      <div class="word" *ngIf="showtype == 0">
           <iframe [src]='iframeSrc'></iframe>
       </div>
-      <div id="viewer"  *ngIf="showtype==1"></div>
-      <div class="twoD" *ngIf="showtype==2">
+      <div id="viewer"  *ngIf="showtype == 1"></div>
+      <div class="twoD" *ngIf="showtype == 2">
         <div class="planBox">
           <span>单位名称: </span>
           <span>{{compantData.name?compantData.name : '暂无数据'}}</span>
@@ -268,17 +267,17 @@
         </div>
       </div>
       <!-- 水源审核 -->
-      <!-- <div class="waterAudit">
-        <app-water-audit></app-water-audit>
-      </div> -->
+      <div class="waterAudit" *ngIf="showtype == 12">
+        <app-water-audit [waterData]="waterData"></app-water-audit>
+      </div>
       <!-- 消防力量审核 -->
-      <!-- <div class="fireForceAudit">
+      <div class="fireForceAudit" *ngIf="showtype == 13">
         <app-fireforce-audit></app-fireforce-audit>
-      </div> -->
+      </div>
       <!-- 联动力量审核 -->
-      <!-- <div class="LinkageForcesAudit">
+      <div class="LinkageForcesAudit" *ngIf="showtype == 14">
         <app-linkageforces-audit></app-linkageforces-audit>
-      </div> -->
+      </div>
     </div>
 </div>
 <div class="echarts" *ngIf="previewshow" ><!-- [style.display]="previewshow==true?'block':'none'" -->

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

@@ -50,6 +50,9 @@
                 overflow-y: auto;
                 height: 700px;
                 width: 100%;
+                .selectedTr{
+                    background-color: #b3d3ee;
+                }
             }
             table{
                 margin-left:10px;

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 10:29:47
+ * @LastEditTime: 2021-03-02 15:12:43
  */
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -153,17 +153,34 @@ export class WaitExamineerComponent implements OnInit {
   }
   //radio点击事件
   viewer//全景图对象
+  waterData:any//需要传递给子组件的水源信息
   radioClick(e,item){
-    this.showtype=-1
+    this.showtype = -1
     //e.target.parentElement.bgColor='#2196F3'
-    //console.log(e,item)
+    console.log(item)
     this.organizationName=''
     this.id=item.id
     this.fetchUrl=''
     this.viewer={}
-    if(item.contentType==11){
-      this.showtype=3
+    if(item.contentType == 11){
+      this.showtype = 3
       sessionStorage.setItem('companyId',item.itemId)
+    }else if(item.contentType == 12){
+      //水源
+      
+      // console.log(item.itemId)
+      this.http.get(`/api/WaterSources/${item.itemId}`).subscribe((data)=>{
+
+        console.log('水源',data)
+        this.waterData = data
+        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
@@ -200,7 +217,7 @@ export class WaitExamineerComponent implements OnInit {
         }
         
         
-       })
+      })
     }
     
       
@@ -311,120 +328,198 @@ export class WaitExamineerComponent implements OnInit {
   //同意操作
   agree(){
     var agreeList=[]
+    var companyAgreeList=[]
     const config = new MatSnackBarConfig();
       config.verticalPosition = 'top';
       config.duration = 3000
       console.log(this.shenheTable)
       if(this.shenheTable.length==0){
-        this.snackBar.open('请选择要审核的预案!','确定',config);
+        this.snackBar.open('请勾选要审核的条目!','确定',config);
       }
       //单个审核
-      else if(this.shenheTable.length==1){
-        //重点单位审核
-        if(this.shenheTable[0].contentType==11){
+      else if(this.shenheTable.length == 1){
+        let isTrue = window.confirm('确定同意选中条目的审核吗？')
+        if(isTrue){
+          //重点单位审核
+          if(this.shenheTable[0].contentType == 11){
+            let body:any = {
+              id:this.shenheTable[0].id,
+              itemId:this.shenheTable[0].itemId,
+              verifyState:4,
+              contentType:11,
+              title:this.shenheTable[0].title+'基本信息'
+            }
+            this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
+              this.snackBar.open('操作成功!','确定',config);
+              this.getAlltabledate()
+            })
+          }else if(this.shenheTable[0].contentType == 12){
+            let body:any = {
+              id:this.shenheTable[0].id,
+              itemId:this.shenheTable[0].itemId,
+              verifyState:4,
+              contentType:12,
+              title:this.shenheTable[0].title
+            }
+            this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
+              this.snackBar.open('操作成功!','确定',config);
+              this.showtype = -1
+              this.getAlltabledate()
+            })
+          }else if(this.shenheTable[0].contentType == 13){
+
+          }else if(this.shenheTable[0].contentType == 14){
+
+          }else{
+            //预案审核
+            if(this.shenheTable[0].verifyState==0){
+              this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:16}).subscribe(data=>{
+                this.snackBar.open('操作成功!','确定',config);
+                this.getAlltabledate()
+              })
+            }else if(this.shenheTable[0].verifyState==3){
+              this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:2}).subscribe(data=>{
+                this.snackBar.open('操作成功!','确定',config);
+                this.getAlltabledate()
+              })
+            }
+          }
+        }
+      }
+      //批量审核
+      else{
+        let isTrue = window.confirm('确定同意选中条目的审核吗？')
+        if(isTrue){
+          if(this.shenheTable[0].contentType==11||this.shenheTable[0].contentType==12){   //批量审批水源和重点单位
+            for(var i=0;i<this.shenheTable.length;i++){
+              var body={
+                id:this.shenheTable[i].id,
+                itemId:this.shenheTable[i].itemId,
+                verifyState:4
+              }
+              companyAgreeList.push(body)
+            }
+            this.http.put(`/api/ContentVerifies/Batch`,companyAgreeList).subscribe(data=>{
+              this.snackBar.open('操作成功!','确定',config);
+              this.getAlltabledate()
+            })
+          }else{   //批量审核预案
+            for(var i=0;i<this.shenheTable.length;i++){
+              var cart={
+                planComponentId:this.shenheTable[i].itemId,
+                auditStatus:this.shenheTable[i].verifyState==3?2:16,
+                auditOpinion:''
+              }
+              agreeList.push(cart)
+            }
+            this.http.put(`/api/PlanAudits/Batch`,agreeList).subscribe(data=>{
+              this.snackBar.open('操作成功!','确定',config);
+              this.getAlltabledate()
+            })
+          }
+          
+        }
+        
+      }
+      this.shenheTable=[]
+ }
+  //拒绝操作
+  refuse(){
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
+    var refuseList = []
+    var companyrefuseList=[]
+    if(this.shenheTable.length==0){
+      this.snackBar.open('请选择要审核的预案!','确定',config);
+    }
+    //单个审核拒绝
+    else if(this.shenheTable.length==1){
+      let isTrue = window.confirm('确定拒绝选中条目的审核吗？')
+      if(isTrue){
+        //重点单位审核拒绝
+        if(this.shenheTable[0].contentType == 11){
           let body:any = {
             id:this.shenheTable[0].id,
             itemId:this.shenheTable[0].itemId,
-            verifyState:4,
+            verifyState:5,
             contentType:11,
             title:this.shenheTable[0].title+'基本信息'
-           }
+          }
           this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
             this.snackBar.open('操作成功!','确定',config);
             this.getAlltabledate()
           })
+        }else if(this.shenheTable[0].contentType == 12){
+          let body:any = {
+            id:this.shenheTable[0].id,
+            itemId:this.shenheTable[0].itemId,
+            verifyState:5,
+            contentType:12,
+            title:this.shenheTable[0].title
+          }
+          this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
+            this.showtype = -1
+            this.snackBar.open('操作成功!','确定',config);
+            this.getAlltabledate()
+          })
+        }else if(this.shenheTable[0].contentType == 13){
+
+        }else if(this.shenheTable[0].contentType == 14){
+
         }else{
-          //预案审核
+          //预案审核拒绝
           if(this.shenheTable[0].verifyState==0){
-            this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:16}).subscribe(data=>{
+            this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:32}).subscribe(data=>{
               this.snackBar.open('操作成功!','确定',config);
               this.getAlltabledate()
             })
           }else if(this.shenheTable[0].verifyState==3){
-            this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:2}).subscribe(data=>{
+            this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=>{
               this.snackBar.open('操作成功!','确定',config);
               this.getAlltabledate()
             })
           }
         }
-        
       }
-      //批量审核
-      else{
-        for(var i=0;i<this.shenheTable.length;i++){
-          var cart={
-            planComponentId:this.shenheTable[i].itemId,
-            auditStatus:this.shenheTable[i].verifyState==3?2:16,
-            auditOpinion:''
+    }
+    //批量审核
+    else{
+      let isTrue = window.confirm('确定拒绝选中条目的审核吗？')
+      if(isTrue){
+        if(this.shenheTable[0].contentType==11||this.shenheTable[0].contentType==12){   //批量审批水源和重点单位
+          for(var i=0;i<this.shenheTable.length;i++){
+            var body={
+              id:this.shenheTable[i].id,
+              itemId:this.shenheTable[i].itemId,
+              verifyState:4
+            }
+            companyrefuseList.push(body)
           }
-          agreeList.push(cart)
+          this.http.put(`/api/ContentVerifies/Batch`,companyrefuseList).subscribe(data=>{
+            this.snackBar.open('操作成功!','确定',config);
+            this.getAlltabledate()
+          })
+        }else{
+          for(var i=0;i<this.shenheTable.length;i++){
+            var cart={
+              planComponentId:this.shenheTable[i].itemId,
+              auditStatus:this.shenheTable[i].verifyState==3?4:32,
+              auditOpinion:''
+            }
+            refuseList.push(cart)
+          }
+          this.http.put(`/api/PlanAudits/Batch`,refuseList).subscribe(data=>{
+            this.snackBar.open('操作成功!','确定',config);
+            this.getAlltabledate()
+          })
         }
-        this.http.put(`/api/PlanAudits/Batch`,agreeList).subscribe(data=>{
-          this.snackBar.open('操作成功!','确定',config);
-          this.getAlltabledate()
-        })
-      }
-      this.shenheTable=[]
- }
- //拒绝操作
- refuse(){
-  const config = new MatSnackBarConfig();
-  config.verticalPosition = 'top';
-  config.duration = 3000
-  var refuseList=[]
-  if(this.shenheTable.length==0){
-    this.snackBar.open('请选择要审核的预案!','确定',config);
-  }
-  //单个审核拒绝
-  else if(this.shenheTable.length==1){
-    //重点单位审核拒绝
-    if(this.shenheTable[0].contentType==11){
-      let body:any = {
-        id:this.shenheTable[0].id,
-        itemId:this.shenheTable[0].itemId,
-        verifyState:5,
-        contentType:11,
-        title:this.shenheTable[0].title+'基本信息'
-       }
-      this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{
-        this.snackBar.open('操作成功!','确定',config);
-        this.getAlltabledate()
-      })
-    }else{
-      //预案审核拒绝
-      if(this.shenheTable[0].verifyState==0){
-        this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:32}).subscribe(data=>{
-          this.snackBar.open('操作成功!','确定',config);
-          this.getAlltabledate()
-        })
-      }else if(this.shenheTable[0].verifyState==3){
-        this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=>{
-          this.snackBar.open('操作成功!','确定',config);
-          this.getAlltabledate()
-        })
       }
     }
+    this.shenheTable=[]
     
-  }
-  //批量审核
-  else{
-    for(var i=0;i<this.shenheTable.length;i++){
-      var cart={
-        planComponentId:this.shenheTable[i].itemId,
-        auditStatus:this.shenheTable[i].verifyState==3?4:32,
-        auditOpinion:''
-      }
-      refuseList.push(cart)
-    }
-    this.http.put(`/api/PlanAudits/Batch`,refuseList).subscribe(data=>{
-      this.snackBar.open('操作成功!','确定',config);
-      this.getAlltabledate()
-    })
-  }
-  this.shenheTable=[]
-  
 
- }
+  }
 
   //分数饼状图
   bar(){

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

@@ -4,7 +4,7 @@
             <div class="tabsbox">
                 <div class="tabs">
                     <div class="selectedBtn">
-                        <span>消火栓</span>
+                        <span>{{selectedWaterTypeIndex == 0 ? '消火栓' : selectedWaterTypeIndex == 1 ? '消防水池' : selectedWaterTypeIndex == 2 ? '天然水源' : null}}</span>
                     </div>
                 </div>
             </div>

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

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 declare var AMap: any;
 @Component({
   selector: 'app-water-audit',
@@ -6,7 +6,7 @@ declare var AMap: any;
   styleUrls: ['./water-audit.component.scss']
 })
 export class WaterAuditComponent implements OnInit {
-
+  @Input() public waterData: any;//data名字根据引用场景自定义
   constructor() { }
   map:any
   newPositionMarker:any
@@ -15,9 +15,12 @@ export class WaterAuditComponent implements OnInit {
   '   <img style="width:20px;height:24px" src="/assets/images/定位.png">' +
   '</div>'
   ngOnInit(): void {
+   
+    this.selectedWaterTypeIndex = this.waterData.waterSourceType
     this.waterData.detailData = JSON.parse(this.waterData.detailData)
     this.fireCockData = this.waterData.detailData
-    console.log(789, this.fireCockData)
+    this.poolData = this.waterData.detailData
+    this.naturalWaterData = this.waterData.detailData
     setTimeout(() => {
       this.map = new AMap.Map('container', {
         zoom:18
@@ -38,27 +41,27 @@ export class WaterAuditComponent implements OnInit {
       
     }, 0);
   }
-  selectedWaterTypeIndex:number = 0//选择的水源类型  0消火栓 1水池 2天然水源
+  selectedWaterTypeIndex:number //选择的水源类型  0消火栓 1水池 2天然水源
   fireCockData:any = []//消火栓详情
   poolData:any = []//水池详情
   naturalWaterData:any = []//天然水源详情
-  waterData:any = {
-    id: "60125d31d31fab7de81c56b0",
-    name: "上海中心消火栓01",
-    administrativeRegion: "上海区",
-    governmentLevel: "1",
-    village: "小高社区",
-    address: "国际会议中心",
-    location: {
-      x: 121.496717,
-      y: 31.239452
-    },
-    detailData: "[{\"PropertyName\":\"可用状态\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"放置形式\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"管网形式\",\"PropertyValue\":\"2\"},{\"PropertyName\":\"管网直径\",\"PropertyValue\":\"2\"},{\"PropertyName\":\"管网压力类型\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"管网压力范围\",\"PropertyValue\":\"2222\"},{\"PropertyName\":\"接口形式\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"接口口径\",\"PropertyValue\":\"3\"},{\"PropertyName\":\"最大流量\",\"PropertyValue\":\"333\"},{\"PropertyName\":\"供水单位\",\"PropertyValue\":\"剃剃头\"},{\"PropertyName\":\"联系方式\",\"PropertyValue\":\"119\"},{\"PropertyName\":\"备注\",\"PropertyValue\":\"突突突突突突\"}]",
-    detailItems: null,
-    createTime: "2021-02-03T02:36:57.451Z",
-    creatorId: "5e8eced2aaca5f7c1025309b",
-    deleted: false,
-    waterSourceType: 0,
-    integrityScore: 0.21052632
-  }
+  // waterData:any = {
+  //   id: "60125d31d31fab7de81c56b0",
+  //   name: "上海中心消火栓01",
+  //   administrativeRegion: "上海区",
+  //   governmentLevel: "1",
+  //   village: "小高社区",
+  //   address: "国际会议中心",
+  //   location: {
+  //     x: 121.496717,
+  //     y: 31.239452
+  //   },
+  //   detailData: "[{\"PropertyName\":\"可用状态\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"放置形式\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"管网形式\",\"PropertyValue\":\"2\"},{\"PropertyName\":\"管网直径\",\"PropertyValue\":\"2\"},{\"PropertyName\":\"管网压力类型\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"管网压力范围\",\"PropertyValue\":\"2222\"},{\"PropertyName\":\"接口形式\",\"PropertyValue\":\"1\"},{\"PropertyName\":\"接口口径\",\"PropertyValue\":\"3\"},{\"PropertyName\":\"最大流量\",\"PropertyValue\":\"333\"},{\"PropertyName\":\"供水单位\",\"PropertyValue\":\"剃剃头\"},{\"PropertyName\":\"联系方式\",\"PropertyValue\":\"119\"},{\"PropertyName\":\"备注\",\"PropertyValue\":\"突突突突突突\"}]",
+  //   detailItems: null,
+  //   createTime: "2021-02-03T02:36:57.451Z",
+  //   creatorId: "5e8eced2aaca5f7c1025309b",
+  //   deleted: false,
+  //   waterSourceType: 0,
+  //   integrityScore: 0.21052632
+  // }
 }

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

@@ -669,7 +669,10 @@ export class CollectionToolsBuildingComponent implements OnInit {
         this.isShowProperty = false
       }
     }, this)
-
+    AxMessageSystem.addListener('imageResize', (eventName, args1) => {
+      this.assetWidth = args1.Width
+      this.assetHeight = args1.Height
+    }, this)
     if(this.router.url.indexOf("keyUnit/viewunitinfo") != -1){ //查看模式
       this.isEditPattern = false
       this.isediticon = false
@@ -1353,7 +1356,6 @@ export class CollectionToolsBuildingComponent implements OnInit {
     });
     this.dataSource.data = treeData
     this.treeControl.expandAll()
-    
   }
 
   //点击树节点
@@ -1493,11 +1495,11 @@ export class CollectionToolsBuildingComponent implements OnInit {
     let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据 
     let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据
 
-    for(let key in companyBuildingData.data){
-      if (companyBuildingData.data[key].FloorId === beforeOneId) { //处理 单位/建筑 数据是否归于当前楼层下
-        storeyData.data[key] = companyBuildingData.data[key]
-      }
-    }
+    // for(let key in companyBuildingData.data){
+    //   if (companyBuildingData.data[key].FloorId === beforeOneId) { //处理 单位/建筑 数据是否归于当前楼层下
+    //     storeyData.data[key] = companyBuildingData.data[key]
+    //   }
+    // }
     for(let key in storeyData.data){ //筛选数据 没有匹配全部放入到   其他   数组
       let noMatch = this.allFireElements.find( every=> every.id===storeyData.data[key].FireElementId )
       if (!noMatch) {

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

@@ -674,7 +674,10 @@ export class CollectionToolsPlanComponent implements OnInit {
         this.isShowProperty = false
       }
     }, this)
-
+    AxMessageSystem.addListener('imageResize', (eventName, args1) => {
+      this.assetWidth = args1.Width
+      this.assetHeight = args1.Height
+    }, this)
     if(this.router.url.indexOf("keyUnit/viewunitinfo") != -1){ //查看模式
       this.isEditPattern = false
       this.isediticon = false

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

@@ -691,7 +691,10 @@ export class CollectionToolsComponent implements OnInit {
         this.isShowProperty = false
       }
     }, this)
-
+    AxMessageSystem.addListener('imageResize', (eventName, args1) => {
+      this.assetWidth = args1.Width
+      this.assetHeight = args1.Height
+    }, this)
     this.canvasData.gameMode = GameMode.Assignment
     if (sessionStorage.getItem('editable') == "0") { //查看模式
       this.isEditPattern = false