-
请输入单位名称:
- -(已标注)
-(未标注)
+ +
+
+
+ 经度 :
+
+
+
+ {{markerPosition.x || '暂未标注'}}
+
+
+
+ 纬度 :
+
+
+
+ {{markerPosition.y || '暂未标注'}}
+
+
+ place 位置
+
' +
+ ' 
' +
+ '
'
+ newPositionMarkerContentBtn:any =
+ '' +
+ '' +
+ ' ' +
+ ' 
|
' +
+ '
'
+ oldPositionMarkerContent:any =
+ '' +
+ ' |' +
+ ' 
' +
+ '
'
+ //初始化地图
labelGis(){
- var map = new AMap.Map('container', {
+ this.map = new AMap.Map('container', {
zoom:12
})
- if(this.isMapLabel){
- this.marker = new AMap.Marker({
- position: [this.unitinfo.location.x,this.unitinfo.location.y], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
- draggable: true
- });
- map.add(this.marker);
- map.setFitView();
- this.marker.on('dragging', (e)=>{
- this.markerPosition = {x: e.lnglat.lng, y: e.lnglat.lat}
+ this.map.on('complete', () => {
+ this.isGisTopBox = true
+ });
+ if(this.isMapLabel){//如果已经标注单位坐标
+ console.log('已标注单位位置')
+ this.map.setCenter([this.unitinfo.location.x,this.unitinfo.location.y]);
+ this.oldPositionMarker = new AMap.Marker({
+ position: [this.unitinfo.location.x,this.unitinfo.location.y],
+ content: this.newPositionMarkerContent,
+ offset: new AMap.Pixel(-15, -18)
})
+ // 将 markers 添加到地图
+ this.map.add(this.oldPositionMarker);
+ }else{
+ console.log('未标注单位位置')
+ this.map.setCity('上海市');
}
-
- //输入提示
- var autoOptions = {
- input: "tipinput"
- };
- AMap.plugin(['AMap.PlaceSearch','AMap.AutoComplete'], () =>{
- var auto = new AMap.AutoComplete(autoOptions);
- var placeSearch = new AMap.PlaceSearch({
- // map: map
- // pageSize: 5, // 单页显示结果条数
- // pageIndex: 1 // 页码
- }); //构造地点查询类
- auto.on("select", (e)=>{
- placeSearch.search(e.poi.name, (status, result) => {
- if(this.marker){
- map.remove(this.marker);
- }
- this.isMapLabel = true
- // 查询成功时，result即对应匹配的POI信息
- var poi = result.poiList.pois[0];
- this.markerPosition = {x: poi.location.lng, y: poi.location.lat}
- this.marker = new AMap.Marker({
- position: poi.location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
- title: poi.name,
- draggable: true
- });
- map.add(this.marker);
- map.setFitView();
- this.marker.on('dragend', (e)=>{
- this.markerPosition = {x: e.lnglat.lng, y: e.lnglat.lat}
- })
+ }
+ //点击位置按钮
+ setPosition(){
+ this.isGisTopBox = false
+ if(this.isMapLabel){//如果已经标注单位坐标
+ console.log('已标注单位位置')
+
+ if(this.oldPositionMarker){
+ this.oldPositionMarker.setContent(this.oldPositionMarkerContent)
+ }
+ if(this.newPositionMarker){
+ this.newPositionMarker.setContent(this.oldPositionMarkerContent)
+ }
+
+ this.newPositionMarker = new AMap.Marker({
+ draggable: true,
+ position: [this.markerPosition.x,this.markerPosition.y],
+ content: this.newPositionMarkerContentBtn,
+ offset: new AMap.Pixel(-15, -18)
+ });
+ this.map.add(this.newPositionMarker);
+
+
+ let markerPosition
+ if(this.markerPosition.x && this.markerPosition.x != 0){
+ markerPosition = {x: this.markerPosition.x,y: this.markerPosition.y}
+ }else{
+ markerPosition = {x: this.map.getCenter().lng,y: this.map.getCenter().lat} //获取当前地图中心位置
+ }
+ this.newPositionMarker.on('dragend', (e)=>{
+ markerPosition = {x: e.lnglat.lng, y: e.lnglat.lat}
+ })
+ //点击确定
+ this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{
+ this.map.clearMap();
+ this.isGisTopBox = true
+ this.newPositionMarker = new AMap.Marker({
+ position: [markerPosition.x,markerPosition.y],
+ content: this.newPositionMarkerContent,
+ offset: new AMap.Pixel(-15, -18)
+ });
+ this.markerPosition = markerPosition
+ this.map.add(this.newPositionMarker);
+ })
+ //点击取消
+ this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'),'click',(event)=>{
+ this.isGisTopBox = true
+ this.map.clearMap();
+ this.newPositionMarker = new AMap.Marker({
+ position: [this.markerPosition.x,this.markerPosition.y],
+ content: this.newPositionMarkerContent,
+ offset: new AMap.Pixel(-15, -18)
});
- });//注册监听，当选中某条记录时会触发
+ this.map.add(this.newPositionMarker);
+ })
+
+ }else{
+ console.log('未标注单位位置')
+ if(this.newPositionMarker){
+ this.newPositionMarker.setContent(this.oldPositionMarkerContent)
+ }
+ let center
+ if(this.markerPosition.x && this.markerPosition.x != 0){
+ center = [this.markerPosition.x,this.markerPosition.y]
+ }else{
+ center = this.map.getCenter(); //获取当前地图中心位置
+ this.map.setCenter(center);
+ }
+
+ this.newPositionMarker = new AMap.Marker({
+ draggable: true,
+ position: center,
+ content: this.newPositionMarkerContentBtn,
+ offset: new AMap.Pixel(-15, -18)
+ });
+ this.map.add(this.newPositionMarker);
+
+ let markerPosition
+ if(this.markerPosition.x && this.markerPosition.x != 0){
+ markerPosition = {x: this.markerPosition.x,y: this.markerPosition.y}
+ }else{
+ markerPosition = {x: this.map.getCenter().lng,y: this.map.getCenter().lat} //获取当前地图中心位置
+ }
+ this.newPositionMarker.on('dragend', (e)=>{
+ markerPosition = {x: e.lnglat.lng, y: e.lnglat.lat}
+ })
+ //点击确定
+ this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{
+ this.isGisTopBox = true
+ this.markerPosition = markerPosition
+ this.map.clearMap();
+ this.newPositionMarker = new AMap.Marker({
+ position: [this.markerPosition.x,this.markerPosition.y],
+ content: this.newPositionMarkerContent,
+ offset: new AMap.Pixel(-15, -18)
+ });
+ this.map.add(this.newPositionMarker);
+ })
+ this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'),'click',(event)=>{
+ this.map.clearMap();
+ this.isGisTopBox = true
+ if(this.markerPosition.x && this.markerPosition.x != 0){//说明之前标过点
+ this.newPositionMarker = new AMap.Marker({
+ position: [this.markerPosition.x,this.markerPosition.y],
+ content: this.newPositionMarkerContent,
+ offset: new AMap.Pixel(-15, -18)
+ });
+ this.map.add(this.newPositionMarker);
+ }
+ })//取消
+ }
+
- });
}
+
+
//获得所有单位类型
getallunittype() {
this.http.get("/api/BuildingTypes/Simple").subscribe(data => {
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 2bb3e4c..40b34c7 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -284,7 +284,7 @@ export class CollectionToolsComponent implements OnInit {
this.startUploading(imgFile)
}
objectName:any //上传对象名
- startUploading (imgFile) {
+ async startUploading (imgFile) {
let _this = this
let file = imgFile || null //获取上传的文件
let fileSize = file.size || null //上传文件的总大小
@@ -293,13 +293,21 @@ export class CollectionToolsComponent implements OnInit {
if (file && fileSize <= shardSize) { //上传文件<=5MB时
let formData = new FormData()
formData.append("file",file)
+ await new Promise((resolve,reject)=>{
+ this.http.delete(`/api/Objects/WebPlan2D/${companyId}/${file.name}?x-oss-process=image/resize,m_fixed,h_100,w_100`).subscribe(data=>{
+ console.log('删除缩略图成功')
+ resolve('删除缩略图成功')
+ })
+ })
this.http.post(`api/Objects/WebPlan2D/${companyId}`,formData).subscribe((data:any)=>{
this.objectName = data.objectName
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('上传成功','确定',config)
-
+ // this.http.delete(`/api/Objects/WebPlan2D/${this.objectName}?x-oss-process=image/resize,m_fixed,h_100,w_100`).subscribe(data=>{
+ // console.log('删除缩略图成功')
+ // })
//在原始素材对象和需要循环图片的对象中分别push最新上传的图片
let imgObj = {
"Tag": null,
diff --git a/src/assets/images/close.png b/src/assets/images/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..c33434e15b7e4463fd5b38ba5b9d2be791771102
GIT binary patch
literal 521
zcmV+k0`~ohP)' +
+ '