fix：大屏地图坐标设置，回退坐标转换代码为84
This commit is contained in:
parent
c92e37c192
commit
b768ae8d4b
@ -2,7 +2,7 @@
|
||||
* @Author: SunTao 328867980@qq.com
|
||||
* @Date: 2024-10-17 11:34:00
|
||||
* @LastEditors: SunTao 328867980@qq.com
|
||||
* @LastEditTime: 2024-10-29 09:40:35
|
||||
* @LastEditTime: 2024-10-29 10:25:21
|
||||
* @FilePath: \znxjxt-ui\src\views\big-screen\index.vue
|
||||
* @Description: 大屏首页
|
||||
-->
|
||||
@ -452,6 +452,8 @@ export default {
|
||||
} else {
|
||||
this.mapClick = "";
|
||||
this.mapZoom = "";
|
||||
this.clusters = null;
|
||||
this.markLayerLines = null;
|
||||
}
|
||||
},
|
||||
/* 获取地图点位信息 */
|
||||
@ -494,8 +496,8 @@ export default {
|
||||
features.push(feature);
|
||||
});
|
||||
const clusterSource = new Cluster({
|
||||
distance: 30,
|
||||
minDistance: 30,
|
||||
distance: 40,
|
||||
minDistance: 40,
|
||||
source: new VectorSource({
|
||||
features,
|
||||
}),
|
||||
@ -537,7 +539,7 @@ export default {
|
||||
/* 获取地图线段点位信息 */
|
||||
getLinePoint() {
|
||||
if (!this.markLayerLines) {
|
||||
mapPciList().then(({ code, data }) => {
|
||||
mapPciList({ type: this.mapClick }).then(({ code, data }) => {
|
||||
if (code === 200) {
|
||||
this.lineString = data.map((item) => {
|
||||
return item.coordinates.split(";").map((it) => {
|
||||
@ -597,6 +599,13 @@ export default {
|
||||
changeIconType(value) {
|
||||
if (this.mapClick !== value) {
|
||||
this.mapClick = value;
|
||||
if (this.$refs.roadMap) {
|
||||
const map = this.$refs.roadMap.instance.get("map");
|
||||
map.removeLayer(this.markLayerLines);
|
||||
map.removeLayer(this.clusters);
|
||||
this.clusters = null;
|
||||
this.markLayerLines = null;
|
||||
}
|
||||
// 获取对应右上角icon类型
|
||||
this.getIconType(value);
|
||||
// 请求地图打点/绘制线段接口
|
||||
@ -666,9 +675,9 @@ export default {
|
||||
/* 地图缩放完成事件 */
|
||||
mapMoveend(zoom) {
|
||||
if (this.clusters && zoom > 13) {
|
||||
this.clusters.getSource().setDistance(1);
|
||||
this.clusters.getSource().setDistance(0);
|
||||
} else if (this.clusters && zoom <= 13) {
|
||||
this.clusters.getSource().setDistance(30);
|
||||
this.clusters.getSource().setDistance(40);
|
||||
}
|
||||
},
|
||||
/* 地图选中feature事件 */
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
|
||||
* @Date: 2024-10-08 10:58:25
|
||||
* @LastEditors: SunTao 328867980@qq.com
|
||||
* @LastEditTime: 2024-10-25 11:29:20
|
||||
* @LastEditTime: 2024-10-29 10:32:48
|
||||
* @FilePath: \znxjxt-ui\src\views\xj\inspection\disease-management .vue
|
||||
* @Description: 巡检信息管理-病害管理
|
||||
-->
|
||||
@ -540,7 +540,6 @@ import {
|
||||
changeDefectStatus,
|
||||
} from "@/api/xj/disease";
|
||||
import { getToken } from "@/utils/auth";
|
||||
import { gcj02ToWgs84, wgs84ToGcj02 } from "@/api/xj/map";
|
||||
|
||||
export default {
|
||||
name: "Defect",
|
||||
@ -898,22 +897,16 @@ export default {
|
||||
handleUpdate(row) {
|
||||
this.dialogVisible = true;
|
||||
this.dialogTitle = "修改缺陷";
|
||||
this.centerPoint = gcj02ToWgs84([
|
||||
this.centerPoint = [
|
||||
row.geometry.coordinates[0],
|
||||
row.geometry.coordinates[1],
|
||||
]);
|
||||
];
|
||||
this.$nextTick(() => {
|
||||
this.initMap("addMap");
|
||||
const e = {
|
||||
lnglat: {
|
||||
lng: gcj02ToWgs84([
|
||||
row.geometry.coordinates[0],
|
||||
row.geometry.coordinates[1],
|
||||
])[0],
|
||||
lat: gcj02ToWgs84([
|
||||
row.geometry.coordinates[0],
|
||||
row.geometry.coordinates[1],
|
||||
])[1],
|
||||
lng: row.geometry.coordinates[0],
|
||||
lat: row.geometry.coordinates[1],
|
||||
},
|
||||
};
|
||||
this.onMapClick(e);
|
||||
@ -979,10 +972,7 @@ export default {
|
||||
}),
|
||||
geometry: {
|
||||
type: "Point",
|
||||
coordinates: wgs84ToGcj02([
|
||||
this.markers[0].lng,
|
||||
this.markers[0].lat,
|
||||
]),
|
||||
coordinates: [this.markers[0].lng, this.markers[0].lat],
|
||||
id: this.form?.geometry?.id,
|
||||
},
|
||||
};
|
||||
@ -1070,26 +1060,14 @@ export default {
|
||||
this.viewForm = defect;
|
||||
this.$nextTick(() => {
|
||||
this.centerPoint = [
|
||||
gcj02ToWgs84([
|
||||
defect.geometry.coordinates[0],
|
||||
defect.geometry.coordinates[1],
|
||||
])[0],
|
||||
gcj02ToWgs84([
|
||||
defect.geometry.coordinates[0],
|
||||
defect.geometry.coordinates[1],
|
||||
])[1],
|
||||
];
|
||||
this.initMap("viewMap");
|
||||
const e = {
|
||||
lnglat: {
|
||||
lng: gcj02ToWgs84([
|
||||
defect.geometry.coordinates[0],
|
||||
defect.geometry.coordinates[1],
|
||||
])[0],
|
||||
lat: gcj02ToWgs84([
|
||||
defect.geometry.coordinates[0],
|
||||
defect.geometry.coordinates[1],
|
||||
])[1],
|
||||
lng: defect.geometry.coordinates[0],
|
||||
lat: defect.geometry.coordinates[1],
|
||||
},
|
||||
};
|
||||
this.onMapClick(e);
|
||||
|
||||
@ -156,7 +156,6 @@
|
||||
<script>
|
||||
import { addRoad, uploadRoad } from "@/api/xj/road";
|
||||
import { getToken } from "@/utils/auth";
|
||||
import { gcj02ToWgs84, wgs84ToGcj02 } from "@/api/xj/map";
|
||||
|
||||
export default {
|
||||
name: "RoadAdd",
|
||||
@ -278,14 +277,8 @@ export default {
|
||||
this.$nextTick(() => {
|
||||
const e = {
|
||||
lnglat: {
|
||||
lng: gcj02ToWgs84([
|
||||
val.geometry.coordinates[0],
|
||||
val.geometry.coordinates[1],
|
||||
])[0],
|
||||
lat: gcj02ToWgs84([
|
||||
val.geometry.coordinates[0],
|
||||
val.geometry.coordinates[1],
|
||||
])[1],
|
||||
lng: val.geometry.coordinates[0],
|
||||
lat: val.geometry.coordinates[1],
|
||||
},
|
||||
};
|
||||
this.onMapClick(e);
|
||||
@ -340,10 +333,7 @@ export default {
|
||||
}),
|
||||
geometry: {
|
||||
type: "Point",
|
||||
coordinates: wgs84ToGcj02([
|
||||
this.markers[0].lng,
|
||||
this.markers[0].lat,
|
||||
]),
|
||||
coordinates: [this.markers[0].lng, this.markers[0].lat],
|
||||
id: this.roadForm?.geometry?.id,
|
||||
},
|
||||
};
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* @Author: SunTao 328867980@qq.com
|
||||
* @Date: 2024-10-12 13:11:05
|
||||
* @LastEditors: SunTao 328867980@qq.com
|
||||
* @LastEditTime: 2024-10-25 11:24:51
|
||||
* @LastEditTime: 2024-10-29 10:41:32
|
||||
* @FilePath: \znxjxt-ui\src\views\xj\inspection\road-management\components\road-view.vue
|
||||
* @Description: 交安事件-查看弹窗
|
||||
-->
|
||||
@ -43,7 +43,6 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { gcj02ToWgs84 } from "@/api/xj/map";
|
||||
export default {
|
||||
name: "RoadView",
|
||||
props: {
|
||||
@ -73,26 +72,14 @@ export default {
|
||||
this.viewForm = JSON.parse(JSON.stringify(val));
|
||||
this.$nextTick(() => {
|
||||
this.centerPoint = [
|
||||
gcj02ToWgs84([
|
||||
val.geometry.coordinates[0],
|
||||
val.geometry.coordinates[1],
|
||||
])[0],
|
||||
gcj02ToWgs84([
|
||||
val.geometry.coordinates[0],
|
||||
val.geometry.coordinates[1],
|
||||
])[1],
|
||||
];
|
||||
this.initMap("viewMap");
|
||||
const e = {
|
||||
lnglat: {
|
||||
lng: gcj02ToWgs84([
|
||||
val.geometry.coordinates[0],
|
||||
val.geometry.coordinates[1],
|
||||
])[0],
|
||||
lat: gcj02ToWgs84([
|
||||
val.geometry.coordinates[0],
|
||||
val.geometry.coordinates[1],
|
||||
])[1],
|
||||
lat: val.geometry.coordinates[1],
|
||||
lng: val.geometry.coordinates[0],
|
||||
},
|
||||
};
|
||||
this.onMapClick(e);
|
||||
|
||||
@ -183,7 +183,6 @@
|
||||
<script>
|
||||
import { addEvent, uploadEvent } from "@/api/xj/traffic";
|
||||
import { getToken } from "@/utils/auth";
|
||||
import { gcj02ToWgs84, wgs84ToGcj02 } from "@/api/xj/map";
|
||||
|
||||
export default {
|
||||
name: "EventAdd",
|
||||
@ -322,14 +321,8 @@ export default {
|
||||
this.$nextTick(() => {
|
||||
const e = {
|
||||
lnglat: {
|
||||
lng: gcj02ToWgs84([
|
||||
val.geometry.coordinates[0],
|
||||
val.geometry.coordinates[1],
|
||||
])[0],
|
||||
lat: gcj02ToWgs84([
|
||||
val.geometry.coordinates[0],
|
||||
val.geometry.coordinates[1],
|
||||
])[1],
|
||||
lng: val.geometry.coordinates[0],
|
||||
lat: val.geometry.coordinates[1],
|
||||
},
|
||||
};
|
||||
this.onMapClick(e);
|
||||
@ -384,10 +377,7 @@ export default {
|
||||
}),
|
||||
geometry: {
|
||||
type: "Point",
|
||||
coordinates: wgs84ToGcj02([
|
||||
this.markers[0].lng,
|
||||
this.markers[0].lat,
|
||||
]),
|
||||
coordinates: [this.markers[0].lng, this.markers[0].lat],
|
||||
id: this.roadForm?.geometry?.id,
|
||||
},
|
||||
};
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* @Author: SunTao 328867980@qq.com
|
||||
* @Date: 2024-10-12 15:49:46
|
||||
* @LastEditors: SunTao 328867980@qq.com
|
||||
* @LastEditTime: 2024-10-25 11:44:59
|
||||
* @LastEditTime: 2024-10-29 10:55:25
|
||||
* @FilePath: \znxjxt-ui\src\views\xj\inspection\traffic-management\components\event-view.vue
|
||||
* @Description: 交安事件-查看弹窗
|
||||
-->
|
||||
@ -31,7 +31,6 @@
|
||||
</el-carousel>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 下半部分显示天地图 -->
|
||||
<div id="viewMap" style="height: 300px; margin-top: 20px"></div>
|
||||
</div>
|
||||
@ -42,7 +41,6 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { gcj02ToWgs84 } from "@/api/xj/map";
|
||||
export default {
|
||||
name: "EventView",
|
||||
props: {
|
||||
@ -68,32 +66,18 @@ export default {
|
||||
watch: {
|
||||
dialogItem: {
|
||||
handler(val) {
|
||||
console.log(val, "dddd");
|
||||
|
||||
if (val.title === "查看事件") {
|
||||
this.viewForm = JSON.parse(JSON.stringify(val));
|
||||
this.$nextTick(() => {
|
||||
this.centerPoint = [
|
||||
gcj02ToWgs84([
|
||||
val.geometry.coordinates[0],
|
||||
val.geometry.coordinates[1],
|
||||
])[0],
|
||||
gcj02ToWgs84([
|
||||
val.geometry.coordinates[0],
|
||||
val.geometry.coordinates[1],
|
||||
])[1],
|
||||
];
|
||||
this.initMap("viewMap");
|
||||
const e = {
|
||||
lnglat: {
|
||||
lng: gcj02ToWgs84([
|
||||
val.geometry.coordinates[0],
|
||||
val.geometry.coordinates[1],
|
||||
])[0],
|
||||
lat: gcj02ToWgs84([
|
||||
val.geometry.coordinates[0],
|
||||
val.geometry.coordinates[1],
|
||||
])[1],
|
||||
lng: val.geometry.coordinates[0],
|
||||
lat: val.geometry.coordinates[1],
|
||||
},
|
||||
};
|
||||
this.onMapClick(e);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user