From 346b68a226542bb8e35e19012c44f7f019d3b6c7 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sat, 7 Nov 2020 09:04:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=B0=B4=E6=BA=90?= =?UTF-8?q?=E9=81=93=E8=B7=AF=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90=E5=89=A9?= =?UTF-8?q?=E4=BD=99=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/collection-tools/addPlaneFigure.html | 2 +- .../collection-tools.component.html | 14 +-- .../collection-tools.component.scss | 28 +++--- .../ui/collection-tools/createBuilding.html | 2 +- src/app/ui/collection-tools/editBuilding.html | 2 +- .../ui/collection-tools/editPlaneFigure.html | 2 +- src/app/ui/collection-tools/panel.scss | 4 +- .../ui/router-gis/router-gis.component.html | 4 + .../ui/router-gis/router-gis.component.scss | 23 +++++ src/app/ui/router-gis/router-gis.component.ts | 17 +++- .../training-recordinfo.component.html | 4 +- .../training-recordinfo.component.ts | 7 +- .../ui/water-road/water-road.component.html | 11 +++ .../ui/water-road/water-road.component.scss | 10 ++ src/app/ui/water-road/water-road.component.ts | 93 ++++++++++++------ src/assets/images/fireHydrant.png | Bin 0 -> 4578 bytes 16 files changed, 163 insertions(+), 60 deletions(-) create mode 100644 src/assets/images/fireHydrant.png diff --git a/src/app/ui/collection-tools/addPlaneFigure.html b/src/app/ui/collection-tools/addPlaneFigure.html index 930bf81..dfe6893 100644 --- a/src/app/ui/collection-tools/addPlaneFigure.html +++ b/src/app/ui/collection-tools/addPlaneFigure.html @@ -4,7 +4,7 @@ -
+
diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index dc00c17..a993fc9 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -7,8 +7,8 @@ - 图标大小 - + 图标大小 + 正常 放大2倍 @@ -23,7 +23,7 @@ screen_share - + 基本信息名称 visibility @@ -50,7 +50,7 @@
diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss index 6411e24..f76e782 100644 --- a/src/app/ui/collection-tools/collection-tools.component.scss +++ b/src/app/ui/collection-tools/collection-tools.component.scss @@ -4,7 +4,7 @@ } .content { width: 100%; - height: 93%; + height:100%; overflow: hidden; box-sizing: border-box; padding: 1px; @@ -20,11 +20,12 @@ //header头部 .header { position: relative; - flex: 5%; + flex: 3%; display: flex; align-items:center; - min-height: 40px; + min-height: 30px; background-color: #fff; + font-size: 16px; .nameShow{ cursor: pointer; user-select: none; @@ -37,7 +38,7 @@ } font-size: 18px; mat-icon{ - font-size: 26px; + font-size: 22px; vertical-align: text-top; } span{ @@ -48,7 +49,7 @@ position: absolute; right: 140px; span{ - font-size: 18px; + font-size: 16px; cursor: pointer; margin: 0 3px; display: inline-block; @@ -74,16 +75,18 @@ span{ font-size: 18px; } - flex: 5%; + flex: 3%; display: flex; align-items:center; - min-height: 40px; + min-height: 30px; box-sizing: border-box; margin: 3px 0; background-color: white; button{ border: 0.5px solid rgb(208, 211, 214); margin: 0 2px; + height: 30px; + line-height: 30px; } .editdeletebtn{ display: none; @@ -109,7 +112,7 @@ top: 0; } .functionalDomain { - flex: 90%; + flex: 94%; overflow: hidden; .functionalDomainContent { position: relative; @@ -122,9 +125,10 @@ flex-direction: column; margin-left: 0px; transition: margin-left 0.5s; - min-width: 235px; + width: 1.953125rem; + min-width: 1.953125rem; border: 1px solid #E6EAEE; - width: 235px; + left: 0; z-index: 111; .leftDragDiv{ @@ -141,7 +145,8 @@ margin-right: 0px; transition: margin-right 0.5s; border: 1px solid #464646; - width: 235px; + width: 1.953125rem; + min-width: 1.953125rem; right: 0; } @@ -303,6 +308,7 @@ } //右侧消防要素 .firecategories{ + background-color: #fff; position: relative; display: flex; flex-flow: column; diff --git a/src/app/ui/collection-tools/createBuilding.html b/src/app/ui/collection-tools/createBuilding.html index 16fdd7b..bb4fc23 100644 --- a/src/app/ui/collection-tools/createBuilding.html +++ b/src/app/ui/collection-tools/createBuilding.html @@ -1,5 +1,5 @@
新增建筑
-
+
diff --git a/src/app/ui/collection-tools/editBuilding.html b/src/app/ui/collection-tools/editBuilding.html index 433316d..d5d4e48 100644 --- a/src/app/ui/collection-tools/editBuilding.html +++ b/src/app/ui/collection-tools/editBuilding.html @@ -1,6 +1,6 @@
编辑建筑
- +
diff --git a/src/app/ui/collection-tools/editPlaneFigure.html b/src/app/ui/collection-tools/editPlaneFigure.html index a0f8016..e650232 100644 --- a/src/app/ui/collection-tools/editPlaneFigure.html +++ b/src/app/ui/collection-tools/editPlaneFigure.html @@ -5,7 +5,7 @@
- +
diff --git a/src/app/ui/collection-tools/panel.scss b/src/app/ui/collection-tools/panel.scss index f0ae073..ef5ed0b 100644 --- a/src/app/ui/collection-tools/panel.scss +++ b/src/app/ui/collection-tools/panel.scss @@ -24,7 +24,7 @@ .hover { width: 18px; height: 18px; - margin-left: 90px; + margin-left: 40px; border: 1px solid #999; border-radius: 3px; .mat-icon {font-size: 18px; color: #999;} @@ -215,7 +215,7 @@ display: flex; flex-direction: row; flex-wrap: wrap; - justify-content: space-between; /* 水平居中 */ + justify-content: space-around; /* 水平居中 */ .imgBox { width: 70px; height: 100px; diff --git a/src/app/ui/router-gis/router-gis.component.html b/src/app/ui/router-gis/router-gis.component.html index 1f2f2b9..5890b79 100644 --- a/src/app/ui/router-gis/router-gis.component.html +++ b/src/app/ui/router-gis/router-gis.component.html @@ -1,3 +1,7 @@
+
+
已到达熟悉单位
+
取消本次任务
+
diff --git a/src/app/ui/router-gis/router-gis.component.scss b/src/app/ui/router-gis/router-gis.component.scss index 219d8f4..100c4c5 100644 --- a/src/app/ui/router-gis/router-gis.component.scss +++ b/src/app/ui/router-gis/router-gis.component.scss @@ -4,8 +4,31 @@ box-sizing: border-box; padding: 0.244141rem; overflow: hidden; + position: relative; .center { width: 100%; height: 100%; } + .btnbox{ + position: absolute; + left: 50%; + bottom: 7%;; + transform: translateX(-50%); + display: flex; + div{ + text-align: center; + width: 1.757813rem; + height: 0.46875rem; + line-height: 0.46875rem; + opacity: 1; + border-radius: 0.292969rem; + font-size: 0.15625rem; + margin: 0 12px; + background: #E9EAF3; + } + .btn{ + background: linear-gradient(337deg, #FC7045 0%, #FF4923 100%); + color: #fff; + } + } } \ No newline at end of file diff --git a/src/app/ui/router-gis/router-gis.component.ts b/src/app/ui/router-gis/router-gis.component.ts index 8a98d33..ba08714 100644 --- a/src/app/ui/router-gis/router-gis.component.ts +++ b/src/app/ui/router-gis/router-gis.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, EventEmitter, OnInit, Output } from '@angular/core'; declare var AMap: any; @Component({ @@ -7,7 +7,7 @@ declare var AMap: any; styleUrls: ['./router-gis.component.scss'] }) export class RouterGISComponent implements OnInit { - + @Output() onCustomEvent: EventEmitter = new　EventEmitter();//创建实力 constructor() { } ngOnInit(): void { @@ -15,7 +15,7 @@ export class RouterGISComponent implements OnInit { this.mapInit() },0) } - + ngAfterViewInit(): void { } @@ -45,4 +45,15 @@ export class RouterGISComponent implements OnInit { //new AMap.LngLat(116.379028, 39.865042), new AMap.LngLat(116.427281, 39.903719) / [{keyword: '淄博站',city:'山东'},{keyword: '淄博北站',city:'山东'}], //路线可搜索, 可用坐标 } + //下一步 + next(){ + this.emitEvent() + } + private emitEvent(){ + this.onCustomEvent.emit('data from child');//通过emit可将需要传递的数据发送给父组件 + } + //取消 + back(){ + window.history.back(); + } } diff --git a/src/app/ui/training-recordinfo/training-recordinfo.component.html b/src/app/ui/training-recordinfo/training-recordinfo.component.html index bb2d527..222fc17 100644 --- a/src/app/ui/training-recordinfo/training-recordinfo.component.html +++ b/src/app/ui/training-recordinfo/training-recordinfo.component.html @@ -13,11 +13,11 @@
- + - + diff --git a/src/app/ui/training-recordinfo/training-recordinfo.component.ts b/src/app/ui/training-recordinfo/training-recordinfo.component.ts index 8147b0d..59b2ea7 100644 --- a/src/app/ui/training-recordinfo/training-recordinfo.component.ts +++ b/src/app/ui/training-recordinfo/training-recordinfo.component.ts @@ -6,10 +6,13 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./training-recordinfo.component.scss'] }) export class TrainingRecordinfoComponent implements OnInit { - + tabsSelectedIndex:any = 0//当前选项卡值 constructor() { } title:any = "训练记录信息" ngOnInit(): void { } - + onCustom($event){ + console.log($event);//data from child + this.tabsSelectedIndex = 1 + } } diff --git a/src/app/ui/water-road/water-road.component.html b/src/app/ui/water-road/water-road.component.html index 72fdd62..c9f52dd 100644 --- a/src/app/ui/water-road/water-road.component.html +++ b/src/app/ui/water-road/water-road.component.html @@ -1,4 +1,15 @@
+
+
+ + description + create + +
+
+ +
+
\ No newline at end of file diff --git a/src/app/ui/water-road/water-road.component.scss b/src/app/ui/water-road/water-road.component.scss index 52862ba..f97ce36 100644 --- a/src/app/ui/water-road/water-road.component.scss +++ b/src/app/ui/water-road/water-road.component.scss @@ -4,8 +4,18 @@ box-sizing: border-box; padding: 0.244141rem; overflow: hidden; + position: relative; .center { width: 100%; height: 100%; } + .textbox{ + position: absolute; + z-index: 999; + right: 0.244141rem; + top:0.244141rem; + .btn{ + text-align: right; + } + } } \ No newline at end of file diff --git a/src/app/ui/water-road/water-road.component.ts b/src/app/ui/water-road/water-road.component.ts index 61c8aff..e35b75d 100644 --- a/src/app/ui/water-road/water-road.component.ts +++ b/src/app/ui/water-road/water-road.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; declare var AMap: any; +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; @Component({ selector: 'app-water-road', @@ -8,39 +9,73 @@ declare var AMap: any; }) export class WaterRoadComponent implements OnInit { - constructor() { } - - ngOnInit(): void { + constructor(public snackBar: MatSnackBar) { } + isshow:boolean = true + textcontant:any = localStorage.getItem(sessionStorage.getItem("companyId") + "waterroad") || "" + clickicon(){ + this.isshow = !this.isshow + } + save(){ + localStorage.setItem(sessionStorage.getItem("companyId") + "waterroad",this.textcontant) + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('保存成功','确定',config); } - ngAfterViewInit(): void { - window.setTimeout(()=>{ - this.mapInit() - },0) + map:any //地图 + ngOnInit(): void { + setTimeout(() => { + this.creatMap() + + }, 0); } - //地图初始化 - mapInit () { - //创建地图 - let map = new AMap.Map('map', { - resizeEnable: true, - cursor: 'default', - zooms:[6,18], + + creatMap(){ + var satellite = new AMap.TileLayer.Satellite(); + var roadNet = new AMap.TileLayer.RoadNet(); + + // 创建一个 icon + var startIcon = new AMap.Icon({ + image: '../../../assets/images/fireHydrant.png', + // // 图标所用图片大小 + imageSize: new AMap.Size(20, 20), + // // 图标取图偏移量 + // imageOffset: new AMap.Pixel(-9, -3) + }); + let arr = [{lng:108.299405,lat: 22.894884}, + {lng:108.597409,lat: 22.80883}, + {lng:108.689419,lat: 23.061775}, + {lng:107.971188,lat: 22.950537}, + {lng:107.847592,lat: 23.090833}, + {lng:108.176374,lat: 22.790585}, + {lng:108.407087,lat: 22.671522}, + {lng:108.158521,lat: 22.61322}, + {lng:107.925062,lat: 22.565038}, + {lng:108.180494,lat: 22.501616}, + {lng:107.743222,lat: 22.535121}] + let Arr = [] + arr.forEach(item=>{ + let viaMarker = new AMap.Marker({ + position: new AMap.LngLat(item.lng, item.lat), + icon: startIcon, + offset: new AMap.Pixel(-10, -10) + }) + Arr.push(viaMarker) + }) + + this.map = new AMap.Map('map',{ + zoom: 16 + }); + + this.map.on('click', (e) => { + console.log(e.lnglat.getLng() + ',' + e.lnglat.getLat()) }); - // //构造路线导航类 实际路线 - // let driving = new AMap.Driving({ - // map: map, - // showTraffic: true, - // isOutline: true, - // }); - // driving.search( [{keyword: '广西消防总队',city:'广西'},{keyword: '万科公园里',city:'广西'},{keyword: '南宁明安医院',city:'广西'}], ); - // //构造路线导航类 导航路线 - // let drivingTwo = new AMap.Driving({ - // map: map, - // showTraffic: false, - // }); - // drivingTwo.search( [{keyword: '广西消防总队',city:'广西'},{keyword: '南宁明安医院',city:'广西'}], ); - //function (status,result) { console.log(status,result) } //地图路线 匹配起始点回调函数 - //new AMap.LngLat(116.379028, 39.865042), new AMap.LngLat(116.427281, 39.903719) / [{keyword: '淄博站',city:'山东'},{keyword: '淄博北站',city:'山东'}], //路线可搜索, 可用坐标 + + this.map.setCity('南宁市') + this.map.add(Arr);//火源标点 + + } diff --git a/src/assets/images/fireHydrant.png b/src/assets/images/fireHydrant.png new file mode 100644 index 0000000000000000000000000000000000000000..58283150a77e6b1ac3aa8533fe32da526b446aa0 GIT binary patch literal 4578 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 literal 0 HcmV?d00001 From 3e9e47844c3d1055e2b7a2d1cbe10a1714c48436 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sat, 7 Nov 2020 12:35:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2ui=EF=BC=9B[=E6=96=B0=E5=A2=9E]=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=9F=A5=E7=9C=8B=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicinfo/basicinfo.component.html | 24 ++++---- .../key-unit/basicinfo/basicinfo.component.ts | 6 ++ .../fire-fighting-device.component.html | 10 ++-- .../fire-fighting-device.component.ts | 7 +++ .../key-unit/key-site/key-site.component.html | 20 +++---- .../key-unit/key-site/key-site.component.ts | 7 +++ .../add-six-familiar.component.ts | 1 + .../collection-tools.component.html | 2 +- .../collection-tools.component.ts | 11 ++++ src/app/ui/home/home.component.ts | 2 + .../photoofthescene.component.html | 28 +++++++-- .../photoofthescene.component.scss | 5 ++ .../photoofthescene.component.ts | 30 +++++++++- src/app/ui/ui.module.ts | 4 +- src/app/ui/water-road/edittext.html | 14 +++++ .../ui/water-road/water-road.component.html | 6 +- .../ui/water-road/water-road.component.scss | 59 +++++++++++++++++++ src/app/ui/water-road/water-road.component.ts | 50 +++++++++++++++- 18 files changed, 246 insertions(+), 40 deletions(-) create mode 100644 src/app/ui/water-road/edittext.html diff --git a/src/app/key-unit/basicinfo/basicinfo.component.html b/src/app/key-unit/basicinfo/basicinfo.component.html index 543286a..2cf3c2a 100644 --- a/src/app/key-unit/basicinfo/basicinfo.component.html +++ b/src/app/key-unit/basicinfo/basicinfo.component.html @@ -113,10 +113,10 @@
- +
- +
@@ -132,7 +132,7 @@
- + @@ -195,12 +195,12 @@
- +

自定义信息

- - + +
- +

{{item.buildingBasicGroups[1].name}}

@@ -316,7 +316,7 @@
- +

储罐信息

@@ -480,12 +480,12 @@
- +

自定义信息

- - + +
-
+
diff --git a/src/app/key-unit/basicinfo/basicinfo.component.ts b/src/app/key-unit/basicinfo/basicinfo.component.ts index 5ec1e1f..33e0f92 100644 --- a/src/app/key-unit/basicinfo/basicinfo.component.ts +++ b/src/app/key-unit/basicinfo/basicinfo.component.ts @@ -86,9 +86,15 @@ export class BasicinfoComponent implements OnInit { allorganizing:any = [] //所有组织机构 constructor(private router:Router,private route:ActivatedRoute,private http: HttpClient, private tree: TreeService, private sanitizer: DomSanitizer, public dialog: MatDialog,public snackBar: MatSnackBar) { } + pattern:any unitId : any //当前单位id ngOnInit(): void { + if(localStorage.getItem("pattern") == "edit"){ + this.pattern = true + }else if(localStorage.getItem("pattern") == "look"){ + this.pattern = false + } this.getallunittype() this.getorganization() // this.getunitinfo() 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..7de851e 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 @@ -3,10 +3,10 @@
-

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

+

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

{{item.name}}

-
+
add_circle_outline description delete @@ -74,7 +74,7 @@

{{item.name}}

- description + description
@@ -100,7 +100,7 @@

{{item.name}}

-
+
add_circle_outline description delete @@ -168,7 +168,7 @@

{{item.name}}

- description + description
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 8338a2a..0f6af69 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 @@ -20,9 +20,16 @@ export class FireFightingDeviceComponent implements OnInit { constructor(private router:Router,private route:ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } + + isEditPattern = true ngOnInit(): void { this.getCompanyInformation() this.getAllBuilding() + if(localStorage.getItem("pattern") == "edit"){ + this.isEditPattern = true + }else if(localStorage.getItem("pattern") == "look"){ + this.isEditPattern = false + } } //定义属性数据 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..df62c75 100644 --- a/src/app/key-unit/key-site/key-site.component.html +++ b/src/app/key-unit/key-site/key-site.component.html @@ -4,7 +4,7 @@
-

重点部位情况

+

重点部位情况

@@ -45,13 +45,13 @@
重点部位名称
-

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

+

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

-

重点提示

- description +

重点提示

+ description

- +

@@ -62,7 +62,7 @@
-

重点部位情况

+

重点部位情况

@@ -103,13 +103,13 @@
重点部位名称
-

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

+

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

-

重点提示

- description +

重点提示

+ 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 c760b23..4fc4efc 100644 --- a/src/app/key-unit/key-site/key-site.component.ts +++ b/src/app/key-unit/key-site/key-site.component.ts @@ -17,8 +17,15 @@ export class KeySiteComponent implements OnInit { constructor(public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private route:ActivatedRoute,) { } displayedColumns: string[] = ['mainname', 'position', 'construction', 'nature', 'danger', 'img']; + isEditPattern = true ngOnInit(): void { + if(localStorage.getItem("pattern")=="edit"){ + this.isEditPattern = true + }else if(localStorage.getItem("pattern") == "look"){ + this.isEditPattern = false + } + this.getCompanyPostion() this.getCompanyTips() this.getAllBuilding() diff --git a/src/app/ui/add-six-familiar/add-six-familiar.component.ts b/src/app/ui/add-six-familiar/add-six-familiar.component.ts index a922967..e9cb2ba 100644 --- a/src/app/ui/add-six-familiar/add-six-familiar.component.ts +++ b/src/app/ui/add-six-familiar/add-six-familiar.component.ts @@ -41,6 +41,7 @@ export class AddSixFamiliarComponent implements OnInit { // ?id=${this.unitdata.id} console.log(this.unitdata) if(this.unitname && this.address && this.contactname && this.contactphone && this.peoplenum && this.leadname){ + localStorage.setItem("pattern","edit") this.router.navigate([`/trainingrecordinfo`],{queryParams:{'id':this.unitdata.id}}) }else{ const config = new MatSnackBarConfig(); diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index a993fc9..903c4ec 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -41,7 +41,7 @@
--> tv - create + create description
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 3b87b9d..4c47b66 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -610,6 +610,8 @@ export class CollectionToolsComponent implements OnInit { this.canvasData.isChange = true } + + isshow = true//切换模式是否显示 ngOnInit(): void { this.getAllLibrary() //获取素材库 @@ -630,6 +632,14 @@ export class CollectionToolsComponent implements OnInit { this.refurbishTreeData() } }) + + + if(localStorage.getItem("pattern")=="edit"){ + this.isEditPattern = true + }else if(localStorage.getItem("pattern") == "look"){ + this.isshow = false + this.isEditPattern = false + } } @@ -2128,6 +2138,7 @@ export class CreateBuilding { allBuildingType:any//所有的建筑类型 selected:any; //选中的建筑 ngOnInit(): void { + this.getAllBuildingType() } diff --git a/src/app/ui/home/home.component.ts b/src/app/ui/home/home.component.ts index 9024e44..0296260 100644 --- a/src/app/ui/home/home.component.ts +++ b/src/app/ui/home/home.component.ts @@ -65,6 +65,8 @@ export class HomeComponent implements OnInit { //查看详情 viewDetails () { + localStorage.setItem("pattern","look") + this.router.navigate([`/trainingrecordinfo`],{queryParams:{'id':'5fa4d863f8eb762cb03c6a72'}}) console.log('查看详情') } diff --git a/src/app/ui/photoofthescene/photoofthescene.component.html b/src/app/ui/photoofthescene/photoofthescene.component.html index c9dcfc0..43fa83c 100644 --- a/src/app/ui/photoofthescene/photoofthescene.component.html +++ b/src/app/ui/photoofthescene/photoofthescene.component.html @@ -11,12 +11,17 @@ 单位整体建筑或大门照片，要求照拍照时要求设置拍照日期
-
+
+
+ +
@@ -28,12 +33,17 @@ 人员现场熟悉照片，要求有带队领导及熟悉人员现场熟悉场景，拍照时要求设置拍照日期
-
+
+
+ +
@@ -47,12 +57,17 @@ 人员现场熟悉照片，要求有熟悉人员现场熟悉场景，拍照时要求设置拍照日期
-
+
+
+ +
@@ -64,12 +79,17 @@ 重点部位照片，拍照时要求设置拍照日期
-
+
+
+ +
\ No newline at end of file diff --git a/src/app/ui/photoofthescene/photoofthescene.component.scss b/src/app/ui/photoofthescene/photoofthescene.component.scss index bdf85d9..75329d2 100644 --- a/src/app/ui/photoofthescene/photoofthescene.component.scss +++ b/src/app/ui/photoofthescene/photoofthescene.component.scss @@ -29,6 +29,11 @@ table{ height: 100%; width: 299px; } + .deleteicon{ + position: absolute; + right: 0.058594rem; + top: 0.058594rem; + } } } table,table tr th, table tr td { border:1px solid black;text-align: center; } \ No newline at end of file diff --git a/src/app/ui/photoofthescene/photoofthescene.component.ts b/src/app/ui/photoofthescene/photoofthescene.component.ts index 312dd2c..6c1120b 100644 --- a/src/app/ui/photoofthescene/photoofthescene.component.ts +++ b/src/app/ui/photoofthescene/photoofthescene.component.ts @@ -11,6 +11,7 @@ export class PhotoofthesceneComponent implements OnInit { constructor(private http: HttpClient,public snackBar: MatSnackBar) { } gallery//viewerJs实例 + isEditPattern = true ngOnInit(): void { setTimeout(() => { if(document.getElementById('viewerjs1')){ @@ -35,7 +36,11 @@ export class PhotoofthesceneComponent implements OnInit { } }, 0); - console.log(555,this.unitImg.split("?")[0]) + if(localStorage.getItem("pattern")=="edit"){ + this.isEditPattern = true + }else if(localStorage.getItem("pattern") == "look"){ + this.isEditPattern = false + } } unitImg:any = localStorage.getItem(sessionStorage.getItem("companyId") + "1") || "" @@ -43,7 +48,28 @@ export class PhotoofthesceneComponent implements OnInit { peopleImg:any = localStorage.getItem(sessionStorage.getItem("companyId") + "3") || "" keysiteImg:any = localStorage.getItem(sessionStorage.getItem("companyId") + "4") || "" - + //删除照片 + deleteimg(num){ + var msg = "您真的确定要删除吗？"; + if (confirm(msg)==true){ + localStorage.removeItem(sessionStorage.getItem('companyId')+num) + if(num == "1"){ + this.unitImg = "" + } + if(num == "2"){ + this.lingdaoImg = "" + } + if(num == "3"){ + this.peopleImg = "" + } + if(num == "4"){ + this.keysiteImg = "" + } + + }else{ + return false; + } + } //熟悉单位照片上传 file:any filechange1(e,index){ diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index 888f4b7..97ed6d7 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -66,11 +66,11 @@ import { TrainingRecordinfoComponent } from './training-recordinfo/training-reco import { RouterGISComponent } from './router-gis/router-gis.component'; import { KeyUnitModule } from '../key-unit/key-unit.module'; import { PhotoofthesceneComponent } from './photoofthescene/photoofthescene.component'; -import { WaterRoadComponent } from './water-road/water-road.component'; +import { EditText, WaterRoadComponent } from './water-road/water-road.component'; import { KnowRouteComponent } from './know-route/know-route.component'; import { FindProblemComponent } from './find-problem/find-problem.component'; @NgModule({ - declarations: [UiComponent, FooterComponent, UserdataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe,EditUser,CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,HomeComponent, AddSixFamiliarComponent, TitleComponent, SelectUnit, TrainingRecordinfoComponent,RouterGISComponent, PhotoofthesceneComponent, WaterRoadComponent,FindProblemComponent,KnowRouteComponent], + declarations: [UiComponent, FooterComponent, UserdataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe,EditUser,CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,HomeComponent, AddSixFamiliarComponent, TitleComponent, SelectUnit, TrainingRecordinfoComponent,RouterGISComponent, PhotoofthesceneComponent, WaterRoadComponent,FindProblemComponent,KnowRouteComponent,EditText], imports: [ CommonModule, diff --git a/src/app/ui/water-road/edittext.html b/src/app/ui/water-road/edittext.html new file mode 100644 index 0000000..f7a270f --- /dev/null +++ b/src/app/ui/water-road/edittext.html @@ -0,0 +1,14 @@ +
+
+ 说明: + 水源情况主要包括消火栓位置、管径、外观完好情况、停车取水位置试水情况，消防水池位置、容量、停车取水位置、取水测试情况，取消码头位置、水位、停车取水位置等；道路情况主要包括道路长度、宽度、起始点、沿线重点单位、立交、桥梁、涵洞及其通车能力。 + 【该项主要在道路水源熟悉时填写】 +
+
+ +
+
+
确认
+
取消
+
+
\ No newline at end of file diff --git a/src/app/ui/water-road/water-road.component.html b/src/app/ui/water-road/water-road.component.html index c9f52dd..9487820 100644 --- a/src/app/ui/water-road/water-road.component.html +++ b/src/app/ui/water-road/water-road.component.html @@ -1,6 +1,6 @@
-
+ +
+

create

+

编辑

\ No newline at end of file diff --git a/src/app/ui/water-road/water-road.component.scss b/src/app/ui/water-road/water-road.component.scss index f97ce36..7386cb6 100644 --- a/src/app/ui/water-road/water-road.component.scss +++ b/src/app/ui/water-road/water-road.component.scss @@ -18,4 +18,63 @@ text-align: right; } } + .editbtn{ + text-align: center; + position: absolute; + right: 0.507813rem; + bottom: 0.439453rem; + width: 0.976563rem; + height: 0.976563rem; + // line-height: 0.976563rem; + background: linear-gradient(360deg, #FC7045 0%, #FF4923 100%); + box-shadow: 0px 2px 10px #D8A798; + border-radius: 50%; + opacity: 1; + p{ + color: #fff; + } + } + } + + + .dialogbox{ + width: 7.441406rem; + height: 5.761719rem; + .title{ + span{ + font-size: 16px; + } + } + .text{ + width: 97%; + height: 3.554688rem; + margin-top: 0.351563rem; + background: #F4F5F9; + + border-radius: 10px; + textarea{ + width: 100%; + height: 100%; + } + } + .btnbox{ + display: flex; + margin-top: 0.351563rem; + justify-content: center; + div{ + font-size: 0.15625rem; + width: 1.757813rem; + height: 0.46875rem; + line-height: 0.46875rem; + text-align: center; + background: #E9EAF3; + opacity: 1; + border-radius: 30px; + margin: 0 10px; + } + div:nth-child(1){ + color: #fff; + background: linear-gradient(337deg, #FC7045 0%, #FF4923 100%); + } + } } \ No newline at end of file diff --git a/src/app/ui/water-road/water-road.component.ts b/src/app/ui/water-road/water-road.component.ts index e35b75d..256b84d 100644 --- a/src/app/ui/water-road/water-road.component.ts +++ b/src/app/ui/water-road/water-road.component.ts @@ -1,4 +1,5 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Inject, OnInit } from '@angular/core'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; declare var AMap: any; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; @@ -9,7 +10,7 @@ import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; }) export class WaterRoadComponent implements OnInit { - constructor(public snackBar: MatSnackBar) { } + constructor(public snackBar: MatSnackBar,public dialog: MatDialog) { } isshow:boolean = true textcontant:any = localStorage.getItem(sessionStorage.getItem("companyId") + "waterroad") || "" clickicon(){ @@ -78,5 +79,48 @@ export class WaterRoadComponent implements OnInit { } - + opendialog(){ + let dialogRef = this.dialog.open(EditText); + dialogRef.afterClosed().subscribe(data=>{ + if(data){ + + } + }); + } } + + +//编辑水源道路情况 +@Component({ + selector: 'app-editBuilding', + templateUrl: './edittext.html', + styleUrls: ['./water-road.component.scss'] +}) +export class EditText { + + constructor(public snackBar: MatSnackBar,public dialog: MatDialog,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) { } + textcontant:any = localStorage.getItem(sessionStorage.getItem("companyId") + "waterroad") || ""//输入内容 + isEditPattern = true + ngOnInit(): void { + if(localStorage.getItem("pattern")=="edit"){ + this.isEditPattern = true + }else if(localStorage.getItem("pattern") == "look"){ + this.isEditPattern = false + } + } + + + //确定 + ok(){ + localStorage.setItem(sessionStorage.getItem("companyId") + "waterroad",this.textcontant) + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('保存成功','确定',config); + this.dialogRef.close(); + } + //取消 + cancel(){ + this.dialogRef.close(); + } +} \ No newline at end of file