[修改]在线编制预案下载，消防设施模块修改

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

@@ -302,7 +302,7 @@ export class WaitExamineerComponent implements OnInit {
         this.companyId = data.companyId
         this.companyName = data.companyName
         if (data.planType != 2 && data.planType != 1) {
-          if (data.planMode == 2) {
+          if (data.planMode == 2 ||data.planMode==4) {
             this.showtype = 0
             this.bianzhi = true
             this.src = `/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`

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html

@@ -437,7 +437,8 @@
                         *ngIf="item.groupName!='单位概况'&&item.groupName!='交通水源'&&item.groupName!='重点图示'&&item.groupName!='预案附件'&&item.groupName!='封面'">
                         <div  class="titleItem">
                             <span *ngIf="item.new==undefined">{{item.groupName}}</span>
-                            <input type="text" placeholder="请输入内容" [(ngModel)]="item.headName" *ngIf="item.new!=undefined">
+                            <input type="text" placeholder="请输入内容" [(ngModel)]="item.headName" *ngIf="item.new!=undefined&&pattern == 'edit'">
+                            <span *ngIf="item.new!=undefined&&pattern != 'edit'">{{item.headName}}</span>
                             <img src="../../../assets/images/add.png" (click)='addAttribute(item.groupName)' *ngIf="pattern == 'edit'&&item.new!=undefined">
                         </div>
                         
@@ -866,12 +867,12 @@
                                                                     height: 40px;
                                                                     width: 40%;
                                                                     font-size: 16px;
-                                                                    text-align: center;">{{info.name}}</th>
+                                                                    text-align: center;" *ngIf="info.completed">{{info.name}}</th>
                                                                     <td style="border: 1px solid #999;
                                                                     height: 40px;
                                                                     width: 60%;
                                                                     font-size: 16px;
-                                                                    text-align: center;">{{info.value}}</td>
+                                                                    text-align: center;" *ngIf="info.completed">{{info.value}}</td>
                                                                   </tr>
                                                             </table>
                                                         </div>

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts

@@ -62,7 +62,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
   haveNew=false
   planMode//预案类型
   //index
-  ngOnInit(): void {
+   ngOnInit() {
     //this.index = this.getArrayIndex(this.planTemplateData,'单位概况')
     this.haveNew=this.route.snapshot.queryParams.haveNew
     this.planMode=this.route.snapshot.queryParams.planMode
@@ -79,8 +79,13 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
     }
      this.getUnitData()
      this.getOrganizations()
+    if(this.route.snapshot.queryParams.xiazai=='true'){
+      window.setTimeout(()=>{
+        this.generatingDoc()
+      },2500)
       
     }
+  }
   zdysearch = ''
   organizationName: any //当前单位组织机构名称
   treedata: any //组织机构树型数据
@@ -2139,7 +2144,12 @@ export class disaster{
       this.snackBar.open('请选择类型!','确定',config);
     }else if(this.headName==undefined||this.headName==''){
       this.snackBar.open('请输入表头名称!','确定',config);
-    }else{
+    }else if(this.level==2&& (this.lieNumber==undefined||this.lieNumber=='')){
+      this.snackBar.open('请输入列数!','确定',config);
+    }else if(this.level==2&& (this.hNumber==undefined||this.hNumber=='')){
+      this.snackBar.open('请输入行数!','确定',config);
+    }
+    else{
       let tree={
         json:[],
         name: ''

src/app/plan-management/entry-plan-look/entry-plan-look.component.html

@@ -102,7 +102,7 @@
                             [ngClass]="{'grey': !(element.auditStatus!='16' && element.auditStatus != '1' )}">编辑</span>
                         <span (click)="lookPlan(element)" *ngIf="element.planType == 2 || element.planType == 16 ||element.planType==1">查看</span>
                         <span (click)="readFile(element)"
-                            [ngClass]="{'grey': element.planMode == '2' || element.planMode == '3'}">下载</span>
+                            [ngClass]="{'grey':element.planMode == '3'}">下载</span>
                         <span (click)="deletePlan(element)" *ngIf="element.auditStatus==8">删除</span>
                         <span (click)="auditResult(element)">审批结果</span>
                         <span (click)="submitAudit(element)"

src/app/plan-management/entry-plan-look/entry-plan-look.component.scss

@@ -217,4 +217,7 @@
     height: 100%;
     display: flex;
     flex-direction: column;
+    .file{
+        text-align: center;
+    }
 }

src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@@ -15,6 +15,7 @@ import { Viewer } from 'photo-sphere-viewer';
 import { STEPPER_GLOBAL_OPTIONS } from '@angular/cdk/stepper';
 import Swiper from 'swiper';
 import { resolve } from 'dns';
+import { DomSanitizer } from '@angular/platform-browser';
 declare var CryptoJS
 @Component({
   selector: 'app-entry-plan-look',
@@ -22,7 +23,7 @@ declare var CryptoJS
   styleUrls: ['./entry-plan-look.component.scss']
 })
 export class EntryPlanLookComponent implements OnInit {
-  constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, private tree: TreeService, public dialog: MatDialog, public snackBar: MatSnackBar) { }
+  constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, private tree: TreeService, public dialog: MatDialog, public snackBar: MatSnackBar, private sanitizer: DomSanitizer) { }
   pageEvent: PageEvent;
   private _transformer = (node, level: number) => {   //初始化tree
     return {
@@ -639,6 +640,15 @@ export class EntryPlanLookComponent implements OnInit {
   //读取下载文件信息
   readFile(element) {
     this.uploadFileLonging = element
+    console.log(element)
+    if(element.planType==16&&(element.planMode==4||element.planMode==2)){
+      const dialogRef = this.dialog.open(wenbenUpload, {
+        width: "650px",
+        height:"710px",
+        data: {src:`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${element.name}&unitName=${this.unitdata.unitname}&planCategory=${element.planCategory}&planId=${element.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=false&xiazai=true`}
+      });
+      //window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${element.name}&unitName=${this.unitdata.unitname}&planCategory=${element.planCategory}&planId=${element.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=false&xiazai=true`)
+    }else{
       const dialogRef = this.dialog.open(DownloadFile, {
         width: "435px",
         // height:"410px",
@@ -655,6 +665,8 @@ export class EntryPlanLookComponent implements OnInit {
       );
     }
     
+  }
+
   //初始化下载
   downloadFile() {
     this.downloadProgress = 0
@@ -1681,7 +1693,7 @@ export class editUpload{
   constructor(private http: HttpClient, public dialogRef: MatDialogRef<editUpload>, @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar) { }
   planName: any//预案名称
   ngOnInit(): void {
-    console.log(this.data)
+    //console.log(this.data)
   }
   onNoClick(): void {
     this.dialogRef.close();
@@ -1694,7 +1706,10 @@ export class editUpload{
   objectName: any; //上传对象名
   uploadId: any; //上传分块上传事件编号
   lastyuanData //之前的预案数据
-  
+  //上传
+  upload() {
+    document.getElementById('up').click()
+  }
 //上传文件input
 filechange(e) {
   this.file = e.target.files[0] || null //上传的文件
@@ -1852,3 +1867,19 @@ filechange(e) {
     })
   }
 }
+//在线编制文本预案下载
+@Component({
+  selector: 'wenbenUpload',
+  templateUrl: './upNew.html',
+  styleUrls: ['./entry-plan-look.component.scss']
+})
+export class wenbenUpload{
+  constructor(private http: HttpClient, public dialogRef: MatDialogRef<wenbenUpload>, @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar, private sanitizer: DomSanitizer) { }
+  ngOnInit(): void {
+    console.log(this.data)
+    window.setTimeout(()=>{
+      this.dialogRef.close();
+    },5000)
+  }
+  src=this.sanitizer.bypassSecurityTrustResourceUrl(this.data.src);
+}

src/app/plan-management/entry-plan-look/upLoad.html

@@ -1,10 +1,18 @@
 <div class="upload">
     <div class="file">
-        <input type="file" (change)="filechange($event)" accept=".doc,.txt,.docx,.pdf">
+        <button mat-raised-button color="primary" (click)='upload()'><img style="margin-bottom: 2px;" src="../../../assets/images/bendi.png"> 重新上传文件</button>
+        <input id="up" style="display: none;" type="file" (change)="filechange($event)" accept=".doc,.txt,.docx,.pdf">
+        <label style="font-size: 10px;">{{file==undefined?'':file.name}}</label>
     </div>
-    <div style="margin-top: 20px;margin-left: 20px;">
-        <button type="button" mat-button (click)="startUploading()" >确定</button>
-        <button type="button" mat-button (click)="onNoClick()" style="margin-left: 10px;">取消</button>
+    <!-- <div class="progressBox" *ngIf="uploadisLoading">
+                  
+        <span style="font-size: 13px;">上传中...</span>
+        <mat-progress-bar mode="determinate" [value]="uploadProgress" class="progress" style="width: 320px;left: 64px;"></mat-progress-bar>
+        
+      </div> -->
+    <div style="margin-top: 20px;text-align: center;">
+        <button  mat-raised-button (click)="startUploading()" >确定</button>
+        <button  mat-raised-button (click)="onNoClick()" style="margin-left: 10px;">取消</button>
     </div>
     
 </div>

src/app/plan-management/entry-plan-look/upNew.html

@@ -0,0 +1,3 @@
+<div style="height: 100%;width: 100%;">
+    <iframe [src]="src" style="width: 100%;height: 100%;"></iframe>
+</div>

src/app/plan-management/plan-management.module.ts

@@ -76,12 +76,13 @@ import { updataHl } from './create-plan-online-five/create-plan-online-five.comp
 import {ChangeUrl} from  './entry-plan-look/entry-plan-look.component'
 import {adddwsurveys} from './create-plan-online-five/create-plan-online-five.component'
 import { editUpload } from './entry-plan-look/entry-plan-look.component'
+import { wenbenUpload } from './entry-plan-look/entry-plan-look.component'
 
 @NgModule({
   declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent, AddPlanone, PlanType, AuditSatus, PlanLevel, DownloadFile, AuditResult, ChangeName,
     WebLookComponent, OnetwoEntryPlanComponent, newunitComponent, MeetPlanComponent, newunitMeet, TypePlanComponent, newunitType, PsViewer, onetwoAuditResult, meetAuditResult,
     typeAuditResult, MaintainUpComponent, GkPsViewer, GkhtmlPsViewer, UnitInfo, ReinforcePlanComponent, state, ImgDetails, CreatePlanOnlineFiveComponent, CreatePlanOnlineThreeComponent,
-     OpenPlanToolDialog,yinYong,newTitle,disaster,updataHl,ChangeUrl,adddwsurveys,editUpload],
+     OpenPlanToolDialog,yinYong,newTitle,disaster,updataHl,ChangeUrl,adddwsurveys,editUpload,wenbenUpload],
   imports: [
     CommonModule,
     PlanManagementRoutingModule,

src/app/statistic-analysis/home/home.component.ts

@@ -58,6 +58,10 @@ export class HomeComponent implements OnInit {
         await this.emitService.getData(paramsdata, `/api/StatisticsAnalysis/BuildingTypes`)
         this.keyUnit()
     }
+    //获取年度完成情况数据
+    getYearData(){
+        
+    }
 
 
     threePlan() {