diff --git a/package.json b/package.json
index c9002ee..4b4ab52 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.ts b/src/app/gis-management/gis-labeling/gis-labeling.component.ts
index a856ee9..58a45d4 100644
--- a/src/app/gis-management/gis-labeling/gis-labeling.component.ts
+++ b/src/app/gis-management/gis-labeling/gis-labeling.component.ts
@@ -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) {//起点
diff --git a/src/index.html b/src/index.html
index 7aab4f9..6e41bea 100644
--- a/src/index.html
+++ b/src/index.html
@@ -8,6 +8,7 @@
-->
+
数字化预案编制管理平台
@@ -16,20 +17,27 @@
-
+
+
-
-
-
+
+
+
+
-
+