Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage

rain

2025-06-12 0082fa417fb2af9add3406bf05ab3e3e45890c34

 src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue

@@ -170,14 +170,11 @@
   if (row.status === 2 || row.status === 1) {
      // isShowCurrentTaskDetails.value = true
      // 跳转大屏当前任务详情
      const adminUrl = `${import.meta.env.VITE_APP_AREA_NAME}/command-center-dashboard/`
      const targetPath = `/taskManage?id=${rowData.value.id}&batchNo=${rowData.value.batch_no}`
      window.open(`${adminUrl}?redirect=${encodeURIComponent(targetPath)}`, '_blank')
      const adminUrl = `${import.meta.env.VITE_APP_AREA_NAME}/command-center-dashboard/#/taskManage`
      const targetPath = `id=${encodeURIComponent(rowData.value.id)}&batchNo=${encodeURIComponent(rowData.value.batch_no)}`
      window.open(`${adminUrl}?${targetPath}`, '_blank')
   } else {
      // isShowDeviceJobDetails.value = true
      const adminUrl = `${import.meta.env.VITE_APP_AREA_NAME}/command-center-dashboard/`
      const targetPath = `/taskManage?id=${rowData.value.id}&batchNo=${rowData.value.batch_no}`
      window.open(`${adminUrl}?redirect=${encodeURIComponent(targetPath)}`, '_blank')
      isShowDeviceJobDetails.value = true
   }
}

@@ -245,12 +242,12 @@

<style lang="scss" scoped>
.task-intermediate-content {
   margin: 0 30px 16px 40px;
   margin: 0 18px 16px 10px;
   background-color: #ffffff;
   padding: 14px 18px;
   // 表格
   .task-table {
      height: 520px;
      height: 580px;
      margin-top: 18px;
      overflow: auto;
   }