Browse Source

[新增]水源道路基本完成剩余样式调整

master
邵佳豪 4 years ago
parent
commit
346b68a226
  1. 2
      src/app/ui/collection-tools/addPlaneFigure.html
  2. 14
      src/app/ui/collection-tools/collection-tools.component.html
  3. 28
      src/app/ui/collection-tools/collection-tools.component.scss
  4. 2
      src/app/ui/collection-tools/createBuilding.html
  5. 2
      src/app/ui/collection-tools/editBuilding.html
  6. 2
      src/app/ui/collection-tools/editPlaneFigure.html
  7. 4
      src/app/ui/collection-tools/panel.scss
  8. 4
      src/app/ui/router-gis/router-gis.component.html
  9. 23
      src/app/ui/router-gis/router-gis.component.scss
  10. 17
      src/app/ui/router-gis/router-gis.component.ts
  11. 4
      src/app/ui/training-recordinfo/training-recordinfo.component.html
  12. 7
      src/app/ui/training-recordinfo/training-recordinfo.component.ts
  13. 11
      src/app/ui/water-road/water-road.component.html
  14. 10
      src/app/ui/water-road/water-road.component.scss
  15. 93
      src/app/ui/water-road/water-road.component.ts
  16. BIN
      src/assets/images/fireHydrant.png

2
src/app/ui/collection-tools/addPlaneFigure.html

@ -4,7 +4,7 @@
<label *ngIf="data.isBuilding">新建楼层/区域</label>
</div>
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container" style="font-size: 16px;">
<div class="keyMargin">
<mat-form-field>

14
src/app/ui/collection-tools/collection-tools.component.html

@ -7,8 +7,8 @@
<button mat-button (click)="toggle2()">
<mat-icon style="vertical-align: middle;">list</mat-icon>
</button>
<span style="color: gray;margin-right: 10px;margin-left: 10px;">图标大小</span>
<mat-form-field style="margin-top: 3px;">
<span style="color: gray;margin-right: 10px;margin-left: 10px;font-size: 16px;">图标大小</span>
<mat-form-field style="margin-top: 3px;font-size: 16px;">
<mat-select (selectionChange)='iconScale()' [(ngModel)]="selected">
<mat-option value="1">正常</mat-option>
<mat-option value="2">放大2倍</mat-option>
@ -23,7 +23,7 @@
<mat-icon style="padding-bottom: 7px;">screen_share</mat-icon>
</button>
<span [ngClass]="{'icongray': !basicInfo}" title="基本信息名称显示/隐藏" style="margin-right:20px;user-select: none;margin-left: 22px;" class="nameShow" (click)="basicInfoClick()">
<span [ngClass]="{'icongray': !basicInfo}" title="基本信息名称显示/隐藏" style="margin-right:20px;user-select: none;margin-left: 22px;font-size: 16px;" class="nameShow" (click)="basicInfoClick()">
基本信息名称
<mat-icon>visibility</mat-icon>
</span>
@ -50,7 +50,7 @@
<div class="headerOperate">
<button mat-button (click)="checkedBuilding({name:'总平面图'},-1)"
[ngClass]="{'buildingbtnchecked': checkedBuildingIndex==-1}">
<span>总平面图</span>
<span style="font-size: 16px;">总平面图</span>
<span *ngIf="isEditPattern && !pattern">
<img src="../../../assets/images/fire.png" *ngIf="sitePlanIcon.fire==2">
<img src="../../../assets/images/noFire.png" *ngIf="sitePlanIcon.fire==1">
@ -60,7 +60,7 @@
</button>
<button mat-button *ngFor="let item of allBuildings;let key = index" (click)="checkedBuilding(item,key)" class="bigeditdeletebtn"
[ngClass]="{'buildingbtnchecked': checkedBuildingIndex==key}">
<span>{{item.name}}</span>
<span style="font-size: 16px;">{{item.name}}</span>
<span *ngIf="isEditPattern && !pattern">
<img src="../../../assets/images/fire.png" *ngIf="item.fire && item.fire==2">
<img src="../../../assets/images/noFire.png" *ngIf="item.fire && item.fire==1">
@ -69,9 +69,9 @@
</span>
<span class="editdeletebtn" *ngIf="isEditPattern && pattern">
<mat-icon (click)="editBuilding($event,item)"
style="font-size: 23px;vertical-align:sub;margin-left: 6px;color: rgb(26, 194, 26);">create</mat-icon>
style="font-size: 18px;vertical-align:sub;margin-left: 6px;color: rgb(26, 194, 26);">create</mat-icon>
<mat-icon (click)="deleteBuilding($event,item)"
style="font-size: 23px;vertical-align:sub;color: rgb(224, 51, 51);">delete</mat-icon>
style="font-size: 18px;vertical-align:sub;color: rgb(224, 51, 51);">delete</mat-icon>
</span>
</button>
<!-- <button (click)="yyy()">yyyyy</button> -->

