Merge remote-tracking branch 'origin/master'

张含笑

2026-05-21 959e687d5b98702daea19eee6c020eba0ff29c99

 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,7 @@
          />
        </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,17 +36,21 @@
        <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"
                v-if="row.attachmentType ===0 && 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>
                     <div class="video-btn" v-if="row.attachmentType === 1 && 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="巡查任务名称" />
@@ -72,6 +76,13 @@
      </div>
    </div>
  </div>
 <VideoPlayDialog
    ref="videoPlayDialogRef"
    v-if="VideoShow"
    v-model="VideoShow"
    :playUrl="currentVideo.resultUrl"
       >
 </VideoPlayDialog>
</template>

<script setup>
@@ -80,6 +91,7 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import { getDictLabel } from '@ztzf/utils'
import dayjs from 'dayjs'
import VideoPlayDialog from '@/components/VideoPlayDialog.vue'

const props = defineProps({
  workOrderId: {
@@ -124,8 +136,8 @@
    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 || []
@@ -230,6 +242,14 @@
  }
}

// 点击视频
let VideoShow = ref(false)
let currentVideo = ref({})
function videoClick(row) {
   VideoShow.value = true
  currentVideo.value = row
}

// 监听 workOrderId 变化
watch(
   () => props.workOrderId,
@@ -254,17 +274,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>
</style>