[新增]待审核和审核记录新增预案编制查看

3 years ago · 63c2cb2889
5 changed files with 66 additions and 32 deletions
--- a/src/app/plan-audit/plan-record/plan-record.component.html
+++ b/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-04-21 15:24:43
+ * @LastEditTime: 2021-07-08 09:25:11
 -->
 <div class="box">
    <div class="boxleft">
@ -172,7 +172,7 @@
        </mat-tab-group>
      </div>
      
-        <div class="word" *ngIf="showtype==0">
+        <div class="word" *ngIf="showtype==0||bianzhi">
          <button mat-raised-button color="primary" style="float: right;margin-top: 10px;margin-right: 15px;" (click)='lookNew()'>查看详情</button>
          <iframe [src]='iframeSrc'></iframe>
        </div>
--- a/src/app/plan-audit/plan-record/plan-record.component.ts
+++ b/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-04-22 10:47:06
+ * @LastEditTime: 2021-07-08 09:35:53
 */
 import { Component, OnInit,Inject } from '@angular/core';
 import { FormControl } from '@angular/forms';
@ -132,6 +132,7 @@ export class PlanRecordComponent implements OnInit {
  LinkageForceDetailInfo:any//需要传递给子组件的联动力量信息
  fireForceDetailInfo:any//需要传递给子组件的消防力量信息
  postlevel:any
+  bianzhi=false
  tableClick(e,item){
    this.showtype = -1
    //e.target.parentElement.bgColor='#2196F3'
@ -142,17 +143,20 @@ export class PlanRecordComponent implements OnInit {
    this.fetchUrl=''
    this.viewer={}
    if(item.contentType == 11){
+      this.bianzhi=false
      window.setTimeout(()=>{
        this.showtype = 3
        sessionStorage.setItem('companyId',item.itemId)
      },0)
    }else if(item.contentType == 12){
+      this.bianzhi=false
      //水源
      this.http.get(`/api/WaterSources/${item.itemId}`).subscribe((data)=>{
        this.waterData = data
        this.showtype = 12
      })
    }else if(item.contentType == 13){
+      this.bianzhi=false
      //消防力量
      this.http.get(`/api/CustomFireForce/${item.itemId}`).subscribe((data:any)=>{
        if(data.forceType != 0){//如果是其他消防力量
@ -166,6 +170,7 @@ export class PlanRecordComponent implements OnInit {
        this.showtype = 13
      })
    }else if(item.contentType == 14){
+      this.bianzhi=false
      //联动力量
      this.http.get(`/api/LinkageForces/${item.itemId}`).subscribe((data:any)=>{

@ -177,38 +182,46 @@ export class PlanRecordComponent implements OnInit {
      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=''
+        if(data.planMode==2){
+          this.bianzhi=true
+          this.src=`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${data.companyId}&planName=${data.name}&unitName=${data.companyName}&planCategory=${data.planCategory}&planId=${data.id}&unitTypeId=${data.company.buildingTypes[0].id}&orName=${data.company.organizationName}&orId=${data.company.organizationId}&pattern=false`
+          //this.src=`/keyUnit/viewunitinfoplan?id=${data.companyId}&orName=${data.company.organizationId}&orId=${data.company.organizationName}`
+        }else{
+          this.bianzhi=false
+          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`)
        }
        
        
+        
       })
    }
    
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
@ -91,7 +91,7 @@
    <div class="righthead">
      <div class="rightheadtwo">
        <button mat-raised-button color="primary" style="float: right;" (click)='lookNew()'
-          *ngIf="showtype == 0">查看详情</button>
+          *ngIf="showtype == 0||bianzhi">查看详情</button>
        <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;"
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
+++ b/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-06-04 10:14:51
+ * @LastEditTime: 2021-07-08 09:32:41
 */
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
@ -165,6 +165,7 @@ export class WaitExamineerComponent implements OnInit {
  differentContentOfBuildingsInfo: any//当前单位变更数据 之 建筑信息
  differentContentOfFunction: any = []//当前单位变更数据 之 功能分区
  differentContentOfPicture: any//当前单位变更数据 之 实景图
+  bianzhi=false
  radioClick(e, item) {
    this.selectedItem = item
    console.log(item)
@ -209,18 +210,22 @@ export class WaitExamineerComponent implements OnInit {
    this.id = item.id
    this.fetchUrl = ''
    this.viewer = {}
+    
    if (item.contentType == 11) {
+      this.bianzhi=false
      window.setTimeout(() => {
        this.showtype = 3
        sessionStorage.setItem('companyId', item.itemId)
      }, 0)
    } else if (item.contentType == 12) {
+      this.bianzhi=false
      //水源
      this.http.get(`/api/WaterSources/${item.itemId}`).subscribe((data) => {
        this.waterData = data
        this.showtype = 12
      })
    } else if (item.contentType == 13) {
+      this.bianzhi=false
      //消防力量
      this.http.get(`/api/CustomFireForce/${item.itemId}`).subscribe((data: any) => {
        if (data.forceType != 0) {//如果是其他消防力量
@ -242,6 +247,7 @@ export class WaitExamineerComponent implements OnInit {

      })
    } else if (item.contentType == 14) {
+      this.bianzhi=false
      //联动力量
      this.http.get(`/api/LinkageForces/${item.itemId}`).subscribe((data: any) => {

@ -251,9 +257,16 @@ export class WaitExamineerComponent implements OnInit {
      })
    } else {
      this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data: any) => {
+        //console.log(data)
        this.companyId = data.companyId
        this.companyName = data.companyName
        if (data.planType != 2 && data.planType != 1) {
+          if(data.planMode==2){
+            this.bianzhi=true
+            this.src=`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${data.companyId}&planName=${data.name}&unitName=${data.companyName}&planCategory=${data.planCategory}&planId=${data.id}&unitTypeId=${data.company.buildingTypes[0].id}&orName=${data.company.organizationName}&orId=${data.company.organizationId}&pattern=false`
+            //this.src=`/keyUnit/viewunitinfoplan?id=${data.companyId}&orName=${data.company.organizationId}&orId=${data.company.organizationName}`
+          }else{
+            this.bianzhi=false
          this.fetchUrl = data.attachmentUrls[0]
          var index = this.fetchUrl.indexOf("\/")
          if (this.fetchUrl.substr(0, index) == 'psw') {
@ -273,7 +286,10 @@ export class WaitExamineerComponent implements OnInit {
          } else {
            this.lookWord()
          }
+          }
+          
        } else {
+          this.bianzhi=false
          this.organizationName = item.organizationName
          this.planData = data
          this.handleData()
--- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
+++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
@ -4,7 +4,7 @@
 * @Author: sueRimn
 * @Date: 2021-06-16 13:56:54
 * @LastEditors: sueRimn
- * @LastEditTime: 2021-07-05 15:36:30
+ * @LastEditTime: 2021-07-08 09:36:32
 */
 import { HttpClient } from '@angular/common/http';
 import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core';
@ -26,6 +26,11 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
  planLevel: string//预案级别
  ngOnInit(): void {
    this.planLevel = this.route.snapshot.queryParams.planCategory
+    if(this.route.snapshot.queryParams.pattern=='false'){
+      this.pattern='look'
+    }else{
+      this.pattern='edit'
+    }
    this.getUnitData()
    //this.getAllBuildings()
    this.tree = {