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

[完善]修改bug

tangshan
邵佳豪 3 years ago
parent
5a565879b8
commit
f3b86a5f7c
7 changed files with 275 additions and 249 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. 10
      src/app/gis-management/fire-facilities/fire-facilities.component.html
  2. 13
      src/app/plan-audit/fire-facilities/fire-facilities.component.html
  3. 13
      src/app/plan-audit/function-partition/function-partition.component.html
  4. 38
      src/app/plan-audit/function-partition/function-partition.component.ts
  5. 20
      src/app/plan-audit/plan-list/plan-list.component.html
  6. 2
      src/app/plan-audit/plan-list/plan-list.component.ts
  7. 2
      src/app/plan-audit/plan-record/plan-record.component.html

10
src/app/gis-management/fire-facilities/fire-facilities.component.html
Unescape View File

@ -29,8 +29,11 @@
<span style="margin-left: 25px;margin-top: 3%;">主要情况：{{items.details}}</span> <span style="margin-left: 25px;margin-top: 3%;">主要情况：{{items.details}}</span>
</div> </div>
<div class="imgdown"> <div class="imgdown">
<span style="margin-left: 25px;color: #0080FF;"><a style="color: #0080FF;" href="javascript:void(0)" (click)='previewImg(items)'>查看图片</a></span> <span style="margin-left: 25px;color: #0080FF;"><a style="color: #0080FF;" href="javascript:void(0)"
<label style="float: right;margin-right: 10%;cursor:pointer" (click)='SwitchBoard(items)'><input style="margin-right: 5px;cursor:pointer" [(ngModel)]="items.expanded?down:open" readonly><img [src]="items.expanded?imgsrcdown:imgsrcopen" (click)='SwitchBoard(items)' ></label> (click)='previewImg(items)'>查看图片</a></span>
<label style="float: right;margin-right: 10%;cursor:pointer" (click)='SwitchBoard(items)'><input
style="margin-right: 5px;cursor:pointer" [(ngModel)]="items.expanded?down:open" readonly><img
[src]="items.expanded?imgsrcdown:imgsrcopen" (click)='SwitchBoard(items)'></label>
</div> </div>
<div class="overflowTable" *ngIf="items.expanded"> <div class="overflowTable" *ngIf="items.expanded">
@ -43,7 +46,8 @@
</table> </table>
</div> </div>
<div *ngFor="let tableMsg of items.loopTable" class="detailsTable"> <div *ngFor="let tableMsg of items.loopTable" class="detailsTable">
<p style="text-align: center; font-size: 16px; margin: 5px 0;">楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}</p> <p style="text-align: center; font-size: 16px; margin: 5px 0;">楼层/区域名称: {{tableMsg.name? tableMsg.name:
'暂无名称'}}</p>
<table> <table>
<tr *ngFor="let header of tableMsg.header"> <tr *ngFor="let header of tableMsg.header">
<th>{{header}}</th> <th>{{header}}</th>

13
src/app/plan-audit/fire-facilities/fire-facilities.component.html
Unescape View File

@ -29,8 +29,11 @@
<span style="margin-left: 25px;margin-top: 3%;">主要情况：{{items.details}}</span> <span style="margin-left: 25px;margin-top: 3%;">主要情况：{{items.details}}</span>
</div> </div>
<div class="imgdown"> <div class="imgdown">
<span style="margin-left: 25px;color: #0080FF;"><a style="color: #0080FF;" href="javascript:void(0)" (click)='previewImg(items)'>查看图片</a></span> <span style="margin-left: 25px;color: #0080FF;"><a style="color: #0080FF;" href="javascript:void(0)"
<label style="float: right;margin-right: 10%;cursor:pointer" (click)='SwitchBoard(items)'><input style="margin-right: 5px;cursor:pointer" [(ngModel)]="items.expanded?down:open" readonly><img [src]="items.expanded?imgsrcdown:imgsrcopen" (click)='SwitchBoard(items)' ></label> (click)='previewImg(items)'>查看图片</a></span>
<label style="float: right;margin-right: 10%;cursor:pointer" (click)='SwitchBoard(items)'><input
style="margin-right: 5px;cursor:pointer" [(ngModel)]="items.expanded?down:open" readonly><img
[src]="items.expanded?imgsrcdown:imgsrcopen" (click)='SwitchBoard(items)'></label>
</div> </div>
<div class="overflowTable" *ngIf="items.expanded"> <div class="overflowTable" *ngIf="items.expanded">
@ -43,7 +46,8 @@
</table> </table>
</div> </div>
<div *ngFor="let tableMsg of items.loopTable" class="detailsTable"> <div *ngFor="let tableMsg of items.loopTable" class="detailsTable">
<p style="text-align: center; font-size: 16px; margin: 5px 0;">楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}</p> <p style="text-align: center; font-size: 16px; margin: 5px 0;">楼层/区域名称: {{tableMsg.name? tableMsg.name:
'暂无名称'}}</p>
<table> <table>
<tr *ngFor="let header of tableMsg.header"> <tr *ngFor="let header of tableMsg.header">
<th>{{header}}</th> <th>{{header}}</th>
@ -54,9 +58,6 @@
</div> </div>
</div> </div>
</mat-expansion-panel> </mat-expansion-panel>
</mat-accordion> </mat-accordion>
</div> </div>

