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 6008fd5..4189176 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 @@ -233,7 +233,7 @@ export class FireFightingDeviceComponent implements OnInit { companyId:companyId }}).subscribe((data:any)=>{ this.allBuildingGrouping = data - console.log(888,data) + // console.log(888,data) if (this.allBuildingGrouping.length) { this.getAllBuildingFacilities() } else { @@ -478,15 +478,13 @@ export class FireFightingDeviceComponent implements OnInit { for (const key in object) { if (Object.prototype.hasOwnProperty.call(object, key)) { const element = object[key]; - if(element.total || element.details){ - body.push({ - buildingId: item.buildingId, - groupName: groupName, - facilityName: element.name, - count: element.total, - description: element.details - }) - } + body.push({ + buildingId: item.buildingId, + groupName: groupName, + facilityName: element.name, + count: element.total || '', + description: element.details || '' + }) } } return body @@ -520,7 +518,7 @@ export class FireFightingDeviceComponent implements OnInit { }else if(item.name == '其它设施'){ putBody = returnBody(this.otherFacilities,'其它设施') }else if(item.name == '自动消防设施'){ - putBody = returnBody(this.otherFacilities,'自动消防设施') + putBody = returnBody(this.automaticFireProtectionFacility,'自动消防设施') } if(putBody.length != 0){ this.http.put('/api/BuildingFacilities/FacilityStatUpdate',putBody,{ diff --git a/src/app/key-unit/key-unit.module.ts b/src/app/key-unit/key-unit.module.ts index 500edd3..c5e5041 100644 --- a/src/app/key-unit/key-unit.module.ts +++ b/src/app/key-unit/key-unit.module.ts @@ -88,7 +88,7 @@ import { SpecialWarningComponent } from './special-warning/special-warning.compo @NgModule({ declarations: [KeyUnitManagementComponent, EditUnitInfoComponent, ViewUnitDetailsComponent,CreateUnit,BasicinfoComponent,LookMaster,AddHouseInfo, EditPlanInfoComponent,BasicinfoLookComponent, ViewUnitDetailsPlanComponent,FunctionDivisionComponent,addPartition,addPartitionAttribute,AllaroundComponent,ImgDetails,RealisticPictureComponent,previewImg,addRealPicture,editRealPicture,KeySiteComponent,KeySiteImgs,UploadingCADComponent,readFile,editFile,KeySiteLookComponent,KeySiteImgs2,FunctionDivisionLookComponent,RealisticPictureLookComponent,previewImg3,UploadingCADLookComponent,FireFightingDeviceComponent,ImagesData,previewBigImg,ImgsDataDetail,FireFightingDeviceLookComponent,ImagesData2,ImgsDataDetail2,previewBigImg2,addPartitionAttribute2, SixFamiliarityComponent, ActualCombatDrillComponent,routerMapComponent, SixFamiliarListComponent,TrainingRecordinfoComponent,RouterGISComponent,WaterRoadComponent,PhotoofthesceneComponent,KnowRouteComponent,FindProblemComponent,upname,companyAuditResult,StatisticsOfFireFightingFacilities, SpecialWarningComponent], - exports:[ViewUnitDetailsPlanComponent], + exports:[ViewUnitDetailsPlanComponent,WaterRoadComponent], imports: [ CommonModule, KeyUnitRoutingModule, diff --git a/src/app/key-unit/water-road/water-road.component.html b/src/app/key-unit/water-road/water-road.component.html index ac01340..7ad14a9 100644 --- a/src/app/key-unit/water-road/water-road.component.html +++ b/src/app/key-unit/water-road/water-road.component.html @@ -1,7 +1,7 @@
- +
@@ -39,7 +39,11 @@
- + + +
\ No newline at end of file diff --git a/src/app/key-unit/water-road/water-road.component.scss b/src/app/key-unit/water-road/water-road.component.scss index a9378a2..41b2331 100644 --- a/src/app/key-unit/water-road/water-road.component.scss +++ b/src/app/key-unit/water-road/water-road.component.scss @@ -135,4 +135,10 @@ } } } +} + +.createImg{ + position: absolute; + right: 30px; + top: 15px; } \ No newline at end of file diff --git a/src/app/key-unit/water-road/water-road.component.ts b/src/app/key-unit/water-road/water-road.component.ts index c20f9fd..fa24d5e 100644 --- a/src/app/key-unit/water-road/water-road.component.ts +++ b/src/app/key-unit/water-road/water-road.component.ts @@ -5,7 +5,7 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dial import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { ActivatedRoute } from '@angular/router'; declare var AMap: any; - +declare var html2canvas: any; @Component({ selector: 'app-water-road', templateUrl: './water-road.component.html', @@ -13,46 +13,48 @@ declare var AMap: any; }) export class WaterRoadComponent implements OnInit { - constructor(private http: HttpClient,public renderer2: Renderer2,public snackBar: MatSnackBar,public dialog: MatDialog,private fb: FormBuilder,private route:ActivatedRoute) { } + constructor(private http: HttpClient, public renderer2: Renderer2, public snackBar: MatSnackBar, public dialog: MatDialog, private fb: FormBuilder, private route: ActivatedRoute) { } //获得单位信息 - unitData:any - - async getUnitData(){ - await new Promise((resolve, reject) =>{ - this.http.get(`/api/Companies/${this.route.snapshot.queryParams.id}`).subscribe(data => { + unitData: any + + async getUnitData() { + await new Promise((resolve, reject) => { + let id + this.route.snapshot.queryParams.id ? id = this.route.snapshot.queryParams.id : id = this.route.snapshot.queryParams.companyId + this.http.get(`/api/Companies/${id}`).subscribe(data => { this.unitData = data resolve(data) }) - }) + }) } - map:any //地图 - watertForm:FormGroup //gis右上角水源表单 - waterList = [ - {id:'0',name:'消火栓',selected:true}, - {id:'1',name:'消防水池',selected:true}, - {id:'2',name:'天然水源',selected:true}, - {id:'3',name:'总队',selected:true}, - {id:'4',name:'支队',selected:true}, - {id:'5',name:'大队',selected:true}, - {id:'6',name:'中队(消防站)',selected:true}, - {id:'7',name:'其他消防队伍',selected:true} + map: any //地图 + watertForm: FormGroup //gis右上角水源表单 + waterList = [ + { id: '0', name: '消火栓', selected: true }, + { id: '1', name: '消防水池', selected: true }, + { id: '2', name: '天然水源', selected: true }, + { id: '3', name: '总队', selected: true }, + { id: '4', name: '支队', selected: true }, + { id: '5', name: '大队', selected: true }, + { id: '6', name: '中队(消防站)', selected: true }, + { id: '7', name: '其他消防队伍', selected: true } ] - fireForceList:any[] = [ - + fireForceList: any[] = [ + ] - waterAreaDefault:any = '5000' //默认水源范围 - selectedWaterList:any = [] //选择提交的水源 + waterAreaDefault: any = '5000' //默认水源范围 + selectedWaterList: any = [] //选择提交的水源 //地图范围圆圈---水源 circleofwater = new AMap.Circle({ center: null, radius: 0, //半径 - strokeOpacity: 1, + strokeOpacity: 1, fillOpacity: 0.4, strokeStyle: 'dashed', - strokeDasharray: [10, 10], + strokeDasharray: [10, 10], // 线样式还支持 'dashed' fillColor: '#1791fc', zIndex: 50, @@ -60,19 +62,19 @@ export class WaterRoadComponent implements OnInit { async ngOnInit(): Promise { this.watertForm = this.fb.group({ - waters:this.waterUnits(), - allSelectedWater:new FormControl(), - areaWater:new FormControl() + waters: this.waterUnits(), + allSelectedWater: new FormControl(), + areaWater: new FormControl() }) this.waters.valueChanges.subscribe(values => { - let selects:string[] = [] - values.forEach((selected:boolean,i:number) => { + let selects: string[] = [] + values.forEach((selected: boolean, i: number) => { selected === true && selects.push(this.waterList[i].id) }); this.selectedWaterList = selects }) this.waterList.forEach(item => { - if(item.selected){ + if (item.selected) { this.selectedWaterList.push(item.id) } }) @@ -82,56 +84,56 @@ export class WaterRoadComponent implements OnInit { }, 0); } - get waters():any{ + get waters(): any { return this.watertForm.get('waters') } //全选水源 - selectedAllWater(event){ - if(event.checked){ - this.waters.controls.forEach(item => {item.setValue(true)}) - }else{ - this.watertForm.reset() + selectedAllWater(event) { + if (event.checked) { + this.waters.controls.forEach(item => { item.setValue(true) }) + } else { + this.watertForm.reset() this.watertForm.controls.areaWater.setValue('0') } } //水源提交 - waterSubmit(value){ - if(!this.unitMarker){ + waterSubmit(value) { + if (!this.unitMarker) { let config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('请前往基本信息标注单位坐标','确定',config); - }else{ + this.snackBar.open('请前往基本信息标注单位坐标', '确定', config); + } else { this.circleofwater.setRadius(Number(this.waterAreaDefault)) this.circleofwater.setCenter(this.unitMarker._position) this.circleofwater.setMap(this.map) let Distance let lnglat = new AMap.LngLat(this.unitData.location.x, this.unitData.location.y) // lng, lat 替换成传入的坐标 - + //如果选择当前的视野范围算出查询半径 - if(this.waterAreaDefault == '0'){ - this.circleofwater.setRadius(this.Calculationofdistance(this.map.getBounds())/2) - Distance = Math.abs(lnglat.offset(0, this.Calculationofdistance(this.map.getBounds())/2).lat - this.unitData.location.y) - }else{ - Distance = Math.abs(lnglat.offset(0, this.waterAreaDefault).lat - this.unitData.location.y) + if (this.waterAreaDefault == '0') { + this.circleofwater.setRadius(this.Calculationofdistance(this.map.getBounds()) / 2) + Distance = Math.abs(lnglat.offset(0, this.Calculationofdistance(this.map.getBounds()) / 2).lat - this.unitData.location.y) + } else { + Distance = Math.abs(lnglat.offset(0, this.waterAreaDefault).lat - this.unitData.location.y) } this.getWaterData(Distance) } } //获得水源列表 - getWaterData(Distance){ - if(this.selectedWaterList.length == 0){ + getWaterData(Distance) { + if (this.selectedWaterList.length == 0) { let config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('请选择要显示的类型','确定',config); - }else{ - - console.log('选中的内容',this.selectedWaterList) + this.snackBar.open('请选择要显示的类型', '确定', config); + } else { + + // console.log('选中的内容', this.selectedWaterList) function checkAdult(item) { return item <= 2; } @@ -140,88 +142,88 @@ export class WaterRoadComponent implements OnInit { } const water = this.selectedWaterList.filter(checkAdult); const power = this.selectedWaterList.filter(checkAdult2); - console.log('water',water) - console.log('power',power) - let waterparamsdata:any = { - PageSize:99999, - Lon : this.unitData.location.x, - Lat : this.unitData.location.y, - Distance : Distance, - WaterSourceTypes :water + // console.log('water', water) + // console.log('power', power) + let waterparamsdata: any = { + PageSize: 99999, + Lon: this.unitData.location.x, + Lat: this.unitData.location.y, + Distance: Distance, + WaterSourceTypes: water } - let powerparamsdata:any = { - PageSize:99999, - Lon : this.unitData.location.x, - Lat : this.unitData.location.y, - Distance : Distance, - WaterSourceTypes :power + let powerparamsdata: any = { + PageSize: 99999, + Lon: this.unitData.location.x, + Lat: this.unitData.location.y, + Distance: Distance, + WaterSourceTypes: power } - if( water.length == 0 ){ - this.http.get("/api/CustomFireForce",{params:powerparamsdata}).subscribe((data2:any) => { + if (water.length == 0) { + this.http.get("/api/CustomFireForce", { params: powerparamsdata }).subscribe((data2: any) => { this.createwaterMarker(data2) }) - }else if( power.length == 0 ){ - this.http.get("/api/WaterSources",{params:waterparamsdata}).subscribe((data:any) => { + } else if (power.length == 0) { + this.http.get("/api/WaterSources", { params: waterparamsdata }).subscribe((data: any) => { this.createwaterMarker(data.items) }) - }else{ - this.http.get("/api/WaterSources",{params:waterparamsdata}).subscribe((data:any) => { - this.http.get("/api/CustomFireForce",{params:powerparamsdata}).subscribe((data2:any) => { - let allData = [...data.items,...data2] + } else { + this.http.get("/api/WaterSources", { params: waterparamsdata }).subscribe((data: any) => { + this.http.get("/api/CustomFireForce", { params: powerparamsdata }).subscribe((data2: any) => { + let allData = [...data.items, ...data2] this.createwaterMarker(allData) }) }) } - + } - + } //循环渲染出所有水源markers - waterCluster:any //水源聚合实例 - createwaterMarker(list){ + waterCluster: any //水源聚合实例 + createwaterMarker(list) { let waterMarkerArrcluster = [] this.waterCluster ? this.waterCluster.setData([]) : null list.forEach((item) => { let image - if(item.waterSourceType == 0 || item.waterSourceType == 1 || item.waterSourceType == 2){ - if(item.waterSourceType == 0){//消火栓 + if (item.waterSourceType == 0 || item.waterSourceType == 1 || item.waterSourceType == 2) { + if (item.waterSourceType == 0) {//消火栓 image = '/assets/waterMarkers/szxhs.png' - }else if(item.waterSourceType == 1){//消防水池 + } else if (item.waterSourceType == 1) {//消防水池 image = '/assets/waterMarkers/fxcsc.png' - }else if(item.waterSourceType == 2){//天然水源 + } else if (item.waterSourceType == 2) {//天然水源 image = '/assets/waterMarkers/trsy.png' } // 用于点集合的数组 item.location ? waterMarkerArrcluster.push({ - lnglat : [item.location.x,item.location.y], - image : image, - data : item + lnglat: [item.location.x, item.location.y], + image: image, + data: item }) : null - }else{ - if(item.forceType == 2){ + } else { + if (item.forceType == 2) { image = '/assets/fireForcesMarkers/qita.png' - }else if(item.level == 0){ + } else if (item.level == 0) { image = '/assets/fireForcesMarkers/zongdui.png' - }else if(item.level == 1){ + } else if (item.level == 1) { image = '/assets/fireForcesMarkers/zhidui.png' - }else if(item.level == 2){ + } else if (item.level == 2) { image = '/assets/fireForcesMarkers/dadui.png' - }else if(item.level == 3){ + } else if (item.level == 3) { image = '/assets/fireForcesMarkers/zhongdui.png' } // 用于点集合的数组 - item.fireForceDetailInfo.location ? - waterMarkerArrcluster.push({ - lnglat : [item.fireForceDetailInfo.location.x,item.fireForceDetailInfo.location.y], - image : image, - data : item - }) : null + item.fireForceDetailInfo.location ? + waterMarkerArrcluster.push({ + lnglat: [item.fireForceDetailInfo.location.x, item.fireForceDetailInfo.location.y], + image: image, + data: item + }) : null } - + }) - this.map.plugin(["AMap.MarkerClusterer"],() => { + this.map.plugin(["AMap.MarkerClusterer"], () => { var gridSize = 60 var count = waterMarkerArrcluster.length; var _renderClusterMarker = function (context) { @@ -237,7 +239,7 @@ export class WaterRoadComponent implements OnInit { div.style.width = div.style.height = size + 'px'; div.style.border = 'solid 1px ' + borderColor; div.style.borderRadius = size / 2 + 'px'; - div.style.boxShadow = '0 0 5px ' + shadowColor; + // div.style.boxShadow = '0 0 5px ' + shadowColor; div.innerHTML = context.count; div.style.lineHeight = size + 'px'; div.style.color = fontColor; @@ -246,7 +248,7 @@ export class WaterRoadComponent implements OnInit { context.marker.setOffset(new AMap.Pixel(-size / 2, -size / 2)); context.marker.setContent(div) }; - var _renderMarker = (context)=> { + var _renderMarker = (context) => { var content = ``; var offset = new AMap.Pixel(-12.5, -12.5); context.marker.setContent(content) @@ -257,17 +259,17 @@ export class WaterRoadComponent implements OnInit { renderClusterMarker: _renderClusterMarker, // 自定义聚合点样式 renderMarker: _renderMarker, // 自定义非聚合点样式 }); - this.waterCluster.on('click',(e)=>{ - if(e.clusterData.length == 1){ - + this.waterCluster.on('click', (e) => { + if (e.clusterData.length == 1) { + } }) }); - + } //取消显示水源 - resetWater(){ + resetWater() { this.watertForm.reset() this.watertForm.controls.areaWater.setValue('0') this.map.remove(this.circleofwater) @@ -275,7 +277,7 @@ export class WaterRoadComponent implements OnInit { } //计算两地距离 - Calculationofdistance(bounds){ + Calculationofdistance(bounds) { let p1 = [bounds.northEast.lng, bounds.northEast.lat]; let p2 = [bounds.northEast.lng, bounds.southWest.lat]; // 返回 p1 到 p2 间的地面距离，单位：米 @@ -292,35 +294,67 @@ export class WaterRoadComponent implements OnInit { } //地图初始化 - unitMarker:any//单位标点 - newPositionMarkerContent:any = - '
' + - ' ' + - '
' - creatMap(){ - this.map = new AMap.Map('center',{ + unitMarker: any//单位标点 + newPositionMarkerContent: any = + '
' + + ' ' + + '
' + creatMap() { + this.map = new AMap.Map('center', { zoom: 13, //初始地图级别 + WebGLParams: { + preserveDrawingBuffer: true + } }); - if(this.unitData.location && this.unitData.location.x){ - this.map.setCenter([this.unitData.location.x,this.unitData.location.y]); + if (this.unitData.location && this.unitData.location.x) { + this.map.setCenter([this.unitData.location.x, this.unitData.location.y]); this.unitMarker = new AMap.Marker({ - position: [this.unitData.location.x,this.unitData.location.y], + position: [this.unitData.location.x, this.unitData.location.y], content: this.newPositionMarkerContent, offset: new AMap.Pixel(-10, -13) }) // 将 markers 添加到地图 this.map.add(this.unitMarker); this.waterSubmit(1) - }else{ + } else { this.map.setCity('上海市'); let config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - this.snackBar.open('请先前往基本信息标注单位位置','确定',config); + this.snackBar.open('请先前往基本信息标注单位位置', '确定', config); } - + } + canvasImg + takeScreenshotGis() { + // console.log(666666, this.selectingSitePlan) + // 使用html2canvas插件，将数据源中的数据转换成画布。 + html2canvas(document.querySelector("#center"), { + useCORS: true, // 【重要】开启跨域配置, + allowTaint: true,//允许跨域图片 + taintTest: false,//是否在渲染前测试图片 + onrendered: function (canvas) { + var dataUrl = canvas.toDataURL("image/png"); + } + }).then(canvas => { + // 修改生成的宽度 + this.canvasImg = canvas.toDataURL("image/png"); + // console.log(this.canvasImg) + }).then(() => { + this.downloadFile('水源图', this.canvasImg); + }) + } + downloadFile(filename, content) { + var base64Img = content; + var oA = document.createElement('a'); + oA.href = base64Img; + oA.download = filename; + var event = document.createEvent('MouseEvents'); + event.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); + oA.dispatchEvent(event); + } + } diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html index 854ad6a..f9b5e29 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html @@ -1,16 +1,13 @@
-
+
-
- 1.封面 -
- {{key + 2}}.{{item.groupName}} + [ngClass]="{'selectedItem': selectedItem == item.groupName}" [title]="item.groupName"> + {{key + 1}}.{{item.groupName}}
-
-
-
+ +
+
重点图示 @@ -38,7 +39,7 @@
-
@@ -63,7 +64,7 @@
-
@@ -112,12 +113,68 @@
-
-
+
+
+ 交通水源 +
+
+
+ + + + + 水源 + + +
+
+
+ +
+

交通水源

+
+
+ + +
+
+
+
+
+ 预案附件 +
+
+
+ + + + + 二维预案列表 + + +
+
+
+ +
+

{{TwoDPlan.name}}

+
+
+ + +
+
+
+
+
建筑列表
-
+
{{item.name}}
@@ -125,112 +182,114 @@
- -
-

- 预案编号: -

-

{{planName}}

-
    -
  • -
    - 对象名称： -
    -
    - {{unitData.name}} -
    -
    • -
  • -
    - 单位性质： -
    -
    - {{unitData.buildingTypes[0].name}} -
    -
    • -
  • -
    - *预案级别： -
    -
    - - Ⅴ级 - - - Ⅲ级 - -
    -
    • -
  • -
    - *灾害类型： -
    -
    - -
    -
    • -
  • -
    - 防火级别： -
    -
    - -
    -
    • -
  • -
    - 防火管辖： -
    -
    - {{unitData.organizationName}} -
    -
    • -
  • -
    - 灭火责任队站： -
    -
    - -
    -
    • -
  • -
    - 制作人职务/姓名： -
    -
    - - -
    -
    • -
  • -
    - 审核人职务/姓名： -
    -
    - -
    -
    • -
  • -
    - 审核时间： -
    -
    - -
    -
    • -
-
-
- +
+ +
+

+ 预案编号: +

+

{{item.attribute.planName}}

+
    +
  • +
    + 对象名称： +
    +
    + {{item.attribute.objName}} +
    +
    • +
  • +
    + 单位性质： +
    +
    + {{item.attribute.unitNature}} +
    +
    • +
  • +
    + *预案级别： +
    +
    + + Ⅴ级 + + + Ⅲ级 + +
    +
    • +
  • +
    + *灾害类型： +
    +
    + +
    +
    • +
  • +
    + 防火级别： +
    +
    + +
    +
    • +
  • +
    + 防火管辖： +
    +
    + {{item.attribute.fireproofingAdminister}} +
    +
    • +
  • +
    + 灭火责任队站： +
    +
    + +
    +
    • +
  • +
    + 制作人职务/姓名： +
    +
    + + +
    +
    • +
  • +
    + 审核人职务/姓名： +
    +
    + + +
    +
    • +
  • +
    + 审核时间： +
    +
    + +
    +
    • +
+
-
+ *ngIf="item.groupName!='单位概况'&&item.groupName!='交通水源'&&item.groupName!='重点图示'&&item.groupName!='预案附件'&&item.groupName!='特别警示'&&item.groupName!='处置要点'&&item.groupName!='封面'"> +
{{item.groupName}}
@@ -284,7 +343,11 @@
-
+
+
+ {{item.groupName}} +
@@ -297,7 +360,7 @@
-
+
@@ -306,13 +369,16 @@
-
+
+
+ {{item.groupName}} +
@@ -320,7 +386,8 @@
- +
@@ -330,7 +397,24 @@
+
+
+ {{item.groupName}} +
+
+
+ +
+
+ +
+
+
+
+ 单位基本信息 +
{{buildingName}}
@@ -347,13 +431,16 @@
{{attack.head}} - - + +
- @@ -368,11 +455,11 @@ -
+
+
- - + +
@@ -465,7 +552,7 @@
- +
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss index 4634be4..b4dec88 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss @@ -42,6 +42,9 @@ box-sizing: border-box; padding: 0 10px; font-size: 14px; + overflow: hidden; /*超出部分隐藏*/ + white-space: nowrap; /*不换行*/ + text-overflow: ellipsis; /*超出部分文字以...显示*/ } .item:hover { background: #e8f4fe; @@ -66,12 +69,12 @@ } } } + .contentbox { height: 100%; box-sizing: border-box; padding-top: 66px; overflow-y: auto; - .leftbox { position: fixed; width: 14%; @@ -171,24 +174,24 @@ } } } - .leftBuilding{ + .leftBuilding { width: 100%; height: 100%; display: flex; flex-direction: column; } - .buildingHead{ + .buildingHead { height: 40px; width: 100%; background-color: #e8f4fe; text-align: center; - span{ + span { line-height: 40px; color: #2196f3; font-size: 16px; } } - .buildingBody{ + .buildingBody { width: 100%; height: 100%; display: flex; @@ -196,11 +199,11 @@ .selectedTr { background-color: #b3d3ee; } - .buildName{ + .buildName { cursor: pointer; height: 40px; width: 100%; - border-bottom: 1px solid #F2F4F5; + border-bottom: 1px solid #f2f4f5; .example-margin { width: 14px; height: 14px; @@ -209,7 +212,7 @@ position: relative; bottom: 1px; } - span{ + span { line-height: 40px; font-size: 16px; margin-left: 5px; @@ -226,6 +229,7 @@ padding: 10px 10px 0; .cover { width: 100%; + min-height: 780px; input, select { border: 1px solid #ebebeb; @@ -233,6 +237,9 @@ height: 28px; line-height: 28px; } + input{ + width: 140px; + } p { height: 28px; line-height: 28px; @@ -456,13 +463,13 @@ margin: 10px 0; } } - .unit{ + .unit { width: 100%; height: 100%; display: flex; flex-direction: column; overflow-y: auto; - .unithead{ + .unithead { height: 40px; width: 100%; background-color: #e8f4fe; @@ -476,22 +483,22 @@ line-height: 40px; } } - .unitbody{ + .unitbody { height: 100%; width: 100%; display: flex; flex-direction: column; - .unitbodyHead{ + .unitbodyHead { width: 100%; height: 40px; - background-color: #2196F3; + background-color: #2196f3; text-align: center; span { font-size: 16px; text-align: center; height: 40px; line-height: 40px; - color: #FFFFFF; + color: #ffffff; } img { cursor: pointer; @@ -502,13 +509,13 @@ margin-right: 10px; } } - .body{ + .body { width: 100%; height: 100%; - .attack{ + .attack { width: 100%; height: 100%; - .attackhead{ + .attackhead { width: 100%; height: 40px; background-color: #ffd91d; @@ -529,7 +536,7 @@ margin-right: 10px; } } - .attackbody{ + .attackbody { width: 100%; height: 100%; thead { @@ -734,6 +741,7 @@ } } } + } .disposalPoint { div { width: 100%; @@ -782,7 +790,22 @@ margin: 10px 0; } } + .titleItem{ + width: 100%; + height: 36px; + line-height: 36px; + background-color: #2196F3; + text-align: center; + color: white; + } } } + .noPadding{ + padding-top: 10px; + } + .quitPreview{ + position: fixed; + top: 10px; + right: 15px; + } } -} \ No newline at end of file diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts index 7a2e4db..c749a33 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-06-16 13:56:54 * @LastEditors: sueRimn - * @LastEditTime: 2021-06-28 17:09:10 + * @LastEditTime: 2021-06-29 17:00:09 */ import { HttpClient } from '@angular/common/http'; import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core'; @@ -22,13 +22,9 @@ export class CreatePlanOnlineFiveComponent implements OnInit { constructor(private http: HttpClient, private route: ActivatedRoute, public snackBar: MatSnackBar, public dialog: MatDialog) { } - planName: string //预案名称 planLevel: string//预案级别 ngOnInit(): void { - this.planName = this.route.snapshot.queryParams.planName this.planLevel = this.route.snapshot.queryParams.planCategory - console.log('级别', this.planLevel) - this.getTemplateData() this.getUnitData() //this.getAllBuildings() this.tree = { @@ -64,8 +60,8 @@ export class CreatePlanOnlineFiveComponent implements OnInit { data.items.forEach(element => { if (element.id == this.route.snapshot.queryParams.companyId) { this.unitData = element - console.log('单位列表信息', this.unitData) - + // console.log('单位列表信息', this.unitData) + this.getTemplateData() } }); }) @@ -74,7 +70,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { selectedItem: string = '封面' clickTitleItem(item) { this.addNumber = -1 - item == '封面' ? this.selectedItem = '封面' : this.selectedItem = item.groupName + this.selectedItem = item.groupName if (this.selectedItem == '重点图示') { this.getAllBuildings() this.getSitePlan() @@ -87,21 +83,43 @@ export class CreatePlanOnlineFiveComponent implements OnInit { this.planTemplateData[0].attribute[0].attinf[3].value=this.unitData.phone this.planTemplateData[0].attribute[0].attinf[4].value=this.unitData.organizationName this.planTemplateData[0].attribute[0].attinf[5].value=this.unitData.address + } /* else if (this.selectedItem == '单位概况') { + //this.getAllBuildings() + } */ else if (this.selectedItem == '预案附件') { + this.getTwoDPlanList() } } + //获取当前单位的二维预案 + TwoDPlanList: any + getTwoDPlanList() { + let paramsData = { + companyId: this.route.snapshot.queryParams.companyId, + pageSize: "999" + } + this.http.get("/api/PlanComponents", { params: paramsData }).subscribe((data: any) => { + this.TwoDPlanList = data.items.filter((item) => { + return item.planType == 1 + }) + }) + } + + + + + //获取实景图 allRealPicture getRealPicture() { let companyId = this.unitId this.http.get('/api/RealityImageGroups', { params: { - companyId: '5e9964caa760a059e84512e9' + companyId: this.route.snapshot.queryParams.companyId } }).subscribe((data: any) => { this.allRealPicture = data this.getAllRealPicture().then(() => { - console.log('实景图', this.allRealPicture) + // console.log('实景图', this.allRealPicture) }) }) } @@ -132,24 +150,68 @@ export class CreatePlanOnlineFiveComponent implements OnInit { planTemplateData: any //获得模板信息 getTemplateData() { - this.http.get('/api/PlanTemplate').subscribe(data => { - this.planTemplateData = JSON.parse(data[2].data).filter(item => + this.http.get(`/api/PlanComponents/${this.route.snapshot.queryParams.planId}/WebText`).subscribe((data: any) => { + // console.log('预案内容', data) + this.planTemplateData = JSON.parse(data.webTextData).filter(item => item.completed == true ) - console.log(this.planTemplateData) + // console.log(this.planTemplateData) + if (this.planTemplateData[0].groupName != '封面') { + let obj = { + completed: true, + groupName: "封面", + attribute: { + planNumber: '', + planName: this.route.snapshot.queryParams.planName, + objName: this.unitData.name, + unitNature: this.unitData.buildingTypes[0].name, + planLevel: '', + disasterType: '0', + fireproofingLevel: '', + fireproofingAdminister: this.unitData.organizationName, + putOutFireAdminister: '', + producer: { + name: '', + duty: '' + }, + verifier: { + name: '', + duty: '' + }, + auditTime: '' + } + } + this.planTemplateData.unshift(obj) + } this.planTemplateData.forEach(element => { if (element.groupName == '重点图示') { if (!element.attribute) { element.attribute = [{ name: '', imgArr: [] }] } } + if (element.groupName == '交通水源') { + if (!element.attribute) { + element.attribute = [{ name: '', imgArr: [] }] + } + } + if (element.groupName == '预案附件') { + if (!element.attribute) { + element.attribute = [{ name: '', imgArr: [] }] + } + } if (element.groupName == '处置要点') { if (!element.attribute) { element.attribute = [{ name: '', content: '' }] } } + if (element.groupName == '特别警示') { + if (!element.attribute) { + element.attribute = [{ name: '特别警示', content: '' }] + } + } }); }) + } @@ -163,7 +225,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } //通过左侧查看实景图 gallery - lookkeyImgItemLeft(key1, key2,i) { + lookkeyImgItemLeft(key1, key2, i) { let dom = document.getElementById(`viewerjs`) let pObjs = dom.childNodes; let node = document.createElement("img") @@ -261,11 +323,20 @@ export class CreatePlanOnlineFiveComponent implements OnInit { }) } //打开采集工具 - openPlan(item, index) { + openPlan(item, index, type?: string) { sessionStorage.setItem("gisplan", 'look') sessionStorage.setItem("companyId", this.unitId) // console.log(item) - let data = { select: item, key: index, allBuildings: this.allBuildings } + if (type == '预案') { + sessionStorage.setItem("planId", item.id) + sessionStorage.setItem("companyId", this.route.snapshot.queryParams.companyId) + sessionStorage.setItem("buildingTypeId", this.route.snapshot.queryParams.unitTypeId) + sessionStorage.setItem("editable", "0") + sessionStorage.setItem("planName", item.name) + sessionStorage.setItem("orName", item.name) + sessionStorage.setItem("orId", item.name) + } + let data = { select: item, key: index, allBuildings: this.allBuildings, type: type } let width = Math.round(document.body.clientWidth * 0.8) + 'px' let height = Math.round(document.body.clientHeight * 0.9) + 'px' // console.log('宽度',width) @@ -309,7 +380,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { this.planTemplateData[key].attribute[i].tabletr[this.addNumber].tabletd.push('') } } - console.log(this.planTemplateData) + // console.log(this.planTemplateData) } //灾情设定表格删除一行 delTd(key, i) { @@ -329,7 +400,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } //单位概况左侧建筑点击事件 buildingName - clicki=0 + clicki = 0 group clickBuilding(item,i){ this.buildingName=item.name @@ -338,9 +409,9 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } //单位概况增加一行 - unitadd(surveyName,attacki){ + unitadd(surveyName, attacki) { this.addNumber++ - if(surveyName=='进攻通道'){ + if (surveyName == '进攻通道') { if (this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr == undefined) { this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr = [] } @@ -353,8 +424,8 @@ export class CreatePlanOnlineFiveComponent implements OnInit { this.planTemplateData[0].building[this.clicki].body[4].attinf[attacki].tabletr[this.addNumber].tabletd.push('') } } - - console.log(this.planTemplateData) + + // console.log(this.planTemplateData) } else if(surveyName=='功能分区'){ console.log(this.clicki) @@ -364,7 +435,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } } //单位概况删除一行 - unitDel(surveyName,attacki){ + unitDel(surveyName, attacki) { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 @@ -434,6 +505,15 @@ export class CreatePlanOnlineFiveComponent implements OnInit { }) }) } + + //预览 + pattern:string = 'edit' + preview(){ + this.pattern = 'look' + } + quitPreview(){ + this.pattern = 'edit' + } } @@ -451,12 +531,15 @@ export class OpenPlanToolDialog { @ViewChild('plan') plan: any //子组件 + type: any//打开的类型 是平面图还是水源 ngOnInit() { - + this.type = this.data.type } ngAfterViewInit(): void { - this.noticePlan() + if (this.type != '水源' && this.type != '预案') { + this.noticePlan() + } } //通知 子组件 传递参数 diff --git a/src/app/plan-management/create-plan-online-five/openPlanTool.html b/src/app/plan-management/create-plan-online-five/openPlanTool.html index 2c411a2..ac9fe02 100644 --- a/src/app/plan-management/create-plan-online-five/openPlanTool.html +++ b/src/app/plan-management/create-plan-online-five/openPlanTool.html @@ -1,3 +1,9 @@ -
+
+ +
+
+
+ +
\ No newline at end of file diff --git a/src/app/plan-management/entry-plan-look/AddPlanone.html b/src/app/plan-management/entry-plan-look/AddPlanone.html index d32cdd5..3668d9a 100644 --- a/src/app/plan-management/entry-plan-look/AddPlanone.html +++ b/src/app/plan-management/entry-plan-look/AddPlanone.html @@ -62,7 +62,7 @@ (已上传)
- 在线编制 +