From 1f93df8130f358538a1a60c766ed62ae47a6d586 Mon Sep 17 00:00:00 2001 From: SunTao <328867980@qq.com> Date: Tue, 24 Dec 2024 16:18:30 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=97=85?= =?UTF-8?q?=E5=AE=B3=E5=AF=B9=E6=AF=94=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=98=BE=E7=A4=BA=E6=9C=80=E4=BD=B3=E5=B1=82?= =?UTF-8?q?=E7=BA=A7=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=9B=BE=E7=89=87=E6=94=BE=E5=A4=A7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index/{护栏缺损.png => 护栏损坏.png} | Bin src/views/big-screen/index.vue | 15 ++++-- .../components/image-dialog.vue | 5 +- .../confirmation-management/index.vue | 28 +++++++++- .../inspection/disease-management/index.vue | 34 ++++++++++-- .../xj/inspection/road-management/index.vue | 44 ++++++++------- .../components/surface-map.vue | 51 ++++++++++++++++-- .../inspection/surface-management/index.vue | 6 +-- .../xj/inspection/task-management/index.vue | 8 +-- 9 files changed, 144 insertions(+), 47 deletions(-) rename src/assets/screen/index/{护栏缺损.png => 护栏损坏.png} (100%) diff --git a/src/assets/screen/index/护栏缺损.png b/src/assets/screen/index/护栏损坏.png similarity index 100% rename from src/assets/screen/index/护栏缺损.png rename to src/assets/screen/index/护栏损坏.png diff --git a/src/views/big-screen/index.vue b/src/views/big-screen/index.vue index 0ed52bd..c03bffb 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-24 11:20:36 + * @LastEditTime: 2024-12-24 15:58:07 * @FilePath: \znxjxt-ui\src\views\big-screen\index.vue * @Description: 大屏首页 --> @@ -316,7 +316,6 @@ @@ -324,7 +323,7 @@ { @@ -1111,6 +1114,10 @@ export default { center, duration: 500, }); + map.getView().fit(extent,{ + duration: 500, + padding: [80, 500, 80, 500], // 边缘填充（可选） + }); }); } this.isCenterCalculated = true; diff --git a/src/views/xj/inspection/confirmation-management/components/image-dialog.vue b/src/views/xj/inspection/confirmation-management/components/image-dialog.vue index c2fb312..c349bdb 100644 --- a/src/views/xj/inspection/confirmation-management/components/image-dialog.vue +++ b/src/views/xj/inspection/confirmation-management/components/image-dialog.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-11-01 17:25:06 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-12-17 09:42:12 + * @LastEditTime: 2024-12-24 15:43:51 * @FilePath: \znxjxt-ui\src\views\xj\inspection\confirmation-management\components\image-dialog.vue * @Description: 病害确认-影像模式弹窗 --> @@ -109,8 +109,7 @@ {{ new Date(rectsItem.createdTime).toLocaleString() }} 起始桩号: {{ rectsItem.stakeStart || "暂无数据" }} 终止桩号: {{ rectsItem.stakeEnd || "暂无数据" }} - 病害类型：{{ rectsItem.defectTypeName || "暂无数据" }} 路产状态: - {{ filterState(rectsItem.state) }} + 病害类型：{{ rectsItem.defectTypeName || "暂无数据" }}
@@ -258,7 +258,7 @@ @@ -275,6 +275,19 @@ class="rect-overlay" :style="getRectStyle(rect)" >
+
+ 采集时间: + {{ new Date(currentImageItem.createdTime).toLocaleString() }} + 起始桩号： {{ currentImageItem.stakeStart || "暂无数据" }} 终止桩号： + {{ currentImageItem.stakeEnd || "暂无数据" }} + 病害类型： + {{ currentImageItem.defectTypeName || "暂无数据" }} + 病害面积：{{ currentImageItem.targetArea }}平方米 病害长度：{{ + currentImageItem.targetLen * 1 <= 0 + ? "暂无数据" + : `${currentImageItem.targetLen}米` + }} +
@@ -608,6 +621,7 @@ export default { width: 100%; height: 80%; display: flex; + flex-direction: column; align-items: center; justify-content: center; overflow: hidden; @@ -624,4 +638,14 @@ export default { pointer-events: none; border: 2px solid red; } + +// 图片信息 +.rect-image { + width: 90%; + position: absolute; + top: 0; + font-size: 1.2rem; + color: #ffffff; + background-color: rgba(0, 0, 0, 0.5); +} diff --git a/src/views/xj/inspection/disease-management/index.vue b/src/views/xj/inspection/disease-management/index.vue index 80be4c6..169433f 100644 --- a/src/views/xj/inspection/disease-management/index.vue +++ b/src/views/xj/inspection/disease-management/index.vue @@ -2,7 +2,7 @@ * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git * @Date: 2024-10-08 10:58:25 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-12-06 15:08:38 + * @LastEditTime: 2024-12-24 15:57:52 * @FilePath: \znxjxt-ui\src\views\xj\inspection\disease-management\index.vue * @Description: 巡检信息管理-病害管理 --> @@ -558,9 +558,7 @@

病害类型：{{ viewForm.defectTypeName }}

病害长度：{{ - viewForm.targetLen * 1 < 0 - ? "" - : `${viewForm.targetLen}米` + viewForm.targetLen * 1 < 0 ? "" : `${viewForm.targetLen}米` }}

病害id：{{ viewForm.id }}

@@ -617,7 +615,7 @@ +
+ 采集时间: + {{ new Date(currentImageItem.createdTime).toLocaleString()}} 起始桩号： + {{ currentImageItem.stakeStart || "暂无数据" }} 终止桩号： + {{ currentImageItem.stakeEnd || "暂无数据" }} + 病害类型： + {{ currentImageItem.defectTypeName || "暂无数据" }} + 病害面积：{{ currentImageItem.targetArea }}平方米 病害长度：{{ + currentImageItem.targetLen * 1 <= 0 + ? "暂无数据" + : `${currentImageItem.targetLen}米` + }} +
@@ -1426,6 +1437,8 @@ export default { */ showScreenImg(item) { this.currentImageItem = item; + console.log(item, "ddddd"); + this.showImageDialog = true; }, @@ -1561,6 +1574,7 @@ export default { width: 100%; height: 80%; display: flex; + flex-direction: column; align-items: center; justify-content: center; overflow: hidden; @@ -1577,4 +1591,14 @@ export default { pointer-events: none; border: 2px solid red; } + +// 图片信息 +.rect-image { + width: 90%; + position: absolute; + top: 0; + font-size: 1.2rem; + color: #ffffff; + background-color: rgba(0, 0, 0, 0.5); +} diff --git a/src/views/xj/inspection/road-management/index.vue b/src/views/xj/inspection/road-management/index.vue index b8269ac..3bf703f 100644 --- a/src/views/xj/inspection/road-management/index.vue +++ b/src/views/xj/inspection/road-management/index.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-11 15:14:16 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-12-02 11:09:10 + * @LastEditTime: 2024-12-24 15:37:29 * @FilePath: \znxjxt-ui\src\views\xj\inspection\road-management\index.vue * @Description: 巡检信息-路产管理 --> @@ -176,27 +176,6 @@ >删除 - - +
+ 采集时间: + {{ new Date(currentImageItem.createdTime).toLocaleString() }} 起始桩号： + {{ currentImageItem.stakeStart || "暂无数据" }} 终止桩号： + {{ currentImageItem.stakeEnd || "暂无数据" }} + 路产类型： + {{ filterDefect(currentImageItem.equipmentType)|| "暂无数据" }} +
@@ -900,6 +887,7 @@ export default { width: 100%; height: 80%; display: flex; + flex-direction: column; align-items: center; justify-content: center; overflow: hidden; @@ -916,4 +904,14 @@ export default { pointer-events: none; border: 2px solid red; } + +// 图片信息 +.rect-image { + width: 90%; + position: absolute; + top: 0; + font-size: 1.2rem; + color: #ffffff; + background-color: rgba(0, 0, 0, 0.5); +} diff --git a/src/views/xj/inspection/surface-management/components/surface-map.vue b/src/views/xj/inspection/surface-management/components/surface-map.vue index d1a44d3..2f751dc 100644 --- a/src/views/xj/inspection/surface-management/components/surface-map.vue +++ b/src/views/xj/inspection/surface-management/components/surface-map.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-14 14:49:21 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-11-07 16:47:49 + * @LastEditTime: 2024-12-24 16:09:46 * @FilePath: \znxjxt-ui\src\views\xj\inspection\surface-management\components\surface-map.vue * @Description: 路面病害管理-地图组件 --> @@ -98,7 +98,7 @@ export default { image: new Icon({ crossOrigin: "anonymous", src: require(`@/assets/screen/index/${ - this.mapLogeList[element.iconType] + this.mapLogeList[element.iconType]||"龟裂" }.png`), // size: [40, 40], scale: 0.5, // 图标缩放比例 @@ -237,6 +237,51 @@ export default { type: "bar", }, ], + dataZoom: [ + { + // 设置滚动条的隐藏与显示 + show: false, + // 设置滚动条类型 + type: "slider", + // 设置背景颜色 + backgroundColor: "rgba(225,225,225,0.2)", + // 设置选中范围的填充颜色 + fillerColor: "#ccc", + // 设置边框颜色 + borderColor: "rgba(225,225,225,0.2)", + // 是否显示detail，即拖拽时候显示详细数值信息 + showDetail: false, + // 数据窗口范围的起始数值 + startValue: 0, + // 数据窗口范围的结束数值（一页显示多少条数据） + endValue: 10, + // empty：当前数据窗口外的数据，被设置为空。 + // 即不会影响其他轴的数据范围 + filterMode: "empty", + // 设置滚动条宽度，相对于盒子宽度 + width: "80%", + // 设置滚动条高度 + height: 5, + // 设置滚动条显示位置 + left: "center", + // 是否锁定选择区域（或叫做数据窗口）的大小 + zoomLoxk: true, + // 控制手柄的尺寸 + handleSize: 10, + // dataZoom-slider组件离容器下侧的距离 + bottom: 0, + }, + { + // 没有下面这块的话，只能拖动滚动条， + // 鼠标滚轮在区域内不能控制外部滚动条 + type: "inside", + // 滚轮是否触发缩放 + zoomOnMouseWheel: false, + // 鼠标滚轮触发滚动 + moveOnMouseMove: true, + moveOnMouseWheel: true, + }, + ], }); window.addEventListener("resize", () => { chart.resize(); @@ -294,4 +339,4 @@ export default { } } } - \ No newline at end of file + diff --git a/src/views/xj/inspection/surface-management/index.vue b/src/views/xj/inspection/surface-management/index.vue index c1322fb..cac4674 100644 --- a/src/views/xj/inspection/surface-management/index.vue +++ b/src/views/xj/inspection/surface-management/index.vue @@ -23,6 +23,7 @@ v-model="surfaceForm.segmentId" placeholder="请选择道路名称" clearable + filterable > - + \ No newline at end of file + diff --git a/src/views/xj/inspection/task-management/index.vue b/src/views/xj/inspection/task-management/index.vue index c4c7741..272a89e 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-06 17:19:25 + * @LastEditTime: 2024-12-24 16:01:02 * @FilePath: \znxjxt-ui\src\views\xj\inspection\task-management\index.vue * @Description: 巡检管理-巡检任务 --> @@ -112,13 +112,13 @@ @click="viewDefect(scope.row)" >查看 - 回顾 - + -->