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

[新增]居民楼五级预案适配word文档

tangshan
陈敬瑜 3 years ago
parent
bc10e10307
commit
87d47efbd0
4 changed files with 59 additions and 33 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. 2
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
  2. 29
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
  3. 41
      src/app/statistic-analysis/combined-query/combined-query.component.ts
  4. 20
      src/app/ui/plan-template/plan-template.component.ts

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

@ -807,7 +807,7 @@
<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" 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.value" *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>

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

@ -159,7 +159,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
data.items.forEach(element => { data.items.forEach(element => {
if (element.id == this.route.snapshot.queryParams.companyId) { if (element.id == this.route.snapshot.queryParams.companyId) {
this.unitData = element this.unitData = element
if(this.unitData.buildingTypes[0].name=='高层建筑'&&this.planLevel=='5'){ if((this.unitData.buildingTypes[0].name=='高层建筑'||this.unitData.buildingTypes[0].name=='居民楼')&&this.planLevel=='5'){
this.zaixianDr=true this.zaixianDr=true
} }
//console.log('单位列表信息', this.unitData) //console.log('单位列表信息', this.unitData)
@ -1212,7 +1212,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
addNumber = -1 addNumber = -1
addTd(key, i) { addTd(key, i) {
this.addNumber++ this.addNumber++
if (this.planTemplateData[key].attribute[i].tableth == undefined) { if (this.planTemplateData[key].attribute[i].tableth == undefined||this.planTemplateData[key].attribute[i].tableth.length==0) {
//this.planTemplateData[key].attribute[i].tabletr = [] //this.planTemplateData[key].attribute[i].tabletr = []
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
@ -1368,6 +1368,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
this.addNumber++ this.addNumber++
this.planTemplateData[index].building[attacki].body.forEach((value,bodyi,arr)=>{ this.planTemplateData[index].building[attacki].body.forEach((value,bodyi,arr)=>{
if(surveyName==arr[bodyi].surveyName){ if(surveyName==arr[bodyi].surveyName){
console.log(bodyi)
if(arr[bodyi].zdy==undefined){ if(arr[bodyi].zdy==undefined){
if (surveyName == '进攻通道') { if (surveyName == '进攻通道') {
if (this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr == undefined) { if (this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr == undefined) {
@ -1415,7 +1416,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
//单位概况自定义表格新增一行 //单位概况自定义表格新增一行
unitNewadd(...num:number[]){ unitNewadd(...num:number[]){
console.log(num) console.log(num)
if (this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tableth == undefined) { if (this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tableth == undefined||this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tableth.length==0) {
//this.planTemplateData[key].attribute[i].tabletr = [] //this.planTemplateData[key].attribute[i].tabletr = []
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
@ -1591,7 +1592,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
searchType = '0' searchType = '0'
//打开自定义新增具体内容 //打开自定义新增具体内容
tuTrue=false tuTrue=false
addAttribute(groupName,attacki?:any, i?:any,fileNum?:any,surveyName?:string){ addAttribute(groupName,attacki?:any, bi?:any,fileNum?:any,surveyName?:string){
let index = this.getArrayIndex(this.planTemplateData,'单位概况') let index = this.getArrayIndex(this.planTemplateData,'单位概况')
const dialogRef = this.dialog.open(disaster, {//调用open方法打开对话框并且携带参数过去 const dialogRef = this.dialog.open(disaster, {//调用open方法打开对话框并且携带参数过去
width: '340px', width: '340px',
@ -1600,7 +1601,6 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
data:this.planTemplateData data:this.planTemplateData
}); });
dialogRef.afterClosed().subscribe(result => { dialogRef.afterClosed().subscribe(result => {
console.log(result)
if(result!=undefined){ if(result!=undefined){
if(surveyName==undefined){ if(surveyName==undefined){
this.planTemplateData.forEach((value,index,array)=>{ this.planTemplateData.forEach((value,index,array)=>{
@ -1612,10 +1612,10 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
array[index].attribute.push(result) array[index].attribute.push(result)
} }
if(result.level==2){ if(result.level==2){
for(var i=0;i<result.hNumber;i++){ for(let i=0;i<result.hNumber;i++){
array[index].attribute[array[index].attribute.length-1].tableth.push([{head:'',body:''}]) array[index].attribute[array[index].attribute.length-1].tableth.push([{head:'',body:''}])
for(var j=0;j<result.lieNumber-1;j++){ for(var j=0;j<result.lieNumber-1;j++){
array[index].attribute[array[index].attribute.length-1].tableth[i].push({head:'',body:''}) array[index].attribute[array[index].attribute.length-1].tableth[i].push({head:'',body:''})
} }
} }
} }
@ -1623,7 +1623,15 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
}) })
} }
else{ else{
this.planTemplateData[index].building[attacki].body[i].attinf.push(result) this.planTemplateData[index].building[attacki].body[bi].attinf.push(result)
if(result.level==2){
for(var i=0;i<result.hNumber;i++){
this.planTemplateData[index].building[attacki].body[bi].attinf[this.planTemplateData[index].building[attacki].body[bi].attinf.length-1].tableth.push([{head:'',body:''}])
for(var j=0;j<result.lieNumber-1;j++){
this.planTemplateData[index].building[attacki].body[bi].attinf[this.planTemplateData[index].building[attacki].body[bi].attinf.length-1].tableth[i].push({head:'',body:''})
}
}
}
} }
if(result.level=='4'){ if(result.level=='4'){
this.tuTrue=true this.tuTrue=true
@ -1693,11 +1701,12 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
config.duration = 3000 config.duration = 3000
let formData = new FormData() let formData = new FormData()
formData.append("file", e.target.files[0]) formData.append("file", e.target.files[0])
let type=this.unitData.buildingTypes[0].name=='高层建筑'?1:2
let fileData={ let fileData={
type:1, type:this.unitData.buildingTypes[0].name=='高层建筑'?1:2,
file:formData file:formData
} }
this.http.post(`/api/OfficeExtract/ExtractWordPlan?type=1`,formData).subscribe((data:any)=>{ this.http.post(`/api/OfficeExtract/ExtractWordPlan?type=${type}`,formData).subscribe((data:any)=>{
console.log(data) console.log(data)
if(data==null){ if(data==null){
this.snackBar.open('解析失败,请确定好格式再重新上传!', '确定', config); this.snackBar.open('解析失败,请确定好格式再重新上传!', '确定', config);

41
src/app/statistic-analysis/combined-query/combined-query.component.ts
Unescape View File

@ -122,6 +122,7 @@ export class CombinedQueryComponent implements OnInit {
let result = await new Promise((resolve, reject)=>{ let result = await new Promise((resolve, reject)=>{
this.http.get("/api/StatisticsAnalysis/ReportTable", { params:this.preparelevels==0? paramsdata:yuandata }).subscribe((data: any) => { this.http.get("/api/StatisticsAnalysis/ReportTable", { params:this.preparelevels==0? paramsdata:yuandata }).subscribe((data: any) => {
console.log(data) console.log(data)
this.excelData=data
if(data.length==0){ if(data.length==0){
this.tableDataNull=true this.tableDataNull=true
}else{ }else{
@ -160,42 +161,42 @@ export class CombinedQueryComponent implements OnInit {
//预案查询 //预案查询
this.yuanColumns=['组织名称', '总数'] this.yuanColumns=['组织名称', '总数']
this.yuanTable=[{name:[0,0]}] this.yuanTable=[{name:[0,0]}]
if(this.reservePlanType.length!=0){ if(this.planCategory.length!=0){
this.reservePlanType.forEach(element => { this.planCategory.forEach(element=>{
if(element==1){ if(element==1){
this.yuanColumns.push('二维') this.yuanColumns.push('Ⅰ级')
this.yuanTable[0].name.push(0) this.yuanTable[0].name.push(0)
}else if(element==2){ }else if(element==2){
this.yuanColumns.push('三维') this.yuanColumns.push('Ⅱ级')
this.yuanTable[0].name.push(0)
}else if(element==3){
this.yuanColumns.push('Ⅲ级')
this.yuanTable[0].name.push(0) this.yuanTable[0].name.push(0)
}else if(element==4){ }else if(element==4){
this.yuanColumns.push('其他') this.yuanColumns.push('Ⅳ级')
this.yuanTable[0].name.push(0) this.yuanTable[0].name.push(0)
}else if(element==16){ }else if(element==5){
this.yuanColumns.push('文本') this.yuanColumns.push('Ⅴ级')
this.yuanTable[0].name.push(0) this.yuanTable[0].name.push(0)
} }
}); })
} }
if(this.planCategory.length!=0){ if(this.reservePlanType.length!=0){
this.planCategory.forEach(element=>{ this.reservePlanType.forEach(element => {
if(element==1){ if(element==1){
this.yuanColumns.push('Ⅰ级预案') this.yuanColumns.push('二维')
this.yuanTable[0].name.push(0) this.yuanTable[0].name.push(0)
}else if(element==2){ }else if(element==2){
this.yuanColumns.push('Ⅱ级预案') this.yuanColumns.push('三维')
this.yuanTable[0].name.push(0)
}else if(element==3){
this.yuanColumns.push('Ⅲ级预案')
this.yuanTable[0].name.push(0) this.yuanTable[0].name.push(0)
}else if(element==4){ }else if(element==4){
this.yuanColumns.push('Ⅳ级预案') this.yuanColumns.push('其他')
this.yuanTable[0].name.push(0) this.yuanTable[0].name.push(0)
}else if(element==5){ }else if(element==16){
this.yuanColumns.push('Ⅴ级预案') this.yuanColumns.push('文本')
this.yuanTable[0].name.push(0) this.yuanTable[0].name.push(0)
} }
}) });
} }
data.forEach((element,i,value) => { data.forEach((element,i,value) => {
@ -243,7 +244,7 @@ export class CombinedQueryComponent implements OnInit {
console.log(this.yuanColumns) console.log(this.yuanColumns)
console.log(this.yuanTable) console.log(this.yuanTable)
this.excelData=data
resolve(this.excelData) resolve(this.excelData)
} }
) )

20
src/app/ui/plan-template/plan-template.component.ts
Unescape View File

@ -227,6 +227,7 @@ export class PlanTemplateComponent implements OnInit {
} }
//右侧新增分组点击事件 //右侧新增分组点击事件
addGroupClick(){ addGroupClick(){
var temp
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
@ -246,6 +247,19 @@ export class PlanTemplateComponent implements OnInit {
}); });
dialogRef.afterClosed().subscribe(result => { dialogRef.afterClosed().subscribe(result => {
console.log(result,this.newleftTabledata) console.log(result,this.newleftTabledata)
/* if(result.length>this.newleftTabledata[this.leftclicki].data.length){
this.newleftTabledata[this.leftclicki].data.forEach((item,i,value)=>{
result.forEach((element,ri,rval) => {
if(value[i].groupName==rval[ri].groupName){
console.log('000')
}
});
})
this.newleftTabledata[this.leftclicki].data.push(result)
} */
//this.newleftTabledata[this.leftclicki].data.push({groupName: '预案附件', completed: false})
console.log(result)
this.newleftTabledata.forEach((value,index,array)=>{ this.newleftTabledata.forEach((value,index,array)=>{
if(array[index].buildingTypeId==this.buildingTypeId&&array[index].planCategory==this.planCategory){ if(array[index].buildingTypeId==this.buildingTypeId&&array[index].planCategory==this.planCategory){
if(result!=undefined){ if(result!=undefined){
@ -253,7 +267,8 @@ export class PlanTemplateComponent implements OnInit {
//添加分组名称 //添加分组名称
if(array[index].data==null||array[index].data.length==0){ if(array[index].data==null||array[index].data.length==0){
array[index].data=result array[index].data=result
}else{ }
else{
array[index].data[i].completed=rarr[i].completed array[index].data[i].completed=rarr[i].completed
} }
@ -298,7 +313,8 @@ export class PlanTemplateComponent implements OnInit {
if(isTrue){ if(isTrue){
this.group.forEach((element,index,array)=>{ this.group.forEach((element,index,array)=>{
if(array[index].groupName==groupName){ if(array[index].groupName==groupName){
this.group.splice(index,1) //this.group.splice(index,1)
array[index].completed=false
} }
}) })
} }

Write Preview
Loading…
Cancel
Save