From b9d643ac5ccd7e2ce148ab0cbc532402b2dd86b9 Mon Sep 17 00:00:00 2001 From: SunTao <328867980@qq.com> Date: Fri, 27 Dec 2024 14:42:50 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=97=85=E5=AE=B3=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E4=BF=AE=E6=94=B9=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=EF=BC=8C=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=9C=8B=E5=BC=B9=E7=AA=97=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...image-dialog.vue => image-dialog-弃用.vue} | 0 .../confirmation-management/index.vue | 9 +- .../task-management/components/task-view.vue | 31 ++++++- .../xj/inspection/task-management/index.vue | 84 ++++++------------- 4 files changed, 58 insertions(+), 66 deletions(-) rename src/views/xj/inspection/confirmation-management/components/{image-dialog.vue => image-dialog-弃用.vue} (100%) diff --git a/src/views/xj/inspection/confirmation-management/components/image-dialog.vue b/src/views/xj/inspection/confirmation-management/components/image-dialog-弃用.vue similarity index 100% rename from src/views/xj/inspection/confirmation-management/components/image-dialog.vue rename to src/views/xj/inspection/confirmation-management/components/image-dialog-弃用.vue diff --git a/src/views/xj/inspection/confirmation-management/index.vue b/src/views/xj/inspection/confirmation-management/index.vue index 2e75bcb..dafb960 100644 --- a/src/views/xj/inspection/confirmation-management/index.vue +++ b/src/views/xj/inspection/confirmation-management/index.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-11-01 13:17:41 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-12-26 16:02:14 + * @LastEditTime: 2024-12-27 14:25:36 * @FilePath: \znxjxt-ui\src\views\xj\inspection\confirmation-management\index.vue * @Description: 巡检信息-病害确认 --> @@ -315,10 +315,9 @@ import { listDefect, mergeDefect, } from "@/api/xj/confirmation"; -import imageDialog from "./components/image-dialog.vue"; import imgDialog from "./components/img-dialog.vue"; export default { - components: { imageDialog, imgDialog }, + components: { imgDialog }, name: "ConfirmationManagement", data() { return { @@ -515,7 +514,7 @@ export default { this.searchForm = {}; this.dateTime = []; this.getTableList(); - this.$refs.defectTable.clearSort() + this.$refs.defectTable.clearSort(); }, /** @@ -609,6 +608,8 @@ export default { this.showImageDialog = false; this.currentImageItem = {}; this.rects = []; + this.imageItem = {}; + this.getTableList(); }, }, }; diff --git a/src/views/xj/inspection/task-management/components/task-view.vue b/src/views/xj/inspection/task-management/components/task-view.vue index a8bc446..a92d3fe 100644 --- a/src/views/xj/inspection/task-management/components/task-view.vue +++ b/src/views/xj/inspection/task-management/components/task-view.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-12-02 11:20:55 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-12-02 16:57:55 + * @LastEditTime: 2024-12-27 14:15:53 * @FilePath: \znxjxt-ui\src\views\xj\inspection\task-management\components\task-view.vue * @Description: 巡检信息-巡检任务-查看新增病害 --> @@ -109,7 +109,7 @@ +
+ 采集时间: + {{ + new Date(currentImageItem.createdTime).toLocaleString() + }} + 起始桩号： {{ currentImageItem.stakeStart || "暂无数据" }} 终止桩号： + {{ currentImageItem.stakeEnd || "暂无数据" }} + 病害类型： + {{ currentImageItem.defectTypeName || "暂无数据" }} + 病害面积：{{ currentImageItem.targetArea }}平方米 病害长度：{{ + currentImageItem.targetLen * 1 <= 0 + ? "暂无数据" + : `${currentImageItem.targetLen}米` + }} +
@@ -387,4 +402,14 @@ export default { pointer-events: none; border: 2px solid red; } - \ No newline at end of file + +// 图片信息 +.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/task-management/index.vue b/src/views/xj/inspection/task-management/index.vue index 272a89e..36fb093 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-24 16:01:02 + * @LastEditTime: 2024-12-27 14:03:45 * @FilePath: \znxjxt-ui\src\views\xj\inspection\task-management\index.vue * @Description: 巡检管理-巡检任务 --> @@ -22,7 +22,6 @@ v-model="queryParams.taskId" :fetch-suggestions="querySearchAsync" placeholder="请输入任务id" - @select="handleSelect" > @@ -94,9 +93,9 @@ - + - + @@ -146,7 +156,7 @@ - - - - - @@ -265,8 +256,6 @@ export default { // 病害类型下拉 defectCascaderList: [], - // 导出弹窗显隐控制 - exportVisible: false, }; }, created() { @@ -309,13 +298,6 @@ export default { }); }, - /** - * @description: 任务id选择事件 - * @param {*} - * @return {*} - */ - handleSelect() {}, - /** * @description: 获取巡检路段下拉数据 * @return {*} @@ -415,20 +397,12 @@ export default { this.dialogItem = item; }, - /** - * @description: 点击导出事件 - * @return {*} - */ - handelExpport(item) { - this.exportVisible = true; - this.dialogItem = item; - }, - /** * @description: 导出文件 * @return {*} */ - submitForm(type) { + submitForm(item,type) { + console.log(item,'fdfdfd') this.wordExport(this.dialogItem, type); }, @@ -499,14 +473,6 @@ export default { this.dialogItem = {}; }, - /** - * @description: 关闭导出弹窗 - * @return {*} - */ - exportCancel() { - this.exportVisible = false; - this.dialogItem = {}; - }, }, };