From 1f2662dc239f2c19639802dcaf6df1d0974a882b Mon Sep 17 00:00:00 2001 From: SunTao <328867980@qq.com> Date: Mon, 9 Dec 2024 15:35:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=8E=BB=E9=99=A4=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E9=BC=A0=E6=A0=87=E4=BA=8B=E4=BB=B6=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=8A=82=E6=B5=81=E5=BA=93=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83=EF=BC=8C=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E5=88=86=E8=BE=A8=E7=8E=87=E9=80=82=E9=85=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/components/map/fssm-map.vue | 42 +-- .../big-screen/components/img-dialog.vue | 9 +- .../components/img-screen-dialog.vue | 216 ---------------- .../disease-components/traffic-log.vue | 17 +- .../disease-components/traffic-safety.vue | 7 +- src/views/big-screen/index.vue | 239 +++++++++++++----- .../overview-components/today-inspection.vue | 31 +-- .../road-components/ancillary-facilities.vue | 7 +- .../road-components/manage-maintain.vue | 2 +- src/views/index-components/road-index.vue | 10 +- src/views/index-components/traffic-index.vue | 4 +- .../inspection-warn/warning-center/index.vue | 150 +++++++++-- .../confirmation-management/index.vue | 47 +--- .../inspection/disease-management/index.vue | 1 + .../xj/inspection/road-management/index.vue | 7 +- .../xj/inspection/task-management/index.vue | 4 +- 17 files changed, 357 insertions(+), 437 deletions(-) delete mode 100644 src/views/big-screen/components/img-screen-dialog.vue 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="路段名称" > - + - + - + - \ No newline at end of file diff --git a/src/views/big-screen/road-components/manage-maintain.vue b/src/views/big-screen/road-components/manage-maintain.vue index 340d2cd..4517ff8 100644 --- a/src/views/big-screen/road-components/manage-maintain.vue +++ b/src/views/big-screen/road-components/manage-maintain.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-18 15:15:04 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-11-19 09:54:43 + * @LastEditTime: 2024-12-09 11:47:49 * @FilePath: \znxjxt-ui\src\views\big-screen\road-components\manage-maintain.vue * @Description: 道路资产大屏-管养道路统计 --> diff --git a/src/views/index-components/road-index.vue b/src/views/index-components/road-index.vue index 6210ca9..fed9e3a 100644 --- a/src/views/index-components/road-index.vue +++ b/src/views/index-components/road-index.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-29 15:23:44 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-11-18 17:45:39 + * @LastEditTime: 2024-12-09 11:53:20 * @FilePath: \znxjxt-ui\src\views\index-components\road-index.vue * @Description: 首页-公路资产 --> @@ -41,7 +41,7 @@
- + - + \ No newline at end of file + diff --git a/src/views/index-components/traffic-index.vue b/src/views/index-components/traffic-index.vue index 4ac51e9..b672a8e 100644 --- a/src/views/index-components/traffic-index.vue +++ b/src/views/index-components/traffic-index.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-29 15:30:35 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-12-04 09:56:31 + * @LastEditTime: 2024-12-09 11:54:48 * @FilePath: \znxjxt-ui\src\views\index-components\traffic-index.vue * @Description: 首页-路况评定 --> @@ -19,7 +19,7 @@
- + diff --git a/src/views/xj/inspection-warn/warning-center/index.vue b/src/views/xj/inspection-warn/warning-center/index.vue index 8f335dc..b341cbc 100644 --- a/src/views/xj/inspection-warn/warning-center/index.vue +++ b/src/views/xj/inspection-warn/warning-center/index.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-11-20 11:58:33 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-12-05 15:03:52 + * @LastEditTime: 2024-12-09 09:34:17 * @FilePath: \znxjxt-ui\src\views\xj\inspection-warn\warning-center\index.vue * @Description: 预警中心-信息中心 --> @@ -10,41 +10,89 @@