Skip to content

Z
zh-baseversion-project
Commit 6a22a02f authored by wanghao's avatar wanghao
Browse files
Options

1 大屏端 地图上标注 之前都是避让，现在都调整成 不避让。

parent fe0e3f4e
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
zh-baseversion-web/src/utils/mapClass/map.js
View file @ 6a22a02f
...@@ -637,7 +637,7 @@ export class EditorMap { ...@@ -637,7 +637,7 @@ export class EditorMap {
this.deviceUserlableLayer = new AMap.LabelsLayer({ this.deviceUserlableLayer = new AMap.LabelsLayer({
zooms: [3, 20], zooms: [3, 20],
zIndex: 1000, zIndex: 1000,
collision: true, //该层内标注是否避让 collision: false, //该层内标注是否避让
allowCollision: false, //不同标注层之间是否避让 allowCollision: false, //不同标注层之间是否避让
}); });
//设置一个图标对象 //设置一个图标对象
...@@ -707,7 +707,7 @@ export class EditorMap { ...@@ -707,7 +707,7 @@ export class EditorMap {
this.videolabelLayer = new AMap.LabelsLayer({ this.videolabelLayer = new AMap.LabelsLayer({
zooms: [3, 20], zooms: [3, 20],
zIndex: 1000, zIndex: 1000,
collision: true, //该层内标注是否避让 collision: false, //该层内标注是否避让
allowCollision: false, //不同标注层之间是否避让 allowCollision: false, //不同标注层之间是否避让
}); });
//设置一个图标对象 //设置一个图标对象
...@@ -776,7 +776,7 @@ export class EditorMap { ...@@ -776,7 +776,7 @@ export class EditorMap {
this.czlabelLayer = new AMap.LabelsLayer({ this.czlabelLayer = new AMap.LabelsLayer({
zooms: [3, 20], zooms: [3, 20],
zIndex: 1000, zIndex: 1000,
collision: true, //该层内标注是否避让 collision: false, //该层内标注是否避让
allowCollision: false, //不同标注层之间是否避让 allowCollision: false, //不同标注层之间是否避让
}); });
//设置一个图标对象 //设置一个图标对象
...@@ -846,7 +846,7 @@ export class EditorMap { ...@@ -846,7 +846,7 @@ export class EditorMap {
this.fmjlabelLayer = new AMap.LabelsLayer({ this.fmjlabelLayer = new AMap.LabelsLayer({
zooms: [3, 20], zooms: [3, 20],
zIndex: 1000, zIndex: 1000,
collision: true, //该层内标注是否避让 collision: false, //该层内标注是否避让
allowCollision: false, //不同标注层之间是否避让 allowCollision: false, //不同标注层之间是否避让
}); });
//设置一个图标对象 //设置一个图标对象
...@@ -915,7 +915,7 @@ export class EditorMap { ...@@ -915,7 +915,7 @@ export class EditorMap {
this.tyxlabelsLayer = new AMap.LabelsLayer({ this.tyxlabelsLayer = new AMap.LabelsLayer({
zooms: [3, 20], zooms: [3, 20],
zIndex: 1000, zIndex: 1000,
collision: true, //该层内标注是否避让 collision: false, //该层内标注是否避让
allowCollision: false, //不同标注层之间是否避让 allowCollision: false, //不同标注层之间是否避让
}); });
//设置一个图标对象 //设置一个图标对象
...@@ -1053,7 +1053,7 @@ export class EditorMap { ...@@ -1053,7 +1053,7 @@ export class EditorMap {
this.businessDetectorUserlabelsLayer = new AMap.LabelsLayer({ this.businessDetectorUserlabelsLayer = new AMap.LabelsLayer({
zooms: [3, 20], zooms: [3, 20],
zIndex: 1000, zIndex: 1000,
collision: true, //该层内标注是否避让 collision: false, //该层内标注是否避让
allowCollision: false, //不同标注层之间是否避让 allowCollision: false, //不同标注层之间是否避让
}); });
//设置一个图标对象 //设置一个图标对象
......
zh-baseversion-web/src/utils/mapClassForBigOld/map.js
View file @ 6a22a02f
...@@ -621,7 +621,7 @@ export class EditorMap { ...@@ -621,7 +621,7 @@ export class EditorMap {
this.deviceUserlableLayer = new AMap.LabelsLayer({ this.deviceUserlableLayer = new AMap.LabelsLayer({
zooms: [3, 20], zooms: [3, 20],
zIndex: 1000, zIndex: 1000,
collision: true, //该层内标注是否避让 collision: false, //该层内标注是否避让
allowCollision: false, //不同标注层之间是否避让 allowCollision: false, //不同标注层之间是否避让
}); });
//设置一个图标对象 //设置一个图标对象
...@@ -680,7 +680,7 @@ export class EditorMap { ...@@ -680,7 +680,7 @@ export class EditorMap {
this.videolabelLayer = new AMap.LabelsLayer({ this.videolabelLayer = new AMap.LabelsLayer({
zooms: [3, 20], zooms: [3, 20],
zIndex: 1000, zIndex: 1000,
collision: true, //该层内标注是否避让 collision: false, //该层内标注是否避让
allowCollision: false, //不同标注层之间是否避让 allowCollision: false, //不同标注层之间是否避让
}); });
//设置一个图标对象 //设置一个图标对象
...@@ -739,7 +739,7 @@ export class EditorMap { ...@@ -739,7 +739,7 @@ export class EditorMap {
this.czlabelLayer = new AMap.LabelsLayer({ this.czlabelLayer = new AMap.LabelsLayer({
zooms: [3, 20], zooms: [3, 20],
zIndex: 1000, zIndex: 1000,
collision: true, //该层内标注是否避让 collision: false, //该层内标注是否避让
allowCollision: false, //不同标注层之间是否避让 allowCollision: false, //不同标注层之间是否避让
}); });
//设置一个图标对象 //设置一个图标对象
...@@ -798,7 +798,7 @@ export class EditorMap { ...@@ -798,7 +798,7 @@ export class EditorMap {
this.fmjlabelLayer = new AMap.LabelsLayer({ this.fmjlabelLayer = new AMap.LabelsLayer({
zooms: [3, 20], zooms: [3, 20],
zIndex: 1000, zIndex: 1000,
collision: true, //该层内标注是否避让 collision: false, //该层内标注是否避让
allowCollision: false, //不同标注层之间是否避让 allowCollision: false, //不同标注层之间是否避让
}); });
//设置一个图标对象 //设置一个图标对象
...@@ -856,7 +856,7 @@ export class EditorMap { ...@@ -856,7 +856,7 @@ export class EditorMap {
this.tyxlabelsLayer = new AMap.LabelsLayer({ this.tyxlabelsLayer = new AMap.LabelsLayer({
zooms: [3, 20], zooms: [3, 20],
zIndex: 1000, zIndex: 1000,
collision: true, //该层内标注是否避让 collision: false, //该层内标注是否避让
allowCollision: false, //不同标注层之间是否避让 allowCollision: false, //不同标注层之间是否避让
}); });
//设置一个图标对象 //设置一个图标对象
...@@ -924,7 +924,7 @@ export class EditorMap { ...@@ -924,7 +924,7 @@ export class EditorMap {
this.detectorUserlabelsLayer = new AMap.LabelsLayer({ this.detectorUserlabelsLayer = new AMap.LabelsLayer({
zooms: [3, 20], zooms: [3, 20],
zIndex: 1000, zIndex: 1000,
collision: true, //该层内标注是否避让 collision: false, //该层内标注是否避让
allowCollision: false, //不同标注层之间是否避让 allowCollision: false, //不同标注层之间是否避让
}); });
//设置一个图标对象 //设置一个图标对象
...@@ -975,7 +975,7 @@ export class EditorMap { ...@@ -975,7 +975,7 @@ export class EditorMap {
this.businessDetectorUserlabelsLayer = new AMap.LabelsLayer({ this.businessDetectorUserlabelsLayer = new AMap.LabelsLayer({
zooms: [3, 20], zooms: [3, 20],
zIndex: 1000, zIndex: 1000,
collision: true, //该层内标注是否避让 collision: false, //该层内标注是否避让
allowCollision: false, //不同标注层之间是否避让 allowCollision: false, //不同标注层之间是否避让
}); });
//设置一个图标对象 //设置一个图标对象
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment