diff --git a/src/app/data-collection/data-collection.module.ts b/src/app/data-collection/data-collection.module.ts index fe8089e..e901e7e 100644 --- a/src/app/data-collection/data-collection.module.ts +++ b/src/app/data-collection/data-collection.module.ts @@ -43,12 +43,13 @@ import {MatTooltipModule} from '@angular/material/tooltip'; import {MatTreeModule} from '@angular/material/tree'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { DataCollectionRoutingModule } from './data-collection.routing'; -import { WaterCollectionComponent } from './water-collection/water-collection.component'; -import { FireForceComponent } from './fire-force/fire-force.component'; +import { AddWater, WaterCollectionComponent } from './water-collection/water-collection.component'; +import { AddFireForce, FireForceComponent } from './fire-force/fire-force.component'; import { LinkageForcesComponent } from './linkage-forces/linkage-forces.component'; +import { NzTreeModule } from 'ng-zorro-antd/tree'; @NgModule({ - declarations: [WaterCollectionComponent, FireForceComponent, LinkageForcesComponent], + declarations: [WaterCollectionComponent, FireForceComponent, LinkageForcesComponent,AddWater,AddFireForce], imports: [ CommonModule, A11yModule, @@ -95,7 +96,8 @@ import { LinkageForcesComponent } from './linkage-forces/linkage-forces.componen ScrollingModule, FormsModule, ReactiveFormsModule, - DataCollectionRoutingModule + DataCollectionRoutingModule, + NzTreeModule ] }) export class DataCollectionModule { } diff --git a/src/app/data-collection/fire-force/addFireForce.html b/src/app/data-collection/fire-force/addFireForce.html new file mode 100644 index 0000000..f99788e --- /dev/null +++ b/src/app/data-collection/fire-force/addFireForce.html @@ -0,0 +1,15 @@ +
+
+ 新增消防力量 +
+
+
+ + {{item.name}} +
+
+
+ + +
+
\ No newline at end of file diff --git a/src/app/data-collection/fire-force/fire-force.component.html b/src/app/data-collection/fire-force/fire-force.component.html index 413184e..70d1cde 100644 --- a/src/app/data-collection/fire-force/fire-force.component.html +++ b/src/app/data-collection/fire-force/fire-force.component.html @@ -1,8 +1,516 @@ -
+
+
+
+
+ 列表过滤 +
+
+ +
+
+
+
+ + 关键字: + + +
+
+ + 完整度: + + +
+
+ +
+
+
+
+
+
+ 消防队 + 完整度 +
+
+ + + + {{node.name}} + +
+ +
+
highlight_off
+ + + + + + {{node.name}} +
+ +
+
highlight_off
+ + +
+
- +
+ {{item.name}} +
+
+
+ +
+
+
+
+
+ 详情 +
+
+ 车辆装备 +
+
+ 相关资料 +
+
+
+ save保存 + open_in_browser提交审核 +
+
+ +
+ +
+

基本信息

+ + + + * + 队站名称: + + + + + + 联系电话: + + + + + + 传真: + + + + + + 辖区面积: + + + + + + 备注: + + + + +

位置信息

+ + + + 地址: + + + + + + 经度: + + + + 纬度: + + + + + + +

人员数量

+ + + + 现役官兵人数: + + + + + + 政府专职消防员数: + + + + + + 消防文员数: + + + + +

联系方式

+ + + + 总队长名称: + + + + + + 总队长联系方式: + + + + + + 总队政委姓名: + + + + + + 总队政委联系方式: + + + + + + + + 支队长姓名: + + + + + + 支队长联系方式: + + + + + + 支队政委姓名: + + + + + + 支队政委联系方式: + + + + +
+ +
+

基本信息

+ + + + * + 队站名称: + + + + + + 值班电话: + + + + + + 辖区面积: + + + + + + 备注: + + + + +

位置信息

+ + + + 地址: + + + + + + 经度: + + + + 纬度: + + + + + + +

人员数量

+ + + + 现役人数: + + + + + + 政府专职消防员数: + + + + + + 每日执勤人数: + + + + +

联系方式

+ + + + 站长姓名: + + + + + + 站长联系方式: + + + + + + 指导员姓名: + + + + + + 指导员联系方式: + + + + + + 副指导员姓名: + + + + + + 副指导员联系方式: + + + + + + 副站长一姓名: + + + + + + 副站长一联系方式: + + + + + + 副站长二姓名: + + + + + + 副站长二联系方式: + + + + + + 副站长三姓名: + + + + + + 副站长三联系方式: + + + + +
+ +
+

基本信息

+ + + + * + 队伍类型: + + + + + + * + 队伍名称: + + + + + + 管辖单位: + + + + + + + 队长: + + + + + + + 值班电话: + + + + + + 传真: + + + + + + 备注: + + + + +

位置信息

+ + + + 地址: + + + + + + 经度: + + + + 纬度: + + + + + + +

人员数量

+ + + + + 每日执勤人数: + + + + + + 消防队员总人数: + + + + + + 执勤车辆数: + +
+ + 辆 +
+ + + + 灭火剂总量: + +
+ + 个 +
+ + +
+
+ +
+
+ +
+ 车辆 +
+ +
+ 相关资料 +
+
\ No newline at end of file diff --git a/src/app/data-collection/fire-force/fire-force.component.scss b/src/app/data-collection/fire-force/fire-force.component.scss index ef03c8d..4463fe4 100644 --- a/src/app/data-collection/fire-force/fire-force.component.scss +++ b/src/app/data-collection/fire-force/fire-force.component.scss @@ -5,14 +5,351 @@ display: flex; box-sizing: border-box; padding: 10px; + font-size: 16px; + font-family: Source Han Sans CN; + font-weight: 400; + color: #000000; } .listbox{ width: 400px; height: 100%; background-color: #fff; + display: flex; + flex-direction: column; + .topbox{ + max-height: 200px; + box-sizing: border-box; + padding: 10px 22px 22px; + .add{ + height: 36px; + line-height: 36px; + display: flex; + justify-content: space-between; + } + .searchbox{ + .inputbox{ + width: 100%; + height: 36px; + font-size: 14px; + line-height: 36px; + margin: 10px 0; + display: flex; + span{ + margin-right: 5px; + } + select,input{ + flex: 1; + background-color: #F2F4F6; + border: 0; + border-radius: 5px; + box-sizing: border-box; + padding:0 8px; + + } + .gray{ + color: gray; + } + // input::-moz-placeholder { + // color: rgba(90, 83, 83, 0.89); + // opacity: 1; + // } + // input:-ms-input-placeholder { + // color: rgba(90, 83, 83, 0.89);; + // } + // input::-webkit-input-placeholder { + // color: rgba(90, 83, 83, 0.89);; + // } + } + } + } + .contantbox{ + flex: 1; + overflow-y: auto; + display: flex; + flex-direction: column; + .title{ + display: flex; + justify-content: space-between; + width: 100%; + box-sizing: border-box; + padding: 0 33px 0 22px; + height: 36px; + line-height: 36px; + span{ + font-size: 14px; + font-weight: 500; + } + } + .fireForceTree{ + flex: 1; + overflow-y: auto; + .nodename{ + flex: 1; + overflow: hidden; + text-overflow:ellipsis + } + .integrity{ + width: 100px; + height: 16px; + background-color: green; + + } + .mat-tree-node{ + cursor: pointer; + } + .selectedTreeNode{ + background-color: #d2eafd; + } + .mat-tree-node:hover{ + background-color: #d2eafd; + } + .deletebtn{ + width: 26px; + text-align: center; + mat-icon{ + width: 20px; + height: 20px; + cursor: pointer; + font-size: 20px; + vertical-align: text-top; + color: rgba(49, 46, 46, 0.144); + } + mat-icon:hover{ + color: #000; + } + } + } + .paginator{ + height: 56px; + width: 100%; + } + } } .mapbox{ flex: 1; margin-left: 10px; background-color: #fff; + display: flex; + flex-direction: column; + .mapcheckbox{ + width: 100%; + height: 50px; + line-height: 50px; + mat-checkbox{ + margin-right:60px; + font-size: 15px; + } + mat-checkbox:nth-child(1){ + margin-left: 20px; + } + } + #map{ + flex: 1; + position: relative; + #container{ + width: 100%; + height: 100%; + } + .gistopbox{ + position: absolute; + box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); + border-radius: 5px; + top: 3px; + width: 30%; + height:40px; + background: #FFFFFF; + display: flex; + align-items: center; + cursor: default;; + .inputBox{ + width: 100%; + display: flex; + align-items: center; + justify-content: center; + box-sizing: border-box; + font-size: 14px; + .positionInput{ + border: 0; + border-radius: 6px; + width: 80%; + height: 28px; + background: #F2F2F2; + margin-left: 8px; + box-sizing: border-box; + padding-left: 10px; + } + } + + } + .hidden{ + opacity: 0; + z-index: -1; + } + .show{ + opacity: 1; + z-index: 1; + } + } + .detailsbox{ + width: 100%; + height:500px; + .tabsbox{ + width: 100%; + height: 40px; + line-height: 40px; + display: flex; + justify-content: space-between; + font-size: 15px; + .tabs{ + div{ + float: left; + width: 120px; + text-align: center; + cursor: pointer; + color: #000000; + opacity: 0.4; + border-right: 1px solid #F2F4F6; + } + .selectedBtn{ + background-color: #2196F3; + color: #fff; + opacity: 1; + } + } + .btnbox{ + span{ + cursor: pointer; + color: #2196F3; + mat-icon{ + vertical-align: text-top; + font-size: 20px; + width: 20px; + height: 20px; + } + } + span:hover{ + text-decoration: underline; + } + .submitAudit{ + margin: 0 30px; + } + } + } + .contant{ + width: 100%; + height:480px; + overflow-y: auto; + p{ + color: #2196F3; + background-color: #F2F4F6; + height: 33px; + line-height: 33px; + box-sizing: border-box; + padding-left: 20px; + font-size: 15px; + } + span{ + font-size: 15px; + } + input,select{ + height: 30px; + line-height: 30px; + box-sizing: border-box; + padding: 0 12px; + width: 60%; + margin-left: 5px; + border: 1px solid #EBEBEB; + border-radius: 5px; + } + textarea{ + width: 89%; + margin-left: 5px; + height: 85%; + border: 1px solid #EBEBEB; + border-radius: 5px; + } + .longinput{ + width: 74%; + } + .unitDiv{ + width: 60%; + position: relative; + input,select{ + width: 100%; + box-sizing: border-box; + padding-right: 50px; + } + .unit{ + position: absolute; + right: 13px; + top: 4px; + color: #000000; + opacity: 0.4; + } + } + .smallwidth{ + width: 30%; + } + } + } +} + +.addWaterBox{ + width: 260px; + height: 284px; + display: flex; + flex-direction: column; + .topbox{ + width: 100%; + height: 40px; + line-height: 40px; + background-color: #2196F3; + text-align: center; + color: #FFFFFF; + font-size: 15px; + } + .contant{ + flex: 1; + box-sizing: border-box; + padding: 0 30px; + display: flex; + flex-direction: column; + justify-content: space-around; + div{ + width: 100%; + height: 36px; + line-height: 36px; + text-align: center; + background-color: #F2F4F6; + font-size: 14px; + cursor: pointer; + border: 1px solid #fff; + border-radius: 4px; + display: flex; + justify-content: center; + align-items: center; + img{ + margin-right: 3px; + } + } + .selectedDiv{ + background-color: #2196F3; + color: #fff; + border: 1px solid #2196F3; + } + } + .btnbox{ + width: 100%; + height: 50px; + box-sizing: border-box; + padding: 0px 30px; + display: flex; + align-items: flex-start;; + justify-content: space-between; + button{ + width: 80px; + height: 36px; + line-height: 36px; + } + } } \ No newline at end of file diff --git a/src/app/data-collection/fire-force/fire-force.component.ts b/src/app/data-collection/fire-force/fire-force.component.ts index 07d8d8e..2e2b582 100644 --- a/src/app/data-collection/fire-force/fire-force.component.ts +++ b/src/app/data-collection/fire-force/fire-force.component.ts @@ -1,4 +1,14 @@ +import { FlatTreeControl } from '@angular/cdk/tree'; +import { HttpClient } from '@angular/common/http'; +import { Inject, Renderer2 } from '@angular/core'; +import { ElementRef } from '@angular/core'; import { Component, OnInit } from '@angular/core'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; +import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; +import { NzTreeNode } from 'ng-zorro-antd/tree'; +import { TreeService } from 'src/app/http-interceptors/tree.service'; +declare var AMap: any; @Component({ selector: 'app-fire-force', @@ -7,9 +17,618 @@ import { Component, OnInit } from '@angular/core'; }) export class FireForceComponent implements OnInit { - constructor() { } + constructor(private tree: TreeService,public snackBar: MatSnackBar,private http:HttpClient,private elementRef: ElementRef,public renderer2: Renderer2,public dialog: MatDialog) { } - ngOnInit(): void { + isCheckedOfSearchDiv:boolean = true//列表过滤滑块 + slideChange(e){ + this.isCheckedOfSearchDiv = e.checked + } + searchForm:any = { + name:'', + integrityNum:'' + } + listIntegrityNum:any[] = [ + {id:-1,name:'全部'}, + {id:0,name:'<=50%'}, + {id:1,name:'50%-60%'}, + {id:2,name:'60%-70%'}, + {id:3,name:'70%-80%'}, + {id:4,name:'80%-90%'}, + {id:5,name:'90%-100%'} + ] + checkBoxList:any[] = [ + {id:0,name:'总队'}, + {id:1,name:'支队'}, + {id:2,name:'大队'}, + {id:3,name:'中队(消防站)'}, + {id:4,name:'其他消防队伍'} + ] + ngOnInit(): void { + this.getAllFireForce() + setTimeout(() => { + this.createMap() + }, 0); + } + //获得所有消防力量 + getAllFireForce(){ + this.http.get('/api/CustomFireForce').subscribe((data:any) => { +   this.dataSource.data = this.tree.toTree(data) + const nodes = this.treeControl.dataNodes; + const expandNodes = []; + nodes.forEach((item) => { + if(item.expandable && this.treeControl.isExpanded(item)){ + expandNodes.push(item.id); + } + }); + // this.dataSource.data = this.newdata; + let newNodes = this.treeControl.dataNodes; + newNodes = newNodes.filter(n => { + return expandNodes.indexOf(n.id) >= 0; + }); + console.log(newNodes) + newNodes.forEach(item => { + this.treeControl.expand(item); + }); + console.log('所有消防力量',data) + }) + } + private _transformer = (node, level: number) => {//要给渲染节点传那些属性参数 + return { + expandable: !!node.children && node.children.length > 0, + name: node.name, + level: level, + id: node.id, + parentId: node.parentId, + enabled:node.enabled, + order:node.order, + children:node.children, + code:node.code, + division:node.division, + fireForceDetailId:node.fireForceDetailId, + forceType:node.forceType + }; + } + treeControl = new FlatTreeControl(node => node.level, node => node.expandable); + treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); + dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); + hasChild = (_: number, node: any) => node.expandable; + selectedFireForceId:any + selectedFireForceLevel:any + selectedFireForce:any + //选择要显示的消防力量 + selectTreeNode(node){ + console.log(node) + if(this.selectedFireForceId != node.id){ + this.clearData() + + this.selectedFireForce = node + this.selectedFireForceId = node.id + this.selectedFireForceLevel = node.level + this.FireForceDetailInfo.stationName = node.name + if(this.newPositionMarker){ + this.map.remove(this.newPositionMarker); + } + if(node.fireForceDetailId ){ + this.isPost = false//是否走post创建接口 + let type + if(node.forceType == 0){ + type = 0 + }else{ + type = 1 + } + this.http.get(`/api/FireForceDetail/${type}/${node.id}`).subscribe((data:any) => { + console.log('当前详情',data) + this.FireForceDetailInfo = data + + if(data.location && data.location.x){//如果已经标注单位坐标 + console.log('开始标注') + this.positionLngLat = data.location + this.map.setCenter([data.location.x,data.location.y]); + this.newPositionMarker = new AMap.Marker({ + position: [data.location.x,data.location.y], + content: this.newPositionMarkerContent, + offset: new AMap.Pixel(-15, -18) + }) + // 将 markers 添加到地图 + this.map.add(this.newPositionMarker); + } + if(this.selectedFireForceLevel == 0){ + this.ZongpersonCountData = JSON.parse(data.personCountData) + this.ZongcontactData = JSON.parse(data.contactData) + } + }) + }else{ + } + } + } + //搜索 + searchList(){ + console.log(this.searchForm) + this.getAllFireForce() + } + + //js乘法 + accMul(arg1,arg2,fix) { + if(!parseInt(fix)==fix) + { + return; + } + var m=0,s1=arg1.toString(),s2=arg2.toString(); + try{m+=s1.split(".")[1].length}catch(e){} + try{m+=s2.split(".")[1].length}catch(e){} + if(m>fix){ + return (Math.round(Number(s1.replace(".",""))*Number(s2.replace(".",""))/Math.pow(10,m-fix))/Math.pow(10,fix)); + }else if(m<=fix){ + return (Number(s1.replace(".",""))*Number(s2.replace(".",""))/Math.pow(10,m)).toFixed(fix); + }else{ + return (arg1*arg2).toFixed(fix).toString(); + } + } + //点击水源列表 + selectedLiIndex:any + clickWaterLi(item,index){ + // console.log(item) + // if(this.selectedLiIndex != index){ + // this.selectedLiIndex = index + // this.clearData() + // // this.selectedWaterTypeIndex = item.waterSourceType//点击的水源类型 + // this.waterData = item + // item.waterSourceType == 0 && item.detailData ? this.fireCockData = JSON.parse(item.detailData) : null + // item.waterSourceType == 1 && item.detailData ? this.poolData = JSON.parse(item.detailData) : null + // item.waterSourceType == 2 && item.detailData ? this.naturalWaterData = JSON.parse(item.detailData) : null + // this.positionLngLat = item.location + // if(this.newPositionMarker){ + // this.map.remove(this.newPositionMarker); + // } + // if(item.location.x){//如果已经标注单位坐标 + // console.log('开始标注') + + // this.map.setCenter([item.location.x,item.location.y]); + // this.newPositionMarker = new AMap.Marker({ + // position: [item.location.x,item.location.y], + // content: this.newPositionMarkerContent, + // offset: new AMap.Pixel(-15, -18) + // }) + // // 将 markers 添加到地图 + // this.map.add(this.newPositionMarker); + // } + // } } + //完整度颜色 + integrity(width){ + let _this = this + let style:any = {} + style.width = width +'%'; + if(width < 30){ + style.background = '#FF5D4A' + } + if(width >= 30 && width < 60){ + style.background = '#FFDD00' + } + if(width >= 60){ + style.background = '#5CD64E' + } + return style + } + //删除某条消防队 + deleteWater(item,e){ + e.stopPropagation() + let isDelete = window.confirm(`确定要删除${item.name}吗`) + if(isDelete){ + // this.http.delete(`/api/WaterSources/${item.id}`).subscribe(data => { + // const config = new MatSnackBarConfig(); + // config.verticalPosition = 'top'; + // config.duration = 3000 + // this.snackBar.open('删除成功','确定',config); + // }) + } + } + //当前点击tab页面第几个 + tabIndex:any = 1 + selectedTab(index){ + this.tabIndex = index + } + + //消防力量详情提交信息 + FireForceDetailInfo:any = { + // id:'',//编号 + stationName:'',//队站名称 + isIndependentAlarm:true,//是否独立报警 + phoneNumber:'',//联系电话 + faxNumber:'',//传真 + jurisdictionArea:null,//辖区面积 + remark:'',//备注 + address:'',//地址 + location:null, + personCountData:[],//人员数量自定义 + contactData:[],//联系方式自定义 + dutyForceData:[]//执勤力量自定义 + } + //总队支队人员数量 + ZongpersonCountData:any=[ + {PropertyName :'现役官兵人数',PropertyValue:''}, + {PropertyName :'政府专职消防员数',PropertyValue:''}, + {PropertyName :'消防文员数',PropertyValue:''} + ] + //总队联系方式 + ZongcontactData:any=[ + {PropertyName :'总队长名称',PropertyValue:''}, + {PropertyName :'总队长联系方式',PropertyValue:''}, + {PropertyName :'总队政委名称',PropertyValue:''}, + {PropertyName :'总队政委联系方式',PropertyValue:''} + ] + //支队联系方式 + ZhicontactData:any=[ + {PropertyName :'支队长名称',PropertyValue:''}, + {PropertyName :'支队长联系方式',PropertyValue:''}, + {PropertyName :'支队政委名称',PropertyValue:''}, + {PropertyName :'支队政委联系方式',PropertyValue:''} + ] + //大队中队人员数量 + DaZhongpersonCountData:any=[ + {PropertyName :'现役人员',PropertyValue:''}, + {PropertyName :'政府专职消防员数',PropertyValue:''}, + {PropertyName :'每日执勤人数',PropertyValue:''} + ] + //大队中队联系方式 + DaZhongcontactData:any=[ + {PropertyName :'站长姓名',PropertyValue:''}, + {PropertyName :'站长联系方式',PropertyValue:''}, + {PropertyName :'指导员姓名',PropertyValue:''}, + {PropertyName :'指导员联系方式',PropertyValue:''}, + {PropertyName :'副指导员姓名',PropertyValue:''}, + {PropertyName :'副指导员联系方式',PropertyValue:''}, + {PropertyName :'副站长一姓名',PropertyValue:''}, + {PropertyName :'副站长一联系方式',PropertyValue:''}, + {PropertyName :'副站长二姓名',PropertyValue:''}, + {PropertyName :'副站长二联系方式',PropertyValue:''}, + {PropertyName :'副站长三姓名',PropertyValue:''}, + {PropertyName :'副站长三联系方式',PropertyValue:''} + ] + //其他消防力量联系方式 + othercontactData:any = [ + {PropertyName :'队长',PropertyValue:''}, + {PropertyName :'联系方式',PropertyValue:''} + ] + //其他消防力量人员数量 + otherpersonCountData:any = [ + {PropertyName :'每日执勤人数',PropertyValue:''}, + {PropertyName :'消防队员总人数',PropertyValue:''}, + {PropertyName :'执勤车辆数',PropertyValue:''}, + {PropertyName :'灭火剂总量',PropertyValue:''} + ] + //清空表单数据 + clearData(){ + this.positionLngLat = {x:'',y:''} + this.FireForceDetailInfo = { + // id:'',//编号 + stationName:'',//队站名称 + isIndependentAlarm:null,//是否独立报警 + phoneNumber:'',//联系电话 + faxNumber:'',//传真 + jurisdictionArea:null,//辖区面积 + remark:'',//备注 + address:'',//地址 + location:null, + personCountData:[],//人员数量自定义 + contactData:[],//联系方式自定义 + dutyForceData:[]//执勤力量自定义 + } + this.ZongpersonCountData = [ + {PropertyName :'现役官兵人数',PropertyValue:''}, + {PropertyName :'政府专职消防员数',PropertyValue:''}, + {PropertyName :'消防文员数',PropertyValue:''} + ] + this.ZongcontactData = [ + {PropertyName :'总队长名称',PropertyValue:''}, + {PropertyName :'总队长联系方式',PropertyValue:''}, + {PropertyName :'总队政委名称',PropertyValue:''}, + {PropertyName :'总队政委联系方式',PropertyValue:''} + ] + this.ZhicontactData = [ + {PropertyName :'支队长名称',PropertyValue:''}, + {PropertyName :'支队长联系方式',PropertyValue:''}, + {PropertyName :'支队政委名称',PropertyValue:''}, + {PropertyName :'支队政委联系方式',PropertyValue:''} + ] + this.DaZhongpersonCountData = [ + {PropertyName :'现役人员',PropertyValue:''}, + {PropertyName :'政府专职消防员数',PropertyValue:''}, + {PropertyName :'每日执勤人数',PropertyValue:''} + ] + this.DaZhongcontactData = [ + {PropertyName :'站长姓名',PropertyValue:''}, + {PropertyName :'站长联系方式',PropertyValue:''}, + {PropertyName :'指导员姓名',PropertyValue:''}, + {PropertyName :'指导员联系方式',PropertyValue:''}, + {PropertyName :'副指导员姓名',PropertyValue:''}, + {PropertyName :'副指导员联系方式',PropertyValue:''}, + {PropertyName :'副站长一姓名',PropertyValue:''}, + {PropertyName :'副站长一联系方式',PropertyValue:''}, + {PropertyName :'副站长二姓名',PropertyValue:''}, + {PropertyName :'副站长二联系方式',PropertyValue:''}, + {PropertyName :'副站长三姓名',PropertyValue:''}, + {PropertyName :'副站长三联系方式',PropertyValue:''} + ] + this.othercontactData = [ + {PropertyName :'队长',PropertyValue:''}, + {PropertyName :'联系方式',PropertyValue:''} + ] + this.otherpersonCountData = [ + {PropertyName :'每日执勤人数',PropertyValue:''}, + {PropertyName :'消防队员总人数',PropertyValue:''}, + {PropertyName :'执勤车辆数',PropertyValue:''}, + {PropertyName :'灭火剂总量',PropertyValue:''} + ] + } + //新增水源 + selectedFireForceTypeIndex:any//新增消防力量名称 + addFireForce(){ + if(this.selectedFireForceId){ + const dialogRef = this.dialog.open(AddFireForce, { + data: {}, + id:'addWater' + }); + dialogRef.afterClosed().subscribe( + data=>{ + if(typeof data === 'number' && !isNaN(data)){ + this.isPost = true + this.selectedFireForceTypeIndex = data + this.selectedFireForceLevel = data + // this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null + // this.positionLngLat.x = 0 + // this.positionLngLat.y = 0 + // this.map.setCity('上海市'); + this.clearData() + } + } + ); + }else{ + let config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('请先从左侧列表选择一个组织机构','确定',config); + } + + } + //保存 + isPost:boolean = false//是否走post创建接口 + save(){ + if(!this.FireForceDetailInfo.stationName){ + alert('名称必填') + return + } + this.FireForceDetailInfo.jurisdictionArea = Number(this.FireForceDetailInfo.jurisdictionArea) + //如果是总支大中 + if(this.selectedFireForce.forceType == 0&&(this.selectedFireForceLevel == 0 || this.selectedFireForceLevel == 1 || this.selectedFireForceLevel == 2 || this.selectedFireForceLevel == 3)){//如果是总队 + let body = this.FireForceDetailInfo + if(this.atLastPositionLngLat.x){ + this.FireForceDetailInfo.location.x = this.atLastPositionLngLat.x + this.FireForceDetailInfo.location.y = this.atLastPositionLngLat.y + } + if(this.selectedFireForceLevel == 0){//总队 + this.FireForceDetailInfo.personCountData = JSON.stringify(this.ZongpersonCountData) + this.FireForceDetailInfo.contactData = JSON.stringify(this.ZongcontactData) + this.FireForceDetailInfo.dutyForceData = null + } + if(this.selectedFireForceLevel == 1){//支队 + this.FireForceDetailInfo.personCountData = JSON.stringify(this.ZongpersonCountData) + this.FireForceDetailInfo.contactData = JSON.stringify(this.ZhicontactData) + this.FireForceDetailInfo.dutyForceData = null + } + if(this.selectedFireForceLevel == 2 || this.selectedFireForceLevel == 3){//大队 中队 + this.FireForceDetailInfo.personCountData = JSON.stringify(this.DaZhongpersonCountData) + this.FireForceDetailInfo.contactData = JSON.stringify(this.DaZhongcontactData) + this.FireForceDetailInfo.dutyForceData = null + } + this.http.put(`/api/FireForceDetail/0/${this.selectedFireForce.id}`,body).subscribe(data => { + let config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('保存成功','确定',config); + console.log(123,data) + }) + } + //如果是其他消防力量 + else{ + if(!this.isPost){ + let body = this.FireForceDetailInfo + body.personCountData = JSON.stringify(this.otherpersonCountData) + body.contactData = JSON.stringify(this.othercontactData) + body.dutyForceData = null + this.http.put(`/api/FireForceDetail/1/${this.selectedFireForce.id}`,body).subscribe(data => { + let config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('保存成功','确定',config); + console.log(123,data) + }) + }else{ + let forceType + this.selectedFireForceTypeIndex == 4 ? forceType = 1 : null + this.selectedFireForceTypeIndex == 5 ? forceType = 2 : null + this.selectedFireForceTypeIndex == 6 ? forceType = 4 : null + let body = { + organizationId:this.selectedFireForce.id, + name:this.FireForceDetailInfo.stationName, + createTime:new Date(), + forceType:forceType + } + let params = { + organizationId : this.selectedFireForce.id + } + this.http.post('/api/CustomFireForce',body,{params:params}).subscribe((data:any) => { + console.log('创建其他消防力量成功',data) + this.getAllFireForce() + let body = this.FireForceDetailInfo + body.personCountData = JSON.stringify(this.otherpersonCountData) + body.contactData = JSON.stringify(this.othercontactData) + body.dutyForceData = null + this.http.put(`/api/FireForceDetail/1/${data.id}`,body).subscribe(data => { + this.isPost = false + let config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('保存成功','确定',config); + console.log(123,data) + }) + }) + } + + + } + + + } + + map:any + placeSearch:any//构造地点查询类 + isMapLabel:boolean = false //是否已经标记坐标 + newPositionMarkerContent:any = + '
' + + ' ' + + '
' + newPositionMarkerContentBtn:any = + '
' + + ' ' + + '
|
' + + '
' + //创建地图 + newPositionMarker:any//坐标实例 + createMap(){ + this.map = new AMap.Map('container', { + zoom:12 + }) + this.map.setCity('上海市'); + //输入提示 + var autoOptions = { + input: "tipinput" + }; + AMap.plugin(['AMap.PlaceSearch','AMap.AutoComplete'], ()=>{ + let auto = new AMap.AutoComplete(autoOptions); + this.placeSearch = new AMap.PlaceSearch(); //构造地点查询类 + auto.on("select", (e)=>{ + this.newPositionMarker.setPosition([e.poi.location.lng,e.poi.location.lat]) + this.positionLngLat = {x: e.poi.location.lng, y: e.poi.location.lat} + this.map.setCenter([e.poi.location.lng,e.poi.location.lat]); //设置地图中心点 + });//注册监听，当选中某条记录时会触发 + + }); + if(this.isMapLabel){//如果已经标注单位坐标 + console.log('已标注单位位置') + // this.map.setCenter([this.unitinfo.location.x,this.unitinfo.location.y]); + // this.oldPositionMarker = new AMap.Marker({ + // position: [this.unitinfo.location.x,this.unitinfo.location.y], + // content: this.newPositionMarkerContent, + // offset: new AMap.Pixel(-15, -18) + // }) + // // 将 markers 添加到地图 + // this.map.add(this.oldPositionMarker); + }else{ + console.log('未标注单位位置') + // this.map.setCity('上海市'); + } + } + //点击位置 + isGisTopBox:boolean = false // + searchTitle:any = ''// + + positionLngLat:any = {}//临时坐标点 + atLastPositionLngLat:any = {}//最终坐标点 + setPosition(){ + if(!this.isGisTopBox){ + this.isGisTopBox = true + this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null + let center + console.log() + if(this.newPositionMarker && this.atLastPositionLngLat.x){//如果已经标注单位坐标 + console.log(1) + center = [this.atLastPositionLngLat.x, this.atLastPositionLngLat.y] + }else if(this.newPositionMarker && !this.atLastPositionLngLat.x && this.FireForceDetailInfo.location.x){ + console.log(2) + center = [this.FireForceDetailInfo.location.x, this.FireForceDetailInfo.location.y] + }else{ + console.log(3) + center = this.map.getCenter(); //获取当前地图中心位置 + } + this.newPositionMarker = new AMap.Marker({ + draggable: true, + position: center, + content: this.newPositionMarkerContentBtn, + offset: new AMap.Pixel(-15, -18) + }); + this.positionLngLat = {x: center.lng || center[0], y: center.lat || center[1]} + this.map.add(this.newPositionMarker); + this.isMapLabel = true + this.newPositionMarker.on('dragend', (e)=>{ + this.positionLngLat = {x: e.lnglat.lng, y: e.lnglat.lat} + }) + //点击确定 + this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{ + this.isGisTopBox = false + this.map.remove(this.newPositionMarker) + this.newPositionMarker = new AMap.Marker({ + position: [this.positionLngLat.x,this.positionLngLat.y], + content: this.newPositionMarkerContent, + offset: new AMap.Pixel(-15, -18) + }); + this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat)) + this.map.add(this.newPositionMarker); + this.positionLngLat = this.atLastPositionLngLat + }) + this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'),'click',(event)=>{ + this.isGisTopBox = false + this.map.remove(this.newPositionMarker) + if(this.positionLngLat.x && this.positionLngLat.x != 0 && !this.atLastPositionLngLat.x){//直接取消 + this.map.remove(this.newPositionMarker) + this.positionLngLat = {} + this.atLastPositionLngLat = {} + }else{ + this.newPositionMarker = new AMap.Marker({ + position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y], + content: this.newPositionMarkerContent, + offset: new AMap.Pixel(-15, -18) + }); + this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点 + this.map.add(this.newPositionMarker); + this.positionLngLat = this.atLastPositionLngLat + } + })//取消 + } + + } } + + + +//新增水源弹出框 +@Component({ + selector: 'addwater', + templateUrl: './addFireForce.html', + styleUrls: ['./fire-force.component.scss'] +}) +export class AddFireForce { + + constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} + + + addList:any = [ + {id:4, name:'微型消防站'}, + {id:5, name:'企业专职消防站'}, + {id:6, name:'义务(志愿)消防站'} + ] + selectedFireForceTypeIndex:any = 4 + selecteAddType(item,key){ + this.selectedFireForceTypeIndex = item.id + + } + ngOnInit(): void { + + } + + confirm(){ + this.dialogRef.close(this.selectedFireForceTypeIndex) + } + +} \ No newline at end of file diff --git a/src/app/data-collection/water-collection/addWater.html b/src/app/data-collection/water-collection/addWater.html new file mode 100644 index 0000000..03099b1 --- /dev/null +++ b/src/app/data-collection/water-collection/addWater.html @@ -0,0 +1,12 @@ +
+
+ 新增水源 +
+
+
{{item.name}}
+
+
+ + +
+
\ No newline at end of file diff --git a/src/app/data-collection/water-collection/water-collection.component.html b/src/app/data-collection/water-collection/water-collection.component.html index 413184e..542ed80 100644 --- a/src/app/data-collection/water-collection/water-collection.component.html +++ b/src/app/data-collection/water-collection/water-collection.component.html @@ -1,8 +1,436 @@ -
+
- +
+
+
+ 列表过滤 +
+
+ +
+
+
+
+ + 关键字: + + +
+
+ + 完整度: + + +
+
+ +
+
+
+
+
+
+ 地址 + 完整度 +
+
+
    +
  • +
    {{item.address}}
    +
    + + {{accMul(item.integrityScore.toFixed(3),100,1)}}% + +
    +
    +
    +
    highlight_off
    +
    • +
+
+
+ +
+
- +
+ {{item.name}} +
+
+
+ +
+
+
+
+
+ 消火栓 + 消防水池 + 天然水源 +
+
+
+ save保存 + open_in_browser提交审核 +
+
+
+

基本信息

+ + + + * + 名称: + + + + + + 行政区: + + + + + + 水源归属: + + + + + + 所属单位(小区): + + + + +

位置信息

+ + + + 地址: + + + + + + 经度: + + + + 纬度: + + + + + + +

详细信息

+ + + + + 可用状态: + + + + + + 放置形式: + + + + + + 管网形式: + + + + + + 管网直径: + +
+ + mm +
+ + + + 管网压力类型: + + + + + + 管网压力范围: + +
+ + Mpa +
+ + + + 接口形式: + + + + + + 接口口径: + +
+ + mm +
+ + + + + 最大流量: + +
+ + L/s +
+ + + + 供水单位: + + + + + + 联系方式: + + + + + + 备注: + + + + + + + + + 可用状态: + + + + + + 储水量: + +
+ + m³ +
+ + + + 取水最大流量: + +
+ + L/s +
+ + + + 进水流量: + +
+ + L/s +
+ + + + 同时取水车辆数: + + + + + + 水源标高差: + +
+ + m +
+ + + + 补水时间: + + + + + + 管网形式: + + + + + + 供水单位: + + + + + + 联系方式: + + + + + + 备注: + + + + + + + + + 可用状态: + + + + + + 天然水源类型: + + + + + + 有无消防码头: + + + + + + 水质: + + + + + + 同时取水车辆数: + + + + + + 水源标高差: + +
+ + m +
+ + + + 有无枯水期: + + + + + + 枯水期时间: + + + + + + 供水单位: + + + + + + 联系方式: + + + + + + 备注: + + + + +
+
\ No newline at end of file diff --git a/src/app/data-collection/water-collection/water-collection.component.scss b/src/app/data-collection/water-collection/water-collection.component.scss index ef03c8d..debc2c4 100644 --- a/src/app/data-collection/water-collection/water-collection.component.scss +++ b/src/app/data-collection/water-collection/water-collection.component.scss @@ -5,14 +5,373 @@ display: flex; box-sizing: border-box; padding: 10px; + font-size: 16px; + font-family: Source Han Sans CN; + font-weight: 400; + color: #000000; } .listbox{ width: 400px; height: 100%; background-color: #fff; + display: flex; + flex-direction: column; + .topbox{ + max-height: 200px; + box-sizing: border-box; + padding: 10px 22px 22px; + .add{ + height: 36px; + line-height: 36px; + display: flex; + justify-content: space-between; + } + .searchbox{ + .inputbox{ + width: 100%; + height: 36px; + font-size: 14px; + line-height: 36px; + margin: 10px 0; + display: flex; + span{ + margin-right: 5px; + } + select,input{ + flex: 1; + background-color: #F2F4F6; + border: 0; + border-radius: 5px; + box-sizing: border-box; + padding:0 8px; + + } + .gray{ + color: gray; + } + // input::-moz-placeholder { + // color: rgba(90, 83, 83, 0.89); + // opacity: 1; + // } + // input:-ms-input-placeholder { + // color: rgba(90, 83, 83, 0.89);; + // } + // input::-webkit-input-placeholder { + // color: rgba(90, 83, 83, 0.89);; + // } + } + } + } + .contantbox{ + flex: 1; + overflow-y: auto; + display: flex; + flex-direction: column; + .title{ + display: flex; + justify-content: space-between; + width: 100%; + box-sizing: border-box; + padding: 0 33px 0 22px; + height: 36px; + line-height: 36px; + span{ + font-size: 14px; + font-weight: 500; + } + } + .waterList{ + flex: 1; + overflow-y: auto; + li{ + cursor: pointer; + width: 100%; + height: 36px; + line-height: 36px; + display: flex; + align-items: center; + font-size: 14px; + div{ + float: left; + box-sizing: border-box; + } + .address{ + text-align: left; + width: 60%; + padding-left: 22px; + white-space:nowrap; + overflow:hidden; + text-overflow:ellipsis; + } + .integrity{ + height: 58%; + width: 32%; + position: relative; + background-color: #F2F4F6; + .integrityNum{ + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + color: black; + font-size: 13px; + cursor: default; + } + .integrityColorDiv{ + height: 100%; + } + } + .deletebtn{ + flex: 1; + text-align: center; + mat-icon{ + width: 20px; + height: 20px; + cursor: pointer; + font-size: 20px; + vertical-align: text-top; + color: rgba(49, 46, 46, 0.144); + } + mat-icon:hover{ + color: #000; + } + } + } + li:hover{ + background-color: #b3d3ee; + } + .selectedLi{ + background-color: #b3d3ee; + } + } + .paginator{ + height: 56px; + width: 100%; + } + } } .mapbox{ flex: 1; margin-left: 10px; background-color: #fff; + display: flex; + flex-direction: column; + .mapcheckbox{ + width: 100%; + height: 50px; + line-height: 50px; + mat-checkbox{ + margin-right:60px; + font-size: 15px; + } + mat-checkbox:nth-child(1){ + margin-left: 20px; + } + } + #map{ + flex: 1; + position: relative; + #container{ + width: 100%; + height: 100%; + } + .gistopbox{ + position: absolute; + box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); + border-radius: 5px; + top: 3px; + width: 30%; + height:40px; + background: #FFFFFF; + display: flex; + align-items: center; + cursor: default;; + .inputBox{ + width: 100%; + display: flex; + align-items: center; + justify-content: center; + box-sizing: border-box; + font-size: 14px; + .positionInput{ + border: 0; + border-radius: 6px; + width: 80%; + height: 28px; + background: #F2F2F2; + margin-left: 8px; + box-sizing: border-box; + padding-left: 10px; + } + } + + } + .hidden{ + opacity: 0; + z-index: -1; + } + .show{ + opacity: 1; + z-index: 1; + } + } + .detailsbox{ + width: 100%; + height:500px; + .tabsbox{ + width: 100%; + height: 40px; + line-height: 40px; + display: flex; + justify-content: space-between; + font-size: 15px; + .tabs{ + div{ + float: left; + width: 120px; + text-align: center; + cursor: pointer; + color: #000000; + opacity: 0.4; + border-right: 1px solid #F2F4F6; + } + .selectedBtn{ + background-color: #2196F3; + color: #fff; + opacity: 1; + } + } + .btnbox{ + span{ + cursor: pointer; + color: #2196F3; + mat-icon{ + vertical-align: text-top; + font-size: 20px; + width: 20px; + height: 20px; + } + } + span:hover{ + text-decoration: underline; + } + .submitAudit{ + margin: 0 30px; + } + } + } + .contant{ + width: 100%; + height:480px; + overflow-y: auto; + p{ + color: #2196F3; + background-color: #F2F4F6; + height: 33px; + line-height: 33px; + box-sizing: border-box; + padding-left: 20px; + font-size: 15px; + } + span{ + font-size: 15px; + } + input,select{ + height: 30px; + line-height: 30px; + box-sizing: border-box; + padding: 0 12px; + width: 60%; + margin-left: 5px; + border: 1px solid #EBEBEB; + border-radius: 5px; + } + textarea{ + width: 89%; + margin-left: 5px; + height: 85%; + border: 1px solid #EBEBEB; + border-radius: 5px; + } + .longinput{ + width: 74%; + } + .unitDiv{ + width: 60%; + position: relative; + input,select{ + width: 100%; + box-sizing: border-box; + padding-right: 50px; + } + .unit{ + position: absolute; + right: 13px; + top: 4px; + color: #000000; + opacity: 0.4; + } + } + } + } +} + +.addWaterBox{ + width: 260px; + height: 284px; + display: flex; + flex-direction: column; + .topbox{ + width: 100%; + height: 40px; + line-height: 40px; + background-color: #2196F3; + text-align: center; + color: #FFFFFF; + font-size: 15px; + } + .contant{ + flex: 1; + box-sizing: border-box; + padding: 0 30px; + display: flex; + flex-direction: column; + justify-content: space-around; + div{ + width: 100%; + height: 36px; + line-height: 36px; + text-align: center; + background-color: #F2F4F6; + font-size: 14px; + cursor: pointer; + border: 1px solid #fff; + border-radius: 4px; + display: flex; + justify-content: center; + align-items: center; + img{ + margin-right: 3px; + } + } + .selectedDiv{ + background-color: #2196F3; + color: #fff; + border: 1px solid #2196F3; + } + } + .btnbox{ + width: 100%; + height: 50px; + box-sizing: border-box; + padding: 0px 30px; + display: flex; + align-items: flex-start;; + justify-content: space-between; + button{ + width: 80px; + height: 36px; + line-height: 36px; + } + } } \ No newline at end of file diff --git a/src/app/data-collection/water-collection/water-collection.component.ts b/src/app/data-collection/water-collection/water-collection.component.ts index 18998f1..17dd475 100644 --- a/src/app/data-collection/water-collection/water-collection.component.ts +++ b/src/app/data-collection/water-collection/water-collection.component.ts @@ -1,4 +1,10 @@ +import { HttpClient } from '@angular/common/http'; +import { Inject, Renderer2 } from '@angular/core'; +import { ElementRef } from '@angular/core'; import { Component, OnInit } from '@angular/core'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; +declare var AMap: any; @Component({ selector: 'app-water-collection', @@ -7,9 +13,489 @@ import { Component, OnInit } from '@angular/core'; }) export class WaterCollectionComponent implements OnInit { - constructor() { } + constructor(public snackBar: MatSnackBar,private http:HttpClient,private elementRef: ElementRef,public renderer2: Renderer2,public dialog: MatDialog) { } + isCheckedOfSearchDiv:boolean = true//列表过滤滑块 + slideChange(e){ + this.isCheckedOfSearchDiv = e.checked + } + searchForm:any = { + name:'', + integrityNum:'' + } + listIntegrityNum:any[] = [ + {id:-1,name:'全部'}, + {id:0,name:'<=50%'}, + {id:1,name:'50%-60%'}, + {id:2,name:'60%-70%'}, + {id:3,name:'70%-80%'}, + {id:4,name:'80%-90%'}, + {id:5,name:'90%-100%'} + ] + checkBoxList:any[] = [ + {id:0,name:'消火栓'}, + {id:1,name:'消防水池'}, + {id:2,name:'天然水源'} + ] ngOnInit(): void { + this.getAllWaterData() + setTimeout(() => { + this.createMap() + }, 0); + } + //获得所有水源 + addWaterListData:any + dataLength:any //获取的数据一共多少条 + PageNumber:any = 1 //当前第几页 + getAllWaterData(){ + let MinIntegrity = 0 + let MaxIntegrity = 1.1 + if(this.searchForm.integrityNum == '0'){ + MinIntegrity = 0 + MaxIntegrity = 0.5 + }else if(this.searchForm.integrityNum == '1'){ + MinIntegrity = 0.5 + MaxIntegrity = 0.6 + }else if(this.searchForm.integrityNum == '2'){ + MinIntegrity = 0.6 + MaxIntegrity = 0.7 + }else if(this.searchForm.integrityNum == '3'){ + MinIntegrity = 0.7 + MaxIntegrity = 0.8 + }else if(this.searchForm.integrityNum == '4'){ + MinIntegrity = 0.8 + MaxIntegrity = 0.9 + }else if(this.searchForm.integrityNum == '5'){ + MinIntegrity = 0.9 + MaxIntegrity = 1.1 + }else if(this.searchForm.integrityNum == '-1'){ + MinIntegrity = 0 + MaxIntegrity = 1.1 + } + let params:any = { + Keyword : this.searchForm.name, + PageSize : 30, + PageNumber : this.PageNumber, + MinIntegrity : MinIntegrity, + MaxIntegrity : MaxIntegrity + } + this.http.get('/api/WaterSources',{params:params}).subscribe((data:any) => { + this.addWaterListData = data + this.dataLength = data.totalCount + console.log('所有水源',data) + }) + } + //搜索 + searchList(){ + console.log(this.searchForm) + this.getAllWaterData() + } + //分页事件 + chagePage(e){ + this.PageNumber = e.pageIndex+1 + this.getAllWaterData() + } + //js乘法 + accMul(arg1,arg2,fix) { + if(!parseInt(fix)==fix) + { + return; + } + var m=0,s1=arg1.toString(),s2=arg2.toString(); + try{m+=s1.split(".")[1].length}catch(e){} + try{m+=s2.split(".")[1].length}catch(e){} + if(m>fix){ + return (Math.round(Number(s1.replace(".",""))*Number(s2.replace(".",""))/Math.pow(10,m-fix))/Math.pow(10,fix)); + }else if(m<=fix){ + return (Number(s1.replace(".",""))*Number(s2.replace(".",""))/Math.pow(10,m)).toFixed(fix); + }else{ + return (arg1*arg2).toFixed(fix).toString(); + } + } + //点击水源列表 + selectedLiIndex:any + clickWaterLi(item,index){ + console.log(item) + if(this.selectedLiIndex != index){ + this.selectedLiIndex = index + this.clearData() + this.selectedWaterTypeIndex = item.waterSourceType//点击的水源类型 + this.waterData = item + item.waterSourceType == 0 && item.detailData ? this.fireCockData = JSON.parse(item.detailData) : null + item.waterSourceType == 1 && item.detailData ? this.poolData = JSON.parse(item.detailData) : null + item.waterSourceType == 2 && item.detailData ? this.naturalWaterData = JSON.parse(item.detailData) : null + this.positionLngLat = item.location + if(this.newPositionMarker){ + this.map.remove(this.newPositionMarker); + } + if(item.location.x){//如果已经标注单位坐标 + console.log('开始标注') + + this.map.setCenter([item.location.x,item.location.y]); + this.newPositionMarker = new AMap.Marker({ + position: [item.location.x,item.location.y], + content: this.newPositionMarkerContent, + offset: new AMap.Pixel(-15, -18) + }) + // 将 markers 添加到地图 + this.map.add(this.newPositionMarker); + } + } + } + //完整度颜色 + integrity(width){ + let _this = this + let style:any = {} + style.width = width +'%'; + if(width < 30){ + style.background = '#FF5D4A' + } + if(width >= 30 && width < 60){ + style.background = '#FFDD00' + } + if(width >= 60){ + style.background = '#5CD64E' + } + return style + } + //删除某条水源 + deleteWater(item,e){ + e.stopPropagation() + let isDelete = window.confirm('确定要删除此条水源信息吗') + if(isDelete){ + this.http.delete(`/api/WaterSources/${item.id}`).subscribe(data => { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.addWaterListData.items = this.addWaterListData.items.filter(x => { + return item.id != x.id + }) + this.dataLength = this.dataLength - 1 + // this.getAllWaterData() + this.snackBar.open('删除成功','确定',config); + }) + } + } + waterData:any = { + id:null, + name:'', + administrativeRegion:'',//行政区 + governmentLevel:'',//水源归属 + village:'',//所属单位（小区） + address:'', + location:{x:'',y:''}, + detailData:'',//详细信息 + createTime:'', + creatorId:'' + } + //消火栓详细信息 + fireCockData:any = [ + {PropertyName :'可用状态',PropertyValue:''}, + {PropertyName :'放置形式',PropertyValue:''}, + {PropertyName :'管网形式',PropertyValue:''}, + {PropertyName :'管网直径',PropertyValue:''}, + {PropertyName :'管网压力类型',PropertyValue:''}, + {PropertyName :'管网压力范围',PropertyValue:''}, + {PropertyName :'接口形式',PropertyValue:''}, + {PropertyName :'接口口径',PropertyValue:''}, + {PropertyName :'最大流量',PropertyValue:''}, + {PropertyName :'供水单位',PropertyValue:''}, + {PropertyName :'联系方式',PropertyValue:''}, + {PropertyName :'备注',PropertyValue:''} + ] + //消防水池详细信息 + poolData:any = [ + {PropertyName :'可用状态',PropertyValue:''}, + {PropertyName :'储水量',PropertyValue:''}, + {PropertyName :'取水最大流量',PropertyValue:''}, + {PropertyName :'进水流量',PropertyValue:''}, + {PropertyName :'同时取水车辆数',PropertyValue:''}, + {PropertyName :'水源标高差',PropertyValue:''}, + {PropertyName :'补水时间',PropertyValue:''}, + {PropertyName :'管网形式',PropertyValue:''}, + {PropertyName :'供水单位',PropertyValue:''}, + {PropertyName :'联系方式',PropertyValue:''}, + {PropertyName :'备注',PropertyValue:''} + ] + //天然水源详细信息 + naturalWaterData:any = [ + {PropertyName :'可用状态',PropertyValue:''}, + {PropertyName :'天然水源类型',PropertyValue:''}, + {PropertyName :'有无消防码头',PropertyValue:''}, + {PropertyName :'水质',PropertyValue:''}, + {PropertyName :'同时取水车辆数',PropertyValue:''}, + {PropertyName :'水源标高差',PropertyValue:''}, + {PropertyName :'有无枯水期',PropertyValue:''}, + {PropertyName :'枯水期时间',PropertyValue:''}, + {PropertyName :'供水单位',PropertyValue:''}, + {PropertyName :'联系方式',PropertyValue:''}, + {PropertyName :'备注',PropertyValue:''} + ] + //清空表单数据 + clearData(){ + this.waterData = { + id:null, + name:'', + administrativeRegion:'',//行政区 + governmentLevel:'',//水源归属 + village:'',//所属单位（小区） + address:'', + location:{x:'',y:''}, + detailData:'',//详细信息 + createTime:'', + creatorId:'' + } + this.fireCockData = [ + {PropertyName :'可用状态',PropertyValue:''}, + {PropertyName :'放置形式',PropertyValue:''}, + {PropertyName :'管网形式',PropertyValue:''}, + {PropertyName :'管网直径',PropertyValue:''}, + {PropertyName :'管网压力类型',PropertyValue:''}, + {PropertyName :'管网压力范围',PropertyValue:''}, + {PropertyName :'接口形式',PropertyValue:''}, + {PropertyName :'接口口径',PropertyValue:''}, + {PropertyName :'最大流量',PropertyValue:''}, + {PropertyName :'供水单位',PropertyValue:''}, + {PropertyName :'联系方式',PropertyValue:''}, + {PropertyName :'备注',PropertyValue:''} + ] + + this.poolData = [ + {PropertyName :'可用状态',PropertyValue:''}, + {PropertyName :'储水量',PropertyValue:''}, + {PropertyName :'取水最大流量',PropertyValue:''}, + {PropertyName :'进水流量',PropertyValue:''}, + {PropertyName :'同时取水车辆数',PropertyValue:''}, + {PropertyName :'水源标高差',PropertyValue:''}, + {PropertyName :'补水时间',PropertyValue:''}, + {PropertyName :'管网形式',PropertyValue:''}, + {PropertyName :'供水单位',PropertyValue:''}, + {PropertyName :'联系方式',PropertyValue:''}, + {PropertyName :'备注',PropertyValue:''} + ] + this.naturalWaterData = [ + {PropertyName :'可用状态',PropertyValue:''}, + {PropertyName :'天然水源类型',PropertyValue:''}, + {PropertyName :'有无消防码头',PropertyValue:''}, + {PropertyName :'水质',PropertyValue:''}, + {PropertyName :'同时取水车辆数',PropertyValue:''}, + {PropertyName :'水源标高差',PropertyValue:''}, + {PropertyName :'有无枯水期',PropertyValue:''}, + {PropertyName :'枯水期时间',PropertyValue:''}, + {PropertyName :'供水单位',PropertyValue:''}, + {PropertyName :'联系方式',PropertyValue:''}, + {PropertyName :'备注',PropertyValue:''} + ] + } + //新增水源 + selectedWaterTypeIndex:any//新增水源类型 + addWater(){ + const dialogRef = this.dialog.open(AddWater, { + data: {}, + id:'addWater' + }); + dialogRef.afterClosed().subscribe( + data=>{ + if(typeof data === 'number' && !isNaN(data)){ + this.selectedWaterTypeIndex = data + this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null + this.positionLngLat.x = 0 + this.positionLngLat.y = 0 + this.map.setCity('上海市'); + this.clearData() + } + } + ); + } + //保存水源 + save(){ + if(!this.waterData.name){ + alert('名称必填') + return + } + this.selectedWaterTypeIndex == '0' ? this.waterData.detailData = JSON.stringify(this.fireCockData) : null + this.selectedWaterTypeIndex == '1' ? this.waterData.detailData = JSON.stringify(this.poolData) : null + this.selectedWaterTypeIndex == '2' ? this.waterData.detailData = JSON.stringify(this.naturalWaterData) : null + this.waterData.waterSourceType = Number(this.selectedWaterTypeIndex) + + this.waterData.createTime = new Date() + + + if(this.waterData.id){ + if(this.atLastPositionLngLat.x){ + this.waterData.location.x = this.atLastPositionLngLat.x + this.waterData.location.y = this.atLastPositionLngLat.y + } + this.http.put(`/api/WaterSources/${this.waterData.id}`,this.waterData).subscribe(data => { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('修改成功','确定',config); + this.selectedLiIndex = 0 + this.getAllWaterData() + }) + }else{ + this.waterData.location.x = this.atLastPositionLngLat.x + this.waterData.location.y = this.atLastPositionLngLat.y + this.http.post('/api/WaterSources',this.waterData).subscribe(data => { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('保存成功','确定',config); + this.selectedLiIndex = 0 + this.waterData = data + this.getAllWaterData() + }) + } + + } + + map:any + placeSearch:any//构造地点查询类 + isMapLabel:boolean = false //是否已经标记坐标 + newPositionMarkerContent:any = + '
' + + ' ' + + '
' + newPositionMarkerContentBtn:any = + '
' + + ' ' + + '
|
' + + '
' + //创建地图 + newPositionMarker:any//坐标实例 + createMap(){ + this.map = new AMap.Map('container', { + zoom:12 + }) + this.map.setCity('上海市'); + //输入提示 + var autoOptions = { + input: "tipinput" + }; + AMap.plugin(['AMap.PlaceSearch','AMap.AutoComplete'], ()=>{ + let auto = new AMap.AutoComplete(autoOptions); + this.placeSearch = new AMap.PlaceSearch(); //构造地点查询类 + auto.on("select", (e)=>{ + this.newPositionMarker.setPosition([e.poi.location.lng,e.poi.location.lat]) + this.positionLngLat = {x: e.poi.location.lng, y: e.poi.location.lat} + this.map.setCenter([e.poi.location.lng,e.poi.location.lat]); //设置地图中心点 + });//注册监听，当选中某条记录时会触发 + + }); + + if(this.isMapLabel){//如果已经标注单位坐标 + console.log('已标注单位位置') + // this.map.setCenter([this.unitinfo.location.x,this.unitinfo.location.y]); + // this.oldPositionMarker = new AMap.Marker({ + // position: [this.unitinfo.location.x,this.unitinfo.location.y], + // content: this.newPositionMarkerContent, + // offset: new AMap.Pixel(-15, -18) + // }) + // // 将 markers 添加到地图 + // this.map.add(this.oldPositionMarker); + }else{ + console.log('未标注单位位置') + // this.map.setCity('上海市'); + } + } + //点击位置 + isGisTopBox:boolean = false // + searchTitle:any = ''// + + positionLngLat:any = {}//临时坐标点 + atLastPositionLngLat:any = {}//最终坐标点 + setPosition(){ + if(!this.isGisTopBox){ + this.isGisTopBox = true + this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null + let center + if(this.newPositionMarker && this.atLastPositionLngLat.x){//如果已经标注单位坐标 + console.log(1) + center = [this.atLastPositionLngLat.x, this.atLastPositionLngLat.y] + }else if(this.newPositionMarker && !this.atLastPositionLngLat.x && this.waterData.location.x){ + console.log(2) + center = [this.waterData.location.x, this.waterData.location.y] + }else{ + console.log(3) + center = this.map.getCenter(); //获取当前地图中心位置 + } + this.newPositionMarker = new AMap.Marker({ + draggable: true, + position: center, + content: this.newPositionMarkerContentBtn, + offset: new AMap.Pixel(-15, -18) + }); + this.positionLngLat = {x: center.lng || center[0], y: center.lat || center[1]} + this.map.add(this.newPositionMarker); + this.isMapLabel = true + this.newPositionMarker.on('dragend', (e)=>{ + this.positionLngLat = {x: e.lnglat.lng, y: e.lnglat.lat} + }) + //点击确定 + this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{ + this.isGisTopBox = false + this.map.remove(this.newPositionMarker) + this.newPositionMarker = new AMap.Marker({ + position: [this.positionLngLat.x,this.positionLngLat.y], + content: this.newPositionMarkerContent, + offset: new AMap.Pixel(-15, -18) + }); + this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat)) + this.map.add(this.newPositionMarker); + this.positionLngLat = this.atLastPositionLngLat + }) + this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'),'click',(event)=>{ + this.isGisTopBox = false + this.map.remove(this.newPositionMarker) + if(this.positionLngLat.x && this.positionLngLat.x != 0 && !this.atLastPositionLngLat.x){//直接取消 + this.map.remove(this.newPositionMarker) + this.positionLngLat = {} + this.atLastPositionLngLat = {} + }else{ + this.newPositionMarker = new AMap.Marker({ + position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y], + content: this.newPositionMarkerContent, + offset: new AMap.Pixel(-15, -18) + }); + this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点 + this.map.add(this.newPositionMarker); + this.positionLngLat = this.atLastPositionLngLat + } + })//取消 + } + + } +} + + +//新增水源弹出框 +@Component({ + selector: 'addwater', + templateUrl: './addWater.html', + styleUrls: ['./water-collection.component.scss'] +}) +export class AddWater { + + constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} + + + addList:any = [ + {name:'消火栓',src:'/assets/images/市政消火栓.png'}, + {name:'消防水池',src:'/assets/images/方形储水池.png'}, + {name:'天然水源',src:'/assets/images/天然水源.png'} + ] + selectedWaterTypeIndex:any = 0 + selecteAddType(item,key){ + this.selectedWaterTypeIndex = key + } + ngOnInit(): void { + + } + + confirm(){ + console.log(this.selectedWaterTypeIndex) + this.dialogRef.close(this.selectedWaterTypeIndex) } } diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.ts b/src/app/gis-management/gis-labeling/gis-labeling.component.ts index f2438e7..faa2a67 100644 --- a/src/app/gis-management/gis-labeling/gis-labeling.component.ts +++ b/src/app/gis-management/gis-labeling/gis-labeling.component.ts @@ -20,8 +20,8 @@ export class GisLabelingComponent implements OnInit { titleList = [ {name:'重点单位',iconImg:'/assets/images/uniticon.png'}, {name:'水源',iconImg:'/assets/images/watericon.png'}, {name:'测量工具',iconImg:'/assets/images/distanceicon.png'}, - /* {name:'测面积',iconImg:'/assets/images/areaicon.png'}, */ - {name:'图层选择',iconImg:'/assets/images/coverageicon.png'}] + {name:'图层选择',iconImg:'/assets/images/coverageicon.png'} + ] keyUnitList:any = [] waterList = [ {id:'0',name:'消火栓',selected:false}, @@ -312,7 +312,7 @@ export class GisLabelingComponent implements OnInit {
导航
全景漫游
三维场景
-
查看预案
+
查看预案
分享
` @@ -327,7 +327,7 @@ export class GisLabelingComponent implements OnInit { this.renderer2.listen(this.elementRef.nativeElement.querySelector('#route'),'click',(event)=>{ this.route(item) })//导航点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#fullViewNavigation'),'click',(event)=>{ this.fullViewNavigation(item) })//全景漫游点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#threeeScene'),'click',(event)=>{ this.threeeScene(item) })//三维场景点击事件 - this.renderer2.listen(this.elementRef.nativeElement.querySelector('#seePlan'),'click',(event)=>{ this.seePlan(item) })//查看预案点击事件 + this.renderer2.listen(this.elementRef.nativeElement.querySelector('#seePlan'),'click',(event)=>{ this.seePlan(item) })//查看预案点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#share'),'click',(event)=>{ this.share(item) })//分享点击事件 }); markerArr.push(labelMarker) @@ -712,7 +712,7 @@ export class GisLabelingComponent implements OnInit { let markerContent = `
${e.name}
-
单位性质:
+
单位性质:
消防负责人:
@@ -739,7 +739,7 @@ export class GisLabelingComponent implements OnInit {
导航
全景漫游
三维场景
-
查看预案
+
查看预案
分享
` @@ -754,7 +754,7 @@ export class GisLabelingComponent implements OnInit { this.renderer2.listen(this.elementRef.nativeElement.querySelector('#route'),'click',(event)=>{ this.route(e) })//导航点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#fullViewNavigation'),'click',(event)=>{ this.fullViewNavigation(e) })//全景漫游点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#threeeScene'),'click',(event)=>{ this.threeeScene(e) })//三维场景点击事件 - this.renderer2.listen(this.elementRef.nativeElement.querySelector('#seePlan'),'click',(event)=>{ this.seePlan(e) })//查看预案点击事件 + this.renderer2.listen(this.elementRef.nativeElement.querySelector('#seePlan'),'click',(event)=>{ this.seePlan(e) })//查看预案点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#share'),'click',(event)=>{ this.share(e) })//分享点击事件 marker.on('click', (ev) => { //marker点击事件 this.infoWindow = new AMap.InfoWindow({ @@ -767,7 +767,7 @@ export class GisLabelingComponent implements OnInit { this.renderer2.listen(this.elementRef.nativeElement.querySelector('#route'),'click',(event)=>{ this.route(e) })//导航点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#fullViewNavigation'),'click',(event)=>{ this.fullViewNavigation(e) })//全景漫游点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#threeeScene'),'click',(event)=>{ this.threeeScene(e) })//三维场景点击事件 - this.renderer2.listen(this.elementRef.nativeElement.querySelector('#seePlan'),'click',(event)=>{ this.seePlan(e) })//查看预案点击事件 + this.renderer2.listen(this.elementRef.nativeElement.querySelector('#seePlan'),'click',(event)=>{ this.seePlan(e) })//查看预案点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#share'),'click',(event)=>{ this.share(e) })//分享点击事件 }) @@ -793,7 +793,6 @@ export class GisLabelingComponent implements OnInit { this.leftDivState = false this.showLeftDiv = false this.isShowRouteGIS = true - // console.log(1,e) this.routeEnd = e.name this.endCoordinate = new AMap.LngLat(e.location.x, e.location.y) } @@ -868,20 +867,18 @@ export class GisLabelingComponent implements OnInit { var autoComplete = new AMap.Autocomplete(autoOptions); autoComplete.search(keywords, function(status, result) { if (result && result.tips && result.tips.length) { //搜索到数据时 + that._ngZone.run(()=>{ if(e == 0){ that.routeStartList = result.tips - - that.startCoordinate = new AMap.LngLat(result.tips[0].location.lng, result.tips[0].location.lat) - // console.log(666,result) }else{ that.routeEndList = result.tips that.endCoordinate = new AMap.LngLat(result.tips[0].location.lng, result.tips[0].location.lat) } }); - } + } //if }) }) }); //获取当前 city @@ -912,7 +909,6 @@ export class GisLabelingComponent implements OnInit { this.endCoordinate = null this.routeGIS? this.routeGIS.clear() : null this.routes = { distance: 0, time: 0, steps: [], } - // console.log(this.selectedUnit) this.map.setZoomAndCenter(13,[this.selectedUnit.location.x,this.selectedUnit.location.y]); //设置地图中心点 } @@ -941,10 +937,7 @@ export class GisLabelingComponent implements OnInit { this.routeGIS? this.routeGIS.clear() : null this.routeGIS = new AMap.Driving({ map: this.map, - }); - // console.log(1,this.startCoordinate) - // console.log(2,this.endCoordinate) - // 根据起终点名称规划驾车导航路线 + }); this.routeGIS.search(this.startCoordinate,this.endCoordinate, function(status, result) { if (status === 'complete') { diff --git a/src/app/key-unit/allaround/allaround.component.html b/src/app/key-unit/allaround/allaround.component.html index 9d94ca3..fd54eb2 100644 --- a/src/app/key-unit/allaround/allaround.component.html +++ b/src/app/key-unit/allaround/allaround.component.html @@ -1,42 +1,5 @@
- -
- -
-
- -
-
- -
-
- - -
-
- - -
-
- - - -
-
- -

暂无数据,请前往平面图进行相关数据录入

-
-
diff --git a/src/app/key-unit/allaround/allaround.component.ts b/src/app/key-unit/allaround/allaround.component.ts index 4702938..27693f8 100644 --- a/src/app/key-unit/allaround/allaround.component.ts +++ b/src/app/key-unit/allaround/allaround.component.ts @@ -17,7 +17,6 @@ export class AllaroundComponent implements OnInit { constructor(private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private route:ActivatedRoute,) { } ngOnInit(): void { - this.getAllCompany() this.getAllBuilding() } @@ -42,7 +41,13 @@ export class AllaroundComponent implements OnInit { this.AllBuilding.forEach(element => { element.allImgs = [] }); - this.getAllArchitecture()} + this.getAllArchitecture() + } else { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('暂无建筑数据','确定',config); + } }) } diff --git a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html index 44661db..ee701d0 100644 --- a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html +++ b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.html @@ -1,99 +1,5 @@
- -
- -

暂无数据,请完善单位基本信息

-
-

{{item.name}}

-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - -
{{header}}
{{body[header]? body[header] : '暂无数据'}}
-
-
-

楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}

- - - - - - - -
{{header}}
{{body[header]? body[header] : '暂无数据'}}
-
-
- - - -
-
- -
- - - - -

{{item.name}}

- - -
- - - - - - - {{radio.name}} - -
- - - -
- -
-
diff --git a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.ts b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.ts index ddaae08..ce55913 100644 --- a/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.ts +++ b/src/app/key-unit/fire-fighting-device-look/fire-fighting-device.component.ts @@ -21,7 +21,6 @@ export class FireFightingDeviceLookComponent implements OnInit { constructor(private router:Router,private route:ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } ngOnInit(): void { - this.getCompanyInformation() this.getAllBuilding() } @@ -234,7 +233,14 @@ export class FireFightingDeviceLookComponent implements OnInit { companyId:companyId }}).subscribe((data:any)=>{ this.allBuildingGrouping = data - if (this.allBuildingGrouping.length) { this.getAllBuildingFacilities() } + if (this.allBuildingGrouping.length) { + this.getAllBuildingFacilities() + } else { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('暂无建筑数据','确定',config); + } }) } diff --git a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html index 1bf4c41..2ccf727 100644 --- a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html +++ b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.html @@ -1,99 +1,5 @@
- -
- -

暂无数据,请完善单位基本信息

-
-

{{item.name}}

-
- add_circle_outline - description - delete -
-
- - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - -
{{header}}
{{body[header]? body[header] : '暂无数据'}}
-
-
-

楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}

- - - - - - - -
{{header}}
{{body[header]? body[header] : '暂无数据'}}
-
-
- - - -
-
- -
- - - - -

{{item.name}}

- description - -
- - - - - - - {{radio.name}} - -
- - - -
- -
-
diff --git a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts index a3be170..8393abf 100644 --- a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts +++ b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts @@ -22,7 +22,6 @@ export class FireFightingDeviceComponent implements OnInit { constructor(private tabbarService: TabbarAndScoreService,private router:Router,private route:ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } ngOnInit(): void { - this.getCompanyInformation() this.getAllBuilding() } @@ -233,7 +232,14 @@ export class FireFightingDeviceComponent implements OnInit { companyId:companyId }}).subscribe((data:any)=>{ this.allBuildingGrouping = data - if (this.allBuildingGrouping.length) { this.getAllBuildingFacilities() } + if (this.allBuildingGrouping.length) { + this.getAllBuildingFacilities() + } else { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('暂无建筑数据','确定',config); + } }) } diff --git a/src/app/key-unit/function-division-look/function-division.component.html b/src/app/key-unit/function-division-look/function-division.component.html index 21de153..93cde75 100644 --- a/src/app/key-unit/function-division-look/function-division.component.html +++ b/src/app/key-unit/function-division-look/function-division.component.html @@ -1,59 +1,6 @@
-
- -
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - -
- - 区域 - - - - 面积 - - - - - 基本情况 - -
-

暂无数据

-
- -
diff --git a/src/app/key-unit/function-division-look/function-division.component.ts b/src/app/key-unit/function-division-look/function-division.component.ts index 372b02b..c9e0ccc 100644 --- a/src/app/key-unit/function-division-look/function-division.component.ts +++ b/src/app/key-unit/function-division-look/function-division.component.ts @@ -16,7 +16,6 @@ export class FunctionDivisionLookComponent implements OnInit { ngOnInit(): void { this.companyId = this.route.snapshot.queryParams.id - this.getAllCompany() this.getAllBuilding() } @@ -121,6 +120,11 @@ export class FunctionDivisionLookComponent implements OnInit { element.functionalZoning = null }); this.getAllBuildingFunctionalZoning() + } else { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('暂无建筑数据','确定',config); } }) } diff --git a/src/app/key-unit/function-division/function-division.component.html b/src/app/key-unit/function-division/function-division.component.html index ce618bf..9e50317 100644 --- a/src/app/key-unit/function-division/function-division.component.html +++ b/src/app/key-unit/function-division/function-division.component.html @@ -1,59 +1,10 @@
-
+
add_circle_outline
- -
-
- add_circle_outline - description - delete -
- - - - - - - - - - - - - - - - - - - - - - - - -
- - 区域 - - - - 面积 - - - - - 基本情况 - -
-

暂无数据

-
- -
diff --git a/src/app/key-unit/function-division/function-division.component.ts b/src/app/key-unit/function-division/function-division.component.ts index 7da8809..2611f5e 100644 --- a/src/app/key-unit/function-division/function-division.component.ts +++ b/src/app/key-unit/function-division/function-division.component.ts @@ -17,7 +17,6 @@ export class FunctionDivisionComponent implements OnInit { ngOnInit(): void { this.companyId = this.route.snapshot.queryParams.id - this.getAllCompany() this.getAllBuilding() } @@ -49,7 +48,6 @@ export class FunctionDivisionComponent implements OnInit { //保存单位功能分区属性 preservation () { let companyId = this.route.snapshot.queryParams.id - // console.log(123,companyId) if (this.companyFunctionalZoning.length) { this.http.post('/api/CompanyFunctionalDivisions/Batch',this.companyFunctionalZoning,{params:{ companyId:companyId @@ -124,6 +122,11 @@ export class FunctionDivisionComponent implements OnInit { element.functionalZoning = null }); this.getAllBuildingFunctionalZoning() + } else { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('暂无建筑数据','确定',config); } }) } diff --git a/src/app/key-unit/key-site-look/key-site.component.html b/src/app/key-unit/key-site-look/key-site.component.html index 8af5827..bdb2718 100644 --- a/src/app/key-unit/key-site-look/key-site.component.html +++ b/src/app/key-unit/key-site-look/key-site.component.html @@ -1,62 +1,5 @@
- -
- -
-

重点部位情况

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
重点部位名称 - {{element.name}} - 重点部位所在位置 - {{element.position}} - 建筑结构 - {{element.structure}} - 使用性质 - {{element.nature}} - 主要危险性 - {{element.hazards}} - 图片 - 查看图片 -
-

暂无数据,请前往平面图进行相关数据录入

-
-
-

重点提示

- -

- -

-
- -
-
diff --git a/src/app/key-unit/key-site-look/key-site.component.ts b/src/app/key-unit/key-site-look/key-site.component.ts index ba659df..053dc20 100644 --- a/src/app/key-unit/key-site-look/key-site.component.ts +++ b/src/app/key-unit/key-site-look/key-site.component.ts @@ -19,8 +19,6 @@ export class KeySiteLookComponent implements OnInit { displayedColumns: string[] = ['mainname', 'position', 'construction', 'nature', 'danger', 'img']; ngOnInit(): void { - this.getCompanyPostion() - this.getCompanyTips() this.getAllBuilding() } @@ -59,6 +57,11 @@ export class KeySiteLookComponent implements OnInit { element.companyInput = null }) //建筑重点提示数据 this.getAllBuildingPositon() this.getAllBuildingTips() + } else { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('暂无建筑数据','确定',config); } }) } diff --git a/src/app/key-unit/key-site/key-site.component.html b/src/app/key-unit/key-site/key-site.component.html index 4adf51d..c79f635 100644 --- a/src/app/key-unit/key-site/key-site.component.html +++ b/src/app/key-unit/key-site/key-site.component.html @@ -1,62 +1,5 @@
- -
- -
-

重点部位情况

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
重点部位名称 - {{element.name}} - 重点部位所在位置 - {{element.position}} - 建筑结构 - {{element.structure}} - 使用性质 - {{element.nature}} - 主要危险性 - {{element.hazards}} - 图片 - 查看图片 -
-

暂无数据,请前往平面图进行相关数据录入

-
-
-

重点提示

- description -

- -

-
- -
-
diff --git a/src/app/key-unit/key-site/key-site.component.ts b/src/app/key-unit/key-site/key-site.component.ts index df76261..b72badc 100644 --- a/src/app/key-unit/key-site/key-site.component.ts +++ b/src/app/key-unit/key-site/key-site.component.ts @@ -20,8 +20,6 @@ export class KeySiteComponent implements OnInit { displayedColumns: string[] = ['mainname', 'position', 'construction', 'nature', 'danger', 'img']; ngOnInit(): void { - this.getCompanyPostion() - this.getCompanyTips() this.getAllBuilding() } @@ -60,6 +58,11 @@ export class KeySiteComponent implements OnInit { element.companyInput = null }) //建筑重点提示数据 this.getAllBuildingPositon() this.getAllBuildingTips() + } else { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('暂无建筑数据','确定',config); } }) } diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.html b/src/app/key-unit/key-unit-management/key-unit-management.component.html index 9b78ece..fa0d039 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.html +++ b/src/app/key-unit/key-unit-management/key-unit-management.component.html @@ -1,5 +1,4 @@ - -
+