[新增]审核页面水源审核的显示

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

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

@@ -441,11 +441,11 @@ export class WaterCollectionComponent implements OnInit {
         operation: this.waterData.verifyState == -1 ? 0 : 1,//操作方式
         contentType: 12,//水源类型
         itemId: this.waterData.id,
-        verifyState: 0,
+        verifyState: 3,
       }
       this.http.post('/api/ContentVerifies',body).subscribe((data) => {
         console.log('提交成功',data)
-        this.waterData.verifyState = 0
+        this.waterData.verifyState = 3
       })
     }
    

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

@@ -268,17 +268,17 @@
         </div>
       </div>
       <!-- 水源审核 -->
-      <!-- <div class="waterAudit">
+      <div class="waterAudit" *ngIf="showtype == 12">
-        <app-water-audit></app-water-audit>
+        <app-water-audit [waterData]="waterData"></app-water-audit>
-      </div> -->
+      </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.ts

@@ -153,6 +153,7 @@ export class WaitExamineerComponent implements OnInit {
   }
   //radio点击事件
   viewer//全景图对象
+  waterData:any//需要传递给子组件的水源信息
   radioClick(e,item){
     this.showtype = -1
     //e.target.parentElement.bgColor='#2196F3'
@@ -164,6 +165,15 @@ export class WaitExamineerComponent implements OnInit {
     if(item.contentType == 11){
       this.showtype = 3
       sessionStorage.setItem('companyId',item.itemId)
+    }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
@@ -347,7 +357,6 @@ export class WaitExamineerComponent implements OnInit {
             })
           }
         }
-        
       }
       //批量审核
       else{

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,6 +15,7 @@ export class WaterAuditComponent implements OnInit {
   '   <img style="width:20px;height:24px" src="/assets/images/定位.png">' +
   '</div>'
   ngOnInit(): void {
+    console.log(7777,this.waterData)
     this.waterData.detailData = JSON.parse(this.waterData.detailData)
     this.fireCockData = this.waterData.detailData
     console.log(789, this.fireCockData)
@@ -42,23 +43,23 @@ export class WaterAuditComponent implements OnInit {
   fireCockData:any = []//消火栓详情
   poolData:any = []//水池详情
   naturalWaterData:any = []//天然水源详情
-  waterData:any = {
+  // waterData:any = {
-    id: "60125d31d31fab7de81c56b0",
+  //   id: "60125d31d31fab7de81c56b0",
-    name: "上海中心消火栓01",
+  //   name: "上海中心消火栓01",
-    administrativeRegion: "上海区",
+  //   administrativeRegion: "上海区",
-    governmentLevel: "1",
+  //   governmentLevel: "1",
-    village: "小高社区",
+  //   village: "小高社区",
-    address: "国际会议中心",
+  //   address: "国际会议中心",
-    location: {
+  //   location: {
-      x: 121.496717,
+  //     x: 121.496717,
-      y: 31.239452
+  //     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\":\"突突突突突突\"}]",
+  //   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,
+  //   detailItems: null,
-    createTime: "2021-02-03T02:36:57.451Z",
+  //   createTime: "2021-02-03T02:36:57.451Z",
-    creatorId: "5e8eced2aaca5f7c1025309b",
+  //   creatorId: "5e8eced2aaca5f7c1025309b",
-    deleted: false,
+  //   deleted: false,
-    waterSourceType: 0,
+  //   waterSourceType: 0,
-    integrityScore: 0.21052632
+  //   integrityScore: 0.21052632
-  }
+  // }
 }