Merge remote-tracking branch 'origin/master'

张含笑

2025-04-17 04cd5b43197a8831c1e1637acf96bacb7a7116fa

 src/components/CurrentTaskDetails/CurrentTaskDetails.vue

File was renamed from src/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/CurrentTaskDetails.vue
@@ -34,14 +34,14 @@
import { liveStart } from '@/api/home/machineNest'
import { getJobDetails } from '@/api/home/task'

import RealTimeMap from '@/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/RealTimeMap.vue'
import RealTimeMap from '@/components/CurrentTaskDetails/RealTimeMap.vue'
import { getWebsocketUrl } from '@/websocket/util/config'
import { useConnectWebSocket } from '@/utils/websocket/connect-websocket'
import { EBizCode } from '@/utils/staticData/enums'
import ControlPanel from '@/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/ControlPanel/ControlPanel.vue'
import TaskDetailsHead from '@/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/TaskDetailsHead.vue'
import TaskDetailsLeft from '@/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/TaskDetailsLeft.vue'
import TaskDetailsRight from '@/views/TaskManage/TaskIntermediateContent/CurrentTaskDetails/TaskDetailsRight.vue'
import ControlPanel from '@/components/CurrentTaskDetails/ControlPanel/ControlPanel.vue'
import TaskDetailsHead from '@/components/CurrentTaskDetails/TaskDetailsHead.vue'
import TaskDetailsLeft from '@/components/CurrentTaskDetails/TaskDetailsLeft.vue'
import TaskDetailsRight from '@/components/CurrentTaskDetails/TaskDetailsRight.vue'
import { ElMessage } from 'element-plus'
import EventBus from '@/event-bus'

@@ -51,13 +51,7 @@
provide('lineQuality', lineQuality)

const isShow = defineModel('show')
const props = defineProps({
   rowData: {
      // 任务列表row数据
      type: Object,
      default: () => ({}),
   },
})
const props = defineProps(['id'])
const currentLiveUrl = ref('')
const machineNestUrl = ref('')
const droneLiveUrl = ref('')
@@ -106,7 +100,8 @@

// 获取任务详情获取航线文件
const getTaskDetails = () => {
   getJobDetails({ wayLineJobInfoId: props.rowData.id }).then(async res => {
   if (!props.id) ElMessage.warning('请检查是否传入id')
   getJobDetails({ wayLineJobInfoId: props.id }).then(async res => {
      taskDetails.value = res.data.data
      currentLiveUrl.value = await getDeviceLiveUrl()
      taskDetails.value.workspace_id = taskDetails.value.way_lines[0]?.workspace_id
@@ -170,7 +165,7 @@
   .el-dialog {
      border-radius: 40px;
      position: relative;
      margin-top: 38px;
      margin-top: 25px;
      width: 1782px;
      height: 1002px;
      padding: 0;
@@ -187,8 +182,8 @@

         .el-dialog__headerbtn {
            position: absolute;
            right: -40px;
            top: -40px;
            right: -30px;
            top: -30px;

            .el-dialog__close {
               font-size: 30px;