chenjingyu 4 years ago
parent
commit
823e6b2356
  1. 5
      angular.json
  2. 1
      src/app/app-routing.module.ts
  3. 14
      src/app/app.component.ts
  4. 4
      src/app/app.module.ts
  5. 108
      src/app/data-collection/fire-force/fire-force.component.ts
  6. 106
      src/app/data-collection/linkage-forces/linkage-forces.component.ts
  7. 80
      src/app/data-collection/water-collection/water-collection.component.ts
  8. 41
      src/app/external-links-plan/external-links-plan.component.ts
  9. 322
      src/app/gis-management/gis-labeling/gis-labeling.component.ts
  10. 2
      src/app/home/home.component.ts
  11. 21
      src/app/key-unit/basicinfo-look/basicinfo.component.ts
  12. 93
      src/app/key-unit/basicinfo/basicinfo.component.ts
  13. 12
      src/app/key-unit/function-division/function-division.component.ts
  14. 36
      src/app/key-unit/router-gis/router-gis.component.ts
  15. 19
      src/app/key-unit/six-familiarity/six-familiarity.component.ts
  16. 60
      src/app/key-unit/water-road/water-road.component.ts
  17. 20
      src/app/pages/login/login.component.ts
  18. 6
      src/app/pages/pages-routing.module.ts
  19. 2
      src/app/pages/pages.component.html
  20. 47
      src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts
  21. 47
      src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts
  22. 40
      src/app/plan-audit/plan-record/plan-record.component.ts
  23. 42
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  24. 14
      src/app/plan-audit/water-audit/water-audit.component.ts
  25. 2
      src/app/plan-management/entry-plan-look/entry-plan-look.component.html
  26. 64
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
  27. 54
      src/app/plan-management/meet-plan/meet-plan.component.ts
  28. 55
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
  29. 46
      src/app/plan-management/open-plan/open-plan.component.ts
  30. 46
      src/app/plan-management/pass-plan/pass-plan.component.ts
  31. 55
      src/app/plan-management/type-plan/type-plan.component.ts
  32. 30
      src/app/searchComponent.service.ts
  33. 46
      src/app/statistic-analysis/all-plan/all-plan.component.ts
  34. 246
      src/app/statistic-analysis/home/home.component.ts
  35. 46
      src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.ts
  36. 39
      src/app/tabbar/tabbar.component.html
  37. 8
      src/app/tabbar/tabbar.component.ts
  38. 4
      src/app/ui/collection-tools-plan/addPlaneFigure.html
  39. 611
      src/app/ui/collection-tools-plan/collection-tools.component.ts
  40. 2
      src/app/working-area/model/axImageShape.ts
  41. 23
      src/app/working-area/model/axShape.ts
  42. 2
      src/app/working-area/working-area.component.ts
  43. 13
      src/assets/kmap/Kmap.config.json
  44. 81
      src/assets/kmap/kmap-service-main-kd.js
  45. 14
      src/index.html
  46. 3
      src/modules/map/declare/component/SearchDownListPlugins/SearchDownList.html
  47. 16
      src/modules/map/declare/component/SearchDownListPlugins/SearchDownList.scss
  48. 53
      src/modules/map/declare/component/SearchDownListPlugins/SearchDownList.ts
  49. 135
      src/modules/map/declare/factory.ts
  50. 488
      src/modules/map/declare/gaode-map.ts
  51. 910
      src/modules/map/declare/keda-map.ts
  52. 43
      src/modules/map/declare/map-tools.ts
  53. 200
      src/modules/map/declare/map.d.ts
  54. 12
      src/styles.scss
  55. 5
      tsconfig.json

5
angular.json

@ -35,6 +35,7 @@
"scripts": [ "scripts": [
"node_modules/echarts/dist/echarts.js", "node_modules/echarts/dist/echarts.js",
"src/assets/mTokenK1/mToken_K1.js", "src/assets/mTokenK1/mToken_K1.js",
"src/assets/kmap/kmap-service-main-kd.js",
"./node_modules/swiper/js/swiper.min.js", "./node_modules/swiper/js/swiper.min.js",
"src/assets/chartstheme/westeros.js", "src/assets/chartstheme/westeros.js",
"src/assets/chartstheme/walden.js", "src/assets/chartstheme/walden.js",
@ -62,8 +63,8 @@
"budgets": [ "budgets": [
{ {
"type": "initial", "type": "initial",
"maximumWarning": "8mb", "maximumWarning": "18mb",
"maximumError": "8mb" "maximumError": "18mb"
}, },
{ {
"type": "anyComponentStyle", "type": "anyComponentStyle",

1
src/app/app-routing.module.ts

@ -30,7 +30,6 @@ const routes: Routes = [
{path:'keyUnit',loadChildren:() => import('./key-unit/key-unit.module').then(m => m.KeyUnitModule)}, {path:'keyUnit',loadChildren:() => import('./key-unit/key-unit.module').then(m => m.KeyUnitModule)},
{path:'planManagement',loadChildren:() => import('./plan-management/plan-management.module').then(m => m.PlanManagementModule)}, {path:'planManagement',loadChildren:() => import('./plan-management/plan-management.module').then(m => m.PlanManagementModule)},
{path:'planAudit',loadChildren:() => import('./plan-audit/plan-audit.module').then(m => m.PlanAuditModule)}, {path:'planAudit',loadChildren:() => import('./plan-audit/plan-audit.module').then(m => m.PlanAuditModule)},
{path:'home',loadChildren:() => import('./pages/pages.module').then(m => m.PagesModule)},
{path:'visualization',component: HomeComponent}, {path:'visualization',component: HomeComponent},
{path:'gis',loadChildren:() => import('./gis-management/gis-management.module').then(m => m.GISManagementModule)}, {path:'gis',loadChildren:() => import('./gis-management/gis-management.module').then(m => m.GISManagementModule)},
{path:'statisticanalysis',loadChildren:() => import('./statistic-analysis/statistic-analysis.module').then(m => m.StatisticAnalysisModule)}, {path:'statisticanalysis',loadChildren:() => import('./statistic-analysis/statistic-analysis.module').then(m => m.StatisticAnalysisModule)},

14
src/app/app.component.ts

@ -1,10 +1,10 @@
import { Component } from '@angular/core'; import { Component, Inject, Injector } from '@angular/core';
import { HttpClient } from '@angular/common/http' import { HttpClient } from '@angular/common/http'
import { Data } from './interface' import { Data } from './interface'
import { Router, ActivatedRoute } from '@angular/router' import { Router, ActivatedRoute } from '@angular/router'
import { CacheTokenService } from './http-interceptors/cache-token.service'//引入服务 import { CacheTokenService } from './http-interceptors/cache-token.service'//引入服务
import { MaskLayerService } from './mask-layer.service'; import { MaskLayerService } from './mask-layer.service';
import * as global from 'globals';
@Component({ @Component({
@ -14,7 +14,9 @@ import { MaskLayerService } from './mask-layer.service';
}) })
export class AppComponent { export class AppComponent {
constructor(private maskLayerService:MaskLayerService,private http:HttpClient,private router:Router,public token:CacheTokenService) { } constructor(private maskLayerService: MaskLayerService, private http: HttpClient, private router: Router, public token: CacheTokenService, private injector: Injector) {
global.injector = injector;
}
isMaskLayerShow: boolean = false isMaskLayerShow: boolean = false
@ -42,11 +44,11 @@ export class AppComponent {
let meta = document.createElement('meta'); let meta = document.createElement('meta');
    meta.content=content; meta.content = content;
    meta.name=name; meta.name = name;
    document.getElementsByTagName('head')[0].appendChild(meta); document.getElementsByTagName('head')[0].appendChild(meta);
} }
if (document.documentElement.clientWidth < 800) { if (document.documentElement.clientWidth < 800) {

4
src/app/app.module.ts

@ -24,6 +24,7 @@ import { DataCollectionModule } from './data-collection/data-collection.module';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { TestComponent } from './test/test.component'; import { TestComponent } from './test/test.component';
import { ExternalLinksPlanComponent } from './external-links-plan/external-links-plan.component'; import { ExternalLinksPlanComponent } from './external-links-plan/external-links-plan.component';
import { SearchDownList } from '../modules/map/declare/component/SearchDownListPlugins/SearchDownList';
@NgModule({ @NgModule({
declarations: [ declarations: [
@ -31,7 +32,8 @@ import { ExternalLinksPlanComponent } from './external-links-plan/external-links
HomeComponent, HomeComponent,
MTokenK1Component, MTokenK1Component,
TestComponent, TestComponent,
ExternalLinksPlanComponent ExternalLinksPlanComponent,
SearchDownList
], ],
imports: [ imports: [
BrowserModule, BrowserModule,

108
src/app/data-collection/fire-force/fire-force.component.ts

@ -6,11 +6,12 @@ import { Component, OnInit } from '@angular/core';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
import { MapFactory } from '@src/modules/map/declare/factory';
import { IMap, IMarker, IMarkerCluster, IPlaceSearch } from '@src/modules/map/declare/map';
import { Console } from 'console'; import { Console } from 'console';
import { TreeService } from 'src/app/http-interceptors/tree.service'; import { TreeService } from 'src/app/http-interceptors/tree.service';
import Viewer from 'viewerjs' import Viewer from 'viewerjs'
declare var CryptoJS declare var CryptoJS
declare var AMap: any;
@Component({ @Component({
selector: 'app-fire-force', selector: 'app-fire-force',
@ -66,7 +67,7 @@ export class FireForceComponent implements OnInit {
} }
} }
//循环渲染出所有力量markers //循环渲染出所有力量markers
cluster:any //力量聚合实例 cluster:IMarkerCluster //力量聚合实例
createMarker(list){ createMarker(list){
let markerArrcluster = [] let markerArrcluster = []
this.cluster ? this.cluster.setData([]) : null this.cluster ? this.cluster.setData([]) : null
@ -91,11 +92,13 @@ export class FireForceComponent implements OnInit {
data : item data : item
}) : null }) : null
}) })
this.map.plugin(["AMap.MarkerClusterer"],() => {
var gridSize = 60 var gridSize = 60
var count = markerArrcluster.length; var count = markerArrcluster.length;
var _renderClusterMarker = function (context) {
var factor = Math.pow(context.count / count, 1 / 18); let render = MapFactory.RenderClusterMarkerInstance();
render.contentRender = (contextCount) => {
var factor = Math.pow(contextCount / count, 1 / 18);
var div = document.createElement('div'); var div = document.createElement('div');
var Hue = 180 - factor * 180; var Hue = 180 - factor * 180;
var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)'; var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)';
@ -103,29 +106,32 @@ export class FireForceComponent implements OnInit {
var borderColor = 'hsla(' + Hue + ',100%,40%,1)'; var borderColor = 'hsla(' + Hue + ',100%,40%,1)';
var shadowColor = 'hsla(' + Hue + ',100%,90%,1)'; var shadowColor = 'hsla(' + Hue + ',100%,90%,1)';
div.style.backgroundColor = bgColor; div.style.backgroundColor = bgColor;
var size = Math.round(30 + Math.pow(context.count / count, 1 / 5) * 20); var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
div.style.width = div.style.height = size + 'px'; div.style.width = div.style.height = size + 'px';
div.style.border = 'solid 1px ' + borderColor; div.style.border = 'solid 1px ' + borderColor;
div.style.borderRadius = size / 2 + 'px'; div.style.borderRadius = size / 2 + 'px';
div.style.boxShadow = '0 0 5px ' + shadowColor; div.style.boxShadow = '0 0 5px ' + shadowColor;
div.innerHTML = context.count; div.innerHTML = contextCount;
div.style.lineHeight = size + 'px'; div.style.lineHeight = size + 'px';
div.style.color = fontColor; div.style.color = fontColor;
div.style.fontSize = '14px'; div.style.fontSize = '14px';
div.style.textAlign = 'center'; div.style.textAlign = 'center';
context.marker.setOffset(new AMap.Pixel(-size / 2, -size / 2)); return div;
context.marker.setContent(div) };
render.pixelRender = (contextCount) => {
var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
return MapFactory.PixelInstance(-size / 2, -size / 2);
}; };
var _renderMarker = (context)=>{
var content = `<img class='clusterImgCollection' src="${context.data[0].image}" alt="">`; render.contentNonRender = (src) => {
var offset = new AMap.Pixel(-15, -15); return `<img class='clusterImgCollection' src="${src}" alt="">`;
context.marker.setContent(content) };
context.marker.setOffset(offset) render.pixelNonRender = () => {
return MapFactory.PixelInstance(-15, -15);
} }
this.cluster = new AMap.MarkerCluster(this.map, markerArrcluster, { this.cluster = MapFactory.MarkerClusterInstance(this.map, markerArrcluster, {
gridSize: gridSize, // 设置网格像素大小 gridSize: gridSize, // 设置网格像素大小
renderClusterMarker: _renderClusterMarker, // 自定义聚合点样式 render: render //自定义聚合点样式, 自定义非聚合点样式
renderMarker: _renderMarker, // 自定义非聚合点样式
}); });
this.cluster.on('click',(e)=>{ this.cluster.on('click',(e)=>{
if(e.clusterData.length == 1){ if(e.clusterData.length == 1){
@ -185,8 +191,8 @@ export class FireForceComponent implements OnInit {
} }
}) })
} }
}) },this)
});
} }
ngOnInit(): void { ngOnInit(): void {
@ -317,10 +323,10 @@ export class FireForceComponent implements OnInit {
if(data.location && data.location.x){//如果已经标注单位坐标 if(data.location && data.location.x){//如果已经标注单位坐标
this.positionLngLat = data.location this.positionLngLat = data.location
this.map.setCenter([data.location.x,data.location.y]); this.map.setCenter([data.location.x,data.location.y]);
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [data.location.x,data.location.y], position: [data.location.x,data.location.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}) })
// 将 markers 添加到地图 // 将 markers 添加到地图
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -793,8 +799,8 @@ export class FireForceComponent implements OnInit {
this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null
this.isGisTopBox = false this.isGisTopBox = false
} }
map:any map:IMap
placeSearch:any//构造地点查询类 placeSearch: IPlaceSearch//构造地点查询类
isMapLabel:boolean = false //是否已经标记坐标 isMapLabel:boolean = false //是否已经标记坐标
newPositionMarkerContent:any = newPositionMarkerContent:any =
'<div class="custom-content-marker">' + '<div class="custom-content-marker">' +
@ -806,9 +812,9 @@ export class FireForceComponent implements OnInit {
' <div class="btnbox"><img id="setPositionOk" src="/assets/images/ok.png"><span>|</span><img id="setPositionClose" src="/assets/images/close.png"></div>' + ' <div class="btnbox"><img id="setPositionOk" src="/assets/images/ok.png"><span>|</span><img id="setPositionClose" src="/assets/images/close.png"></div>' +
'</div>' '</div>'
//创建地图 //创建地图
newPositionMarker:any//坐标实例 newPositionMarker:IMarker//坐标实例
createMap(){ createMap(){
this.map = new AMap.Map('container', { this.map = MapFactory.MapInstance('container', {
zoom:12 zoom:12
}) })
this.map.setCity('上海市'); this.map.setCity('上海市');
@ -816,16 +822,14 @@ export class FireForceComponent implements OnInit {
var autoOptions = { var autoOptions = {
input: "tipinput" input: "tipinput"
}; };
AMap.plugin(['AMap.PlaceSearch','AMap.AutoComplete'], ()=>{ let auto = MapFactory.AutocompleteInstance(autoOptions,this);
let auto = new AMap.AutoComplete(autoOptions); this.placeSearch = MapFactory.PlaceSearchInstance(this); //构造地点查询类
this.placeSearch = new AMap.PlaceSearch(); //构造地点查询类
auto.on("select", (e)=>{ auto.on("select", (e)=>{
this.newPositionMarker.setPosition([e.poi.location.lng,e.poi.location.lat]) this.newPositionMarker.setPosition([e.poi.location.lng,e.poi.location.lat])
this.positionLngLat = {x: e.poi.location.lng, y: e.poi.location.lat} this.positionLngLat = {x: e.poi.location.lng, y: e.poi.location.lat}
this.map.setCenter([e.poi.location.lng,e.poi.location.lat]); //设置地图中心点 this.map.setCenter([e.poi.location.lng,e.poi.location.lat]); //设置地图中心点
});//注册监听,当选中某条记录时会触发 });//注册监听,当选中某条记录时会触发
});
} }
//点击位置 //点击位置
isGisTopBox:boolean = false // isGisTopBox:boolean = false //
@ -845,26 +849,26 @@ export class FireForceComponent implements OnInit {
}else{ }else{
center = this.map.getCenter(); //获取当前地图中心位置 center = this.map.getCenter(); //获取当前地图中心位置
} }
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
draggable: true, draggable: true,
position: center, position: center,
content: this.newPositionMarkerContentBtn, content: this.newPositionMarkerContentBtn,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.positionLngLat = {x: center.lng || center[0], y: center.lat || center[1]} this.positionLngLat = {x: center.lng || center[0], y: center.lat || center[1]}
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
this.isMapLabel = true this.isMapLabel = true
this.newPositionMarker.on('dragend', (e)=>{ this.newPositionMarker.on('dragend', (e)=>{
this.positionLngLat = {x: e.lnglat.lng, y: e.lnglat.lat} this.positionLngLat = {x: e.lnglat.lng, y: e.lnglat.lat}
}) },this)
//点击确定 //点击确定
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{ this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{
this.isGisTopBox = false this.isGisTopBox = false
this.map.remove(this.newPositionMarker) this.map.remove(this.newPositionMarker)
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.positionLngLat.x,this.positionLngLat.y], position: [this.positionLngLat.x,this.positionLngLat.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat)) this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat))
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -878,10 +882,10 @@ export class FireForceComponent implements OnInit {
this.positionLngLat = {} this.positionLngLat = {}
this.atLastPositionLngLat = {} this.atLastPositionLngLat = {}
}else{ }else{
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y], position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点 this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -891,10 +895,10 @@ export class FireForceComponent implements OnInit {
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'touchstart',(event)=>{ this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'touchstart',(event)=>{
this.isGisTopBox = false this.isGisTopBox = false
this.map.remove(this.newPositionMarker) this.map.remove(this.newPositionMarker)
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.positionLngLat.x,this.positionLngLat.y], position: [this.positionLngLat.x,this.positionLngLat.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat)) this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat))
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -908,10 +912,10 @@ export class FireForceComponent implements OnInit {
this.positionLngLat = {} this.positionLngLat = {}
this.atLastPositionLngLat = {} this.atLastPositionLngLat = {}
}else{ }else{
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y], position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点 this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -1143,25 +1147,13 @@ export class FireForceComponent implements OnInit {
} }
if(suffix == 'docx' || suffix == 'doc' || suffix == 'pdf'){ if(suffix == 'docx' || suffix == 'doc' || suffix == 'pdf'){
let fetchUrl = item.objectName let fetchUrl = item.objectName
let json={ if (suffix == 'docx' || suffix == 'doc') {
doc: { let arr = fetchUrl.split('.')
docId: new Date(), arr[arr.length - 1] = 'pdf'
title: item.fileName, window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl }else if (suffix == 'pdf') {
}, window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
user: {
uid: "test",
nickName: "test",
avatar: "",
privilege: [
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
],
},
} }
var stringjson=JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
} }
if(suffix == 'mp4'){ if(suffix == 'mp4'){
const dialogRef = this.dialog.open(ViewDetails, {//调用open方法打开对话框并且携带参数过去 const dialogRef = this.dialog.open(ViewDetails, {//调用open方法打开对话框并且携带参数过去

106
src/app/data-collection/linkage-forces/linkage-forces.component.ts

@ -10,8 +10,10 @@ import { NzTreeNode } from 'ng-zorro-antd/tree';
import { TreeService } from 'src/app/http-interceptors/tree.service'; import { TreeService } from 'src/app/http-interceptors/tree.service';
import Viewer from 'viewerjs' import Viewer from 'viewerjs'
import Swiper from 'swiper'; import Swiper from 'swiper';
import { MapFactory } from '@src/modules/map/declare/factory';
import { IMap, IMarker } from '@src/modules/map/declare/map';
declare var CryptoJS declare var CryptoJS
declare var AMap: any;
@Component({ @Component({
selector: 'app-linkage-forces', selector: 'app-linkage-forces',
templateUrl: './linkage-forces.component.html', templateUrl: './linkage-forces.component.html',
@ -124,11 +126,13 @@ export class LinkageForcesComponent implements OnInit {
}) })
} }
}) })
this.map.plugin(["AMap.MarkerClusterer"],() => {
var gridSize = 60 var gridSize = 60
var count = markerArrcluster.length; var count = markerArrcluster.length;
var _renderClusterMarker = function (context) {
var factor = Math.pow(context.count / count, 1 / 18); let render = MapFactory.RenderClusterMarkerInstance();
render.contentRender = (contextCount) => {
var factor = Math.pow(contextCount / count, 1 / 18);
var div = document.createElement('div'); var div = document.createElement('div');
var Hue = 180 - factor * 180; var Hue = 180 - factor * 180;
var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)'; var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)';
@ -136,29 +140,33 @@ export class LinkageForcesComponent implements OnInit {
var borderColor = 'hsla(' + Hue + ',100%,40%,1)'; var borderColor = 'hsla(' + Hue + ',100%,40%,1)';
var shadowColor = 'hsla(' + Hue + ',100%,90%,1)'; var shadowColor = 'hsla(' + Hue + ',100%,90%,1)';
div.style.backgroundColor = bgColor; div.style.backgroundColor = bgColor;
var size = Math.round(30 + Math.pow(context.count / count, 1 / 5) * 20); var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
div.style.width = div.style.height = size + 'px'; div.style.width = div.style.height = size + 'px';
div.style.border = 'solid 1px ' + borderColor; div.style.border = 'solid 1px ' + borderColor;
div.style.borderRadius = size / 2 + 'px'; div.style.borderRadius = size / 2 + 'px';
div.style.boxShadow = '0 0 5px ' + shadowColor; div.style.boxShadow = '0 0 5px ' + shadowColor;
div.innerHTML = context.count; div.innerHTML = contextCount;
div.style.lineHeight = size + 'px'; div.style.lineHeight = size + 'px';
div.style.color = fontColor; div.style.color = fontColor;
div.style.fontSize = '14px'; div.style.fontSize = '14px';
div.style.textAlign = 'center'; div.style.textAlign = 'center';
context.marker.setOffset(new AMap.Pixel(-size / 2, -size / 2)); return div;
context.marker.setContent(div) };
render.pixelRender = (contextCount) => {
var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
return MapFactory.PixelInstance(-size / 2, -size / 2);
}; };
var _renderMarker = (context)=> {
var content = `<img class='clusterImgCollection' src="${context.data[0].image}" alt="">`; render.contentNonRender = (src) => {
var offset = new AMap.Pixel(-15, -15); return `<img class='clusterImgCollection' src="${src}" alt="">`;
context.marker.setContent(content) };
context.marker.setOffset(offset) render.pixelNonRender = () => {
return MapFactory.PixelInstance(-15, -15);
} }
this.cluster = new AMap.MarkerCluster(this.map, markerArrcluster, {
this.cluster = MapFactory.MarkerClusterInstance(this.map, markerArrcluster, {
gridSize: gridSize, // 设置网格像素大小 gridSize: gridSize, // 设置网格像素大小
renderClusterMarker: _renderClusterMarker, // 自定义聚合点样式 render: render //自定义聚合点样式, 自定义非聚合点样式
renderMarker: _renderMarker, // 自定义非聚合点样式
}); });
this.cluster.on('click',(e)=>{ this.cluster.on('click',(e)=>{
if(e.clusterData.length == 1){ if(e.clusterData.length == 1){
@ -168,8 +176,8 @@ export class LinkageForcesComponent implements OnInit {
item.location?this.positionLngLat = item.location:null item.location?this.positionLngLat = item.location:null
this.AttachmentArr = JSON.parse(item.relevantInfomationData) this.AttachmentArr = JSON.parse(item.relevantInfomationData)
} }
}) },this)
});
} }
ngOnInit(): void { ngOnInit(): void {
@ -251,10 +259,10 @@ export class LinkageForcesComponent implements OnInit {
} }
if(item.location && item.location.x){//如果已经标注单位坐标 if(item.location && item.location.x){//如果已经标注单位坐标
this.map.setCenter([item.location.x,item.location.y]); this.map.setCenter([item.location.x,item.location.y]);
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [item.location.x,item.location.y], position: [item.location.x,item.location.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}) })
// 将 markers 添加到地图 // 将 markers 添加到地图
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -512,7 +520,7 @@ export class LinkageForcesComponent implements OnInit {
this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null
this.isGisTopBox = false this.isGisTopBox = false
} }
map:any map:IMap
placeSearch:any//构造地点查询类 placeSearch:any//构造地点查询类
isMapLabel:boolean = false //是否已经标记坐标 isMapLabel:boolean = false //是否已经标记坐标
newPositionMarkerContent:any = newPositionMarkerContent:any =
@ -525,9 +533,9 @@ export class LinkageForcesComponent implements OnInit {
' <div class="btnbox"><img id="setPositionOk" src="/assets/images/ok.png"><span>|</span><img id="setPositionClose" src="/assets/images/close.png"></div>' + ' <div class="btnbox"><img id="setPositionOk" src="/assets/images/ok.png"><span>|</span><img id="setPositionClose" src="/assets/images/close.png"></div>' +
'</div>' '</div>'
//创建地图 //创建地图
newPositionMarker:any//坐标实例 newPositionMarker:IMarker//坐标实例
createMap(){ createMap(){
this.map = new AMap.Map('container', { this.map = MapFactory.MapInstance('container', {
zoom:12 zoom:12
}) })
this.map.setCity('上海市'); this.map.setCity('上海市');
@ -535,16 +543,14 @@ export class LinkageForcesComponent implements OnInit {
var autoOptions = { var autoOptions = {
input: "tipinput" input: "tipinput"
}; };
AMap.plugin(['AMap.PlaceSearch','AMap.AutoComplete'], ()=>{ let auto = MapFactory.AutocompleteInstance(autoOptions,this);
let auto = new AMap.AutoComplete(autoOptions); this.placeSearch = MapFactory.PlaceSearchInstance(this); //构造地点查询类
this.placeSearch = new AMap.PlaceSearch(); //构造地点查询类
auto.on("select", (e)=>{ auto.on("select", (e)=>{
this.newPositionMarker.setPosition([e.poi.location.lng,e.poi.location.lat]) this.newPositionMarker.setPosition([e.poi.location.lng,e.poi.location.lat])
this.positionLngLat = {x: e.poi.location.lng, y: e.poi.location.lat} this.positionLngLat = {x: e.poi.location.lng, y: e.poi.location.lat}
this.map.setCenter([e.poi.location.lng,e.poi.location.lat]); //设置地图中心点 this.map.setCenter([e.poi.location.lng,e.poi.location.lat]); //设置地图中心点
});//注册监听,当选中某条记录时会触发 });//注册监听,当选中某条记录时会触发
});
} }
//点击位置 //点击位置
isGisTopBox:boolean = false // isGisTopBox:boolean = false //
@ -564,26 +570,26 @@ export class LinkageForcesComponent implements OnInit {
}else{ }else{
center = this.map.getCenter(); //获取当前地图中心位置 center = this.map.getCenter(); //获取当前地图中心位置
} }
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
draggable: true, draggable: true,
position: center, position: center,
content: this.newPositionMarkerContentBtn, content: this.newPositionMarkerContentBtn,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.positionLngLat = {x: center.lng || center[0], y: center.lat || center[1]} this.positionLngLat = {x: center.lng || center[0], y: center.lat || center[1]}
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
this.isMapLabel = true this.isMapLabel = true
this.newPositionMarker.on('dragend', (e)=>{ this.newPositionMarker.on('dragend', (e)=>{
this.positionLngLat = {x: e.lnglat.lng, y: e.lnglat.lat} this.positionLngLat = {x: e.lnglat.lng, y: e.lnglat.lat}
}) },this)
//点击确定 //点击确定
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{ this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{
this.isGisTopBox = false this.isGisTopBox = false
this.map.remove(this.newPositionMarker) this.map.remove(this.newPositionMarker)
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.positionLngLat.x,this.positionLngLat.y], position: [this.positionLngLat.x,this.positionLngLat.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat)) this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat))
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -597,10 +603,10 @@ export class LinkageForcesComponent implements OnInit {
this.positionLngLat = {} this.positionLngLat = {}
this.atLastPositionLngLat = {} this.atLastPositionLngLat = {}
}else{ }else{
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y], position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点 this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -611,10 +617,10 @@ export class LinkageForcesComponent implements OnInit {
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'touchstart',(event)=>{ this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'touchstart',(event)=>{
this.isGisTopBox = false this.isGisTopBox = false
this.map.remove(this.newPositionMarker) this.map.remove(this.newPositionMarker)
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.positionLngLat.x,this.positionLngLat.y], position: [this.positionLngLat.x,this.positionLngLat.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat)) this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat))
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -628,10 +634,10 @@ export class LinkageForcesComponent implements OnInit {
this.positionLngLat = {} this.positionLngLat = {}
this.atLastPositionLngLat = {} this.atLastPositionLngLat = {}
}else{ }else{
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y], position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点 this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -867,25 +873,13 @@ export class LinkageForcesComponent implements OnInit {
} }
if(suffix == 'docx' || suffix == 'doc' || suffix == 'pdf'){ if(suffix == 'docx' || suffix == 'doc' || suffix == 'pdf'){
let fetchUrl = item.objectName let fetchUrl = item.objectName
let json={ if (suffix == 'docx' || suffix == 'doc') {
doc: { let arr = fetchUrl.split('.')
docId: new Date(), arr[arr.length - 1] = 'pdf'
title: item.fileName, window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl }else if (suffix == 'pdf') {
}, window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
user: {
uid: "test",
nickName: "test",
avatar: "",
privilege: [
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
],
},
} }
var stringjson=JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
} }
if(suffix == 'mp4'){ if(suffix == 'mp4'){
const dialogRef = this.dialog.open(ViewDetails2, {//调用open方法打开对话框并且携带参数过去 const dialogRef = this.dialog.open(ViewDetails2, {//调用open方法打开对话框并且携带参数过去

80
src/app/data-collection/water-collection/water-collection.component.ts

@ -4,7 +4,8 @@ import { ElementRef } from '@angular/core';
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
declare var AMap: any; import { MapFactory } from '@src/modules/map/declare/factory';
import { IMap, IMarker } from '@src/modules/map/declare/map';
@Component({ @Component({
selector: 'app-water-collection', selector: 'app-water-collection',
@ -80,11 +81,13 @@ export class WaterCollectionComponent implements OnInit {
}) })
} }
}) })
this.map.plugin(["AMap.MarkerClusterer"],() => {
var gridSize = 60 var gridSize = 60
var count = markerArrcluster.length; var count = markerArrcluster.length;
var _renderClusterMarker = function (context) {
var factor = Math.pow(context.count / count, 1 / 18); let render = MapFactory.RenderClusterMarkerInstance();
render.contentRender = (contextCount) => {
var factor = Math.pow(contextCount / count, 1 / 18);
var div = document.createElement('div'); var div = document.createElement('div');
var Hue = 180 - factor * 180; var Hue = 180 - factor * 180;
var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)'; var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)';
@ -92,29 +95,32 @@ export class WaterCollectionComponent implements OnInit {
var borderColor = 'hsla(' + Hue + ',100%,40%,1)'; var borderColor = 'hsla(' + Hue + ',100%,40%,1)';
var shadowColor = 'hsla(' + Hue + ',100%,90%,1)'; var shadowColor = 'hsla(' + Hue + ',100%,90%,1)';
div.style.backgroundColor = bgColor; div.style.backgroundColor = bgColor;
var size = Math.round(30 + Math.pow(context.count / count, 1 / 5) * 20); var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
div.style.width = div.style.height = size + 'px'; div.style.width = div.style.height = size + 'px';
div.style.border = 'solid 1px ' + borderColor; div.style.border = 'solid 1px ' + borderColor;
div.style.borderRadius = size / 2 + 'px'; div.style.borderRadius = size / 2 + 'px';
div.style.boxShadow = '0 0 5px ' + shadowColor; div.style.boxShadow = '0 0 5px ' + shadowColor;
div.innerHTML = context.count; div.innerHTML = contextCount;
div.style.lineHeight = size + 'px'; div.style.lineHeight = size + 'px';
div.style.color = fontColor; div.style.color = fontColor;
div.style.fontSize = '14px'; div.style.fontSize = '14px';
div.style.textAlign = 'center'; div.style.textAlign = 'center';
context.marker.setOffset(new AMap.Pixel(-size / 2, -size / 2)); return div;
context.marker.setContent(div) };
render.pixelRender = (contextCount) => {
var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
return MapFactory.PixelInstance(-size / 2, -size / 2);
};
render.contentNonRender = (src) => {
return `<img class='clusterImgCollection' src="${src}" alt="">`;
}; };
var _renderMarker = (context)=> { render.pixelNonRender = () => {
var content = `<img class='clusterImgCollection' src="${context.data[0].image}" alt="">`; return MapFactory.PixelInstance(-15, -15);
context.marker.setContent(content)
var offset = new AMap.Pixel(-15, -15);
context.marker.setOffset(offset)
} }
this.cluster = new AMap.MarkerCluster(this.map, markerArrcluster, { this.cluster = MapFactory.MarkerClusterInstance(this.map, markerArrcluster, {
gridSize: gridSize, // 设置网格像素大小 gridSize: gridSize, // 设置网格像素大小
renderClusterMarker: _renderClusterMarker, // 自定义聚合点样式 render: render //自定义聚合点样式, 自定义非聚合点样式
renderMarker: _renderMarker, // 自定义非聚合点样式
}); });
this.cluster.on('click',(e)=>{ this.cluster.on('click',(e)=>{
if(e.clusterData.length == 1){ if(e.clusterData.length == 1){
@ -129,8 +135,8 @@ export class WaterCollectionComponent implements OnInit {
item.waterSourceType == 2 && item.detailData ? this.naturalWaterData = JSON.parse(item.detailData) : null item.waterSourceType == 2 && item.detailData ? this.naturalWaterData = JSON.parse(item.detailData) : null
this.positionLngLat = item.location this.positionLngLat = item.location
} }
}) },this)
});
} }
ngOnInit(): void { ngOnInit(): void {
@ -226,10 +232,10 @@ export class WaterCollectionComponent implements OnInit {
if(item.location.x){//如果已经标注单位坐标 if(item.location.x){//如果已经标注单位坐标
// console.log(item) // console.log(item)
this.map.setCenter([item.location.x,item.location.y]); this.map.setCenter([item.location.x,item.location.y]);
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [item.location.x,item.location.y], position: [item.location.x,item.location.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}) })
// 将 markers 添加到地图 // 将 markers 添加到地图
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -518,7 +524,7 @@ export class WaterCollectionComponent implements OnInit {
this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null this.newPositionMarker ? this.map.remove(this.newPositionMarker) : null
this.isGisTopBox = false this.isGisTopBox = false
} }
map:any map:IMap
placeSearch:any//构造地点查询类 placeSearch:any//构造地点查询类
isMapLabel:boolean = false //是否已经标记坐标 isMapLabel:boolean = false //是否已经标记坐标
newPositionMarkerContent:any = newPositionMarkerContent:any =
@ -531,9 +537,9 @@ export class WaterCollectionComponent implements OnInit {
' <div class="btnbox"><img id="setPositionOk" src="/assets/images/ok.png"><span>|</span><img id="setPositionClose" src="/assets/images/close.png"></div>' + ' <div class="btnbox"><img id="setPositionOk" src="/assets/images/ok.png"><span>|</span><img id="setPositionClose" src="/assets/images/close.png"></div>' +
'</div>' '</div>'
//创建地图 //创建地图
newPositionMarker:any//坐标实例 newPositionMarker:IMarker//坐标实例
createMap(){ createMap(){
this.map = new AMap.Map('container', { this.map = MapFactory.MapInstance('container', {
zoom:12 zoom:12
}) })
this.map.setCity('上海市'); this.map.setCity('上海市');
@ -541,16 +547,14 @@ export class WaterCollectionComponent implements OnInit {
var autoOptions = { var autoOptions = {
input: "tipinput" input: "tipinput"
}; };
AMap.plugin(['AMap.PlaceSearch','AMap.AutoComplete'], ()=>{ let auto = MapFactory.AutocompleteInstance(autoOptions,this);
let auto = new AMap.AutoComplete(autoOptions); this.placeSearch = MapFactory.PlaceSearchInstance(this); //构造地点查询类
this.placeSearch = new AMap.PlaceSearch(); //构造地点查询类
auto.on("select", (e)=>{ auto.on("select", (e)=>{
this.newPositionMarker.setPosition([e.poi.location.lng,e.poi.location.lat]) this.newPositionMarker.setPosition([e.poi.location.lng,e.poi.location.lat])
this.positionLngLat = {x: e.poi.location.lng, y: e.poi.location.lat} this.positionLngLat = {x: e.poi.location.lng, y: e.poi.location.lat}
this.map.setCenter([e.poi.location.lng,e.poi.location.lat]); //设置地图中心点 this.map.setCenter([e.poi.location.lng,e.poi.location.lat]); //设置地图中心点
});//注册监听,当选中某条记录时会触发 });//注册监听,当选中某条记录时会触发
});
} }
//点击位置 //点击位置
isGisTopBox:boolean = false // isGisTopBox:boolean = false //
@ -573,26 +577,26 @@ export class WaterCollectionComponent implements OnInit {
// console.log(3) // console.log(3)
center = this.map.getCenter(); //获取当前地图中心位置 center = this.map.getCenter(); //获取当前地图中心位置
} }
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
draggable: true, draggable: true,
position: center, position: center,
content: this.newPositionMarkerContentBtn, content: this.newPositionMarkerContentBtn,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.positionLngLat = {x: center.lng || center[0], y: center.lat || center[1]} this.positionLngLat = {x: center.lng || center[0], y: center.lat || center[1]}
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
this.isMapLabel = true this.isMapLabel = true
this.newPositionMarker.on('dragend', (e)=>{ this.newPositionMarker.on('dragend', (e)=>{
this.positionLngLat = {x: e.lnglat.lng, y: e.lnglat.lat} this.positionLngLat = {x: e.lnglat.lng, y: e.lnglat.lat}
}) },this)
//点击确定 //点击确定
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{ this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{
this.isGisTopBox = false this.isGisTopBox = false
this.map.remove(this.newPositionMarker) this.map.remove(this.newPositionMarker)
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.positionLngLat.x,this.positionLngLat.y], position: [this.positionLngLat.x,this.positionLngLat.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat)) this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat))
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -606,10 +610,10 @@ export class WaterCollectionComponent implements OnInit {
this.positionLngLat = {} this.positionLngLat = {}
this.atLastPositionLngLat = {} this.atLastPositionLngLat = {}
}else{ }else{
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y], position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点 this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -620,10 +624,10 @@ export class WaterCollectionComponent implements OnInit {
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'touchstart',(event)=>{ this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'touchstart',(event)=>{
this.isGisTopBox = false this.isGisTopBox = false
this.map.remove(this.newPositionMarker) this.map.remove(this.newPositionMarker)
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.positionLngLat.x,this.positionLngLat.y], position: [this.positionLngLat.x,this.positionLngLat.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat)) this.atLastPositionLngLat = JSON.parse(JSON.stringify(this.positionLngLat))
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -637,10 +641,10 @@ export class WaterCollectionComponent implements OnInit {
this.positionLngLat = {} this.positionLngLat = {}
this.atLastPositionLngLat = {} this.atLastPositionLngLat = {}
}else{ }else{
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y], position: [this.atLastPositionLngLat.x,this.atLastPositionLngLat.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18) offset: MapFactory.PixelInstance(-15, -18)
}); });
this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点 this.map.setCenter([this.atLastPositionLngLat.x,this.atLastPositionLngLat.y]); //设置地图中心点
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);

