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 0000000..ca8f6ef
Binary files /dev/null and b/src/assets/index/green.png differ
diff --git a/src/assets/index/nomal.png b/src/assets/index/nomal.png
new file mode 100644
index 0000000..0c13ecb
Binary files /dev/null and b/src/assets/index/nomal.png differ
diff --git a/src/components/map/fssm-map.vue b/src/components/map/fssm-map.vue
index b483515..208a2f2 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-03-28 13:51:38
+ * @LastEditTime: 2025-03-31 13:02:21
* @FilePath: \znxjxt-ui\src\components\map\fssm-map.vue
* @Description: 公共地图
-->
@@ -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;
+}