diff --git a/package.json b/package.json
index bf7947f..8a9fecb 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
"js-beautify": "1.13.0",
"js-cookie": "3.0.1",
"jsencrypt": "3.0.0-rc.1",
+ "lodash": "^4.17.21",
"nprogress": "0.2.0",
"ol": "^6.5.0",
"openlayers": "^4.6.5",
diff --git a/src/components/map/fssm-map.vue b/src/components/map/fssm-map.vue
index 66924eb..9caf5d1 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: 2024-12-04 09:16:07
+ * @LastEditTime: 2024-12-09 15:13:56
* @FilePath: \znxjxt-ui\src\components\map\fssm-map.vue
* @Description: 公共地图
-->
@@ -337,25 +337,25 @@ export default {
}
});
// 鼠标移入事件
- map.on("pointermove", (e) => {
- const feature = map.forEachFeatureAtPixel(
- map.getEventPixel(e.originalEvent),
- (mapFeature) => {
- return mapFeature;
- }
- );
- // 线、面要素不做鼠标移入样式修改
- if (feature) {
- if (feature.getGeometry()?.getType() === "Point") {
- map.getTargetElement().style.cursor = "pointer";
- this.$emit("pointer-move", feature);
- } else {
- map.getTargetElement().style.cursor = "auto";
- }
- } else {
- map.getTargetElement().style.cursor = "auto";
- }
- });
+ // map.on("pointermove", (e) => {
+ // const feature = map.forEachFeatureAtPixel(
+ // map.getEventPixel(e.originalEvent),
+ // (mapFeature) => {
+ // return mapFeature;
+ // }
+ // );
+ // // 线、面要素不做鼠标移入样式修改
+ // if (feature) {
+ // if (feature.getGeometry()?.getType() === "Point") {
+ // map.getTargetElement().style.cursor = "pointer";
+ // this.$emit("pointer-move", feature);
+ // } else {
+ // map.getTargetElement().style.cursor = "auto";
+ // }
+ // } else {
+ // map.getTargetElement().style.cursor = "auto";
+ // }
+ // });
// 地图缩放级别事件
map.on("moveend", (e) => {
const zoom = map.getView().getZoom().toFixed(); //获取当前地图的缩放级别
@@ -858,4 +858,4 @@ export default {
}
}
}
-
\ No newline at end of file
+
diff --git a/src/views/big-screen/components/img-dialog.vue b/src/views/big-screen/components/img-dialog.vue
index e67f4af..e875dbd 100644
--- a/src/views/big-screen/components/img-dialog.vue
+++ b/src/views/big-screen/components/img-dialog.vue
@@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com
* @Date: 2024-10-22 15:30:25
* @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-06 15:47:24
+ * @LastEditTime: 2024-12-09 10:29:47
* @FilePath: \znxjxt-ui\src\views\big-screen\components\img-dialog.vue
* @Description: 大屏查看图片弹窗
-->
@@ -192,6 +192,7 @@ import {
getItemTypes,
getMediaIndex,
} from "@/api/xj/screen/index";
+import throttle from "lodash/throttle";
export default {
name: "ImgDialog",
props: {
@@ -316,7 +317,7 @@ export default {
* @return {*}
*/
getSegmentList() {
- getSegment().then(({ code, data }) => {
+ getSegment({ routeId: "" }).then(({ code, data }) => {
if (code === 200) {
this.roadTypeList = data;
}
@@ -736,11 +737,11 @@ export default {
},
},
mounted() {
- window.addEventListener("keydown", this.handleKeydown);
+ window.addEventListener("keydown", throttle(this.handleKeydown, 100));
window.addEventListener("resize", this.updateRects);
},
beforeDestroy() {
- window.removeEventListener("keydown", this.handleKeydown);
+ window.removeEventListener("keydown",this.handleKeydown);
window.removeEventListener("resize", this.updateRects);
},
};
diff --git a/src/views/big-screen/components/img-screen-dialog.vue b/src/views/big-screen/components/img-screen-dialog.vue
deleted file mode 100644
index 79e28ef..0000000
--- a/src/views/big-screen/components/img-screen-dialog.vue
+++ /dev/null
@@ -1,216 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/views/big-screen/disease-components/traffic-log.vue b/src/views/big-screen/disease-components/traffic-log.vue
index 7c4541b..7439031 100644
--- a/src/views/big-screen/disease-components/traffic-log.vue
+++ b/src/views/big-screen/disease-components/traffic-log.vue
@@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com
* @Date: 2024-11-08 11:56:02
* @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-06 16:23:54
+ * @LastEditTime: 2024-12-09 09:25:57
* @FilePath: \znxjxt-ui\src\views\big-screen\disease-components\traffic-log.vue
* @Description: 病害巡检-病害日志
-->
@@ -146,11 +146,7 @@
label="路段名称"
>
-
+
@@ -256,6 +252,7 @@ export default {
this.getData();
this.getLineList();
this.getAllDefectType();
+ this.getSegmentList();
},
methods: {
/**
@@ -277,12 +274,8 @@ export default {
* @return {*}
*/
chengeLine(val) {
- if (val) {
- this.getSegmentList(val);
- } else {
- this.trafficForm.segmentId = "";
- this.segmentList = [];
- }
+ this.trafficForm.segmentId = "";
+ this.getSegmentList(val);
},
/**
diff --git a/src/views/big-screen/disease-components/traffic-safety.vue b/src/views/big-screen/disease-components/traffic-safety.vue
index ac35baa..eafc8d5 100644
--- a/src/views/big-screen/disease-components/traffic-safety.vue
+++ b/src/views/big-screen/disease-components/traffic-safety.vue
@@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com
* @Date: 2024-10-21 09:59:32
* @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-05 17:30:29
+ * @LastEditTime: 2024-12-09 11:39:11
* @FilePath: \znxjxt-ui\src\views\big-screen\disease-components\traffic-safety.vue
* @Description: 病害巡检大屏-今日巡查
-->
@@ -650,7 +650,7 @@ export default {
.right-sum {
cursor: pointer;
width: 100%;
- height: 4rem;
+ height: 45%;
display: flex;
padding-left: 1rem;
justify-content: center;
@@ -661,7 +661,6 @@ export default {
background-size: 100%;
background-position: 100% 50%;
color: #aac6c7;
- font-size: 0.9rem;
span {
margin-right: 0.5rem;
@@ -843,4 +842,4 @@ export default {
padding: 0;
background-color: #113463;
}
-
\ No newline at end of file
+
diff --git a/src/views/big-screen/index.vue b/src/views/big-screen/index.vue
index 84601a7..228a14c 100644
--- a/src/views/big-screen/index.vue
+++ b/src/views/big-screen/index.vue
@@ -2,7 +2,7 @@
* @Author: SunTao 328867980@qq.com
* @Date: 2024-10-17 11:34:00
* @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-05 14:22:25
+ * @LastEditTime: 2024-12-09 10:52:43
* @FilePath: \znxjxt-ui\src\views\big-screen\index.vue
* @Description: 大屏首页
-->
@@ -22,16 +22,36 @@