shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

[完善] GIS模块完善

dev
陈鹏飞 4 years ago
parent
a341797393
commit
e170e86d46
4 changed files with 13 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/app/gis-management/gis-labeling/gis-labeling.component.scss
  2. 25
      src/app/gis-management/gis-labeling/gis-labeling.component.ts
  3. 4
      src/app/plan-audit/plan-pass/plan-pass.component.html
  4. 5
      src/styles.scss

6
src/app/gis-management/gis-labeling/gis-labeling.component.scss
Unescape View File

@ -219,7 +219,7 @@
//右上角div
.rightTopBox{
width: 480px;
width: 400px;
position: absolute;
right: 30px;
top: 15px;
@ -277,7 +277,7 @@
cursor: pointer;
}
.submit{
width: 68px;
width: 60px;
height: 30px;
text-align: center;
border: 0;
@ -287,7 +287,7 @@
color: #fff;
}
.cancel{
width: 96px;
width: 70px;
height: 30px;
background: #EEF1F5;
opacity: 1;

25
src/app/gis-management/gis-labeling/gis-labeling.component.ts
Unescape View File

@ -19,9 +19,9 @@ export class GisLabelingComponent implements OnInit {
selectedTitle:number
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/distanceicon.png'},
// {name:'图层选择',iconImg:'/assets/images/coverageicon.png'}
]
keyUnitList:any = []
waterList = [
{id:'0',name:'消火栓',selected:false},
@ -310,10 +310,7 @@ export class GisLabelingComponent implements OnInit {
<div style="display: flex; align-items: center; justify-content: center; margin-top: 10px;">
<div class="btn" id="baseInformation"><img src="../../../assets/images/basicinfoicon.png" alt="">基本信息</div>
<div class="btn" id="route"><img src="../../../assets/images/navicon.png" alt="">导航</div>
<div class="btn" id="fullViewNavigation"><img src="../../../assets/images/panoramaicon.png" alt="">全景漫游</div>
<div class="btn" id="threeeScene"><img src="../../../assets/images/3dicon.png" alt="">三维场景</div>
<div class="btn" id="seePlan"><img src="../../../assets/images/planicon.png" alt="">查看预案</div>
<div class="btn" id="share"><img src="../../../assets/images/shareicon.png" alt="">分享</div>
<div class="btn" id="threeeScene"><img src="../../../assets/images/3dicon.png" alt="">三维场景编制</div>
</div>
</div>`
// 创建一个自定义内容的 infowindow 实例
@ -325,10 +322,7 @@ export class GisLabelingComponent implements OnInit {
this.infoWindow.open(this.map);
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#baseInformation'),'click',(event)=>{ this.baseInformation(item) })//基本信息点击事件
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('#share'),'click',(event)=>{ this.share(item) })//分享点击事件
});
markerArr.push(labelMarker)
})
@ -737,10 +731,7 @@ export class GisLabelingComponent implements OnInit {
<div style="display: flex; align-items: center; justify-content: center; margin-top: 10px;">
<div class="btn" id="baseInformation"><img src="../../../assets/images/basicinfoicon.png" alt="">基本信息</div>
<div class="btn" id="route"><img src="../../../assets/images/navicon.png" alt="">导航</div>
<div class="btn" id="fullViewNavigation"><img src="../../../assets/images/panoramaicon.png" alt="">全景漫游</div>
<div class="btn" id="threeeScene"><img src="../../../assets/images/3dicon.png" alt="">三维场景</div>
<div class="btn" id="seePlan"><img src="../../../assets/images/planicon.png" alt="">查看预案</div>
<div class="btn" id="share"><img src="../../../assets/images/shareicon.png" alt="">分享</div>
<div class="btn" id="threeeScene"><img src="../../../assets/images/3dicon.png" alt="">三维场景编制</div>
</div>
</div>`
// 创建一个自定义内容的 infowindow 实例
@ -752,10 +743,7 @@ export class GisLabelingComponent implements OnInit {
this.infoWindow.open(this.map);
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#baseInformation'),'click',(event)=>{ this.baseInformation(e) })//基本信息点击事件
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('#share'),'click',(event)=>{ this.share(e) })//分享点击事件
marker.on('click', (ev) => { //marker点击事件
this.infoWindow = new AMap.InfoWindow({
position: [e.location.x,e.location.y],
@ -765,10 +753,7 @@ export class GisLabelingComponent implements OnInit {
this.infoWindow.open(this.map);
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#baseInformation'),'click',(event)=>{ this.baseInformation(e) })//基本信息点击事件
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('#share'),'click',(event)=>{ this.share(e) })//分享点击事件
})
this.map.setZoomAndCenter(13,marker._position); //设置地图中心点

4
src/app/plan-audit/plan-pass/plan-pass.component.html
Unescape View File

@ -1,4 +1,4 @@
<div style="height: 100%; overflow: hidden;">
<div style="height: 100%; overflow: hidden; display: flex; flex-direction: column;">
<mat-accordion>
<mat-expansion-panel disabled>
@ -30,7 +30,7 @@
</mat-expansion-panel>
</mat-accordion>
<div class="planBody" style="width: 100%;height: 100%;padding: 10px;box-sizing: border-box;overflow-y: auto;">
<div class="planBody" style="flex: 1; overflow: hidden;">
<div class="table" style="width: 100%;" *ngIf="planType==0">
<table mat-table [dataSource]="allFile">

5
src/styles.scss
Unescape View File

@ -5,7 +5,8 @@ html,body{
width: 100%;
height: 100%;
margin:0 auto;
padding:0;
padding:0;
overflow: hidden;
}
ul,ol,dl,li,dt,dd,p,form,input,h1,h2,h3,h4,h5,h6,section,article,aside,header,footer,nav,figure,time,mark,main,canvas{
margin:0;
@ -110,7 +111,7 @@ table td.mat-footer-cell:last-of-type{
//gis标点弹出框样式
#gispopupbox{
.btn{
width: 92px;
width: 130px;
height: 36px;
background: #FFFFFF;
border: 1px solid #EEF1F5;

Write Preview
Loading…
Cancel
Save