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
4d7f03dc4e 53217492d7
commit
e99618f853
7 changed files with 69 additions and 35 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. 4
      src/app/plan-management/create-plan-online-five/Disaster.html
  2. 10
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
  3. 57
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
  4. 6
      src/app/plan-management/create-plan-online-five/updatal.html
  5. 7
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
  6. 6
      src/app/plan-management/entry-plan-look/upNew.html
  7. 6
      src/app/ui/plan-template/updatal.html

4
src/app/plan-management/create-plan-online-five/Disaster.html
Unescape View File

@ -30,13 +30,13 @@
<div class="queryField" *ngIf="level==2"> <div class="queryField" *ngIf="level==2">
<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 type="number" [(ngModel)]="lieNumber" autocomplete="off" required min="1"> <input matInput type="number" [(ngModel)]="lieNumber" autocomplete="off" required min="1" placeholder="请输入列数" >
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="level==2"> <div class="queryField" *ngIf="level==2">
<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 type="number" [(ngModel)]="hNumber" autocomplete="off" required min="1"> <input matInput type="number" [(ngModel)]="hNumber" autocomplete="off" required min="1" placeholder="请输入行数" >
</mat-form-field> </mat-form-field>
</div> </div>
<div class="bottom"> <div class="bottom">

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

@ -822,14 +822,14 @@
</div> </div>
<table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;"> <table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
<tr *ngFor="let info of element.attinf;let infoi=index"> <tr *ngFor="let info of element.attinf;let infoi=index">
<td style="border: 1px solid #999; <th style="border: 1px solid #999;
height: 40px; height: 40px;
width: 40%; width: 30%;
font-size: 16px; font-size: 16px;
text-align: center;" *ngIf="info.completed"><span>{{info.propertyName}}</span></td> text-align: center;" *ngIf="info.completed"><span>{{info.propertyName}}</span></th>
<td style="border: 1px solid #999; <td style="border: 1px solid #999;
height: 40px; height: 40px;
width: 60%; width: 70%;
font-size: 16px; font-size: 16px;
text-align: center;"*ngIf="info.completed"><span>{{info.propertyValue}}</span> </td> text-align: center;"*ngIf="info.completed"><span>{{info.propertyValue}}</span> </td>
</tr> </tr>
@ -1156,7 +1156,7 @@
</div> </div>
<div class="toolDiv" *ngIf="pattern == 'look'"> <div class="toolDiv" *ngIf="pattern == 'look'">
<button title="下载文档" mat-mini-fab color="primary" (click)="generatingDoc()"> <button *ngIf="xiazai==undefined" title="下载文档" mat-mini-fab color="primary" (click)="generatingDoc()">
<mat-icon>vertical_align_bottom</mat-icon> <mat-icon>vertical_align_bottom</mat-icon>
</button> </button>
<button title="返回顶部" mat-mini-fab color="primary" (click)="goBack()"> <button title="返回顶部" mat-mini-fab color="primary" (click)="goBack()">

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

