From 4b3c357f2fa24a27eac3fe59cbf64e34255ab212 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 30 Jun 2026 11:56:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue | 174 +++++++++++++++++++++++++++------------------------------
1 files changed, 83 insertions(+), 91 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
index 9e90a91..4f34518 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
@@ -5,14 +5,18 @@
<el-table-column label="线索缩略图" width="120">
<template v-slot="{ row }">
<el-image
- v-if="row.aiImg || row.resultUrl"
- :src="row.aiImg || row.resultUrl"
- :preview-src-list="[row.aiImg || row.resultUrl]"
+ 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: 60px"
+ style="width: 80px; height: 80px"
preview-teleported
/>
- <span v-else>-</span>
+ <div class="video-btn" v-if="row.attachmentType === 3" @click="videoClick(row)">
+ <el-icon :size="30" color="#fff">
+ <VideoPlay />
+ </el-icon>
+ </div>
</template>
</el-table-column>
<el-table-column prop="resultCode" show-overflow-tooltip label="线索编号" />
@@ -31,8 +35,12 @@
<el-table-column prop="distributeUserName" show-overflow-tooltip label="分发人员" />
<el-table-column label="操作" class-name="operation-btns" width="140">
<template v-slot="{ row }">
- <el-link type="primary" @click="openDistributeDialog(row)" v-if="permission.clueEvents_distribute && (row.distributeStatus === 0 || row.distributeStatus === 2)">
- {{ row.distributeStatus === 2 ? '再次分发':'转为事件并分发' }}
+ <el-link
+ type="primary"
+ @click="openDistributeDialog(row)"
+ v-if="permission.clueEvents_distribute && (row.distributeStatus === 0 || row.distributeStatus === 2)"
+ >
+ {{ row.distributeStatus === 2 ? '再次分发' : '转为事件并分发' }}
</el-link>
<el-button disabled type="text" v-else>转为事件并分发</el-button>
</template>
@@ -51,12 +59,22 @@
@success="getList"
/>
</el-dialog>
+
+ <VideoPlayDialog
+ ref="videoPlayDialogRef"
+ v-if="VideoShow"
+ v-model="VideoShow"
+ :playUrl="currentVideo.resultUrl"
+ />
</template>
<script setup>
import { ref } from 'vue'
import { gdTaskResultListApi } from './achievementApi'
import DistributeDiaLog from './DistributeDiaLog.vue'
+import { getAiImg } from '@ztzf/utils'
+import { VideoPlay } from '@element-plus/icons-vue'
+import VideoPlayDialog from '@/components/VideoPlayDialog.vue'
const store = useStore()
const requester = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
@@ -71,6 +89,8 @@
const currentRow = ref(null) // 当前行数据
const distributeDialogRef = ref(null)
const distributeDialogVisible = ref(false)
+const VideoShow = ref(false)
+const currentVideo = ref({})
// 分发状态选项
const distributeStatusOptions = [
@@ -99,91 +119,18 @@
if (!currentRow.value?.id) return
loading.value = true
try {
- const res = await gdTaskResultListApi({ patrolTaskId: currentRow.value.id })
- list.value = res?.data?.data ?? []
- list.value = await Promise.all(list.value.map(async i => {
- const aiImg = await getAiImg(i.resultUrl)
- return { ...i, aiImg }
- }))
+ const res = await gdTaskResultListApi({ patrolTaskId: currentRow.value.id})
+ list.value = await Promise.all(
+ (res?.data?.data ?? []).map(async item => {
+ if (item.attachmentType !== 2) return item
+ const aiImg = await getAiImg(item.resultUrl,item.geojson)
+ return { ...item, aiImg }
+ })
+ )
} finally {
loading.value = false
}
}
-
-const aiFrame = [
- "{\"score\":0.91357421875,\"bbox\":{\"x_cen\":1246.0,\"y_cen\":209.0,\"width\":166.0,\"height\":334.0},\"class_name\":\"car\",\"algorithmId\":\"e71116098eeb1d60cfebd04d30653b151\"}",
- "{\"score\":0.89697265625,\"bbox\":{\"x_cen\":370.0,\"y_cen\":694.5,\"width\":162.0,\"height\":331.0},\"class_name\":\"car\",\"algorithmId\":\"e71116098eeb1d60cfebd04d30653b151\"}",
- "{\"score\":0.89501953125,\"bbox\":{\"x_cen\":396.0,\"y_cen\":343.0,\"width\":168.0,\"height\":330.0},\"class_name\":\"car\",\"algorithmId\":\"e71116098eeb1d60cfebd04d30653b151\"}",
- "{\"score\":0.79296875,\"bbox\":{\"x_cen\":409.5,\"y_cen\":52.5,\"width\":167.0,\"height\":105.0},\"class_name\":\"car\",\"algorithmId\":\"e71116098eeb1d60cfebd04d30653b151\"}"
-]
-
-function getAiImg(url) {
- if (!url) return ''
- const img = new Image()
- img.crossOrigin = 'anonymous';
- return new Promise(resolve => {
- img.onload = () => {
- if (!img.naturalWidth || !img.naturalHeight) {
- resolve('')
- return
- }
-
- const canvas = document.createElement('canvas')
- const ctx = canvas.getContext('2d')
- if (!ctx) {
- resolve('')
- return
- }
-
- canvas.width = img.naturalWidth
- canvas.height = img.naturalHeight
- ctx.drawImage(img, 0, 0, canvas.width, canvas.height)
-
- aiFrame.forEach(item => {
- let target = item
- try {
- target = typeof item === 'string' ? JSON.parse(item) : item
- } catch (error) {
- return
- }
-
- const { x_cen, y_cen, width, height } = target.bbox || {}
- if ([x_cen, y_cen, width, height].some(value => typeof value !== 'number')) return
-
- const x = x_cen - width / 2
- const y = y_cen - height / 2
- const label = target.class_name || ''
- const fontSize = Math.max(18, Math.round(canvas.width / 80))
- const labelHeight = fontSize + 10
- const labelY = y - labelHeight >= 0 ? y - labelHeight : y
-
- ctx.strokeStyle = '#FF3B30'
- ctx.lineWidth = Math.max(3, Math.round(canvas.width / 640))
- ctx.strokeRect(x, y, width, height)
-
- if (label) {
- ctx.font = `${fontSize}px Arial`
- const labelWidth = ctx.measureText(label).width + 16
- ctx.fillStyle = '#FF3B30'
- ctx.fillRect(x, labelY, labelWidth, labelHeight)
- ctx.fillStyle = '#FFFFFF'
- ctx.textBaseline = 'middle'
- ctx.fillText(label, x + 8, labelY + labelHeight / 2)
- }
- })
-
- try {
- resolve(canvas.toDataURL('image/jpeg', 0.92))
- } catch (error) {
- console.log(error)
- resolve('')
- }
- }
- img.onerror = () => resolve('')
- img.src = url
- })
-}
-
// 打开分发弹框
function openDistributeDialog(row) {
@@ -196,6 +143,12 @@
})
}
+// 点击视频
+function videoClick(row) {
+ currentVideo.value = row
+ VideoShow.value = true
+}
+
// 打开弹框
async function open({ row } = {}) {
currentRow.value = row
@@ -206,8 +159,47 @@
</script>
<style lang="scss" scoped>
- .disabled-text {
- color: #C0C4CC;
- cursor: not-allowed;
+.disabled-text {
+ color: #c0c4cc;
+ cursor: not-allowed;
+}
+
+.video-btn {
+ width: 80px;
+ height: 80px;
+ position: relative;
+ overflow: hidden;
+ border-radius: 4px;
+ background: linear-gradient(135deg, rgba(76, 52, 255, 0.14), rgba(76, 52, 255, 0) 48%),
+ linear-gradient(180deg, #f4f5ff 0%, #e9ecff 100%);
+ box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.7);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ cursor: pointer;
+
+ &::before {
+ content: '';
+ position: absolute;
+ inset: 0;
+ background-image: linear-gradient(
+ 90deg,
+ rgba(76, 52, 255, 0.05) 0,
+ rgba(76, 52, 255, 0.05) 1px,
+ transparent 1px,
+ transparent 12px
+ );
+ opacity: 0.42;
}
+
+ .el-icon {
+ position: relative;
+ z-index: 1;
+ width: 42px;
+ height: 42px;
+ border-radius: 50%;
+ background: rgba(76, 52, 255, 0.72);
+ box-shadow: 0 4px 12px rgba(76, 52, 255, 0.2);
+ }
+}
</style>
--
Gitblit v1.9.3