From d83c8f2bdc1ee9e0e66bc692496e19fc47ab2e2d Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sat, 7 Nov 2020 14:38:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=96=8F=E6=95=A3=E5=92=8C=E6=B6=88=E9=98=B2?= =?UTF-8?q?=E8=AE=BE=E6=96=BD=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fire-fighting-device.component.ts | 14 ++++++++++++++ .../training-recordinfo.component.html | 2 +- .../training-recordinfo.component.ts | 4 ++++ 3 files changed, 19 insertions(+), 1 deletion(-) 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 0f6af69..3e2f3e3 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 @@ -59,6 +59,13 @@ export class FireFightingDeviceComponent implements OnInit { elements.total = element.facilityCount[index] elements.expanded = false}); }); + if(sessionStorage.getItem("tabsindex") == "4"){ + this.companyBuiltInGrouping = [this.companyBuiltInGrouping[1]] + this.companyOptionalGrouping = [] + } + if(sessionStorage.getItem("tabsindex") == "5"){ + this.companyBuiltInGrouping.splice(1,1) + } }) //http } //if @@ -254,6 +261,13 @@ export class FireFightingDeviceComponent implements OnInit { newElement.total = elements.facilityCount[index] newElement.expanded = false }); }); + if(sessionStorage.getItem("tabsindex") == "4"){ + element.buildingFacilityGroups = [element.buildingFacilityGroups[1]] + element.buildingOptionalGroups = [] + } + if(sessionStorage.getItem("tabsindex") == "5"){ + element.buildingFacilityGroups.splice(1,1) + } }) }); diff --git a/src/app/ui/training-recordinfo/training-recordinfo.component.html b/src/app/ui/training-recordinfo/training-recordinfo.component.html index 0c60302..2260876 100644 --- a/src/app/ui/training-recordinfo/training-recordinfo.component.html +++ b/src/app/ui/training-recordinfo/training-recordinfo.component.html @@ -13,7 +13,7 @@
- + diff --git a/src/app/ui/training-recordinfo/training-recordinfo.component.ts b/src/app/ui/training-recordinfo/training-recordinfo.component.ts index 59b2ea7..fdad26f 100644 --- a/src/app/ui/training-recordinfo/training-recordinfo.component.ts +++ b/src/app/ui/training-recordinfo/training-recordinfo.component.ts @@ -15,4 +15,8 @@ export class TrainingRecordinfoComponent implements OnInit { console.log($event);//data from child this.tabsSelectedIndex = 1 } + selectedtab(e){ + sessionStorage.setItem("tabsindex",e.index) + // console.log(e.index) + } } From 364b8e0a14f6202c9b1b9025ed9baa3b4c977539 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sat, 7 Nov 2020 19:41:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E6=B0=B4=E6=BA=90=E9=81=93=E8=B7=AF=E9=A1=B5=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=AD=E5=BF=83=E7=82=B9=E5=92=8C=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/ui/water-road/water-road.component.html | 4 ++-- src/app/ui/water-road/water-road.component.scss | 4 +++- src/app/ui/water-road/water-road.component.ts | 13 +++++++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/app/ui/water-road/water-road.component.html b/src/app/ui/water-road/water-road.component.html index 9487820..6549ca7 100644 --- a/src/app/ui/water-road/water-road.component.html +++ b/src/app/ui/water-road/water-road.component.html @@ -12,8 +12,8 @@
-->
-

create

-

编辑

+

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 7386cb6..0158e8c 100644 --- a/src/app/ui/water-road/water-road.component.scss +++ b/src/app/ui/water-road/water-road.component.scss @@ -25,12 +25,14 @@ bottom: 0.439453rem; width: 0.976563rem; height: 0.976563rem; - // line-height: 0.976563rem; + line-height: 0.859375rem; background: linear-gradient(360deg, #FC7045 0%, #FF4923 100%); box-shadow: 0px 2px 10px #D8A798; border-radius: 50%; opacity: 1; p{ + height: 0.175781rem; + font-size: 0.15625rem; color: #fff; } } diff --git a/src/app/ui/water-road/water-road.component.ts b/src/app/ui/water-road/water-road.component.ts index 256b84d..c4af7d7 100644 --- a/src/app/ui/water-road/water-road.component.ts +++ b/src/app/ui/water-road/water-road.component.ts @@ -54,7 +54,15 @@ export class WaterRoadComponent implements OnInit { {lng:108.158521,lat: 22.61322}, {lng:107.925062,lat: 22.565038}, {lng:108.180494,lat: 22.501616}, - {lng:107.743222,lat: 22.535121}] + {lng:107.743222,lat: 22.535121}, + {lng:108.373809,lat: 22.764746}, + {lng:108.378895,lat: 22.761877}, + {lng:108.383337,lat: 22.766467}, + {lng:108.37647,lat: 22.763341}, + {lng:108.37662,lat: 22.767397}, + {lng:108.378916,lat: 22.758513}, + {lng:108.379045,lat: 22.765695}, + {lng:108.384731,lat: 22.760096},] let Arr = [] arr.forEach(item=>{ let viaMarker = new AMap.Marker({ @@ -66,6 +74,7 @@ export class WaterRoadComponent implements OnInit { }) this.map = new AMap.Map('map',{ + center: [108.377865, 22.763499], //初始地图中心点 zoom: 16 }); @@ -73,7 +82,7 @@ export class WaterRoadComponent implements OnInit { console.log(e.lnglat.getLng() + ',' + e.lnglat.getLat()) }); - this.map.setCity('南宁市') + // this.map.setCity('南宁市') this.map.add(Arr);//火源标点