From 815a510667e91bbf8943775aae8060864112f1c3 Mon Sep 17 00:00:00 2001 From: SunTao <328867980@qq.com> Date: Thu, 10 Apr 2025 16:59:38 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E5=B1=95=E7=A4=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/api/xj/diseaseLine.js | 18 + src/api/xj/mapDisease.js | 13 +- src/assets/index/green.png | Bin 0 -> 3531 bytes src/assets/index/nomal.png | Bin 0 -> 3500 bytes src/components/map/fssm-map.vue | 19 +- src/views/big-screen/index.vue | 2 +- src/views/xj/inspection/diease-line/index.vue | 74 ++++ .../map-diease/components/diease-view.vue | 40 ++ src/views/xj/inspection/map-diease/index.vue | 377 +++++++++++++++--- 10 files changed, 483 insertions(+), 61 deletions(-) create mode 100644 src/api/xj/diseaseLine.js create mode 100644 src/assets/index/green.png create mode 100644 src/assets/index/nomal.png create mode 100644 src/views/xj/inspection/diease-line/index.vue create mode 100644 src/views/xj/inspection/map-diease/components/diease-view.vue diff --git a/package.json b/package.json index e03cc57..3964f0e 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "diagram-js": "^11.4.1", "echarts": "^5.4.0", "echarts-gl": "^2.0.9", + "element-resize-detector": "^1.2.4", "element-ui": "2.15.14", "file-saver": "2.0.5", "flv.js": "^1.6.2", diff --git a/src/api/xj/diseaseLine.js b/src/api/xj/diseaseLine.js new file mode 100644 index 0000000..50de622 --- /dev/null +++ b/src/api/xj/diseaseLine.js @@ -0,0 +1,18 @@ +/* + * @Author: SunTao 328867980@qq.com + * @Date: 2025-04-08 13:47:06 + * @LastEditors: SunTao 328867980@qq.com + * @LastEditTime: 2025-04-08 13:49:28 + * @FilePath: \znxjxt-ui\src\api\xj\diseaseLine.js + * @Description: 巡检信息-护拦板高度 + */ +import request from "@/utils/request"; + +// 获取护拦板高度列表 +export function getBarrierBoardList(query) { + return request({ + url: "/barrierBoard/list", + method: "get", + params: query, + }); +} diff --git a/src/api/xj/mapDisease.js b/src/api/xj/mapDisease.js index 44e0743..c0ca181 100644 --- a/src/api/xj/mapDisease.js +++ b/src/api/xj/mapDisease.js @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-08 09:26:24 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-11-05 13:40:07 + * @LastEditTime: 2025-04-08 13:42:28 * @FilePath: \znxjxt-ui\src\api\xj\mapDisease.js * @Description: 巡检信息-病害管理接口 */ @@ -15,4 +15,13 @@ export function getSegment() { url: "/api/v2/segment/selectList", method: "post", }); -} \ No newline at end of file +} + +// 查询轮廓标缺失列表 +export function getDelineatorList(params) { + return request({ + url: "/delineator/list", + method: "get", + params, + }); +} diff --git a/src/assets/index/green.png b/src/assets/index/green.png new file mode 100644 index 0000000000000000000000000000000000000000..ca8f6eff6a006a26c8641113164d228c12163084 GIT binary patch literal 3531 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 FV1hiysek|g literal 0 HcmV?d00001 diff --git a/src/assets/index/nomal.png b/src/assets/index/nomal.png new file mode 100644 index 0000000000000000000000000000000000000000..0c13ecb273ec6c8c7ac9a9111ae79fadd386209e GIT binary patch literal 3500 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 ag#QK5xDb!f6^pt60000 @@ -130,6 +130,11 @@ export default { type: String, default: "cva_c", }, + // 接受传过来的弹窗类型 + popupType: { + type: String, + default: "mapLine", + }, }, data() { return { @@ -459,10 +464,14 @@ export default { // 获取弹窗数据 const popupData = feature.get("data"); // 获取弹窗内元素并赋值 - this.$refs.popupContent.innerHTML = `路段名称:${popupData.name}
- 病害数:${popupData.count}个
- 起始桩号:${popupData.stakeStart}
- 终止桩号:${popupData.stakeEnd}`; + if (this.popupType === "mapLine") { + this.$refs.popupContent.innerHTML = `路段名称:${popupData.name}
+ 病害数:${popupData.count}个
+ 起始桩号:${popupData.stakeStart}
+ 终止桩号:${popupData.stakeEnd}`; + } else if (this.popupType === "dieaseLine") { + this.$refs.popupContent.innerHTML = `护拦板高度:${popupData.value}`; + } dislogLay.setPosition(coordinate); } else { dislogLay.setPosition(undefined); diff --git a/src/views/big-screen/index.vue b/src/views/big-screen/index.vue index 7c92b97..d7841f2 100644 --- a/src/views/big-screen/index.vue +++ b/src/views/big-screen/index.vue @@ -719,7 +719,7 @@ export default { if (code === 200) { this.messageList = rows; this.noticeNum = total; - if(total > 99){ + if (total > 99) { clearInterval(this.messageTimer); } } diff --git a/src/views/xj/inspection/diease-line/index.vue b/src/views/xj/inspection/diease-line/index.vue new file mode 100644 index 0000000..27f1fce --- /dev/null +++ b/src/views/xj/inspection/diease-line/index.vue @@ -0,0 +1,74 @@ + + + + + + diff --git a/src/views/xj/inspection/map-diease/components/diease-view.vue b/src/views/xj/inspection/map-diease/components/diease-view.vue new file mode 100644 index 0000000..4c4c29d --- /dev/null +++ b/src/views/xj/inspection/map-diease/components/diease-view.vue @@ -0,0 +1,40 @@ + + + + + + \ No newline at end of file diff --git a/src/views/xj/inspection/map-diease/index.vue b/src/views/xj/inspection/map-diease/index.vue index 17f15f8..9285536 100644 --- a/src/views/xj/inspection/map-diease/index.vue +++ b/src/views/xj/inspection/map-diease/index.vue @@ -2,56 +2,131 @@ * @Author: SunTao 328867980@qq.com * @Date: 2025-03-25 11:10:16 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2025-03-28 14:14:07 + * @LastEditTime: 2025-04-10 16:51:45 * @FilePath: \znxjxt-ui\src\views\xj\inspection\map-diease\index.vue - * @Description: 地图展示病害-首页 + * @Description: 地图展示筛选病害-首页 --> @@ -122,15 +375,33 @@ export default { height: calc(100vh - 5.3rem); padding: 0.5rem; box-sizing: border-box; + display: flex; - .diease-form { - width: 100%; - height: 6%; + .diease-left { + width: 50%; + height: 100%; + box-sizing: border-box; + display: flex; + flex-direction: column; + padding: 0 1rem; + + .diease-form { + width: 100%; + height: 6%; + } } .map-diease-map { - width: 100%; - height: 94%; + width: 50%; + height: 100%; } } + +/* 分页样式 */ +.pagination-part { + width: 100%; + display: flex; + padding-top: 1rem; + justify-content: flex-end; +}