shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

tangshan
邵佳豪 3 years ago
parent
9132f7dc1d fe17cce6ec
commit
80b833467e
41 changed files with 1148 additions and 451 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 55
      src/app/gis-management/gis-labeling/gis-labeling.component.ts
  2. 2
      src/app/gis-management/gis-labeling/lookPlan.html
  3. 16
      src/app/key-unit/key-unit-management/key-unit-management.component.html
  4. 11
      src/app/key-unit/key-unit-management/key-unit-management.component.scss
  5. 20
      src/app/key-unit/key-unit-management/key-unit-management.component.ts
  6. 21
      src/app/plan-audit/plan-record/plan-record.component.html
  7. 13
      src/app/plan-audit/plan-record/plan-record.component.scss
  8. 4
      src/app/plan-audit/plan-record/plan-record.component.ts
  9. 98
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  10. 14
      src/app/plan-audit/wait-examineer/wait-examineer.component.scss
  11. 4
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  12. 33
      src/app/plan-management/create-plan-online-five/addattinf.html
  13. 41
      src/app/plan-management/create-plan-online-five/addgroup.scss
  14. 359
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
  15. 336
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
  16. 1
      src/app/plan-management/entry-plan-look/AddPlanone.html
  17. 17
      src/app/plan-management/entry-plan-look/entry-plan-look.component.html
  18. 10
      src/app/plan-management/entry-plan-look/entry-plan-look.component.scss
  19. 170
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
  20. 10
      src/app/plan-management/entry-plan/entry-plan.component.scss
  21. 10
      src/app/plan-management/entry-plan/entry-plan.component.ts
  22. 33
      src/app/plan-management/meet-plan/meet-plan.component.html
  23. 12
      src/app/plan-management/meet-plan/meet-plan.component.scss
  24. 31
      src/app/plan-management/meet-plan/meet-plan.component.ts
  25. 29
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
  26. 42
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
  27. 17
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
  28. 28
      src/app/plan-management/open-plan/open-plan.component.html
  29. 10
      src/app/plan-management/open-plan/open-plan.component.scss
  30. 8
      src/app/plan-management/open-plan/open-plan.component.ts
  31. 28
      src/app/plan-management/pass-plan/pass-plan.component.html
  32. 10
      src/app/plan-management/pass-plan/pass-plan.component.scss
  33. 10
      src/app/plan-management/pass-plan/pass-plan.component.ts
  34. 3
      src/app/plan-management/plan-management.module.ts
  35. 28
      src/app/plan-management/reinforce-plan/reinforce-plan.component.html
  36. 10
      src/app/plan-management/reinforce-plan/reinforce-plan.component.scss
  37. 10
      src/app/plan-management/reinforce-plan/reinforce-plan.component.ts
  38. 15
      src/app/plan-management/type-plan/type-plan.component.html
  39. 10
      src/app/plan-management/type-plan/type-plan.component.scss
  40. 16
      src/app/plan-management/type-plan/type-plan.component.ts
  41. 4
      src/app/ui/collection-tools-plan/addPlaneFigure.html

55
src/app/gis-management/gis-labeling/gis-labeling.component.ts
Unescape View File