13
src/app/plan-audit/function-partition/function-partition.component.html
Unescape View File

@ -34,24 +34,24 @@
</mat-accordion> </mat-accordion>
</div> </div>
<div style="margin-bottom: 10px;" *ngFor="let item of allBuildingFunctionalZoning;let key = index"> <div style="margin-bottom: 10px;" *ngFor="let item of allBuilding;let key = index">
<mat-accordion class="tableContent"> <mat-accordion class="tableContent">
<mat-expansion-panel > <mat-expansion-panel expanded>
<mat-expansion-panel-header class="panelhead"> <mat-expansion-panel-header class="panelhead">
<mat-panel-title style="font-size: 14px;"> <mat-panel-title style="font-size: 14px;">
{{item.name}} {{item.name}}
</mat-panel-title> </mat-panel-title>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<div class="column" *ngFor="let item of companyFunctionalZoning"> <div class="column" *ngFor="let i of item.functionalZoning">
<div class="up"> <div class="up">
<span style="color: #0080FF;">区域：{{item.region}}</span> <span style="color: #0080FF;">区域：{{i.region}}</span>
</div> </div>
<div class="areacenter"> <div class="areacenter">
<span>面积：{{item.area}}</span> <span>面积：{{i.area}}</span>
</div> </div>
<div class="down"> <div class="down">
<span style="display: inline-block;">基本情况：{{item.details}}</span> <span style="display: inline-block;">基本情况：{{i.details}}</span>
</div> </div>
</div> </div>
</mat-expansion-panel> </mat-expansion-panel>
@ -61,4 +61,3 @@
</div> </div>
</div> </div>

38
src/app/plan-audit/function-partition/function-partition.component.ts
Unescape View File

