Browse Source

[修改]8.17根据王英皓意见修改

tangshan
邵佳豪 3 years ago
parent
commit
5f93c984a0
  1. 4
      src/app/pages/home/home.component.ts
  2. 4
      src/app/pages/login/login.component.ts
  3. 22
      src/app/tabbar/tabbar.component.html
  4. 4
      src/modules/map/declare/gaode-map.ts
  5. 2
      src/modules/map/declare/keda-map.ts

4
src/app/pages/home/home.component.ts

@ -889,7 +889,7 @@ export class HomeComponent implements OnInit {
//初始化地图 //初始化地图
adcode:any = 310000 //行政编码 adcode:any = 130200 //行政编码
mapInit () { mapInit () {
//创建地图 //创建地图
this.map = new AMap.Map('chartMap', { this.map = new AMap.Map('chartMap', {
@ -1029,7 +1029,7 @@ export class HomeComponent implements OnInit {
districtExplorer.on('outsideClick', (e) => { districtExplorer.on('outsideClick', (e) => {
// console.log('区域外点击'); // console.log('区域外点击');
this.chartsSetOption('','province') this.chartsSetOption('','province')
adcode = 310000 adcode = 130200
districtExplorer.loadAreaNode(adcode, (error, areaNode)=> { districtExplorer.loadAreaNode(adcode, (error, areaNode)=> {
//更新地图视野 //更新地图视野
// this.map.setBounds(areaNode.getBounds(), null, null, true); // this.map.setBounds(areaNode.getBounds(), null, null, true);

4
src/app/pages/login/login.component.ts

@ -74,10 +74,10 @@ export class LoginComponent implements OnInit {
dialogRef.afterClosed().subscribe((data) => { dialogRef.afterClosed().subscribe((data) => {
sessionStorage.setItem('isDefaultPassword', 'false') sessionStorage.setItem('isDefaultPassword', 'false')
this.lookUpdateData() // this.lookUpdateData()
}); });
} else { } else {
this.lookUpdateData() // this.lookUpdateData()
} }
} }

22
src/app/tabbar/tabbar.component.html

@ -230,30 +230,12 @@
<mat-icon>help</mat-icon> <mat-icon>help</mat-icon>
</button> </button>
<mat-menu #appSetHelp="matMenu" yPosition="below" xPosition="after"> <mat-menu #appSetHelp="matMenu" yPosition="below" xPosition="after">
<button mat-menu-item (click)='lookUpdate()'>
<mat-icon>update</mat-icon>
<span>查看更新内容</span>
</button>
<button mat-menu-item (click)="aFile('/assets/helpword/help.pdf','数字化预案编制管理平台手册.pdf')"> <button mat-menu-item (click)="aFile('/assets/helpword/help.pdf','数字化预案编制管理平台手册.pdf')">
<mat-icon>save_alt</mat-icon> <mat-icon>save_alt</mat-icon>
<span>下载帮助文档</span> <span>下载帮助文档</span>
</button> </button>
<button mat-menu-item (click)="aFile('/assets/helpword/plantemplate.zip','V级文本预案模板.zip')">
<mat-icon>save_alt</mat-icon>
<span>V级文本预案模板</span>
</button>
<button mat-menu-item (click)="aFile('/assets/helpword/plancustom.zip','V级预案自定义.zip')">
<mat-icon>save_alt</mat-icon>
<span>V级预案自定义</span>
</button>
<button mat-menu-item (click)="aFile('/assets/helpword/planonlineedit.zip','V级在线编制.zip')">
<mat-icon>save_alt</mat-icon>
<span>V级在线编制</span>
</button>
<button mat-menu-item (click)="aFile('/assets/helpword/planonlineimport.zip','V级预案转在线导入.zip')">
<mat-icon>save_alt</mat-icon>
<span>V级预案转在线导入</span>
</button>
</mat-menu> </mat-menu>
<!-- 全屏 --> <!-- 全屏 -->
<button mat-button (click)="!isfullscreen?fullscreenToggle():closefullscreen()" class="fullscreen"> <button mat-button (click)="!isfullscreen?fullscreenToggle():closefullscreen()" class="fullscreen">

4
src/modules/map/declare/gaode-map.ts

@ -86,7 +86,7 @@ export class GaoDeMap extends GaodeBasic implements IMap {
eventSupport: true, //打开事件支持 eventSupport: true, //打开事件支持
}); });
let adcode = 310000 //上海行政编码 let adcode = 130200 //上海行政编码
districtExplorer.loadAreaNode(adcode, (error, areaNode) => { districtExplorer.loadAreaNode(adcode, (error, areaNode) => {
//更新地图视野 //更新地图视野
@ -184,7 +184,7 @@ export class GaoDeMap extends GaodeBasic implements IMap {
districtExplorer.on('outsideClick', (e) => { districtExplorer.on('outsideClick', (e) => {
setData && setData.call(component); setData && setData.call(component);
let adcode = 310000 let adcode = 130200
districtExplorer.loadAreaNode(adcode, (error, areaNode) => { districtExplorer.loadAreaNode(adcode, (error, areaNode) => {
//设置定位节点,支持鼠标位置识别 //设置定位节点,支持鼠标位置识别

2
src/modules/map/declare/keda-map.ts

@ -12,7 +12,7 @@ class KedaBasic implements ISelf {
} }
const cityPosition: number[] = [121.469167918, 31.232262275]; //上海市 坐标 const cityPosition: number[] = [121.469167918, 31.232262275]; //上海市 坐标
const beforCity: string = "上海市"; //当前城市 const beforCity: string = "上海市"; //当前城市
const cityCode: string = "310000"; //当前城市 行政编码 const cityCode: string = "130200"; //当前城市 行政编码
export class KeDaMap extends KedaBasic implements IMap { export class KeDaMap extends KedaBasic implements IMap {
public isLoadEnd:boolean = false public isLoadEnd:boolean = false

Loading…
Cancel
Save