Merge remote-tracking branch 'origin/master'

张含笑

2026-05-21 959e687d5b98702daea19eee6c020eba0ff29c99

 applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue

@@ -80,12 +80,17 @@
                  <div class="imgBox">
                     <div v-for="item in taskResultList">
                        <el-image
                           v-if="item.resultUrl"
                           v-if="item.attachmentType === 0 && item.resultUrl"
                           :src="item.resultUrl"
                           :preview-src-list="[item.resultUrl]"
                           fit="cover"
                           preview-teleported
                        />
                        <div class="video-btn" v-if="item.attachmentType === 1 && item.resultUrl" @click="videoClick(item)">
                           <el-icon :size="30" color="#fff">
                              <VideoPlay />
                           </el-icon>
                        </div>
                     </div>
                  </div>
               </template>
@@ -244,6 +249,14 @@
         @success="rejectSuccess"
      />
   </el-dialog>

   <VideoPlayDialog
      ref="videoPlayDialogRef"
      v-if="VideoShow"
      v-model="VideoShow"
      :playUrl="currentVideo.resultUrl"
   >
   </VideoPlayDialog>
</template>

<script setup>
@@ -432,11 +445,13 @@
   try {
      const res = await gdTaskResultListApi({ patrolTaskId: formData.value.id })
      taskResultList.value = res?.data?.data ?? []
      console.log(taskResultList.value, '8989')
   } finally {
   }
}
import { ArrowLineMaterialProperty } from '@/utils/cesium/Material'
import OrderStepBar from '@/views/orderView/orderManage/orderManage/OrderStepBar.vue'
import VideoPlayDialog from '@/components/VideoPlayDialog.vue'
let arrowLineMaterialProperty = new ArrowLineMaterialProperty({
   color: new Cesium.Color(128 / 255, 215 / 255, 255 / 255, 1),
   directionColor: new Cesium.Color(1, 1, 1, 1),
@@ -523,10 +538,18 @@
      const coordinates = geomAnalysis(geom)
      if (!coordinates || !coordinates.length) return
      const airRes = await airlineListApi(coordinates)
      routeOptions.value = airRes.data.data || []
      routeOptions.value = (airRes.data.data || []).filter(item => item)
   } catch (e) {
      console.error('获取工单详情或航线列表失败', e)
   }
}

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

// 初始化地图实例
@@ -575,6 +598,15 @@
      width: 100%;
      height: 100%;
   }
   .video-btn {
      width: 100%;
      height: 100%;
      background-color: #9E9E9E;
      display: flex;
      align-items: center;
      justify-content: center;
      cursor: pointer;
   }
}
:deep(.el-timeline-item__timestamp) {
   font-size: 12px;