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

[完善]更改地图key

guangxi
邵佳豪 2 years ago
parent
83770e08c7
commit
8c9a026fb4
3 changed files with 78 additions and 70 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. 2
      package.json
  2. 126
      src/app/gis-management/gis-labeling/gis-labeling.component.ts
  3. 20
      src/index.html

2
package.json
Unescape View File

@ -3,7 +3,7 @@
"version": "0.0.0",
"scripts": {
"ng": "ng",
"start": "ng serve --proxy-config proxy.config.json --open",
"start": "ng serve --proxy-config proxy.config.json --open --port 51423",
"build": "ng build",
"build-prod": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --prod",
"publish": "ng build --prod --verbose",

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

@ -537,7 +537,7 @@ export class GisLabelingComponent implements OnInit {
image = '/assets/fireForcesMarkers/dadui.png'
} else if (item.level == 3) {
image = '/assets/fireForcesMarkers/zhongdui.png'
}else{
} else {
image = '/assets/fireForcesMarkers/qita.png'
}
// 用于点集合的数组
@ -1161,46 +1161,46 @@ export class GisLabelingComponent implements OnInit {
//搜索
search() {
let that = this
let placeSearch = MapFactory.PlaceSearchInstance(that); //构造地点查询类
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000;
this.allCompany = []
let paramsdata: any = { Name: this.searchText || '' }
this.http.get("/api/Companies", { params: paramsdata }).subscribe((data: any) => {
if (data.items.length) { //数据库api 搜索
this.allCompany = data.items
this.snackBar.open(`搜索目标结果为${data.items.length}个`, '确定', config);
} else { //高德api 搜索
placeSearch.search(that.searchText, (status, result)=>{
if (status != "complete") {
this.snackBar.open(`搜索目标结果为0个`, '确定', config);
console.log(status,result)
return
}
if (result.poiList.pois.length) {
let resultList = []
result.poiList.pois.forEach((element: any) => {
let item = {
address: element.address,
buildingTypes: [],
id: null,
imageUrl: null,
location: {x: element.location.lng, y: element.location.lat},
name: element.name
}
resultList.push(item)
});
that.allCompany = resultList
that.snackBar.open(`搜索目标结果为${resultList.length}个`, '确定', config);
} else {
that.snackBar.open(`搜索目标结果为0个`, '确定', config);
let that = this
let placeSearch = MapFactory.PlaceSearchInstance(that); //构造地点查询类
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000;
this.allCompany = []
let paramsdata: any = { Name: this.searchText || '' }
this.http.get("/api/Companies", { params: paramsdata }).subscribe((data: any) => {
if (data.items.length) { //数据库api 搜索
this.allCompany = data.items
this.snackBar.open(`搜索目标结果为${data.items.length}个`, '确定', config);
} else { //高德api 搜索
placeSearch.search(that.searchText, (status, result) => {
if (status != "complete") {
this.snackBar.open(`搜索目标结果为0个`, '确定', config);
console.log(status, result)
return
}
if (result.poiList.pois.length) {
let resultList = []
result.poiList.pois.forEach((element: any) => {
let item = {
address: element.address,
buildingTypes: [],
id: null,
imageUrl: null,
location: { x: element.location.lng, y: element.location.lat },
name: element.name
}
resultList.push(item)
});
that.allCompany = resultList
that.snackBar.open(`搜索目标结果为${resultList.length}个`, '确定', config);
} else {
that.snackBar.open(`搜索目标结果为0个`, '确定', config);
}
})
}
})
}
})
})
}
//清除
@ -1300,13 +1300,13 @@ export class GisLabelingComponent implements OnInit {
//基本信息
baseInformation(e) {
if (!e.id) {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('暂无单位数据', '确定', config);
return
}
if (!e.id) {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('暂无单位数据', '确定', config);
return
}
this.leftDivState = true
this.showLeftDiv = true
this.appLeft.selectBaseInfo(e) //调用子组件方法
@ -1333,13 +1333,13 @@ export class GisLabelingComponent implements OnInit {
//查看预案
seePlan(e) {
if (!e.id) {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('暂无单位数据', '确定', config);
return
}
if (!e.id) {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('暂无单位数据', '确定', config);
return
}
let data = e
let dialogRef = this.dialog.open(LookPlanDialog, {//调用open方法打开对话框并且携带参数过去
width: '1400px',
@ -1354,16 +1354,16 @@ export class GisLabelingComponent implements OnInit {
//分享
share(e) {
if (!e.id) {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('暂无单位数据', '确定', config);
return
}
if (!e.id) {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('暂无单位数据', '确定', config);
return
}
let data = {
url: 'https://',
buildingType: e.buildingTypes.length? e.buildingTypes[0].name : null,
buildingType: e.buildingTypes.length ? e.buildingTypes[0].name : null,
address: e.address
}
let dialogRef = this.dialog.open(ShareUrlDialog, {//调用open方法打开对话框并且携带参数过去
@ -1397,13 +1397,13 @@ export class GisLabelingComponent implements OnInit {
let that = this
window.clearTimeout(this.timeout)
this.timeout = window.setTimeout(() => {
that.map.getCity(function (info) { //获取当前 city
var autoOptions = { city: info.city }
let keywords
e == 0 ? keywords = that.routeStart : keywords = that.routeEnd
var autoComplete = MapFactory.AutocompleteInstance(autoOptions, that);
autoComplete.search(keywords, function (status, result) {
console.log(result)
if (result && result.tips && result.tips.length) { //搜索到数据时
that._ngZone.run(() => {
if (e == 0) {//起点

20
src/index.html
Unescape View File

@ -8,6 +8,7 @@
-->
<!doctype html>
<html lang="zh-CN">
<head>
<meta charset="utf-8">
<title>数字化预案编制管理平台</title>
@ -16,20 +17,27 @@
<!-- <meta name="viewport" content="initial-scale=0.5, maximum-scale=0.5, minimum-scale=0.5, user-scalable=no,uc-fitscreen=yes,viewport-fit=cover"> -->
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link href='/assets/icon/material-icons.css' rel="stylesheet">
<link rel="stylesheet" href="/assets/css/photo-sphere-viewer.css"/>
<link rel="stylesheet" href="/assets/css/photo-sphere-viewer.css" />
</head>
<body>
<app-root></app-root>
</body>
<!-- <script type="text/javascript" src="./assets/kmap/kmap-service-main-kd.js"></script> -->
<script src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script>
<!-- <script src="https://webapi.amap.com/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->
<!-- <script src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script> -->
<script type="text/javascript">
window._AMapSecurityConfig = {
securityJsCode: '0afa0b144398727fad2ca06f5f7156b3'
}
</script>
<script
src="https://webapi.amap.com/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="https://webapi.amap.com/ui/1.1/main.js"></script>
<script src="/assets/html2canvas.js"></script>
<script type="text/javascript" src="/assets/wordexport/jquery.js"></script>
<script type="text/javascript" src="/assets/wordexport/FileSaver.js"></script>
<script type="text/javascript" src="/assets/wordexport/jquery.wordexport.js"></script>
</html>
</html>
Write Preview
Loading…
Cancel
Save