From a53ece5036c1fa61a63fe5f9e0cd3519210ab928 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 07 Aug 2026 09:44:27 +0800
Subject: [PATCH] feat:兼容分辨率低不出现滚动条
---
applications/task-work-order/src/views/orderView/orderManage/orderManage/outcomeData.vue | 115 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 21 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/outcomeData.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/outcomeData.vue
index c602d60..4e2dc31 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/outcomeData.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/outcomeData.vue
@@ -10,7 +10,7 @@
v-model="searchParams.patrolTaskIds"
placeholder="请选择"
clearable
-
+
multiple
@change="handleSearch"
>
@@ -22,7 +22,25 @@
/>
</el-select>
</el-form-item>
-
+
+ <el-form-item label="成果类型" prop="attachmentType">
+ <el-select
+ class="gd-select"
+ popper-class="gd-select-popper"
+ v-model="searchParams.attachmentType"
+ placeholder="请选择"
+ clearable
+ @change="handleSearch"
+ >
+ <el-option
+ v-for="item in attachmentTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+
<el-form-item >
<el-button :icon="RefreshRight" @click="resetForm"></el-button>
<el-button :icon="Search" color="#383874" @click="handleSearch"></el-button>
@@ -36,22 +54,32 @@
<el-table class="gd-table" :data="list" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="46" />
<el-table-column type="index" label="序号" width="80" />
- <el-table-column label="图片" >
+ <el-table-column label="图片/视频" >
<template v-slot="{ row }">
- <el-image
- v-if="row.resultUrl"
- :src="row.resultUrl"
- :preview-src-list="[row.resultUrl]"
- fit="cover"
- style="width: 80px; height: 80px; border-radius: 4px;"
- preview-teleported
- />
- <span v-else>-</span>
+ <el-image
+ v-if="row.attachmentType === 1 || row.attachmentType === 2"
+ :src="row.attachmentType === 1 ? row.resultUrl : row.aiImg"
+ :preview-src-list="[row.attachmentType === 1 ? row.resultUrl : row.aiImg]"
+ fit="cover"
+ style="width: 80px; height: 80px"
+ preview-teleported
+ />
+ <div class="video-btn" v-if="row.attachmentType === 3 && row.resultUrl" @click="videoClick(row)">
+ <el-icon :size="30" color="#fff">
+ <VideoPlay />
+ </el-icon>
+ </div>
</template>
</el-table-column>
<el-table-column prop="patrolTaskName" show-overflow-tooltip label="巡查任务名称" />
+ <el-table-column label="成果类型">
+ <template v-slot="{ row }">
+ {{ getAttachmentTypeLabel(row.attachmentType) }}
+ </template>
+ </el-table-column>
+
<el-table-column prop="shootTime" show-overflow-tooltip label="拍摄时间" />
- <el-table-column label="操作" class-name="operation-btns" width="120">
+ <el-table-column label="操作" class-name="operation-btns" width="120" fixed="right">
<template v-slot="{ row }">
<!-- <el-link type="primary" @click="handleDownload(row)">下载</el-link> -->
<el-link type="primary" @click="handleDelete(row)">删除</el-link>
@@ -72,14 +100,22 @@
</div>
</div>
</div>
+ <VideoPlayDialog
+ ref="videoPlayDialogRef"
+ v-if="VideoShow"
+ v-model="VideoShow"
+ :playUrl="currentVideo.resultUrl"
+ >
+ </VideoPlayDialog>
</template>
<script setup>
import {gdTaskResultPageApi, gdTaskResultDownloadApi, gdTaskResultRemoveApi,listByWorkOrderId}from './orderManageApi'
import { Search, RefreshRight, Download } from '@element-plus/icons-vue'
import { ElMessage, ElMessageBox } from 'element-plus'
-import { getDictLabel } from '@ztzf/utils'
+import { getAiImg, getDictLabel } from '@ztzf/utils'
import dayjs from 'dayjs'
+import VideoPlayDialog from '@/components/VideoPlayDialog.vue'
const props = defineProps({
workOrderId: {
@@ -94,7 +130,8 @@
const initSearchParams = () => ({
current: 1,
size: 10,
- patrolTaskIds: []
+ patrolTaskIds: [],
+ attachmentType: ''
})
const searchParams = ref(initSearchParams())
@@ -105,6 +142,16 @@
const selectedRows = ref([])
const patrolTaskList = ref([])
const dictObj = inject('dictObj')
+const attachmentTypeOptions = [
+ { label: '媒体文件', value: 1 },
+ { label: 'AI文件', value: 2 },
+ { label: '主视频', value: 3 },
+]
+
+function getAttachmentTypeLabel(attachmentType) {
+ return attachmentTypeOptions.find(item => item.value === Number(attachmentType))?.label || ''
+}
+
// 导出加载状态
const exportLoading = ref(false)
// 获取巡查任务列表
@@ -124,11 +171,17 @@
const res = await gdTaskResultPageApi({
...searchParams.value,
workOrderId: props.workOrderId,
- patrolTaskIds: searchParams.value.patrolTaskIds.length
- ? searchParams.value.patrolTaskIds.join(',')
+ patrolTaskIds: searchParams.value.patrolTaskIds.length
+ ? searchParams.value.patrolTaskIds.join(',')
: ''
})
- list.value = res?.data?.data?.records || []
+ list.value = await Promise.all(
+ (res?.data?.data?.records ?? []).map(async item => {
+ if (item.attachmentType !== 2) return item
+ const aiImg = await getAiImg(item.resultUrl,item.geojson)
+ return { ...item, aiImg }
+ })
+ )
total.value = res?.data?.data?.total || 0
} finally {
loading.value = false
@@ -230,6 +283,14 @@
}
}
+// 点击视频
+let VideoShow = ref(false)
+let currentVideo = ref({})
+function videoClick(row) {
+ currentVideo.value = row
+ VideoShow.value = true
+}
+
// 监听 workOrderId 变化
watch(
() => props.workOrderId,
@@ -254,17 +315,29 @@
display: flex;
flex-direction: column;
overflow: hidden;
-
+
.gd-table-container {
flex: 1;
overflow: hidden;
display: flex;
flex-direction: column;
-
+
.gd-table-content {
flex: 1;
overflow: auto;
}
+ .video-btn {
+ width: 80px;
+ height: 80px;
+ background-color: #9E9E9E;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 4px;
+ cursor: pointer;
+ }
}
+
+
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3