diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.ts b/src/app/gis-management/gis-labeling/gis-labeling.component.ts index 44a1941..c0f837f 100644 --- a/src/app/gis-management/gis-labeling/gis-labeling.component.ts +++ b/src/app/gis-management/gis-labeling/gis-labeling.component.ts @@ -1577,7 +1577,7 @@ export class LookPlanDialog { ngOnInit() { - // console.log(this.data) + console.log(this.data) this.getAllPlans() } //关闭弹窗 @@ -1603,7 +1603,7 @@ export class LookPlanDialog { } //查看预案 lookPlan(e) { - if (e.planMode == 0) { + /* if (e.planMode == 0) { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 @@ -1636,7 +1636,56 @@ export class LookPlanDialog { 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`) + } + } + } } //点击下载 diff --git a/src/app/gis-management/gis-labeling/lookPlan.html b/src/app/gis-management/gis-labeling/lookPlan.html index c9c0ad9..97d3ede 100644 --- a/src/app/gis-management/gis-labeling/lookPlan.html +++ b/src/app/gis-management/gis-labeling/lookPlan.html @@ -37,7 +37,7 @@ {{item.planLevel | planlevel}} 查看 - 下载 + 下载 diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.html b/src/app/key-unit/key-unit-management/key-unit-management.component.html index f2ea551..4b4b7b8 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.html +++ b/src/app/key-unit/key-unit-management/key-unit-management.component.html @@ -332,12 +332,26 @@ {{element.modifiedTime|date:'yyyy-MM-dd'}} + + 新增审核 + + {{element.newVerifyState}} + + + + + 维护审核 + + {{element.maintenanceVerifyState}} + + 操作 查看详情 提交审核 { + console.log(data) this.length = data.totalCount this.allKeyUnitInfo = data // data.items.sort( (a,b) => { @@ -393,7 +394,7 @@ export class KeyUnitManagementComponent implements OnInit { item.integrity = this.wanzhengduArr[index] }) //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.integrityScoreMax=undefined this.integrityScoreMin=undefined + this.IsNewData='' + this.getAllKeyUnit(); } //编辑单位名称 @@ -681,14 +684,7 @@ export class KeyUnitManagementComponent implements OnInit { onSubmit(value){ this.PageNumber = 1 this.pageEvent.pageIndex = 0 - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - if(this.integrityScoreMax联动力量 - 编制级别： + 状态： + + + 新增 + 维护更新 + + + 编制级别： {{item.name}} @@ -104,9 +111,10 @@
- + + - + @@ -117,15 +125,16 @@
类型状态类型 预案类型名称名称 操作 所属组织 审核状态
- + - - + + diff --git a/src/app/plan-audit/plan-record/plan-record.component.scss b/src/app/plan-audit/plan-record/plan-record.component.scss index 3c8f655..9d0a39d 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.scss +++ b/src/app/plan-audit/plan-record/plan-record.component.scss @@ -118,6 +118,7 @@ } } .headthree{ + height: 45px; @media screen and (min-device-width:1400px){ margin-left: 30px; @@ -125,13 +126,13 @@ @media screen and (max-device-width:1200px){ font-size: 13px; mat-form-field{ - width: 120px; + width: 50px; } } @media screen and (max-device-width:1400px) and (min-device-width:1200px){ margin-left: 15px; mat-form-field{ - width: 120px; + width: 50px; } } } @@ -188,6 +189,7 @@ } } } + .tablediv{ width: 100%; height: 100%; @@ -304,7 +306,7 @@ th,td{ } .green{color: #00C756;} .red{color: #FF4D4D;} -.blue{color: #2196F3;} +.yellow{color: #FFC94B;} .twoD { width: 100%; box-sizing: border-box; @@ -326,4 +328,7 @@ th,td{ } ::-webkit-scrollbar-thumb{ background-color: #2196F3; - } \ No newline at end of file + } + .mat-form-field-infix{ + width: 100px; +} \ No newline at end of file diff --git a/src/app/plan-audit/plan-record/plan-record.component.ts b/src/app/plan-audit/plan-record/plan-record.component.ts index 546791b..f683be1 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.ts +++ b/src/app/plan-audit/plan-record/plan-record.component.ts @@ -93,6 +93,7 @@ export class PlanRecordComponent implements OnInit { fetchUrl companyName plantypes + IsNewData=[true,false] //获取表格数据 getAlltabledate() { @@ -103,7 +104,8 @@ export class PlanRecordComponent implements OnInit { verifyState: this.verifyState || [1, 2, 4, 5], QueryStartTime: this.addtime || '', QueryEndTime: this.endtime || '', - PlanType:this.plantypes||[] + PlanType:this.plantypes||[], + IsNewData:this.IsNewData } this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => { //console.log(data) diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html index 22d0fed..3e3d469 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -39,7 +39,14 @@
- 预案类型： + 状态： + + + 新增 + 维护更新 + + + 预案类型： 二维预案 @@ -48,6 +55,7 @@ 文本预案 + @@ -56,52 +64,56 @@
-
-
+ {{item.itemMaintenanceState=='0'?'新增':'维护'}} {{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'?'联动力量':'未知'}} {{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}} {{item.title}}{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}{{item.title}}{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}} {{item.organizationName}} {{item.verifyState=='0'?'待初审':item.verifyState=='1'? '初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}}
- - - - - - - - - - + + +
+
类型预案类型名称操作所属组织审核状态提交人提交时间
+ + + + + + + + + + + +
状态类型预案类型名称操作所属组织审核状态提交人提交时间
+
+ + + + + + + + + + + +
+ + + {{item.itemMaintenanceState=='0'?'新增':'维护'}} + + {{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'?'联动力量':'未知'}} + + {{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}} + {{item.title}} + {{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}{{item.organizationName}} + {{item.verifyState=='0'?'待初审':item.verifyState=='1'? + '初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}} + {{item.creatorName}}{{item.createTime|date:'yyyy-MM-dd'}}
-
- - - - - - - - - - - -
- - - {{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'?'联动力量':'未知'}} - - {{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}} - {{item.title}} - {{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}{{item.organizationName}} - {{item.verifyState=='0'?'待初审':item.verifyState=='1'? - '初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}} - {{item.creatorName}}{{item.createTime|date:'yyyy-MM-dd'}}
-
+
-
-
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss index 8b8e8ec..89f01ff 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss @@ -85,7 +85,7 @@ } .find{ @media screen and (min-device-width: 1400px){ - margin-left: 100px; + margin-left: 200px; } } @media screen and (min-device-width: 1400px) { @@ -132,13 +132,11 @@ } .tablediv { width: 100%; - height: 70%; + height: 62%; .tbodycss { - @media screen and (min-device-width: 1400px) { - overflow-y: auto; - } + overflow-y: auto; - height: 600px; + height: 100%; width: 100%; .selectedTr { background-color: #b3d3ee; @@ -285,8 +283,8 @@ td { .red { color: #ff4d4d; } -.blue { - color: #2196f3; +.yellow { + color: #FFC94B; } .accordingin { margin: 5px; diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts index 9440632..72dd752 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -110,6 +110,7 @@ export class WaitExamineerComponent implements OnInit { fetchUrl companyName plantypes + IsNewData=[true,false] //获取表格数据 getAlltabledate() { @@ -118,7 +119,8 @@ export class WaitExamineerComponent implements OnInit { ContentType: Number(this.projectlevel) || [], Level: this.PlanLevel || [], verifyState: [0, 3], - PlanType:this.plantypes||[] + PlanType:this.plantypes||[], + IsNewData:this.IsNewData } this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => { this.tableDate = data.items diff --git a/src/app/plan-management/create-plan-online-five/addattinf.html b/src/app/plan-management/create-plan-online-five/addattinf.html new file mode 100644 index 0000000..a7fe071 --- /dev/null +++ b/src/app/plan-management/create-plan-online-five/addattinf.html @@ -0,0 +1,33 @@ + +
+
+ 新增分组 +
+ +
+
+ {{item.propertyName}} +
+
+
+
+ {{item.name}} +
+
+
+
+ {{item.name}} +
+
+
+ + +
+
\ No newline at end of file diff --git a/src/app/plan-management/create-plan-online-five/addgroup.scss b/src/app/plan-management/create-plan-online-five/addgroup.scss new file mode 100644 index 0000000..ecfba06 --- /dev/null +++ b/src/app/plan-management/create-plan-online-five/addgroup.scss @@ -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; + } + } +} \ No newline at end of file diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html index 4642e56..6c47d3f 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html @@ -455,8 +455,8 @@ line-height: 40px; color: #b99a00;">{{element.headName}} - - + +
@@ -520,24 +520,27 @@ - - - - - -
- {{itemthj.head}} - - {{itemthj.body}} -
+ + + + + + + +
+ {{itemthj.head}} + {{itemthj.body}} +
@@ -660,12 +663,7 @@ -->
- +
{{itemunit.name}} - + + 自定义
{{element.surveyName}} + + - +
@@ -806,31 +807,32 @@
-
-
+
+
- - - - - -
{{info.propertyName}}{{info.propertyValue}}
+
+ + + + + +
{{info.propertyName}}{{info.propertyValue}}
@@ -842,34 +844,36 @@ text-align: center;"> {{attack.name}} - + *ngIf="pattern == 'edit'" + (click)='unitadd(element.surveyName,uniti,attacki,0)'> +
-
+
- - - - - -
{{info.name}}{{info.value}}
+
+ + + + + +
{{info.name}}{{info.value}}
@@ -877,48 +881,56 @@
-
-
- - - - - - - - -
{{info.name}}{{info.value}}
+
+
+
+ + + +
+ +
+ + + + + +
{{info.name}}{{info.value}}
-
-
- - - - - - - - -
{{info.name}}{{info.value}}
+
+
+
+ + + + +
+ + + + + + +
{{info.name}}{{info.value}}
@@ -936,121 +948,57 @@ color: #b99a00;" *ngIf="pattern == 'look'">{{parts.heafName}}
-
+
- - - - - -
- {{parts.body[0].name}} - - - {{parts.body[0].value}} - -
+
- - - - - -
- {{parts.body[1].name}} - - - {{parts.body[1].value}} - -
+
- - - - - -
- {{parts.body[2].name}} - - - {{parts.body[2].value}} - -
+
- - - - - -
- {{parts.body[3].name}} - - - {{parts.body[3].value}} - -
+
- - - - - -
- {{parts.body[4].name}} - - - {{parts.body[4].value}} - -
+
+ + + + + +
+ {{partsbody.name}} + + + {{partsbody.value}} + +
@@ -1138,24 +1086,27 @@ - - - - - -
- {{itemthj.head}} - - {{itemthj.body}} -
+
+
+ + + + + +
+ {{itemthj.head}} + {{itemthj.body}} +
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts index 90442c8..7378932 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts @@ -21,6 +21,7 @@ import Viewer from 'viewerjs'; import { async } from 'rxjs/internal/scheduler/async'; import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; import { adddwsurvey, addGroup } from '@src/app/ui/plan-template/plan-template.component'; +import { zdyaddattinf } from '../../ui/plan-template/plan-template.component' declare var $: any @Component({ selector: 'app-create-plan-online-five', @@ -59,8 +60,12 @@ export class CreatePlanOnlineFiveComponent implements OnInit { blockyl = true zaixianDr=false haveNew=false + planMode//预案类型 + //index ngOnInit(): void { + //this.index = this.getArrayIndex(this.planTemplateData,'单位概况') this.haveNew=this.route.snapshot.queryParams.haveNew + this.planMode=this.route.snapshot.queryParams.planMode console.log(this.route.snapshot.queryParams.wordChange) this.planLevel = this.route.snapshot.queryParams.planCategory if (this.route.snapshot.queryParams.pattern == 'false') { @@ -446,6 +451,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { buildingsData = [] buildDataName buildZong + basicCategoryId //获得所有建筑信息 async getAllBuildingsInfo() { let index = this.getArrayIndex(this.planTemplateData,'单位概况') @@ -466,6 +472,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { }).subscribe((buildingsData: any) => { //console.log(buildingsData) this.buildingsData.push(buildingsData[0]) + //this.basicCategoryId=buildingsData[0].basicCategoryId resolve(this.buildingsData) }) } @@ -580,8 +587,8 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } getTemplateData() { this.http.get(`/api/PlanComponents/${this.route.snapshot.queryParams.planId}/WebText`).subscribe((data: any) => { - console.log('预案内容', data) - if(this.route.snapshot.queryParams.haveNew!=undefined&&data.webTextData==null){ + console.log('预案内容', data.webTextData) + if(this.route.snapshot.queryParams.planMode==4&&data.webTextData==null){ this.planTemplateData=[] let obj = { completed: true, @@ -1479,7 +1486,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { if(fileNum==0){ this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].facilityItems.push({ name: '', value: '',completed:true,zdy:true}) }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); } } +//建筑跟消防设施添加模板数据 +@Component({ + selector: 'adddwsurveys', + templateUrl: './addattinf.html', + styleUrls: ['./addgroup.scss'] +}) +export class adddwsurveys{ + constructor(private http: HttpClient,public dialogRef: MatDialogRef,@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) +} +} diff --git a/src/app/plan-management/entry-plan-look/AddPlanone.html b/src/app/plan-management/entry-plan-look/AddPlanone.html index 084ca02..45e896c 100644 --- a/src/app/plan-management/entry-plan-look/AddPlanone.html +++ b/src/app/plan-management/entry-plan-look/AddPlanone.html @@ -63,7 +63,6 @@
模板在线编制 -
自定义在线编制 diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html index f38a9b6..0aea5f4 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html @@ -74,10 +74,16 @@ - 审核状态 + 新增审核 - {{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? - '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}} + {{element.newVerifyState==null?'':element.newVerifyState}} + + + + 维护审核 + + {{element.maintenanceVerifyState==null?'':element.maintenanceVerifyState}} + 是否公开 @@ -93,14 +99,15 @@ 改名 转在线导入 编辑 + [ngClass]="{'grey':element.planMode == '1' || !(element.auditStatus!='16' && element.auditStatus != '1' )}">编辑 查看 下载 删除 审批结果 提交审核 + *ngIf="(element.isNewData && element.newVerifyState=='未提交审核')||(!element.isNewData&&(element.maintenanceVerifyState=='审核通过'||element.maintenanceVerifyState=='未提交审核'))"> + 提交审核 撤销审核 diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss b/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss index a50c639..8af8f8b 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss @@ -26,6 +26,8 @@ .tablebox{ overflow: auto; .add{ + cursor: auto; + text-decoration: none; display: block; width: 40px; height: 20px; @@ -35,14 +37,18 @@ color: #FFFFFF; margin-left: 50px; } + .weihu{ - //display: block; + cursor: auto; + text-decoration: none; + display: block; width: 64px; height: 20px; - background: #2196F3; + background: #FFC94B; font-size: 12px; color: #FFFFFF; line-height: 20px; + margin-left: 40px; } table{ width: 100%; diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index f2cc0e7..6c963a1 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts @@ -40,7 +40,7 @@ export class EntryPlanLookComponent implements OnInit { myControl = new FormControl(); hasChild = (_: number, node: any) => node.expandable; 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 //分页 @ViewChild(MatPaginator, { static: true }) @@ -174,7 +174,8 @@ export class EntryPlanLookComponent implements OnInit { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - let isTrue = confirm('您确定编辑吗,若是公开预案会变成未公开状态') + if(e.openRange!='未公开'||e.auditStatus!=8){ + let isTrue = confirm('您确定编辑吗,若是公开预案会变成未公开状态,审核状态也会改变') if(isTrue){ if (e.auditStatus == 8) { if (e.planType == 1) { //如果是在线编辑 @@ -190,9 +191,9 @@ export class EntryPlanLookComponent implements OnInit { 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&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{ - 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 { this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config); } } else { - let isTrue = confirm('编辑后审核状态会成为未审核状态，您确定要编辑吗') - if (isTrue) { + //let isTrue = confirm('编辑后审核状态会成为未审核状态，您确定要编辑吗') if (e.planType == 1) { //如果是在线编辑 let id = e.id sessionStorage.setItem("planId", id) @@ -259,7 +250,7 @@ export class EntryPlanLookComponent implements OnInit { 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}`) + 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 { let body = {}; @@ -280,16 +271,7 @@ export class EntryPlanLookComponent implements OnInit { } 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, { data: { element: e } }); @@ -309,9 +291,133 @@ export class EntryPlanLookComponent implements OnInit { 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 //所有预案组件 @@ -337,6 +443,7 @@ export class EntryPlanLookComponent implements OnInit { ); } //获得所有预案组件 + audit:boolean getAllPlanComponents() { let pagetype = this.route.snapshot.queryParams.pagetype let unitId = this.route.snapshot.queryParams.unitId @@ -372,6 +479,11 @@ export class EntryPlanLookComponent implements OnInit { this.length = data.totalCount this.allPlanComponents = data 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.dialogRef.close(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{ if (open.length > 0) { diff --git a/src/app/plan-management/entry-plan/entry-plan.component.scss b/src/app/plan-management/entry-plan/entry-plan.component.scss index 3ffae1d..83b7d0f 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.scss +++ b/src/app/plan-management/entry-plan/entry-plan.component.scss @@ -101,6 +101,8 @@ } .tablebox{ .add{ + cursor: auto; + text-decoration: none; display: block; width: 40px; height: 20px; @@ -110,14 +112,18 @@ color: #FFFFFF; margin-left: 50px; } + .weihu{ - //display: block; + cursor: auto; + text-decoration: none; + display: block; width: 64px; height: 20px; - background: #2196F3; + background: #FFC94B; font-size: 12px; color: #FFFFFF; line-height: 20px; + margin-left: 40px; } table{ width: 100%; diff --git a/src/app/plan-management/entry-plan/entry-plan.component.ts b/src/app/plan-management/entry-plan/entry-plan.component.ts index 55d790c..58cb926 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.ts +++ b/src/app/plan-management/entry-plan/entry-plan.component.ts @@ -42,8 +42,8 @@ export class EntryPlanComponent implements OnInit { pageSize:any; //每页条数 pageSizeOptions: number[] = [10] //设置每页条数 PageNumber:any; //第几页 - IsNewData=true //预案维护更新或者新增 - IsNewCompanyData=true//单位维护更新或者新增 + IsNewData='' //预案维护更新或者新增 + IsNewCompanyData=''//单位维护更新或者新增 displayedColumns: string[] = ['state','unitname','integrity','level','jurisdictionsquadron', 'unittype','plantype', 'passstate','projectlevel','operation']; @@ -358,7 +358,7 @@ export class EntryPlanComponent implements OnInit { onSubmit (value) { this.PageNumber = 1 this.pageEvent.pageIndex = 0 - this.getAllPlanInfo(); + this.getAllPlanInfo() } companyName:any //单位名称 @@ -373,8 +373,8 @@ export class EntryPlanComponent implements OnInit { planCategory=[] //预案级别 //重置 reset(){ - this.IsNewCompanyData=true - this.IsNewData=true + this.IsNewCompanyData='' + this.IsNewData='' this.companyName = '' this.js = '' this.jsId = '' diff --git a/src/app/plan-management/meet-plan/meet-plan.component.html b/src/app/plan-management/meet-plan/meet-plan.component.html index 3ef9c32..6592eef 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.html +++ b/src/app/plan-management/meet-plan/meet-plan.component.html @@ -6,7 +6,7 @@
- +
@@ -117,51 +117,58 @@
- + - + - + - + - + - + - - + + - + - + + + + +
预案状态预案状态 新增 维护更新 预案名称预案名称 {{element.name}} 预案级别预案级别 {{element.planCategory=='6'?'国家级':'市级'}} 添加人添加人 {{element.creatorName}} 添加时间添加时间 {{element.creationTime|date:'yyyy-MM-dd'}} 预案类型预案类型 {{element.disasterType}} 审核状态{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? - '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}新增审核 + {{element.newVerifyState}} + + 是否公开是否公开 {{element.openRange}} 编制级别编制级别 {{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}} 维护审核{{element.maintenanceVerifyState}} 操作 查看预案 - 提交审核 + 提交审核 撤销审核 审批结果 下载 diff --git a/src/app/plan-management/meet-plan/meet-plan.component.scss b/src/app/plan-management/meet-plan/meet-plan.component.scss index 644ca36..2116c66 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.scss +++ b/src/app/plan-management/meet-plan/meet-plan.component.scss @@ -112,6 +112,8 @@ } .tablebox{ .add{ + cursor: auto; + text-decoration: none; display: block; width: 40px; height: 20px; @@ -119,16 +121,20 @@ font-size: 12px; line-height: 20px; color: #FFFFFF; - margin-left: 50px; + margin-left: 35px; } + .weihu{ - //display: block; + cursor: auto; + text-decoration: none; + display: block; width: 64px; height: 20px; - background: #2196F3; + background: #FFC94B; font-size: 12px; color: #FFFFFF; line-height: 20px; + margin-left: 25px; } table{ width: 100%; diff --git a/src/app/plan-management/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts index 41c1501..943ee8d 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.ts +++ b/src/app/plan-management/meet-plan/meet-plan.component.ts @@ -9,6 +9,7 @@ import { PageEvent } from '@angular/material/paginator'; import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { TreeService } from '../../http-interceptors/tree.service' +import { unwatchFile } from 'fs'; declare var CryptoJS @Component({ selector: 'app-meet-plan', @@ -82,8 +83,8 @@ export class MeetPlanComponent implements OnInit { preparelevels: any plcheck: boolean //编制级别勾选框 - IsNewData=true //维护更新活新增 - displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation']; + IsNewData='' //维护更新活新增 + displayedColumns: string[] = ['state','unitname', 'level', 'addname', 'addtime', 'plantype', 'isopen', 'projectlevel','passstate','weihustate', 'operation']; tabledataSource typePlan//新预案类型 unitname//预案名称 @@ -164,7 +165,30 @@ export class MeetPlanComponent implements OnInit { } else { this.PageNumber = 1 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.projectlevel = '' this.plcheck = false + this.IsNewData='' this.getAlltabledate() } //新增预案弹窗 diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html index 9e99c67..b7c44e5 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html @@ -13,7 +13,7 @@
- +
@@ -108,51 +108,54 @@
- + - + - + - + - + - + - - + + + + + + - + - + - - + + + + + + diff --git a/src/app/plan-management/open-plan/open-plan.component.scss b/src/app/plan-management/open-plan/open-plan.component.scss index a67a989..7e9f7f9 100644 --- a/src/app/plan-management/open-plan/open-plan.component.scss +++ b/src/app/plan-management/open-plan/open-plan.component.scss @@ -90,6 +90,8 @@ } .tablebox{ .add{ + cursor: auto; + text-decoration: none; display: block; width: 40px; height: 20px; @@ -99,14 +101,18 @@ color: #FFFFFF; margin-left: 50px; } + .weihu{ - //display: block; + cursor: auto; + text-decoration: none; + display: block; width: 64px; height: 20px; - background: #2196F3; + background: #FFC94B; font-size: 12px; color: #FFFFFF; line-height: 20px; + margin-left: 40px; } table{ width: 100%; diff --git a/src/app/plan-management/open-plan/open-plan.component.ts b/src/app/plan-management/open-plan/open-plan.component.ts index cb2f62c..facb3cb 100644 --- a/src/app/plan-management/open-plan/open-plan.component.ts +++ b/src/app/plan-management/open-plan/open-plan.component.ts @@ -43,9 +43,9 @@ export class OpenPlanComponent implements OnInit { pageSize: any; //每页条数 pageSizeOptions: number[] = [10] //设置每页条数 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 //所有组织机构 allunittype: any //所有单位类型 @@ -115,6 +115,7 @@ export class OpenPlanComponent implements OnInit { allPlanInfo: any //存储所有预案信息 //获得所有预案信息 + IsNewCompanyData='' getAllPlanInfo() { let paramsdata: any = { CompanyName: this.companyName || '', @@ -129,6 +130,7 @@ export class OpenPlanComponent implements OnInit { PageSize: this.pageSizeOptions[0], Sort: '', IsNewData:this.IsNewData, + IsNewCompanyData:this.IsNewCompanyData } this.http.get("/api/PublicPlans", { params: paramsdata }).subscribe((data: any) => { // console.log(111,data) @@ -291,6 +293,8 @@ export class OpenPlanComponent implements OnInit { this.pageEvent.pageIndex = 0 this.PageNumber = 1 this.getAllPlanInfo(); + this.IsNewCompanyData='' + this.IsNewData='' } } diff --git a/src/app/plan-management/pass-plan/pass-plan.component.html b/src/app/plan-management/pass-plan/pass-plan.component.html index 5a952fa..38fadfd 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.html +++ b/src/app/plan-management/pass-plan/pass-plan.component.html @@ -110,10 +110,22 @@
- - - - + + + + 新增 + 维护更新 + + +
+
+ + + + 新增 + 维护更新 + +
@@ -155,8 +167,12 @@ - - + + + + + + diff --git a/src/app/plan-management/pass-plan/pass-plan.component.scss b/src/app/plan-management/pass-plan/pass-plan.component.scss index ae2da82..b012b72 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.scss +++ b/src/app/plan-management/pass-plan/pass-plan.component.scss @@ -96,6 +96,8 @@ } .tablebox{ .add{ + cursor: auto; + text-decoration: none; display: block; width: 40px; height: 20px; @@ -105,14 +107,18 @@ color: #FFFFFF; margin-left: 50px; } + .weihu{ - //display: block; + cursor: auto; + text-decoration: none; + display: block; width: 64px; height: 20px; - background: #2196F3; + background: #FFC94B; font-size: 12px; color: #FFFFFF; line-height: 20px; + margin-left: 40px; } table{ width: 100%; diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts index 0d767d5..60cde6c 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.ts +++ b/src/app/plan-management/pass-plan/pass-plan.component.ts @@ -44,11 +44,11 @@ export class PassPlanComponent implements OnInit { pageSizeOptions: number[] = [10] //设置每页条数 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 //所有组织机构 allunittype: any //所有单位类型 tabledataSource: any //表格数据 - IsNewData=true //维护更新活新增 + IsNewData='' //维护更新活新增 url preparelevels: any @@ -116,6 +116,7 @@ export class PassPlanComponent implements OnInit { } allPlanInfo: any //存储所有预案信息 + IsNewCompanyData='' //单位是新增还是维护更新 //获得所有预案信息 getAllPlanInfo() { let reservePlanType @@ -139,6 +140,7 @@ export class PassPlanComponent implements OnInit { Sort: '', PlanCategories: this.planCategory, IsNewData:this.IsNewData, + IsNewCompanyData:this.IsNewCompanyData } this.http.get("/api/ApprovedPlans", { params: paramsdata }).subscribe((data: any) => { this.length = data.totalCount @@ -438,7 +440,7 @@ export class PassPlanComponent implements OnInit { onSubmit(e) { this.PageNumber = 1 this.pageEvent.pageIndex = 0 - this.getAllPlanInfo(); + this.getAllPlanInfo() } companyName: any //单位名称 js: any //所选组织机构 @@ -451,6 +453,8 @@ export class PassPlanComponent implements OnInit { planCategory = []//预案级别 //重置 reset() { + this.IsNewData='' + this.IsNewCompanyData='' this.companyName = '' this.js = '' this.jsId = '' diff --git a/src/app/plan-management/plan-management.module.ts b/src/app/plan-management/plan-management.module.ts index 12a9909..b91230d 100644 --- a/src/app/plan-management/plan-management.module.ts +++ b/src/app/plan-management/plan-management.module.ts @@ -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 { updataHl } from './create-plan-online-five/create-plan-online-five.component' import {ChangeUrl} from './entry-plan-look/entry-plan-look.component' +import {adddwsurveys} from './create-plan-online-five/create-plan-online-five.component' @NgModule({ declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent, AddPlanone, PlanType, AuditSatus, PlanLevel, DownloadFile, AuditResult, ChangeName, WebLookComponent, OnetwoEntryPlanComponent, newunitComponent, MeetPlanComponent, newunitMeet, TypePlanComponent, newunitType, PsViewer, onetwoAuditResult, meetAuditResult, typeAuditResult, MaintainUpComponent, GkPsViewer, GkhtmlPsViewer, UnitInfo, ReinforcePlanComponent, state, ImgDetails, CreatePlanOnlineFiveComponent, CreatePlanOnlineThreeComponent, - OpenPlanToolDialog,yinYong,newTitle,disaster,updataHl,ChangeUrl], + OpenPlanToolDialog,yinYong,newTitle,disaster,updataHl,ChangeUrl,adddwsurveys], imports: [ CommonModule, PlanManagementRoutingModule, diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.html b/src/app/plan-management/reinforce-plan/reinforce-plan.component.html index e9df805..1cb4035 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.html +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.html @@ -79,10 +79,22 @@
- - - - + + + + 新增 + 维护更新 + + +
+
+ + + + 新增 + 维护更新 + +
@@ -131,8 +143,12 @@
- - + + + + + + diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss b/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss index 08c9400..3689b22 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss @@ -91,6 +91,8 @@ } .tablebox{ .add{ + cursor: auto; + text-decoration: none; display: block; width: 40px; height: 20px; @@ -100,14 +102,18 @@ color: #FFFFFF; margin-left: 50px; } + .weihu{ - //display: block; + cursor: auto; + text-decoration: none; + display: block; width: 64px; height: 20px; - background: #2196F3; + background: #FFC94B; font-size: 12px; color: #FFFFFF; line-height: 20px; + margin-left: 40px; } table{ width: 100%; diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts index 75cb817..52a8603 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts @@ -44,11 +44,11 @@ export class ReinforcePlanComponent implements OnInit { pageSizeOptions: number[] = [10] //设置每页条数 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 //所有组织机构 allunittype:any //所有单位类型 tabledataSource:any //表格数据 - IsNewData=true //维护更新活新增 + IsNewData='' //维护更新活新增 preparelevels:any ngOnInit(): void { @@ -114,6 +114,7 @@ export class ReinforcePlanComponent implements OnInit { allPlanInfo:any //存储所有预案信息 //获得所有预案信息 + IsNewCompanyData=''//单位维护更新或者新增 getAllPlanInfo(){ let paramsdata:any = { CompanyName: this.companyName || '', @@ -130,6 +131,7 @@ export class ReinforcePlanComponent implements OnInit { PageSize: this.pageSizeOptions[0], Sort: '', IsNewData:this.IsNewData, + IsNewCompanyData:this.IsNewCompanyData } this.http.get("/api/ApprovedPlans/GetReinforcementPlanComponents",{params:paramsdata}).subscribe((data:any)=>{ // console.log('增援预案列表',data) @@ -203,7 +205,7 @@ export class ReinforcePlanComponent implements OnInit { onSubmit (e) { this.PageNumber = 1 this.pageEvent.pageIndex = 0 - this.getAllPlanInfo(); + this.getAllPlanInfo() } companyName:any //单位名称 js:any //所选组织机构 @@ -215,6 +217,8 @@ export class ReinforcePlanComponent implements OnInit { plcheck:boolean //编制级别勾选框 //重置 reset(){ + this.IsNewData='' + this.IsNewCompanyData='' this.companyName = '' this.js = '' this.jsId = '' diff --git a/src/app/plan-management/type-plan/type-plan.component.html b/src/app/plan-management/type-plan/type-plan.component.html index a7dffbb..d9d5c81 100644 --- a/src/app/plan-management/type-plan/type-plan.component.html +++ b/src/app/plan-management/type-plan/type-plan.component.html @@ -6,7 +6,7 @@
- +
@@ -120,9 +120,10 @@
- - + + @@ -132,11 +133,15 @@ + + + +
预案状态预案状态 新增 维护更新 预案名称预案名称 {{element.name}} 预案级别预案级别 {{url=='2'?'Ⅱ级':'Ⅰ级'}} 添加人添加人 {{element.creatorName}} 添加时间添加时间 {{element.creationTime|date:'yyyy-MM-dd'}} 预案类型预案类型 {{element.disasterType}} 审核状态{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? - '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}新增审核{{element.newVerifyState}} 维护审核{{element.maintenanceVerifyState}} 是否公开是否公开 {{element.openRange}} 编制级别编制级别 {{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}} 操作 查看预案 - 提交审核 + 提交审核 撤销审核 审批结果 diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss index c2a8398..5905869 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss @@ -122,24 +122,30 @@ } .add{ - display: block; - width: 40px; - height: 20px; - background: #1AE2AC; - font-size: 12px; - line-height: 20px; - color: #FFFFFF; - margin-left: 50px; - } - .weihu{ - //display: block; - width: 64px; - height: 20px; - background: #2196F3; - font-size: 12px; - color: #FFFFFF; - line-height: 20px; - } + cursor: auto; + text-decoration: none; + display: block; + width: 40px; + height: 20px; + background: #1AE2AC; + font-size: 12px; + line-height: 20px; + color: #FFFFFF; + margin-left: 35px; + } + + .weihu{ + cursor: auto; + text-decoration: none; + display: block; + width: 64px; + height: 20px; + background: #FFC94B; + font-size: 12px; + color: #FFFFFF; + line-height: 20px; + margin-left: 25px; + } } mat-paginator{ width: 100%; diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts index 93cde8a..3fa4bf5 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts @@ -95,7 +95,7 @@ export class OnetwoEntryPlanComponent implements OnInit { url preparelevels: any 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 unitname//预案名称 level//预案级别 @@ -114,7 +114,7 @@ export class OnetwoEntryPlanComponent implements OnInit { pageSize: any; //每页条数 pageSizeOptions: number[] = [10] //设置每页条数 PageNumber: any; //第几页 - IsNewData=true //维护更新活新增 + IsNewData='' //维护更新活新增 //获取表格数据 getAlltabledate() { @@ -151,6 +151,7 @@ export class OnetwoEntryPlanComponent implements OnInit { //重置 reset() { + this.IsNewData='' this.typePlan = '' this.unitname = '' this.level = '' @@ -167,17 +168,7 @@ export class OnetwoEntryPlanComponent implements OnInit { //查询 onSubmit(value) { //console.log(value) - if (this.endtime != undefined && this.addtime > this.endtime) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('开始时间不能大于结束时间!', '确定', config); - } else { - this.PageNumber = 1 - this.pageEvent.pageIndex = 0 - this.getAlltabledate(); - } - + this.getAlltabledate() } //删除预案 deletePlan(id) { diff --git a/src/app/plan-management/open-plan/open-plan.component.html b/src/app/plan-management/open-plan/open-plan.component.html index 24eae26..a1ddae2 100644 --- a/src/app/plan-management/open-plan/open-plan.component.html +++ b/src/app/plan-management/open-plan/open-plan.component.html @@ -47,10 +47,22 @@
- - - - + + + + 新增 + 维护更新 + + +
+
+ + + + 新增 + 维护更新 + +
@@ -93,8 +105,12 @@
{{element.planType | plantype}} 审核状态{{element.auditStatus | auditsatus}}新增审核{{element.newVerifyState}}维护审核{{element.maintenanceVerifyState}} {{element.planType | plantype}} 审核状态{{element.auditStatus | auditsatus}}新增审核{{element.newVerifyState}}维护审核{{element.maintenanceVerifyState}} 二维预案 审核状态{{element.auditStatus | auditsatus}}新增审核{{element.newVerifyState}}维护审核{{element.maintenanceVerifyState}} 是否公开 类型预案 审核状态{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? - '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}新增审核 + {{element.newVerifyState}} + 是否公开编制级别 {{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}} 维护审核{{element.maintenanceVerifyState}} 操作 查看预案 - 提交审核 + 提交审核 撤销审核 审批结果 下载 diff --git a/src/app/plan-management/type-plan/type-plan.component.scss b/src/app/plan-management/type-plan/type-plan.component.scss index 9126325..ec93c51 100644 --- a/src/app/plan-management/type-plan/type-plan.component.scss +++ b/src/app/plan-management/type-plan/type-plan.component.scss @@ -112,6 +112,8 @@ } .tablebox{ .add{ + cursor: auto; + text-decoration: none; display: block; width: 40px; height: 20px; @@ -121,14 +123,18 @@ color: #FFFFFF; margin-left: 50px; } + .weihu{ - //display: block; + cursor: auto; + text-decoration: none; + display: block; width: 64px; height: 20px; - background: #2196F3; + background: #FFC94B; font-size: 12px; color: #FFFFFF; line-height: 20px; + margin-left: 40px; } table{ width: 100%; diff --git a/src/app/plan-management/type-plan/type-plan.component.ts b/src/app/plan-management/type-plan/type-plan.component.ts index 9408be0..6448a64 100644 --- a/src/app/plan-management/type-plan/type-plan.component.ts +++ b/src/app/plan-management/type-plan/type-plan.component.ts @@ -89,8 +89,8 @@ export class TypePlanComponent implements OnInit { levels preparelevels: any plcheck: boolean //编制级别勾选框 - IsNewData=true //维护更新活新增 - displayedColumns: string[] = ['state','unitname', 'addname', 'addtime', 'plantype', 'passstate', 'isopen', 'projectlevel', 'operation']; + IsNewData='' //维护更新活新增 + displayedColumns: string[] = ['state','unitname', 'addname', 'addtime', 'plantype', 'isopen', 'projectlevel','passstate','weihustate', 'operation']; tabledataSource unitname//预案名称 level//预案级别 @@ -137,6 +137,7 @@ export class TypePlanComponent implements OnInit { //重置 reset() { + this.IsNewData='' this.unitname = '' this.level = '' this.addname = '' @@ -150,16 +151,7 @@ export class TypePlanComponent implements OnInit { //查询 onSubmit(value) { - if (this.endtime != undefined && this.addtime > this.endtime) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('开始时间不能大于结束时间!', '确定', config); - } else { - this.PageNumber = 1 - this.pageEvent.pageIndex = 0 - this.getAlltabledate(); - } + this.getAlltabledate() } diff --git a/src/app/ui/collection-tools-plan/addPlaneFigure.html b/src/app/ui/collection-tools-plan/addPlaneFigure.html index 80cbac6..344170b 100644 --- a/src/app/ui/collection-tools-plan/addPlaneFigure.html +++ b/src/app/ui/collection-tools-plan/addPlaneFigure.html @@ -12,9 +12,9 @@ -
+