Browse Source

[新增]新增待审核页面中水源的显示

zhuzhou
邵佳豪 4 years ago
parent
commit
3ca9bca1ab
  1. 3
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  2. 3
      src/app/plan-audit/wait-examineer/wait-examineer.component.scss
  3. 11
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  4. 2
      src/app/plan-audit/water-audit/water-audit.component.html
  5. 8
      src/app/plan-audit/water-audit/water-audit.component.ts

3
src/app/plan-audit/wait-examineer/wait-examineer.component.html

@ -54,10 +54,9 @@
</table>
<div class="tbodycss" id="tbodydiv" >
<table cellspacing="0" cellpadding="0" id="table" >
<tr *ngFor="let item of tableDate;let key = index" (click)='radioClick($event,item)'>
<tr [ngClass]="{'selectedTr': item.id == id}" *ngFor="let item of tableDate;let key = index" (click)='radioClick($event,item)'>
<td style="width: 15%;">
<mat-checkbox color="primary" (change)='radioClick($event,item)'></mat-checkbox>
<!-- <input type="checkbox" name="yuan" value={{item.id}} (click)='radioClick($event,item)'> -->
{{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'?'联动力量':'未知'}}</td>
<td style="width: 15%;" [ngClass]="{'green': item.operation == '1','red':item.operation == '2','blue':item.operation == '0'}">{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>

3
src/app/plan-audit/wait-examineer/wait-examineer.component.scss

@ -50,6 +50,9 @@
overflow-y: auto;
height: 700px;
width: 100%;
.selectedTr{
background-color: #b3d3ee;
}
}
table{
margin-left:10px;

11
src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@ -157,7 +157,7 @@ export class WaitExamineerComponent implements OnInit {
radioClick(e,item){
this.showtype = -1
//e.target.parentElement.bgColor='#2196F3'
console.log(e,item)
console.log(item)
this.organizationName=''
this.id=item.id
this.fetchUrl=''
@ -167,7 +167,14 @@ export class WaitExamineerComponent implements OnInit {
sessionStorage.setItem('companyId',item.itemId)
}else if(item.contentType == 12){
//水源
this.showtype = 12
// console.log(item.itemId)
this.http.get(`/api/WaterSources/${item.itemId}`).subscribe((data)=>{
console.log('水源',data)
this.waterData = data
this.showtype = 12
})
}else if(item.contentType == 13){
//消防力量
this.showtype = 13

2
src/app/plan-audit/water-audit/water-audit.component.html

@ -4,7 +4,7 @@
<div class="tabsbox">
<div class="tabs">
<div class="selectedBtn">
<span>消火栓</span>
<span>{{selectedWaterTypeIndex == 0 ? '消火栓' : selectedWaterTypeIndex == 1 ? '消防水池' : selectedWaterTypeIndex == 2 ? '天然水源' : null}}</span>
</div>
</div>
</div>

8
src/app/plan-audit/water-audit/water-audit.component.ts

@ -15,10 +15,12 @@ export class WaterAuditComponent implements OnInit {
' <img style="width:20px;height:24px" src="/assets/images/定位.png">' +
'</div>'
ngOnInit(): void {
console.log(7777,this.waterData)
this.selectedWaterTypeIndex = this.waterData.waterSourceType
this.waterData.detailData = JSON.parse(this.waterData.detailData)
this.fireCockData = this.waterData.detailData
console.log(789, this.fireCockData)
this.poolData = this.waterData.detailData
this.naturalWaterData = this.waterData.detailData
setTimeout(() => {
this.map = new AMap.Map('container', {
zoom:18
@ -39,7 +41,7 @@ export class WaterAuditComponent implements OnInit {
}, 0);
}
selectedWaterTypeIndex:number = 0//选择的水源类型 0消火栓 1水池 2天然水源
selectedWaterTypeIndex:number //选择的水源类型 0消火栓 1水池 2天然水源
fireCockData:any = []//消火栓详情
poolData:any = []//水池详情
naturalWaterData:any = []//天然水源详情

Loading…
Cancel
Save