From 9a46f15cec245d1efe7c5539dc6b2f38e4980f8a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 07 二月 2025 11:48:19 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
admin/src/views/Inspection/components/taskDetail.vue | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/Inspection/components/taskDetail.vue b/admin/src/views/Inspection/components/taskDetail.vue
index 79fd9ca..635969f 100644
--- a/admin/src/views/Inspection/components/taskDetail.vue
+++ b/admin/src/views/Inspection/components/taskDetail.vue
@@ -1,6 +1,6 @@
<template>
- <GlobalWindow title="宸℃浠诲姟璇︽儏" :showConfirm="false" :visible.sync="isShowModal">
- <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
+ <GlobalWindow title="宸℃浠诲姟璇︽儏" width="100%" :showConfirm="false" :visible.sync="isShowModal">
+ <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getDetail(1)" @clear="clear" />
<el-table v-loading="loading" :data="list" stripe>
<el-table-column prop="pointName" label="宸℃鐐瑰悕绉�" min-width="100" show-overflow-tooltip />
<el-table-column prop="" label="鐘舵��" min-width="100" show-overflow-tooltip>
@@ -9,12 +9,25 @@
<span v-if="row.status == 1">宸插贰妫�</span>
</template>
</el-table-column>
- <el-table-column prop="editor" label="宸℃浜�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="realname" label="宸℃浜�" min-width="100" show-overflow-tooltip />
<el-table-column prop="editDate" label="宸℃鏃堕棿" min-width="100" show-overflow-tooltip />
- <el-table-column prop="" label="宸℃缁撴灉" min-width="100" show-overflow-tooltip>
+ <el-table-column prop="files" label="宸℃缁撴灉" min-width="100" show-overflow-tooltip >
<template v-slot="{ row }">
<span class="gray" v-if="row.dealStatus == 0">姝ｅ父</span>
<span class="red" v-if="row.dealStatus == 1">寮傚父</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="" label="宸℃闄勪欢" min-width="100" show-overflow-tooltip>
+ <template v-slot="{ row }">
+ <div class="value" v-if="row.multifileList != null && row.multifileList.length">
+ <div v-for="item in row.multifileList.slice(0, 1)" :key="item.id" style="display: inline;margin-right: 20px">
+ <video v-if="item.fileurlFull && item.fileurlFull.endsWith('.mp4')" ref="videoRef" controls preload="auto"
+ style="width: 60px;height: 60px;object-fit: contain;" :src="item.fileurlFull" />
+ <el-image v-else-if="item.fileurlFull" style="width:60px; height: 60px" :src="item.fileurlFull"
+ :preview-src-list="row.multifileList.map(item1 => item1.fileurlFull)">
+ </el-image>
+ </div>
+ </div>
</template>
</el-table-column>
<el-table-column prop="dealInfo" label="宸℃璇存槑" min-width="100" show-overflow-tooltip />
@@ -30,6 +43,7 @@
import QueryForm from '@/components/common/QueryForm'
import Pagination from '@/components/common/Pagination'
import { getDetail } from '@/api/Inspection/ywPatrolTask'
+import dayjs from 'dayjs'
export default {
components: { GlobalWindow, QueryForm, Pagination },
data() {
@@ -41,6 +55,7 @@
page: 1,
total: 0
},
+ loading:false,
filters: {},
list: [],
total: 0,
@@ -82,11 +97,11 @@
this.loading = false
this.list = res.records || []
this.pagination.total = res.total
- this.list.forEach(item => {
- item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
- item.taskOrigin = 'WMS鑾峰彇'
- item.workTime = dayjs.duration(item.param3, 'seconds').format('H鏃秏鍒唖绉�')
- })
+ // this.list.forEach(item => {
+ // item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫'
+ // item.taskOrigin = 'WMS鑾峰彇'
+ // item.workTime = dayjs.duration(item.param3, 'seconds').format('H鏃秏鍒唖绉�')
+ // })
this.pagination.total = res.total || 0
}, () => {
this.loading = false
--
Gitblit v1.9.3