41
src/app/external-links-plan/external-links-plan.component.ts

@ -73,38 +73,17 @@ export class ExternalLinksPlanComponent implements OnInit {
iframeSrc//毕生服务器链接 iframeSrc//毕生服务器链接
src//文件存储地址 src//文件存储地址
lookWord() { lookWord() {
let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + this.fetchUrl);
let docId = CryptoJS.enc.Base64.stringify(docIdWordArray);
let jwt = sessionStorage.getItem("token");
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]);
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt);
let identityJsonparse = JSON.parse(identityJson)
let filename: string
this.http.get(`/api/ObjectMetadata/PlanPlatform/${this.fetchUrl}`).subscribe((data: any) => {
filename = data.fileName
let json = {
doc: {
docId: docId,
title: filename,
//title: filename,
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/` + this.fetchUrl
},
user: {
uid: identityJsonparse.sub,
nickName: identityJsonparse.name,
avatar: "",
privilege: [
'FILE_READ', 'FILE_DOWNLOAD', 'FILE_PRINT'
],
},
}
var stringjson = JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
this.src = `http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`
this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
this.showType = 0 this.showType = 0
}) let src
let suffix = this.fetchUrl.split('.')[this.fetchUrl.split('.').length - 1].toLowerCase()
if (suffix == 'docx' || suffix == 'doc') {
let arr = this.fetchUrl.split('.')
arr[arr.length - 1] = 'pdf'
src = `/api/Objects/PlanPlatform/` + arr.join('.')
}else if (suffix == 'pdf') {
src = `/api/Objects/PlanPlatform/` + this.fetchUrl
}
this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(src);
} }
companyData//当前公司信息 companyData//当前公司信息

322
src/app/gis-management/gis-labeling/gis-labeling.component.ts

@ -3,8 +3,11 @@ import { Component, OnInit ,Renderer2,ElementRef, Inject, NgZone, ViewChild } fr
import { FormBuilder, FormGroup, FormControl } from '@angular/forms'; import { FormBuilder, FormGroup, FormControl } from '@angular/forms';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import { ICircle, IDriving, IMap, IMouseTool } from '@src/modules/map/declare/map';
import { MapFactory } from '../../../modules/map/declare/factory'
declare var AMap: any; declare var AMap: any;
declare var QRCode: any; declare var QRCode: any;
@Component({ @Component({
selector: 'app-gis-labeling', selector: 'app-gis-labeling',
templateUrl: './gis-labeling.component.html', templateUrl: './gis-labeling.component.html',
@ -155,8 +158,6 @@ export class GisLabelingComponent implements OnInit {
}) })
} }
//构造重点单位checkbox控制器 //构造重点单位checkbox控制器
buildUnits() { buildUnits() {
const arr = this.keyUnitList.map(item => { const arr = this.keyUnitList.map(item => {
@ -210,7 +211,7 @@ export class GisLabelingComponent implements OnInit {
}) })
} }
//地图范围圆圈---重点单位 //地图范围圆圈---重点单位
circle = new AMap.Circle({ circle:ICircle = MapFactory.CircleInstance({
center: null, center: null,
radius: 0, //半径 radius: 0, //半径
strokeOpacity: 1, strokeOpacity: 1,
@ -222,7 +223,7 @@ export class GisLabelingComponent implements OnInit {
zIndex: 50, zIndex: 50,
}) })
//地图范围圆圈---水源 //地图范围圆圈---水源
circleofwater = new AMap.Circle({ circleofwater:ICircle = MapFactory.CircleInstance({
center: null, center: null,
radius: 0, //半径 radius: 0, //半径
strokeOpacity: 1, strokeOpacity: 1,
@ -234,7 +235,7 @@ export class GisLabelingComponent implements OnInit {
zIndex: 50, zIndex: 50,
}) })
//地图范围圆圈---消防力量 //地图范围圆圈---消防力量
circleoffireForce = new AMap.Circle({ circleoffireForce:ICircle = MapFactory.CircleInstance({
center: null, center: null,
radius: 0, //半径 radius: 0, //半径
strokeOpacity: 1, strokeOpacity: 1,
@ -246,7 +247,7 @@ export class GisLabelingComponent implements OnInit {
zIndex: 50, zIndex: 50,
}) })
//地图范围圆圈---联动力量 //地图范围圆圈---联动力量
circleoflinkageForces = new AMap.Circle({ circleoflinkageForces:ICircle = MapFactory.CircleInstance({
center: null, center: null,
radius: 0, //半径 radius: 0, //半径
strokeOpacity: 1, strokeOpacity: 1,
@ -274,7 +275,7 @@ export class GisLabelingComponent implements OnInit {
this.circle.setCenter(this.markers[0]._position) this.circle.setCenter(this.markers[0]._position)
this.circle.setMap(this.map) this.circle.setMap(this.map)
let Distance let Distance
let lnglat = new AMap.LngLat(this.selectedUnit.location.x, this.selectedUnit.location.y) // lng, lat 替换成传入的坐标 let lnglat = MapFactory.LngLatInstance(this.selectedUnit.location.x, this.selectedUnit.location.y) // lng, lat 替换成传入的坐标
if (this.unitAreaDefault == '0') { if (this.unitAreaDefault == '0') {
this.circle.setRadius(this.Calculationofdistance(this.map.getBounds()) / 2) this.circle.setRadius(this.Calculationofdistance(this.map.getBounds()) / 2)
Distance = Math.abs(lnglat.offset(0, this.Calculationofdistance(this.map.getBounds()) / 2).lat - this.selectedUnit.location.y) Distance = Math.abs(lnglat.offset(0, this.Calculationofdistance(this.map.getBounds()) / 2).lat - this.selectedUnit.location.y)
@ -362,11 +363,13 @@ export class GisLabelingComponent implements OnInit {
data: item data: item
}) })
}) })
this.map.plugin(["AMap.MarkerClusterer"],() => {
var gridSize = 60 var gridSize = 60
var count = unitMarkerArrcluster.length; var count = unitMarkerArrcluster.length;
var _renderClusterMarker = function (context) {
var factor = Math.pow(context.count / count, 1 / 18); let render = MapFactory.RenderClusterMarkerInstance();
render.contentRender = (contextCount) => {
var factor = Math.pow(contextCount / count, 1 / 18);
var div = document.createElement('div'); var div = document.createElement('div');
var Hue = 180 - factor * 180; var Hue = 180 - factor * 180;
var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)'; var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)';
@ -374,29 +377,32 @@ export class GisLabelingComponent implements OnInit {
var borderColor = 'hsla(' + Hue + ',100%,40%,1)'; var borderColor = 'hsla(' + Hue + ',100%,40%,1)';
var shadowColor = 'hsla(' + Hue + ',100%,90%,1)'; var shadowColor = 'hsla(' + Hue + ',100%,90%,1)';
div.style.backgroundColor = bgColor; div.style.backgroundColor = bgColor;
var size = Math.round(30 + Math.pow(context.count / count, 1 / 5) * 20); var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
div.style.width = div.style.height = size + 'px'; div.style.width = div.style.height = size + 'px';
div.style.border = 'solid 1px ' + borderColor; div.style.border = 'solid 1px ' + borderColor;
div.style.borderRadius = size / 2 + 'px'; div.style.borderRadius = size / 2 + 'px';
div.style.boxShadow = '0 0 5px ' + shadowColor; div.style.boxShadow = '0 0 5px ' + shadowColor;
div.innerHTML = context.count; div.innerHTML = contextCount;
div.style.lineHeight = size + 'px'; div.style.lineHeight = size + 'px';
div.style.color = fontColor; div.style.color = fontColor;
div.style.fontSize = '14px'; div.style.fontSize = '14px';
div.style.textAlign = 'center'; div.style.textAlign = 'center';
context.marker.setOffset(new AMap.Pixel(-size / 2, -size / 2)); return div;
context.marker.setContent(div) };
render.pixelRender = (contextCount) => {
var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
return MapFactory.PixelInstance(-size / 2, -size / 2);
}; };
var _renderMarker = (context)=> {
var content = `<img class='clusterImg' src="${context.data[0].image}" alt="">`; render.contentNonRender = (src) => {
var offset = new AMap.Pixel(-15, -15); return `<img class='clusterImgCollection' src="${src}" alt="">`;
context.marker.setContent(content) };
context.marker.setOffset(offset) render.pixelNonRender = () => {
return MapFactory.PixelInstance(-15, -15);
} }
this.unitCluster = new AMap.MarkerCluster(this.map, unitMarkerArrcluster, { this.unitCluster = MapFactory.MarkerClusterInstance(this.map, unitMarkerArrcluster, {
gridSize: gridSize, // 设置网格像素大小 gridSize: gridSize, // 设置网格像素大小
renderClusterMarker: _renderClusterMarker, // 自定义聚合点样式 render: render //自定义聚合点样式, 自定义非聚合点样式
renderMarker: _renderMarker, // 自定义非聚合点样式
}); });
this.unitCluster.on('click', (e) => { this.unitCluster.on('click', (e) => {
if (e.clusterData.length == 1) { if (e.clusterData.length == 1) {
@ -437,9 +443,9 @@ export class GisLabelingComponent implements OnInit {
</div> </div>
</div>` </div>`
// 创建一个自定义内容的 infowindow 实例 // 创建一个自定义内容的 infowindow 实例
this.infoWindow = new AMap.InfoWindow({ this.infoWindow = MapFactory.InfoWindowInstance({
position: [item.location.x, item.location.y], position: [item.location.x, item.location.y],
offset: new AMap.Pixel(0, -30), offset: MapFactory.PixelInstance(0, -30),
content: markerContent, content: markerContent,
}); });
this.infoWindow.open(this.map); this.infoWindow.open(this.map);
@ -450,8 +456,8 @@ export class GisLabelingComponent implements OnInit {
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#seePlan'), 'click', (event) => { this.seePlan(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) })//分享点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#share'), 'click', (event) => { this.share(item) })//分享点击事件
} }
}) },this)
});
} }
//取消显示单位 //取消显示单位
@ -459,7 +465,7 @@ export class GisLabelingComponent implements OnInit {
this.keyUnitForm.reset() this.keyUnitForm.reset()
this.keyUnitForm.controls.areaUnit.setValue('-1') this.keyUnitForm.controls.areaUnit.setValue('-1')
this.map.remove(this.circle) this.map.remove(this.circle)
this.unitCluster.setData([]) this.unitCluster ? this.unitCluster.setData([]) : null
} }
@ -478,7 +484,7 @@ export class GisLabelingComponent implements OnInit {
this.circleoffireForce.setCenter(this.markers[0]._position) this.circleoffireForce.setCenter(this.markers[0]._position)
this.circleoffireForce.setMap(this.map) this.circleoffireForce.setMap(this.map)
let Distance let Distance
let lnglat = new AMap.LngLat(this.selectedUnit.location.x, this.selectedUnit.location.y) // lng, lat 替换成传入的坐标 let lnglat = MapFactory.LngLatInstance(this.selectedUnit.location.x, this.selectedUnit.location.y) // lng, lat 替换成传入的坐标
if (this.fireForceAreaDefault == '0') { if (this.fireForceAreaDefault == '0') {
this.circleoffireForce.setRadius(this.Calculationofdistance(this.map.getBounds()) / 2) this.circleoffireForce.setRadius(this.Calculationofdistance(this.map.getBounds()) / 2)
Distance = Math.abs(lnglat.offset(0, this.Calculationofdistance(this.map.getBounds()) / 2).lat - this.selectedUnit.location.y) Distance = Math.abs(lnglat.offset(0, this.Calculationofdistance(this.map.getBounds()) / 2).lat - this.selectedUnit.location.y)
@ -533,11 +539,13 @@ export class GisLabelingComponent implements OnInit {
data: item data: item
}) : null }) : null
}) })
this.map.plugin(["AMap.MarkerClusterer"],() => {
var gridSize = 60 var gridSize = 60
var count = fireForceMarkerArrcluster.length; var count = fireForceMarkerArrcluster.length;
var _renderClusterMarker = function (context) {
var factor = Math.pow(context.count / count, 1 / 18); let render = MapFactory.RenderClusterMarkerInstance();
render.contentRender = (contextCount) => {
var factor = Math.pow(contextCount / count, 1 / 18);
var div = document.createElement('div'); var div = document.createElement('div');
var Hue = 180 - factor * 180; var Hue = 180 - factor * 180;
var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)'; var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)';
@ -545,38 +553,41 @@ export class GisLabelingComponent implements OnInit {
var borderColor = 'hsla(' + Hue + ',100%,40%,1)'; var borderColor = 'hsla(' + Hue + ',100%,40%,1)';
var shadowColor = 'hsla(' + Hue + ',100%,90%,1)'; var shadowColor = 'hsla(' + Hue + ',100%,90%,1)';
div.style.backgroundColor = bgColor; div.style.backgroundColor = bgColor;
var size = Math.round(30 + Math.pow(context.count / count, 1 / 5) * 20); var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
div.style.width = div.style.height = size + 'px'; div.style.width = div.style.height = size + 'px';
div.style.border = 'solid 1px ' + borderColor; div.style.border = 'solid 1px ' + borderColor;
div.style.borderRadius = size / 2 + 'px'; div.style.borderRadius = size / 2 + 'px';
div.style.boxShadow = '0 0 5px ' + shadowColor; div.style.boxShadow = '0 0 5px ' + shadowColor;
div.innerHTML = context.count; div.innerHTML = contextCount;
div.style.lineHeight = size + 'px'; div.style.lineHeight = size + 'px';
div.style.color = fontColor; div.style.color = fontColor;
div.style.fontSize = '14px'; div.style.fontSize = '14px';
div.style.textAlign = 'center'; div.style.textAlign = 'center';
context.marker.setOffset(new AMap.Pixel(-size / 2, -size / 2)); return div;
context.marker.setContent(div) };
render.pixelRender = (contextCount) => {
var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
return MapFactory.PixelInstance(-size / 2, -size / 2);
};
render.contentNonRender = (src) => {
return `<img class='clusterImgCollection' src="${src}" alt="">`;
}; };
var _renderMarker = (context)=> { render.pixelNonRender = () => {
var content = `<img class='clusterImg' src="${context.data[0].image}" alt="">`; return MapFactory.PixelInstance(-15, -15);
var offset = new AMap.Pixel(-15, -15);
context.marker.setContent(content)
context.marker.setOffset(offset)
} }
this.fireForceCluster = new AMap.MarkerCluster(this.map, fireForceMarkerArrcluster, { this.fireForceCluster = MapFactory.MarkerClusterInstance(this.map, fireForceMarkerArrcluster, {
gridSize: gridSize, // 设置网格像素大小 gridSize: gridSize, // 设置网格像素大小
renderClusterMarker: _renderClusterMarker, // 自定义聚合点样式 render: render //自定义聚合点样式, 自定义非聚合点样式
renderMarker: _renderMarker, // 自定义非聚合点样式
});
}); });
} }
//取消消防力量 //取消消防力量
resetFireForce() { resetFireForce() {
this.fireForceForm.reset() this.fireForceForm.reset()
this.fireForceForm.controls.areaFireForce.setValue('-1') this.fireForceForm.controls.areaFireForce.setValue('-1')
this.map.remove(this.circleoffireForce) this.map.remove(this.circleoffireForce)
this.fireForceCluster.setData([]) this.fireForceCluster ? this.fireForceCluster.setData([]) : null
} }
@ -599,7 +610,7 @@ export class GisLabelingComponent implements OnInit {
this.circleoflinkageForces.setCenter(this.markers[0]._position) this.circleoflinkageForces.setCenter(this.markers[0]._position)
this.circleoflinkageForces.setMap(this.map) this.circleoflinkageForces.setMap(this.map)
let Distance let Distance
let lnglat = new AMap.LngLat(this.selectedUnit.location.x, this.selectedUnit.location.y) // lng, lat 替换成传入的坐标 let lnglat = MapFactory.LngLatInstance(this.selectedUnit.location.x, this.selectedUnit.location.y) // lng, lat 替换成传入的坐标
if (this.linkageForcesAreaDefault == '0') { if (this.linkageForcesAreaDefault == '0') {
this.circleoflinkageForces.setRadius(this.Calculationofdistance(this.map.getBounds()) / 2) this.circleoflinkageForces.setRadius(this.Calculationofdistance(this.map.getBounds()) / 2)
Distance = Math.abs(lnglat.offset(0, this.Calculationofdistance(this.map.getBounds()) / 2).lat - this.selectedUnit.location.y) Distance = Math.abs(lnglat.offset(0, this.Calculationofdistance(this.map.getBounds()) / 2).lat - this.selectedUnit.location.y)
@ -676,11 +687,13 @@ export class GisLabelingComponent implements OnInit {
} }
// 用于点集合的数组 // 用于点集合的数组
}) })
this.map.plugin(["AMap.MarkerClusterer"],() => {
var gridSize = 60 var gridSize = 60
var count = linkageForcesMarkerArrcluster.length; var count = linkageForcesMarkerArrcluster.length;
var _renderClusterMarker = function (context) {
var factor = Math.pow(context.count / count, 1 / 18); let render = MapFactory.RenderClusterMarkerInstance();
render.contentRender = (contextCount) => {
var factor = Math.pow(contextCount / count, 1 / 18);
var div = document.createElement('div'); var div = document.createElement('div');
var Hue = 180 - factor * 180; var Hue = 180 - factor * 180;
var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)'; var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)';
@ -688,38 +701,42 @@ export class GisLabelingComponent implements OnInit {
var borderColor = 'hsla(' + Hue + ',100%,40%,1)'; var borderColor = 'hsla(' + Hue + ',100%,40%,1)';
var shadowColor = 'hsla(' + Hue + ',100%,90%,1)'; var shadowColor = 'hsla(' + Hue + ',100%,90%,1)';
div.style.backgroundColor = bgColor; div.style.backgroundColor = bgColor;
var size = Math.round(30 + Math.pow(context.count / count, 1 / 5) * 20); var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
div.style.width = div.style.height = size + 'px'; div.style.width = div.style.height = size + 'px';
div.style.border = 'solid 1px ' + borderColor; div.style.border = 'solid 1px ' + borderColor;
div.style.borderRadius = size / 2 + 'px'; div.style.borderRadius = size / 2 + 'px';
div.style.boxShadow = '0 0 5px ' + shadowColor; div.style.boxShadow = '0 0 5px ' + shadowColor;
div.innerHTML = context.count; div.innerHTML = contextCount;
div.style.lineHeight = size + 'px'; div.style.lineHeight = size + 'px';
div.style.color = fontColor; div.style.color = fontColor;
div.style.fontSize = '14px'; div.style.fontSize = '14px';
div.style.textAlign = 'center'; div.style.textAlign = 'center';
context.marker.setOffset(new AMap.Pixel(-size / 2, -size / 2)); return div;
context.marker.setContent(div) };
render.pixelRender = (contextCount) => {
var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
return MapFactory.PixelInstance(-size / 2, -size / 2);
};
render.contentNonRender = (src) => {
return `<img class='clusterImgCollection' src="${src}" alt="">`;
}; };
var _renderMarker = (context)=> { render.pixelNonRender = () => {
var content = `<img class='clusterImg' src="${context.data[0].image}" alt="">`; return MapFactory.PixelInstance(-15, -15);
var offset = new AMap.Pixel(-15, -15);
context.marker.setContent(content)
context.marker.setOffset(offset)
} }
this.linkageForcesCluster = new AMap.MarkerCluster(this.map, linkageForcesMarkerArrcluster, {
this.linkageForcesCluster = MapFactory.MarkerClusterInstance(this.map, linkageForcesMarkerArrcluster, {
gridSize: gridSize, // 设置网格像素大小 gridSize: gridSize, // 设置网格像素大小
renderClusterMarker: _renderClusterMarker, // 自定义聚合点样式 render: render //自定义聚合点样式, 自定义非聚合点样式
renderMarker: _renderMarker, // 自定义非聚合点样式
});
}); });
} }
//取消联动力量 //取消联动力量
resetLinkageForces() { resetLinkageForces() {
this.linkageForcesForm.reset() this.linkageForcesForm.reset()
this.linkageForcesForm.controls.areaLinkageForces.setValue('-1') this.linkageForcesForm.controls.areaLinkageForces.setValue('-1')
this.map.remove(this.circleoflinkageForces) this.map.remove(this.circleoflinkageForces)
this.linkageForcesCluster.setData([]) this.linkageForcesCluster ? this.linkageForcesCluster.setData([]) : null
} }
@ -748,7 +765,7 @@ export class GisLabelingComponent implements OnInit {
this.circleofwater.setCenter(this.markers[0]._position) this.circleofwater.setCenter(this.markers[0]._position)
this.circleofwater.setMap(this.map) this.circleofwater.setMap(this.map)
let Distance let Distance
let lnglat = new AMap.LngLat(this.selectedUnit.location.x, this.selectedUnit.location.y) // lng, lat 替换成传入的坐标 let lnglat = MapFactory.LngLatInstance(this.selectedUnit.location.x, this.selectedUnit.location.y) // lng, lat 替换成传入的坐标
//如果选择当前的视野范围算出查询半径 //如果选择当前的视野范围算出查询半径
if (this.waterAreaDefault == '0') { if (this.waterAreaDefault == '0') {
@ -816,11 +833,13 @@ export class GisLabelingComponent implements OnInit {
data: item data: item
}) })
}) })
this.map.plugin(["AMap.MarkerClusterer"],() => {
var gridSize = 60 var gridSize = 60
var count = waterMarkerArrcluster.length; var count = waterMarkerArrcluster.length;
var _renderClusterMarker = function (context) {
var factor = Math.pow(context.count / count, 1 / 18); let render = MapFactory.RenderClusterMarkerInstance();
render.contentRender = (contextCount) => {
var factor = Math.pow(contextCount / count, 1 / 18);
var div = document.createElement('div'); var div = document.createElement('div');
var Hue = 180 - factor * 180; var Hue = 180 - factor * 180;
var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)'; var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)';
@ -828,36 +847,73 @@ export class GisLabelingComponent implements OnInit {
var borderColor = 'hsla(' + Hue + ',100%,40%,1)'; var borderColor = 'hsla(' + Hue + ',100%,40%,1)';
var shadowColor = 'hsla(' + Hue + ',100%,90%,1)'; var shadowColor = 'hsla(' + Hue + ',100%,90%,1)';
div.style.backgroundColor = bgColor; div.style.backgroundColor = bgColor;
var size = Math.round(30 + Math.pow(context.count / count, 1 / 5) * 20); var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
div.style.width = div.style.height = size + 'px'; div.style.width = div.style.height = size + 'px';
div.style.border = 'solid 1px ' + borderColor; div.style.border = 'solid 1px ' + borderColor;
div.style.borderRadius = size / 2 + 'px'; div.style.borderRadius = size / 2 + 'px';
div.style.boxShadow = '0 0 5px ' + shadowColor; div.style.boxShadow = '0 0 5px ' + shadowColor;
div.innerHTML = context.count; div.innerHTML = contextCount;
div.style.lineHeight = size + 'px'; div.style.lineHeight = size + 'px';
div.style.color = fontColor; div.style.color = fontColor;
div.style.fontSize = '14px'; div.style.fontSize = '14px';
div.style.textAlign = 'center'; div.style.textAlign = 'center';
context.marker.setOffset(new AMap.Pixel(-size / 2, -size / 2)); return div;
context.marker.setContent(div)
}; };
var _renderMarker = (context)=> { render.pixelRender = (contextCount) => {
var content = `<img class='clusterImgCollection' src="${context.data[0].image}" alt="">`; var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
var offset = new AMap.Pixel(-15, -15); return MapFactory.PixelInstance(-size / 2, -size / 2);
context.marker.setContent(content) };
context.marker.setOffset(offset)
} render.contentNonRender = (src) => {
this.waterCluster = new AMap.MarkerCluster(this.map, waterMarkerArrcluster, { return `<img class='clusterImgCollection' src="${src}" alt="">`;
};
render.pixelNonRender = () => {
return MapFactory.PixelInstance(-15, -15);
}
// var _renderClusterMarker = function (context) {
// var factor = Math.pow(context.count / count, 1 / 18);
// var div = document.createElement('div');
// var Hue = 180 - factor * 180;
// var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)';
// var fontColor = 'hsla(' + Hue + ',100%,90%,1)';
// var borderColor = 'hsla(' + Hue + ',100%,40%,1)';
// var shadowColor = 'hsla(' + Hue + ',100%,90%,1)';
// div.style.backgroundColor = bgColor;
// var size = Math.round(30 + Math.pow(context.count / count, 1 / 5) * 20);
// div.style.width = div.style.height = size + 'px';
// div.style.border = 'solid 1px ' + borderColor;
// div.style.borderRadius = size / 2 + 'px';
// div.style.boxShadow = '0 0 5px ' + shadowColor;
// div.innerHTML = context.count;
// div.style.lineHeight = size + 'px';
// div.style.color = fontColor;
// div.style.fontSize = '14px';
// div.style.textAlign = 'center';
// context.marker.setOffset(MapFactory.PixelInstance(-size / 2, -size / 2));
// context.marker.setContent(div)
// };
// var _renderMarker = (context) => {
// var content = `<img class='clusterImgCollection' src="${context.data[0].image}" alt="">`;
// var offset = MapFactory.PixelInstance(-15, -15);
// context.marker.setContent(content)
// context.marker.setOffset(offset)
// }
this.waterCluster = MapFactory.MarkerClusterInstance(this.map, waterMarkerArrcluster, {
gridSize: gridSize, // 设置网格像素大小 gridSize: gridSize, // 设置网格像素大小
renderClusterMarker: _renderClusterMarker, // 自定义聚合点样式 render: render //自定义聚合点样式, 自定义非聚合点样式
renderMarker: _renderMarker, // 自定义非聚合点样式
}); });
// this.waterCluster = new AMap.MarkerCluster(this.map, waterMarkerArrcluster, {
// gridSize: gridSize, // 设置网格像素大小
// renderClusterMarker: _renderClusterMarker, // 自定义聚合点样式
// renderMarker: _renderMarker, // 自定义非聚合点样式
// });
this.waterCluster.on('click', (e) => { this.waterCluster.on('click', (e) => {
if (e.clusterData.length == 1) { if (e.clusterData.length == 1) {
} }
}) },this)
});
} }
//取消显示水源 //取消显示水源
@ -865,7 +921,7 @@ export class GisLabelingComponent implements OnInit {
this.watertForm.reset() this.watertForm.reset()
this.watertForm.controls.areaWater.setValue('-1') this.watertForm.controls.areaWater.setValue('-1')
this.map.remove(this.circleofwater) this.map.remove(this.circleofwater)
this.waterCluster.setData([]) this.waterCluster ? this.waterCluster.setData([]) : null
} }
@ -874,8 +930,7 @@ export class GisLabelingComponent implements OnInit {
let p1 = [bounds.northEast.lng, bounds.northEast.lat]; let p1 = [bounds.northEast.lng, bounds.northEast.lat];
let p2 = [bounds.northEast.lng, bounds.southWest.lat]; let p2 = [bounds.northEast.lng, bounds.southWest.lat];
// 返回 p1 到 p2 间的地面距离,单位:米 // 返回 p1 到 p2 间的地面距离,单位:米
let dis = AMap.GeometryUtil.distance(p1, p2); return this.map.distance(p1, p2);
return dis
} }
//全选重点单位 //全选重点单位
@ -927,14 +982,14 @@ export class GisLabelingComponent implements OnInit {
} }
//卫星图层 //卫星图层
satelliteLayer = new AMap.TileLayer.Satellite(); satelliteLayer = MapFactory.TileLayerInstance().Satellite();
satelliteModel: boolean = false satelliteModel: boolean = false
satelliteChange(e) { satelliteChange(e) {
e.checked ? this.map.add(this.satelliteLayer) : this.map.remove(this.satelliteLayer); e.checked ? this.map.add(this.satelliteLayer) : this.map.remove(this.satelliteLayer);
} }
//路网图层 //路网图层
roadNetLayer = new AMap.TileLayer.RoadNet(); roadNetLayer = MapFactory.TileLayerInstance().RoadNet();
loadModel: boolean = false loadModel: boolean = false
loadChange(e) { loadChange(e) {
e.checked ? this.map.add(this.roadNetLayer) : this.map.remove(this.roadNetLayer); e.checked ? this.map.add(this.roadNetLayer) : this.map.remove(this.roadNetLayer);
@ -955,7 +1010,7 @@ export class GisLabelingComponent implements OnInit {
this.showLeftDiv = false this.showLeftDiv = false
} }
map:any //地图 map: IMap //地图
markers: any = []; //markers标注 markers: any = []; //markers标注
//地图2D 3D切换 //地图2D 3D切换
@ -970,7 +1025,7 @@ export class GisLabelingComponent implements OnInit {
} else { } else {
this.unitCluster ? this.unitCluster.setData([]) : null this.unitCluster ? this.unitCluster.setData([]) : null
this.mapPattern = false this.mapPattern = false
this.map = new AMap.Map('map',{ this.map = MapFactory.MapInstance('map', {
viewMode: '3D', viewMode: '3D',
pitch: 60, pitch: 60,
rotation: -35, rotation: -35,
@ -986,24 +1041,19 @@ export class GisLabelingComponent implements OnInit {
//地图初始化 //地图初始化
mapInit() { mapInit() {
let that = this let that = this
var layer = new AMap.createDefaultLayer({ var layer = MapFactory.LayerInstance({
zooms: [3, 20], //可见级别 zooms: [3, 20], //可见级别
visible: true, //是否可见 visible: true, //是否可见
opacity: 1, //透明度 opacity: 1, //透明度
zIndex: 0, //叠加层级 zIndex: 0, //叠加层级
resizeEnable: true //是否监控地图容器尺寸变化, resizeEnable: true //是否监控地图容器尺寸变化,
}) })
that.map = new AMap.Map('map',{ that.map = MapFactory.MapInstance('map', {
layers:[layer], //当只想显示标准图层时layers属性可缺省, layers: [layer],
WebGLParams: { WebGLParams: {preserveDrawingBuffer: true}
preserveDrawingBuffer: true
}
}); });
that.map.setCity('上海市'); that.map.setCity('上海市');
AMap.plugin(["AMap.RangingTool", "AMap.MouseTool"],function () { that.mouseTool = MapFactory.MouseToolInstance(that.map);
that.mouseTool=new AMap.MouseTool(that.map);
});
} }
@ -1013,7 +1063,7 @@ export class GisLabelingComponent implements OnInit {
measureDistance; //测距离 measureDistance; //测距离
distanceList = []; //测距离 点和线 distanceList = []; //测距离 点和线
measureArea; //测面积 measureArea; //测面积
mouseTool;//二合一测距和侧面积 mouseTool:IMouseTool;//二合一测距和侧面积
checkRadio = false //判断测距和侧面积是否选中 checkRadio = false //判断测距和侧面积是否选中
//测距离 开始 //测距离 开始
@ -1035,17 +1085,7 @@ export class GisLabelingComponent implements OnInit {
//清空距离测量 //清空距离测量
clearDistance() { clearDistance() {
this.distanceList.forEach(item=>{
if (item.className == 'AMap.Marker') {
let parent = item.dom.parentNode
let children = item.dom.nextElementSibling
parent && children? parent.removeChild(item.dom.nextElementSibling) : null
this.map.remove(item)
} else {
this.map.remove(item)
}
})
this.distanceList = [] //清空数组
} }
//清空面积测量 //清空面积测量
@ -1058,27 +1098,27 @@ export class GisLabelingComponent implements OnInit {
case 'rule': { case 'rule': {
this.mouseTool.rule({ this.mouseTool.rule({
startMarkerOptions: {//可缺省 startMarkerOptions: {//可缺省
icon: new AMap.Icon({ icon: MapFactory.IconInstance({
size: new AMap.Size(19, 31),//图标大小 size: MapFactory.SizeInstance(19, 31),//图标大小
imageSize:new AMap.Size(19, 31), imageSize: MapFactory.SizeInstance(19, 31),
image: "https://webapi.amap.com/theme/v1.3/markers/b/start.png" image: "https://webapi.amap.com/theme/v1.3/markers/b/start.png"
}) })
}, },
endMarkerOptions: {//可缺省 endMarkerOptions: {//可缺省
icon: new AMap.Icon({ icon: MapFactory.IconInstance({
size: new AMap.Size(19, 31),//图标大小 size: MapFactory.SizeInstance(19, 31),//图标大小
imageSize:new AMap.Size(19, 31), imageSize: MapFactory.SizeInstance(19, 31),
image: "https://webapi.amap.com/theme/v1.3/markers/b/end.png" image: "https://webapi.amap.com/theme/v1.3/markers/b/end.png"
}), }),
offset: new AMap.Pixel(-9, -31) offset: MapFactory.PixelInstance(-9, -31)
}, },
midMarkerOptions: {//可缺省 midMarkerOptions: {//可缺省
icon: new AMap.Icon({ icon: MapFactory.IconInstance({
size: new AMap.Size(19, 31),//图标大小 size: MapFactory.SizeInstance(19, 31),//图标大小
imageSize:new AMap.Size(19, 31), imageSize: MapFactory.SizeInstance(19, 31),
image: "https://webapi.amap.com/theme/v1.3/markers/b/mid.png" image: "https://webapi.amap.com/theme/v1.3/markers/b/mid.png"
}), }),
offset: new AMap.Pixel(-9, -31) offset: MapFactory.PixelInstance(-9, -31)
}, },
lineOptions: {//可缺省 lineOptions: {//可缺省
strokeStyle: "solid", strokeStyle: "solid",
@ -1139,7 +1179,7 @@ export class GisLabelingComponent implements OnInit {
this.markers.forEach((element, index) => { this.map.remove(element); }); //先删除所有标点 this.markers.forEach((element, index) => { this.map.remove(element); }); //先删除所有标点
this.markers = [] this.markers = []
let marker = new AMap.Marker({ let marker = MapFactory.MarkerInstance({
map: this.map, map: this.map,
position: [e.location.x, e.location.y], // 基点位置, position: [e.location.x, e.location.y], // 基点位置,
}); });
@ -1180,9 +1220,9 @@ export class GisLabelingComponent implements OnInit {
</div> </div>
</div>` </div>`
// 创建一个自定义内容的 infowindow 实例 // 创建一个自定义内容的 infowindow 实例
this.infoWindow = new AMap.InfoWindow({ this.infoWindow = MapFactory.InfoWindowInstance({
position: [e.location.x, e.location.y], position: [e.location.x, e.location.y],
offset: new AMap.Pixel(0, -30), offset: MapFactory.PixelInstance(0, -30),
content: markerContent, content: markerContent,
}); });
this.infoWindow.open(this.map); this.infoWindow.open(this.map);
@ -1193,9 +1233,9 @@ export class GisLabelingComponent implements OnInit {
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#seePlan'), 'click', (event) => { this.seePlan(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.renderer2.listen(this.elementRef.nativeElement.querySelector('#share'), 'click', (event) => { this.share(e) })//分享点击事件
marker.on('click', (ev) => { //marker点击事件 marker.on('click', (ev) => { //marker点击事件
this.infoWindow = new AMap.InfoWindow({ this.infoWindow = MapFactory.InfoWindowInstance({
position: [e.location.x, e.location.y], position: [e.location.x, e.location.y],
offset: new AMap.Pixel(0, -30), offset: MapFactory.PixelInstance(0, -30),
content: markerContent, content: markerContent,
}); });
this.infoWindow.open(this.map); this.infoWindow.open(this.map);
@ -1229,7 +1269,7 @@ export class GisLabelingComponent implements OnInit {
this.showLeftDiv = false this.showLeftDiv = false
this.isShowRouteGIS = true this.isShowRouteGIS = true
this.routeEnd = e.name this.routeEnd = e.name
this.endCoordinate = new AMap.LngLat(e.location.x, e.location.y) this.endCoordinate = MapFactory.LngLatInstance(e.location.x, e.location.y)
} }
//全景漫游 //全景漫游
@ -1267,7 +1307,8 @@ export class GisLabelingComponent implements OnInit {
width: '540px', width: '540px',
height: '596px', height: '596px',
id: 'shareDialog', id: 'shareDialog',
data}); data
});
dialogRef.afterClosed().subscribe((data) => { dialogRef.afterClosed().subscribe((data) => {
}); });
@ -1280,7 +1321,7 @@ export class GisLabelingComponent implements OnInit {
routeEnd: any; //终点 routeEnd: any; //终点
routeEndList: any = [] //终点 搜索结果 routeEndList: any = [] //终点 搜索结果
timeout: any; //延时器 timeout: any; //延时器
routeGIS:any; //查询结果 规划路线 routeGIS: IDriving; //查询结果 规划路线
selectType: boolean = true; //路线选择 推荐方案/躲避用拥堵 selectType: boolean = true; //路线选择 推荐方案/躲避用拥堵
//关闭导航路线 //关闭导航路线
@ -1295,11 +1336,10 @@ export class GisLabelingComponent implements OnInit {
this.timeout = window.setTimeout(() => { this.timeout = window.setTimeout(() => {
that.map.getCity(function (info) { //获取当前 city that.map.getCity(function (info) { //获取当前 city
AMap.plugin(['AMap.AutoComplete'], () =>{
var autoOptions = { city: info.city } var autoOptions = { city: info.city }
let keywords let keywords
e == 0 ? keywords = that.routeStart : keywords = that.routeEnd e == 0 ? keywords = that.routeStart : keywords = that.routeEnd
var autoComplete = new AMap.Autocomplete(autoOptions); var autoComplete = MapFactory.AutocompleteInstance(autoOptions,that);
autoComplete.search(keywords, function (status, result) { autoComplete.search(keywords, function (status, result) {
if (result && result.tips && result.tips.length) { //搜索到数据时 if (result && result.tips && result.tips.length) { //搜索到数据时
that._ngZone.run(() => { that._ngZone.run(() => {
@ -1309,20 +1349,19 @@ export class GisLabelingComponent implements OnInit {
for (let index = 0; index < result.tips.length; index++) { for (let index = 0; index < result.tips.length; index++) {
const element = result.tips[index]; const element = result.tips[index];
if (element.location) { if (element.location) {
that.startCoordinate = new AMap.LngLat(element.location.lng, element.location.lat) that.startCoordinate = MapFactory.LngLatInstance(element.location.lng, element.location.lat)
return return
} }
} }
} }
} else {//终点 } else {//终点
that.routeEndList = result.tips that.routeEndList = result.tips
that.endCoordinate = new AMap.LngLat(result.tips[0].location.lng, result.tips[0].location.lat) that.endCoordinate = MapFactory.LngLatInstance(result.tips[0].location.lng, result.tips[0].location.lat)
} }
}); });
} //if } //if
}) })
})
}); //获取当前 city }); //获取当前 city
}, 500) }, 500)
@ -1377,7 +1416,7 @@ export class GisLabelingComponent implements OnInit {
let that = this let that = this
this.selectType = true this.selectType = true
this.routeGIS ? this.routeGIS.clear() : null this.routeGIS ? this.routeGIS.clear() : null
this.routeGIS = new AMap.Driving({ this.routeGIS = MapFactory.DrivingInstance({
map: this.map, map: this.map,
}); });
if (!this.startCoordinate) { if (!this.startCoordinate) {
@ -1386,14 +1425,14 @@ export class GisLabelingComponent implements OnInit {
config.duration = 3000 config.duration = 3000
this.snackBar.open('未查询到起点坐标信息,请输入有效地址', '确定', config); this.snackBar.open('未查询到起点坐标信息,请输入有效地址', '确定', config);
return return
}else if(!this.startCoordinate){ } else if (!this.endCoordinate) {
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('未查询到终点坐标信息,请输入有效地址', '确定', config); this.snackBar.open('未查询到终点坐标信息,请输入有效地址', '确定', config);
return return
} else { } else {
this.routeGIS.search(this.startCoordinate,this.endCoordinate, this.routeGIS.search(this,this.startCoordinate, this.endCoordinate,
function (status, result) { function (status, result) {
if (status === 'complete') { if (status === 'complete') {
that.routes = result.routes[0] that.routes = result.routes[0]
@ -1410,13 +1449,13 @@ export class GisLabelingComponent implements OnInit {
if (this.selectType != e) { if (this.selectType != e) {
this.selectType = e this.selectType = e
this.routeGIS ? this.routeGIS.clear() : null this.routeGIS ? this.routeGIS.clear() : null
this.routeGIS = new AMap.Driving({ this.routeGIS = MapFactory.DrivingInstance({
map: this.map, map: this.map,
policy: e == true ? AMap.DrivingPolicy.LEAST_TIME : AMap.DrivingPolicy.REAL_TRAFFIC policy: e == true ? AMap.DrivingPolicy.LEAST_TIME : AMap.DrivingPolicy.REAL_TRAFFIC
}); });
// 根据起终点名称规划驾车导航路线 // 根据起终点名称规划驾车导航路线
this.routeGIS.search(this.startCoordinate,this.endCoordinate, this.routeGIS.search(this,this.startCoordinate, this.endCoordinate,
function (status, result) { function (status, result) {
if (status === 'complete') { if (status === 'complete') {
that.routes = result.routes[0] that.routes = result.routes[0]
@ -1648,7 +1687,8 @@ export class LookPlanDialog {
let result = await new Promise((result, reject) => { let result = await new Promise((result, reject) => {
this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => { this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => {
result(data) }) result(data)
})
}) })
allFile.push(result) allFile.push(result)

2
src/app/home/home.component.ts

@ -1,8 +1,6 @@
import { Component, OnInit, Renderer2, ElementRef } from '@angular/core'; import { Component, OnInit, Renderer2, ElementRef } from '@angular/core';
import { HttpClient } from '@angular/common/http' import { HttpClient } from '@angular/common/http'
declare var echarts: any; declare var echarts: any;
declare var AMap: any;
declare var AMapUI: any;

21
src/app/key-unit/basicinfo-look/basicinfo.component.ts

@ -5,21 +5,16 @@ import { HttpClient, HttpHeaders, HttpEventType } from '@angular/common/http';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { AbstractControl, FormControl, NG_VALIDATORS, Validator } from '@angular/forms'; import { AbstractControl, FormControl, NG_VALIDATORS, Validator } from '@angular/forms';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import format from 'date-fns/format';
import { TreeService } from '../../http-interceptors/tree.service' import { TreeService } from '../../http-interceptors/tree.service'
import { FileUploader, FileItem } from 'ng2-file-upload' import { FileUploader, FileItem } from 'ng2-file-upload'
import { DomSanitizer } from '@angular/platform-browser' import { DomSanitizer } from '@angular/platform-browser'
import { Injectable } from "@angular/core"
import { filter } from 'rxjs/operators';
import { async } from '@angular/core/testing';
import { MatTableDataSource } from '@angular/material/table';
import { isNgTemplate } from '@angular/compiler';
import * as _ from 'lodash'; import * as _ from 'lodash';
import Swiper from 'swiper'; import Swiper from 'swiper';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { StatisticsOfFireFightingFacilities } from '../basicinfo/basicinfo.component'; import { StatisticsOfFireFightingFacilities } from '../basicinfo/basicinfo.component';
import Viewer from 'viewerjs'; import Viewer from 'viewerjs';
declare var AMap: any; import { IMap, IMarker } from '@src/modules/map/declare/map';
import { MapFactory } from '@src/modules/map/declare/factory';
@Component({ @Component({
selector: 'app-basicinfo-look', selector: 'app-basicinfo-look',
@ -131,11 +126,11 @@ export class BasicinfoLookComponent implements OnInit {
isMapLabel: boolean isMapLabel: boolean
//地图标注位置 //地图标注位置
markerPosition: any = { x: 0, y: 0 }//单位坐标 markerPosition: any = { x: 0, y: 0 }//单位坐标
map: any //地图实例 map: IMap //地图实例
isGisTopBox: boolean = false//点击位置按钮 isGisTopBox: boolean = false//点击位置按钮
isGisTopBoxTwo: boolean = false//点击位置按钮 isGisTopBoxTwo: boolean = false//点击位置按钮
oldPositionMarker: any //旧位置marker实例 oldPositionMarker: IMarker //旧位置marker实例
newPositionMarker: any //新位置marker实例 newPositionMarker: IMarker //新位置marker实例
newPositionMarkerContent: any = newPositionMarkerContent: any =
'<div class="custom-content-marker">' + '<div class="custom-content-marker">' +
@ -145,7 +140,7 @@ export class BasicinfoLookComponent implements OnInit {
//初始化地图 //初始化地图
labelGis() { labelGis() {
this.map = new AMap.Map('container', { this.map = MapFactory.MapInstance('container', {
zoom: 12 zoom: 12
}) })
this.map.on('complete', () => { this.map.on('complete', () => {
@ -156,10 +151,10 @@ export class BasicinfoLookComponent implements OnInit {
if (this.isMapLabel) {//如果已经标注单位坐标 if (this.isMapLabel) {//如果已经标注单位坐标
// console.log('已标注单位位置') // console.log('已标注单位位置')
this.map.setCenter([this.unitinfo.location.x, this.unitinfo.location.y]); this.map.setCenter([this.unitinfo.location.x, this.unitinfo.location.y]);
this.oldPositionMarker = new AMap.Marker({ this.oldPositionMarker = MapFactory.MarkerInstance({
position: [this.unitinfo.location.x, this.unitinfo.location.y], position: [this.unitinfo.location.x, this.unitinfo.location.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-34, -36) offset: MapFactory.PixelInstance(-34, -36)
}) })
// 将 markers 添加到地图 // 将 markers 添加到地图
this.map.add(this.oldPositionMarker); this.map.add(this.oldPositionMarker);

93
src/app/key-unit/basicinfo/basicinfo.component.ts

@ -5,23 +5,19 @@ import { HttpClient, HttpHeaders, HttpEventType } from '@angular/common/http';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { AbstractControl, FormControl, NG_VALIDATORS, Validator } from '@angular/forms'; import { AbstractControl, FormControl, NG_VALIDATORS, Validator } from '@angular/forms';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import format from 'date-fns/format';
import { TreeService } from '../../http-interceptors/tree.service' import { TreeService } from '../../http-interceptors/tree.service'
import { FileUploader, FileItem } from 'ng2-file-upload' import { FileUploader, FileItem } from 'ng2-file-upload'
import { AddHouseInfo } from './addhouseinfo.component' import { AddHouseInfo } from './addhouseinfo.component'
import { DomSanitizer } from '@angular/platform-browser' import { DomSanitizer } from '@angular/platform-browser'
import { Injectable } from "@angular/core"
import { filter } from 'rxjs/operators';
import { async } from '@angular/core/testing';
import { MatTableDataSource } from '@angular/material/table';
import { isNgTemplate } from '@angular/compiler';
import * as _ from 'lodash'; import * as _ from 'lodash';
import Swiper from 'swiper'; import Swiper from 'swiper';
import { LookMaster } from './lookmaster.component' import { LookMaster } from './lookmaster.component'
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { TabbarAndScoreService } from 'src/app/http-interceptors/tabbar-and-score.service'; import { TabbarAndScoreService } from 'src/app/http-interceptors/tabbar-and-score.service';
declare var AMap: any;
import Viewer from 'viewerjs'; import Viewer from 'viewerjs';
import { IMap, IMarker, IPlaceSearch } from '@src/modules/map/declare/map';
import { MapFactory } from '@src/modules/map/declare/factory';
@Component({ @Component({
selector: 'app-basicinfo', selector: 'app-basicinfo',
templateUrl: './basicinfo.component.html', templateUrl: './basicinfo.component.html',
@ -129,11 +125,11 @@ export class BasicinfoComponent implements OnInit {
isMapLabel: boolean isMapLabel: boolean
//地图标注位置 //地图标注位置
markerPosition: any = { x: 0, y: 0 }//单位坐标 markerPosition: any = { x: 0, y: 0 }//单位坐标
map: any //地图实例 map: IMap //地图实例
isGisTopBox: boolean = false//点击位置按钮 isGisTopBox: boolean = false//点击位置按钮
isGisTopBoxTwo: boolean = false//点击位置按钮 isGisTopBoxTwo: boolean = false//点击位置按钮
oldPositionMarker: any //旧位置marker实例 oldPositionMarker: IMarker //旧位置marker实例
newPositionMarker: any //新位置marker实例 newPositionMarker: IMarker //新位置marker实例
newPositionMarkerContent: any = newPositionMarkerContent: any =
'<div class="custom-content-marker">' + '<div class="custom-content-marker">' +
@ -152,7 +148,7 @@ export class BasicinfoComponent implements OnInit {
'</div>' '</div>'
//初始化地图 //初始化地图
searchTitle: any//搜索内容 searchTitle: any//搜索内容
placeSearch: any//地址搜索类 placeSearch: IPlaceSearch//地址搜索类
search() { search() {
this.placeSearch.search(this.searchTitle, (status, result) => { this.placeSearch.search(this.searchTitle, (status, result) => {
// 搜索成功时,result即是对应的匹配数据 // 搜索成功时,result即是对应的匹配数据
@ -169,7 +165,7 @@ export class BasicinfoComponent implements OnInit {
} }
//初始化地图 //初始化地图
labelGis() { labelGis() {
this.map = new AMap.Map('container', { this.map = MapFactory.MapInstance('container', {
zoom: 12 zoom: 12
}) })
this.map.on('complete', () => { this.map.on('complete', () => {
@ -179,26 +175,21 @@ export class BasicinfoComponent implements OnInit {
var autoOptions = { var autoOptions = {
input: "tipinput" input: "tipinput"
}; };
AMap.plugin(['AMap.PlaceSearch', 'AMap.AutoComplete'], () => { var auto = MapFactory.AutocompleteInstance(autoOptions,this);
var auto = new AMap.AutoComplete(autoOptions); this.placeSearch = MapFactory.PlaceSearchInstance(this); //构造地点查询类
this.placeSearch = new AMap.PlaceSearch(); //构造地点查询类
auto.on("select", (e) => { auto.on("select", (e) => {
// console.log(e)
// console.log( this.newPositionMarker)
this.newPositionMarker.setPosition([e.poi.location.lng, e.poi.location.lat]) this.newPositionMarker.setPosition([e.poi.location.lng, e.poi.location.lat])
this.markerPosition2 = { x: e.poi.location.lng, y: e.poi.location.lat } this.markerPosition2 = { x: e.poi.location.lng, y: e.poi.location.lat }
this.map.setCenter([e.poi.location.lng, e.poi.location.lat]); //设置地图中心点 this.map.setCenter([e.poi.location.lng, e.poi.location.lat]); //设置地图中心点
});//注册监听,当选中某条记录时会触发 });//注册监听,当选中某条记录时会触发
});
if (this.isMapLabel) {//如果已经标注单位坐标 if (this.isMapLabel) {//如果已经标注单位坐标
// console.log('已标注单位位置') // console.log('已标注单位位置')
this.map.setCenter([this.unitinfo.location.x, this.unitinfo.location.y]); this.map.setCenter([this.unitinfo.location.x, this.unitinfo.location.y]);
this.oldPositionMarker = new AMap.Marker({ this.oldPositionMarker = MapFactory.MarkerInstance({
position: [this.unitinfo.location.x, this.unitinfo.location.y], position: [this.unitinfo.location.x, this.unitinfo.location.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-34, -36) offset: MapFactory.PixelInstance(-34, -36)
}) })
// 将 markers 添加到地图 // 将 markers 添加到地图
this.map.add(this.oldPositionMarker); this.map.add(this.oldPositionMarker);
@ -222,11 +213,11 @@ export class BasicinfoComponent implements OnInit {
this.newPositionMarker.setContent(this.oldPositionMarkerContent) this.newPositionMarker.setContent(this.oldPositionMarkerContent)
} }
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
draggable: true, draggable: true,
position: [this.markerPosition.x, this.markerPosition.y], position: [this.markerPosition.x, this.markerPosition.y],
content: this.newPositionMarkerContentBtn, content: this.newPositionMarkerContentBtn,
offset: new AMap.Pixel(-34, -36) offset: MapFactory.PixelInstance(-34, -36)
}); });
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -237,24 +228,24 @@ export class BasicinfoComponent implements OnInit {
this.markerPosition2 = { x: this.map.getCenter().lng, y: this.map.getCenter().lat } //获取当前地图中心位置 this.markerPosition2 = { x: this.map.getCenter().lng, y: this.map.getCenter().lat } //获取当前地图中心位置
} }
this.newPositionMarker.on('dragend', (e) => { this.newPositionMarker.on('dragend', (e) => {
let lnglat = this.map.containerToLngLat(e.pixel) let lnglat = this.newPositionMarker.getLngLatByMarkerEvent(this.map,e);
this.markerPosition2 = { x: lnglat.KL, y: lnglat.kT } this.markerPosition2 = { x: lnglat.KL, y: lnglat.kT }
// console.log(`${lnglat.KL},${lnglat.kT}`); // console.log(`${lnglat.KL},${lnglat.kT}`);
}) },this)
this.newPositionMarker.on('dragging', (e) => { this.newPositionMarker.on('dragging', (e) => {
//console.log('dragging',e) //console.log('dragging',e)
let lnglat = this.map.containerToLngLat(e.pixel) let lnglat = this.newPositionMarker.getLngLatByMarkerEvent(this.map,e);
this.newPositionMarker.setPosition(lnglat); this.newPositionMarker.setPosition(lnglat);
}) },this)
//点击确定 //点击确定
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'), 'click', (event) => { this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'), 'click', (event) => {
this.map.clearMap(); this.map.clearMap();
this.isGisTopBox = true this.isGisTopBox = true
this.isGisTopBoxTwo = false this.isGisTopBoxTwo = false
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.markerPosition2.x, this.markerPosition2.y], position: [this.markerPosition2.x, this.markerPosition2.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-34, -36) offset: MapFactory.PixelInstance(-34, -36)
}); });
this.markerPosition = this.markerPosition2 this.markerPosition = this.markerPosition2
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -264,10 +255,10 @@ export class BasicinfoComponent implements OnInit {
this.isGisTopBox = true this.isGisTopBox = true
this.isGisTopBoxTwo = false this.isGisTopBoxTwo = false
this.map.clearMap(); this.map.clearMap();
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.markerPosition.x, this.markerPosition.y], position: [this.markerPosition.x, this.markerPosition.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-34, -36) offset: MapFactory.PixelInstance(-34, -36)
}); });
this.map.setCenter([this.markerPosition.x, this.markerPosition.y]); //设置地图中心点 this.map.setCenter([this.markerPosition.x, this.markerPosition.y]); //设置地图中心点
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -277,10 +268,10 @@ export class BasicinfoComponent implements OnInit {
this.map.clearMap(); this.map.clearMap();
this.isGisTopBox = true this.isGisTopBox = true
this.isGisTopBoxTwo = false this.isGisTopBoxTwo = false
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.markerPosition2.x, this.markerPosition2.y], position: [this.markerPosition2.x, this.markerPosition2.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-34, -36) offset: MapFactory.PixelInstance(-34, -36)
}); });
this.markerPosition = this.markerPosition2 this.markerPosition = this.markerPosition2
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -290,10 +281,10 @@ export class BasicinfoComponent implements OnInit {
this.isGisTopBox = true this.isGisTopBox = true
this.isGisTopBoxTwo = false this.isGisTopBoxTwo = false
this.map.clearMap(); this.map.clearMap();
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.markerPosition.x, this.markerPosition.y], position: [this.markerPosition.x, this.markerPosition.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-34, -36) offset: MapFactory.PixelInstance(-34, -36)
}); });
this.map.setCenter([this.markerPosition.x, this.markerPosition.y]); //设置地图中心点 this.map.setCenter([this.markerPosition.x, this.markerPosition.y]); //设置地图中心点
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -311,11 +302,11 @@ export class BasicinfoComponent implements OnInit {
this.map.setCenter(center); this.map.setCenter(center);
} }
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
draggable: true, draggable: true,
position: center, position: center,
content: this.newPositionMarkerContentBtn, content: this.newPositionMarkerContentBtn,
offset: new AMap.Pixel(-34, -36) offset: MapFactory.PixelInstance(-34, -36)
}); });
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -326,25 +317,25 @@ export class BasicinfoComponent implements OnInit {
this.markerPosition2 = { x: this.map.getCenter().lng, y: this.map.getCenter().lat } //获取当前地图中心位置 this.markerPosition2 = { x: this.map.getCenter().lng, y: this.map.getCenter().lat } //获取当前地图中心位置
} }
this.newPositionMarker.on('dragend', (e) => { this.newPositionMarker.on('dragend', (e) => {
let lnglat = this.map.containerToLngLat(e.pixel) let lnglat = this.newPositionMarker.getLngLatByMarkerEvent(this.map,e)
this.markerPosition2 = { x: lnglat.KL, y: lnglat.kT } this.markerPosition2 = { x: lnglat.KL, y: lnglat.kT }
// console.log(`${lnglat.KL},${lnglat.kT}`); // console.log(`${lnglat.KL},${lnglat.kT}`);
}) },this)
this.newPositionMarker.on('dragging', (e) => { this.newPositionMarker.on('dragging', (e) => {
//console.log('dragging',e) //console.log('dragging',e)
let lnglat = this.map.containerToLngLat(e.pixel) let lnglat = this.newPositionMarker.getLngLatByMarkerEvent(this.map,e)
this.newPositionMarker.setPosition(lnglat); this.newPositionMarker.setPosition(lnglat);
}) },this)
//点击确定 //点击确定
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'), 'click', (event) => { this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'), 'click', (event) => {
this.isGisTopBox = true this.isGisTopBox = true
this.isGisTopBoxTwo = false this.isGisTopBoxTwo = false
this.markerPosition = this.markerPosition2 this.markerPosition = this.markerPosition2
this.map.clearMap(); this.map.clearMap();
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.markerPosition.x, this.markerPosition.y], position: [this.markerPosition.x, this.markerPosition.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-34, -36) offset: MapFactory.PixelInstance(-34, -36)
}); });
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
}) })
@ -353,10 +344,10 @@ export class BasicinfoComponent implements OnInit {
this.isGisTopBoxTwo = false this.isGisTopBoxTwo = false
this.markerPosition = this.markerPosition2 this.markerPosition = this.markerPosition2
this.map.clearMap(); this.map.clearMap();
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.markerPosition.x, this.markerPosition.y], position: [this.markerPosition.x, this.markerPosition.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-34, -36) offset: MapFactory.PixelInstance(-34, -36)
}); });
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
}) })
@ -365,10 +356,10 @@ export class BasicinfoComponent implements OnInit {
this.isGisTopBox = true this.isGisTopBox = true
this.isGisTopBoxTwo = false this.isGisTopBoxTwo = false
if (this.markerPosition.x && this.markerPosition.x != 0) {//说明之前标过点 if (this.markerPosition.x && this.markerPosition.x != 0) {//说明之前标过点
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.markerPosition.x, this.markerPosition.y], position: [this.markerPosition.x, this.markerPosition.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-34, -36) offset: MapFactory.PixelInstance(-34, -36)
}); });
this.map.setCenter([this.markerPosition.x, this.markerPosition.y]); //设置地图中心点 this.map.setCenter([this.markerPosition.x, this.markerPosition.y]); //设置地图中心点
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -379,10 +370,10 @@ export class BasicinfoComponent implements OnInit {
this.isGisTopBox = true this.isGisTopBox = true
this.isGisTopBoxTwo = false this.isGisTopBoxTwo = false
if (this.markerPosition.x && this.markerPosition.x != 0) {//说明之前标过点 if (this.markerPosition.x && this.markerPosition.x != 0) {//说明之前标过点
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.markerPosition.x, this.markerPosition.y], position: [this.markerPosition.x, this.markerPosition.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-34, -36) offset: MapFactory.PixelInstance(-34, -36)
}); });
this.map.setCenter([this.markerPosition.x, this.markerPosition.y]); //设置地图中心点 this.map.setCenter([this.markerPosition.x, this.markerPosition.y]); //设置地图中心点
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -1048,10 +1039,6 @@ export class BasicinfoComponent implements OnInit {
//提交建筑信息 //提交建筑信息
onSubmitBuildingInfo(value, item, key, invalid) { onSubmitBuildingInfo(value, item, key, invalid) {
// console.log(1,item)
// console.log(2,invalid)
// console.log(3,value)
// console.log(4,this.allunittype)
if (invalid) { if (invalid) {
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';

12
src/app/key-unit/function-division/function-division.component.ts

@ -133,12 +133,14 @@ export class FunctionDivisionComponent implements OnInit {
noDataList = [] //没有 创建功能分区 的建筑 noDataList = [] //没有 创建功能分区 的建筑
//获得所有建筑的功能分区 //获得所有建筑的功能分区
getAllBuildingFunctionalZoning () { async getAllBuildingFunctionalZoning () {
this.selectBuildingFunctionalZoning = [] this.selectBuildingFunctionalZoning = []
this.allBuildingFunctionalZoning = [] this.allBuildingFunctionalZoning = []
this.noDataList = [] this.noDataList = []
this.allBuilding.forEach((element,index) => { for (let index = 0; index < this.allBuilding.length; index++) {
const element = this.allBuilding[index];
let data={buildingId: element.id} let data={buildingId: element.id}
await new Promise((resolve,reject)=>{
this.http.get(`/api/BuildingFunctionalDivisions`,{params:data}).subscribe((data:any)=>{ this.http.get(`/api/BuildingFunctionalDivisions`,{params:data}).subscribe((data:any)=>{
if (data.length) { if (data.length) {
element.functionalZoning = data element.functionalZoning = data
@ -149,8 +151,12 @@ export class FunctionDivisionComponent implements OnInit {
this.noDataList.push(false) this.noDataList.push(false)
} }
if (this.noDataList.length === this.allBuilding.length) { this.addVoluntarilyPartition() } if (this.noDataList.length === this.allBuilding.length) { this.addVoluntarilyPartition() }
resolve(data)
}) })
}); })
}
} }
// 没有 创建 建筑功能分区时 自动创建 // 没有 创建 建筑功能分区时 自动创建

36
src/app/key-unit/router-gis/router-gis.component.ts

@ -2,6 +2,8 @@ import { HttpClient } from '@angular/common/http';
import { Component, EventEmitter, NgZone, OnInit, Output } from '@angular/core'; import { Component, EventEmitter, NgZone, OnInit, Output } from '@angular/core';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { MapFactory } from '@src/modules/map/declare/factory';
import { IDriving, IMap } from '@src/modules/map/declare/map';
declare var AMap: any; declare var AMap: any;
@Component({ @Component({
@ -31,14 +33,14 @@ export class RouterGISComponent implements OnInit {
this.http.get(`/api/Companies/${this.route.snapshot.queryParams.id}`).subscribe((data:any)=>{ this.http.get(`/api/Companies/${this.route.snapshot.queryParams.id}`).subscribe((data:any)=>{
if (data.driveRouteStartPoint && data.driveRouteStartPoint.x && data.driveRouteStartPoint.y && data.driveRouteStartName) { //开始坐标 名称 if (data.driveRouteStartPoint && data.driveRouteStartPoint.x && data.driveRouteStartPoint.y && data.driveRouteStartName) { //开始坐标 名称
this.routeStart = data.driveRouteStartName this.routeStart = data.driveRouteStartName
this.startCoordinate = [data.driveRouteStartPoint.x,data.driveRouteStartPoint.y] this.startCoordinate = MapFactory.LngLatInstance(data.driveRouteStartPoint.x, data.driveRouteStartPoint.y)
} }
if (data.driveRouteEndPoint && data.driveRouteEndPoint.x && data.driveRouteEndPoint.y && data.driveRouteEndName) { //结束坐标 名称 if (data.driveRouteEndPoint && data.driveRouteEndPoint.x && data.driveRouteEndPoint.y && data.driveRouteEndName) { //结束坐标 名称
this.routeEnd = data.driveRouteEndName this.routeEnd = data.driveRouteEndName
this.endCoordinate = [data.driveRouteEndPoint.x,data.driveRouteEndPoint.y] this.endCoordinate = MapFactory.LngLatInstance(data.driveRouteEndPoint.x, data.driveRouteEndPoint.y)
} else if (data.location && data.location.x && data.location.y) { } else if (data.location && data.location.x && data.location.y) {
this.routeEnd = data.name this.routeEnd = data.name
this.endCoordinate = [data.location.x,data.location.y] this.endCoordinate = MapFactory.LngLatInstance(data.location.x, data.location.y)
} }
resolve('success') resolve('success')
}) //http }) //http
@ -88,29 +90,27 @@ export class RouterGISComponent implements OnInit {
//地图初始化 //地图初始化
mapInit () { mapInit () {
let that = this let that = this
var layer = new AMap.createDefaultLayer({ var layer = MapFactory.LayerInstance({
zooms:[3,20], //可见级别 zooms:[3,20], //可见级别
visible:true, //是否可见 visible:true, //是否可见
opacity:1, //透明度 opacity:1, //透明度
zIndex:0, //叠加层级 zIndex:0, //叠加层级
resizeEnable: true //是否监控地图容器尺寸变化, resizeEnable: true //是否监控地图容器尺寸变化,
}) })
that.map = new AMap.Map('map',{ that.map = MapFactory.MapInstance('map',{
layers:[layer], //当只想显示标准图层时layers属性可缺省, layers:[layer], //当只想显示标准图层时layers属性可缺省,
}); });
that.map.setCity('上海市'); that.map.setCity('上海市');
AMap.plugin('AMap.Driving', function() {
that.startCoordinate && that.endCoordinate? that.queryGISRoute() : null that.startCoordinate && that.endCoordinate? that.queryGISRoute() : null
})
} }
map:any; //地图实例 map:IMap; //地图实例
routeStart:any; //起点 routeStart:any; //起点
routeStartList:any = [] //起点 搜索结果 routeStartList:any = [] //起点 搜索结果
routeEnd:any; //终点 routeEnd:any; //终点
routeEndList:any = [] //终点 搜索结果 routeEndList:any = [] //终点 搜索结果
timeout:any; //延时器 timeout:any; //延时器
routeGIS:any; //查询结果 规划路线 routeGIS:IDriving; //查询结果 规划路线
selectType:boolean = true; //路线选择 推荐方案/躲避用拥堵 selectType:boolean = true; //路线选择 推荐方案/躲避用拥堵
routes:any = { distance: 0, time: 0, steps: [], };//导航查询结果 路线规划 routes:any = { distance: 0, time: 0, steps: [], };//导航查询结果 路线规划
startCoordinate:any//开始坐标 startCoordinate:any//开始坐标
@ -123,11 +123,10 @@ export class RouterGISComponent implements OnInit {
this.timeout = window.setTimeout(()=>{ this.timeout = window.setTimeout(()=>{
that.map.getCity( function(info){ //获取当前 city that.map.getCity( function(info){ //获取当前 city
AMap.plugin(['AMap.AutoComplete'], () =>{
var autoOptions = {city: info.city} var autoOptions = {city: info.city}
let keywords let keywords
e == 0 ? keywords = that.routeStart : keywords = that.routeEnd e == 0 ? keywords = that.routeStart : keywords = that.routeEnd
var autoComplete = new AMap.Autocomplete(autoOptions); var autoComplete = MapFactory.AutocompleteInstance(autoOptions,that);
autoComplete.search(keywords, function(status, result) { autoComplete.search(keywords, function(status, result) {
if (result && result.tips && result.tips.length) { //搜索到数据时 if (result && result.tips && result.tips.length) { //搜索到数据时
that._ngZone.run(()=>{ that._ngZone.run(()=>{
@ -137,20 +136,19 @@ export class RouterGISComponent implements OnInit {
for (let index = 0; index < result.tips.length; index++) { for (let index = 0; index < result.tips.length; index++) {
const element = result.tips[index]; const element = result.tips[index];
if(element.location){ if(element.location){
that.startCoordinate = new AMap.LngLat(element.location.lng, element.location.lat) that.startCoordinate = MapFactory.LngLatInstance(element.location.lng, element.location.lat)
return return
} }
} }
} }
}else{ }else{
that.routeEndList = result.tips that.routeEndList = result.tips
that.endCoordinate = new AMap.LngLat(result.tips[0].location.lng, result.tips[0].location.lat) that.endCoordinate = MapFactory.LngLatInstance(result.tips[0].location.lng, result.tips[0].location.lat)
} }
}); });
} //if } //if
}) })
})
}); //获取当前 city }); //获取当前 city
},500) },500)
@ -201,7 +199,7 @@ export class RouterGISComponent implements OnInit {
let that = this let that = this
this.selectType = true this.selectType = true
this.routeGIS? this.routeGIS.clear() : null this.routeGIS? this.routeGIS.clear() : null
this.routeGIS = new AMap.Driving({ this.routeGIS = MapFactory.DrivingInstance({
map: this.map, map: this.map,
}); });
if(!this.startCoordinate){ if(!this.startCoordinate){
@ -217,7 +215,7 @@ export class RouterGISComponent implements OnInit {
this.snackBar.open('未查询到终点坐标信息,请输入有效地址','确定',config); this.snackBar.open('未查询到终点坐标信息,请输入有效地址','确定',config);
return return
}else{ }else{
this.routeGIS.search(this.startCoordinate,this.endCoordinate, this.routeGIS.search(this,this.startCoordinate,this.endCoordinate,
function(status, result) { function(status, result) {
if (status === 'complete') { if (status === 'complete') {
that.routes = result.routes[0] that.routes = result.routes[0]
@ -239,12 +237,12 @@ export class RouterGISComponent implements OnInit {
if (this.selectType != e) { if (this.selectType != e) {
this.selectType = e this.selectType = e
this.routeGIS? this.routeGIS.clear() : null this.routeGIS? this.routeGIS.clear() : null
this.routeGIS = new AMap.Driving({ this.routeGIS = MapFactory.DrivingInstance({
map: this.map, map: this.map,
policy: e==true? AMap.DrivingPolicy.LEAST_TIME : AMap.DrivingPolicy.REAL_TRAFFIC policy: e==true? AMap.DrivingPolicy.LEAST_TIME : AMap.DrivingPolicy.REAL_TRAFFIC
}); });
// 根据起终点名称规划驾车导航路线 // 根据起终点名称规划驾车导航路线
this.routeGIS.search(this.startCoordinate,this.endCoordinate, this.routeGIS.search(this,this.startCoordinate,this.endCoordinate,
function(status, result) { function(status, result) {
if (status === 'complete') { if (status === 'complete') {
that.routes = result.routes[0] that.routes = result.routes[0]

19
src/app/key-unit/six-familiarity/six-familiarity.component.ts

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
declare var AMap: any; import { MapFactory } from '@src/modules/map/declare/factory';
@Component({ @Component({
selector: 'app-six-familiarity', selector: 'app-six-familiarity',
@ -47,26 +47,11 @@ export class routerMapComponent implements OnInit {
//地图初始化 //地图初始化
mapInit () { mapInit () {
//创建地图 //创建地图
let map = new AMap.Map('contentMap', { let map = MapFactory.MapInstance('contentMap', {
resizeEnable: true, resizeEnable: true,
cursor: 'default', cursor: 'default',
zooms:[6,18], zooms:[6,18],
}); });
//构造路线导航类 实际路线
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:'山东'}], //路线可搜索, 可用坐标
} }

60
src/app/key-unit/water-road/water-road.component.ts

@ -4,6 +4,8 @@ import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { MapFactory } from '@src/modules/map/declare/factory';
import { ICircle, IMap, IMarker } from '@src/modules/map/declare/map';
declare var AMap: any; declare var AMap: any;
declare var html2canvas: any; declare var html2canvas: any;
@Component({ @Component({
@ -29,7 +31,7 @@ export class WaterRoadComponent implements OnInit {
}) })
} }
map: any //地图 map:IMap //地图
watertForm:FormGroup //gis右上角水源表单 watertForm:FormGroup //gis右上角水源表单
waterList = [ waterList = [
{id:'0',name:'消火栓',selected:true}, {id:'0',name:'消火栓',selected:true},
@ -48,7 +50,7 @@ export class WaterRoadComponent implements OnInit {
waterAreaDefault: any = '5000' //默认水源范围 waterAreaDefault: any = '5000' //默认水源范围
selectedWaterList: any = [] //选择提交的水源 selectedWaterList: any = [] //选择提交的水源
//地图范围圆圈---水源 //地图范围圆圈---水源
circleofwater = new AMap.Circle({ circleofwater:ICircle = MapFactory.CircleInstance({
center: null, center: null,
radius: 0, //半径 radius: 0, //半径
strokeOpacity: 1, strokeOpacity: 1,
@ -111,7 +113,7 @@ export class WaterRoadComponent implements OnInit {
this.circleofwater.setMap(this.map) this.circleofwater.setMap(this.map)
let Distance let Distance
let lnglat = new AMap.LngLat(this.unitData.location.x, this.unitData.location.y) // lng, lat 替换成传入的坐标 let lnglat = MapFactory.LngLatInstance(this.unitData.location.x, this.unitData.location.y) // lng, lat 替换成传入的坐标
//如果选择当前的视野范围算出查询半径 //如果选择当前的视野范围算出查询半径
if (this.waterAreaDefault == '0') { if (this.waterAreaDefault == '0') {
@ -223,11 +225,12 @@ export class WaterRoadComponent implements OnInit {
} }
}) })
this.map.plugin(["AMap.MarkerClusterer"], () => {
var gridSize = 60 var gridSize = 60
var count = waterMarkerArrcluster.length; var count = waterMarkerArrcluster.length;
var _renderClusterMarker = function (context) {
var factor = Math.pow(context.count / count, 1 / 18); let render = MapFactory.RenderClusterMarkerInstance();
render.contentRender = (contextCount) => {
var factor = Math.pow(contextCount / count, 1 / 18);
var div = document.createElement('div'); var div = document.createElement('div');
var Hue = 180 - factor * 180; var Hue = 180 - factor * 180;
var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)'; var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)';
@ -235,36 +238,38 @@ export class WaterRoadComponent implements OnInit {
var borderColor = 'hsla(' + Hue + ',100%,40%,1)'; var borderColor = 'hsla(' + Hue + ',100%,40%,1)';
var shadowColor = 'hsla(' + Hue + ',100%,90%,1)'; var shadowColor = 'hsla(' + Hue + ',100%,90%,1)';
div.style.backgroundColor = bgColor; div.style.backgroundColor = bgColor;
var size = Math.round(30 + Math.pow(context.count / count, 1 / 5) * 20); var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
div.style.width = div.style.height = size + 'px'; div.style.width = div.style.height = size + 'px';
div.style.border = 'solid 1px ' + borderColor; div.style.border = 'solid 1px ' + borderColor;
div.style.borderRadius = size / 2 + 'px'; div.style.borderRadius = size / 2 + 'px';
// div.style.boxShadow = '0 0 5px ' + shadowColor; div.style.boxShadow = '0 0 5px ' + shadowColor;
div.innerHTML = context.count; div.innerHTML = contextCount;
div.style.lineHeight = size + 'px'; div.style.lineHeight = size + 'px';
div.style.color = fontColor; div.style.color = fontColor;
div.style.fontSize = '14px'; div.style.fontSize = '14px';
div.style.textAlign = 'center'; div.style.textAlign = 'center';
context.marker.setOffset(new AMap.Pixel(-size / 2, -size / 2)); return div;
context.marker.setContent(div) };
render.pixelRender = (contextCount) => {
var size = Math.round(30 + Math.pow(contextCount / count, 1 / 5) * 20);
return MapFactory.PixelInstance(-size / 2, -size / 2);
};
render.contentNonRender = (src) => {
return `<img class='clusterImgCollection' src="${src}" alt="">`;
}; };
var _renderMarker = (context) => { render.pixelNonRender = () => {
var content = `<img class='clusterImgCollection' src="${context.data[0].image}" alt="">`; return MapFactory.PixelInstance(-15, -15);
var offset = new AMap.Pixel(-12.5, -12.5);
context.marker.setContent(content)
context.marker.setOffset(offset)
} }
this.waterCluster = new AMap.MarkerCluster(this.map, waterMarkerArrcluster, { this.waterCluster = MapFactory.MarkerClusterInstance(this.map, waterMarkerArrcluster, {
gridSize: gridSize, // 设置网格像素大小 gridSize: gridSize, // 设置网格像素大小
renderClusterMarker: _renderClusterMarker, // 自定义聚合点样式 render: render //自定义聚合点样式, 自定义非聚合点样式
renderMarker: _renderMarker, // 自定义非聚合点样式
}); });
this.waterCluster.on('click',(e)=>{ this.waterCluster.on('click',(e)=>{
if(e.clusterData.length == 1){ if(e.clusterData.length == 1){
} }
}) },this)
});
} }
@ -273,7 +278,7 @@ export class WaterRoadComponent implements OnInit {
this.watertForm.reset() this.watertForm.reset()
this.watertForm.controls.areaWater.setValue('0') this.watertForm.controls.areaWater.setValue('0')
this.map.remove(this.circleofwater) this.map.remove(this.circleofwater)
this.waterCluster.setData([]) this.waterCluster? this.waterCluster.setData([]) : null
} }
//计算两地距离 //计算两地距离
@ -281,8 +286,7 @@ export class WaterRoadComponent implements OnInit {
let p1 = [bounds.northEast.lng, bounds.northEast.lat]; let p1 = [bounds.northEast.lng, bounds.northEast.lat];
let p2 = [bounds.northEast.lng, bounds.southWest.lat]; let p2 = [bounds.northEast.lng, bounds.southWest.lat];
// 返回 p1 到 p2 间的地面距离,单位:米 // 返回 p1 到 p2 间的地面距离,单位:米
let dis = AMap.GeometryUtil.distance(p1, p2); return this.map.distance(p1, p2);
return dis
} }
//构造水源checkbox控制器 //构造水源checkbox控制器
@ -294,13 +298,13 @@ export class WaterRoadComponent implements OnInit {
} }
//地图初始化 //地图初始化
unitMarker: any//单位标点 unitMarker:IMarker//单位标点
newPositionMarkerContent:any = newPositionMarkerContent:any =
'<div class="custom-content-marker">' + '<div class="custom-content-marker">' +
' <img style="width:20px;height:26px" src="/assets/images/dingwei.png">' + ' <img style="width:20px;height:26px" src="/assets/images/dingwei.png">' +
'</div>' '</div>'
creatMap(){ creatMap(){
this.map = new AMap.Map('center', { this.map = MapFactory.MapInstance('center',{
zoom: 13, //初始地图级别 zoom: 13, //初始地图级别
WebGLParams: { WebGLParams: {
preserveDrawingBuffer: true preserveDrawingBuffer: true
@ -308,10 +312,10 @@ export class WaterRoadComponent implements OnInit {
}); });
if(this.unitData.location && this.unitData.location.x){ if(this.unitData.location && this.unitData.location.x){
this.map.setCenter([this.unitData.location.x,this.unitData.location.y]); this.map.setCenter([this.unitData.location.x,this.unitData.location.y]);
this.unitMarker = new AMap.Marker({ this.unitMarker = MapFactory.MarkerInstance({
position: [this.unitData.location.x,this.unitData.location.y], position: [this.unitData.location.x,this.unitData.location.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-10, -13) offset: MapFactory.PixelInstance(-10, -13)
}) })
// 将 markers 添加到地图 // 将 markers 添加到地图
this.map.add(this.unitMarker); this.map.add(this.unitMarker);

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

@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core'; import { ApplicationRef, Component, ComponentFactoryResolver, Injector, OnInit } from '@angular/core';
import { HttpClient } from '@angular/common/http' import { HttpClient } from '@angular/common/http'
import { Data } from '../../interface' import { Data } from '../../interface'
import { Router, ActivatedRoute } from '@angular/router' import { Router, ActivatedRoute } from '@angular/router'
@ -6,8 +6,6 @@ import {CacheTokenService} from '../../http-interceptors/cache-token.service'//
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { MatDialog, MatDialogRef } from '@angular/material/dialog';
@Component({ @Component({
selector: 'app-login', selector: 'app-login',
templateUrl: './login.component.html', templateUrl: './login.component.html',
@ -15,7 +13,9 @@ import { MatDialog,MatDialogRef } from '@angular/material/dialog';
}) })
export class LoginComponent implements OnInit { export class LoginComponent implements OnInit {
constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,public token:CacheTokenService,public snackBar: MatSnackBar, public dialog: MatDialog) { } constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, public token: CacheTokenService, public snackBar: MatSnackBar, public dialog: MatDialog) {
}
ngOnInit() { ngOnInit() {
this.automaticLogin() this.automaticLogin()
@ -26,7 +26,8 @@ export class LoginComponent implements OnInit {
onSubmit(e) { onSubmit(e) {
this.http.post('/api/Account/SignIn', { this.http.post('/api/Account/SignIn', {
name: e.name, name: e.name,
password: e.password}).subscribe( (data: Data) => { password: e.password
}).subscribe((data: Data) => {
sessionStorage.setItem("level", data.level); sessionStorage.setItem("level", data.level);
sessionStorage.setItem("token", data.token); sessionStorage.setItem("token", data.token);
sessionStorage.setItem("refreshToken", data.refreshToken); sessionStorage.setItem("refreshToken", data.refreshToken);
@ -61,7 +62,8 @@ export class LoginComponent implements OnInit {
if (e.notlogin) { //7天免登录时 if (e.notlogin) { //7天免登录时
localStorage.setItem("isnologin", "true") localStorage.setItem("isnologin", "true")
localStorage.setItem("token", data.token) localStorage.setItem("token", data.token)
localStorage.setItem("refreshToken",data.refreshToken) } localStorage.setItem("refreshToken", data.refreshToken)
}
//调用服务中的function刷新token //调用服务中的function刷新token
this.token.startUp() this.token.startUp()
}, },
@ -88,7 +90,8 @@ export class LoginComponent implements OnInit {
let refreshToken = localStorage.getItem("refreshToken"); let refreshToken = localStorage.getItem("refreshToken");
this.http.post('/api/Account/RefreshToken', { this.http.post('/api/Account/RefreshToken', {
token: token, token: token,
refreshToken: refreshToken}).subscribe((data:any)=>{ refreshToken: refreshToken
}).subscribe((data: any) => {
sessionStorage.setItem("level", data.level); sessionStorage.setItem("level", data.level);
sessionStorage.setItem("token", data.token); sessionStorage.setItem("token", data.token);
sessionStorage.setItem("refreshToken", data.refreshToken); sessionStorage.setItem("refreshToken", data.refreshToken);
@ -139,8 +142,7 @@ export class ChangepasswordComponent2 implements OnInit {
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('密码修改成功', '确定', config); this.snackBar.open('密码修改成功', '确定', config);
},(err) => }, (err) => { this.errmsg = err }
{this.errmsg = err}
) )
} }

6
src/app/pages/pages-routing.module.ts

@ -1,10 +1,8 @@
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { HomeComponent } from './home/home.component';
import { HomedetailComponent } from './homedetail/homedetail.component';
const routes: Routes = [ const routes: Routes = [
{ path: '', component: HomeComponent},
{ path: 'detail', component: HomedetailComponent},
]; ];
@NgModule({ @NgModule({

2
src/app/pages/pages.component.html

@ -1 +1 @@
<p>pages works!</p>

47
src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts

@ -2,10 +2,12 @@ import { HttpClient } from '@angular/common/http';
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
import { MatDialog } from '@angular/material/dialog'; import { MatDialog } from '@angular/material/dialog';
import { MatSnackBar } from '@angular/material/snack-bar'; import { MatSnackBar } from '@angular/material/snack-bar';
import { MapFactory } from '@src/modules/map/declare/factory';
import { IMap, IMarker } from '@src/modules/map/declare/map';
import Viewer from 'viewerjs' import Viewer from 'viewerjs'
import { ViewDetailsComponent } from '../view-details/view-details.component'; import { ViewDetailsComponent } from '../view-details/view-details.component';
declare var CryptoJS declare var CryptoJS
declare var AMap: any;
@Component({ @Component({
selector: 'app-fireforce-audit', selector: 'app-fireforce-audit',
templateUrl: './fireforce-audit.component.html', templateUrl: './fireforce-audit.component.html',
@ -37,16 +39,16 @@ export class FireforceAuditComponent implements OnInit {
this.FireForceDetailInfo.RelevantInfomationData ? this.AttachmentArr = JSON.parse(this.FireForceDetailInfo.RelevantInfomationData) : null this.FireForceDetailInfo.RelevantInfomationData ? this.AttachmentArr = JSON.parse(this.FireForceDetailInfo.RelevantInfomationData) : null
console.log(789,this.ZongcontactData) console.log(789,this.ZongcontactData)
setTimeout(() => { setTimeout(() => {
this.map = new AMap.Map('container', { this.map = MapFactory.MapInstance('container', {
zoom:18 zoom:18
}) })
if(this.FireForceDetailInfo.location && this.FireForceDetailInfo.location.x){ if(this.FireForceDetailInfo.location && this.FireForceDetailInfo.location.x){
this.map.setCenter([this.FireForceDetailInfo.location.x,this.FireForceDetailInfo.location.y]); this.map.setCenter([this.FireForceDetailInfo.location.x,this.FireForceDetailInfo.location.y]);
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.FireForceDetailInfo.location.x,this.FireForceDetailInfo.location.y], position: [this.FireForceDetailInfo.location.x,this.FireForceDetailInfo.location.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-10, -12) offset: MapFactory.PixelInstance(-10, -12)
}) })
// 将 markers 添加到地图 // 将 markers 添加到地图
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -56,8 +58,8 @@ export class FireforceAuditComponent implements OnInit {
}, 0); }, 0);
} }
map:any map:IMap
newPositionMarker:any newPositionMarker:IMarker
newPositionMarkerContent:any = newPositionMarkerContent:any =
'<div class="custom-content-marker">' + '<div class="custom-content-marker">' +
' <img style="width:20px;height:24px" src="/assets/images/dingwei.png">' + ' <img style="width:20px;height:24px" src="/assets/images/dingwei.png">' +
@ -161,32 +163,13 @@ export class FireforceAuditComponent implements OnInit {
} }
if(suffix == 'docx' || suffix == 'doc' || suffix == 'pdf'){ if(suffix == 'docx' || suffix == 'doc' || suffix == 'pdf'){
let fetchUrl = item.objectName let fetchUrl = item.objectName
let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + fetchUrl); if (suffix == 'docx' || suffix == 'doc') {
let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); let arr = fetchUrl.split('.')
arr[arr.length - 1] = 'pdf'
let jwt = sessionStorage.getItem("token"); window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); }else if (suffix == 'pdf') {
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
let identityJsonparse=JSON.parse(identityJson) }
let json={
doc: {
docId: docId,
title: item.fileName,
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl
},
user: {
uid: identityJsonparse.sub,
nickName: identityJsonparse.name,
avatar: "",
privilege: [
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
],
},
}
var stringjson=JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
} }
if(suffix == 'mp4'){ if(suffix == 'mp4'){
const dialogRef = this.dialog.open(ViewDetailsComponent, {//调用open方法打开对话框并且携带参数过去 const dialogRef = this.dialog.open(ViewDetailsComponent, {//调用open方法打开对话框并且携带参数过去

47
src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts

@ -4,8 +4,10 @@ import { ViewDetailsComponent } from '../view-details/view-details.component';
import Viewer from 'viewerjs' import Viewer from 'viewerjs'
import { MatSnackBar } from '@angular/material/snack-bar'; import { MatSnackBar } from '@angular/material/snack-bar';
import { MatDialog } from '@angular/material/dialog'; import { MatDialog } from '@angular/material/dialog';
import { MapFactory } from '@src/modules/map/declare/factory';
import { IMap, IMarker } from '@src/modules/map/declare/map';
declare var CryptoJS declare var CryptoJS
declare var AMap: any;
@Component({ @Component({
selector: 'app-linkageforces-audit', selector: 'app-linkageforces-audit',
templateUrl: './linkageforces-audit.component.html', templateUrl: './linkageforces-audit.component.html',
@ -33,8 +35,8 @@ export class LinkageforcesAuditComponent implements OnInit {
{id:14,name:'住建',imgUrl:'/assets/linkageForces/zhujian.png',isChecked:false} {id:14,name:'住建',imgUrl:'/assets/linkageForces/zhujian.png',isChecked:false}
] ]
AttachmentArr:any//附件 AttachmentArr:any//附件
map:any map:IMap
newPositionMarker:any newPositionMarker:IMarker
newPositionMarkerContent:any = newPositionMarkerContent:any =
'<div class="custom-content-marker">' + '<div class="custom-content-marker">' +
' <img style="width:20px;height:24px" src="/assets/images/dingwei.png">' + ' <img style="width:20px;height:24px" src="/assets/images/dingwei.png">' +
@ -43,16 +45,16 @@ export class LinkageforcesAuditComponent implements OnInit {
this.AttachmentArr = JSON.parse(this.LinkageForceDetailInfo.relevantInfomationData) this.AttachmentArr = JSON.parse(this.LinkageForceDetailInfo.relevantInfomationData)
this.LinkageForceDetailInfo.location ? null : this.LinkageForceDetailInfo.location={x:null,y:null} this.LinkageForceDetailInfo.location ? null : this.LinkageForceDetailInfo.location={x:null,y:null}
setTimeout(() => { setTimeout(() => {
this.map = new AMap.Map('container', { this.map = MapFactory.MapInstance('container', {
zoom:18 zoom:18
}) })
if(this.LinkageForceDetailInfo.location && this.LinkageForceDetailInfo.location.x){ if(this.LinkageForceDetailInfo.location && this.LinkageForceDetailInfo.location.x){
this.map.setCenter([this.LinkageForceDetailInfo.location.x,this.LinkageForceDetailInfo.location.y]); this.map.setCenter([this.LinkageForceDetailInfo.location.x,this.LinkageForceDetailInfo.location.y]);
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.LinkageForceDetailInfo.location.x,this.LinkageForceDetailInfo.location.y], position: [this.LinkageForceDetailInfo.location.x,this.LinkageForceDetailInfo.location.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-10, -12) offset: MapFactory.PixelInstance(-10, -12)
}) })
// 将 markers 添加到地图 // 将 markers 添加到地图
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);
@ -171,32 +173,13 @@ export class LinkageforcesAuditComponent implements OnInit {
} }
if(suffix == 'docx' || suffix == 'doc' || suffix == 'pdf'){ if(suffix == 'docx' || suffix == 'doc' || suffix == 'pdf'){
let fetchUrl = item.objectName let fetchUrl = item.objectName
let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + fetchUrl); if (suffix == 'docx' || suffix == 'doc') {
let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); let arr = fetchUrl.split('.')
arr[arr.length - 1] = 'pdf'
let jwt = sessionStorage.getItem("token"); window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); }else if (suffix == 'pdf') {
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
let identityJsonparse=JSON.parse(identityJson) }
let json={
doc: {
docId: docId,
title: item.fileName,
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl
},
user: {
uid: identityJsonparse.sub,
nickName: identityJsonparse.name,
avatar: "",
privilege: [
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
],
},
}
var stringjson=JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
} }
if(suffix == 'mp4'){ if(suffix == 'mp4'){
const dialogRef = this.dialog.open(ViewDetailsComponent, {//调用open方法打开对话框并且携带参数过去 const dialogRef = this.dialog.open(ViewDetailsComponent, {//调用open方法打开对话框并且携带参数过去

40
src/app/plan-audit/plan-record/plan-record.component.ts

@ -245,38 +245,16 @@ export class PlanRecordComponent implements OnInit {
//毕升 //毕升
lookWord() { lookWord() {
this.showtype = 0 this.showtype = 0
let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + this.fetchUrl); let src
let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); let suffix = this.fetchUrl.split('.')[this.fetchUrl.split('.').length - 1].toLowerCase()
let jwt = sessionStorage.getItem("token"); if (suffix == 'docx' || suffix == 'doc') {
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); let arr = this.fetchUrl.split('.')
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); arr[arr.length - 1] = 'pdf'
let identityJsonparse=JSON.parse(identityJson) src = `/api/Objects/PlanPlatform/` + arr.join('.')
let filename:string } else if (suffix == 'pdf') {
this.http.get(`/api/ObjectMetadata/PlanPlatform/${this.fetchUrl}`).subscribe((data:any)=>{ src = `/api/Objects/PlanPlatform/` + this.fetchUrl
filename=data.fileName
let json={
doc: {
docId: docId,
title: filename,
//title: filename,
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+this.fetchUrl
},
user: {
uid: identityJsonparse.sub,
nickName: identityJsonparse.name,
avatar: "",
privilege: [
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
],
},
} }
var stringjson=JSON.stringify(json) this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(src);
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
this.src=`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`
this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
//window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
})
} }
//查看按钮跳转 //查看按钮跳转
lookNew() { lookNew() {

42
src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@ -319,38 +319,16 @@ export class WaitExamineerComponent implements OnInit {
//毕升 //毕升
lookWord() { lookWord() {
this.showtype = 0 this.showtype = 0
let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + this.fetchUrl); let src
let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); let suffix = this.fetchUrl.split('.')[this.fetchUrl.split('.').length - 1].toLowerCase()
let jwt = sessionStorage.getItem("token"); if (suffix == 'docx' || suffix == 'doc') {
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); let arr = this.fetchUrl.split('.')
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); arr[arr.length - 1] = 'pdf'
let identityJsonparse=JSON.parse(identityJson) src = `/api/Objects/PlanPlatform/` + arr.join('.')
let filename:string }else if (suffix == 'pdf') {
this.http.get(`/api/ObjectMetadata/PlanPlatform/${this.fetchUrl}`).subscribe((data:any)=>{ src = `/api/Objects/PlanPlatform/` + this.fetchUrl
filename=data.fileName }
let json={ this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(src);
doc: {
docId: docId,
title: filename,
//title: filename,
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+this.fetchUrl
},
user: {
uid: identityJsonparse.sub,
nickName: identityJsonparse.name,
avatar: "",
privilege: [
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
],
},
}
var stringjson=JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
this.src=`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`
this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
//window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
})
} }
//查看按钮跳转 //查看按钮跳转
lookNew() { lookNew() {

14
src/app/plan-audit/water-audit/water-audit.component.ts

@ -1,5 +1,7 @@
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
declare var AMap: any; import { MapFactory } from '@src/modules/map/declare/factory';
import { IMap, IMarker } from '@src/modules/map/declare/map';
@Component({ @Component({
selector: 'app-water-audit', selector: 'app-water-audit',
templateUrl: './water-audit.component.html', templateUrl: './water-audit.component.html',
@ -8,8 +10,8 @@ declare var AMap: any;
export class WaterAuditComponent implements OnInit { export class WaterAuditComponent implements OnInit {
@Input() public waterData: any;//data名字根据引用场景自定义 @Input() public waterData: any;//data名字根据引用场景自定义
constructor() { } constructor() { }
map:any map:IMap
newPositionMarker:any newPositionMarker:IMarker
newPositionMarkerContent:any = newPositionMarkerContent:any =
'<div class="custom-content-marker">' + '<div class="custom-content-marker">' +
' <img style="width:20px;height:24px" src="/assets/images/dingwei.png">' + ' <img style="width:20px;height:24px" src="/assets/images/dingwei.png">' +
@ -22,16 +24,16 @@ export class WaterAuditComponent implements OnInit {
this.poolData = this.waterData.detailData this.poolData = this.waterData.detailData
this.naturalWaterData = this.waterData.detailData this.naturalWaterData = this.waterData.detailData
setTimeout(() => { setTimeout(() => {
this.map = new AMap.Map('container', { this.map = MapFactory.MapInstance('container', {
zoom:18 zoom:18
}) })
if(this.waterData.location && this.waterData.location.x){ if(this.waterData.location && this.waterData.location.x){
this.map.setCenter([this.waterData.location.x,this.waterData.location.y]); this.map.setCenter([this.waterData.location.x,this.waterData.location.y]);
this.newPositionMarker = new AMap.Marker({ this.newPositionMarker = MapFactory.MarkerInstance({
position: [this.waterData.location.x,this.waterData.location.y], position: [this.waterData.location.x,this.waterData.location.y],
content: this.newPositionMarkerContent, content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-10, -12) offset: MapFactory.PixelInstance(-10, -12)
}) })
// 将 markers 添加到地图 // 将 markers 添加到地图
this.map.add(this.newPositionMarker); this.map.add(this.newPositionMarker);

2
src/app/plan-management/entry-plan-look/entry-plan-look.component.html

@ -80,7 +80,7 @@
<span (click)="changeName(element)" *ngIf="element.auditStatus==8">改名</span> <span (click)="changeName(element)" *ngIf="element.auditStatus==8">改名</span>
<span (click)="editPlan(element)" <span (click)="editPlan(element)"
[ngClass]="{'grey': !(element.auditStatus!='16' && element.auditStatus != '1')}">编辑</span> [ngClass]="{'grey': !(element.auditStatus!='16' && element.auditStatus != '1')}">编辑</span>
<span (click)="lookPlan(element)" *ngIf="element.planType == 2">查看</span> <span (click)="lookPlan(element)" *ngIf="element.planType == 2 || element.planType == 16">查看</span>
<span (click)="readFile(element)" <span (click)="readFile(element)"
[ngClass]="{'grey': element.planMode == '2' || element.planMode == '3'}">下载</span> [ngClass]="{'grey': element.planMode == '2' || element.planMode == '3'}">下载</span>
<span (click)="deletePlan(element)" *ngIf="element.auditStatus==8">删除</span> <span (click)="deletePlan(element)" *ngIf="element.auditStatus==8">删除</span>

64
src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@ -106,8 +106,8 @@ export class EntryPlanLookComponent implements OnInit {
} }
//查看预案 //查看预案
lookPlan(e) { lookPlan(e) {
console.log(e)
if (e.planType == 16 || e.planType == 4 || e.planType == 8) { if (e.planType == 16 || e.planType == 4 || e.planType == 8) {
// console.log(e.attachmentUrls)
var index = e.attachmentUrls[0].indexOf("\/") var index = e.attachmentUrls[0].indexOf("\/")
if (e.attachmentUrls[0].substr(0, index) == 'psw') { if (e.attachmentUrls[0].substr(0, index) == 'psw') {
const dialogRef = this.dialog.open(PsViewer, { const dialogRef = this.dialog.open(PsViewer, {
@ -121,54 +121,27 @@ export class EntryPlanLookComponent implements OnInit {
data: data.attachmentUrls, data: data.attachmentUrls,
}); });
dialogRef.afterClosed().subscribe(); dialogRef.afterClosed().subscribe();
} } else {
else /* if(e.attachmentUrls[0].substr(e.attachmentUrls[0].length-4,e.attachmentUrls[0].length-1)=='docx'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='pdf'
||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='doc'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='DOC'
||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='txt'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='JPG') */ {
let filename: string
let fetchUrl = e.attachmentUrls[0] let fetchUrl = e.attachmentUrls[0]
let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + fetchUrl); if (fetchUrl) {
let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase()
let jwt = sessionStorage.getItem("token"); if (suffix == 'docx' || suffix == 'doc') {
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); let arr = fetchUrl.split('.')
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); arr[arr.length - 1] = 'pdf'
let identityJsonparse = JSON.parse(identityJson) window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data: any) => { } else if (suffix == 'pdf') {
filename = data.fileName window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
let json = { } else {
doc: { let config = new MatSnackBarConfig();
docId: docId, config.verticalPosition = 'top';
title: filename, config.duration = 3000
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/` + fetchUrl, this.snackBar.open('该文件类型暂不支持在线查看', '确定', config);
}, }
user: { } else {
uid: identityJsonparse.sub, window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}`)
nickName: identityJsonparse.name,
avatar: "",
privilege: e.auditStatus != '1' && e.auditStatus != '16' ? [
'FILE_READ', 'FILE_WRITE', 'FILE_DOWNLOAD', 'FILE_PRINT'
] : [
'FILE_READ', 'FILE_DOWNLOAD', 'FILE_PRINT'
],
},
}
var stringjson = JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
})
} }
} }
/* if(e.planType == 4){
var index=e.attachmentUrls[0].indexOf("\/")
if(e.attachmentUrls[0].substr(0,index)=='psw'){
const dialogRef = this.dialog.open(PsViewer, {
width: '1500px',
height:'800px',
data: e.attachmentUrls[0]
});
} }
} */
if (e.planType == 1) { //如果是在线编辑 if (e.planType == 1) { //如果是在线编辑
let id = e.id let id = e.id
sessionStorage.setItem("planId", id) sessionStorage.setItem("planId", id)
@ -206,7 +179,6 @@ export class EntryPlanLookComponent implements OnInit {
} }
else if (e.planType == 16) { else if (e.planType == 16) {
if (e.attachmentUrls == null) { if (e.attachmentUrls == null) {
console.log(this.compantData)
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}`) window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}`)
} }
else { else {

54
src/app/plan-management/meet-plan/meet-plan.component.ts

@ -217,39 +217,20 @@ export class MeetPlanComponent implements OnInit {
//查看预案 //查看预案
openPlan(element) { openPlan(element) {
//fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl
let filename:string
let fetchUrl = element.attachmentUrls[0] let fetchUrl = element.attachmentUrls[0]
let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + fetchUrl); let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase()
let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); if (suffix == 'docx' || suffix == 'doc') {
let jwt = sessionStorage.getItem("token"); let arr = fetchUrl.split('.')
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); arr[arr.length - 1] = 'pdf'
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
let identityJsonparse=JSON.parse(identityJson) } else if (suffix == 'pdf') {
this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{ window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
filename=data.fileName } else {
let json={ let config = new MatSnackBarConfig();
doc: { config.verticalPosition = 'top';
docId: docId, config.duration = 3000
title: filename, this.snackBar.open('该文件类型暂不支持在线查看', '确定', config);
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl, }
},
user: {
uid: identityJsonparse.sub,
nickName: identityJsonparse.name,
avatar: "",
privilege:element.auditStatus!='1'&&element.auditStatus!='16'?[
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
]:[
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
],
},
}
var stringjson=JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
})
} }
//下载↓ //下载↓
@ -323,7 +304,8 @@ export class MeetPlanComponent implements OnInit {
let result = await new Promise((result, reject) => { let result = await new Promise((result, reject) => {
this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => { this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => {
result(data) }) result(data)
})
}) })
allFile.push(result) allFile.push(result)
this.downloadProgress = Number((i / allSlice).toFixed(2)) * 100 this.downloadProgress = Number((i / allSlice).toFixed(2)) * 100
@ -511,7 +493,8 @@ export class newunitMeet{
this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i + 1}`, formData).subscribe((data: any) => { this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i + 1}`, formData).subscribe((data: any) => {
let msg = { let msg = {
"partNumber": data.partNumber || null, "partNumber": data.partNumber || null,
"eTag": data.eTag || null} "eTag": data.eTag || null
}
resolve(msg) // 调用 promise 内置方法处理成功 resolve(msg) // 调用 promise 内置方法处理成功
}) })
}); });
@ -520,7 +503,8 @@ export class newunitMeet{
if (this.PartNumberETag.length === allSlice) { if (this.PartNumberETag.length === allSlice) {
this.uploadProgress = 100 this.uploadProgress = 100
this.endUploading(planType)} this.endUploading(planType)
}
}//for循环 }//for循环
} }

55
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts

@ -227,40 +227,20 @@ export class OnetwoEntryPlanComponent implements OnInit {
} }
//查看预案 //查看预案
openPlan(element) { openPlan(element) {
let filename:string
let fetchUrl = element.attachmentUrls[0] let fetchUrl = element.attachmentUrls[0]
let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + fetchUrl); let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase()
let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); if (suffix == 'docx' || suffix == 'doc') {
let jwt = sessionStorage.getItem("token"); let arr = fetchUrl.split('.')
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); arr[arr.length - 1] = 'pdf'
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
let identityJsonparse=JSON.parse(identityJson) }else if (suffix == 'pdf') {
this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{ window.open(`/api/Objects/PlanPlatform/` + element.attachmentUrls[0])
filename=data.fileName }else{
let json={ let config = new MatSnackBarConfig();
doc: { config.verticalPosition = 'top';
docId: docId, config.duration = 3000
title: filename, this.snackBar.open('该文件类型暂不支持在线查看', '确定', config);
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl, }
},
user: {
uid: identityJsonparse.sub,
nickName: identityJsonparse.name,
avatar: "",
privilege:element.auditStatus!='1'&&element.auditStatus!='16'?[
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
]:[
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
],
},
}
var stringjson=JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
})
} }
//新增预案弹窗 //新增预案弹窗
@ -359,7 +339,8 @@ export class OnetwoEntryPlanComponent implements OnInit {
let result = await new Promise((result, reject) => { let result = await new Promise((result, reject) => {
this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => { this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => {
result(data) }) result(data)
})
}) })
allFile.push(result) allFile.push(result)
this.downloadProgress = Number((i / allSlice).toFixed(2)) * 100 this.downloadProgress = Number((i / allSlice).toFixed(2)) * 100
@ -517,7 +498,8 @@ export class newunitComponent{
this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i + 1}`, formData).subscribe((data: any) => { this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i + 1}`, formData).subscribe((data: any) => {
let msg = { let msg = {
"partNumber": data.partNumber || null, "partNumber": data.partNumber || null,
"eTag": data.eTag || null} "eTag": data.eTag || null
}
resolve(msg) // 调用 promise 内置方法处理成功 resolve(msg) // 调用 promise 内置方法处理成功
}) })
}); });
@ -526,7 +508,8 @@ export class newunitComponent{
if (this.PartNumberETag.length === allSlice) { if (this.PartNumberETag.length === allSlice) {
this.uploadProgress = 100 this.uploadProgress = 100
this.endUploading(planType)} this.endUploading(planType)
}
}//for循环 }//for循环
} }

46
src/app/plan-management/open-plan/open-plan.component.ts

@ -205,39 +205,21 @@ export class OpenPlanComponent implements OnInit {
data: e.attachmentUrls[0] data: e.attachmentUrls[0]
}); });
} }
else /* if(e.attachmentUrls[0].substr(e.attachmentUrls[0].length-4,e.attachmentUrls[0].length-1)=='docx'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='pdf' else {
||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='doc'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='DOC'
||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='txt'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='JPG') */{
let filename:string
let fetchUrl = e.attachmentUrls[0] let fetchUrl = e.attachmentUrls[0]
let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + fetchUrl); let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase()
let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); if (suffix == 'docx' || suffix == 'doc') {
let jwt = sessionStorage.getItem("token"); let arr = fetchUrl.split('.')
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); arr[arr.length - 1] = 'pdf'
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
let identityJsonparse=JSON.parse(identityJson) } else if (suffix == 'pdf') {
this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{ window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
filename=data.fileName } else {
let json={ let config = new MatSnackBarConfig();
doc: { config.verticalPosition = 'top';
docId: docId, config.duration = 3000
title: filename, this.snackBar.open('该文件类型暂不支持在线查看', '确定', config);
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl, }
},
user: {
uid: identityJsonparse.sub,
nickName: identityJsonparse.name,
avatar: "",
privilege: [
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
],
},
}
var stringjson=JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
})
} }
} }

46
src/app/plan-management/pass-plan/pass-plan.component.ts

@ -352,39 +352,21 @@ export class PassPlanComponent implements OnInit {
data: e.attachmentUrls[0] data: e.attachmentUrls[0]
}); });
} }
else /* if(e.attachmentUrls[0].substr(e.attachmentUrls[0].length-4,e.attachmentUrls[0].length-1)=='docx'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='pdf' else {
||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='doc'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='DOC'
||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='txt'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='JPG') */{
let filename:string
let fetchUrl = e.attachmentUrls[0] let fetchUrl = e.attachmentUrls[0]
let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + fetchUrl); let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase()
let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); if (suffix == 'docx' || suffix == 'doc') {
let jwt = sessionStorage.getItem("token"); let arr = fetchUrl.split('.')
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); arr[arr.length - 1] = 'pdf'
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
let identityJsonparse=JSON.parse(identityJson) } else if (suffix == 'pdf') {
this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{ window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
filename=data.fileName } else {
let json={ let config = new MatSnackBarConfig();
doc: { config.verticalPosition = 'top';
docId: docId, config.duration = 3000
title: filename, this.snackBar.open('该文件类型暂不支持在线查看', '确定', config);
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl, }
},
user: {
uid: identityJsonparse.sub,
nickName: identityJsonparse.name,
avatar: "",
privilege: [
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
],
},
}
var stringjson=JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
})
} }
} }

55
src/app/plan-management/type-plan/type-plan.component.ts

@ -208,40 +208,20 @@ export class TypePlanComponent implements OnInit {
} }
//查看预案 //查看预案
openPlan(element) { openPlan(element) {
let filename:string
let fetchUrl = element.attachmentUrls[0] let fetchUrl = element.attachmentUrls[0]
let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + fetchUrl); let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase()
let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); if (suffix == 'docx' || suffix == 'doc') {
let jwt = sessionStorage.getItem("token"); let arr = fetchUrl.split('.')
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); arr[arr.length - 1] = 'pdf'
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
let identityJsonparse=JSON.parse(identityJson) } else if (suffix == 'pdf') {
this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{ window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
filename=data.fileName } else {
let json={ let config = new MatSnackBarConfig();
doc: { config.verticalPosition = 'top';
docId: docId, config.duration = 3000
title: filename, this.snackBar.open('该文件类型暂不支持在线查看', '确定', config);
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl, }
},
user: {
uid: identityJsonparse.sub,
nickName: identityJsonparse.name,
avatar: "",
privilege: element.auditStatus!='1'&&element.auditStatus!='16'?[
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
]:[
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
],
},
}
var stringjson=JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
})
} }
//新增预案弹窗 //新增预案弹窗
addunit() { addunit() {
@ -340,7 +320,8 @@ export class TypePlanComponent implements OnInit {
let result = await new Promise((result, reject) => { let result = await new Promise((result, reject) => {
this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => { this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => {
result(data) }) result(data)
})
}) })
allFile.push(result) allFile.push(result)
this.downloadProgress = Number((i / allSlice).toFixed(2)) * 100 this.downloadProgress = Number((i / allSlice).toFixed(2)) * 100
@ -487,7 +468,8 @@ export class newunitType{
this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i + 1}`, formData).subscribe((data: any) => { this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i + 1}`, formData).subscribe((data: any) => {
let msg = { let msg = {
"partNumber": data.partNumber || null, "partNumber": data.partNumber || null,
"eTag": data.eTag || null} "eTag": data.eTag || null
}
resolve(msg) // 调用 promise 内置方法处理成功 resolve(msg) // 调用 promise 内置方法处理成功
}) })
}); });
@ -496,7 +478,8 @@ export class newunitType{
if (this.PartNumberETag.length === allSlice) { if (this.PartNumberETag.length === allSlice) {
this.uploadProgress = 100 this.uploadProgress = 100
this.endUploading(planType)} this.endUploading(planType)
}
}//for循环 }//for循环
} }

30
src/app/searchComponent.service.ts

@ -0,0 +1,30 @@
import { ApplicationRef, ComponentFactoryResolver, ComponentRef, EmbeddedViewRef, Injectable, Injector } from '@angular/core';
@Injectable({
providedIn: 'root'
})
export class SearchService {
constructor(private componentFactoryResolver: ComponentFactoryResolver, private applicationRef: ApplicationRef, private injector: Injector,) { }
//angular 动态添加组件
appendComponentToBody<T>(component: any): ComponentRef<T> {
//create a component reference
const componentRef = this.componentFactoryResolver.resolveComponentFactory(component).create(this.injector);
// attach component to the appRef so that so that it will be dirty checked.
this.applicationRef.attachView(componentRef.hostView);
// get DOM element from component
const domElem = (componentRef.hostView as EmbeddedViewRef<any>).rootNodes[0] as HTMLElement;
document.body.appendChild(domElem);
return componentRef as ComponentRef<T>;
}
//删除组件
removeComponentFromBody(componentRef: ComponentRef<any>) {
this.applicationRef.detachView(componentRef.hostView);
componentRef.destroy();
}
}

46
src/app/statistic-analysis/all-plan/all-plan.component.ts

@ -91,39 +91,21 @@ export class AllPlanComponent implements OnInit {
data: e.attachmentUrls[0] data: e.attachmentUrls[0]
}); });
} }
else /* if(e.attachmentUrls[0].substr(e.attachmentUrls[0].length-4,e.attachmentUrls[0].length-1)=='docx'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='pdf' else {
||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='doc'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='DOC'
||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='txt'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='JPG') */{
let filename:string
let fetchUrl = e.attachmentUrls[0] let fetchUrl = e.attachmentUrls[0]
let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + fetchUrl); let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase()
let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); if (suffix == 'docx' || suffix == 'doc') {
let jwt = sessionStorage.getItem("token"); let arr = fetchUrl.split('.')
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); arr[arr.length - 1] = 'pdf'
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
let identityJsonparse=JSON.parse(identityJson) } else if (suffix == 'pdf') {
this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{ window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
filename=data.fileName } else {
let json={ let config = new MatSnackBarConfig();
doc: { config.verticalPosition = 'top';
docId: docId, config.duration = 3000
title: filename, this.snackBar.open('该文件类型暂不支持在线查看', '确定', config);
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl, }
},
user: {
uid: identityJsonparse.sub,
nickName: identityJsonparse.name,
avatar: "",
privilege: [
'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT'
],
},
}
var stringjson=JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
})
} }
} }
/* if(e.planType == 4){ /* if(e.planType == 4){

246
src/app/statistic-analysis/home/home.component.ts

@ -2,9 +2,10 @@ import { Component, OnInit, Renderer2, ElementRef } from '@angular/core';
import { HttpClient } from '@angular/common/http' import { HttpClient } from '@angular/common/http'
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { EchartsDataService } from '../echarts-data.service'; import { EchartsDataService } from '../echarts-data.service';
import { MapFactory } from '@src/modules/map/declare/factory';
import { IMap } from '@src/modules/map/declare/map';
declare var echarts: any; declare var echarts: any;
declare var AMap: any;
declare var AMapUI: any;
@Component({ @Component({
selector: 'app-home', selector: 'app-home',
templateUrl: './home.component.html', templateUrl: './home.component.html',
@ -14,24 +15,10 @@ export class HomeComponent implements OnInit {
constructor(private http: HttpClient, private render2: Renderer2, public element: ElementRef, private router: Router, public emitService: EchartsDataService) { } constructor(private http: HttpClient, private render2: Renderer2, public element: ElementRef, private router: Router, public emitService: EchartsDataService) { }
map:any; //地图 map: IMap; //地图
yuandata yuandata
ngOnInit() { ngOnInit() {
this.level=sessionStorage.getItem("level")
this.getechartsdata() this.getechartsdata()
/* this.emitService.eventEmit.subscribe((value: any) => {
if (value == 'echarts') {
setTimeout(() => {
this.updateEcharts()
}, 500);
}
});
window.addEventListener('resize', () => {
setTimeout(() => {
this.updateEcharts()
}, 0);
}) */
window.setTimeout(() => { window.setTimeout(() => {
/* this.unitType() /* this.unitType()
this.unitData() this.unitData()
@ -102,231 +89,37 @@ export class HomeComponent implements OnInit {
} }
//初始化地图 //初始化地图
adcode: any //行政编码 adcode: any //行政编码
level//组织级别 level = sessionStorage.getItem("level")//组织级别
orid orid
mapInit () {
//创建地图
this.map = new AMap.Map('chartMap', {
cursor: 'default',
zooms:[8,16],
mapStyle:"amap://styles/grey",
// bubble: true
});
let colors = [
"#3366cc", "#dc3912", "#ff9900", "#109618", "#990099", "#0099c6", "#dd4477", "#66aa00",
"#b82e2e", "#316395", "#994499", "#22aa99", "#aaaa11", "#6633cc", "#e67300", "#8b0707",
"#651067", "#329262", "#5574a6", "#3b3eac"
];
AMapUI.loadUI(['geo/DistrictExplorer'], (DistrictExplorer)=> {
//创建一个实例
let districtExplorer = new DistrictExplorer({
map: this.map,
eventSupport: true, //打开事件支持
});
// let adcode = this.adcode; //行政编码
let adcode
if(sessionStorage.getItem("realName") == "上海总队"){
adcode = 310000
}else{
adcode = 310000
}
districtExplorer.loadAreaNode(adcode, (error, areaNode)=> {
//更新地图视野
this.map.setBounds(areaNode.getBounds(), null, null, true);
//设置定位节点,支持鼠标位置识别 //封装Gaode
//注意节点的顺序,前面的高优先级 getEchartsData(data) {
districtExplorer.setAreaNodesForLocating(areaNode); return new Promise((resolve, reject) => {
//清除已有的绘制内容
districtExplorer.clearFeaturePolygons();
//绘制子区域
districtExplorer.renderSubFeatures(areaNode, (feature, i) =>{
// console.log(123,feature,i)
let fillColor = colors[i % colors.length];
let strokeColor = colors[colors.length - 1 - i % colors.length];
return {
cursor: 'default',
bubble: true,
strokeColor: strokeColor, //线颜色
strokeOpacity: 1, //线透明度
strokeWeight: 1, //线宽
fillColor: fillColor, //填充色
fillOpacity: 0.5, //填充透明度
};
});
//绘制父区域
districtExplorer.renderParentFeature(areaNode, {
cursor: 'default',
bubble: true,
strokeColor: 'black', //线颜色
strokeOpacity: 1, //线透明度
strokeWeight: 1, //线宽
fillColor: null, //填充色
fillOpacity: 0.5, //填充透明度
});
// 更新地图视野以适合区划面
this.map.setFitView(districtExplorer.getAllFeaturePolygons());
});
if(this.level=="0"||this.level=="1"||this.level=="2"){
//区域内点击
districtExplorer.on('featureClick', (e, feature) =>{
//console.log(feature)
let paramsdata: any = { let paramsdata: any = {
name:feature.properties.name, name: data.properties.name,
level: Number(this.level) + 1 level: Number(this.level) + 1
} }
this.http.get("/api/Organizations/GetIdByName", { params: paramsdata }).subscribe((data: any) => { this.http.get("/api/Organizations/GetIdByName", { params: paramsdata }).subscribe((data: any) => {
console.log(data)
this.orid = data[0] this.orid = data[0]
this.getechartsdata() this.getechartsdata()
resolve('success')
})
}) })
let props = feature.properties;
adcode = props.adcode
let fillColor2
if(props.level == 'city'){
fillColor2 = null
}else{
fillColor2 = '#d0daee'
} }
districtExplorer.loadAreaNode(adcode, (error, areaNode)=> { setEchartsData() {
//更新地图视野
// this.map.setBounds(areaNode.getBounds(), null, null, true);
//设置定位节点,支持鼠标位置识别
//注意节点的顺序,前面的高优先级
districtExplorer.setAreaNodesForLocating(areaNode);
//清除已有的绘制内容
districtExplorer.clearFeaturePolygons();
//绘制子区域
districtExplorer.renderSubFeatures(areaNode, (feature, i) =>{
let fillColor = colors[i % colors.length];
// console.log(111,fillColor)
let strokeColor = colors[colors.length - 1 - i % colors.length];
return {
cursor: 'default',
bubble: true,
strokeColor: strokeColor, //线颜色
strokeOpacity: 1, //线透明度
strokeWeight: 1, //线宽
fillColor: fillColor, //填充色
fillOpacity: 0.5, //填充透明度
};
});
//绘制父区域
districtExplorer.renderParentFeature(areaNode, {
cursor: 'default',
bubble: true,
strokeColor: 'black', //线颜色
strokeOpacity: 1, //线透明度
strokeWeight: 1, //线宽
fillColor: fillColor2, //填充色
fillOpacity: 0.5, //填充透明度
});
// 更新地图视野以适合区划面
this.map.setFitView(districtExplorer.getAllFeaturePolygons());
});
//this.planState.setOption(this.planStateOptionsZhong);
//this.chartDwsjcj.setOption(this.chartDwsjcjOptionsZhong);
//this.chartZdgzqy.setOption(this.chartZdgzqyOptionsZhong);
/* this.planNum = ["0","0","3","1","6","5"]
this.keyUnitNum = 666 */
//this.dataGetNum = 456
/* this.threePlanNum = "867"
this.twoPlanNum = "485"
this.cardPlanNum = "756"
this.otherPlanNum = "658" */
});
districtExplorer.on('outsideClick', (e) => {
this.orid = '' this.orid = ''
this.getechartsdata() this.getechartsdata()
// console.log('区域外点击');
let adcode
if(sessionStorage.getItem("realName") == "上海总队"){
adcode = 310000
}else{
adcode = 310000
} }
districtExplorer.loadAreaNode(adcode, (error, areaNode)=> { //封装Gaode
//更新地图视野
// this.map.setBounds(areaNode.getBounds(), null, null, true);
//设置定位节点,支持鼠标位置识别
//注意节点的顺序,前面的高优先级
districtExplorer.setAreaNodesForLocating(areaNode);
//清除已有的绘制内容
districtExplorer.clearFeaturePolygons();
//绘制子区域
districtExplorer.renderSubFeatures(areaNode, (feature, i) =>{
let fillColor = colors[i % colors.length];
// console.log(111,fillColor)
let strokeColor = colors[colors.length - 1 - i % colors.length];
return {
cursor: 'default',
bubble: true,
strokeColor: strokeColor, //线颜色
strokeOpacity: 1, //线透明度
strokeWeight: 1, //线宽
fillColor: fillColor, //填充色
fillOpacity: 0.5, //填充透明度
};
});
//绘制父区域 mapInit() {
districtExplorer.renderParentFeature(areaNode, { //创建地图
this.map = MapFactory.MapInstance('chartMap', {
cursor: 'default', cursor: 'default',
bubble: true, zooms: [8, 16],
strokeColor: 'black', //线颜色 mapStyle: "amap://styles/grey",
strokeOpacity: 1, //线透明度
strokeWeight: 1, //线宽
fillColor: null, //填充色
fillOpacity: 0.5, //填充透明度
});
// 更新地图视野以适合区划面
this.map.setFitView(districtExplorer.getAllFeaturePolygons());
});
/* this.planState.setOption(this.planStateOptionsZhi);
this.chartDwsjcj.setOption(this.chartDwsjcjOptionsZhi);
this.chartZdgzqy.setOption(this.chartZdgzqyOptionsZhi); */
/* this.planNum = ["0","2","2","6","7","8"]
this.keyUnitNum = 8036
this.dataGetNum = 6578 */
/* this.threePlanNum = "4374"
this.twoPlanNum = "9693"
this.cardPlanNum = "6403"
this.otherPlanNum = "2208" */
})
}
}); });
this.map.setAdministrativeAreaStyle(this, this.getEchartsData, this.setEchartsData)
} }
planNum = [] planNum = []
keyUnitNum keyUnitNum
@ -337,7 +130,6 @@ export class HomeComponent implements OnInit {
cardPlanNum = "0" cardPlanNum = "0"
otherPlanNum = "0" otherPlanNum = "0"
aPlan = '0' aPlan = '0'
bPlan = '0' bPlan = '0'
cPlan = '0' cPlan = '0'

46
src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.ts

@ -353,39 +353,21 @@ export class PlanAnalysisBySynthesisComponent implements OnInit {
data: e.attachmentUrls[0] data: e.attachmentUrls[0]
}); });
} }
else /* if(e.attachmentUrls[0].substr(e.attachmentUrls[0].length-4,e.attachmentUrls[0].length-1)=='docx'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='pdf' else {
||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='doc'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='DOC'
||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='txt'||e.attachmentUrls[0].substr(e.attachmentUrls[0].length-3,e.attachmentUrls[0].length)=='JPG') */ {
let filename: string
let fetchUrl = e.attachmentUrls[0] let fetchUrl = e.attachmentUrls[0]
let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + fetchUrl); let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase()
let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); if (suffix == 'docx' || suffix == 'doc') {
let jwt = sessionStorage.getItem("token"); let arr = fetchUrl.split('.')
let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); arr[arr.length - 1] = 'pdf'
let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
let identityJsonparse = JSON.parse(identityJson) } else if (suffix == 'pdf') {
this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data: any) => { window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
filename = data.fileName } else {
let json = { let config = new MatSnackBarConfig();
doc: { config.verticalPosition = 'top';
docId: docId, config.duration = 3000
title: filename, this.snackBar.open('该文件类型暂不支持在线查看', '确定', config);
fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/` + fetchUrl, }
},
user: {
uid: identityJsonparse.sub,
nickName: identityJsonparse.name,
avatar: "",
privilege: [
'FILE_READ', 'FILE_DOWNLOAD', 'FILE_PRINT'
],
},
}
var stringjson = JSON.stringify(json)
var wordArray = CryptoJS.enc.Utf8.parse(stringjson);
var base64 = CryptoJS.enc.Base64.stringify(wordArray);
window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
})
} }
} }

