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 2dd05cc..36d6adc 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 @@ -2199,8 +2199,8 @@ export class updataHl{ } level//类型 headName=this.data.headName//表头名称 - lieNumber=this.data.tableth[0].length//最小列数 - hNumber=this.data.tableth.length//行数 + lieNumber=this.data.tableth[0].length//最小列数 this.data.zdy!=undefined?0: + hNumber=this.data.tableth.length//行数this.data.zdy!=undefined?0: //取消按钮 close(){ this.dialogRef.close(); @@ -2218,7 +2218,7 @@ export class updataHl{ } //确定按钮 newdisaster(){ - console.log(this.data) + console.log(this.lieNumber,this.hNumber) let result={ lieNumber:this.level==2? this.lieNumber:this.data.tableth.length, hNumber:this.hNumber @@ -2234,7 +2234,10 @@ export class updataHl{ this.snackBar.open('列数不许为空,并且列数大于0!','确定',config); }else if(this.level==2&& (this.hNumber==undefined||this.hNumber=='')){ this.snackBar.open('行数不许为空,并且行数大于0!!','确定',config); - }else{ + }else if(this.level==1&& this.data.tableth.length<=0){ + this.snackBar.open('列数不许为空,并且列数大于0!','确定',config); + } + else{ this.dialogRef.close(result); } diff --git a/src/app/plan-management/create-plan-online-five/updatal.html b/src/app/plan-management/create-plan-online-five/updatal.html index 18d0967..328736a 100644 --- a/src/app/plan-management/create-plan-online-five/updatal.html +++ b/src/app/plan-management/create-plan-online-five/updatal.html @@ -12,19 +12,19 @@
- +
- +
- +
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 da34ef1..a0f6771 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 @@ -1880,7 +1880,7 @@ export class wenbenUpload{ console.log(this.data) window.setTimeout(()=>{ this.dialogRef.close(); - },7500) + },8000) } src=this.sanitizer.bypassSecurityTrustResourceUrl(this.data.src); }