fix:巡检信息修改地图

This commit is contained in:
SunTao 2024-11-21 15:38:45 +08:00
parent 0a090e70d8
commit 151f95b06c
6 changed files with 794 additions and 599 deletions

View File

@ -62,9 +62,9 @@ export default {
props: {
//
centerPoint: {
type: Object,
type: Array,
default: () => {
return { lat: 123.30297096718999, lon: 41.87942945541742 };
return [123.30297096718999, 41.87942945541742];
},
},
//
@ -90,7 +90,11 @@ export default {
//
controlStyle: {
type: Object,
default: () => {},
default: () => {
return {
top: 0,
};
},
},
// id
mapId: {
@ -168,7 +172,10 @@ export default {
// this.changeImg("cva_c");
},
methods: {
/* 初始化openlayer地图 */
/**
* @description: 初始化openlayer地图
* @return {*}
*/
initMap() {
// const tianditu_vec_c = new TileLayer({
// className: "baseLayerClass",
@ -207,7 +214,7 @@ export default {
rotate: false,
}),
view: new View({
center: [this.centerPoint.lat, this.centerPoint.lon], //
center: this.centerPoint, //
zoom: this.zoom, //
projection: "EPSG:4326",
minZoom: 7,
@ -307,11 +314,18 @@ export default {
this.instance.set("overlay-list", []);
},
/* 删除图层选择对象 */
/**
* @description: 删除图层选择对象
* @return {*}
*/
removeSelectClick() {
this.selectSingClick.getFeatures().clear();
},
/* 绘制地图 */
/**
* @description: 绘制地图
* @return {*}
*/
drawMap() {
if (this.drawMarkers.length < 1) {
const map = this.instance.get("map");
@ -360,7 +374,12 @@ export default {
});
}
},
/* 监听绘制完成的事件 */
/**
* @description: 监听绘制完成的事件
* @param {*} event
* @return {*}
*/
drawend(event) {
const feature = event.feature;
const geometry = feature.getGeometry();
@ -379,7 +398,12 @@ export default {
}
this.$emit("endEoordinate", this.drawMarkers);
},
/* 检测交叉点位方法 */
/**
* @description: 检测交叉点位方法
* @param {*} coordinates
* @return {*}
*/
isSelfCrossing(coordinates) {
for (let i = 0; i < coordinates.length - 1; i++) {
const segment1 = [coordinates[i], coordinates[i + 1]];
@ -393,7 +417,13 @@ export default {
}
return false;
},
/* 检测交叉线段 */
/**
* @description: 检测交叉线段
* @param {*} segment1
* @param {*} segment2
* @return {*}
*/
doSegmentsCross(segment1, segment2) {
const [p1, p2] = segment1;
const [q1, q2] = segment2;
@ -421,7 +451,11 @@ export default {
// 线
return t > 0 && t < 1 && u > 0 && u < 1;
},
/* 删除绘制功能 */
/**
* @description: 删除绘制功能
* @return {*}
*/
deletedraw() {
const map = this.instance.get("map");
map.removeInteraction(this.draw);
@ -434,7 +468,12 @@ export default {
this.drawMarkers = [];
this.$emit("endEoordinate", []);
},
/* 修改地图底图样式 */
/**
* @description: 修改地图底图样式
* @param {*} item
* @return {*}
*/
changeImg(item) {
if (this.mapType !== item) {
this.mapType = item;
@ -487,6 +526,7 @@ export default {
});
}
},
/**
* @description: 切换当前位置
* @param {Array} position 中心点位置
@ -517,7 +557,10 @@ export default {
map.removeLayer(layer);
},
/* 根据类型清除地图线段图层 */
/**
* @description: 根据类型清除地图线段图层
* @return {*}
*/
clearMapLine() {
const map = this.instance.get("map");
const [layer] = map

File diff suppressed because it is too large Load Diff

View File

@ -115,7 +115,11 @@
</el-col>
</el-row>
<el-form-item label="病害位置">
<div ref="addMap" id="addMap" class="no-hand-cursor"></div>
<fssm-map
ref="addMap"
@map-click="getMapClick"
class="no-hand-cursor"
></fssm-map>
</el-form-item>
<el-form-item label="上传病害图片">
<el-upload
@ -156,9 +160,20 @@
<script>
import { addRoad, uploadRoad } from "@/api/xj/road";
import { getToken } from "@/utils/auth";
//
import FssmMap from "@/components/map/fssm-map.vue";
import { Feature } from "ol";
import { Point } from "ol/geom";
import { Style } from "ol/style";
import * as styleExports from "ol/style";
import VectorLayer from "ol/layer/Vector";
import { Vector as VectorSource } from "ol/source";
export default {
name: "RoadAdd",
components: {
FssmMap,
},
props: {
dialogItem: {
type: Object,
@ -254,8 +269,6 @@ export default {
//
fileList: [],
},
//
centerPoint: [123.30297096718999, 41.87942945541742],
//
markers: [],
};
@ -273,13 +286,10 @@ export default {
};
});
this.$nextTick(() => {
const e = {
lnglat: {
lng: val.geometry.coordinates[0],
lat: val.geometry.coordinates[1],
},
};
this.onMapClick(e);
const map = this.$refs.addMap.instance.get("map");
map.getView().setCenter(val.geometry.coordinates);
this.markers = val.geometry.coordinates;
this.drawMapPoint();
});
}
},
@ -287,20 +297,96 @@ export default {
deep: true,
},
},
/* 生命周期函数-mouted */
mounted() {
this.initMap();
},
/**
* @description: 生命周期函数-mouted
* @return {*}
*/
mounted() {},
methods: {
/* 文件提交处理 */
/**
* @description: 传回来的地图点击事件获取点位数据
* @param {*} e
* @return {*}
*/
getMapClick(e) {
const map = this.$refs.addMap.instance.get("map");
map.removeLayer(this.markLayerPoints);
const { coordinate } = e;
this.markers = coordinate;
this.drawMapPoint();
},
/**
* @description: 绘制地图点位
* @param {*} val
* @return {*}
*/
drawMapPoint() {
const features = [];
const point = new Point(this.markers); //
const feature = new Feature({
geometry: point,
type: "icon", //
});
feature.setStyle([
new Style({
image: new styleExports.Circle({
//
radius: 6,
stroke: new styleExports.Stroke({
color: "#9a9c9e",
width: 4,
}),
fill: new styleExports.Fill({
color: "blue",
}),
}),
}),
]);
features.push(feature);
//
const pointSource = new VectorSource({
features,
});
this.markLayerPoints = new VectorLayer({
source: pointSource,
properties: {
type: "point",
},
});
this.$nextTick(() => {
const map = this.$refs.addMap.instance.get("map");
map.addLayer(this.markLayerPoints);
});
},
/**
* @description: 文件提交处理
* @param {*} e
* @return {*}
*/
submitUpload() {
this.$refs.upload.submit();
},
/* 文件上传中处理 */
/**
* @description: 文件上传中处理
* @param {*} event
* @param {*} file
* @param {*} fileList
* @return {*}
*/
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
},
/* 文件上传成功处理 */
/**
* @description: 文件上传成功处理
* @param {*} response
* @param {*} file
* @param {*} fileList
* @return {*}
*/
handleFileSuccess(response, file, fileList) {
this.upload.fileList = fileList.map((item) => {
if (item.response) {
@ -310,7 +396,11 @@ export default {
});
this.upload.isUploading = false;
},
/* 点击确定事件 */
/**
* @description: 点击确定事件
* @return {*}
*/
submitForm() {
this.$refs["roadForm"].validate((valid) => {
if (valid) {
@ -331,7 +421,7 @@ export default {
}),
geometry: {
type: "Point",
coordinates: [this.markers[0].lng, this.markers[0].lat],
coordinates: this.markers,
id: this.roadForm?.geometry?.id,
},
};
@ -369,34 +459,14 @@ export default {
}
});
},
/* 点击取消事件 */
/**
* @description: 点击取消事件
* @return {*}
*/
cancel() {
this.$emit("cancel");
},
/* 初始化天地图 */
initMap() {
//
this.map = new T.Map("addMap");
this.map.centerAndZoom(
new T.LngLat(this.centerPoint[0], this.centerPoint[1]),
9
);
//
this.map.on("click", this.onMapClick);
},
/* 新增/编辑地图单击事件 */
onMapClick(e) {
const marker = new T.Marker(e.lnglat);
if (this.markers.length > 0) {
this.markers.shift();
this.map.clearOverLays();
this.map.addOverLay(marker);
this.markers.push(e.lnglat);
} else {
this.map.addOverLay(marker);
this.markers.push(e.lnglat);
}
},
},
};
</script>

View File

@ -34,7 +34,10 @@
</div>
<!-- 下半部分显示天地图 -->
<div id="viewMap" style="height: 300px; margin-top: 20px"></div>
<fssm-map
style="height: 300px; margin-top: 20px"
ref="viewMap"
></fssm-map>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="closeDialog">关闭</el-button>
@ -43,8 +46,19 @@
</template>
<script>
//
import FssmMap from "@/components/map/fssm-map.vue";
import { Feature } from "ol";
import { Point } from "ol/geom";
import { Style } from "ol/style";
import * as styleExports from "ol/style";
import VectorLayer from "ol/layer/Vector";
import { Vector as VectorSource } from "ol/source";
export default {
name: "RoadView",
components: {
FssmMap,
},
props: {
dialogItem: {
type: Object,
@ -71,20 +85,10 @@ export default {
if (val.title === "查看路产") {
this.viewForm = JSON.parse(JSON.stringify(val));
this.$nextTick(() => {
this.centerPoint = [
val.geometry.coordinates[0],
val.geometry.coordinates[1],
];
this.initMap("viewMap");
const e = {
lnglat: {
lat: val.geometry.coordinates[1],
lng: val.geometry.coordinates[0],
},
};
this.onMapClick(e);
//
this.map.removeEventListener("click", this.onMapClick);
const map = this.$refs.viewMap.instance.get("map");
map.getView().setCenter(val.geometry.coordinates);
this.markers = val.geometry.coordinates;
this.drawMapPoint();
});
}
},
@ -92,11 +96,13 @@ export default {
deep: true,
},
},
mounted() {
// this.initMap("viewMap");
},
mounted() {},
methods: {
/* 过滤列表路产类型 */
/**
* @description: 过滤列表路产类型
* @param {*} value
* @return {*}
*/
filterDefect(value) {
let a = null;
[a] = this.roadType.filter((item) => {
@ -106,37 +112,58 @@ export default {
return a.label;
}
},
/* 关闭弹窗 */
/**
* @description: 绘制地图点位
* @param {*} val
* @return {*}
*/
drawMapPoint() {
const features = [];
const point = new Point(this.markers); //
const feature = new Feature({
geometry: point,
type: "icon", //
});
feature.setStyle([
new Style({
image: new styleExports.Circle({
//
radius: 6,
stroke: new styleExports.Stroke({
color: "#9a9c9e",
width: 4,
}),
fill: new styleExports.Fill({
color: "blue",
}),
}),
}),
]);
features.push(feature);
//
const pointSource = new VectorSource({
features,
});
this.markLayerPoints = new VectorLayer({
source: pointSource,
properties: {
type: "point",
},
});
this.$nextTick(() => {
const map = this.$refs.viewMap.instance.get("map");
map.addLayer(this.markLayerPoints);
});
},
/**
* @description: 关闭弹窗
* @return {*}
*/
closeDialog() {
this.$emit("cancel");
},
/* 初始化天地图 */
initMap(ele) {
// if (this.map) {
// this.map.remove(); //
// }
//
this.map = new T.Map(ele);
this.map.centerAndZoom(
new T.LngLat(this.centerPoint[0], this.centerPoint[1]),
9
); //
//
this.map.on("click", this.onMapClick);
},
/* 新增/编辑地图单击事件 */
onMapClick(e) {
const marker = new T.Marker(e.lnglat);
if (this.markers.length > 0) {
this.markers.shift();
this.map.clearOverLays();
this.map.addOverLay(marker);
this.markers.push(e.lnglat);
} else {
this.map.addOverLay(marker);
this.markers.push(e.lnglat);
}
},
},
};
</script>

View File

@ -319,6 +319,7 @@
@close="addCancel"
>
<road-add
v-if="addVisible"
@cancel="addCancel"
:dialogItem="dialogItem"
:segmentList="segmentList"
@ -338,6 +339,7 @@
@close="viewCancel"
>
<road-view
v-if="viewVisible"
@cancel="viewCancel"
:dialogItem="dialogItem"
:roadType="roadType"

View File

@ -305,7 +305,8 @@
<!-- 右侧地图部分 -->
<div style="flex: 1; position: relative">
<div id="add_map" ref="mapContainer" class="no-hand-cursor"></div>
<!-- <div id="add_map" ref="mapContainer" class="no-hand-cursor"></div> -->
<fssm-map :showDraw="true" class="no-hand-cursor" ref="mapContainer"></fssm-map>
</div>
</div>
<div slot="footer" class="dialog-footer">
@ -324,10 +325,20 @@ import {
addRoute,
updateRoute,
} from "@/api/xj/route";
//
import FssmMap from "@/components/map/fssm-map.vue";
import { Feature } from "ol";
import { Point } from "ol/geom";
import { Style } from "ol/style";
import * as styleExports from "ol/style";
import VectorLayer from "ol/layer/Vector";
import { Vector as VectorSource } from "ol/source";
export default {
name: "Route",
dicts: ["bas_road_type", "bas_direction"],
components: {
FssmMap,
},
data() {
return {
menuOpen: false,
@ -400,143 +411,12 @@ export default {
},
created() {
this.getList();
this.dialogVisible = true;
this.dialogVisible = false;
},
methods: {
undoLastAction() {
// 线
if (this.lines.length > 0) {
const lastLine = this.lines.pop();
this.map.removeOverLay(lastLine); // 线
}
if (this.lines.length == 0) {
this.resetMap();
return;
}
this.markers.pop();
//
this.previousPoint =
this.markers.length > 0
? this.markers[this.markers.length - 1].getLngLat()
: null;
// textarea
const coordArr = this.form.coordinates.split(";");
coordArr.pop(); //
this.form.coordinates = coordArr.join(";");
},
resetMap() {
//
this.form.coordinates = "";
this.previousPoint = null;
this.map.clearOverLays();
this.markers = [];
this.lines = [];
},
initMap() {
if (!this.map) {
//
this.map = new T.Map("add_map");
this.map.centerAndZoom(new T.LngLat(116.40769, 39.89945), 12); //
//
this.map.on("click", this.onMapClick);
//
this.map.on("contextmenu", this.onMapRightClick);
} else {
this.resetMap();
}
},
onMapClick(e) {
if (this.menuOpen) {
this.menuOpen = false;
return;
}
const latLng = e.lnglat;
const point = `${latLng.lng},${latLng.lat}`;
// textarea
if (this.form.coordinates == null) {
this.form.coordinates = "";
}
this.form.coordinates += this.form.coordinates ? `;${point}` : point;
// 线
const marker = new T.Marker(latLng);
this.markers.push(marker); //
// 线
if (this.previousPoint) {
const line = new T.Polyline([this.previousPoint, latLng], {
strokeColor: "blue",
strokeWeight: 3,
strokeOpacity: 0.7,
});
this.map.addOverLay(line);
this.lines.push(line);
}
if (this.lines.length == 0) {
this.map.addOverLay(marker);
}
this.previousPoint = latLng; //
},
drawExistingCoordinates() {
//
// console.log(this.form.coordinates, "this.form.coordinates");
if (this.form.coordinates) {
const coordArr = this.form.coordinates.split(";");
let previousLatLng = null;
coordArr.forEach((coord, index) => {
const [lng, lat] = coord.split(",").map(Number);
const latLng = new T.LngLat(lng, lat);
//
const marker = new T.Marker(latLng);
this.markers.push(marker);
// 线
if (previousLatLng) {
const line = new T.Polyline([previousLatLng, latLng], {
strokeColor: "blue",
strokeWeight: 3,
strokeOpacity: 0.7,
});
this.map.addOverLay(line);
this.lines.push(line);
}
// previousPoint previousPoint
previousLatLng = latLng;
});
// previousPoint便
this.previousPoint = previousLatLng;
}
},
onMapRightClick(e) {
this.menuOpen = true;
var menu = new T.ContextMenu({
width: 50,
});
var _MenuItem1 = new T.MenuItem("撤销", this.undoLastAction);
var _MenuItem2 = new T.MenuItem("重绘", this.resetMap);
menu.addItem(_MenuItem1);
menu.addItem(_MenuItem2);
this.map.addContextMenu(menu);
},
/** 查询道路线列表 */
/**
* @description: 查询道路线列表
* @return {*}
*/
getList() {
this.loading = true;
listRoute(this.queryParams).then((response) => {
@ -545,66 +425,66 @@ export default {
this.loading = false;
});
},
//
/**
* @description: 取消按钮
* @return {*}
*/
cancel() {
this.open = false;
this.dialogVisible = false;
this.reset();
},
//
/**
* @description: 表单重置
* @return {*}
*/
reset() {
this.form = {
id: null,
routeCode: null,
routeName: null,
fullName: null,
routeType: null,
direction: null,
startPoint: null,
endPoint: null,
coordinates: null,
startMilepost: null,
endMilepost: null,
remarks: null,
createdBy: null,
createdAt: null,
updatedBy: null,
updatedAt: null,
deletedBy: null,
deletedAt: null,
isDeleted: null,
companyId: null,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
/**
* @description: 搜索按钮操作
* @return {*}
*/
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
/**
* @description: 重置按钮操作
* @return {*}
*/
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
/**
* @description: 多选框选中数据
* @param {selection}
* @return {*}
*/
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
/**
* @description: 新增按钮操作
* @return {*}
*/
handleAdd() {
this.reset();
this.dialogVisible = true;
this.title = "添加道路线";
let that = this;
setTimeout(function () {
that.initMap();
}, 100);
},
/** 修改按钮操作 */
/**
* @description: 修改按钮操作
* @param {row}
* @return {*}
*/
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
@ -612,15 +492,13 @@ export default {
this.form = response.data;
this.dialogVisible = true;
this.title = "修改道路线";
let that = this;
setTimeout(function () {
that.initMap();
that.drawExistingCoordinates();
}, 200);
});
},
/** 提交按钮 */
/**
* @description: 提交按钮
* @return {*}
*/
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
@ -640,7 +518,12 @@ export default {
}
});
},
/** 删除按钮操作 */
/**
* @description: 删除按钮操作
* @param {row}
* @return {*}
*/
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal
@ -654,7 +537,11 @@ export default {
})
.catch(() => {});
},
/** 导出按钮操作 */
/**
* @description: 导出按钮操作
* @return {*}
*/
handleExport() {
this.download(
"xj/route/export",