From 6dd0ef6706cfc0a864b736d92915d5638c3c94e3 Mon Sep 17 00:00:00 2001 From: SunTao <328867980@qq.com> Date: Thu, 2 Jan 2025 16:36:30 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=B7=A1=E6=A3=80=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=A2=9E=E5=8A=A0=E5=9C=B0=E5=9B=BE=EF=BC=8C=E5=85=BB?= =?UTF-8?q?=E6=8A=A4=E9=80=9A=E7=9F=A5=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/xj/task.js | 11 +- src/components/map/fssm-map.vue | 6 +- .../components/edit-dialog.vue | 1 + .../task-management/components/task-map.vue | 224 ++++++++++++++++++ .../xj/inspection/task-management/index.vue | 68 +++++- 5 files changed, 298 insertions(+), 12 deletions(-) create mode 100644 src/views/xj/inspection/task-management/components/task-map.vue diff --git a/src/api/xj/task.js b/src/api/xj/task.js index 8cc5c56..fa89510 100644 --- a/src/api/xj/task.js +++ b/src/api/xj/task.js @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-14 10:04:12 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-12-05 15:34:41 + * @LastEditTime: 2025-01-02 15:10:39 * @FilePath: \znxjxt-ui\src\api\xj\task.js * @Description: 巡检任务管理接口 */ @@ -74,3 +74,12 @@ export function exportDefectData(params) { params, }); } + +// 根据任务id查询病害点位 +export function getDefectPoint(params) { + return request({ + url: "/xj/xjtask/getMapInfoByTaskId", + method: "get", + params, + }); +} diff --git a/src/components/map/fssm-map.vue b/src/components/map/fssm-map.vue index 2160b93..fbf9be3 100644 --- a/src/components/map/fssm-map.vue +++ b/src/components/map/fssm-map.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-14 10:46:23 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2025-01-02 10:33:02 + * @LastEditTime: 2025-01-02 16:17:20 * @FilePath: \znxjxt-ui\src\components\map\fssm-map.vue * @Description: 公共地图 --> @@ -428,7 +428,9 @@ export default { this.$emit("map-moveend", zoom); }); // 图层选择事件 - this.selectSingClick = new Select(); + this.selectSingClick = new Select({ + style: null, + }); map.addInteraction(this.selectSingClick); this.selectSingClick.on("select", (e) => { this.$emit("feature-select", e); diff --git a/src/views/xj/document/maintenance-notice/components/edit-dialog.vue b/src/views/xj/document/maintenance-notice/components/edit-dialog.vue index 1e93a49..af510c7 100644 --- a/src/views/xj/document/maintenance-notice/components/edit-dialog.vue +++ b/src/views/xj/document/maintenance-notice/components/edit-dialog.vue @@ -180,6 +180,7 @@ export default { handler(val) { this.editForm = { ...val, + segmentId: val.segmentId === "未知路段" ? "" : val.segmentId, id: null, defectId: val.id, createdTime: null, diff --git a/src/views/xj/inspection/task-management/components/task-map.vue b/src/views/xj/inspection/task-management/components/task-map.vue new file mode 100644 index 0000000..13503f5 --- /dev/null +++ b/src/views/xj/inspection/task-management/components/task-map.vue @@ -0,0 +1,224 @@ + + + + + + diff --git a/src/views/xj/inspection/task-management/index.vue b/src/views/xj/inspection/task-management/index.vue index 36fb093..bc829b6 100644 --- a/src/views/xj/inspection/task-management/index.vue +++ b/src/views/xj/inspection/task-management/index.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-14 09:48:43 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-12-27 14:03:45 + * @LastEditTime: 2025-01-02 15:21:44 * @FilePath: \znxjxt-ui\src\views\xj\inspection\task-management\index.vue * @Description: 巡检管理-巡检任务 --> @@ -95,7 +95,11 @@ - +

导出是否附带图片?

- 取消 - 确定
@@ -130,6 +137,14 @@ @click="viewDefect(scope.row)" >查看 + 地图 + + + + +