@ -1577,7 +1577,7 @@ export class LookPlanDialog {
ngOnInit() { ngOnInit() {
// console.log(this.data) console.log(this.data)
this.getAllPlans() this.getAllPlans()
} }
//关闭弹窗 //关闭弹窗
@ -1603,7 +1603,7 @@ export class LookPlanDialog {
} }
//查看预案 //查看预案
lookPlan(e) { lookPlan(e) {
if (e.planMode == 0) { /* if (e.planMode == 0) {
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
@ -1636,7 +1636,56 @@ export class LookPlanDialog {
window.open(`/planManagement/webLook`) window.open(`/planManagement/webLook`)
} }
} }
} } */
let companyId = sessionStorage.getItem("companyId")
if (e.planType == 16 || e.planType == 4 || e.planType == 8) {
if (e.planType == 16&&e.attachmentUrls == null){
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${companyId}&planName=${e.name}&unitName=${this.data.name}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.data.buildingTypes[0].id}&orName=${this.data.organizationName}&pattern=false`)
}else{
var index = e.attachmentUrls[0].indexOf("\/")
let fetchUrl = e.attachmentUrls[0]
//console.log(fetchUrl)
if (fetchUrl) {
let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase()
if (suffix == 'docx' || suffix == 'doc') {
let arr = fetchUrl.split('.')
arr[arr.length - 1] = 'pdf'
window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
} else if (suffix == 'pdf') {
window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
} else {
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('该文件类型暂不支持在线查看', '确定', config);
}
}
}
}
if (e.planType == 1) { //如果是在线编辑
let id = e.id
sessionStorage.setItem("planId", id)
//sessionStorage.setItem("companyId", companyId)
sessionStorage.setItem("buildingTypeId", this.data.buildingTypes[0].id)
sessionStorage.setItem("editable", "0")
sessionStorage.setItem("planName", e.name)
let companyId = sessionStorage.getItem("companyId")
window.open(`/keyUnit/viewunitinfoplan?id=${companyId}`)
}
if (e.planType == 2) { //如果是跳转网页
if (e.url.indexOf('app') == 0) {
window.location.href = e.url
} else {
sessionStorage.setItem("url", e.url)
if ((e.url as string).includes('gis/threeDimensionalHome')) { //三维预案
window.open(`${e.url}?unitId=${this.data.id}&unitName=${this.data.name}&editMode=false`)
} else {
window.open(`/planManagement/webLook`)
}
}
}
} }
//点击下载 //点击下载

2
src/app/gis-management/gis-labeling/lookPlan.html
Unescape View File

@ -37,7 +37,7 @@
<td>{{item.planLevel | planlevel}}</td> <td>{{item.planLevel | planlevel}}</td>
<td> <td>
<span class="btn" (click)="lookPlan(item)">查看</span> <span class="btn" (click)="lookPlan(item)">查看</span>
<span class="btn" (click)="readFile(item)" [ngClass]="{'grey': item.planMode == '1' || item.planMode == '2' || item.planMode == '3'}">下载</span> <span class="btn" (click)="readFile(item)" [ngClass]="{'grey': item.planMode != '1'}">下载</span>
</td> </td>
</tr> </tr>
</table> </table>

16
src/app/key-unit/key-unit-management/key-unit-management.component.html
Unescape View File

@ -332,12 +332,26 @@
{{element.modifiedTime|date:'yyyy-MM-dd'}} {{element.modifiedTime|date:'yyyy-MM-dd'}}
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="addstate">
<th mat-header-cell *matHeaderCellDef>新增审核</th>
<td mat-cell *matCellDef="let element">
{{element.newVerifyState}}
<!-- {{element.contentVerify==4?'审核通过':element.contentVerify==5?'审核退回':''}} -->
</td>
</ng-container>
<ng-container matColumnDef="weihustate">
<th mat-header-cell *matHeaderCellDef>维护审核</th>
<td mat-cell *matCellDef="let element">
{{element.maintenanceVerifyState}}
</td>
</ng-container>
<ng-container matColumnDef="operation"> <ng-container matColumnDef="operation">
<th mat-header-cell *matHeaderCellDef>操作</th> <th mat-header-cell *matHeaderCellDef>操作</th>
<td mat-cell *matCellDef="let element" class="operation"> <td mat-cell *matCellDef="let element" class="operation">
<span (click)="unitdetails(element)">查看详情</span> <span (click)="unitdetails(element)">查看详情</span>
<span style="color: blue;margin-left: 4px;" <span style="color: blue;margin-left: 4px;"
*ngIf="element.contentVerify==null||element.contentVerify.verifyState==-1||element.contentVerify.verifyState==1||element.contentVerify.verifyState==2||element.contentVerify.verifyState==4||element.contentVerify.verifyState==5" *ngIf="(element.isNewData && (element.newVerifyState=='未提交审核'||element.newVerifyState=='审核通过'
||element.newVerifyState=='审核退回'))||(!element.isNewData&&(element.maintenanceVerifyState=='审核通过'||element.maintenanceVerifyState=='未提交审核'||element.maintenanceVerifyState=='审核退回'))"
(click)='submitAudit(element)'>提交审核</span> (click)='submitAudit(element)'>提交审核</span>
<span style="color: blue;margin-left: 4px;" <span style="color: blue;margin-left: 4px;"
*ngIf="element.contentVerify!=null&&(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3) " *ngIf="element.contentVerify!=null&&(element.contentVerify.verifyState==0||element.contentVerify.verifyState==3) "

11
src/app/key-unit/key-unit-management/key-unit-management.component.scss
Unescape View File

@ -93,6 +93,8 @@
} }
.tablebox{ .tablebox{
.add{ .add{
cursor:auto;
text-decoration: none;
display: block; display: block;
width: 40px; width: 40px;
height: 20px; height: 20px;
@ -100,16 +102,19 @@
font-size: 12px; font-size: 12px;
line-height: 20px; line-height: 20px;
color: #FFFFFF; color: #FFFFFF;
margin-left: 50px; margin-left: 60px;
} }
.weihu{ .weihu{
//display: block; cursor:auto;
text-decoration: none;
display: block;
width: 64px; width: 64px;
height: 20px; height: 20px;
background: #2196F3; background: #FFC94B;
font-size: 12px; font-size: 12px;
color: #FFFFFF; color: #FFFFFF;
line-height: 20px; line-height: 20px;
margin-left: 50px;
} }
table{ table{
width: 100%; width: 100%;

20
src/app/key-unit/key-unit-management/key-unit-management.component.ts
Unescape View File

@ -67,7 +67,7 @@ export class KeyUnitManagementComponent implements OnInit {
pageSizeOptions: number[] = [10] //设置每页条数 pageSizeOptions: number[] = [10] //设置每页条数
PageNumber:any //第几页 PageNumber:any //第几页
displayedColumns: string[] = ['checked','Follow','state','unitname','integrity','jurisdictionsquadron', 'unittype','scc', 'time','operation']; displayedColumns: string[] = ['checked','Follow','state','unitname','integrity','jurisdictionsquadron', 'unittype','scc', 'time','addstate','weihustate','operation'];
tabledataSource:any tabledataSource:any
allorganizations:any allorganizations:any
oldDataSource:any; //原始表格数据 oldDataSource:any; //原始表格数据
@ -354,7 +354,7 @@ export class KeyUnitManagementComponent implements OnInit {
] ]
allKeyUnitInfo:any //所有的重点单位 allKeyUnitInfo:any //所有的重点单位
IsNewData=true//是否是新增或者维护更新 IsNewData=''//是否是新增或者维护更新
getAllKeyUnit(){ getAllKeyUnit(){
// console.log(Boolean(Number(this.follow))) // console.log(Boolean(Number(this.follow)))
let follow let follow
@ -384,6 +384,7 @@ export class KeyUnitManagementComponent implements OnInit {
IntegrityScoreMax:this.integrityScoreMax/100||1 IntegrityScoreMax:this.integrityScoreMax/100||1
} }
this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{ this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{
console.log(data)
this.length = data.totalCount this.length = data.totalCount
this.allKeyUnitInfo = data this.allKeyUnitInfo = data
// data.items.sort( (a,b) => { // data.items.sort( (a,b) => {
@ -393,7 +394,7 @@ export class KeyUnitManagementComponent implements OnInit {
item.integrity = this.wanzhengduArr[index] item.integrity = this.wanzhengduArr[index]
}) })
//console.log(789,data.items) //console.log(789,data.items)
this.tabledataSource = new MatTableDataSource(data.items); this.tabledataSource = data.items
}) })
} }
//得到当前单位信息 //得到当前单位信息
@ -652,6 +653,8 @@ export class KeyUnitManagementComponent implements OnInit {
this.integritySort = '' this.integritySort = ''
this.integrityScoreMax=undefined this.integrityScoreMax=undefined
this.integrityScoreMin=undefined this.integrityScoreMin=undefined
this.IsNewData=''
this.getAllKeyUnit(); this.getAllKeyUnit();
} }
//编辑单位名称 //编辑单位名称
@ -681,14 +684,7 @@ export class KeyUnitManagementComponent implements OnInit {
onSubmit(value){ onSubmit(value){
this.PageNumber = 1 this.PageNumber = 1
this.pageEvent.pageIndex = 0 this.pageEvent.pageIndex = 0
const config = new MatSnackBarConfig(); this.getAllKeyUnit()
config.verticalPosition = 'top';
config.duration = 3000
if(this.integrityScoreMax<this.integrityScoreMin){
this.snackBar.open('最大值不能小于最小值!','确定',config);
}else{
this.getAllKeyUnit();
}
} }
bigclosediv(e){ bigclosediv(e){
@ -748,7 +744,7 @@ export class KeyUnitManagementComponent implements OnInit {
console.log(element) console.log(element)
let body:any = { let body:any = {
title:element.name, title:element.name,
Operation:element.contentVerify==null? 0:1, Operation:element.contentVerify==null&&element.isNewData? 0:1,
itemId:element.id, itemId:element.id,
verifyState:3, verifyState:3,
contentType:11 contentType:11

21
src/app/plan-audit/plan-record/plan-record.component.html
Unescape View File

@ -46,7 +46,14 @@
<mat-option value="14">联动力量</mat-option> <mat-option value="14">联动力量</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<span style="margin-left: 30px;">编制级别：</span> <span>状态：</span>
<mat-form-field>
<mat-select name="IsNewData" placeholder='请选择状态' [(ngModel)]="IsNewData" [multiple]="true">
<mat-option value=true>新增</mat-option>
<mat-option value=false>维护更新</mat-option>
</mat-select>
</mat-form-field>
<span>编制级别：</span>
<mat-form-field> <mat-form-field>
<mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="PlanLevel"> <mat-select name="preparelevel" placeholder='请选择编制级别' [(ngModel)]="PlanLevel">
<mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option> <mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
@ -104,9 +111,10 @@
<div class="tablediv"> <div class="tablediv">
<table cellspacing="0" cellpadding="0" style="margin-top: 10px;"> <table cellspacing="0" cellpadding="0" style="margin-top: 10px;">
<thead> <thead>
<th style="width: 15%;">类型</th> <th style="width: 10%;">状态</th>
<th style="width: 10%;">类型</th>
<th style="width: 10%;">预案类型</th> <th style="width: 10%;">预案类型</th>
<th style="width: 15%;">名称</th> <th style="width: 10%;">名称</th>
<th style="width: 5%;">操作</th> <th style="width: 5%;">操作</th>
<th style="width: 20%;">所属组织</th> <th style="width: 20%;">所属组织</th>
<th style="width: 10%;">审核状态</th> <th style="width: 10%;">审核状态</th>
@ -117,15 +125,16 @@
<div class="tbodycss" id="tbodydiv" > <div class="tbodycss" id="tbodydiv" >
<table cellspacing="0" cellpadding="0" id="table" > <table cellspacing="0" cellpadding="0" id="table" >
<tr [ngClass]="{'selectedTr': item.id == id}" *ngFor="let item of tableDate;let key = index" (click)='tableClick($event,item)'> <tr [ngClass]="{'selectedTr': item.id == id}" *ngFor="let item of tableDate;let key = index" (click)='tableClick($event,item)'>
<td style="width: 15%;"> <td style="width: 10%;" [ngClass]="{'green': item.itemMaintenanceState == '0','yellow':item.itemMaintenanceState != '0'}">{{item.itemMaintenanceState=='0'?'新增':'维护'}}</td>
<td style="width: 10%;">
<!-- <input type="radio" name="yuan" value={{item.id}} [(ngModel)]="checked" (click)='radioClick(item)'> --> <!-- <input type="radio" name="yuan" value={{item.id}} [(ngModel)]="checked" (click)='radioClick(item)'> -->
{{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'? {{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'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}</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: 10%;"> <td style="width: 10%;">
{{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}} {{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}}
</td> </td>
<td style="width: 15%;">{{item.title}}</td> <td style="width: 10%;">{{item.title}}</td>
<td style="width: 5%;" [ngClass]="{'green': item.operation == '1','red':item.operation == '2','blue':item.operation == '0'}">{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td> <td style="width: 5%;" [ngClass]="{'green': item.operation == '0','red':item.operation == '2','yellow':item.operation == '1'}">{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
<td style="width: 20%;">{{item.organizationName}}</td> <td style="width: 20%;">{{item.organizationName}}</td>
<td style="width: 10%;" [ngClass]="{'green': item.verifyState == '1'||item.verifyState == '4','red':item.verifyState == '2'||item.verifyState == '5'}">{{item.verifyState=='0'?'待初审':item.verifyState=='1'? <td style="width: 10%;" [ngClass]="{'green': item.verifyState == '1'||item.verifyState == '4','red':item.verifyState == '2'||item.verifyState == '5'}">{{item.verifyState=='0'?'待初审':item.verifyState=='1'?
'初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}}</td> '初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}}</td>

13
src/app/plan-audit/plan-record/plan-record.component.scss
Unescape View File

@ -118,6 +118,7 @@
} }
} }
.headthree{ .headthree{
height: 45px; height: 45px;
@media screen and (min-device-width:1400px){ @media screen and (min-device-width:1400px){
margin-left: 30px; margin-left: 30px;
@ -125,13 +126,13 @@
@media screen and (max-device-width:1200px){ @media screen and (max-device-width:1200px){
font-size: 13px; font-size: 13px;
mat-form-field{ mat-form-field{
width: 120px; width: 50px;
} }
} }
@media screen and (max-device-width:1400px) and (min-device-width:1200px){ @media screen and (max-device-width:1400px) and (min-device-width:1200px){
margin-left: 15px; margin-left: 15px;
mat-form-field{ mat-form-field{
width: 120px; width: 50px;
} }
} }
} }
@ -188,6 +189,7 @@
} }
} }
} }
.tablediv{ .tablediv{
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -304,7 +306,7 @@ th,td{
} }
.green{color: #00C756;} .green{color: #00C756;}
.red{color: #FF4D4D;} .red{color: #FF4D4D;}
.blue{color: #2196F3;} .yellow{color: #FFC94B;}
.twoD { .twoD {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
@ -326,4 +328,7 @@ th,td{
} }
::-webkit-scrollbar-thumb{ ::-webkit-scrollbar-thumb{
background-color: #2196F3; background-color: #2196F3;
} }
.mat-form-field-infix{
width: 100px;
}

4
src/app/plan-audit/plan-record/plan-record.component.ts
Unescape View File

@ -93,6 +93,7 @@ export class PlanRecordComponent implements OnInit {
fetchUrl fetchUrl
companyName companyName
plantypes plantypes
IsNewData=[true,false]
//获取表格数据 //获取表格数据
getAlltabledate() { getAlltabledate() {
@ -103,7 +104,8 @@ export class PlanRecordComponent implements OnInit {
verifyState: this.verifyState || [1, 2, 4, 5], verifyState: this.verifyState || [1, 2, 4, 5],
QueryStartTime: this.addtime || '', QueryStartTime: this.addtime || '',
QueryEndTime: this.endtime || '', QueryEndTime: this.endtime || '',
PlanType:this.plantypes||[] PlanType:this.plantypes||[],
IsNewData:this.IsNewData
} }
this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => { this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => {
//console.log(data) //console.log(data)

98
src/app/plan-audit/wait-examineer/wait-examineer.component.html
Unescape View File

@ -39,7 +39,14 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div class="headthreetwo"> <div class="headthreetwo">
<span >预案类型：</span> <span >状态：</span>
<mat-form-field>
<mat-select placeholder='请选择状态' name="IsNewData" [(ngModel)]="IsNewData" [multiple]="true">
<mat-option value=true>新增</mat-option>
<mat-option value=false>维护更新</mat-option>
</mat-select>
</mat-form-field>
<span class="bzjb">预案类型：</span>
<mat-form-field> <mat-form-field>
<mat-select placeholder='请选择预案类型' name="unittype" [(ngModel)]="plantypes" [multiple]="true"> <mat-select placeholder='请选择预案类型' name="unittype" [(ngModel)]="plantypes" [multiple]="true">
<mat-option value="1">二维预案</mat-option> <mat-option value="1">二维预案</mat-option>
@ -48,6 +55,7 @@
<mat-option value="16">文本预案</mat-option> <mat-option value="16">文本预案</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<button mat-raised-button color="primary" type="submit" class="find">查询</button> <button mat-raised-button color="primary" type="submit" class="find">查询</button>
<button mat-raised-button color="primary" (click)='record()'><img src="../../../assets/images/refresh.png"> <button mat-raised-button color="primary" (click)='record()'><img src="../../../assets/images/refresh.png">
重置</button> 重置</button>
@ -56,52 +64,56 @@
</div> </div>
</form> </form>
<div class="tablediv">
<table cellspacing="0" cellpadding="0" style="margin-top: 10px;margin-bottom: 5px;"> </div>
<thead> <div class="tablediv">
<th style="width: 15%;">类型</th> <table cellspacing="0" cellpadding="0" style="margin-top: 10px;margin-bottom: 5px;">
<th style="width: 10%;">预案类型</th> <thead>
<th style="width: 15%;">名称</th> <th style="width: 10%;margin-left: 5px;">状态</th>
<th style="width: 5%;">操作</th> <th style="width: 10%;">类型</th>
<th style="width: 20%;">所属组织</th> <th style="width: 10%;">预案类型</th>
<th style="width: 10%;">审核状态</th> <th style="width: 15%;">名称</th>
<th style="width: 10%;">提交人</th> <th style="width: 5%;">操作</th>
<th style="width: 15%;">提交时间</th> <th style="width: 20%;">所属组织</th>
</thead> <th style="width: 10%;">审核状态</th>
<th style="width: 7%;">提交人</th>
<th style="width: 13%;">提交时间</th>
</thead>
</table>
<div class="tbodycss" id="tbodydiv">
<table cellspacing="0" cellpadding="0" id="table">
<tr [ngClass]="{'selectedTr': item.id == id}" *ngFor="let item of tableDate;let key = index"
(click)='radioClick($event,item)'>
<td style="width: 10%;" [ngClass]="{'green': item.itemMaintenanceState == '0','yellow':item.itemMaintenanceState != '0'}">
<mat-checkbox color="primary" (change)='radioClick($event,item)' style="float: left;margin-bottom:'2px'">
</mat-checkbox>
{{item.itemMaintenanceState=='0'?'新增':'维护'}}</td>
<td style="width: 10%;">
{{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'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}
</td>
<td style="width: 10%;">
{{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}}
</td>
<td style="width: 15%;">{{item.title}}</td>
<td style="width: 5%;"
[ngClass]="{'green': item.operation == '0','red':item.operation == '2','yellow':item.operation == '1'}">
{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
<td style="width: 20%;">{{item.organizationName}}</td>
<td style="width: 10%;"
[ngClass]="{'green': item.verifyState == '1'||item.verifyState == '4','red':item.verifyState == '2'||item.verifyState == '5'}">
{{item.verifyState=='0'?'待初审':item.verifyState=='1'?
'初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}}
</td>
<td style="width: 7%;">{{item.creatorName}}</td>
<td style="width: 13%;">{{item.createTime|date:'yyyy-MM-dd'}}</td>
</tr>
</table> </table>
<div class="tbodycss" id="tbodydiv"> </div>
<table cellspacing="0" cellpadding="0" id="table">
<tr [ngClass]="{'selectedTr': item.id == id}" *ngFor="let item of tableDate;let key = index"
(click)='radioClick($event,item)'>
<td style="width: 15%;">
<mat-checkbox color="primary" (change)='radioClick($event,item)' style="float: left;margin-top:'2px'">
</mat-checkbox>
{{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'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}
</td>
<td style="width: 10%;">
{{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}}
</td>
<td style="width: 15%;">{{item.title}}</td>
<td style="width: 5%;"
[ngClass]="{'green': item.operation == '1','red':item.operation == '2','blue':item.operation == '0'}">
{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
<td style="width: 20%;">{{item.organizationName}}</td>
<td style="width: 10%;"
[ngClass]="{'green': item.verifyState == '1'||item.verifyState == '4','red':item.verifyState == '2'||item.verifyState == '5'}">
{{item.verifyState=='0'?'待初审':item.verifyState=='1'?
'初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}}
</td>
<td style="width: 10%;">{{item.creatorName}}</td>
<td style="width: 15%;">{{item.createTime|date:'yyyy-MM-dd'}}</td>
</tr>
</table>
</div>
</div>
</div> </div>
</div> </div>
<div class="boxright" id="waitexamineergis"> <div class="boxright" id="waitexamineergis">

14
src/app/plan-audit/wait-examineer/wait-examineer.component.scss
Unescape View File

@ -85,7 +85,7 @@
} }
.find{ .find{
@media screen and (min-device-width: 1400px){ @media screen and (min-device-width: 1400px){
margin-left: 100px; margin-left: 200px;
} }
} }
@media screen and (min-device-width: 1400px) { @media screen and (min-device-width: 1400px) {
@ -132,13 +132,11 @@
} }
.tablediv { .tablediv {
width: 100%; width: 100%;
height: 70%; height: 62%;
.tbodycss { .tbodycss {
@media screen and (min-device-width: 1400px) { overflow-y: auto;
overflow-y: auto;
}
height: 600px; height: 100%;
width: 100%; width: 100%;
.selectedTr { .selectedTr {
background-color: #b3d3ee; background-color: #b3d3ee;
@ -285,8 +283,8 @@ td {
.red { .red {
color: #ff4d4d; color: #ff4d4d;
} }
.blue { .yellow {
color: #2196f3; color: #FFC94B;
} }
.accordingin { .accordingin {
margin: 5px; margin: 5px;

4
src/app/plan-audit/wait-examineer/wait-examineer.component.ts
Unescape View File

@ -110,6 +110,7 @@ export class WaitExamineerComponent implements OnInit {
fetchUrl fetchUrl
companyName companyName
plantypes plantypes
IsNewData=[true,false]
//获取表格数据 //获取表格数据
getAlltabledate() { getAlltabledate() {
@ -118,7 +119,8 @@ export class WaitExamineerComponent implements OnInit {
ContentType: Number(this.projectlevel) || [], ContentType: Number(this.projectlevel) || [],
Level: this.PlanLevel || [], Level: this.PlanLevel || [],
verifyState: [0, 3], verifyState: [0, 3],
PlanType:this.plantypes||[] PlanType:this.plantypes||[],
IsNewData:this.IsNewData
} }
this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => { this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => {
this.tableDate = data.items this.tableDate = data.items

33
src/app/plan-management/create-plan-online-five/addattinf.html
Unescape View File

@ -0,0 +1,33 @@
<!--
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2021-05-26 14:54:36
* @LastEditors: sueRimn
* @LastEditTime: 2021-06-01 10:25:05
-->
<div class="box">
<div class="top">
<span>新增分组</span>
</div>
<div class="center" *ngIf="this.data.element!=undefined&& this.data.element.surveyName=='建筑信息'">
<div class="group" *ngFor="let item of addAttinfBuild" >
<mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" *ngIf="item.zdy==undefined">{{item.propertyName}}</mat-checkbox>
</div>
</div>
<div class="center" *ngIf="this.data.element!=undefined&& this.data.element.surveyName=='消防设施'">
<div class="group" *ngFor="let item of addAttinfFile" >
<mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" *ngIf="item.zdy==undefined">{{item.name}}</mat-checkbox>
</div>
</div>
<div class="center" *ngIf="this.data.facilityItems!=null">
<div class="group" *ngFor="let item of facilityItems" >
<mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed" *ngIf="item.zdy==undefined">{{item.name}}</mat-checkbox>
</div>
</div>
<div class="bottom">
<button mat-raised-button color="primary" (click)='defineClick()'>确定</button>
<button mat-raised-button style="margin-left: 20px;" (click)="close()">取消</button>
</div>
</div>

41
src/app/plan-management/create-plan-online-five/addgroup.scss
Unescape View File

@ -0,0 +1,41 @@
.box{
height: 100%;
width: 100%;
display: flex;
flex-direction: column;
.top{
width: 100%;
height: 40px;
text-align: center;
span{
font-size: 18px;
}
}
.center{
overflow: auto;
width: 100%;
height: 80%;
.group{
height: 35px;
//margin-left: 20px;
.example-margin {
margin: 0 10px;
}
input{
top: 2px;
}
span{
margin-left: 8px;
}
}
}
.bottom{
width: 100%;
margin-top: 20px;
button{
width: 80px;
height: 36px;
font-size: 16px;
}
}
}

359
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
Unescape View File

@ -455,8 +455,8 @@
line-height: 40px; line-height: 40px;
color: #b99a00;">{{element.headName}}</span> color: #b99a00;">{{element.headName}}</span>
<img src="../../../assets/images/delyello.png" *ngIf="pattern == 'edit'" (click)='delTd(key,i)'> <img src="../../../assets/images/delyello.png" *ngIf="pattern == 'edit'" (click)='delTd(key,i)'>
<img src="../../../assets/images/downyello.png" *ngIf="item.new!=undefined&&i<item.attribute.length-1" (click)='downPai(key,i)'> <img src="../../../assets/images/downyello.png" *ngIf="item.new!=undefined&&i<item.attribute.length-1&&pattern == 'edit'" (click)='downPai(key,i)'>
<img src="../../../assets/images/uoyello.png" *ngIf="item.new!=undefined&&i>0" (click)='upPai(key,i)'> <img src="../../../assets/images/uoyello.png" *ngIf="item.new!=undefined&&i>0 &&pattern == 'edit'" (click)='upPai(key,i)'>
<img src="../../../assets/images/updateyello.png" *ngIf="(element.level==1||element.level==2)&&pattern == 'edit'" (click)='updataHl(key,i)'> <img src="../../../assets/images/updateyello.png" *ngIf="(element.level==1||element.level==2)&&pattern == 'edit'" (click)='updataHl(key,i)'>
<img src="../../../assets/images/addyello.png" *ngIf="element.level==1&&pattern == 'edit'" (click)='addTd(key,i)'> <img src="../../../assets/images/addyello.png" *ngIf="element.level==1&&pattern == 'edit'" (click)='addTd(key,i)'>
</div> </div>
@ -520,24 +520,27 @@
<input type="text" placeholder="请输入内容" style="width: 60%;" <input type="text" placeholder="请输入内容" style="width: 60%;"
[(ngModel)]="itemthj.body" *ngIf="pattern == 'edit'"> [(ngModel)]="itemthj.body" *ngIf="pattern == 'edit'">
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr>
<th style="border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center; white-space:pre-wrap; width: 185px;">
{{itemthj.head}}
</th>
<td style="border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center;white-space:pre-wrap;width: 185px;">
{{itemthj.body}}
</td>
</tr>
</table>
</div> </div>
</div> </div>
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr *ngFor="let itemth of element.tableth;let tablethi=index;TrackBy:trackByFn">
<td style="border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center; white-space:pre-wrap; width: 185px;" *ngFor="let itemthj of element.tableth[tablethi];let tablethj=index;TrackBy:trackByFn">
<span>{{itemthj.head}}</span>
<span>{{itemthj.body}}</span>
</td>
<!-- <td style="border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center;white-space:pre-wrap;width: 185px;">
{{itemthj.body}}
</td> -->
</tr>
</table>
</div> </div>
<!--树形图--> <!--树形图-->
@ -660,12 +663,7 @@
</div> --> </div> -->
<div class="keyImg" <div class="keyImg"
*ngIf="item.groupName == '重点图示' || item.groupName == '交通水源' || item.groupName == '预案附件'"> *ngIf="item.groupName == '重点图示' || item.groupName == '交通水源' || item.groupName == '预案附件'">
<!-- <div class="titleItem" style="width: 100%;
background-color: #2196F3;
text-align: center;
color: white;">
<span>{{item.groupName}}</span>
</div> -->
<div style="border: 1px solid #e8e9e9;width: 100%;" class="keyImgItem" <div style="border: 1px solid #e8e9e9;width: 100%;" class="keyImgItem"
*ngFor="let i of item.attribute;let key = index"> *ngFor="let i of item.attribute;let key = index">
<div class="keyImgTitle" style="height: 30px; <div class="keyImgTitle" style="height: 30px;
@ -721,7 +719,8 @@
opacity: 1; opacity: 1;
height: 40px; height: 40px;
line-height: 40px;">{{itemunit.name}}</span> line-height: 40px;">{{itemunit.name}}</span>
<img src="../../../assets/images/update.png" *ngIf="haveNew!=undefined" (click)='unitZdyaaa()'> <img src="../../../assets/images/update.png" *ngIf="planMode==4&&pattern == 'edit'" (click)='unitZdyaaa()'>
<span style="float: right;margin-right: 30px;cursor: pointer;" *ngIf="planMode==4&&pattern == 'edit'" (click)='zdyDw()'>自定义</span>
</div> </div>
<div class="unitbody" *ngFor="let element of itemunit.body;let elei=index" style=" height: 100%; <div class="unitbody" *ngFor="let element of itemunit.body;let elei=index" style=" height: 100%;
width: 100%; width: 100%;
@ -738,9 +737,11 @@
line-height: 40px; line-height: 40px;
color: #ffffff;">{{element.surveyName}}</span> color: #ffffff;">{{element.surveyName}}</span>
<!-- <img src="../../../assets/images/deletered.png" > --> <!-- <img src="../../../assets/images/deletered.png" > -->
<img src="../../../assets/images/delyello.png" *ngIf="haveNew!=undefined&&pattern == 'edit'">
<img src="../../../assets/images/updatabai.png" (click)='addBuildingmb(element)' *ngIf="planMode==4&&pattern == 'edit'&&(element.surveyName=='建筑信息'||element.surveyName=='消防设施')">
<img src="../../../assets/images/addbai.png" <img src="../../../assets/images/addbai.png"
(click)='unitadd(element.surveyName,uniti,elei)' *ngIf="pattern == 'edit'"> (click)='unitadd(element.surveyName,uniti,elei)' *ngIf="pattern == 'edit'">
<img src="../../../assets/images/delyello.png" *ngIf="haveNew!=undefined">
</div> </div>
<div class="body"> <div class="body">
<!-- 进攻通道 --> <!-- 进攻通道 -->
@ -806,31 +807,32 @@
</div> </div>
<!-- 单位和建筑信息 --> <!-- 单位和建筑信息 -->
<div class="building" *ngIf="element.surveyName=='单位基本信息'||element.surveyName=='建筑信息'"> <div class="building" *ngIf="element.surveyName=='单位基本信息'||element.surveyName=='建筑信息'">
<div *ngFor="let info of element.attinf;let infoi=index"> <div *ngFor="let info of element.attinf;let infoi=index" >
<div *ngIf="info.completed" class="onetext"> <div *ngIf="info.completed&&pattern != 'look'" class="onetext">
<input type="text" placeholder="请输入内容" style="width: 30%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="info.propertyName" *ngIf="pattern == 'edit'" [readonly]='info.zdy==undefined'> <input type="text" placeholder="请输入内容" style="width: 30%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="info.propertyName" *ngIf="pattern == 'edit'" [readonly]='info.zdy==undefined'>
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #FFFFFF;" [(ngModel)]="info.propertyValue" *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #FFFFFF;" [(ngModel)]="info.propertyValue" *ngIf="pattern == 'edit'">
<!-- <input type="text" style="width: 30%;background-color: #FFFFFF;color: #999;" [(ngModel)]="info.olddata" *ngIf="pattern == 'edit'&&oldData" readonly> --> <!-- <input type="text" style="width: 30%;background-color: #FFFFFF;color: #999;" [(ngModel)]="info.olddata" *ngIf="pattern == 'edit'&&oldData" readonly> -->
<!-- <span style="width: 30%;background-color: #FFFFFF;color: #999;" *ngIf="pattern == 'edit'&&oldData">{{info.olddata||'无原数据'}}</span> --> <!-- <span style="width: 30%;background-color: #FFFFFF;color: #999;" *ngIf="pattern == 'edit'&&oldData">{{info.olddata||'无原数据'}}</span> -->
<input type="text" style="width: 27%;background-color: #FFFFFF;color: #999;" *ngIf="pattern == 'edit'&&oldData" [value]="info.olddata||'无原数据'" readonly> <input type="text" style="width: 27%;background-color: #FFFFFF;color: #999;" *ngIf="pattern == 'edit'&&oldData" [value]="info.olddata||'无原数据'" readonly>
<img style="float: right;" src="../../../assets/images/deletered.png" *ngIf="pattern == 'edit'&&info.zdy" (click)='unitDel(element.surveyName,uniti,infoi)'> <img style="float: right;" src="../../../assets/images/deletered.png" *ngIf="pattern == 'edit'&&info.zdy" (click)='unitDel(element.surveyName,uniti,infoi)'>
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr>
<th style="border: 1px solid #999;
height: 40px;
width: 40%;
font-size: 16px;
text-align: center;">{{info.propertyName}}</th>
<td style="border: 1px solid #999;
height: 40px;
width: 60%;
font-size: 16px;
text-align: center;">{{info.propertyValue}}</td>
</tr>
</table>
</div> </div>
</div> </div>
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr *ngFor="let info of element.attinf;let infoi=index">
<td style="border: 1px solid #999;
height: 40px;
width: 40%;
font-size: 16px;
text-align: center;" *ngIf="info.completed"><span>{{info.propertyName}}</span></td>
<td style="border: 1px solid #999;
height: 40px;
width: 60%;
font-size: 16px;
text-align: center;" *ngIf="info.completed"><span>{{info.propertyValue}}</span> </td>
</tr>
</table>
</div> </div>
<!-- 消防设施 --> <!-- 消防设施 -->
<div class="file" *ngIf="element.surveyName=='消防设施'"> <div class="file" *ngIf="element.surveyName=='消防设施'">
@ -842,34 +844,36 @@
text-align: center;"> text-align: center;">
<input type="text" placeholder="请输入内容" [(ngModel)]="attack.name" [readonly]='attack.zdy==undefined' *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" [(ngModel)]="attack.name" [readonly]='attack.zdy==undefined' *ngIf="pattern == 'edit'">
<span style=" margin-left: 20px;font-size: 16px;color: #b99a00;opacity: 1;height: 40px;line-height: 40px;" *ngIf="pattern != 'edit'">{{attack.name}}</span> <span style=" margin-left: 20px;font-size: 16px;color: #b99a00;opacity: 1;height: 40px;line-height: 40px;" *ngIf="pattern != 'edit'">{{attack.name}}</span>
<img src="../../../assets/images/delyello.png" *ngIf="pattern == 'edit'&&attack.zdy!=undefined" <img src="../../../assets/images/delyello.png" *ngIf="pattern == 'edit'"
(click)='unitDel(element.surveyName,uniti,attacki)'> (click)='unitDel(element.surveyName,uniti,attacki)'>
<img src="../../../assets/images/addyello.png" <img src="../../../assets/images/addyello.png"
*ngIf="pattern == 'edit'&&attack.zdy!=undefined" *ngIf="pattern == 'edit'"
(click)='unitadd(element.surveyName,uniti,attacki,0)'> (click)='unitadd(element.surveyName,uniti,attacki,0)'><!-- &&attack.zdy!=undefined -->
<img src="../../../assets/images/updateyello.png" (click)='fileAdd(attack.facilityItems,attacki,attack.name)' *ngIf="pattern == 'edit'&&attack.zdy==undefined">
</div> </div>
<div class="fileBody"> <div class="fileBody">
<div *ngFor="let info of attack.facilityItems;let filenum=index"> <div *ngFor="let info of attack.facilityItems;let filenum=index">
<div *ngIf="info.completed" class="onetext"> <div *ngIf="info.completed&&pattern != 'look'" class="onetext">
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="info.name" *ngIf="pattern == 'edit'" [readonly]='info.zdy==undefined'> <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="info.name" *ngIf="pattern == 'edit'" [readonly]='info.zdy==undefined'>
<input type="text" placeholder="请输入内容" style="width: 57%;background-color: #FFFFFF;" [(ngModel)]="info.value" *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 57%;background-color: #FFFFFF;" [(ngModel)]="info.value" *ngIf="pattern == 'edit'">
<img src="../../../assets/images/deletered.png" *ngIf="pattern == 'edit'&&info.zdy" (click)='unitDel(element.surveyName,uniti,attacki,filenum)'> <img src="../../../assets/images/deletered.png" *ngIf="pattern == 'edit'&&info.zdy" (click)='unitDel(element.surveyName,uniti,attacki,filenum)'>
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr>
<th style="border: 1px solid #999;
height: 40px;
width: 40%;
font-size: 16px;
text-align: center;">{{info.name}}</th>
<td style="border: 1px solid #999;
height: 40px;
width: 60%;
font-size: 16px;
text-align: center;">{{info.value}}</td>
</tr>
</table>
</div> </div>
</div> </div>
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr *ngFor="let info of attack.facilityItems;let filenum=index">
<th style="border: 1px solid #999;
height: 40px;
width: 40%;
font-size: 16px;
text-align: center;">{{info.name}}</th>
<td style="border: 1px solid #999;
height: 40px;
width: 60%;
font-size: 16px;
text-align: center;">{{info.value}}</td>
</tr>
</table>
</div> </div>
</div> </div>
@ -877,48 +881,56 @@
</div> </div>
<!-- 四周毗邻 --> <!-- 四周毗邻 -->
<div class="fouradj" *ngIf="element.surveyName=='四周毗邻'"> <div *ngIf="element.surveyName=='四周毗邻'">
<div class="fourTexttwo" *ngFor="let info of element.attinf;let infoi=index"> <div class="fouradj" *ngIf="pattern != 'look'" >
<input type="text" placeholder="请输入内容" style="width: 30%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="info.name" *ngIf="pattern == 'edit'" [readonly]='info.zdy==undefined'> <div class="fourTexttwo" *ngFor="let info of element.attinf;let infoi=index">
<input type="text" placeholder="请输入内容" style="width: 65%;background-color: #FFFFFF;" [(ngModel)]="info.value" *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 30%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="info.name" *ngIf="pattern == 'edit'" [readonly]='info.zdy==undefined'>
<img style="position: relative;bottom: 30px;left: 347px;" src="../../../assets/images/deletered.png" (click)='unitDel(element.surveyName,uniti,infoi)' *ngIf="pattern == 'edit'&&info.zdy"> <input type="text" placeholder="请输入内容" style="width: 65%;background-color: #FFFFFF;" [(ngModel)]="info.value" *ngIf="pattern == 'edit'">
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;"> <img style="position: relative;bottom: 30px;left: 347px;" src="../../../assets/images/deletered.png" (click)='unitDel(element.surveyName,uniti,infoi)' *ngIf="pattern == 'edit'&&info.zdy">
<tr> </div>
<th style="border: 1px solid #999;
height: 40px;
width: 30%;
font-size: 16px;
text-align: center;">{{info.name}}</th>
<td style="border: 1px solid #999;
height: 40px;
width: 70%;
font-size: 16px;
text-align: center;">{{info.value}}</td>
</tr>
</table>
</div> </div>
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr *ngFor="let info of element.attinf;let infoi=index">
<th style="border: 1px solid #999;
height: 40px;
width: 30%;
font-size: 16px;
text-align: center;">{{info.name}}</th>
<td style="border: 1px solid #999;
height: 40px;
width: 70%;
font-size: 16px;
text-align: center;">{{info.value}}</td>
</tr>
</table>
</div> </div>
<!-- 功能分区 --> <!-- 功能分区 -->
<div class="fouradj" *ngIf="element.surveyName=='功能分区'"> <div *ngIf="element.surveyName=='功能分区'">
<div class="onetext" *ngFor="let info of element.attinf;let infoi=index"> <div class="fouradj" *ngIf="pattern != 'look'">
<input type="text" placeholder="请输入内容" style="width: 30%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="info.name" *ngIf="pattern == 'edit'"> <div class="onetext" *ngFor="let info of element.attinf;let infoi=index">
<input type="text" placeholder="请输入内容" style="width: 67%;background-color: #FFFFFF;" [(ngModel)]="info.value" *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 30%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="info.name" *ngIf="pattern == 'edit'">
<img src="../../../assets/images/deletered.png" (click)='unitDel(element.surveyName,uniti,infoi)' *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 67%;background-color: #FFFFFF;" [(ngModel)]="info.value" *ngIf="pattern == 'edit'">
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;"> <img src="../../../assets/images/deletered.png" (click)='unitDel(element.surveyName,uniti,infoi)' *ngIf="pattern == 'edit'">
<tr>
<th style="border: 1px solid #999; </div>
height: 40px;
width: 30%;
font-size: 16px;
text-align: center;">{{info.name}}</th>
<td style="border: 1px solid #999;
height: 40px;
width: 70%;
font-size: 16px;
text-align: center;">{{info.value}}</td>
</tr>
</table>
</div> </div>
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr *ngFor="let info of element.attinf;let infoi=index">
<th style="border: 1px solid #999;
height: 40px;
width: 30%;
font-size: 16px;
text-align: center;">{{info.name}}</th>
<td style="border: 1px solid #999;
height: 40px;
width: 70%;
font-size: 16px;
text-align: center;">{{info.value}}</td>
</tr>
</table>
</div> </div>
<!-- 重点部位 --> <!-- 重点部位 -->
<div class="parts" *ngIf="element.surveyName=='重点部位'"> <div class="parts" *ngIf="element.surveyName=='重点部位'">
@ -936,121 +948,57 @@
color: #b99a00;" *ngIf="pattern == 'look'">{{parts.heafName}}</span> color: #b99a00;" *ngIf="pattern == 'look'">{{parts.heafName}}</span>
<img src="../../../assets/images/deletered.png" (click)='unitDel(element.surveyName,uniti,infoi)' *ngIf="pattern == 'edit'"> <img src="../../../assets/images/deletered.png" (click)='unitDel(element.surveyName,uniti,infoi)' *ngIf="pattern == 'edit'">
</div> </div>
<div class="partsBody"> <div class="partsBody" *ngIf="pattern!='look'">
<div class="duohang"> <div class="duohang">
<div class="duohangHalf"> <div class="duohangHalf">
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="parts.body[0].name" *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="parts.body[0].name" *ngIf="pattern == 'edit'">
<input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[0].value" *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[0].value" *ngIf="pattern == 'edit'">
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr>
<th style="border: 1px solid #999;
font-size: 16px;
text-align: center;height: 40px;width: 185px;">
{{parts.body[0].name}}
<!-- <textarea style="height: 100%;width: 100%;" [(ngModel)]="parts.body[0].name" disabled></textarea> -->
</th>
<td style="border: 1px solid #999;
font-size: 16px;
text-align: center;">
{{parts.body[0].value}}
<!-- <textarea style="height: 30px;width: 180px;" [(ngModel)]="parts.body[0].value" disabled></textarea> -->
</td>
</tr>
</table>
</div> </div>
<div class="duohangHalf"> <div class="duohangHalf">
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #F9F9F9;text-align: center;"[(ngModel)]="parts.body[1].name" *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #F9F9F9;text-align: center;"[(ngModel)]="parts.body[1].name" *ngIf="pattern == 'edit'">
<input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[1].value" *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[1].value" *ngIf="pattern == 'edit'">
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr>
<th style="border: 1px solid #999;
height: 40px;width: 185px;
font-size: 16px;
text-align: center;">
{{parts.body[1].name}}
<!-- <textarea style="height: 100%;width: 100%;" [(ngModel)]="parts.body[1].name" disabled></textarea> -->
</th>
<td style="border: 1px solid #999;
height: 40px;
width: 60%;
font-size: 16px;
text-align: center;">
{{parts.body[1].value}}
<!-- <textarea style="height: 100%;width:100%;" [(ngModel)]="parts.body[1].value" disabled></textarea> -->
</td>
</tr>
</table>
</div> </div>
</div> </div>
<div class="duohang"> <div class="duohang">
<div class="duohangHalf"> <div class="duohangHalf">
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="parts.body[2].name" *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="parts.body[2].name" *ngIf="pattern == 'edit'">
<input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[2].value" *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[2].value" *ngIf="pattern == 'edit'">
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr>
<th style="border: 1px solid #999;
height: 40px;width: 185px;
font-size: 16px;
text-align: center;">
{{parts.body[2].name}}
<!-- <textarea style="height: 100%;width: 100%;" [(ngModel)]="parts.body[2].name" disabled></textarea> -->
</th>
<td style="border: 1px solid #999;
height: 40px;width: 185px;
font-size: 16px;
text-align: center;">
{{parts.body[2].value}}
<!-- <textarea style="height: 100%;width: 100%;" [(ngModel)]="parts.body[2].value" disabled></textarea> -->
</td>
</tr>
</table>
</div> </div>
<div class="duohangHalf"> <div class="duohangHalf">
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="parts.body[3].name" *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="parts.body[3].name" *ngIf="pattern == 'edit'">
<input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[3].value" *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[3].value" *ngIf="pattern == 'edit'">
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr>
<th style="border: 1px solid #999;
height: 40px;width: 185px;
font-size: 16px;
text-align: center;">
{{parts.body[3].name}}
<!-- <textarea style="height: 80%;width: 90%;" [(ngModel)]="parts.body[3].name" disabled></textarea> -->
</th>
<td style="border: 1px solid #999;
height: 40px;width: 185px;
font-size: 16px;
text-align: center;">
{{parts.body[3].value}}
<!-- <textarea style="height: 100%;width: 100%;" [(ngModel)]="parts.body[3].value" disabled></textarea> -->
</td>
</tr>
</table>
</div> </div>
</div> </div>
<div class="danhang"> <div class="danhang">
<input type="text" placeholder="请输入内容" style="width: 40%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="parts.body[4].name" *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #F9F9F9;text-align: center;" [(ngModel)]="parts.body[4].name" *ngIf="pattern == 'edit'">
<input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[4].value" *ngIf="pattern == 'edit'"> <input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="parts.body[4].value" *ngIf="pattern == 'edit'">
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr>
<th style="
height: 40px;width: 185px;
font-size: 16px;
text-align: center;">
{{parts.body[4].name}}
<!-- <textarea style="height: 100%;width: 100%;" [(ngModel)]="parts.body[4].name" disabled></textarea> -->
</th>
<td style="
height: 40px;width: 185px;
font-size: 16px;
text-align: center;">
{{parts.body[4].value}}
<!-- <textarea style="height: 100%;width: 100%;" [(ngModel)]="parts.body[4].value" disabled></textarea> -->
</td>
</tr>
</table>
</div> </div>
</div> </div>
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr *ngFor="let partsbody of parts.body">
<th style="border: 1px solid #999;
height: 40px;
width: 30%;
font-size: 16px;
text-align: center;">
{{partsbody.name}}
<!-- <textarea style="height: 100%;width: 100%;" [(ngModel)]="parts.body[0].name" disabled></textarea> -->
</th>
<td style="border: 1px solid #999;
height: 40px;
width: 30%;
font-size: 16px;
text-align: center;">
{{partsbody.value}}
<!-- <textarea style="height: 30px;width: 180px;" [(ngModel)]="parts.body[0].value" disabled></textarea> -->
</td>
</tr>
</table>
</div> </div>
</div> </div>
@ -1138,24 +1086,27 @@
<input type="text" placeholder="请输入内容" style="width: 75%;" <input type="text" placeholder="请输入内容" style="width: 75%;"
[(ngModel)]="itemthj.body" *ngIf="pattern == 'edit'"> [(ngModel)]="itemthj.body" *ngIf="pattern == 'edit'">
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr>
<th style="border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center; white-space:pre-wrap; width: 185px;">
{{itemthj.head}}
</th>
<td style="border: 1px solid #999;
height: 40px;
font-size: 16px;
text-align: center;white-space:pre-wrap;width: 185px;">
{{itemthj.body}}
</td>
</tr>
</table>
</div> </div>
</div> </div>
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr *ngFor="let itemth of element.tableth;let tablethi=index;TrackBy:trackByFn">
<td style="border: 1px solid #999;
height: 40px;width: 30%;
font-size: 16px;
text-align: center; " *ngFor="let itemthj of element.tableth[tablethi];let tablethj=index;TrackBy:trackByFn">
<span>{{itemthj.head}}</span>
<span>{{itemthj.body}}</span>
</td>
<!-- <td style="border: 1px solid #999;
height: 40px;width: 70%;
font-size: 16px;
text-align: center;" *ngFor="let itemthj of element.tableth[tablethi];let tablethj=index;TrackBy:trackByFn">
{{itemthj.body}}
</td> -->
</tr>
</table>
</div> </div>
<!--树形图--> <!--树形图-->

336
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
Unescape View File

@ -21,6 +21,7 @@ import Viewer from 'viewerjs';
import { async } from 'rxjs/internal/scheduler/async'; import { async } from 'rxjs/internal/scheduler/async';
import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
import { adddwsurvey, addGroup } from '@src/app/ui/plan-template/plan-template.component'; import { adddwsurvey, addGroup } from '@src/app/ui/plan-template/plan-template.component';
import { zdyaddattinf } from '../../ui/plan-template/plan-template.component'
declare var $: any declare var $: any
@Component({ @Component({
selector: 'app-create-plan-online-five', selector: 'app-create-plan-online-five',
@ -59,8 +60,12 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
blockyl = true blockyl = true
zaixianDr=false zaixianDr=false
haveNew=false haveNew=false
planMode//预案类型
//index
ngOnInit(): void { ngOnInit(): void {
//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
console.log(this.route.snapshot.queryParams.wordChange) console.log(this.route.snapshot.queryParams.wordChange)
this.planLevel = this.route.snapshot.queryParams.planCategory this.planLevel = this.route.snapshot.queryParams.planCategory
if (this.route.snapshot.queryParams.pattern == 'false') { if (this.route.snapshot.queryParams.pattern == 'false') {
@ -446,6 +451,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
buildingsData = [] buildingsData = []
buildDataName buildDataName
buildZong buildZong
basicCategoryId
//获得所有建筑信息 //获得所有建筑信息
async getAllBuildingsInfo() { async getAllBuildingsInfo() {
let index = this.getArrayIndex(this.planTemplateData,'单位概况') let index = this.getArrayIndex(this.planTemplateData,'单位概况')
@ -466,6 +472,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
}).subscribe((buildingsData: any) => { }).subscribe((buildingsData: any) => {
//console.log(buildingsData) //console.log(buildingsData)
this.buildingsData.push(buildingsData[0]) this.buildingsData.push(buildingsData[0])
//this.basicCategoryId=buildingsData[0].basicCategoryId
resolve(this.buildingsData) resolve(this.buildingsData)
}) })
} }
@ -580,8 +587,8 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
} }
getTemplateData() { getTemplateData() {
this.http.get(`/api/PlanComponents/${this.route.snapshot.queryParams.planId}/WebText`).subscribe((data: any) => { this.http.get(`/api/PlanComponents/${this.route.snapshot.queryParams.planId}/WebText`).subscribe((data: any) => {
console.log('预案内容', data) console.log('预案内容', data.webTextData)
if(this.route.snapshot.queryParams.haveNew!=undefined&&data.webTextData==null){ if(this.route.snapshot.queryParams.planMode==4&&data.webTextData==null){
this.planTemplateData=[] this.planTemplateData=[]
let obj = { let obj = {
completed: true, completed: true,
@ -1479,7 +1486,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
if(fileNum==0){ if(fileNum==0){
this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].facilityItems.push({ name: '', value: '',completed:true,zdy:true}) this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].facilityItems.push({ name: '', value: '',completed:true,zdy:true})
}else{ }else{
this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ propertyName: '', value: '',completed:true,zdy:true,facilityItems:[] }) this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ name: '', value: '',completed:true,zdy:true,facilityItems:[] })
} }
} }
@ -1908,6 +1915,67 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
}) })
} }
//建筑信息和消防设施模板信息添加
addBuildingmb(element){
let index = this.getArrayIndex(this.planTemplateData,'单位概况')
console.log(element,this.buildingsData)
const dialogRef = this.dialog.open(adddwsurveys, {//调用open方法打开对话框并且携带参数过去
width: '290px',
height:'460px',
disableClose:true,
data:{element:element,buildingID:this.buildingsData[0].basicCategoryId,fid:this.route.snapshot.queryParams.unitTypeId}
});
dialogRef.afterClosed().subscribe(result => {
if(result!=undefined){
this.planTemplateData[index].building[this.clicki].body.forEach(item => {
if(item.surveyName==element.surveyName){
element.attinf=result
}
});
}
})
}
//消防设施具体属性编辑
fileAdd(facilityItems,filei,filename){
let index = this.getArrayIndex(this.planTemplateData,'单位概况')
if(facilityItems.length!=0){
const dialogRef = this.dialog.open(adddwsurveys, {//调用open方法打开对话框并且携带参数过去
width: '240px',
height:'400px',
disableClose:true,
data:{facilityItems:facilityItems,filename,fid:this.route.snapshot.queryParams.unitTypeId}
});
dialogRef.afterClosed().subscribe(result => {
console.log(result)
if(result!=undefined){
this.planTemplateData[index].building[this.clicki].body.forEach(element => {
if(element.surveyName=='消防设施'){
element.attinf[filei].facilityItems=result
}
});
}
})
}
}
//单位概况自定义
zdyDw(){
let index = this.getArrayIndex(this.planTemplateData,'单位概况')
const dialogRef = this.dialog.open(zdyaddattinf, {//调用open方法打开对话框并且携带参数过去
width: '340px',
height:'200px',
disableClose:true,
//data:this.planTemplateData
});
dialogRef.afterClosed().subscribe(result => {
if(result!=undefined){
this.planTemplateData[index].building[this.clicki].body.push({surveyName:result.groupName,completed: true,attinf:[],zdy:true})
}
})
}
} }
@ -2121,4 +2189,266 @@ export class updataHl{
this.dialogRef.close(result); this.dialogRef.close(result);
} }
} }
//建筑跟消防设施添加模板数据
@Component({
selector: 'adddwsurveys',
templateUrl: './addattinf.html',
styleUrls: ['./addgroup.scss']
})
export class adddwsurveys{
constructor(private http: HttpClient,public dialogRef: MatDialogRef<adddwsurveys>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
addAttinfBuild=[]
buildnewDate=[]
addAttinfFile//过滤消防设施外层数据
filenewDate=[]
facilityItems//过滤消防设施最内层数据
facilityCategoryId//消防设施内容id
zdyData//模板传过来自定义的数据
ngOnInit(): void{
this.getinf()
console.log(this.data)
}
async getinf(){
if(this.data.facilityItems==undefined){
if(this.data.element.surveyName=='建筑信息'&&this.data.element.attinf==undefined){
this.addAttinfBuild=[]
let paramsdata:any ={
categoryId:this.data.buildingID
}
this.http.get("/api/BasicGroups",{params:paramsdata}).subscribe((data:any)=>{
data.forEach(buildDate => {
this.addAttinfBuild.push(...buildDate.propertyInfos)
});
this.addAttinfBuild.forEach(element => {
element.completed=false
element.olddata=element.propertyValue
});
console.log(this.addAttinfBuild)
})
}else if(this.data.element.surveyName=='建筑信息'&&this.data.element.attinf!=undefined){
this.buildnewDate=[] //接受接口返回的新数据
this.addAttinfBuild=this.data.element.attinf.filter(item=>{
return item.zdy==undefined
}) //模板传过来的非自定义数据
this.zdyData=this.data.element.attinf.filter(item=>{
return item.zdy!=undefined
})//模板传过来自定义数据
this.addAttinfBuild=JSON.parse(JSON.stringify(this.addAttinfBuild))
console.log(this.addAttinfBuild)
let paramsdata:any ={
categoryId:this.data.buildingID
}
/* 请求接口，做差异化对比 */
let restlt=await new Promise((resolve) => {
this.http.get("/api/BasicGroups",{params:paramsdata}).subscribe((data:any)=>{
data.forEach((buildDate,buildi,buildarr) => {
this.buildnewDate.push(...buildarr[buildi].propertyInfos)
resolve(data)
});
this.buildnewDate.forEach(element => {
element.completed=false
element.olddata=element.propertyValue
});
})
})
this.buildnewDate=JSON.parse(JSON.stringify(this.buildnewDate))
//差异化比较
let temp=0
this.buildnewDate.forEach((buildval,buindi,buildarr)=>{
temp=0
this.addAttinfBuild.forEach((addval,addi,addarr)=>{
if(buildval.propertyName==addval.propertyName){
temp++
}
})
if(temp==0){
//模板数据少于接口数据
// console.log(buildval)
this.addAttinfBuild.push(buildval)
}
})
this.addAttinfBuild.forEach((addval,addi,addarr)=>{
temp=0
this.buildnewDate.forEach((buildval,buindi,buildarr)=>{
if(buildarr[buindi].propertyName==addarr[addi].propertyName){
temp++
}
})
if(temp==0){
console.log(addarr[addi])
//模板数据多了
this.addAttinfBuild.splice(addi,1)
}
})
this.addAttinfBuild.push(...this.zdyData)
console.log(this.buildnewDate)
console.log(this.addAttinfBuild)
}else if(this.data.element.surveyName=='消防设施'&&this.data.element.attinf==undefined){
this.http.get("/api/BuildingTypes").subscribe((buildData:any)=>{
console.log(buildData)
buildData.forEach(element => {
if(element.id==this.data.fid){
this.facilityCategoryId=element.facilityCategoryId
let paramsdata:any ={
categoryId:this.facilityCategoryId
}
this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
console.log(data)
this.addAttinfFile=data
this.addAttinfFile.forEach(element => {
element.completed=false
element.value=''
});
console.log(this.addAttinfFile)
})
}
});
})
}else if(this.data.element.surveyName=='消防设施'&&this.data.element.attinf!=undefined){
this.filenewDate=[]
this.addAttinfFile=this.data.element.attinf.filter(element => {
return element.zdy==false
});
this.zdyData=this.data.element.attinf.filter(element => {
return element.zdy!=undefined
});
//this.addAttinfFile=JSON.parse(JSON.stringify(this.addAttinfFile))
console.log(this.addAttinfFile,this.zdyData)
let restlt=await new Promise((resolve) => {
this.http.get("/api/BuildingTypes").subscribe((buildData:any)=>{
buildData.forEach(async element => {
if(element.id==this.data.fid){
this.facilityCategoryId=element.facilityCategoryId
let paramsdata:any ={
categoryId:this.facilityCategoryId
}
this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
data.forEach((buildDate,buildi,buildarr) => {
this.filenewDate.push(buildDate)
resolve(data)
});
this.filenewDate.forEach(element => {
element.completed=false
//element.olddata=element.propertyValue
});
})
}
})
})
})
this.filenewDate=JSON.parse(JSON.stringify(this.filenewDate))
console.log(this.filenewDate)
let temp=0
this.filenewDate.forEach((buildval,buindi,buildarr)=>{
temp=0
this.addAttinfFile.forEach((addval,addi,addarr)=>{
if(buildval.name==addval.name){
temp++
}
})
if(temp==0){
//console.log(buildval)
this.addAttinfFile.push(buildval)
}
})
this.addAttinfFile.forEach((addval,addi,addarr)=>{
temp=0
this.filenewDate.forEach((buildval,buindi,buildarr)=>{
if(buildval.name==addval.name){
temp++
}
})
if(temp==0){
this.addAttinfFile.splice(addi,1)
}
})
this.addAttinfFile.push(...this.zdyData)
}
}else{
//消防设施最里层数据
let apifile
this.facilityItems=this.data.facilityItems.filter(element => {
return element.zdy==undefined
});
this.zdyData=this.data.facilityItems.filter(element => {
return element.zdy!=undefined
});
this.facilityItems=JSON.parse(JSON.stringify(this.facilityItems))
console.log(this.facilityItems)
//请求接口，看数据是否有变化
let paramsdata:any ={
categoryId:this.data.fid
}
this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((buildData:any)=>{
buildData.forEach(async element => {
if(element.id==this.data.fid){
this.facilityCategoryId=element.facilityCategoryId
let paramsdata:any ={
categoryId:this.facilityCategoryId
}
let fileResult=await new Promise((resolve) => {
this.http.get("/api/FacilityGroups",{params:paramsdata}).subscribe((data:any)=>{
resolve(data)
})
})
apifile=fileResult
let apifileData//消防设施最内层数据
apifile.forEach(element => {
if(element.name==this.data.filename){
apifileData=element.facilityItems
}
});
console.log(apifileData)
let temp=0
apifileData.forEach((buildval,buindi,buildarr)=>{
temp=0
this.facilityItems.forEach((addval,addi,addarr)=>{
if(buildval.name==addval.name){
temp++
}
})
if(temp==0){
console.log(buildval)
this.facilityItems.push(buildval)
}
})
this.facilityItems.forEach((addval,addi,addarr)=>{
temp=0
apifileData.forEach((buildval,buindi,buildarr)=>{
if(buildarr[buindi].name==addarr[addi].name){
temp++
}
if(temp==0){
console.log(addarr[addi])
this.facilityItems.splice(addi,1)
}
})
})
}
})
})
this.facilityItems.push(...this.zdyData)
}
}
//取消按钮
close(){
this.dialogRef.close(undefined);
}
//确定按钮
defineClick(){
this.dialogRef.close(this.data.element!=undefined&&this.data.element.surveyName=='建筑信息'?
this.addAttinfBuild:this.data.element!=undefined&&this.data.element.surveyName=='消防设施'?this.addAttinfFile:this.facilityItems)
}
}

1
src/app/plan-management/entry-plan-look/AddPlanone.html
Unescape View File

@ -63,7 +63,6 @@
</div> </div>
<div *ngIf="inputword"> <div *ngIf="inputword">
<mat-radio-button value="2" style="margin-right: 10px;">模板在线编制</mat-radio-button> <mat-radio-button value="2" style="margin-right: 10px;">模板在线编制</mat-radio-button>
<!-- <button mat-raised-button *ngIf="isinput" (click)='createWord()'>在线编制预案</button> -->
</div> </div>
<div *ngIf="inputNew"> <div *ngIf="inputNew">
<mat-radio-button value="4" style="margin-right: 10px;">自定义在线编制</mat-radio-button> <mat-radio-button value="4" style="margin-right: 10px;">自定义在线编制</mat-radio-button>

17
src/app/plan-management/entry-plan-look/entry-plan-look.component.html
Unescape View File

@ -74,10 +74,16 @@
</ng-container> </ng-container>
<ng-container matColumnDef="auditstate"> <ng-container matColumnDef="auditstate">
<th mat-header-cell *matHeaderCellDef>审核状态</th> <th mat-header-cell *matHeaderCellDef>新增审核</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? {{element.newVerifyState==null?'':element.newVerifyState}}
'审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}</td> </td>
</ng-container>
<ng-container matColumnDef="weihustate">
<th mat-header-cell *matHeaderCellDef>维护审核</th>
<td mat-cell *matCellDef="let element">
{{element.maintenanceVerifyState==null?'':element.maintenanceVerifyState}}
</td>
</ng-container> </ng-container>
<ng-container matColumnDef="isopen"> <ng-container matColumnDef="isopen">
<th mat-header-cell *matHeaderCellDef>是否公开</th> <th mat-header-cell *matHeaderCellDef>是否公开</th>
@ -93,14 +99,15 @@
<span (click)="changeName(element)" *ngIf="element.auditStatus==8">改名</span> <span (click)="changeName(element)" *ngIf="element.auditStatus==8">改名</span>
<span (click)="upzhuanMb(element)" *ngIf="element.planMode==1&&element.planType==16&&element.planCategory==5">转在线导入</span> <span (click)="upzhuanMb(element)" *ngIf="element.planMode==1&&element.planType==16&&element.planCategory==5">转在线导入</span>
<span (click)="editPlan(element)" <span (click)="editPlan(element)"
[ngClass]="{'grey': !(element.auditStatus!='16' && element.auditStatus != '1')}">编辑</span> [ngClass]="{'grey':element.planMode == '1' || !(element.auditStatus!='16' && element.auditStatus != '1' )}">编辑</span>
<span (click)="lookPlan(element)" *ngIf="element.planType == 2 || element.planType == 16">查看</span> <span (click)="lookPlan(element)" *ngIf="element.planType == 2 || element.planType == 16">查看</span>
<span (click)="readFile(element)" <span (click)="readFile(element)"
[ngClass]="{'grey': element.planMode == '2' || element.planMode == '3'}">下载</span> [ngClass]="{'grey': element.planMode == '2' || 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)"
*ngIf="element.auditStatus==8">提交审核</span> *ngIf="(element.isNewData && element.newVerifyState=='未提交审核')||(!element.isNewData&&(element.maintenanceVerifyState=='审核通过'||element.maintenanceVerifyState=='未提交审核'))">
提交审核</span>
<span (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</span> <span (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</span>
</td> </td>
</ng-container> </ng-container>

10
src/app/plan-management/entry-plan-look/entry-plan-look.component.scss
Unescape View File

@ -26,6 +26,8 @@
.tablebox{ .tablebox{
overflow: auto; overflow: auto;
.add{ .add{
cursor: auto;
text-decoration: none;
display: block; display: block;
width: 40px; width: 40px;
height: 20px; height: 20px;
@ -35,14 +37,18 @@
color: #FFFFFF; color: #FFFFFF;
margin-left: 50px; margin-left: 50px;
} }
.weihu{ .weihu{
//display: block; cursor: auto;
text-decoration: none;
display: block;
width: 64px; width: 64px;
height: 20px; height: 20px;
background: #2196F3; background: #FFC94B;
font-size: 12px; font-size: 12px;
color: #FFFFFF; color: #FFFFFF;
line-height: 20px; line-height: 20px;
margin-left: 40px;
} }
table{ table{
width: 100%; width: 100%;

170
src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
Unescape View File

@ -40,7 +40,7 @@ export class EntryPlanLookComponent implements OnInit {
myControl = new FormControl(); myControl = new FormControl();
hasChild = (_: number, node: any) => node.expandable; hasChild = (_: number, node: any) => node.expandable;
IsNewData=true //维护更新活新增 IsNewData=true //维护更新活新增
displayedColumns: string[] = ['state','planname', 'addpeople', 'addtime','planCategory', 'plantype', 'auditstate', 'isopen', 'preparethelevel', 'operation']; displayedColumns: string[] = ['state','planname', 'addpeople', 'addtime','planCategory', 'plantype', 'auditstate', 'weihustate','isopen', 'preparethelevel', 'operation'];
tabledataSource: any tabledataSource: any
//分页 //分页
@ViewChild(MatPaginator, { static: true }) @ViewChild(MatPaginator, { static: true })
@ -174,7 +174,8 @@ export class EntryPlanLookComponent implements OnInit {
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
let isTrue = confirm('您确定编辑吗,若是公开预案会变成未公开状态') if(e.openRange!='未公开'||e.auditStatus!=8){
let isTrue = confirm('您确定编辑吗,若是公开预案会变成未公开状态,审核状态也会改变')
if(isTrue){ if(isTrue){
if (e.auditStatus == 8) { if (e.auditStatus == 8) {
if (e.planType == 1) { //如果是在线编辑 if (e.planType == 1) { //如果是在线编辑
@ -190,9 +191,9 @@ export class EntryPlanLookComponent implements OnInit {
else if (e.planType == 16) { else if (e.planType == 16) {
if (e.attachmentUrls == null) { if (e.attachmentUrls == null) {
if(e.planMode==4){ if(e.planMode==4){
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&haveNew=true`) window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&planMode=${e.planMode}`)
}else{ }else{
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true`) window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&planMode=${e.planMode}`)
} }
} }
@ -230,22 +231,12 @@ export class EntryPlanLookComponent implements OnInit {
} }
} }
); );
/* if (e.url.indexOf('app') == 0) {
window.location.href = e.url
} else {
sessionStorage.setItem("url", e.url)
if ((e.url as string).includes('gis/threeDimensionalHome')) { //三维预案
window.open(`${e.url}?unitId=${this.companyId}&unitName=${this.unitdata.unitname}&editMode=true`)
} else {
window.open(`/planManagement/webLook`)
}
} */
} else { } else {
this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config); this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config);
} }
} else { } else {
let isTrue = confirm('编辑后审核状态会成为未审核状态，您确定要编辑吗') //let isTrue = confirm('编辑后审核状态会成为未审核状态，您确定要编辑吗')
if (isTrue) {
if (e.planType == 1) { //如果是在线编辑 if (e.planType == 1) { //如果是在线编辑
let id = e.id let id = e.id
sessionStorage.setItem("planId", id) sessionStorage.setItem("planId", id)
@ -259,7 +250,7 @@ export class EntryPlanLookComponent implements OnInit {
else if (e.planType == 16) { else if (e.planType == 16) {
if (e.attachmentUrls == null) { if (e.attachmentUrls == null) {
console.log(this.compantData) console.log(this.compantData)
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}`) window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&planMode=${e.planMode}`)
} }
else { else {
let body = {}; let body = {};
@ -280,16 +271,7 @@ export class EntryPlanLookComponent implements OnInit {
} }
else if (e.planType == 2) { //三维预案 else if (e.planType == 2) { //三维预案
/* if (e.url.indexOf('app') == 0) {
window.location.href = e.url
} else {
sessionStorage.setItem("url", e.url)
if ((e.url as string).includes('gis/threeDimensionalHome')) { //三维预案
window.open(`${e.url}?unitId=${this.companyId}&unitName=${this.unitdata.unitname}&editMode=true`)
} else {
window.open(`/planManagement/webLook`)
}
} */
const dialogRef = this.dialog.open(ChangeUrl, { const dialogRef = this.dialog.open(ChangeUrl, {
data: { element: e } data: { element: e }
}); });
@ -309,9 +291,133 @@ export class EntryPlanLookComponent implements OnInit {
this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config); this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config);
} }
}
} }
} }
}else{
if (e.planType == 1) { //如果是在线编辑
let id = e.id
sessionStorage.setItem("planId", id)
sessionStorage.setItem("companyId", this.companyId)
sessionStorage.setItem("buildingTypeId", this.unittypeId)
sessionStorage.setItem("editable", "1")
sessionStorage.setItem("planName", e.name)
let companyId = sessionStorage.getItem("companyId")
window.open(`/keyUnit/editunitinfo?id=${companyId}&orName=${this.route.snapshot.queryParams.orName}&orId=${this.route.snapshot.queryParams.orId}`);
}
else if (e.planType == 16) {
if (e.attachmentUrls == null) {
if(e.planMode==4){
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&planMode=${e.planMode}`)
}else{
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=true&planMode=${e.planMode}`)
}
}
else {
let body = {};
let resetAudit = true
let headers = new HttpHeaders({
'Content-Type': 'text/json'
});
let options = {
headers
};
this.http.put(`/api/PlanComponents/${e.id}?resetAudit=${resetAudit}`, body, options).subscribe(data => {
this.getAllPlanComponents()
this.lookPlan(e)
}/* ,err => {
this.snackBar.open(err,'确定',config);
} */)
}
}
else if (e.planType == 2) { //三维预案
const dialogRef = this.dialog.open(ChangeUrl, {
//改网址
data: { element: e }
});
dialogRef.afterClosed().subscribe(
data => {
if (data) {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('修改成功!', '确定', config);
this.getAllPlanComponents()
}
}
);
/* if (e.url.indexOf('app') == 0) {
window.location.href = e.url
} else {
sessionStorage.setItem("url", e.url)
if ((e.url as string).includes('gis/threeDimensionalHome')) { //三维预案
window.open(`${e.url}?unitId=${this.companyId}&unitName=${this.unitdata.unitname}&editMode=true`)
} else {
window.open(`/planManagement/webLook`)
}
} */
} else {
this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config);
}
/* else {
if (e.planType == 1) { //如果是在线编辑
let id = e.id
sessionStorage.setItem("planId", id)
sessionStorage.setItem("companyId", this.companyId)
sessionStorage.setItem("buildingTypeId", this.unittypeId)
sessionStorage.setItem("editable", "1")
sessionStorage.setItem("planName", e.name)
let companyId = sessionStorage.getItem("companyId")
window.open(`/keyUnit/editunitinfo?id=${companyId}&orName=${this.route.snapshot.queryParams.orName}&orId=${this.route.snapshot.queryParams.orId}`);
}
else if (e.planType == 16) {
if (e.attachmentUrls == null) {
console.log(this.compantData)
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}`)
}
else {
let body = {};
let resetAudit = true
let headers = new HttpHeaders({
'Content-Type': 'text/json'
});
let options = {
headers
};
this.http.put(`/api/PlanComponents/${e.id}?resetAudit=${resetAudit}`, body, options).subscribe(data => {
this.getAllPlanComponents()
this.lookPlan(e)
})
}
}
else if (e.planType == 2) { //三维预案
const dialogRef = this.dialog.open(ChangeUrl, {
data: { element: e }
});
dialogRef.afterClosed().subscribe(
data => {
if (data) {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('修改成功!', '确定', config);
this.getAllPlanComponents()
}
}
);
} else {
this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config);
}
} */
}
} }
allPlanComponents: any //所有预案组件 allPlanComponents: any //所有预案组件
@ -337,6 +443,7 @@ export class EntryPlanLookComponent implements OnInit {
); );
} }
//获得所有预案组件 //获得所有预案组件
audit:boolean
getAllPlanComponents() { getAllPlanComponents() {
let pagetype = this.route.snapshot.queryParams.pagetype let pagetype = this.route.snapshot.queryParams.pagetype
let unitId = this.route.snapshot.queryParams.unitId let unitId = this.route.snapshot.queryParams.unitId
@ -372,6 +479,11 @@ export class EntryPlanLookComponent implements OnInit {
this.length = data.totalCount this.length = data.totalCount
this.allPlanComponents = data this.allPlanComponents = data
this.tabledataSource = data.items this.tabledataSource = data.items
/* if(this.tabledataSource.isNewData){
this.tabledataSource.auditStatus==8?this.audit=true:false
}else{
(this.tabledataSource.newVerifyState=='待终审'&&this.tabledataSource.newVerifyState=='审核中'&&this.tabledataSource.maintenanceVerifyState!='未提交审核')?this.audit=false:true
} */
}) })
} }
//删除预案 //删除预案
@ -1079,7 +1191,7 @@ export class AddPlanone {
this.planData = plandata this.planData = plandata
this.dialogRef.close(plandata); this.dialogRef.close(plandata);
//console.log(plandata) //console.log(plandata)
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.data.companyId}&planName=${this.planData.name}&unitName=${this.data.unitName}&planCategory=${this.selectedPLanLevel}&planId=${this.planData.id}&haveNew=${haveNew}`) window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.data.companyId}&planName=${this.planData.name}&unitName=${this.data.unitName}&planCategory=${this.selectedPLanLevel}&planId=${this.planData.id}&haveNew=${haveNew}&planMode=${this.defaultisshow}`)
}) })
}else{ }else{
if (open.length > 0) { if (open.length > 0) {

10
src/app/plan-management/entry-plan/entry-plan.component.scss
Unescape View File

@ -101,6 +101,8 @@
} }
.tablebox{ .tablebox{
.add{ .add{
cursor: auto;
text-decoration: none;
display: block; display: block;
width: 40px; width: 40px;
height: 20px; height: 20px;
@ -110,14 +112,18 @@
color: #FFFFFF; color: #FFFFFF;
margin-left: 50px; margin-left: 50px;
} }
.weihu{ .weihu{
//display: block; cursor: auto;
text-decoration: none;
display: block;
width: 64px; width: 64px;
height: 20px; height: 20px;
background: #2196F3; background: #FFC94B;
font-size: 12px; font-size: 12px;
color: #FFFFFF; color: #FFFFFF;
line-height: 20px; line-height: 20px;
margin-left: 40px;
} }
table{ table{
width: 100%; width: 100%;

10
src/app/plan-management/entry-plan/entry-plan.component.ts
Unescape View File

@ -42,8 +42,8 @@ export class EntryPlanComponent implements OnInit {
pageSize:any; //每页条数 pageSize:any; //每页条数
pageSizeOptions: number[] = [10] //设置每页条数 pageSizeOptions: number[] = [10] //设置每页条数
PageNumber:any; //第几页 PageNumber:any; //第几页
IsNewData=true //预案维护更新或者新增 IsNewData='' //预案维护更新或者新增
IsNewCompanyData=true//单位维护更新或者新增 IsNewCompanyData=''//单位维护更新或者新增
displayedColumns: string[] = ['state','unitname','integrity','level','jurisdictionsquadron', 'unittype','plantype', 'passstate','projectlevel','operation']; displayedColumns: string[] = ['state','unitname','integrity','level','jurisdictionsquadron', 'unittype','plantype', 'passstate','projectlevel','operation'];
@ -358,7 +358,7 @@ export class EntryPlanComponent implements OnInit {
onSubmit (value) { onSubmit (value) {
this.PageNumber = 1 this.PageNumber = 1
this.pageEvent.pageIndex = 0 this.pageEvent.pageIndex = 0
this.getAllPlanInfo(); this.getAllPlanInfo()
} }
companyName:any //单位名称 companyName:any //单位名称
@ -373,8 +373,8 @@ export class EntryPlanComponent implements OnInit {
planCategory=[] //预案级别 planCategory=[] //预案级别
//重置 //重置
reset(){ reset(){
this.IsNewCompanyData=true this.IsNewCompanyData=''
this.IsNewData=true this.IsNewData=''
this.companyName = '' this.companyName = ''
this.js = '' this.js = ''
this.jsId = '' this.jsId = ''

33
src/app/plan-management/meet-plan/meet-plan.component.html
Unescape View File

@ -6,7 +6,7 @@
<div class="queryField"> <div class="queryField">
<label style="margin-right: 10px;">预案名称:</label> <label style="margin-right: 10px;">预案名称:</label>
<mat-form-field class="example-full-width"> <mat-form-field class="example-full-width">
<input matInput placeholder="请输入单位名称" name="companyName" autocomplete="off" [(ngModel)]="unitname"> <input matInput placeholder="请输入预案名称" name="companyName" autocomplete="off" [(ngModel)]="unitname">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" > <div class="queryField" >
@ -117,51 +117,58 @@
<div class="tablebox" id="table"> <div class="tablebox" id="table">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8"> <table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="state"> <ng-container matColumnDef="state">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案状态</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
<span class="add" *ngIf="element.isNewData">新增</span> <span class="add" *ngIf="element.isNewData">新增</span>
<span class="weihu" *ngIf="!element.isNewData">维护更新</span> <span class="weihu" *ngIf="!element.isNewData">维护更新</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="unitname"> <ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案名称</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案名称</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td> <td mat-cell *matCellDef="let element">{{element.name}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="level"> <ng-container matColumnDef="level">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案级别</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案级别</th>
<td mat-cell *matCellDef="let element">{{element.planCategory=='6'?'国家级':'市级'}}</td> <td mat-cell *matCellDef="let element">{{element.planCategory=='6'?'国家级':'市级'}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="addname"> <ng-container matColumnDef="addname">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">添加人</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">添加人</th>
<td mat-cell *matCellDef="let element">{{element.creatorName}}</td> <td mat-cell *matCellDef="let element">{{element.creatorName}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="addtime"> <ng-container matColumnDef="addtime">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">添加时间</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">添加时间</th>
<td mat-cell *matCellDef="let element">{{element.creationTime|date:'yyyy-MM-dd'}}</td> <td mat-cell *matCellDef="let element">{{element.creationTime|date:'yyyy-MM-dd'}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="plantype"> <ng-container matColumnDef="plantype">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案类型</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案类型</th>
<td mat-cell *matCellDef="let element">{{element.disasterType}}</td> <td mat-cell *matCellDef="let element">{{element.disasterType}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="passstate"> <ng-container matColumnDef="passstate">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">审核状态</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">新增审核</th>
<td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? <td mat-cell *matCellDef="let element">
'审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}</td> {{element.newVerifyState}}
<!-- {{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?
'审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}} -->
</td>
</ng-container> </ng-container>
<ng-container matColumnDef="isopen"> <ng-container matColumnDef="isopen">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">是否公开</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">是否公开</th>
<td mat-cell *matCellDef="let element">{{element.openRange}}</td> <td mat-cell *matCellDef="let element">{{element.openRange}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="projectlevel"> <ng-container matColumnDef="projectlevel">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">编制级别</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">编制级别</th>
<td mat-cell *matCellDef="let element">{{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}</td> <td mat-cell *matCellDef="let element">{{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="weihustate">
<th mat-header-cell *matHeaderCellDef style="width: 8%;">维护审核</th>
<td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
</ng-container>
<ng-container matColumnDef="operation"> <ng-container matColumnDef="operation">
<th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th> <th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th>
<td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;"> <td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
<span style="color: blue;" (click)='openPlan(element)'>查看预案</span> <span style="color: blue;" (click)='openPlan(element)'>查看预案</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus!=1&&element.auditStatus!=16">提交审核</span> <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="(element.isNewData && element.newVerifyState=='未提交审核')||(!element.isNewData&&(element.maintenanceVerifyState=='审核通过'||element.maintenanceVerifyState=='未提交审核'))">提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</span> <span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</span>
<span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span> <span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span>
<span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>下载</span> <span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>下载</span>

12
src/app/plan-management/meet-plan/meet-plan.component.scss
Unescape View File

@ -112,6 +112,8 @@
} }
.tablebox{ .tablebox{
.add{ .add{
cursor: auto;
text-decoration: none;
display: block; display: block;
width: 40px; width: 40px;
height: 20px; height: 20px;
@ -119,16 +121,20 @@
font-size: 12px; font-size: 12px;
line-height: 20px; line-height: 20px;
color: #FFFFFF; color: #FFFFFF;
margin-left: 50px; margin-left: 35px;
} }
.weihu{ .weihu{
//display: block; cursor: auto;
text-decoration: none;
display: block;
width: 64px; width: 64px;
height: 20px; height: 20px;
background: #2196F3; background: #FFC94B;
font-size: 12px; font-size: 12px;
color: #FFFFFF; color: #FFFFFF;
line-height: 20px; line-height: 20px;
margin-left: 25px;
} }
table{ table{
width: 100%; width: 100%;

31
src/app/plan-management/meet-plan/meet-plan.component.ts
Unescape View File

@ -9,6 +9,7 @@ import { PageEvent } from '@angular/material/paginator';
import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import { TreeService } from '../../http-interceptors/tree.service' import { TreeService } from '../../http-interceptors/tree.service'
import { unwatchFile } from 'fs';
declare var CryptoJS declare var CryptoJS
@Component({ @Component({
selector: 'app-meet-plan', selector: 'app-meet-plan',
@ -82,8 +83,8 @@ export class MeetPlanComponent implements OnInit {
preparelevels: any preparelevels: any
plcheck: boolean //编制级别勾选框 plcheck: boolean //编制级别勾选框
IsNewData=true //维护更新活新增 IsNewData='' //维护更新活新增
displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation']; displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype', 'isopen', 'projectlevel','passstate','weihustate', 'operation'];
tabledataSource tabledataSource
typePlan//新预案类型 typePlan//新预案类型
unitname//预案名称 unitname//预案名称
@ -164,7 +165,30 @@ export class MeetPlanComponent implements OnInit {
} else { } else {
this.PageNumber = 1 this.PageNumber = 1
this.pageEvent.pageIndex = 0 this.pageEvent.pageIndex = 0
this.getAlltabledate(); let reservePlanType
this.reservePlanType ? reservePlanType = JSON.parse(JSON.stringify(this.reservePlanType)) : reservePlanType = ''
if (this.reservePlanType && this.reservePlanType.length != 0) {
reservePlanType = eval(this.reservePlanType.join("|"))
}
let paramsdata: any = {
Name: this.unitname || '',
planCategories: this.level || [6, 7],
//PlanType:reservePlanType||'',
DisasterType: this.typePlan || '',
CreatorName: this.addname || '',
AuditStatus: this.unitstate || '',
CreationTimeRangeStart: this.addtime || '',
CreationTimeRangeEnd: this.endtime || '',
PlanLevel: this.projectlevel || '',
HasChildrenPlanLevel: this.plcheck || '',
PageNumber: this.PageNumber || '1',
PageSize: this.pageSizeOptions[0],
IsNewData:this.IsNewData,
}
this.http.get("/api/PlanComponentsMajor", { params: paramsdata }).subscribe((data: any) => {
this.length = data.totalCount
this.tabledataSource = data.items
})
} }
} }
@ -345,6 +369,7 @@ export class MeetPlanComponent implements OnInit {
this.unitstate = '' this.unitstate = ''
this.projectlevel = '' this.projectlevel = ''
this.plcheck = false this.plcheck = false
this.IsNewData=''
this.getAlltabledate() this.getAlltabledate()
} }
//新增预案弹窗 //新增预案弹窗

29
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
Unescape View File

@ -13,7 +13,7 @@
<div class="queryField"> <div class="queryField">
<label style="margin-right: 10px;">预案名称:</label> <label style="margin-right: 10px;">预案名称:</label>
<mat-form-field class="example-full-width"> <mat-form-field class="example-full-width">
<input matInput placeholder="请输入单位名称" name="companyName" autocomplete="off" [(ngModel)]="unitname"> <input matInput placeholder="请输入预案名称" name="companyName" autocomplete="off" [(ngModel)]="unitname">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" > <div class="queryField" >
@ -108,51 +108,54 @@
<div class="tablebox"> <div class="tablebox">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8"> <table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="state"> <ng-container matColumnDef="state">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案状态</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
<span class="add" *ngIf="element.isNewData">新增</span> <span class="add" *ngIf="element.isNewData">新增</span>
<span class="weihu" *ngIf="!element.isNewData">维护更新</span> <span class="weihu" *ngIf="!element.isNewData">维护更新</span>
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="unitname"> <ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案名称</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案名称</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td> <td mat-cell *matCellDef="let element">{{element.name}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="level"> <ng-container matColumnDef="level">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案级别</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案级别</th>
<td mat-cell *matCellDef="let element">{{url=='2'?'Ⅱ级':'Ⅰ级'}}</td> <td mat-cell *matCellDef="let element">{{url=='2'?'Ⅱ级':'Ⅰ级'}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="addname"> <ng-container matColumnDef="addname">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">添加人</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">添加人</th>
<td mat-cell *matCellDef="let element">{{element.creatorName}}</td> <td mat-cell *matCellDef="let element">{{element.creatorName}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="addtime"> <ng-container matColumnDef="addtime">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">添加时间</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">添加时间</th>
<td mat-cell *matCellDef="let element">{{element.creationTime|date:'yyyy-MM-dd'}}</td> <td mat-cell *matCellDef="let element">{{element.creationTime|date:'yyyy-MM-dd'}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="plantype"> <ng-container matColumnDef="plantype">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案类型</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">预案类型</th>
<td mat-cell *matCellDef="let element">{{element.disasterType}}</td> <td mat-cell *matCellDef="let element">{{element.disasterType}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="passstate"> <ng-container matColumnDef="passstate">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">审核状态</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">新增审核</th>
<td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? <td mat-cell *matCellDef="let element">{{element.newVerifyState}}</td>
'审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="weihustate">
<th mat-header-cell *matHeaderCellDef style="width: 8%;">维护审核</th>
<td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
</ng-container>
<ng-container matColumnDef="isopen"> <ng-container matColumnDef="isopen">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">是否公开</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">是否公开</th>
<td mat-cell *matCellDef="let element">{{element.openRange}}</td> <td mat-cell *matCellDef="let element">{{element.openRange}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="projectlevel"> <ng-container matColumnDef="projectlevel">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">编制级别</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">编制级别</th>
<td mat-cell *matCellDef="let element">{{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}</td> <td mat-cell *matCellDef="let element">{{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="operation"> <ng-container matColumnDef="operation">
<th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th> <th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th>
<td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;"> <td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
<span style="color: blue;" (click)='openPlan(element)'>查看预案</span> <span style="color: blue;" (click)='openPlan(element)'>查看预案</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus!=1&&element.auditStatus!=16">提交审核</span> <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="(element.isNewData && element.newVerifyState=='未提交审核')||(!element.isNewData&&(element.maintenanceVerifyState=='审核通过'||element.maintenanceVerifyState=='未提交审核'))">提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</span> <span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</span>
<span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span> <span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span>
<!-- <span style="color: blue;margin-left: 4px;" *ngIf="element.auditStatus == 2">审核通过</span> --> <!-- <span style="color: blue;margin-left: 4px;" *ngIf="element.auditStatus == 2">审核通过</span> -->

42
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss
Unescape View File

@ -122,24 +122,30 @@
} }
.add{ .add{
display: block; cursor: auto;
width: 40px; text-decoration: none;
height: 20px; display: block;
background: #1AE2AC; width: 40px;
font-size: 12px; height: 20px;
line-height: 20px; background: #1AE2AC;
color: #FFFFFF; font-size: 12px;
margin-left: 50px; line-height: 20px;
} color: #FFFFFF;
.weihu{ margin-left: 35px;
//display: block; }
width: 64px;
height: 20px; .weihu{
background: #2196F3; cursor: auto;
font-size: 12px; text-decoration: none;
color: #FFFFFF; display: block;
line-height: 20px; width: 64px;
} height: 20px;
background: #FFC94B;
font-size: 12px;
color: #FFFFFF;
line-height: 20px;
margin-left: 25px;
}
} }
mat-paginator{ mat-paginator{
width: 100%; width: 100%;

17
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
Unescape View File

@ -95,7 +95,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
url url
preparelevels: any preparelevels: any
plcheck: boolean //编制级别勾选框 plcheck: boolean //编制级别勾选框
displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation']; displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype', 'isopen', 'projectlevel', 'passstate','weihustate','operation'];
tabledataSource tabledataSource
unitname//预案名称 unitname//预案名称
level//预案级别 level//预案级别
@ -114,7 +114,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
pageSize: any; //每页条数 pageSize: any; //每页条数
pageSizeOptions: number[] = [10] //设置每页条数 pageSizeOptions: number[] = [10] //设置每页条数
PageNumber: any; //第几页 PageNumber: any; //第几页
IsNewData=true //维护更新活新增 IsNewData='' //维护更新活新增
//获取表格数据 //获取表格数据
getAlltabledate() { getAlltabledate() {
@ -151,6 +151,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
//重置 //重置
reset() { reset() {
this.IsNewData=''
this.typePlan = '' this.typePlan = ''
this.unitname = '' this.unitname = ''
this.level = '' this.level = ''
@ -167,17 +168,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
//查询 //查询
onSubmit(value) { onSubmit(value) {
//console.log(value) //console.log(value)
if (this.endtime != undefined && this.addtime > this.endtime) { this.getAlltabledate()
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('开始时间不能大于结束时间!', '确定', config);
} else {
this.PageNumber = 1
this.pageEvent.pageIndex = 0
this.getAlltabledate();
}
} }
//删除预案 //删除预案
deletePlan(id) { deletePlan(id) {

28
src/app/plan-management/open-plan/open-plan.component.html
Unescape View File

@ -47,10 +47,22 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='true' [(ngModel)]="IsNewData"> <label style="margin-right: 10px;">单位状态:</label>
<label style="margin-right: 10px;margin-left: 2px;">新增</label> <mat-form-field>
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='false' [(ngModel)]="IsNewData"> <mat-select placeholder='请选择单位状态' [(ngModel)]="IsNewCompanyData" name="IsNewCompanyData">
<label style="margin-right: 10px;margin-left: 2px;">维护更新</label> <mat-option value='true'>新增</mat-option>
<mat-option value="false">维护更新</mat-option>
</mat-select>
</mat-form-field>
</div>
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">预案状态:</label>
<mat-form-field>
<mat-select placeholder='请选择预案状态' [(ngModel)]="IsNewData" name="IsNewData">
<mat-option value='true'>新增</mat-option>
<mat-option value="false">维护更新</mat-option>
</mat-select>
</mat-form-field>
</div> </div>
<div class="queryField" *ngIf="pcfind" > <div class="queryField" *ngIf="pcfind" >
@ -93,8 +105,12 @@
<td mat-cell *matCellDef="let element">{{element.planType | plantype}}</td> <td mat-cell *matCellDef="let element">{{element.planType | plantype}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="auditStatus"> <ng-container matColumnDef="auditStatus">
<th mat-header-cell *matHeaderCellDef>审核状态</th> <th mat-header-cell *matHeaderCellDef>新增审核</th>
<td mat-cell *matCellDef="let element">{{element.auditStatus | auditsatus}}</td> <td mat-cell *matCellDef="let element">{{element.newVerifyState}}</td>
</ng-container>
<ng-container matColumnDef="weihuStatus">
<th mat-header-cell *matHeaderCellDef>维护审核</th>
<td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="openRange"> <ng-container matColumnDef="openRange">

10
src/app/plan-management/open-plan/open-plan.component.scss
Unescape View File

@ -90,6 +90,8 @@
} }
.tablebox{ .tablebox{
.add{ .add{
cursor: auto;
text-decoration: none;
display: block; display: block;
width: 40px; width: 40px;
height: 20px; height: 20px;
@ -99,14 +101,18 @@
color: #FFFFFF; color: #FFFFFF;
margin-left: 50px; margin-left: 50px;
} }
.weihu{ .weihu{
//display: block; cursor: auto;
text-decoration: none;
display: block;
width: 64px; width: 64px;
height: 20px; height: 20px;
background: #2196F3; background: #FFC94B;
font-size: 12px; font-size: 12px;
color: #FFFFFF; color: #FFFFFF;
line-height: 20px; line-height: 20px;
margin-left: 40px;
} }
table{ table{
width: 100%; width: 100%;

8
src/app/plan-management/open-plan/open-plan.component.ts
Unescape View File

@ -43,9 +43,9 @@ export class OpenPlanComponent implements OnInit {
pageSize: any; //每页条数 pageSize: any; //每页条数
pageSizeOptions: number[] = [10] //设置每页条数 pageSizeOptions: number[] = [10] //设置每页条数
PageNumber: any; //第几页 PageNumber: any; //第几页
IsNewData=true //维护更新活新增 IsNewData='' //维护更新活新增
displayedColumns: string[] = ['state','unitname', 'planname', 'addpeople', 'addtime', 'plantype', 'auditStatus', 'openRange', 'projectlevel', 'operation']; displayedColumns: string[] = ['state','unitname', 'planname', 'addpeople', 'addtime', 'plantype', 'auditStatus', 'weihuStatus','openRange', 'projectlevel', 'operation'];
allorganizations: any //所有组织机构 allorganizations: any //所有组织机构
allunittype: any //所有单位类型 allunittype: any //所有单位类型
@ -115,6 +115,7 @@ export class OpenPlanComponent implements OnInit {
allPlanInfo: any //存储所有预案信息 allPlanInfo: any //存储所有预案信息
//获得所有预案信息 //获得所有预案信息
IsNewCompanyData=''
getAllPlanInfo() { getAllPlanInfo() {
let paramsdata: any = { let paramsdata: any = {
CompanyName: this.companyName || '', CompanyName: this.companyName || '',
@ -129,6 +130,7 @@ export class OpenPlanComponent implements OnInit {
PageSize: this.pageSizeOptions[0], PageSize: this.pageSizeOptions[0],
Sort: '', Sort: '',
IsNewData:this.IsNewData, IsNewData:this.IsNewData,
IsNewCompanyData:this.IsNewCompanyData
} }
this.http.get("/api/PublicPlans", { params: paramsdata }).subscribe((data: any) => { this.http.get("/api/PublicPlans", { params: paramsdata }).subscribe((data: any) => {
// console.log(111,data) // console.log(111,data)
@ -291,6 +293,8 @@ export class OpenPlanComponent implements OnInit {
this.pageEvent.pageIndex = 0 this.pageEvent.pageIndex = 0
this.PageNumber = 1 this.PageNumber = 1
this.getAllPlanInfo(); this.getAllPlanInfo();
this.IsNewCompanyData=''
this.IsNewData=''
} }
} }

28
src/app/plan-management/pass-plan/pass-plan.component.html
Unescape View File

@ -110,10 +110,22 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="!padMore&&!pcMore"> <div class="queryField" *ngIf="!padMore&&!pcMore">
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='true' [(ngModel)]="IsNewData"> <label style="margin-right: 10px;">单位状态:</label>
<label style="margin-right: 10px;margin-left: 2px;">新增</label> <mat-form-field>
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='false' [(ngModel)]="IsNewData"> <mat-select placeholder='请选择单位状态' [(ngModel)]="IsNewCompanyData" name="IsNewCompanyData">
<label style="margin-right: 10px;margin-left: 2px;">维护更新</label> <mat-option value='true'>新增</mat-option>
<mat-option value="false">维护更新</mat-option>
</mat-select>
</mat-form-field>
</div>
<div class="queryField" *ngIf="!padMore&&!pcMore">
<label style="margin-right: 10px;">预案状态:</label>
<mat-form-field>
<mat-select placeholder='请选择预案状态' [(ngModel)]="IsNewData" name="IsNewData">
<mat-option value='true'>新增</mat-option>
<mat-option value="false">维护更新</mat-option>
</mat-select>
</mat-form-field>
</div> </div>
</div> </div>
@ -155,8 +167,12 @@
<td mat-cell *matCellDef="let element">{{element.planType | plantype}}</td> <td mat-cell *matCellDef="let element">{{element.planType | plantype}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="auditStatus"> <ng-container matColumnDef="auditStatus">
<th mat-header-cell *matHeaderCellDef>审核状态</th> <th mat-header-cell *matHeaderCellDef>新增审核</th>
<td mat-cell *matCellDef="let element">{{element.auditStatus | auditsatus}}</td> <td mat-cell *matCellDef="let element">{{element.newVerifyState}}</td>
</ng-container>
<ng-container matColumnDef="weihuState">
<th mat-header-cell *matHeaderCellDef>维护审核</th>
<td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="openRange"> <ng-container matColumnDef="openRange">

10
src/app/plan-management/pass-plan/pass-plan.component.scss
Unescape View File

@ -96,6 +96,8 @@
} }
.tablebox{ .tablebox{
.add{ .add{
cursor: auto;
text-decoration: none;
display: block; display: block;
width: 40px; width: 40px;
height: 20px; height: 20px;
@ -105,14 +107,18 @@
color: #FFFFFF; color: #FFFFFF;
margin-left: 50px; margin-left: 50px;
} }
.weihu{ .weihu{
//display: block; cursor: auto;
text-decoration: none;
display: block;
width: 64px; width: 64px;
height: 20px; height: 20px;
background: #2196F3; background: #FFC94B;
font-size: 12px; font-size: 12px;
color: #FFFFFF; color: #FFFFFF;
line-height: 20px; line-height: 20px;
margin-left: 40px;
} }
table{ table{
width: 100%; width: 100%;

10
src/app/plan-management/pass-plan/pass-plan.component.ts
Unescape View File

@ -44,11 +44,11 @@ export class PassPlanComponent implements OnInit {
pageSizeOptions: number[] = [10] //设置每页条数 pageSizeOptions: number[] = [10] //设置每页条数
PageNumber: any; //第几页 PageNumber: any; //第几页
displayedColumns: string[] = ['state','planname', 'addpeople', 'level', 'addtime', 'plantype', 'auditStatus', 'openRange', 'projectlevel', 'operation']; displayedColumns: string[] = ['state','planname', 'addpeople', 'level', 'addtime', 'plantype', 'auditStatus','weihuState', 'openRange', 'projectlevel', 'operation'];
allorganizations: any //所有组织机构 allorganizations: any //所有组织机构
allunittype: any //所有单位类型 allunittype: any //所有单位类型
tabledataSource: any //表格数据 tabledataSource: any //表格数据
IsNewData=true //维护更新活新增 IsNewData='' //维护更新活新增
url url
preparelevels: any preparelevels: any
@ -116,6 +116,7 @@ export class PassPlanComponent implements OnInit {
} }
allPlanInfo: any //存储所有预案信息 allPlanInfo: any //存储所有预案信息
IsNewCompanyData='' //单位是新增还是维护更新
//获得所有预案信息 //获得所有预案信息
getAllPlanInfo() { getAllPlanInfo() {
let reservePlanType let reservePlanType
@ -139,6 +140,7 @@ export class PassPlanComponent implements OnInit {
Sort: '', Sort: '',
PlanCategories: this.planCategory, PlanCategories: this.planCategory,
IsNewData:this.IsNewData, IsNewData:this.IsNewData,
IsNewCompanyData:this.IsNewCompanyData
} }
this.http.get("/api/ApprovedPlans", { params: paramsdata }).subscribe((data: any) => { this.http.get("/api/ApprovedPlans", { params: paramsdata }).subscribe((data: any) => {
this.length = data.totalCount this.length = data.totalCount
@ -438,7 +440,7 @@ export class PassPlanComponent implements OnInit {
onSubmit(e) { onSubmit(e) {
this.PageNumber = 1 this.PageNumber = 1
this.pageEvent.pageIndex = 0 this.pageEvent.pageIndex = 0
this.getAllPlanInfo(); this.getAllPlanInfo()
} }
companyName: any //单位名称 companyName: any //单位名称
js: any //所选组织机构 js: any //所选组织机构
@ -451,6 +453,8 @@ export class PassPlanComponent implements OnInit {
planCategory = []//预案级别 planCategory = []//预案级别
//重置 //重置
reset() { reset() {
this.IsNewData=''
this.IsNewCompanyData=''
this.companyName = '' this.companyName = ''
this.js = '' this.js = ''
this.jsId = '' this.jsId = ''

3
src/app/plan-management/plan-management.module.ts
Unescape View File

@ -74,12 +74,13 @@ import { newTitle } from './create-plan-online-five/create-plan-online-five.comp
import { disaster } from './create-plan-online-five/create-plan-online-five.component' import { disaster } from './create-plan-online-five/create-plan-online-five.component'
import { updataHl } from './create-plan-online-five/create-plan-online-five.component' import { updataHl } from './create-plan-online-five/create-plan-online-five.component'
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'
@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], OpenPlanToolDialog,yinYong,newTitle,disaster,updataHl,ChangeUrl,adddwsurveys],
imports: [ imports: [
CommonModule, CommonModule,
PlanManagementRoutingModule, PlanManagementRoutingModule,

28
src/app/plan-management/reinforce-plan/reinforce-plan.component.html
Unescape View File

@ -79,10 +79,22 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='true' [(ngModel)]="IsNewData"> <label style="margin-right: 10px;">单位状态:</label>
<label style="margin-right: 10px;margin-left: 2px;">新增</label> <mat-form-field>
<input type="radio" style="height: 16px;width: 16px;position: relative;top: 2px;" name="whgx" [value]='false' [(ngModel)]="IsNewData"> <mat-select placeholder='请选择单位状态' [(ngModel)]="IsNewCompanyData" name="IsNewCompanyData">
<label style="margin-right: 10px;margin-left: 2px;">维护更新</label> <mat-option value='true'>新增</mat-option>
<mat-option value="false">维护更新</mat-option>
</mat-select>
</mat-form-field>
</div>
<div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">预案状态:</label>
<mat-form-field>
<mat-select placeholder='请选择预案状态' [(ngModel)]="IsNewData" name="IsNewData">
<mat-option value='true'>新增</mat-option>
<mat-option value="false">维护更新</mat-option>
</mat-select>
</mat-form-field>
</div> </div>
<div class="queryField" style="width: 100%;text-align: center;" *ngIf="pcfind"> <div class="queryField" style="width: 100%;text-align: center;" *ngIf="pcfind">
<button mat-raised-button color="primary" type="submit">查询</button> <button mat-raised-button color="primary" type="submit">查询</button>
@ -131,8 +143,12 @@
<td mat-cell *matCellDef="let element">二维预案</td> <td mat-cell *matCellDef="let element">二维预案</td>
</ng-container> </ng-container>
<ng-container matColumnDef="auditStatus"> <ng-container matColumnDef="auditStatus">
<th mat-header-cell *matHeaderCellDef>审核状态</th> <th mat-header-cell *matHeaderCellDef>新增审核</th>
<td mat-cell *matCellDef="let element">{{element.auditStatus | auditsatus}}</td> <td mat-cell *matCellDef="let element">{{element.newVerifyState}}</td>
</ng-container>
<ng-container matColumnDef="weihuStatus">
<th mat-header-cell *matHeaderCellDef>维护审核</th>
<td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="openRange"> <ng-container matColumnDef="openRange">
<th mat-header-cell *matHeaderCellDef>是否公开</th> <th mat-header-cell *matHeaderCellDef>是否公开</th>

10
src/app/plan-management/reinforce-plan/reinforce-plan.component.scss
Unescape View File

@ -91,6 +91,8 @@
} }
.tablebox{ .tablebox{
.add{ .add{
cursor: auto;
text-decoration: none;
display: block; display: block;
width: 40px; width: 40px;
height: 20px; height: 20px;
@ -100,14 +102,18 @@
color: #FFFFFF; color: #FFFFFF;
margin-left: 50px; margin-left: 50px;
} }
.weihu{ .weihu{
//display: block; cursor: auto;
text-decoration: none;
display: block;
width: 64px; width: 64px;
height: 20px; height: 20px;
background: #2196F3; background: #FFC94B;
font-size: 12px; font-size: 12px;
color: #FFFFFF; color: #FFFFFF;
line-height: 20px; line-height: 20px;
margin-left: 40px;
} }
table{ table{
width: 100%; width: 100%;

10
src/app/plan-management/reinforce-plan/reinforce-plan.component.ts
Unescape View File

@ -44,11 +44,11 @@ export class ReinforcePlanComponent implements OnInit {
pageSizeOptions: number[] = [10] //设置每页条数 pageSizeOptions: number[] = [10] //设置每页条数
PageNumber:any; //第几页 PageNumber:any; //第几页
displayedColumns: string[] = ['state','unitname','planname', 'addpeople','level','addtime','plantype','auditStatus','openRange','projectlevel','operation']; displayedColumns: string[] = ['state','unitname','planname', 'addpeople','level','addtime','plantype','auditStatus','weihuStatus','openRange','projectlevel','operation'];
allorganizations:any //所有组织机构 allorganizations:any //所有组织机构
allunittype:any //所有单位类型 allunittype:any //所有单位类型
tabledataSource:any //表格数据 tabledataSource:any //表格数据
IsNewData=true //维护更新活新增 IsNewData='' //维护更新活新增
preparelevels:any preparelevels:any
ngOnInit(): void { ngOnInit(): void {
@ -114,6 +114,7 @@ export class ReinforcePlanComponent implements OnInit {
allPlanInfo:any //存储所有预案信息 allPlanInfo:any //存储所有预案信息
//获得所有预案信息 //获得所有预案信息
IsNewCompanyData=''//单位维护更新或者新增
getAllPlanInfo(){ getAllPlanInfo(){
let paramsdata:any = { let paramsdata:any = {
CompanyName: this.companyName || '', CompanyName: this.companyName || '',
@ -130,6 +131,7 @@ export class ReinforcePlanComponent implements OnInit {
PageSize: this.pageSizeOptions[0], PageSize: this.pageSizeOptions[0],
Sort: '', Sort: '',
IsNewData:this.IsNewData, IsNewData:this.IsNewData,
IsNewCompanyData:this.IsNewCompanyData
} }
this.http.get("/api/ApprovedPlans/GetReinforcementPlanComponents",{params:paramsdata}).subscribe((data:any)=>{ this.http.get("/api/ApprovedPlans/GetReinforcementPlanComponents",{params:paramsdata}).subscribe((data:any)=>{
// console.log('增援预案列表',data) // console.log('增援预案列表',data)
@ -203,7 +205,7 @@ export class ReinforcePlanComponent implements OnInit {
onSubmit (e) { onSubmit (e) {
this.PageNumber = 1 this.PageNumber = 1
this.pageEvent.pageIndex = 0 this.pageEvent.pageIndex = 0
this.getAllPlanInfo(); this.getAllPlanInfo()
} }
companyName:any //单位名称 companyName:any //单位名称
js:any //所选组织机构 js:any //所选组织机构
@ -215,6 +217,8 @@ export class ReinforcePlanComponent implements OnInit {
plcheck:boolean //编制级别勾选框 plcheck:boolean //编制级别勾选框
//重置 //重置
reset(){ reset(){
this.IsNewData=''
this.IsNewCompanyData=''
this.companyName = '' this.companyName = ''
this.js = '' this.js = ''
this.jsId = '' this.jsId = ''

15
src/app/plan-management/type-plan/type-plan.component.html
Unescape View File

@ -6,7 +6,7 @@
<div class="queryField"> <div class="queryField">
<label style="margin-right: 10px;">预案名称:</label> <label style="margin-right: 10px;">预案名称:</label>
<mat-form-field class="example-full-width"> <mat-form-field class="example-full-width">
<input matInput placeholder="请输入单位名称" name="companyName" autocomplete="off" [(ngModel)]="unitname"> <input matInput placeholder="请输入预案名称" name="companyName" autocomplete="off" [(ngModel)]="unitname">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" > <div class="queryField" >
@ -120,9 +120,10 @@
<td mat-cell *matCellDef="let element">类型预案</td> <td mat-cell *matCellDef="let element">类型预案</td>
</ng-container> </ng-container>
<ng-container matColumnDef="passstate"> <ng-container matColumnDef="passstate">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">审核状态</th> <th mat-header-cell *matHeaderCellDef style="width: 10%;">新增审核</th>
<td mat-cell *matCellDef="let element">{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? <td mat-cell *matCellDef="let element">
'审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}</td> {{element.newVerifyState}}
</td>
</ng-container> </ng-container>
<ng-container matColumnDef="isopen"> <ng-container matColumnDef="isopen">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">是否公开</th> <th mat-header-cell *matHeaderCellDef style="width: 10%;">是否公开</th>
@ -132,11 +133,15 @@
<th mat-header-cell *matHeaderCellDef style="width: 10%;">编制级别</th> <th mat-header-cell *matHeaderCellDef style="width: 10%;">编制级别</th>
<td mat-cell *matCellDef="let element">{{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}</td> <td mat-cell *matCellDef="let element">{{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="weihustate">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">维护审核</th>
<td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
</ng-container>
<ng-container matColumnDef="operation"> <ng-container matColumnDef="operation">
<th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th> <th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th>
<td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;"> <td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
<span style="color: blue;" (click)='openPlan(element)'>查看预案</span> <span style="color: blue;" (click)='openPlan(element)'>查看预案</span>
<span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="element.auditStatus!=1&&element.auditStatus!=16">提交审核</span> <span style="color: blue;margin-left: 4px;" (click)="submitAudit(element)" *ngIf="(element.isNewData && element.newVerifyState=='未提交审核')||(!element.isNewData&&(element.maintenanceVerifyState=='审核通过'||element.maintenanceVerifyState=='未提交审核'))">提交审核</span>
<span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</span> <span style="color: blue;margin-left: 4px;" (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1||element.auditStatus == 16">撤销审核</span>
<span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span> <span style="color: blue;margin-left: 4px;" (click)="auditResult(element)">审批结果</span>
<span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>下载</span> <span style="color: blue;margin-left: 4px;" (click)='readFile(element)'>下载</span>

10
src/app/plan-management/type-plan/type-plan.component.scss
Unescape View File

@ -112,6 +112,8 @@
} }
.tablebox{ .tablebox{
.add{ .add{
cursor: auto;
text-decoration: none;
display: block; display: block;
width: 40px; width: 40px;
height: 20px; height: 20px;
@ -121,14 +123,18 @@
color: #FFFFFF; color: #FFFFFF;
margin-left: 50px; margin-left: 50px;
} }
.weihu{ .weihu{
//display: block; cursor: auto;
text-decoration: none;
display: block;
width: 64px; width: 64px;
height: 20px; height: 20px;
background: #2196F3; background: #FFC94B;
font-size: 12px; font-size: 12px;
color: #FFFFFF; color: #FFFFFF;
line-height: 20px; line-height: 20px;
margin-left: 40px;
} }
table{ table{
width: 100%; width: 100%;

16
src/app/plan-management/type-plan/type-plan.component.ts
Unescape View File

@ -89,8 +89,8 @@ export class TypePlanComponent implements OnInit {
levels levels
preparelevels: any preparelevels: any
plcheck: boolean //编制级别勾选框 plcheck: boolean //编制级别勾选框
IsNewData=true //维护更新活新增 IsNewData='' //维护更新活新增
displayedColumns: string[] = ['state','unitname', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation']; displayedColumns: string[] = ['state','unitname', 'addname', 'addtime', 'plantype', 'isopen', 'projectlevel','passstate','weihustate', 'operation'];
tabledataSource tabledataSource
unitname//预案名称 unitname//预案名称
level//预案级别 level//预案级别
@ -137,6 +137,7 @@ export class TypePlanComponent implements OnInit {
//重置 //重置
reset() { reset() {
this.IsNewData=''
this.unitname = '' this.unitname = ''
this.level = '' this.level = ''
this.addname = '' this.addname = ''
@ -150,16 +151,7 @@ export class TypePlanComponent implements OnInit {
//查询 //查询
onSubmit(value) { onSubmit(value) {
if (this.endtime != undefined && this.addtime > this.endtime) { this.getAlltabledate()
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('开始时间不能大于结束时间!', '确定', config);
} else {
this.PageNumber = 1
this.pageEvent.pageIndex = 0
this.getAlltabledate();
}
} }

4
src/app/ui/collection-tools-plan/addPlaneFigure.html
Unescape View File

@ -12,9 +12,9 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div class="keyMargin"> <!-- <div class="keyMargin">
<a href="javascript:;" class="uploadBackGround" (click)='toGIS()' [ngClass]="{'uploadBackGroundSelected': selectedType == 'gis'}">导入GIS地图</a> <a href="javascript:;" class="uploadBackGround" (click)='toGIS()' [ngClass]="{'uploadBackGroundSelected': selectedType == 'gis'}">导入GIS地图</a>
</div> </div> -->
<div class="keyMargin"> <div class="keyMargin">
<a href="javascript:;" class="uploadBackGround" [ngClass]="{'uploadBackGroundSelected': selectedType == 'image'}"> <a href="javascript:;" class="uploadBackGround" [ngClass]="{'uploadBackGroundSelected': selectedType == 'image'}">

Write Preview
Loading…
Cancel
Save