Browse Source

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

tangshan
陈敬瑜 3 years ago
parent
commit
8610a77e34
  1. 2
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  2. 7
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
  3. 20
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
  4. 2
      src/app/plan-management/entry-plan-look/entry-plan-look.component.html
  5. 3
      src/app/plan-management/entry-plan-look/entry-plan-look.component.scss
  6. 63
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
  7. 16
      src/app/plan-management/entry-plan-look/upLoad.html
  8. 3
      src/app/plan-management/entry-plan-look/upNew.html
  9. 3
      src/app/plan-management/plan-management.module.ts
  10. 4
      src/app/statistic-analysis/home/home.component.ts

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

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

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

20
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 haveNew=false
planMode//预案类型 planMode//预案类型
//index //index
ngOnInit(): void { ngOnInit() {
//this.index = this.getArrayIndex(this.planTemplateData,'单位概况') //this.index = this.getArrayIndex(this.planTemplateData,'单位概况')
this.haveNew=this.route.snapshot.queryParams.haveNew this.haveNew=this.route.snapshot.queryParams.haveNew
this.planMode=this.route.snapshot.queryParams.planMode this.planMode=this.route.snapshot.queryParams.planMode
@ -77,9 +77,14 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
this.selectedItem='封面' this.selectedItem='封面'
this.pattern = 'edit' this.pattern = 'edit'
} }
this.getUnitData() this.getUnitData()
this.getOrganizations() this.getOrganizations()
if(this.route.snapshot.queryParams.xiazai=='true'){
window.setTimeout(()=>{
this.generatingDoc()
},2500)
}
} }
zdysearch = '' zdysearch = ''
organizationName: any //当前单位组织机构名称 organizationName: any //当前单位组织机构名称
@ -2139,7 +2144,12 @@ export class disaster{
this.snackBar.open('请选择类型!','确定',config); this.snackBar.open('请选择类型!','确定',config);
}else if(this.headName==undefined||this.headName==''){ }else if(this.headName==undefined||this.headName==''){
this.snackBar.open('请输入表头名称!','确定',config); 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={ let tree={
json:[], json:[],
name: '' name: ''

2
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> [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)="lookPlan(element)" *ngIf="element.planType == 2 || element.planType == 16 ||element.planType==1">查看</span>
<span (click)="readFile(element)" <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)="deletePlan(element)" *ngIf="element.auditStatus==8">删除</span>
<span (click)="auditResult(element)">审批结果</span> <span (click)="auditResult(element)">审批结果</span>
<span (click)="submitAudit(element)" <span (click)="submitAudit(element)"

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

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

63
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 { STEPPER_GLOBAL_OPTIONS } from '@angular/cdk/stepper';
import Swiper from 'swiper'; import Swiper from 'swiper';
import { resolve } from 'dns'; import { resolve } from 'dns';
import { DomSanitizer } from '@angular/platform-browser';
declare var CryptoJS declare var CryptoJS
@Component({ @Component({
selector: 'app-entry-plan-look', selector: 'app-entry-plan-look',
@ -22,7 +23,7 @@ declare var CryptoJS
styleUrls: ['./entry-plan-look.component.scss'] styleUrls: ['./entry-plan-look.component.scss']
}) })
export class EntryPlanLookComponent implements OnInit { 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; pageEvent: PageEvent;
private _transformer = (node, level: number) => { //初始化tree private _transformer = (node, level: number) => { //初始化tree
return { return {
@ -639,20 +640,31 @@ export class EntryPlanLookComponent implements OnInit {
//读取下载文件信息 //读取下载文件信息
readFile(element) { readFile(element) {
this.uploadFileLonging = element this.uploadFileLonging = element
const dialogRef = this.dialog.open(DownloadFile, { console.log(element)
width: "435px", if(element.planType==16&&(element.planMode==4||element.planMode==2)){
// height:"410px", const dialogRef = this.dialog.open(wenbenUpload, {
data: { fileUrls: element.attachmentUrls, compantData: this.unitdata.unitname, element: element } width: "650px",
}); height:"710px",
dialogRef.afterClosed().subscribe( 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`}
data => { });
if (data) { //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`)
this.downloadFileName = data.fileName }else{
this.download = data const dialogRef = this.dialog.open(DownloadFile, {
this.downloadFile() width: "435px",
// height:"410px",
data: { fileUrls: element.attachmentUrls, compantData: this.unitdata.unitname, element: element }
});
dialogRef.afterClosed().subscribe(
data => {
if (data) {
this.downloadFileName = data.fileName
this.download = data
this.downloadFile()
}
} }
} );
); }
} }
//初始化下载 //初始化下载
@ -1681,7 +1693,7 @@ export class editUpload{
constructor(private http: HttpClient, public dialogRef: MatDialogRef<editUpload>, @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar) { } constructor(private http: HttpClient, public dialogRef: MatDialogRef<editUpload>, @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar) { }
planName: any//预案名称 planName: any//预案名称
ngOnInit(): void { ngOnInit(): void {
console.log(this.data) //console.log(this.data)
} }
onNoClick(): void { onNoClick(): void {
this.dialogRef.close(); this.dialogRef.close();
@ -1694,7 +1706,10 @@ export class editUpload{
objectName: any; //上传对象名 objectName: any; //上传对象名
uploadId: any; //上传分块上传事件编号 uploadId: any; //上传分块上传事件编号
lastyuanData //之前的预案数据 lastyuanData //之前的预案数据
//上传
upload() {
document.getElementById('up').click()
}
//上传文件input //上传文件input
filechange(e) { filechange(e) {
this.file = e.target.files[0] || null //上传的文件 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);
}

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

@ -1,10 +1,18 @@
<div class="upload"> <div class="upload">
<div class="file"> <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>
<div style="margin-top: 20px;margin-left: 20px;"> <!-- <div class="progressBox" *ngIf="uploadisLoading">
<button type="button" mat-button (click)="startUploading()" >确定</button>
<button type="button" mat-button (click)="onNoClick()" style="margin-left: 10px;">取消</button> <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>
</div> </div>

3
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>

3
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 {ChangeUrl} from './entry-plan-look/entry-plan-look.component'
import {adddwsurveys} from './create-plan-online-five/create-plan-online-five.component' import {adddwsurveys} from './create-plan-online-five/create-plan-online-five.component'
import { editUpload } from './entry-plan-look/entry-plan-look.component' import { editUpload } from './entry-plan-look/entry-plan-look.component'
import { wenbenUpload } from './entry-plan-look/entry-plan-look.component'
@NgModule({ @NgModule({
declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent, AddPlanone, PlanType, AuditSatus, PlanLevel, DownloadFile, AuditResult, ChangeName, declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent, AddPlanone, PlanType, AuditSatus, PlanLevel, DownloadFile, AuditResult, ChangeName,
WebLookComponent, OnetwoEntryPlanComponent, newunitComponent, MeetPlanComponent, newunitMeet, TypePlanComponent, newunitType, PsViewer, onetwoAuditResult, meetAuditResult, WebLookComponent, OnetwoEntryPlanComponent, newunitComponent, MeetPlanComponent, newunitMeet, TypePlanComponent, newunitType, PsViewer, onetwoAuditResult, meetAuditResult,
typeAuditResult, MaintainUpComponent, GkPsViewer, GkhtmlPsViewer, UnitInfo, ReinforcePlanComponent, state, ImgDetails, CreatePlanOnlineFiveComponent, CreatePlanOnlineThreeComponent, 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: [ imports: [
CommonModule, CommonModule,
PlanManagementRoutingModule, PlanManagementRoutingModule,

4
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`) await this.emitService.getData(paramsdata, `/api/StatisticsAnalysis/BuildingTypes`)
this.keyUnit() this.keyUnit()
} }
//获取年度完成情况数据
getYearData(){
}
threePlan() { threePlan() {

Loading…
Cancel
Save