[新增]增加水源采集提交审核按钮

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="state" *ngIf="waterData.verifyState == 0">(待审核)</span>
-                    <span class="submitAudit"><mat-icon>open_in_browser</mat-icon>提交审核</span>
+                    <span class="state" style="color: rgb(92, 214, 78);" *ngIf="waterData.verifyState == 1">(审核通过)</span>
+                    <span class="state" *ngIf="waterData.verifyState == 2">(审核驳回)</span>
+                    
+                    <span class="submitAudit" *ngIf="waterData.verifyState != 0 && waterData.verifyState != 1" (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="save state" *ngIf="waterData.verifyState == 2 || waterData.verifyState != 0 && waterData.verifyState != 1" (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: 0,
+      }
+      this.http.post('/api/ContentVerifies',body).subscribe((data) => {
+        console.log('提交成功',data)
+        this.waterData.verifyState = 0
+      })
+    }
+   
+  }
+  //撤销审核
+  cancelAudit(){
+    
   }
   //关闭
   close(){

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

@@ -59,7 +59,7 @@
                             <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'?

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

@@ -155,7 +155,7 @@ export class WaitExamineerComponent implements OnInit {
   viewer//全景图对象
   radioClick(e,item){
     //e.target.parentElement.bgColor='#2196F3'
-    //console.log(e,item)
+    console.log(e,item)
     this.organizationName=''
     this.id=item.id
     this.fetchUrl=''
@@ -195,7 +195,7 @@ export class WaitExamineerComponent implements OnInit {
       }
       
       
-     })
+    })
       
     if(e.checked){
       this.shenheTable.push(item)

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

@@ -1353,7 +1353,6 @@ export class CollectionToolsBuildingComponent implements OnInit {
     });
     this.dataSource.data = treeData
     this.treeControl.expandAll()
-    
   }
 
   //点击树节点
@@ -1493,11 +1492,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){
+    // for(let key in companyBuildingData.data){
-      if (companyBuildingData.data[key].FloorId === beforeOneId) { //处理 单位/建筑 数据是否归于当前楼层下
+    //   if (companyBuildingData.data[key].FloorId === beforeOneId) { //处理 单位/建筑 数据是否归于当前楼层下
-        storeyData.data[key] = companyBuildingData.data[key]
+    //     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) {