@ -29,10 +29,13 @@ export class FunctionPartitionComponent implements OnInit {
//获得所有单位功能分区属性 //获得所有单位功能分区属性
getAllCompany() { getAllCompany() {
let companyId = this.unitId let companyId = this.unitId
this.http.get('/api/CompanyFunctionalDivisions',{params:{ this.http.get('/api/CompanyFunctionalDivisions', {
params: {
companyId: companyId companyId: companyId
}}).subscribe((data:any)=>{ }
}).subscribe((data: any) => {
this.companyFunctionalZoning = data this.companyFunctionalZoning = data
console.log(this.companyFunctionalZoning)
this.selectFunctionalZoning = [] this.selectFunctionalZoning = []
}) })
} }
@ -49,9 +52,11 @@ export class FunctionPartitionComponent implements OnInit {
preservation() { preservation() {
let companyId = this.unitId let companyId = this.unitId
if (this.companyFunctionalZoning.length) { if (this.companyFunctionalZoning.length) {
this.http.post('/api/CompanyFunctionalDivisions/Batch',this.companyFunctionalZoning,{params:{ this.http.post('/api/CompanyFunctionalDivisions/Batch', this.companyFunctionalZoning, {
params: {
companyId: companyId companyId: companyId
}}).subscribe(data=>{ }
}).subscribe(data => {
this.getAllCompany() this.getAllCompany()
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
@ -76,12 +81,15 @@ export class FunctionPartitionComponent implements OnInit {
if (this.selectFunctionalZoning.length) { if (this.selectFunctionalZoning.length) {
let isDelete = confirm('您确定要删除吗') let isDelete = confirm('您确定要删除吗')
if (isDelete) { if (isDelete) {
this.http.post('/api/CompanyFunctionalDivisions/Batch',this.companyFunctionalZoning,{params:{ this.http.post('/api/CompanyFunctionalDivisions/Batch', this.companyFunctionalZoning, {
params: {
companyId: companyId companyId: companyId
}}).subscribe(data=>{ }
}).subscribe(data => {
const options = { const options = {
headers: new HttpHeaders({ 'Content-Type': 'application/json', }), headers: new HttpHeaders({ 'Content-Type': 'application/json', }),
body:this.selectFunctionalZoning} body: this.selectFunctionalZoning
}
this.http.delete(`/api/CompanyFunctionalDivisions/Batch`, options).subscribe(data => { this.http.delete(`/api/CompanyFunctionalDivisions/Batch`, options).subscribe(data => {
this.getAllCompany() this.getAllCompany()
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
@ -111,9 +119,11 @@ export class FunctionPartitionComponent implements OnInit {
//获得所有建筑 //获得所有建筑
getAllBuilding() { getAllBuilding() {
let companyId = this.unitId let companyId = this.unitId
this.http.get(`/api/Buildings`,{params:{ this.http.get(`/api/Buildings`, {
params: {
companyId: companyId companyId: companyId
}}).subscribe((data:any)=>{ }
}).subscribe((data: any) => {
if (data.length) { if (data.length) {
this.allBuilding = data this.allBuilding = data
this.allBuilding.forEach(element => { //为每个建筑添加一个 功能分区对象 this.allBuilding.forEach(element => { //为每个建筑添加一个 功能分区对象
@ -134,9 +144,11 @@ export class FunctionPartitionComponent implements OnInit {
if (data.length) { if (data.length) {
element.functionalZoning = data element.functionalZoning = data
this.selectBuildingFunctionalZoning.push([]) //拥有建筑功能分区的提前push空数组 this.selectBuildingFunctionalZoning.push([]) //拥有建筑功能分区的提前push空数组
this.allBuildingFunctionalZoning.push(element) } this.allBuildingFunctionalZoning.push(element)
}
}) })
}); });
console.log(this.allBuilding)
} }
//封装函数刷新当前建筑功能分区 //封装函数刷新当前建筑功能分区
@ -191,7 +203,8 @@ export class FunctionPartitionComponent implements OnInit {
const options = { const options = {
headers: new HttpHeaders({ 'Content-Type': 'application/json', }), headers: new HttpHeaders({ 'Content-Type': 'application/json', }),
body: this.selectBuildingFunctionalZoning[index], body: this.selectBuildingFunctionalZoning[index],
params:{buildingId:e.id}} params: { buildingId: e.id }
}
this.http.delete(`/api/BuildingFunctionalDivisions/Batch`, options).subscribe(data => { this.http.delete(`/api/BuildingFunctionalDivisions/Batch`, options).subscribe(data => {
this.selectBuildingFunctionalZoning[index].forEach((element, newIndex) => { this.selectBuildingFunctionalZoning[index].forEach((element, newIndex) => {
this.allBuildingFunctionalZoning[index].functionalZoning.splice(this.allBuildingFunctionalZoning[index].functionalZoning.findIndex(item => item.id == element), 1) this.allBuildingFunctionalZoning[index].functionalZoning.splice(this.allBuildingFunctionalZoning[index].functionalZoning.findIndex(item => item.id == element), 1)
@ -200,7 +213,8 @@ export class FunctionPartitionComponent implements OnInit {
this.updateCurrent(e, index) this.updateCurrent(e, index)
} else { } else {
this.selectBuildingFunctionalZoning.splice(index, 1) this.selectBuildingFunctionalZoning.splice(index, 1)
this.allBuildingFunctionalZoning.splice(index,1)} this.allBuildingFunctionalZoning.splice(index, 1)
}
} }
}); });

20
src/app/plan-audit/plan-list/plan-list.component.html
Unescape View File

@ -1,8 +1,9 @@
<div class="planlist" id="planlist"> <div class="planlist" id="planlist">
<div style="margin: 10px 0;" *ngIf="planType == 'zong'"> <div style="margin: 10px 0;" *ngIf="planType == 'zong' ||planType == 'all'">
<mat-accordion> <mat-accordion>
<mat-expansion-panel expanded style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;"> <mat-expansion-panel expanded style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;">
<mat-expansion-panel-header collapsedHeight ='40px' expandedHeight='40px' style="position: relative;padding-left:20px;background: #F2F9FF;"> <mat-expansion-panel-header collapsedHeight='40px' expandedHeight='40px'
style="position: relative;padding-left:20px;background: #F2F9FF;">
<mat-panel-title> <mat-panel-title>
总平面图 总平面图
</mat-panel-title> </mat-panel-title>
@ -10,7 +11,9 @@
<div class="contant"> <div class="contant">
<div class="contantitem" *ngFor="let item of sitePlanItems"> <div class="contantitem" *ngFor="let item of sitePlanItems">
<div> <div>
<img (click)="openPlan(item,-1)" [src]="item.imageUrl ? item.imageUrl+'?x-oss-process=image/resize,m_fill,h_110,w_110' : '../../../assets/images/noImg.png'" alt=""> <img (click)="openPlan(item,-1)"
[src]="item.imageUrl ? item.imageUrl+'?x-oss-process=image/resize,m_fill,h_110,w_110' : '../../../assets/images/noImg.png'"
alt="">
</div> </div>
<p>{{item.name}}</p> <p>{{item.name}}</p>
</div> </div>
@ -18,11 +21,12 @@
</mat-expansion-panel> </mat-expansion-panel>
</mat-accordion> </mat-accordion>
</div> </div>
<div *ngIf="planType == 'ceng'"> <div *ngIf="planType == 'ceng' ||planType == 'all'">
<div *ngFor="let item of allBuildings;let key=index" style="margin-bottom: 10px;"> <div *ngFor="let item of allBuildings;let key=index" style="margin-bottom: 10px;">
<mat-accordion> <mat-accordion>
<mat-expansion-panel style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;"> <mat-expansion-panel expanded style="box-shadow: 0 0 black;border: 1px solid #EEF1F5;">
<mat-expansion-panel-header collapsedHeight ='40px' expandedHeight='40px' style="position: relative;padding-left:20px;background: #F2F9FF;"> <mat-expansion-panel-header collapsedHeight='40px' expandedHeight='40px'
style="position: relative;padding-left:20px;background: #F2F9FF;">
<mat-panel-title> <mat-panel-title>
{{item.name}} {{item.name}}
</mat-panel-title> </mat-panel-title>
@ -31,7 +35,9 @@
<div class="contant"> <div class="contant">
<div class="contantitem" *ngFor="let i of item.plandata"> <div class="contantitem" *ngFor="let i of item.plandata">
<div> <div>
<img (click)="openPlan(i,key)" [src]="i.imageUrl ? i.imageUrl+'?x-oss-process=image/resize,m_fill,h_110,w_110' : '../../../assets/images/noImg.png'" alt=""> <img (click)="openPlan(i,key)"
[src]="i.imageUrl ? i.imageUrl+'?x-oss-process=image/resize,m_fill,h_110,w_110' : '../../../assets/images/noImg.png'"
alt="">
</div> </div>
<p>{{i.name}}</p> <p>{{i.name}}</p>
</div> </div>

2
src/app/plan-audit/plan-list/plan-list.component.ts
Unescape View File

@ -35,6 +35,7 @@ export class PlanListComponent implements OnInit {
}) })
}) })
this.allBuildings = data this.allBuildings = data
console.log('所有的建筑物',this.allBuildings)
}) })
} }
//获取总平面图 //获取总平面图
@ -44,6 +45,7 @@ export class PlanListComponent implements OnInit {
this.http.get('/api/SitePlans',{params:params}).subscribe(data=>{ this.http.get('/api/SitePlans',{params:params}).subscribe(data=>{
this.sitePlanItems = data this.sitePlanItems = data
}) })
console.log('总平面图',this.sitePlanItems)
} }
//打开采集工具 //打开采集工具
openPlan(item,index){ openPlan(item,index){

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

@ -159,7 +159,7 @@
</mat-tab> </mat-tab>
<mat-tab label="平面图"> <mat-tab label="平面图">
<ng-template matTabContent> <ng-template matTabContent>
<app-plan-list></app-plan-list> <app-plan-list [planType]="'all'"></app-plan-list>
</ng-template> </ng-template>
</mat-tab> </mat-tab>
<mat-tab label="四周毗邻"> <mat-tab label="四周毗邻">

Write Preview
Loading…
Cancel
Save