@ -61,9 +61,11 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
zaixianDr=false zaixianDr=false
haveNew=false haveNew=false
planMode//预案类型 planMode//预案类型
xiazai//是否点击下载按钮进来的
//index //index
ngOnInit() { ngOnInit() {
//this.index = this.getArrayIndex(this.planTemplateData,'单位概况') //this.index = this.getArrayIndex(this.planTemplateData,'单位概况')
this.xiazai=this.route.snapshot.queryParams.xiazai
this.haveNew=this.route.snapshot.queryParams.haveNew this.haveNew=this.route.snapshot.queryParams.haveNew
this.planMode=this.route.snapshot.queryParams.planMode this.planMode=this.route.snapshot.queryParams.planMode
console.log(this.route.snapshot.queryParams.wordChange) console.log(this.route.snapshot.queryParams.wordChange)
@ -82,7 +84,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
if(this.route.snapshot.queryParams.xiazai=='true'){ if(this.route.snapshot.queryParams.xiazai=='true'){
window.setTimeout(()=>{ window.setTimeout(()=>{
this.generatingDoc() this.generatingDoc()
},2500) },5000)
} }
} }
@ -167,7 +169,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
//获得单位信息 //获得单位信息
unitData: any unitData: any
getUnitData() { async getUnitData() {
let paramsdata: any = { let paramsdata: any = {
Name: this.route.snapshot.queryParams.unitName || '', Name: this.route.snapshot.queryParams.unitName || '',
} }
@ -559,7 +561,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
this.http.get('/api/RealityImages', { params: data }).subscribe((data: any) => { this.http.get('/api/RealityImages', { params: data }).subscribe((data: any) => {
element.realityImages = data.items element.realityImages = data.items
element.realityImages.forEach(item => { //每张图片设置选中状态为false element.realityImages.forEach(item => { //每张图片设置选中状态为false
item.newImageUrl = `/api/Objects/PlanPlatform/${item.imageUrl}?x-oss-process=image/resize,m_fill,h_100,w_100` //处理图片URL地址 item.newImageUrl = `/api/Objects/PlanPlatform/${item.imageUrl}` //处理图片URL地址?x-oss-process=image/resize,m_fill,h_100,w_100
item.nameStart = item.name.substring(0, item.name.lastIndexOf(".")); //图片名称前缀 item.nameStart = item.name.substring(0, item.name.lastIndexOf(".")); //图片名称前缀
item.nameEnd = item.name.substring(item.name.lastIndexOf("."), item.name.length); //图片名称后缀 item.nameEnd = item.name.substring(item.name.lastIndexOf("."), item.name.length); //图片名称后缀
resolve(data) resolve(data)
@ -1616,6 +1618,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
preview() { preview() {
this.pattern = 'look' this.pattern = 'look'
this.clickTitleItem('单位概况') this.clickTitleItem('单位概况')
} }
quitPreview() { quitPreview() {
this.pattern = 'edit' this.pattern = 'edit'
@ -1674,14 +1677,16 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
this.planTemplateData.forEach(element => { this.planTemplateData.forEach(element => {
if(element.groupName=='交通水源'||element.groupName=='重点图示'){ if(element.groupName=='交通水源'||element.groupName=='重点图示'){
console.log(element.attribute[0].imgArr.length) if(element.attribute[0].imgArr.length>0){
for(let i=0;i<element.attribute[0].imgArr.length;i++){ for(let i=0;i<element.attribute[0].imgArr.length;i++){
String(element.attribute[0].imgArr[i]) +'?x-image-process=image/format,png' console.log(element.attribute[0].imgArr[i])
element.attribute[0].imgArr[i]= String(element.attribute[0].imgArr[i]) +'?x-image-process=image/format,jpg'
}
} }
} }
}); });
console.log(this.planTemplateData) console.log(this.planTemplateData)
$(".mainbox").wordExport('word文档'); $(".mainbox").wordExport('word文档');
} }
//原数据点击 //原数据点击
@ -1822,7 +1827,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
if(value.groupName=='交通水源'||value.groupName=='重点图示'){ if(value.groupName=='交通水源'||value.groupName=='重点图示'){
value.attribute.forEach(element => { value.attribute.forEach(element => {
if(element.imgArr!=undefined&&element.imgArr.length>0){ if(element.imgArr!=undefined&&element.imgArr.length>0){
element.imgArr[0]=element.imgArr[0].slice(25,element.imgArr[0].length)+'?x-image-process=image/format,png' element.imgArr[0]=element.imgArr[0].slice(25,element.imgArr[0].length) //+'?x-image-process=image/format,png'
} }
}); });
@ -2145,6 +2150,7 @@ export class disaster{
close(){ close(){
this.dialogRef.close(); this.dialogRef.close();
} }
//确定按钮 //确定按钮
newdisaster(){ newdisaster(){
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
@ -2155,9 +2161,9 @@ export class disaster{
}else if(this.headName==undefined||this.headName==''){ }else if(this.headName==undefined||this.headName==''){
this.snackBar.open('请输入表头名称!','确定',config); this.snackBar.open('请输入表头名称!','确定',config);
}else if(this.level==2&& (this.lieNumber==undefined||this.lieNumber=='')){ }else if(this.level==2&& (this.lieNumber==undefined||this.lieNumber=='')){
this.snackBar.open('请输入列数!','确定',config); this.snackBar.open('列数不许为空,并且列数大于0!','确定',config);
}else if(this.level==2&& (this.hNumber==undefined||this.hNumber=='')){ }else if(this.level==2&& (this.hNumber==undefined||this.hNumber=='')){
this.snackBar.open('请输入行数!','确定',config); this.snackBar.open('行数不许为空,并且行数大于0!!','确定',config);
} }
else{ else{
let tree={ let tree={
@ -2193,21 +2199,46 @@ export class updataHl{
} }
level//类型 level//类型
headName=this.data.headName//表头名称 headName=this.data.headName//表头名称
lieNumber=this.data.zdy!=undefined?0:this.data.lieNumber//最小列数 lieNumber=this.data.tableth[0].length//最小列数
hNumber=this.data.zdy!=undefined?0:this.data.hNumber//行数 hNumber=this.data.tableth.length//行数
//取消按钮 //取消按钮
close(){ close(){
this.dialogRef.close(); this.dialogRef.close();
} }
inputChange(){
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
if(this.level==2&& (this.lieNumber==undefined||this.lieNumber=='')){
this.snackBar.open('请输入列数,并且列数大于0!','确定',config);
}else if(this.level==2&& (this.hNumber==undefined||this.hNumber=='')){
this.snackBar.open('请输入行数,并且行数大于0!!','确定',config);
}
}
//确定按钮 //确定按钮
newdisaster(){ newdisaster(){
console.log(this.data) console.log(this.data)
let result={ let result={
lieNumber:this.level==2? this.data.tableth[0].length:this.data.tableth.length, lieNumber:this.level==2? this.lieNumber:this.data.tableth.length,
hNumber:this.data.tableth.length hNumber:this.hNumber
} }
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
if(this.level==undefined||this.level==''){
this.snackBar.open('请选择类型!','确定',config);
}else if(this.headName==undefined||this.headName==''){
this.snackBar.open('请输入表头名称!','确定',config);
}else if(this.level==2&& (this.lieNumber==undefined||this.lieNumber=='')){
this.snackBar.open('列数不许为空,并且列数大于0!','确定',config);
}else if(this.level==2&& (this.hNumber==undefined||this.hNumber=='')){
this.snackBar.open('行数不许为空,并且行数大于0!!','确定',config);
}else{
this.dialogRef.close(result); this.dialogRef.close(result);
} }
}
} }
//建筑跟消防设施添加模板数据 //建筑跟消防设施添加模板数据
@Component({ @Component({

6
src/app/plan-management/create-plan-online-five/updatal.html
Unescape View File

@ -12,19 +12,19 @@
<div class="queryField" *ngIf="level==1"> <div class="queryField" *ngIf="level==1">
<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 type="number" [(ngModel)]="data.tableth.length" autocomplete="off" required [min]="lieNumber"> <input matInput type="number" [(ngModel)]="data.tableth.length" autocomplete="off" required [min]="lieNumber" placeholder="请输入列数" >
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="level==2"> <div class="queryField" *ngIf="level==2">
<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 type="number" [(ngModel)]="data.tableth[0].length" autocomplete="off" required [min]="lieNumber"> <input matInput type="number" [(ngModel)]="lieNumber" autocomplete="off" required [min]="1" placeholder="请输入列数">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="level==2"> <div class="queryField" *ngIf="level==2">
<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 type="number" [(ngModel)]="data.tableth.length" autocomplete="off" required [min]="hNumber"> <input matInput type="number" [(ngModel)]="hNumber" autocomplete="off" required [min]="1" placeholder="请输入行数">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="bottom"> <div class="bottom">

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

@ -643,8 +643,9 @@ export class EntryPlanLookComponent implements OnInit {
console.log(element) console.log(element)
if(element.planType==16&&(element.planMode==4||element.planMode==2)){ if(element.planType==16&&(element.planMode==4||element.planMode==2)){
const dialogRef = this.dialog.open(wenbenUpload, { const dialogRef = this.dialog.open(wenbenUpload, {
width: "650px", width: "180px",
height:"710px", height:"200px",
disableClose: true,
data: {src:`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${element.name}&unitName=${this.unitdata.unitname}&planCategory=${element.planCategory}&planId=${element.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=false&xiazai=true`} data: {src:`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${element.name}&unitName=${this.unitdata.unitname}&planCategory=${element.planCategory}&planId=${element.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=false&xiazai=true`}
}); });
//window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${element.name}&unitName=${this.unitdata.unitname}&planCategory=${element.planCategory}&planId=${element.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=false&xiazai=true`) //window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${element.name}&unitName=${this.unitdata.unitname}&planCategory=${element.planCategory}&planId=${element.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=false&xiazai=true`)
@ -1879,7 +1880,7 @@ export class wenbenUpload{
console.log(this.data) console.log(this.data)
window.setTimeout(()=>{ window.setTimeout(()=>{
this.dialogRef.close(); this.dialogRef.close();
},5000) },7500)
} }
src=this.sanitizer.bypassSecurityTrustResourceUrl(this.data.src); src=this.sanitizer.bypassSecurityTrustResourceUrl(this.data.src);
} }

6
src/app/plan-management/entry-plan-look/upNew.html
Unescape View File

@ -1,3 +1,5 @@
<div style="height: 100%;width: 100%;"> <div style="height: 100%;width: 100%;text-align: center;">
<iframe [src]="src" style="width: 100%;height: 100%;"></iframe> <iframe [src]="src" style="width: 100%;height: 100%;display: none;"></iframe>
<span style="text-align: center;font-size: 16px;color: black;font-weight: bold;">下载中</span>
<mat-spinner style="margin-left: 10px;margin-top: 10px;"></mat-spinner>
</div> </div>

6
src/app/ui/plan-template/updatal.html
Unescape View File

@ -12,19 +12,19 @@
<div class="queryField" *ngIf="level==1||level==undefined"> <div class="queryField" *ngIf="level==1||level==undefined">
<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 type="number" [(ngModel)]="data.tableth.length" autocomplete="off" required min="0" required> <input matInput type="number" [(ngModel)]="data.tableth.length" autocomplete="off" required min="0" required placeholder="请输入列数" >
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="level==2"> <div class="queryField" *ngIf="level==2">
<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 type="number" [(ngModel)]="data.tableth[0].length" autocomplete="off" required min="1" required> <input matInput type="number" [(ngModel)]="data.tableth[0].length" autocomplete="off" required min="1" required placeholder="请输入列数" >
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="level==2"> <div class="queryField" *ngIf="level==2">
<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 type="number" [(ngModel)]="data.tableth.length" autocomplete="off" required min="1" required> <input matInput type="number" [(ngModel)]="data.tableth.length" autocomplete="off" required min="1" required placeholder="请输入行数" >
</mat-form-field> </mat-form-field>
</div> </div>
<div class="bottom"> <div class="bottom">

Write Preview
Loading…
Cancel
Save