39
src/app/tabbar/tabbar.component.html

@ -134,7 +134,6 @@
<p *ngIf="!isUpdates" style="font-size: 16px;position: absolute; right: 233px;">欢迎您, {{realName}}</p> <p *ngIf="!isUpdates" style="font-size: 16px;position: absolute; right: 233px;">欢迎您, {{realName}}</p>
<div class="scoringRule" *ngIf="companyIntegrityScore"> <div class="scoringRule" *ngIf="companyIntegrityScore">
<span class="name" (click)="scoringRule()"> <span class="name" (click)="scoringRule()">
信息完整度规则 信息完整度规则
@ -158,60 +157,62 @@
<td>规则说明</td> <td>规则说明</td>
</tr> </tr>
<tr> <tr>
<td>单位名称</td> <td>单位信息</td>
<td class="bulecolor">5%</td> <td class="bulecolor">5%</td>
<td>按填录入内容评判</td> <td>填写项平分该项占比分值,信息填写完整即可</td>
</tr> </tr>
<tr> <tr>
<td>建筑信息</td> <td>建筑信息</td>
<td class="bulecolor">10%</td> <td class="bulecolor">10%</td>
<td>根据创建的建筑个数平分该分值,每个建筑根据实际填写的完整度再进行评判</td> <td>根据创建的建筑个数平分该分值,每个建筑根据实际填写的完整度再进行评判</td>
</tr> </tr>
<tr>
<td>平面图</td>
<td class="bulecolor">10%</td>
<td>总平面图<span class="bulecolor">1</span>张,层平面图<span class="bulecolor">1</span></td>
</tr>
<tr> <tr>
<td>四周毗邻</td> <td>四周毗邻</td>
<td class="bulecolor">10%</td> <td class="bulecolor">10%</td>
<td><span class="bulecolor">4</span>个方向均分,每个方向的属性信息要填写完整才能得分</td> <td><span class="bulecolor">4</span>个方向均分,每个方向的属性信息要填写完整,并且包含图片</td>
</tr> </tr>
<tr> <tr>
<td>消防设施</td> <td>消防设施</td>
<td class="bulecolor">25%</td> <td class="bulecolor">25%</td>
<td>消防水源占<span class="bulecolor">30%</span> &nbsp;&nbsp;&nbsp; 安全疏散占<span <td>消防水源占<span class="bulecolor">30%</span> &nbsp;&nbsp;安全疏散设施/消防泡沫系统/安全疏散模块占<span
class="bulecolor">30%</span> <br> 消防水系统占<span class="bulecolor">30%</span> class="bulecolor">30%</span> <br> 消防水系统/自动消防设施/消防设施/消防灭火给水系统/消火栓系统模块占<span
class="bulecolor">30%</span>
&nbsp;&nbsp;&nbsp; 内部消防力量占<span class="bulecolor">10%</span></td> &nbsp;&nbsp;&nbsp; 内部消防力量占<span class="bulecolor">10%</span></td>
</tr> </tr>
<tr> <tr>
<td>重点部位</td> <td>重点部位</td>
<td class="bulecolor">10%</td> <td class="bulecolor">10%</td>
<td><span>根据耐火等级做区分</span>:一级:添加<span class="bulecolor">3</span>个重点部位(1个50%,2个80%,3个满分)<span <td>层平面图中重点部位数量大于1个,并且属性信息填写完整(包含图片)</td>
class="bulecolor">二级</span>:添加<span class="bulecolor">2</span>个重点部位(一个占50%)<span
class="bulecolor">三级</span> 添加<span class="bulecolor">1</span>个重点部位 其它:填写重点提示自动满分</td>
</tr> </tr>
<tr> <tr>
<td>功能分区</td> <td>功能分区</td>
<td class="bulecolor">10%</td> <td class="bulecolor">10%</td>
<td>创建<span class="bulecolor">2</span>条并填写完整得满分</td> <td>任意建筑下功能分区信息填写两条以上并且信息填写完整</td>
</tr> </tr>
<tr> <tr>
<td>实景图</td> <td>实景图</td>
<td class="bulecolor">10%</td> <td class="bulecolor">10%</td>
<td>外观,保证有<span class="bulecolor">2</span>张照片(占<span class="bulecolor">30%</span>); 重点部位,保证有<span <td>外观,保证有<span class="bulecolor">2</span>张照片(占<span class="bulecolor">30%</span>);
class="bulecolor">2</span>张照片(占<span class="bulecolor">30%</span>);安全出口,保证有<span 重点部位,保证有<span class="bulecolor">2</span>张照片(占<span
class="bulecolor">2</span>张照片(占<span class="bulecolor">40%</span></td> class="bulecolor">30%</span>);安全出口,保证有<span class="bulecolor">2</span>张照片(占<span
class="bulecolor">40%</span></td>
</tr> </tr>
<tr> <tr>
<td>CAD上传</td> <td>CAD上传</td>
<td class="bulecolor">10%</td> <td class="bulecolor">10%</td>
<td>上传<span class="bulecolor">2</span>个cad文件</td> <td>保证至少有<span class="bulecolor">1</span>个文件,格式不限</td>
</tr>
<tr>
<td>平面图</td>
<td class="bulecolor">10%</td>
<td>总平面图<span class="bulecolor">1</span>张,建筑平面图<span class="bulecolor">1</span></td>
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
<div class="isUpdates" *ngIf="isUpdates"> <div class="isUpdates" *ngIf="isUpdates">
<span class="name" (click)="submitAudit()" <span class="name" (click)="submitAudit()"
*ngIf="!contentVerify || contentVerify.verifyState == 5 || contentVerify.verifyState == 4">提交审核</span> *ngIf="!contentVerify || contentVerify.verifyState == 5 || contentVerify.verifyState == 4">提交审核</span>

8
src/app/tabbar/tabbar.component.ts

@ -76,11 +76,9 @@ export class TabbarComponent implements OnInit {
} }
//根据usci获取当前单位的分数信息 //根据usci获取当前单位的分数信息
getIntegrityScore(){ getIntegrityScore(){
let params:any = { let unitId = sessionStorage.getItem('companyId')
USCI : this.route.snapshot.queryParams.usci this.http.get(`/api/Companies/${unitId}`).subscribe((data:any) => {
} this.companyIntegrityScore = data.companyIntegrityScore
this.http.get('/api/Companies',{params:params}).subscribe((data:any) => {
this.companyIntegrityScore = data.items[0].companyIntegrityScore
}) })
} }
isSpinner:boolean = false//下载帮助文档进度 isSpinner:boolean = false//下载帮助文档进度

4
src/app/ui/collection-tools-plan/addPlaneFigure.html

@ -12,9 +12,9 @@
</mat-form-field> </mat-form-field>
</div> </div>
<!-- <div class="keyMargin"> <div class="keyMargin">
<a href="javascript:;" class="uploadBackGround" (click)='toGIS()' [ngClass]="{'uploadBackGroundSelected': selectedType == 'gis'}">导入GIS地图</a> <a href="javascript:;" class="uploadBackGround" (click)='toGIS()' [ngClass]="{'uploadBackGroundSelected': selectedType == 'gis'}">导入GIS地图</a>
</div> --> </div>
<div class="keyMargin"> <div class="keyMargin">
<a href="javascript:;" class="uploadBackGround" [ngClass]="{'uploadBackGroundSelected': selectedType == 'image'}"> <a href="javascript:;" class="uploadBackGround" [ngClass]="{'uploadBackGroundSelected': selectedType == 'image'}">

611
src/app/ui/collection-tools-plan/collection-tools.component.ts

@ -17,8 +17,11 @@ import { TabbarAndScoreService } from 'src/app/http-interceptors/tabbar-and-scor
import { MaskLayerService } from 'src/app/mask-layer.service'; import { MaskLayerService } from 'src/app/mask-layer.service';
import * as ObjectID from 'bson-objectid'; import * as ObjectID from 'bson-objectid';
import { AxMessageSystem } from 'src/app/working-area/model/axMessageSystem'; import { AxMessageSystem } from 'src/app/working-area/model/axMessageSystem';
import { MapFactory } from 'src/modules/map/declare/factory';
import { IMap, IMarker, IMarkOptions } from 'src/modules/map/declare/map';
declare var AMap: any declare var AMap: any
declare var html2canvas: any; declare var html2canvas: any;
declare global { declare global {
interface Window { interface Window {
deleteMarker: any; deleteMarker: any;
@ -86,7 +89,7 @@ export class CollectionToolsPlanComponent implements OnInit {
gallery//viewerJs实例 gallery//viewerJs实例
//设置属性框 //设置属性框
setAssetsProperty(obj) { setAssetsProperty(obj) {
// console.log('传进来的属性信息', obj) console.log('传进来的属性信息', obj)
//初始化viewerJs实例 //初始化viewerJs实例
setTimeout(() => { setTimeout(() => {
obj.PropertyInfos.forEach(item => { obj.PropertyInfos.forEach(item => {
@ -165,11 +168,7 @@ export class CollectionToolsPlanComponent implements OnInit {
resetZoom() { resetZoom() {
this.canvas.resetCamera2D() this.canvas.resetCamera2D()
} }
//放大图标
iconScale() {
let number = Number(this.selected)
this.canvas.setIconScale(number)
}
//消防要素div边框高度调节 //消防要素div边框高度调节
firecategoriesDivMouseDown(e) { firecategoriesDivMouseDown(e) {
@ -189,6 +188,7 @@ export class CollectionToolsPlanComponent implements OnInit {
document.onmouseup = null; document.onmouseup = null;
} }
} }
//左侧div边框宽度调节 //左侧div边框宽度调节
leftDivMouseDown(e) { leftDivMouseDown(e) {
document.onmousemove = (ev) => { document.onmousemove = (ev) => {
@ -205,6 +205,8 @@ export class CollectionToolsPlanComponent implements OnInit {
document.onmouseup = null; document.onmouseup = null;
} }
} }
//右侧div边框宽度调节 //右侧div边框宽度调节
rightDivMouseDown(e) { rightDivMouseDown(e) {
document.onmousemove = (ev) => { document.onmousemove = (ev) => {
@ -222,10 +224,12 @@ export class CollectionToolsPlanComponent implements OnInit {
} }
} }
//判断是否是数字类型 //放大图标
myIsNaN(value) { iconScale() {
return typeof value === 'number' && !isNaN(value); let number = Number(this.selected)
this.canvas.setIconScale(number)
} }
//素材宽度输入框改变 //素材宽度输入框改变
assetWidthIunput() { assetWidthIunput() {
this.canvasAssetObj.Width = this.assetWidth this.canvasAssetObj.Width = this.assetWidth
@ -233,7 +237,9 @@ export class CollectionToolsPlanComponent implements OnInit {
if (!this.isGis) { if (!this.isGis) {
this.canvas.refreshIcon(this.canvasAssetObj.Id) this.canvas.refreshIcon(this.canvasAssetObj.Id)
} }
} }
//素材高度输入框改变 //素材高度输入框改变
assetHeightIunput() { assetHeightIunput() {
this.canvasAssetObj.Height = this.assetHeight this.canvasAssetObj.Height = this.assetHeight
@ -242,6 +248,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.canvas.refreshIcon(this.canvasAssetObj.Id) this.canvas.refreshIcon(this.canvasAssetObj.Id)
} }
} }
//素材角度输入框改变 //素材角度输入框改变
assetAngleIunput() { assetAngleIunput() {
this.canvasAssetObj.Angle = this.sliderValue this.canvasAssetObj.Angle = this.sliderValue
@ -250,6 +257,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.canvas.refreshIcon(this.canvasAssetObj.Id) this.canvas.refreshIcon(this.canvasAssetObj.Id)
} }
} }
//素材厚度输入框改变 //素材厚度输入框改变
assetThicknessIunput() { assetThicknessIunput() {
this.canvasAssetObj.Thickness = this.sliderValueThickness this.canvasAssetObj.Thickness = this.sliderValueThickness
@ -258,6 +266,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.canvas.refreshIcon(this.canvasAssetObj.Id) this.canvas.refreshIcon(this.canvasAssetObj.Id)
} }
} }
//素材是否高亮改变----->本地操作行为 //素材是否高亮改变----->本地操作行为
assetHighLightIunput() { assetHighLightIunput() {
// console.log(this.isHighLight,this.canvasAssetObj) // console.log(this.isHighLight,this.canvasAssetObj)
@ -266,6 +275,10 @@ export class CollectionToolsPlanComponent implements OnInit {
// this.canvas.setHighlight(arr) // this.canvas.setHighlight(arr)
} }
//判断是否是数字类型
myIsNaN(value) {
return typeof value === 'number' && !isNaN(value);
}
//动态属性素材input框值改变 //动态属性素材input框值改变
assetInputChange(i, e) { assetInputChange(i, e) {
let index = this.canvasAssetObj.PropertyInfos.findIndex((item) => { let index = this.canvasAssetObj.PropertyInfos.findIndex((item) => {
@ -404,6 +417,7 @@ export class CollectionToolsPlanComponent implements OnInit {
config.duration = 3000 config.duration = 3000
this.snackBar.open('图片数量已达上限', '确定', config); this.snackBar.open('图片数量已达上限', '确定', config);
} }
//删除素材属性图片 //删除素材属性图片
deleteImg() { deleteImg() {
if (this.imagesArr.length == 0) { if (this.imagesArr.length == 0) {
@ -475,110 +489,8 @@ export class CollectionToolsPlanComponent implements OnInit {
}//多个素材共同属性 }//多个素材共同属性
multipleAssetData: any//当前多选的素材 multipleAssetData: any//当前多选的素材
firstMultipleAssetData: any//当前多选的第一个素材 firstMultipleAssetData: any//当前多选的第一个素材
//多选宽度共同改变
multipleAssetWidthInput() {
this.multipleAssetData.forEach(item => {
item.assetData.Width = this.multipleAsset.Width
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
})
}
//多选高度共同改变
multipleAssetHeightInput() {
this.multipleAssetData.forEach(item => {
item.assetData.Height = this.multipleAsset.Height
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
})
}
//多选角度共同改变
multipleAssetAngleInput() {
this.multipleAssetData.forEach(item => {
item.assetData.Angle = this.multipleAsset.Angle
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
})
}
//多选厚度共同改变
multipleAssetThicknessInput() {
this.multipleAssetData.forEach(item => {
item.assetData.Thickness = this.multipleAsset.Thickness
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
})
}
//多选颜色共同改变
multipleSelectedcolor: any
multipleAssetSelectcolor(item, key) {
//在当前透明度基础上改变颜色
this.multipleSelectedcolor = item
this.multipleAssetData.forEach(item => {
item.assetData.Color = this.multipleSelectedcolor
this.canvasData.isChange = true
this.canvas.refreshIcon(item.assetData.Id)
})
}
//多选颜色滑竿改变
multipleColorDivSliderChange() {
let colorOpacity = Math.round(255 * this.colorDivSliderValue * 0.01)
//根据滑竿值改变16进制颜色后两位
function replacepos(text, start, stop, replacetext) {
let mystr = text.substring(0, stop - 1) + replacetext + text.substring(stop + 1);
return mystr;
}
this.multipleAssetData.forEach(item => {
this.multipleSelectedcolor = replacepos(this.multipleSelectedcolor, 7, 8, colorOpacity.toString(16))
item.assetData.Color = this.multipleSelectedcolor
this.canvasData.isChange = true
this.canvas.refreshIcon(item.assetData.Id)
})
}
//多选状态动态属性素材input框值改变
multipleAssetInputChange(i, e) {
e.stopPropagation()
setTimeout(() => {
this.multipleAssetData.forEach(item => {
item.assetData.PropertyInfos.forEach(element => {
if (element.PropertyName == i.PropertyName) {
if (this.myIsNaN(i.PropertyValue)) {
i.PropertyValue = String(i.PropertyValue)
}
element.PropertyValue = i.PropertyValue
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
}
})
})
}, 0);
}
//多选状态动态属性素材radio框值改变
multipleAssetRadioChange(i, value) {
// e.stopPropagation()
this.multipleAssetData.forEach(item => {
// console.log(item)
item.assetData.PropertyInfos.forEach(element => {
if (element.PropertyName == i.PropertyName) {
element.PropertyValue = value
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
}
})
})
}
//多选状态动态属性素材下拉框值改变
multipleSupplyArea(i, e) {
e.stopPropagation()
this.multipleAssetData.forEach(item => {
item.assetData.PropertyInfos.forEach(element => {
if (element.PropertyName == i.PropertyName) {
element.PropertyValue = i.PropertyValue
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
}
})
})
}
ngOnInit(): void { ngOnInit(): void {
let _this = this let _this = this
AxMessageSystem.addListener('selectionChanged', () => { AxMessageSystem.addListener('selectionChanged', () => {
if (this.canvas.selection.size() == 1) {//如果是单选 if (this.canvas.selection.size() == 1) {//如果是单选
@ -641,7 +553,7 @@ export class CollectionToolsPlanComponent implements OnInit {
} }
//gis模块平面图 //gis模块平面图
if ((this.router.url.indexOf("gis") != -1 || this.router.url.indexOf("waitexamineergis") != -1 || this.router.url.indexOf("createplanonlinefive") != -1) && sessionStorage.getItem("gisplan") == "look") { if ((this.router.url.indexOf("gis") != -1 || this.router.url.indexOf("waitexamineergis") != -1) && sessionStorage.getItem("gisplan") == "look") {
this.isEditPattern = false this.isEditPattern = false
this.isediticon = false this.isediticon = false
this.canvasData.gameMode = GameMode.Assignment this.canvasData.gameMode = GameMode.Assignment
@ -679,12 +591,114 @@ export class CollectionToolsPlanComponent implements OnInit {
// 删除建筑数据 // 删除建筑数据
delete this.canvasData.originalcompanyBuildingData.data[this.clickId]; delete this.canvasData.originalcompanyBuildingData.data[this.clickId];
// console.log('originalcompanyBuildingData', this.canvasData.originalcompanyBuildingData) console.log('originalcompanyBuildingData', this.canvasData.originalcompanyBuildingData)
// console.log('originaleveryStoreyData', this.canvasData.originaleveryStoreyData) console.log('originaleveryStoreyData', this.canvasData.originaleveryStoreyData)
} }
} }
//多选宽度共同改变
multipleAssetWidthInput() {
this.multipleAssetData.forEach(item => {
item.assetData.Width = this.multipleAsset.Width
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
})
}
//多选高度共同改变
multipleAssetHeightInput() {
this.multipleAssetData.forEach(item => {
item.assetData.Height = this.multipleAsset.Height
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
})
}
//多选角度共同改变
multipleAssetAngleInput() {
this.multipleAssetData.forEach(item => {
item.assetData.Angle = this.multipleAsset.Angle
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
})
}
//多选厚度共同改变
multipleAssetThicknessInput() {
this.multipleAssetData.forEach(item => {
item.assetData.Thickness = this.multipleAsset.Thickness
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
})
}
//多选颜色共同改变
multipleSelectedcolor: any
multipleAssetSelectcolor(item, key) {
//在当前透明度基础上改变颜色
this.multipleSelectedcolor = item
this.multipleAssetData.forEach(item => {
item.assetData.Color = this.multipleSelectedcolor
this.canvasData.isChange = true
this.canvas.refreshIcon(item.assetData.Id)
})
}
//多选颜色滑竿改变
multipleColorDivSliderChange() {
let colorOpacity = Math.round(255 * this.colorDivSliderValue * 0.01)
//根据滑竿值改变16进制颜色后两位
function replacepos(text, start, stop, replacetext) {
let mystr = text.substring(0, stop - 1) + replacetext + text.substring(stop + 1);
return mystr;
}
this.multipleAssetData.forEach(item => {
this.multipleSelectedcolor = replacepos(this.multipleSelectedcolor, 7, 8, colorOpacity.toString(16))
item.assetData.Color = this.multipleSelectedcolor
this.canvasData.isChange = true
this.canvas.refreshIcon(item.assetData.Id)
})
}
//多选状态动态属性素材input框值改变
multipleAssetInputChange(i, e) {
e.stopPropagation()
setTimeout(() => {
this.multipleAssetData.forEach(item => {
item.assetData.PropertyInfos.forEach(element => {
if (element.PropertyName == i.PropertyName) {
if (this.myIsNaN(i.PropertyValue)) {
i.PropertyValue = String(i.PropertyValue)
}
element.PropertyValue = i.PropertyValue
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
}
})
})
}, 0);
}
//多选状态动态属性素材radio框值改变
multipleAssetRadioChange(i, value) {
// e.stopPropagation()
this.multipleAssetData.forEach(item => {
// console.log(item)
item.assetData.PropertyInfos.forEach(element => {
if (element.PropertyName == i.PropertyName) {
element.PropertyValue = value
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
}
})
})
}
//多选状态动态属性素材下拉框值改变
multipleSupplyArea(i, e) {
e.stopPropagation()
this.multipleAssetData.forEach(item => {
item.assetData.PropertyInfos.forEach(element => {
if (element.PropertyName == i.PropertyName) {
element.PropertyValue = i.PropertyValue
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
}
})
})
}
ngAfterViewInit(): void { ngAfterViewInit(): void {
//不是gis模块平面图 //不是gis模块平面图
@ -704,6 +718,7 @@ export class CollectionToolsPlanComponent implements OnInit {
let buildingId = this.beforeOneCheckedBuilding.id let buildingId = this.beforeOneCheckedBuilding.id
let floorId = this.selectingSitePlan.id let floorId = this.selectingSitePlan.id
this.canvas.paste(companyId, buildingId, floorId) this.canvas.paste(companyId, buildingId, floorId)
// this.renovateTreeData(false)
} }
//截图 //截图
takeScreenshot() { takeScreenshot() {
@ -755,6 +770,11 @@ export class CollectionToolsPlanComponent implements OnInit {
this.canvas.setNameVisible(this.basicInfo, 0) this.canvas.setNameVisible(this.basicInfo, 0)
} }
//点击想定作业名称
wantToWorkClick() {
this.wantToWork = !this.wantToWork
this.canvas.setNameVisible(this.wantToWork, 1)
}
isEditPattern: boolean = true //是否为编辑模式 isEditPattern: boolean = true //是否为编辑模式
//进入编辑模式 //进入编辑模式
@ -779,7 +799,6 @@ export class CollectionToolsPlanComponent implements OnInit {
saveNum: any = [] saveNum: any = []
saveSite() { saveSite() {
//更新用于统计的数据 //更新用于统计的数据
this.canvasData.updateBuildingData() this.canvasData.updateBuildingData()
if (this.selectingSitePlan && this.selectingSitePlan.id) { if (this.selectingSitePlan && this.selectingSitePlan.id) {
@ -792,11 +811,12 @@ export class CollectionToolsPlanComponent implements OnInit {
CompanyData.data = JSON.stringify(CompanyData.data) CompanyData.data = JSON.stringify(CompanyData.data)
let object = this.canvasData.originalcompanyBuildingData.data let object = this.canvasData.originalcompanyBuildingData.data
console.log('建筑数据',object)
let adjoinArr = [] //毗邻数组 let adjoinArr = [] //毗邻数组
if (this.pattern) {//如果是基本信息编辑模式 if (this.pattern) {//如果是基本信息编辑模式
for (const key in object) { for (const key in object) {
if (object[key].Name == "毗邻") {//如果是相同楼层,则筛选出毗邻 if (object[key].Name == "毗邻") {//如果是相同楼层,则筛选出毗邻
object[key].PropertyInfos.forEach(element => { object[key].PropertyInfos.forEach(element => {
if (element.PropertyName == "方向") { if (element.PropertyName == "方向") {
adjoinArr.push(element.PropertyValue) adjoinArr.push(element.PropertyValue)
@ -804,7 +824,6 @@ export class CollectionToolsPlanComponent implements OnInit {
}); });
} }
} }
console.log('adjoinArr',adjoinArr)
if ((new Set(adjoinArr)).size != adjoinArr.length) { if ((new Set(adjoinArr)).size != adjoinArr.length) {
this.maskLayerService.sendMessage(false) this.maskLayerService.sendMessage(false)
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
@ -815,6 +834,7 @@ export class CollectionToolsPlanComponent implements OnInit {
} else { } else {
//如果是单位 总平面图 //如果是单位 总平面图
if (this.checkedBuildingIndex == -1) { if (this.checkedBuildingIndex == -1) {
if (this.isGis) { if (this.isGis) {
let data = JSON.parse(JSON.stringify(this.selectingSitePlan)) let data = JSON.parse(JSON.stringify(this.selectingSitePlan))
data.zoomLevel = this.map.getZoom(), data.zoomLevel = this.map.getZoom(),
@ -863,9 +883,6 @@ export class CollectionToolsPlanComponent implements OnInit {
}) })
//保存建筑数据 //保存建筑数据
// console.log('CompanyData',CompanyData)
// CompanyData.data = "{\"图例\":{\"Id\":\"图例\",\"Name\":\"图例\",\"Angle\":0,\"Color\":\"#066EED80\",\"Point\":{\"x\":200,\"y\":200},\"Scale\":1,\"Width\":32,\"Border\":null,\"Height\":32,\"PivotX\":0,\"PivotY\":0,\"Enabled\":true,\"FloorId\":\"60d43256660b093f1c3b5aa5\",\"DrawMode\":null,\"FillMode\":null,\"GameMode\":0,\"ImageUrl\":null,\"FixedSize\":null,\"Thickness\":null,\"MultiPoint\":null,\"TemplateId\":null,\"FireElementId\":null,\"PropertyInfos\":[{\"Tag\":\"\",\"Order\":0,\"Enabled\":true,\"Visible\":true,\"Required\":false,\"RuleName\":\"\",\"RuleValue\":\"\",\"PhysicalUnit\":\"\",\"PropertyName\":\"列\",\"PropertyType\":2,\"PropertyValue\":\"2\"}],\"IsFromBuilding\":null,\"InteractiveMode\":null}}"
this.http.post("/api/CompanyData", CompanyData, { this.http.post("/api/CompanyData", CompanyData, {
params: { params: {
companyId: this.params.companyId companyId: this.params.companyId
@ -955,6 +972,7 @@ export class CollectionToolsPlanComponent implements OnInit {
}).subscribe(data => { }).subscribe(data => {
this.saveNum.push("1") this.saveNum.push("1")
if (this.saveNum.length == 5) { if (this.saveNum.length == 5) {
this.maskLayerService.sendMessage(false)
this.maskLayerService.sendMessage(false) this.maskLayerService.sendMessage(false)
this.canvasData.isChange = false this.canvasData.isChange = false
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
@ -1118,6 +1136,7 @@ export class CollectionToolsPlanComponent implements OnInit {
}) })
} }
//创建建筑 //创建建筑
createBuilding() { createBuilding() {
let data = { let data = {
@ -1236,9 +1255,11 @@ export class CollectionToolsPlanComponent implements OnInit {
} }
} }
} }
storeyData //将建筑素材和当前楼层素材合二为一 storeyData //将建筑素材和当前楼层素材合二为一
//处理 tree 数据结构 //处理 tree 数据结构
handleTreeData(storeyData) { handleTreeData(storeyData) {
this.storeyData = storeyData this.storeyData = storeyData
let data = this.allFireElements //所有消防要素模板 let data = this.allFireElements //所有消防要素模板
let treeData = [] //tree型 处理完成后的数据 let treeData = [] //tree型 处理完成后的数据
@ -1280,6 +1301,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.treeControl.expandAll() this.treeControl.expandAll()
} }
//点击树节点 //点击树节点
clickTreeNode(node) { clickTreeNode(node) {
if (this.canvasData.originalcompanyBuildingData.data[node.id]) { if (this.canvasData.originalcompanyBuildingData.data[node.id]) {
@ -1323,12 +1345,15 @@ export class CollectionToolsPlanComponent implements OnInit {
//点击数节点的显示隐藏icon //点击数节点的显示隐藏icon
clickLookItem(node) { clickLookItem(node) {
//修改真实素材islook属性 //修改真实素材islook属性
for (let key in this.storeyData.data) { for (let key in this.storeyData.data) {
if (key == node.id) { if (key == node.id) {
this.storeyData.data[key].isLook = !this.storeyData.data[key].isLook this.storeyData.data[key].isLook = !this.storeyData.data[key].isLook
} }
} }
//所有消防要素模板变化islook值 //所有消防要素模板变化islook值
if (node.isTemplate) { if (node.isTemplate) {
this.allFireElements.forEach(item => { this.allFireElements.forEach(item => {
@ -1337,6 +1362,7 @@ export class CollectionToolsPlanComponent implements OnInit {
}) })
} }
//子节点跟随父节点的islook变化 //子节点跟随父节点的islook变化
if (node.children && node.children.length != 0) { if (node.children && node.children.length != 0) {
node.children.forEach(item => { node.children.forEach(item => {
@ -1349,6 +1375,7 @@ export class CollectionToolsPlanComponent implements OnInit {
}) })
} }
const nodes = this.treeControl.dataNodes; const nodes = this.treeControl.dataNodes;
const expandNodes = []; const expandNodes = [];
nodes.forEach((item) => { nodes.forEach((item) => {
@ -1356,7 +1383,9 @@ export class CollectionToolsPlanComponent implements OnInit {
expandNodes.push(item.id); expandNodes.push(item.id);
} }
}); });
this.dataSource.data = [...this.dataSource.data] this.dataSource.data = [...this.dataSource.data]
let newNodes = this.treeControl.dataNodes; let newNodes = this.treeControl.dataNodes;
newNodes = newNodes.filter(n => { newNodes = newNodes.filter(n => {
return expandNodes.indexOf(n.id) >= 0; return expandNodes.indexOf(n.id) >= 0;
@ -1386,6 +1415,7 @@ export class CollectionToolsPlanComponent implements OnInit {
//封装 刷新 tree 数据 //封装 刷新 tree 数据
async renovateTreeData(isRefresh: boolean = true) { async renovateTreeData(isRefresh: boolean = true) {
// this.allFireElements[this.allFireElements.length-1].children = []
if (!this.selectingSitePlan.isGis) { if (!this.selectingSitePlan.isGis) {
isRefresh ? await this.canvas.refresh() : null isRefresh ? await this.canvas.refresh() : null
this.canvas.setNameVisible(this.basicInfo, 0) this.canvas.setNameVisible(this.basicInfo, 0)
@ -1416,9 +1446,9 @@ export class CollectionToolsPlanComponent implements OnInit {
} }
this.handleTreeData(storeyData) //处理tree数据结构 this.handleTreeData(storeyData) //处理tree数据结构
} }
map: any map: IMap
toLoadGis() { toLoadGis() {
this.map = new AMap.Map('planContainer', { this.map = MapFactory.MapInstance("planContainer", {
viewMode: '2D', // 默认使用 2D 模式,如果希望使用带有俯仰角的 3D 模式,请设置 viewMode: '3D', viewMode: '2D', // 默认使用 2D 模式,如果希望使用带有俯仰角的 3D 模式,请设置 viewMode: '3D',
zoom: 11, //初始化地图层级 zoom: 11, //初始化地图层级
WebGLParams: { WebGLParams: {
@ -1434,7 +1464,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.map.on('click', (e) => { this.map.on('click', (e) => {
this.showInfoClick(e) this.showInfoClick(e)
}); },this);
this.map.on("complete", () => { this.map.on("complete", () => {
for (const key in this.canvasData.originaleveryStoreyData.data) { for (const key in this.canvasData.originaleveryStoreyData.data) {
if (Object.prototype.hasOwnProperty.call(this.canvasData.originaleveryStoreyData.data, key)) { if (Object.prototype.hasOwnProperty.call(this.canvasData.originaleveryStoreyData.data, key)) {
@ -1455,26 +1485,28 @@ export class CollectionToolsPlanComponent implements OnInit {
} }
// 将 icon 传入 marker // 将 icon 传入 marker
let startMarker = new AMap.Marker({ let startMarker = MapFactory.MarkerInstance({
position: new AMap.LngLat(element.Point.x, element.Point.y), position: MapFactory.LngLatInstance(element.Point.x, element.Point.y),
// 将 html 传给 content // 将 html 传给 content
content: markerContent, content: markerContent,
// 以 icon 的 [center bottom] 为原点 // 以 icon 的 [center bottom] 为原点
offset: new AMap.Pixel(-13, -30), //offset: MapFactory.PixelInstance(-13,-30,
offset: MapFactory.PixelInstance(-13, 30),
draggable: editable == '1' ? true : false, draggable: editable == '1' ? true : false,
}); } as IMarkOptions)
startMarker.id = element.Id startMarker.id = element.Id
startMarker.on('click', (e) => { startMarker.on('click', (e) => {
console.log(e)
this.clickId = e.target.id this.clickId = e.target.id
this.setAssetsProperty(this.canvasData.originaleveryStoreyData.data[e.target.id]) this.setAssetsProperty(this.canvasData.originaleveryStoreyData.data[e.target.id])
}); },this);
startMarker.on('dragend', (e) => { startMarker.on('dragend', (e) => {
// console.log('拖拽完成', e) // console.log('拖拽完成', e)
this.canvasData.isChange = true this.canvasData.isChange = true
this.clickId = e.target.id this.clickId = e.target.id
this.canvasData.originaleveryStoreyData.data[e.target.id].Point = { x: e.lnglat.lng, y: e.lnglat.lat } this.canvasData.originaleveryStoreyData.data[e.target.id].Point = { x: e.lnglat.lng, y: e.lnglat.lat }
}); },this);
this.planDataMarkers.push(startMarker) this.planDataMarkers.push(startMarker)
this.map.add(startMarker); this.map.add(startMarker);
} }
@ -1486,6 +1518,12 @@ export class CollectionToolsPlanComponent implements OnInit {
} }
//陈鹏飞↓↓↓ //陈鹏飞↓↓↓
//陈鹏飞↓↓↓ //陈鹏飞↓↓↓
//陈鹏飞↓↓↓ //陈鹏飞↓↓↓
@ -1642,7 +1680,7 @@ export class CollectionToolsPlanComponent implements OnInit {
//点击选中 平面图 楼层/区域 时 //点击选中 平面图 楼层/区域 时
isGis: boolean isGis: boolean
selectSitePlan(item, index) { selectSitePlan(item, index) {
// console.log('点击楼层', item) console.log('点击楼层', item)
if (item.isGis) { if (item.isGis) {
this.isGis = true this.isGis = true
} else { } else {
@ -1699,6 +1737,7 @@ export class CollectionToolsPlanComponent implements OnInit {
}, 0); }, 0);
} }
} }
hoverSitePlan(item,key){ hoverSitePlan(item,key){
if(key == this.selectSitePlanIndex){ if(key == this.selectSitePlanIndex){
if (this.element.nativeElement.querySelector('#rightOperate')) { if (this.element.nativeElement.querySelector('#rightOperate')) {
@ -1711,6 +1750,7 @@ export class CollectionToolsPlanComponent implements OnInit {
} }
} }
//新增平面图 楼层/区域 //新增平面图 楼层/区域
foundPanel(e) { foundPanel(e) {
e.stopPropagation() e.stopPropagation()
@ -1845,13 +1885,29 @@ export class CollectionToolsPlanComponent implements OnInit {
const isDelete = confirm('您确定要删除吗'); const isDelete = confirm('您确定要删除吗');
if (isDelete) { if (isDelete) {
if (this.checkedBuildingIndex == -1) { //总平面图 if (this.checkedBuildingIndex == -1) { //总平面图
let isHave = this.canvasData.allDisposalNode.find(items => { return items.sitePlanId === item.id })
if (isHave == undefined) {
this.http.delete(`/api/SitePlans/${item.id}`).subscribe(data => { this.http.delete(`/api/SitePlans/${item.id}`).subscribe(data => {
this.deleteShareData(item, -1) this.deleteShareData(item, -1)
}) })
} else {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('含有数据节点的楼层不允许删除', '确定', config);
}
} else { //楼层/区域 } else { //楼层/区域
let isHave = this.canvasData.allDisposalNode.find(items => { return items.buildingAreaId === item.id })
if (isHave == undefined) {
this.http.delete(`/api/BuildingAreas/${item.id}`).subscribe(data => { this.http.delete(`/api/BuildingAreas/${item.id}`).subscribe(data => {
this.deleteShareData(item, 1) this.deleteShareData(item, 1)
}) })
} else {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('含有数据节点的楼层不允许删除', '确定', config);
}
} }
} }
} }
@ -1870,17 +1926,13 @@ export class CollectionToolsPlanComponent implements OnInit {
delete data.data[key] delete data.data[key]
} }
} }
console.log('删除e',e)
console.log('删除建筑数据',data)
let newData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData)); let newData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
newData.data = JSON.stringify(newData.data) // 转换JSON 数据格式 newData.data = JSON.stringify(newData.data) // 转换JSON 数据格式
this.selectingSitePlan = this.sitePlanData[0] || {} this.selectingSitePlan = this.sitePlanData[0] || {}
this.sitePlanData[0] ? this.isGis = this.sitePlanData[0].isGis : null
this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据 this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据
this.selectSitePlanIndex = 0 this.selectSitePlanIndex = 0
this.canvasData.isChange = false this.canvasData.isChange = false
if (isCompany === -1) { if (isCompany === -1) {
console.log('保存建筑数据',newData)
this.http.post("/api/CompanyData", newData).subscribe(data => { }) this.http.post("/api/CompanyData", newData).subscribe(data => { })
this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据 this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
} else { } else {
@ -1914,12 +1966,6 @@ export class CollectionToolsPlanComponent implements OnInit {
item.name = item.name + '(副本)' item.name = item.name + '(副本)'
item.order = this.sitePlanData[this.sitePlanData.length - 1].order + 1 item.order = this.sitePlanData[this.sitePlanData.length - 1].order + 1
this.http.post('/api/SitePlans', item).subscribe((data: any) => { this.http.post('/api/SitePlans', item).subscribe((data: any) => {
for (const key in paramsData) {
if (Object.prototype.hasOwnProperty.call(paramsData, key)) {
const element = paramsData[key];
element.FloorId = data.id
}
}
let newData = { let newData = {
version: "2.0", version: "2.0",
id: "", id: "",
@ -1976,12 +2022,6 @@ export class CollectionToolsPlanComponent implements OnInit {
item.name = item.name + '(副本)' item.name = item.name + '(副本)'
item.order = this.sitePlanData[this.sitePlanData.length - 1].order + 1 item.order = this.sitePlanData[this.sitePlanData.length - 1].order + 1
this.http.post('/api/BuildingAreas', item, { params: this.params }).subscribe((data: any) => { this.http.post('/api/BuildingAreas', item, { params: this.params }).subscribe((data: any) => {
for (const key in paramsData) {
if (Object.prototype.hasOwnProperty.call(paramsData, key)) {
const element = paramsData[key];
element.FloorId = data.id
}
}
let newData = { let newData = {
version: "2.0", version: "2.0",
id: "", id: "",
@ -2225,7 +2265,7 @@ export class CollectionToolsPlanComponent implements OnInit {
// console.log('选中图片',this.selectImage) // console.log('选中图片',this.selectImage)
this.selectImageIndex = index this.selectImageIndex = index
if (this.isGis) { if (this.isGis) {
// console.log(this.map)
} else { } else {
this.canvasData.selectTemplateData = items this.canvasData.selectTemplateData = items
this.canvas.beginPaint() this.canvas.beginPaint()
@ -2254,32 +2294,31 @@ export class CollectionToolsPlanComponent implements OnInit {
'</div>'; '</div>';
// 将 icon 传入 marker // 将 icon 传入 marker
let startMarker = new AMap.Marker({ let startMarker: IMarker = MapFactory.MarkerInstance({
position: new AMap.LngLat(e.lnglat.lng, e.lnglat.lat), position: MapFactory.LngLatInstance(e.lnglat.lng, e.lnglat.lat),
// 将 html 传给 content // 将 html 传给 content
content: markerContent, content: markerContent,
// 以 icon 的 [center bottom] 为原点 // 以 icon 的 [center bottom] 为原点
offset: new AMap.Pixel(-13, -30), offset: MapFactory.PixelInstance(-13, -30),
draggable: true, draggable: true,
}); } as IMarkOptions);
startMarker.id = id startMarker.id = id
startMarker.on('click', (e) => { startMarker.on('click', (e) => {
this.clickId = e.target.id this.clickId = e.target.id
this.setAssetsProperty(this.canvasData.originaleveryStoreyData.data[e.target.id]) this.setAssetsProperty(this.canvasData.originaleveryStoreyData.data[e.target.id])
}); },this);
startMarker.on('dragend', (e) => { startMarker.on('dragend', (e) => {
// console.log('拖拽完成', e) // console.log('拖拽完成', e)
this.canvasData.isChange = true this.canvasData.isChange = true
this.clickId = e.target.id this.clickId = e.target.id
this.canvasData.originaleveryStoreyData.data[e.target.id].Point = { x: e.lnglat.lng, y: e.lnglat.lat } this.canvasData.originaleveryStoreyData.data[e.target.id].Point = { x: e.lnglat.lng, y: e.lnglat.lat }
}); },this);
//将图标数据添加 //将图标数据添加
let itemData = JSON.parse(JSON.stringify(this.selectImage)) let itemData = JSON.parse(JSON.stringify(this.selectImage))
itemData.id = id itemData.id = id
itemData.point = { x: e.lnglat.lng, y: e.lnglat.lat } itemData.point = { x: e.lnglat.lng, y: e.lnglat.lat }
itemData.floorId = this.selectingSitePlan.id
itemData = this.canvasData.deserialize(JSON.stringify(itemData))//反序列化为大写 itemData = this.canvasData.deserialize(JSON.stringify(itemData))//反序列化为大写
// 添加楼层数据 // 添加楼层数据
this.canvasData.originaleveryStoreyData.data[id] = itemData; this.canvasData.originaleveryStoreyData.data[id] = itemData;
@ -2295,11 +2334,264 @@ export class CollectionToolsPlanComponent implements OnInit {
} }
//处置预案
allFirePlan: any = []; //所有灾情
selectDisposalNode: string = ''; //当前点击tree节点 css选中样式
//获取所有灾情
getAllFirePlan() {
let params = { componentId: sessionStorage.getItem('planId') }
this.http.get('/api/Disasters', { params: params }).subscribe((data: any) => {
if (!data.length) { //该 单位没有灾情时
let msg = {
name: '灾情',
modifiedTime: new Date(),
planComponentId: sessionStorage.getItem('planId')
}
this.http.post('/api/Disasters', msg).subscribe(data => {
this.allFirePlan.push(data)
let params = { disasterId: this.allFirePlan[0].id || '' }
this.http.get('/api/DisposalNodes', { params: params }).subscribe(data => { //所有处置节点
this.canvasData.allDisposalNode = data
})
})
} else { //单位 有灾情时
this.allFirePlan = data
let params = { disasterId: this.allFirePlan[0].id || '' }
this.http.get('/api/DisposalNodes', { params: params }).subscribe(data => { //所有处置节点
this.canvasData.allDisposalNode = data
})
}
})
}
//获取所有处置节点
getDisposalNode() {
this.selectDisposalNode = ''
let params = { disasterId: this.allFirePlan[0].id || '' }
this.http.get('/api/DisasterData/Markers', { params: params }).subscribe(data => { //灾情标签信息
this.canvasData.allNodeMarkers = data
this.mateFireForce()
})
this.http.get('/api/DisposalNodes', { params: params }).subscribe(data => { //处置节点
this.canvasData.allDisposalNode = data
this.handleHybridTree()
})
}
treeData: any = []; //渲染tree处理完成数据
defaultExpandedKeys: any = []; //首次渲染 tree展开状态
//处理 节点 Tree数据
handleHybridTree() {
this.defaultExpandedKeys = []
let treeData = []
let data = JSON.parse(JSON.stringify(this.canvasData.allDisposalNode || []))
data.forEach(element => {
this.defaultExpandedKeys.push(element.id)
element.title = element.name //name
element.key = element.id //id
element.children = [] //children
if (element.sitePlanId || element.buildingAreaId) { //是数据节点
element.isLeaf = true
element.isDataNode = true
} else { //不是数据节点
element.isLeaf = false
element.isDataNode = false
}
data.forEach(item => {
item.parentId === element.id ? element.children.push(item) : null
})
});
data.forEach(element => {
!element.parentId ? treeData.push(element) : null
})
this.treeData = [...treeData]
this.defaultExpandedKeys = [...this.defaultExpandedKeys]
}
//刷新 treeData 保存已展开节点
refurbishTreeData() {
this.defaultExpandedKeys = []
let params = { disasterId: this.allFirePlan[0].id || '' }
this.http.get('/api/DisposalNodes', { params: params }).subscribe(nodeData => { //处置节点
this.canvasData.allDisposalNode = nodeData
let oldTreeData = this.nzTreeComponent.getExpandedNodeList()
oldTreeData.forEach(item => {
this.defaultExpandedKeys.push(item.key)
})
let treeData = []
let data = JSON.parse(JSON.stringify(this.canvasData.allDisposalNode || []))
data.forEach(element => {
element.title = element.name //name
element.key = element.id //id
element.children = [] //children
if (element.sitePlanId || element.buildingAreaId) { //是数据节点
element.isLeaf = true
element.isDataNode = true
} else { //不是数据节点
element.isLeaf = false
element.isDataNode = false
}
data.forEach(item => {
item.parentId === element.id ? element.children.push(item) : null
})
});
data.forEach(element => {
!element.parentId ? treeData.push(element) : null
})
this.treeData = [...treeData]
this.defaultExpandedKeys = [...this.defaultExpandedKeys]
})
}
sitePlanIcon = { fire: 0, force: 0 } // 总平面图 火源/力量 图标 是否展示
//刷新 建筑楼层 匹配 火源/力量 图标
mateFireForce() {
let data = this.canvasData.allNodeMarkers.markers || {}
for (let key in data) { //遍历 火/力量 图标
this.sitePlanData.forEach(element => { //楼层
if (element.id == key) { // 相匹配时
data[key].fireCount != 0 ? element.fire = 1 : element.fire = 0
data[key].forceCount != 0 ? element.force = 1 : element.force = 0
}
});
this.allBuildings.forEach(element => { //建筑
if (element.id == key) { // 相匹配时
data[key].fireCount != 0 ? element.fire = 1 : element.fire = 0
data[key].forceCount != 0 ? element.force = 1 : element.force = 0
}
});
if (this.params.companyId == key) { //总平面图时
data[key].fireCount != 0 ? this.sitePlanIcon.fire = 1 : this.sitePlanIcon.fire = 0
data[key].forceCount != 0 ? this.sitePlanIcon.force = 1 : this.sitePlanIcon.force = 0
}
}
let buildingMSG = this.canvasData.allNodeMarkers.highlightMarkers || {}
for (let key in buildingMSG) {
if (key === this.canvasData.selectPanelPoint.DisposalNodeId) {
for (let keys in buildingMSG[key]) {
this.sitePlanData.forEach(element => { //楼层
if (element.id === keys) {
buildingMSG[key][keys].fireCount != 0 ? element.fire = 2 : null
buildingMSG[key][keys].forceCount != 0 ? element.force = 2 : null
}
});
this.allBuildings.forEach(element => { //建筑
if (element.id === keys) { // 相匹配时
buildingMSG[key][keys].fireCount != 0 ? element.fire = 2 : null
buildingMSG[key][keys].forceCount != 0 ? element.force = 2 : null
}
});
if (this.params.companyId === keys) { //总平面图时
buildingMSG[key][keys].fireCount != 0 ? this.sitePlanIcon.fire = 2 : null
buildingMSG[key][keys].forceCount != 0 ? this.sitePlanIcon.force = 2 : null
}
}
}
}
}
// 切换 基本信息时 刷新 删除 建筑楼层 自定义属性
mateDeleteCustomize() {
this.canvasData.selectPanelPointBaseData = { description: '', notes: '', weather: '', airTemperature: '', windDirection: '', windScale: '' }
this.defaultExpandedKeys = []
this.sitePlanIcon = { fire: 0, force: 0 }
this.sitePlanData.forEach(element => { //楼层
delete element.fire
delete element.force
});
this.allBuildings.forEach(element => { //建筑
delete element.fire
delete element.force
});
}
//计算差异
countValue(e) {
e.stopPropagation()
let params = { disasterId: this.allFirePlan[0].id || '' }
this.http.get('/api/DisasterData/Diffs', { params: params }).subscribe(data => {
this.canvasData.allNodeMarkers = data
this.mateFireForce()
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('计算差异完成', '确定', config);
})
}
//复制 处置预案 节点
copyPanelPoint(e, item, treeData) {
e.stopPropagation()
if (confirm(`确定要复制 ${item.title} ?`)) {
let params = { id: item.origin.id }
let order
if (item.level == 0) {
treeData.length ? order = treeData[treeData.length - 1].order + 1 : order = 0
} else {
let parent = item.getParentNode() //获取父节点
parent.origin.children.length ? order = parent.origin.children[parent.origin.children.length - 1].order + 1 : order = 0
}
let data = {
name: item.title + '(副本)',
level: item.level,
order: order,
description: '',
disasterId: item.origin.disasterId || '',
parentId: item.origin.parentId || null,
planComponentId: item.origin.planComponentId || '',
}
this.http.post('/api/DisposalNodes/Clone', data, { params: params }).subscribe(data => {
this.refurbishTreeData()
})
} //isTrue
}
//删除 处置预案 节点
deletePanelPoint(e, item) {
e.stopPropagation()
if (confirm(`确定要删除 ${item.name} ?`)) {
this.http.delete(`/api/DisposalNodes/${item.id}`).subscribe(data => {
this.refurbishTreeData()
})
}
}
//点击 处置Tree节点
selectanelPoint(e) {
if (!e.buildingAreaId && !e.sitePlanId) { //当前节点 不是 数据节点 时
let msg = this.canvasData.findDisposalNode(e.id)
this.canvasData.selectPanelPointBaseData = msg
this.selectDisposalNode == msg.id ? this.selectDisposalNode = '' : this.selectDisposalNode = msg.id //选中 节点
} else if (e.buildingAreaId || e.sitePlanId) { //当前节点 是 数据节点 时
let msg = this.canvasData.findDisposalNode(e.parentId)
this.canvasData.selectPanelPointBaseData = msg
this.selectDisposalNode = e.parentId //选中 节点
if (this.canvasData.selectPanelPoint.DisposalNodeId != e.id) { //选择节点 不是当前节点时
let params = { nodeId: e.id }
let parameter = { //查询 节点 对应 建筑/楼层 index,id
buildingIndex: e.sitePlanId ? -1 : this.allBuildings.findIndex(item => { return item.id === e.buildingId }), //总平面图/建筑 index
storeyId: e.sitePlanId ? e.sitePlanId : e.buildingAreaId, //楼层id
}
this.http.get('/api/DisposalNodeData', { params: params }).subscribe(data => {
this.canvasData.selectPanelPoint = this.canvasData.deserialize(JSON.stringify(data || new DisposalNodeData())) //选择 当前 节点
this.canvasData.selectPanelPoint.Data = this.canvasData.deserialize(this.canvasData.selectPanelPoint.Data)
this.seekPanelPoint(parameter)
})
} //if
} //else if
}
//查找 数据节点 对应 建筑/楼层 //查找 数据节点 对应 建筑/楼层
seekPanelPoint(paramsData) { seekPanelPoint(paramsData) {
this.checkedBuildingIndex = paramsData.buildingIndex this.checkedBuildingIndex = paramsData.buildingIndex
if (paramsData.buildingIndex == -1) { //总平面图时 if (paramsData.buildingIndex == -1) { //总平面图时
// console.log('走了1')
this.beforeOneCheckedBuilding = { name: "总平面图" } this.beforeOneCheckedBuilding = { name: "总平面图" }
let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素 let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素
let planData = this.getSitePlanCompanyData() //获取 单位 数据 let planData = this.getSitePlanCompanyData() //获取 单位 数据
@ -2309,20 +2601,17 @@ export class CollectionToolsPlanComponent implements OnInit {
this.selectingSitePlan = this.sitePlanData[index] || {} this.selectingSitePlan = this.sitePlanData[index] || {}
this.canvasData.selectStorey = this.sitePlanData[index] || {} //服务中 存一份数据 this.canvasData.selectStorey = this.sitePlanData[index] || {} //服务中 存一份数据
this.selectSitePlanIndex = index this.selectSitePlanIndex = index
Promise.all([fireData, planData]).then((res) => { Promise.all([fireData, planData]).then((res) => {
this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据 this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
}) })
}) //get }) //get
} else { //建筑时 } else { //建筑时
// console.log('走了2')
// console.log('allBuildings', this.allBuildings)
// console.log('paramsData', paramsData)
this.beforeOneCheckedBuilding = this.allBuildings[paramsData.buildingIndex] this.beforeOneCheckedBuilding = this.allBuildings[paramsData.buildingIndex]
let params = { buildingId: this.beforeOneCheckedBuilding.id } let params = { buildingId: this.beforeOneCheckedBuilding.id }
let fireData = this.getFireElements(this.beforeOneCheckedBuilding.buildingTypes[0].id || '') //获取建筑下 消防要素 let fireData = this.getFireElements(this.beforeOneCheckedBuilding.buildingTypes[0].id || '') //获取建筑下 消防要素
let planData = this.getBuildingData(params) //获取 建筑 数据 let planData = this.getBuildingData(params) //获取 建筑 数据
this.http.get('/api/BuildingAreas', { params }).subscribe(data => { this.http.get('/api/BuildingAreas', { params }).subscribe(data => {
// console.log('BuildingAreas', data)
this.sitePlanData = data this.sitePlanData = data
let index = this.sitePlanData.findIndex(item => { return item.id === paramsData.storeyId }) let index = this.sitePlanData.findIndex(item => { return item.id === paramsData.storeyId })
this.selectingSitePlan = this.sitePlanData[index] || {} this.selectingSitePlan = this.sitePlanData[index] || {}

2
src/app/working-area/model/axImageShape.ts

@ -236,7 +236,7 @@ export class AxImageShape extends AxShape {
if (this.rightDrag) { if (this.rightDrag) {
this.rightDrag = false; this.rightDrag = false;
this.image.anchor.set(0.5); this.image.anchor.set(0.5);
this.image.position.set(this.image.position.x + (this.image.width / 2)); this.image.position.set(this.image.position.x + (this.image.width / 2), this.image.position.y);
} }
}); });
this.right.visible = false; this.right.visible = false;

23
src/app/working-area/model/axShape.ts

@ -42,7 +42,7 @@ export class AxShape extends Graphics {
} }
if (this.allowEdit) { if (this.allowEdit) {
this.mouseDragging = true; this.mouseDragging = true;
this.mousePosition = new PIXI.Point(event.data.global.x, event.data.global.y); this.mousePosition = event.data.getLocalPosition(this.workingArea.backgroundImage);
} }
}) })
.on('pointerup', event => { .on('pointerup', event => {
@ -53,15 +53,26 @@ export class AxShape extends Graphics {
}) })
.on('pointermove', event => { .on('pointermove', event => {
if (this.mouseDragging) { if (this.mouseDragging) {
// const newPosition = event.data.getLocalPosition(this.workingArea.backgroundImage);
// const x = newPosition.x - this.x;
// const y = newPosition.y - this.y;
// this.workingArea.selection.all().forEach(item => {
// item.x += x;
// item.y += y;
// item.assetData.Point = new PIXI.Point(item.x, item.y);
// this.workingArea.canvasData.isChange = true;
// });
const newPosition = event.data.getLocalPosition(this.workingArea.backgroundImage);
const offsetX = newPosition.x - this.mousePosition.x;
const offsetY = newPosition.y - this.mousePosition.y;
this.workingArea.selection.all().forEach(item => { this.workingArea.selection.all().forEach(item => {
const x = event.data.global.x - this.mousePosition.x; item.x += offsetX;
const y = event.data.global.y - this.mousePosition.y; item.y += offsetY;
item.x += x * (1 / this.workingArea.camera2D.scale.x);
item.y += y * (1 / this.workingArea.camera2D.scale.y);
item.assetData.Point = new PIXI.Point(item.x, item.y); item.assetData.Point = new PIXI.Point(item.x, item.y);
this.workingArea.canvasData.isChange = true; this.workingArea.canvasData.isChange = true;
}); });
this.mousePosition = new PIXI.Point(event.data.global.x, event.data.global.y); this.mousePosition = newPosition;
} }
}) })
.on('rightclick', event => { .on('rightclick', event => {

2
src/app/working-area/working-area.component.ts

@ -175,7 +175,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
* - * -
* - * -
*/ */
public VERSION = '1.5.0.20210507_rc'; public VERSION = '1.5.1.20210715';
/** /**
* *
*/ */

13
src/assets/kmap/Kmap.config.json

@ -0,0 +1,13 @@
{
"DIST_URL": "./kmap-service-main-kd.js",
"TOKEN": "E203F172F1A54CD5B3CEDD107B8F4E43",
"CT_SERVER_URL": "https://10.14.183.81",
"USERMNG_SERVER": "",
"SEARCH_SERVER": "",
"WS_SERVER": "",
"ROUTING_SERVER": "",
"STORAGE_SERVER": "",
"COORDINATETYPE": "",
"INDOOR_MAP_MAX_ZOOM": 24
}

81
src/assets/kmap/kmap-service-main-kd.js

File diff suppressed because one or more lines are too long

14
src/index.html

@ -20,16 +20,16 @@
</head> </head>
<body> <body>
<app-root></app-root> <app-root></app-root>
</body> </body>
<script src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script> <!-- <script type="text/javascript" src="./assets/kmap/kmap-service-main-kd.js"></script> -->
<script src="http://10.81.73.39:8000/webapi/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="https://webapi.amap.com/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/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="/assets/html2canvas.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/jquery.js"></script>
<script type="text/javascript" src="/assets/wordexport/FileSaver.js"></script> <script type="text/javascript" src="/assets/wordexport/FileSaver.js"></script>
<script type="text/javascript" src="/assets/wordexport/jquery.wordexport.js"></script> --> <script type="text/javascript" src="/assets/wordexport/jquery.wordexport.js"></script>
</html> </html>

3
src/modules/map/declare/component/SearchDownListPlugins/SearchDownList.html

@ -0,0 +1,3 @@
<div class="content" [ngStyle]="{'left': leftCss,'top': topCss,'min-width': minWidthCss}" *ngIf="searchList.length">
<div *ngFor="let item of searchList" (click)="select(item)" class="item">{{item.name}}</div>
</div>

16
src/modules/map/declare/component/SearchDownListPlugins/SearchDownList.scss

@ -0,0 +1,16 @@
.content{
position: absolute;
z-index: 1024;
background-color: #fefefe;
border: 1px solid #d1d1d1;
bottom: auto;
}
.item {
white-space: nowrap;
font-size: 12px;
cursor: pointer;
padding: 4px;
}
.item:hover {
background-color: #7fb9f7;
}

53
src/modules/map/declare/component/SearchDownListPlugins/SearchDownList.ts

@ -0,0 +1,53 @@
import { Component, OnInit, Inject } from '@angular/core';
import { AutocompleteSelect, HtmlRender } from '../../map';
type ClickHandler = (data: AutocompleteSelect) => void;
@Component({
selector: 'SearchDownList',
templateUrl: './SearchDownList.html',
styleUrls: ['./SearchDownList.scss']
})
export class SearchDownList implements OnInit {
constructor() {}
public $input; //input
public searchList: AutocompleteSelect[] = []; //list
public leftCss: string = '0px';
public topCss: string = '0px';
public minWidthCss: string = '0px';
private clickHandler: ClickHandler;
ngOnInit(): void {
window.onresize = () => {
if (this.$input) {
let Dom = this.$input.getBoundingClientRect()
this.leftCss = `${Dom.left + 3}px`
this.topCss = `${Dom.top + Dom.height + 3}px`
this.minWidthCss = `${Dom.width}px`
}
}
}
setClickHander(handler: ClickHandler) {
this.clickHandler = handler;
}
clearClickHander() {
this.clearClickHander = null;
}
init(inputElement: HtmlRender): void {
this.$input = inputElement
let Dom = this.$input.getBoundingClientRect()
this.leftCss = `${Dom.left + 3}px`
this.topCss = `${Dom.top + Dom.height + 3}px`
this.minWidthCss = `${Dom.width}px`
}
// 触发 select
select(e) {
this.clearClickHander && this.clickHandler(e);
this.searchList = [];
}
}

135
src/modules/map/declare/factory.ts

@ -0,0 +1,135 @@
const mapSupplier: number = 1; // 1:高德, 2:科达
import { IMap, IMapOptions, IMarker, IPixel, IMarkOptions, ILngLat, ILayer, ICircle, IMarkerCluster, IRenderClusterMarker, IInfoWindow, IMouseTool, IIcon, ISize, IIconOptions, ITileLayer, IDriving, IDrivingOptions, IAutocomplete, IPlaceSearch } from './map'
import { GaodeCircle, GaodeIcon, GaodeInfoWindow, GaodeLayer, GaoDeLngLat, GaoDeMap, GaoDeMarker, GaoDeMarkerCluster, GaodeMouseTool, GaoDePixel, GaoDeRenderClusterMarker, GaodeTileLayer, GaodeSize, GaodeDriving, GaodeAutocomplete, GaodePlaceSearch } from './gaode-map'
import { KedaAutocomplete, KedaCircle, KedaDriving, KedaInfoWindow, KedaLayer, KeDaLngLat, KeDaMap, KeDaMarker, KedaMarkerCluster, KedaMouseTool, KeDaPixel, KedaPlaceSearch, KedaRenderClusterMarkerr, KedaTileLayer } from './keda-map';
import MapTools from './map-tools';
export class MapFactory {
public static MapInstance(container: string, options: IMapOptions | any,plugins?:string[]): IMap {
let config = MapTools.ExplicitConvert(options);
switch (mapSupplier) {
case 1: return new GaoDeMap(container, config,plugins);
case 2: return new KeDaMap(container, config);
default: return null;
}
}
public static PixelInstance(x: number, y: number): IPixel {
switch (mapSupplier) {
case 1: return new GaoDePixel(x, y);
case 2: return new KeDaPixel(x, y);
default: return null;
}
}
public static MarkerInstance(options: IMarkOptions): IMarker {
switch (mapSupplier) {
case 1: return new GaoDeMarker(options);
case 2: return new KeDaMarker(options);
default: return null;
}
}
public static MarkerClusterInstance(map: IMap, list: Object[], renderObj: { gridSize: number, render: IRenderClusterMarker }): IMarkerCluster {
switch (mapSupplier) {
case 1: return new GaoDeMarkerCluster(map, list, renderObj);
case 2: return new KedaMarkerCluster(map, list, renderObj);
default: return null;
}
}
public static LngLatInstance(x: number, y: number): ILngLat {
switch (mapSupplier) {
case 1: return new GaoDeLngLat(x, y);
case 2: return new KeDaLngLat(x, y);
default: return null;
}
}
public static IconInstance(options: IIconOptions): IIcon { //科达map 暂不需要
switch (mapSupplier) {
case 1: return new GaodeIcon(options);
default: return null;
}
}
public static SizeInstance(x: number, y: number): ISize { //科达map 暂不需要
switch (mapSupplier) {
case 1: return new GaodeSize(x, y);
default: return null;
}
}
public static TileLayerInstance(): ITileLayer {
switch (mapSupplier) {
case 1: return new GaodeTileLayer();
case 2: return new KedaTileLayer();
default: return null;
}
}
public static LayerInstance(options: any): ILayer {
switch (mapSupplier) {
case 1: return new GaodeLayer(options);
case 2: return new KedaLayer(options);
default: return null;
}
}
public static DrivingInstance(options: IDrivingOptions): IDriving {
switch (mapSupplier) {
case 1: return new GaodeDriving(options);
case 2: return new KedaDriving(options);
default: return null;
}
}
public static AutocompleteInstance(options: any,component: any): IAutocomplete {
switch (mapSupplier) {
case 1: return new GaodeAutocomplete(options,component);
case 2: return new KedaAutocomplete(options,component);
default: return null;
}
}
public static PlaceSearchInstance(component: any): IPlaceSearch {
switch (mapSupplier) {
case 1: return new GaodePlaceSearch(component);
case 2: return new KedaPlaceSearch(component);
default: return null;
}
}
public static MouseToolInstance(map: IMap): IMouseTool {
switch (mapSupplier) {
case 1: return new GaodeMouseTool(map);
case 2: return new KedaMouseTool(map);
default: return null;
}
}
public static InfoWindowInstance(options: any): IInfoWindow {
switch (mapSupplier) {
case 1: return new GaodeInfoWindow(options);
case 2: return new KedaInfoWindow(options);
default: return null;
}
}
public static CircleInstance(options: any): ICircle {
switch (mapSupplier) {
case 1: return new GaodeCircle(options);
case 2: return new KedaCircle(options);
default: return null;
}
}
public static RenderClusterMarkerInstance(): IRenderClusterMarker {
switch (mapSupplier) {
case 1: return new GaoDeRenderClusterMarker();
case 2: return new KedaRenderClusterMarkerr();
default: return null;
}
}
}

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

@ -0,0 +1,488 @@
import { HtmlRender, ICircle, IIcon, IIconOptions, ILayer, ILngLat, IMap, IMapOptions, IMarker, IMarkerCluster, IMarkOptions, IMouseTool, IInfoWindow, IPixel, IRenderClusterMarker, ISelf, ISize, PixelRender, ITileLayer, IDriving, IDrivingOptions, IAutocomplete, IPlaceSearch, AutocompleteSearchCallback, AutocompleteSelectCallback, PlaceSearchCallback, AutocompleteSearch, DrivingSearchCallback } from './map'
import MapTools from './map-tools';
declare var AMap: any;
declare var AMapUI: any;
class GaodeBasic implements ISelf {
self: any;
discriminator: string = "ISelf";
}
export class GaoDeMap extends GaodeBasic implements IMap {
/// plugins:同步加载插件
constructor(container: string, options: IMapOptions, plugins?: string[]) {
super();
this.self = new AMap.Map(container, options);
if (!!plugins && plugins.length) {
for (var i in plugins) {
let name = plugins[i];
if (name.indexOf('AMap.') == -1) continue;
let pObj = eval(`new ${plugins[i]}()`);
this.self.plugin(pObj);
}
}
}
containerToLngLat(e: any) {
return this.self.containerToLngLat(e)
}
clearMap() {
return this.self.clearMap();
}
distance(a: number[], b: number[]) {
return AMap.GeometryUtil.distance(a, b);
}
getCity(callback: Function) {
return this.self.getCity(callback)
}
setZoomAndCenter(zoom: number, pos: number[]) {
return this.self.setZoomAndCenter(zoom, pos)
}
plugin(pluginNames: string[], callback: Function) {
let names = pluginNames.filter(s => s.indexOf("AMap.") == 0);
return this.self.plugin(names, callback)
}
getBounds() {
return this.self.getBounds()
}
add(obj: IMarker | any) {
return this.self.add(obj.self)
}
remove(obj: any) {
return this.self.remove(obj.self)
}
setCity(city: string) {
return this.self.setCity(city)
}
setZoom(zoom) {
return this.self.setZoom(zoom)
}
setCenter(pos: any) {
return this.self.setCenter(pos)
}
getCenter(): ILngLat {
let d = this.self.getCenter();
return new GaoDeLngLat(0, 0, d);
}
getZoom() {
return this.self.getZoom();
}
on(eventName: string, callback: Function): void {
return this.self.on(eventName, callback);
}
setAdministrativeAreaStyle(component: any, getData?: Function, setData?: Function) {//自定义 行政区划 样式
let that = this
let level = sessionStorage.getItem("level")
AMapUI.loadUI(['geo/DistrictExplorer'], (DistrictExplorer) => {
let colors = [
"#3366cc", "#dc3912", "#ff9900", "#109618", "#990099", "#0099c6", "#dd4477", "#66aa00",
"#b82e2e", "#316395", "#994499", "#22aa99", "#aaaa11", "#6633cc", "#e67300", "#8b0707",
"#651067", "#329262", "#5574a6", "#3b3eac"
];
//创建一个实例
let districtExplorer = new DistrictExplorer({
map: that.self,
eventSupport: true, //打开事件支持
});
let adcode = 310000 //上海行政编码
districtExplorer.loadAreaNode(adcode, (error, areaNode) => {
//更新地图视野
that.self.setBounds(areaNode.getBounds(), null, null, true);
//设置定位节点,支持鼠标位置识别
//注意节点的顺序,前面的高优先级
districtExplorer.setAreaNodesForLocating(areaNode);
//清除已有的绘制内容
districtExplorer.clearFeaturePolygons();
//绘制子区域
districtExplorer.renderSubFeatures(areaNode, (feature, i) => {
let fillColor = colors[i % colors.length];
let strokeColor = colors[colors.length - 1 - i % colors.length];
return {
cursor: 'default',
bubble: true,
strokeColor: strokeColor, //线颜色
strokeOpacity: 1, //线透明度
strokeWeight: 1, //线宽
fillColor: fillColor, //填充色
fillOpacity: 0.5, //填充透明度
};
});
//绘制父区域
districtExplorer.renderParentFeature(areaNode, {
cursor: 'default',
bubble: true,
strokeColor: 'black', //线颜色
strokeOpacity: 1, //线透明度
strokeWeight: 1, //线宽
fillColor: null, //填充色
fillOpacity: 0.5, //填充透明度
});
// 更新地图视野以适合区划面
that.self.setFitView(districtExplorer.getAllFeaturePolygons());
});
if (level == "0" || level == "1" || level == "2") {
//区域内点击
districtExplorer.on('featureClick', (e, feature) => {
getData && getData.call(component, feature);
let props = feature.properties;
adcode = props.adcode
let fillColor2
if (props.level == 'city') {
fillColor2 = null
} else {
fillColor2 = '#d0daee'
}
districtExplorer.loadAreaNode(adcode, (error, areaNode) => {
//设置定位节点,支持鼠标位置识别
//注意节点的顺序,前面的高优先级
districtExplorer.setAreaNodesForLocating(areaNode);
//清除已有的绘制内容
districtExplorer.clearFeaturePolygons();
//绘制子区域
districtExplorer.renderSubFeatures(areaNode, (feature, i) => {
let fillColor = colors[i % colors.length];
let strokeColor = colors[colors.length - 1 - i % colors.length];
return {
cursor: 'default',
bubble: true,
strokeColor: strokeColor, //线颜色
strokeOpacity: 1, //线透明度
strokeWeight: 1, //线宽
fillColor: fillColor, //填充色
fillOpacity: 0.5, //填充透明度
};
});
//绘制父区域
districtExplorer.renderParentFeature(areaNode, {
cursor: 'default',
bubble: true,
strokeColor: 'black', //线颜色
strokeOpacity: 1, //线透明度
strokeWeight: 1, //线宽
fillColor: fillColor2, //填充色
fillOpacity: 0.5, //填充透明度
});
// 更新地图视野以适合区划面
that.self.setFitView(districtExplorer.getAllFeaturePolygons());
});
});
districtExplorer.on('outsideClick', (e) => {
setData && setData.call(component);
let adcode = 310000
districtExplorer.loadAreaNode(adcode, (error, areaNode) => {
//设置定位节点,支持鼠标位置识别
//注意节点的顺序,前面的高优先级
districtExplorer.setAreaNodesForLocating(areaNode);
//清除已有的绘制内容
districtExplorer.clearFeaturePolygons();
//绘制子区域
districtExplorer.renderSubFeatures(areaNode, (feature, i) => {
let fillColor = colors[i % colors.length];
let strokeColor = colors[colors.length - 1 - i % colors.length];
return {
cursor: 'default',
bubble: true,
strokeColor: strokeColor, //线颜色
strokeOpacity: 1, //线透明度
strokeWeight: 1, //线宽
fillColor: fillColor, //填充色
fillOpacity: 0.5, //填充透明度
};
});
//绘制父区域
districtExplorer.renderParentFeature(areaNode, {
cursor: 'default',
bubble: true,
strokeColor: 'black', //线颜色
strokeOpacity: 1, //线透明度
strokeWeight: 1, //线宽
fillColor: null, //填充色
fillOpacity: 0.5, //填充透明度
});
// 更新地图视野以适合区划面
that.self.setFitView(districtExplorer.getAllFeaturePolygons());
});
})
}
}); //end
}
}
export class GaoDePixel extends GaodeBasic implements IPixel {
constructor(x: number, y: number) {
super();
this.x = x;
this.y = y;
this.self = new AMap.Pixel(x, y);
}
getArray(): number[] {
return [this.x, this.y];
}
x: number;
y: number;
}
export class GaoDeMarker extends GaodeBasic implements IMarker {
constructor(options: IMarkOptions) {
super();
let conf = MapTools.ExplicitConvert(options);
this.self = new AMap.Marker(conf);
this._position = this.self._position;
}
getLngLatByMarkerEvent(map: IMap, e: any): ILngLat {
return map.containerToLngLat(e.pixel);
}
setContent(html: string) {
return this.self.setContent(html)
}
setPosition(x: ILngLat | number[]) {
x = (x as ILngLat).getArray == undefined ? x : (x as ILngLat).getArray();
return this.self.setPosition(x)
}
_position: number[]
setMap() {
return this.self.setMap(null)
}
get id(): string {
return this.self.id;
}
set id(str: string) {
this.self.id = str;
}
on(eventName: string, callback: Function): void {
return this.self.on(eventName, callback);
}
}
export class GaoDeMarkerCluster extends GaodeBasic implements IMarkerCluster {
constructor(map: IMap, list: Object[], options: any) {
super();
let conf = MapTools.ExplicitConvert(options);
AMap.plugin('AMap.MarkerClusterer', () => {
this.self = new AMap.MarkerCluster(map.self, list, conf)
});
}
on(eventName: string, callback: Function): void {
this.self.on(eventName, callback);
}
setData(list: any[]) {
this.self.setData(list)
}
}
export class GaoDeLngLat extends GaodeBasic implements ILngLat {
constructor(x: number, y: number, me?: any) {
super();
if (me == undefined)
this.self = new AMap.LngLat(x, y);
else
this.self = me;
}
typeName = "LngLat";
get KL(): number {
return this.lng;
}
get kT(): number {
return this.lat;
}
getArray(): number[] {
return [this.lng, this.lat];
}
get lng(): number {
return this.self.lng;
}
get lat(): number {
return this.self.lat;
}
offset(x: number, y: number): ILngLat {
return this.self.offset(x, y)
}
}
export class GaodeLayer extends GaodeBasic implements ILayer {
constructor(options: any) {
super();
this.self = new AMap.createDefaultLayer(options);
}
}
export class GaodeIcon extends GaodeBasic implements IIcon {
constructor(options: IIconOptions) {
super();
options.size = options.size.self
options.imageSize = options.imageSize.self
this.self = new AMap.Icon(options);
}
}
export class GaodeSize extends GaodeBasic implements ISize {
constructor(x: number, y: number) {
super();
this.self = new AMap.Size(x, y);
}
}
export class GaodeTileLayer extends GaodeBasic implements ITileLayer {
constructor() {
super();
}
Satellite() {
this.self = new AMap.TileLayer.Satellite()
return this
}
RoadNet() {
this.self = new AMap.TileLayer.RoadNet()
return this
}
}
export class GaodeDriving extends GaodeBasic implements IDriving {
constructor(options: IDrivingOptions) {
super();
options.map = options.map.self
AMap.plugin('AMap.Driving', () => {
this.self = new AMap.Driving(options)
})
}
search(component: any, posStart: ILngLat, posEnd: ILngLat, callback: DrivingSearchCallback) {
return this.self.search(posStart.getArray(), posEnd.getArray(), (status, result)=>{
callback.call(component,status,result)
})
}
clear() {
return this.self.clear()
}
}
export class GaodeAutocomplete extends GaodeBasic implements IAutocomplete {
private component: any
constructor(options: any, component: any) {
super();
this.component = component
AMap.plugin('AMap.AutoComplete', () => {
this.self = new AMap.Autocomplete(options)
})
}
on(eventName: string, callback: AutocompleteSelectCallback) {
this.self.on(eventName, (event) => {
callback.call(this.component, event)
})
}
search(address: string, callback: AutocompleteSearchCallback) {
this.self.search(address, (status, result) => {
callback.call(this.component, status, result)
})
}
}
export class GaodePlaceSearch extends GaodeBasic implements IPlaceSearch {
private component: any
constructor(component: any) {
super();
this.component = component
AMap.plugin('AMap.PlaceSearch', () => {
this.self = new AMap.PlaceSearch()
})
}
search(text: string, callback: PlaceSearchCallback) {
return this.self.search(text, (status, result) => {
callback.call(this.component, status, result)
})
}
}
export class GaodeMouseTool extends GaodeBasic implements IMouseTool {
constructor(map: IMap) {
super();
AMap.plugin(["AMap.RangingTool", "AMap.MouseTool"], () => {
this.self = new AMap.MouseTool(map.self);
})
}
rule(options: any) {
let conf = MapTools.ExplicitConvert(options);
return this.self.rule(conf)
}
measureArea(options: any) {
return this.self.measureArea(options)
}
close(isTrue: boolean) {
return this.self.close(isTrue)
}
}
export class GaodeInfoWindow extends GaodeBasic implements IInfoWindow {
constructor(options: any) {
super();
options.offset = options.offset.self
this.self = new AMap.InfoWindow(options);
}
open(map: IMap) {
return this.self.open(map.self)
}
listen(html: any, event: string, callback: Function) {
return this.self.listen(html, event, callback)
}
}
export class GaodeCircle extends GaodeBasic implements ICircle {
constructor(options: Object) {
super();
this.self = new AMap.Circle(options);
}
setMap(map: IMap) {
return this.self.setMap(map.self)
}
setCenter(pos: number[]) {
return this.self.setCenter(pos)
}
setRadius(num: number) {
return this.self.setRadius(num)
}
}
export class GaoDeRenderClusterMarker implements IRenderClusterMarker, ISelf {
discriminator: string = "ISelfCombine";
getFirstImages(context: any): string {
return context.data[0].image;
}
contentRender: HtmlRender;
contentNonRender: HtmlRender;
pixelRender: PixelRender;
pixelNonRender: PixelRender;
get self(): any {
return {
renderClusterMarker: (context) => {
context.marker.setContent(this.contentRender(context.count));
context.marker.setOffset(this.pixelRender(context.count).self);
},
renderMarker: (context) => {
context.marker.setContent(this.contentNonRender(this.getFirstImages(context)));
context.marker.setOffset(this.pixelNonRender(context.count).self);
}
};
}
}

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

@ -0,0 +1,910 @@
import { AutocompleteSearch, AutocompleteSearchCallback, AutocompleteSelect, AutocompleteSelectCallback, ClickOptions, DrivingSearchCallback, EventCallback, HtmlRender, IAutocomplete, ICircle, IDriving, IInfoWindow, ILayer, ILngLat, IMap, IMapOptions, IMarker, IMarkerCluster, IMarkOptions, IMouseTool, IPixel, IPlaceSearch, IRenderClusterMarker, ISelf, ITileLayer, MarkerClusterCallback, PixelRender, PlaceSearchCallback } from './map'
import { SearchDownList } from './component/SearchDownListPlugins/SearchDownList';
import { SearchService } from '@src/app/searchComponent.service';
import { HttpClient } from '@angular/common/http';
import * as ObjectID from 'bson-objectid';
import * as global from 'globals';
declare var KMap: any;
class KedaBasic implements ISelf {
self: any;
discriminator: string = "ISelf";
}
const cityPosition: number[] = [121.469167918, 31.232262275]; //上海市 坐标
const beforCity: string = "上海市"; //当前城市
const cityCode: string = "310000"; //当前城市 行政编码
export class KeDaMap extends KedaBasic implements IMap {
public isLoadEnd:boolean = false
public LoadedCallback:Function[] = [];
constructor(container: string, options: IMapOptions) { //地图初始化
super();
let that = this
let opt = Object.assign({}, { containerId: container }, options) as any;
opt.configUrl = "/assets/kmap/Kmap.config.json";
opt.targetCoordinateType = "WGS84";
opt.center = cityPosition;
opt.zoom === undefined ? opt.zoom = 9 : opt.zoom = opt.zoom - 2
if (opt.mapStyle && opt.mapStyle == 'amap://styles/grey') {
opt.solution = '8888'
}
let mapLayer = function () {
if (opt.viewMode && opt.viewMode == "3D") {
let data = {
type: 'FeatureCollection',
features: [
{
type: 'Feature',
geometry: {
type: 'Point',
coordinates: cityPosition
},
properties: { height: 30 }
}
]
};
that.self.add3DLayer({ data: data });
}
that.isLoadEnd = true
that.LoadedCallback.forEach(i=>{
try{
i();
}catch(e) {
console.log(e,'错误')
}
});
that.LoadedCallback = []
}
opt.onLoadMap = mapLayer
this.self = new KMap(opt);
}
containerToLngLat(e: IPixel): ILngLat {
let d = null;
this.self.getGeoPointByPixel({
ePoint: e.self,
callback: (e) => {
d = new KeDaLngLat(e.data.lng, e.data.lat);
}
})
return d;
}
setAdministrativeAreaStyle(component: any, getData?: Function, setData?: Function) { //自定义 行政区划 样式
let _this =this;
if(!this.isLoadEnd){
this.LoadedCallback.push(
()=>_this.setAdministrativeAreaStyle(component,getData,setData)
);
return;
}
let beforeCode:string = cityCode //当前 城市行政编码
let setTime //延时器
let initMap = ()=>{ //绘制地图
this.self.getGeometryByAdminCode({
code: beforeCode,
callback: (res)=> {
this.self.highlightPolygon({
color: 'rgba(0,102,255,0.5)',
area: res.data
});
}
});
} //function
let clickMap = (e)=>{ //点击地图
_this.self.getAdminInfoByPoint({
point: [e.lnglat.lng, e.lnglat.lat],
callback: (res)=>{
if (res.status === 10) {
console.log(res.data,'当前点击行政区域')
if (res.data.adminId != beforeCode && res.data.parentId == cityCode) { //当前点击位置已改动
_this.self.clear()
window.clearTimeout(setTime)
beforeCode = (res.data.adminId).toString()
setTime = window.setTimeout(()=>{ initMap() },100)
let name = { properties:{name: res.data.nameZh } }
getData && getData.call(component,name);
return
} else if (res.data.parentId != cityCode) {
_this.self.clear()
window.clearTimeout(setTime)
beforeCode = cityCode
setTime = window.setTimeout(()=>{ initMap() },100)
setData && setData.call(component);
}
} else {
if (beforeCode != cityCode) {
_this.self.clear()
window.clearTimeout(setTime)
beforeCode = cityCode
setTime = window.setTimeout(()=>{ initMap() },100)
setData && setData.call(component);
}
}
}
});
}
initMap()
let level = Number(sessionStorage.getItem("level"))
if (level < 3) {
this.on("click",clickMap,this);
}
}
clearMap() {
this.self.clear()
}
distance(a: number[], b: number[]) {
let num
this.self.distancePoints({
startPoint: a,
endPoint: b,
units: "meters",
callback: (res) => { num = res.data }
})
return num
}
setZoomAndCenter(zoom: number, pos: number[]) {
this.self.flyTo({
zoom: zoom,
point: pos,
});
}
getBounds() {
let bounds = {
northEast: null,
southWest: null
}
this.self.getBounds({
callback: (res) => {
bounds.northEast = new KeDaLngLat(res.data[0][0],res.data[0][1])
bounds.southWest = new KeDaLngLat(res.data[1][0],res.data[1][1])
}
})
return bounds
}
add(obj: any) {
let _this =this;
if(!this.isLoadEnd){
this.LoadedCallback.push(
()=>_this.add(obj)
);
return;
}
if (obj && obj.typeName === "KeDaMarker") {
let _marker = (obj as KeDaMarker);
_marker.map = this;
this.self.addCustomOverlay(_marker.self)
} else if (obj == "卫星图层") {
this.self.setImageLayer({ display: true })
} else if (obj == "路网图层") {
this.self.setMapStyle({ solution: '8888' });
}
}
remove(obj: any) {
if (obj && obj.typeName === "KeDaMarker") {
obj.KedaMarkerID && this.self.removeCustomOverlayById({ id: obj.KedaMarkerID })
} else if (obj && obj.typeName === "KeDaInfoWindow") {
this.self.removeAllPopups()
} else if (obj && obj.typeName === "KeDaCircle") {
obj.id && this.self.removeLayer({ layerId: obj.id })
} else if (obj == "卫星图层") {
this.self.setImageLayer({ display: false })
} else if (obj == "路网图层") {
this.self.setMapStyle({ solution: '9999' });
}
}
setCity(city: string) {
let that = this
if (city.includes("上海") && this.isLoadEnd) {
that.self.flyTo({
zoom: 9,
point: cityPosition
});
}
}
getCity(callback: Function) {
let autoOptions = { city: "上海" }
return callback(autoOptions)
}
setZoom(zoom: number) {
this.self.zoomTo({
zoom: zoom
});
}
getZoom(): number {
let num
this.self.getZoom({
callback: (e) => {
num = e.data;
}
})
return num
}
setCenter(pos: number[] | ILngLat) {
let _this =this;
if(!this.isLoadEnd){
this.LoadedCallback.push(
()=>_this.setCenter(pos)
);
return;
}
let position = []
if (pos instanceof Array) {
position = pos
} else {
position = pos.getArray();
}
this.self.flyTo({ point: position })
}
getCenter() {
let center
this.self.getCenter({
callback: function (res) {
center = res.data
}
});
return center
}
on(eventName: string, callback: EventCallback, component?: any) {
let _this =this;
if(!this.isLoadEnd){
this.LoadedCallback.push(
()=>_this.on(eventName,callback,component)
);
return;
}
let eventMapProfile = {
complete: "load",
click: "click",
rightclick: "contextmenu"
};
if (eventName == "click") {
this.self.addEventOnMap({event: "click",
handler: (res)=>{
let event = {
lnglat: new KeDaLngLat(res.lngLat.lng,res.lngLat.lat),
pixel: new KeDaPixel(res.point.x,res.point.y),
type: res.type,
target: { id:null } //TODO
}
callback.call(component,event);
}
});
} else if (eventName == "complete") {
callback.call(component,null);
} else {
this.self.addEventOnMap({
event: eventMapProfile[eventName],
handler: callback
});
}
}
}
export class KeDaPixel extends KedaBasic implements IPixel {
constructor(x: number, y: number) {
super();
this.x = x;
this.y = y;
this.self = [x, y];
}
getArray(): number[] {
return this.self;
}
x: number;
y: number;
}
export class KeDaMarker extends KedaBasic implements IMarker {
public map: KeDaMap;
public KedaMarkerID:String;
public typeName: string = "KeDaMarker";
private html:string = '<img class="KedaPosImg" src="/assets/images/dingwei.png">'
constructor(options: IMarkOptions) {
super();
let pos = []
if (options.position instanceof Array) {
pos = options.position
} else {
pos = options.position.getArray()
}
let elementHtml = document.createElement('div')
elementHtml.innerHTML = options.content? options.content : this.html
let marker = {
point: pos,
//anchor: 'bottom', //TODO
//offset: options.offset? options.offset.self : [0,0], //TODO
element: elementHtml.firstElementChild,
ended: (res) => {
this.KedaMarkerID = res.data;
if (options.draggable) { //启用拖拽功能
this.map.self.setCustomOverlayDraggable({
id: this.KedaMarkerID,
draggable: true,
})
this.map.self.addEventOnCustomOverlays({
selector: `#${this.KedaMarkerID}`,
event: 'dragend',
});
}
this.startBindEvent();
}
};
this.self = marker;
this._position = pos
if (options.map) {
this.map = options.map as KeDaMap
this.map.self.addCustomOverlay(this.self);
}
}
getLngLatByMarkerEvent(map:IMap,e: any): ILngLat {
return e.lnglat;
}
_position: number[];
setContent(html: string) { //marker 添加 DOM元素
this.map.self.setCustomOverlayProperty({
type: 'id',
id: this.KedaMarkerID,
element: html,
})
}
setPosition(x: ILngLat | number[]) {
x = (x as ILngLat).getArray == undefined ? x : (x as ILngLat).getArray();
this.map.self.setCustomOverlayProperty({
type: 'id',
id: this.KedaMarkerID,
point: x
})
}
setMap() {
this.map.self.removeCustomOverlayById({ id: this.KedaMarkerID })
}
get id(): string {
return this.self.id
}
set id(str: string) {
this.self.id = str
}
public bindObj = []; // event
on(eventName: string, callback: EventCallback, component?: any) {
this.bindObj.push({
eventName: eventName,
callback: callback,
component: component,
});
this.startBindEvent();
}
startBindEvent() {
let _this =this;
if (this.map !== undefined) {
this.bindObj.forEach((item, index) => {
if (item.eventName.includes('drag')) {
this.map.self.setCustomOverlayDraggable({
id: this.KedaMarkerID,
draggable: true,
})
}
this.map.self.addEventOnCustomOverlays({
selector: `#${this.KedaMarkerID}`,
event: item.eventName,
handler: (res) =>{
this.map.self.getOverlayById({
id: this.KedaMarkerID,
callback: (p)=>{
let point = p.data.point;
let event
if (res.lngLat!=undefined && res.point!=undefined) {
event = {
lnglat: new KeDaLngLat(point.lng,point.lat),
pixel: [0,0],//科达覆盖物所用的div坐标为center,儿我们的div正好近似正方形,所以不用偏移
type: res.type,
target: { id:this.self.id || null },
_target:res.target
}
} else {
event = {
lnglat: new KeDaLngLat(point.lng,point.lat),
target: { id:this.self.id || null }
}
}
item.callback.call(item.component,event)
}
})
}
});
})
this.bindObj = [];
}
}
}
export class KeDaLngLat extends KedaBasic implements ILngLat {
constructor(lng: number, lat: number) {
super();
this.lng = lng
this.lat = lat
this.self = this;
}
offset(x: number, y: number): ILngLat {
return x = 2 * Math.asin(Math.sin(Math.round(x) / 12756274) / Math.cos(this.kT * Math.PI / 180)),
x = this.KL + 180 * x / Math.PI,
y = 2 * Math.asin(Math.round(y) / 12756274),
new KeDaLngLat(x, y);
}
typeName = "LngLat";
lng: number;
lat: number;
get KL(): number {
return this.lng;
}
get kT(): number {
return this.lat;
}
getArray(): number[] {
return [this.lng, this.lat];
}
}
export class KedaDriving extends KedaBasic implements IDriving { //路线导航
public map: KeDaMap;
public policy: number = 0; // 0:快捷模式, 4:躲避拥堵
public id: string;
constructor(options: any) {
super();
this.map = options.map as KeDaMap
options.policy === undefined ? this.policy = 0 : this.policy = options.policy
}
search(component: any, posStart: ILngLat, posEnd: ILngLat, callback: DrivingSearchCallback) {
let params = {
startPoint: posStart.getArray(),
endPoint: posEnd.getArray(),
error: () => { alert('路线规划失败!') },
ended: (res) => {
console.log(res.data,'路径规划')
this.id = res.data
let router = { routes:[] }
callback.call(component,'complete',router)
}
}
if (this.map.isLoadEnd) { //map加载完毕
if (this.policy === 0) { //快捷模式
this.map.self.createMinDistanceRoutePlanning(params)
} else { //躲避拥堵
this.map.self.createMinTimeRoutePlanning(params)
}
} else {
let _this =this;
this.map.LoadedCallback.push(
()=>_this.search(component,posStart,posEnd,callback)
);
}
}
clear() {
this.id? this.map.self.removeRoutePlanning({ id: this.id }) : null
}
}
export class KedaAutocomplete extends KedaBasic implements IAutocomplete { //Autocomplete 关键字搜索
private component: any;
private searchDownList: SearchDownList;
private $input: any;
constructor(options: any, component: any) {
super();
this.component = component
if (options && options.input != undefined) { //绑定input框 搜索事件
this.searchDownList = global.injector.get<SearchService>(SearchService).appendComponentToBody(SearchDownList).instance;
this.$input = document.getElementById(options.input);
this.searchDownList.init(this.$input)
this.$input.oninput = (e) =>{ //监听 input事件
(this.component.map as KeDaMap).self.queryInfoByType({
code: cityCode,
keyword: this.$input.value,
maxCount: 10,
searchType: [],
callback: (res) => {
let list = res.data
this.searchDownList.searchList = list || []
}
}) // search
}
}
}
on(eventName: string, callback: AutocompleteSelectCallback) {
this.searchDownList.setClickHander((e:any) => {
let a = {
id : e.id,
name : e.name,
adcode : e.adminId,
district : e.address,
location : new KeDaLngLat(e.locationpoint[0],e.locationpoint[1]),
type : 'point',
poi: { location : new KeDaLngLat(e.locationpoint[0],e.locationpoint[1]) }
}
callback.call(this.component,a);
});
}
search(address: string, callback: AutocompleteSearchCallback) {
(this.component.map as KeDaMap).self.queryInfoByType({
code: cityCode,
keyword: address,
maxCount: 10,
searchType: [],
callback: (res:any) => {
let list = { tips:[] };
res.data.forEach(item => {
let a = {
id : item.id,
name : item.name,
adcode : item.adminId,
district : item.address,
location : new KeDaLngLat(item.locationpoint[0],item.locationpoint[1]),
type : 'point',
poi: { location : new KeDaLngLat(item.locationpoint[0],item.locationpoint[1]) }
}
list.tips.push(a);
});
callback.call(this.component,'complete',list);
}
})
}
}
export class KedaPlaceSearch extends KedaBasic implements IPlaceSearch { //PlaceSearch 关键字搜索
private component: any
constructor(component: any) {
super();
this.component = component
}
search(address: string, callback: PlaceSearchCallback) {
(this.component.map as KeDaMap).self.queryInfoByType({
code: cityCode,
keyword: address,
maxCount: 10,
searchType: [],
callback: (res:any) => {
let list = { info:'OK', poiList:{ posi:[] } };
res.data.forEach(item => {
let a = {
id : item.id,
name : item.name,
adcode : item.adminId,
district : item.address,
location : new KeDaLngLat(item.locationpoint[0],item.locationpoint[1]),
type : 'point',
poi: { location : new KeDaLngLat(item.locationpoint[0],item.locationpoint[1]) }
}
list.poiList.posi.push(a);
});
callback.call(this.component,'complete',list);
}
})
}
}
export class KedaCircle extends KedaBasic implements ICircle { //圆形 图层
public typeName: string = "KeDaCircle";
public id: string;
constructor(options: any) {
super();
let circle = {
data: {
type: 'FeatureCollection',
features: [
{
type: 'Feature',
geometry: {
type: 'Point',
coordinates: cityPosition
},
properties: { id: ObjectID.default.generate() }
}
]
},
defaultStyles: {
"line-dasharray": options.strokeDasharray,
"line-opacity": options.strokeOpacity,
"fill-color": options.fillColor,
"fill-opacity": options.fillOpacity,
},
radius: 0,
draggable: false,
updateHandler: (res) => { },
end: (res) => { this.id = res }
}
this.self = circle
}
setRadius(num: number) { //设置圆的半径
this.self.radius = num / 1000
}
setCenter(pos: number[]) {//设置圆的中心
this.self.center = pos
}
setMap(map: KeDaMap) {//把圆添加到 map
if (map.isLoadEnd) {
this.self.radius != 0 && map.self.addGeometryCircleLayer(this.self)
} else {
let _this =this;
map.LoadedCallback.push(
()=>_this.setMap(map)
);
}
}
}
export class KedaMarkerCluster extends KedaBasic implements IMarkerCluster { //Marker 聚合物
public map:KeDaMap
public id:string
private LoadedCallback:Function[] = []
public markerList:any[] = []
constructor(map: IMap, list: Object[], options: any) {
super();
this.map = map as KeDaMap;
list.forEach((item:any)=>{
let elementHtml = document.createElement('div')
elementHtml.innerHTML = `<img class="KedaPosIcon" src="${item.image}">`
let marker = {
point: item.lnglat,
element: elementHtml.firstElementChild,
customProps: item.data,
}
this.markerList.push(marker)
})
if (this.markerList.length) { //有聚合物时
}
// let http:HttpClient = global.injector.get<HttpClient>(HttpClient)
// http.get(`http://10.14.183.81/kiop-web/static/autoGroup/2.19.0.kd/assets/json/buildData.json`).subscribe(data=>{
// console.log(data)
// })
//覆盖物聚合
// this.map.self.addOverlayLayer({
// serviceName: 'service_tzn_test3', //业务图层类型
// clustered: true, //是否聚合
// defaultIcon: 'icon-policeman-1',//雪碧图名称
// clusteredMarkerTemplate: `'<div style="background-color: lightgrey;padding: 4px;border-radius: 3px">' +
// '{{IMGTAG}}' +</div>`,
// singleMarkerTemplate: {
// default: '<div style="background-color: red;padding: 2px;border-radius: 3px">' +
// '{{IMGTAG}}' + '</div>',
// filters: [
// {
// template: '<div style="background-color: red;padding: 2px;border-radius: 3px">' +
// '{{IMGTAG}}' +
// '</div>',
// icon: 'icon-policeman-1',
// //status === 1 的数据,将显示为markerHtml的marker样式
// match: [{
// key: 'status',
// value: 1
// }]
// },
// ]
// },
// ended: function (res) {
// console.log(res,'覆盖物聚合·')
// this.id = res.data
// this.LoadedCallback.forEach(i=>{
// try{
// i();
// }catch(e) {
// console.log(e,'错误')
// }
// });
// this.LoadedCallback = []
// }
// })
}
on(eventName: string, callback: MarkerClusterCallback, component?: any): void {
let _this =this;
if(!this.id){
this.LoadedCallback.push(
()=>_this.on(eventName,callback,component)
);
return;
}
}
setData(list: any[]) {
if (!list.length && this.id) {
}
}
}
export class KedaRenderClusterMarkerr extends KedaBasic implements IRenderClusterMarker { //Marker 聚合物 配置项
discriminator: string = "ISelfCombine";
constructor() {
super();
}
getFirstImages(context: any): string {
return context.data[0].image;
}
contentRender: HtmlRender;
contentNonRender: HtmlRender;
pixelRender: PixelRender;
pixelNonRender: PixelRender;
}
export class KedaInfoWindow extends KedaBasic implements IInfoWindow { //信息窗体
public typeName: string = "KeDaInfoWindow";
constructor(options) {
super();
let opt = {
htmlText: options.content,
// offset: options.offset.self,
anchor: 'bottom',
point: options.position,
closeButton: true,
}
this.self = opt
}
open(map: IMap) {
map.self.addPopup(this.self);
}
listen(html: any, event: string, callback: Function) {
html.addEventListener(event, callback)
}
}
export class KedaLayer extends KedaBasic implements ILayer { //mapInit 配置项
constructor(options: any) {
super();
}
}
export class KedaTileLayer extends KedaBasic implements ITileLayer { //图层切换
constructor() {
super();
}
Satellite() { //卫星图层
return "卫星图层"
}
RoadNet() { //路网图层
return "路网图层"
}
}
export class KedaMouseTool extends KedaBasic implements IMouseTool { //地图工具
constructor(map: IMap) {
super();
this.self = map.self
}
layerIds = [];
layerIdAreas = [];
rule(options: any) {
let that = this
this.self.measureDistance({
units: 'kilometers',
callback: (result) => {
var startText, sClass = that.self.mapType === 'AG' ? 'ag-popup-tools' : 'mm-popup-tools';
var result = result.data;
if (!result.isEnd) {
if (result.isStart) {
that.self.addTexts({
points: [{
point: result.point,
htmlText: '起点',
class: sClass
}],
anchor: 'left',
ended: function (res) {
that.layerIds.push(res.data);
startText = res.data;
}
});
} else {
that.self.addTexts({
points: [{
point: result.point,
htmlText: result.distance.toFixed(4) + 'km',
class: sClass
}],
anchor: 'left',
ended: function (res) {
that.layerIds.push(res.data);
}
});
}
} else {
if (result.index >= 1) {
if (result.isFailure) {
that.layerIds.forEach((layerId) => {
that.self.removeTextsByType({
textType: layerId
});
});
return;
}
that.layerIds.push(result.layerId);
if (that.self.mapType === 'BM') {
that.self.addTexts({
points: [{
point: result.point,
htmlText: '总距离:' + result.distance.toFixed(4) +
'km',
class: sClass
}],
anchor: 'left',
ended: function (res) {
that.layerIds.push(res.data);
}
});
}
} else {
that.layerIds.forEach((layerId) => {
that.self.removeTextsByType({
textType: layerId
});
});
}
}
}
});
}
measureArea(options: any) {
let that = this
this.self.measureArea({
units: 'meters',
callback: (result) => {
var sClass = that.self.mapType === 'AG' ? 'ag-popup-tools' : 'mm-popup-tools';
var result = result.data;
if (!result.isEnd) {
if (result.index >= 2) {
that.self.addTexts({
points: [{
point: result.point,
htmlText: result.area + '平方米',
class: sClass
}],
anchor: 'left',
ended: function (res) {
that.layerIdAreas.push(res.data);
}
});
}
} else {
if (result.index >= 2) {
if (result.isFailure) {
that.layerIdAreas.forEach((layerId) => {
that.self.removeTextsByType({
textType: layerId
});
});
return;
}
that.layerIdAreas.push(result.layerId);
if (that.self.mapType === 'BM') {
that.self.addTexts({
points: [{
point: result.point,
htmlText: '总面积:' + result.area + '平方米',
class: sClass
}],
anchor: 'left',
ended: function (res) {
that.layerIdAreas.push(res.data);
}
});
}
}
}
}
});
}
close(isTrue: boolean) {
if (isTrue) {
this.self.clear();
for (var i in this.layerIds) {
this.self.removeTextsByType({
textType: this.layerIds[i]
});
}
for (var i in this.layerIdAreas) {
this.self.removeTextsByType({
textType: this.layerIdAreas[i]
});
}
this.layerIdAreas = [];
this.layerIds = [];
}
}
}

43
src/modules/map/declare/map-tools.ts

@ -0,0 +1,43 @@
export default class MapTools {
//显式转换
public static ExplicitConvert(data: any): any {
if (data == null) {
return
}
let obj = Object.assign({}, data);
let convert = (obj: any, data: string) => {
if (!obj[data]) return;
if (obj[data].discriminator === "ISelf") {
obj[data] = obj[data].self;
} else if (obj[data].discriminator === "ISelfCombine") {
Object.assign(obj, obj[data].self);
}
}
let process = (obj: any, deep: number = 0) => {
try {
deep++;
if (deep >= 4) return;
if (obj == undefined) return;
if (!(obj instanceof Object)) return;
for (var name in obj) {
if (obj[name] instanceof Array) {
for (var j in obj[name]) {
convert(obj[name], j);
process(obj[name][j], deep);
}
continue;
}
convert(obj, name);
process(obj[name], deep);
}
} catch (e) {
console.log(e);
debugger
}
}
process(obj);
return obj;
}
}

200
src/modules/map/declare/map.d.ts vendored

@ -0,0 +1,200 @@
export interface ISelf {
self: any;
discriminator: string;
}
export class ClickOptions {
lnglat: ILngLat
pixel: IPixel
type: string
target: { id:string }
}
type EventCallback = (event?:ClickOptions)=>void;
export interface IMap extends ISelf {
on(eventName: string, callback: EventCallback, component?: any);
add(obj: IMarker|ITileLayer|any);
remove(obj: IMarker|ITileLayer|any);
clearMap();
containerToLngLat(e:IPixel): ILngLat; //地图容器像素坐标转经纬度
setCity(city: string);
getCity(callback: Function): any;
setZoom(zoom: number);
setZoomAndCenter(zoom: number, pos: number[]);
getZoom(): number;
setCenter(pos: number[]|ILngLat);
getCenter(): ILngLat;
getBounds(): any;
distance(a:number[],b:number[]): any;
setAdministrativeAreaStyle(component:any,getData?:Function,setData?:Function): any; //自定义 行政区划 样式
}
export interface IMapOptions {
zoom?: number;
zooms?: number[];
}
export interface IMarker extends ISelf {
id: string;
_position:number[];
on(eventName: string, callback: EventCallback, component?: any);
setPosition(x:ILngLat|number[])
setContent(html:string)
setMap();
getLngLatByMarkerEvent(map:IMap,e:any):ILngLat;
}
export class MarkerClusterOptions { //聚合物 click 数据类型
cluster:any[]
clusterData:any[]
lnglat:ILngLat
target:any
markers:IMarker[]
}
type MarkerClusterCallback = (event:MarkerClusterOptions)=>void;
export interface IMarkerCluster extends ISelf {
on(eventName: string, callback: MarkerClusterCallback, component?: any): void;
setData(list: any[]);
}
type HtmlRender = (...args) => string | HTMLElement;
type PixelRender = (...args) => IPixel;
export interface IRenderClusterMarker {
getFirstImages(context: any): string;
contentRender: HtmlRender;
contentNonRender: HtmlRender;
pixelRender: PixelRender;
pixelNonRender: PixelRender;
}
export class IMarkOptions {
position?: ILngLat | number[];
content?: string;
offset?: IPixel;
map?: IMap;
draggable?: boolean
}
export interface IPixel extends ISelf {
x:number
y:number
getArray():number[]
}
export interface ILngLat extends ISelf {
typeName:string
lng: number
lat: number
KL:number
kT:number
offset(x: number, y: number):ILngLat
getArray():number[]
}
export interface ILayer extends ISelf {
}
export interface IIconOptions {
size?: ISize;
imageSize?: ISize;
image?: string;
}
export interface IIcon extends ISelf {
}
export interface ISize extends ISelf {
}
export interface ITileLayer extends ISelf {
Satellite();
RoadNet();
}
export interface IDrivingOptions {
map?: IMap;
policy?: string
showTraffic?: boolean
isOutline?: boolean
}
export class DrivingSearch { //Driving Search() 数据类型
distance: number
time: number
tolls_distance: number
steps: DrivingSearchSteps[]
routes:any[] //伪代码
}
export class DrivingSearchSteps { //Driving Search() Steps 数据类型
instruction:string
orientation:string
road: string
distance: number
time: number
tolls_distance: number
}
type DrivingSearchCallback = (status:string,searchData:DrivingSearch)=>void;
export interface IDriving extends ISelf {
clear();
search(component: any,posStart: ILngLat, posEnd: ILngLat, callback:DrivingSearchCallback);
}
export class AutocompleteSearch { //Autocomplete Search() 数据类型
info: string
count: number
tips: AutocompleteSelect[]
}
export class AutocompleteSelect { //GaoDe POI 数据类型
id: string
name: string
adcode: string
district: string
location: ILngLat
type: string
poi:{ location: ILngLat }
}
type AutocompleteSearchCallback = (status:string,searchData:AutocompleteSearch)=>void;
type AutocompleteSelectCallback = (event:AutocompleteSelect)=>void;
export interface IAutocomplete extends ISelf {
search(address: string,callback: AutocompleteSearchCallback)
on(eventName: string, callback: AutocompleteSelectCallback)
}
export class PlaceSearchSearch { //PlaceSearch Search() 数据类型
info: string
poiList: PlaceSearchSearchTips
}
export class PlaceSearchSearchTips { //PlaceSearch Search() 数据类型
pois:AutocompleteSelect[]
pageIndex:number
pageSize:number
count:number
}
type PlaceSearchCallback = (status:string,searchData:PlaceSearchSearch)=>void;
export interface IPlaceSearch extends ISelf {
search(text:string, callback: PlaceSearchCallback);
}
export interface IMouseTool extends ISelf {
rule(options:any)
measureArea(options:any)
close(isTrue:boolean)
}
export interface IInfoWindow extends ISelf {
open(map:IMap);
listen(html:any, event:string, callback: Function)
}
export interface ICircle extends ISelf {
setRadius(num: number);
setCenter(pos: number[])
setMap(map: IMap)
}

12
src/styles.scss

@ -207,6 +207,18 @@ table td.mat-footer-cell:last-of-type{
--swiper-navigation-size: 26px;/* 设置按钮大小 */ --swiper-navigation-size: 26px;/* 设置按钮大小 */
} }
} }
.KedaPosImg {
width: 30px;
height: 36px;
background-size: 100%;
background: no-repeat center;
}
.KedaPosIcon {
width: 30px;
height: 30px;
background-size: 100%;
background: no-repeat center;
}
//点聚合自定义图片大小 //点聚合自定义图片大小
.clusterImg{ .clusterImg{
width: 30px; width: 30px;

5
tsconfig.json

@ -18,7 +18,10 @@
"lib": [ "lib": [
"es2018", "es2018",
"dom" "dom"
] ],
"paths": {
"@src/*":["src/*"]
}
}, },
"angularCompilerOptions": { "angularCompilerOptions": {
"fullTemplateTypeCheck": true, "fullTemplateTypeCheck": true,

Loading…
Cancel
Save