28
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;

2
src/app/ui/collection-tools/createBuilding.html

@ -1,5 +1,5 @@
<div mat-dialog-title>新增建筑</div>
<div>
<div style="font-size: 16px;">
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
<div mat-dialog-content>

2
src/app/ui/collection-tools/editBuilding.html

@ -1,6 +1,6 @@
<div mat-dialog-title>编辑建筑</div>
<div>
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container" style="font-size: 16px;">
<div mat-dialog-content>
<mat-form-field>
<input type="text" matInput [(ngModel)]="defaultName" required name="propertyName" placeholder="建筑名称" autocomplete="off">

2
src/app/ui/collection-tools/editPlaneFigure.html

@ -5,7 +5,7 @@
<label *ngIf="data.isBuilding">编辑楼层/区域</label>
</div>
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container" style="font-size: 16px;">
<div class="keyMargin">
<mat-form-field>

4
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;

4
src/app/ui/router-gis/router-gis.component.html

@ -1,3 +1,7 @@
<div class="content">
<div class="center" id="center"></div>
<div class="btnbox">
<div class="btn" (click)="next()">已到达熟悉单位</div>
<div (click)="back()">取消本次任务</div>
</div>
</div>

23
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;
}
}
}

17
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<any> = 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();
}
}

4
src/app/ui/training-recordinfo/training-recordinfo.component.html

@ -13,11 +13,11 @@
<div class="content">
<div class="cardbox">
<mat-tab-group style="height: 95%;">
<mat-tab-group style="height: 97%;" [selectedIndex]="tabsSelectedIndex">
<mat-tab label="行驶路线">
<ng-template matTabContent>
<app-router-gis></app-router-gis>
<app-router-gis (onCustomEvent)="onCustom($event)"></app-router-gis>
</ng-template>
</mat-tab>

7
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
}
}

11
src/app/ui/water-road/water-road.component.html

@ -1,4 +1,15 @@
<div class="content">
<div class="center" id="map"></div>
<div class="textbox">
<div class="btn">
<span>
<mat-icon (click)="save()">description</mat-icon>
<mat-icon (click)="clickicon()">create</mat-icon>
</span>
</div>
<div class="text" [hidden]="!isshow">
<textarea [(ngModel)]="textcontant" name="" id="" cols="28" rows="18" placeholder="水源情况主要包括消火栓位置、管径、外观完好情况、停车取水位置试水情况,消防水池位置、容量、停车取水位置、取水测试情况,取消码头位置、水位、停车取水位置等;道路情况主要包括道路长度、宽度、起始点、沿线重点单位、立交、桥梁、涵洞及其通车能力。【该项主要在道路水源熟悉时填写】"></textarea>
</div>
</div>
</div>

10
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;
}
}
}

93
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);//火源标点
}

BIN
src/assets/images/fireHydrant.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Loading…
Cancel
Save