Merge branch 'refs/heads/test'

张含笑

2025-07-18 e64e01d698c071cb4e904a7a6f6dbe25a5268c3a

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

@@ -50,7 +50,6 @@
            <el-table-column prop="creator_name" label="创建人" align="center" show-overflow-tooltip />
            <el-table-column label="操作" width="200" align="center">
               <template #default="scope">
<<<<<<< HEAD
                  <div
                     v-if="scope.row.status === 2"
                     class="btnItem"
@@ -67,14 +66,6 @@
                     type="primary"
                     @click="cancelTask(scope.row)"
                  >
=======
                  <div v-if="scope.row.status === 2" class="btnItem turnBack" link type="primary"
                     @click="turnBack(scope.row)">
                     返航
                  </div>
                  <div v-if="scope.row.status === 1" class="btnItem cancelTask" link type="primary"
                     @click="cancelTask(scope.row)">
>>>>>>> 28c246747fe4214c22f3df73ad62b3cd2668dc3c
                     取消任务
                  </div>
                  <div class="btnItem" link type="primary" @click="handleDetail(scope.row)">查看</div>
@@ -87,7 +78,7 @@
            class="ztzf-pagination"
            popper-class="custom-pagination-dropdown"
            background
            :page-sizes="[10, 20, 30, 40]"
            :page-sizes="[10, 20, 30, 40,50,100]"
            :size="size"
            v-model:current-page="jobListParams.current"
            v-model:page-size="jobListParams.size"
@@ -117,7 +108,7 @@
import SearchBox from '../SearchBox.vue'
import AddTask from './AddTask.vue'
// import CurrentTaskDetails from '@/components/CurrentTaskDetails/CurrentTaskDetails.vue'
import { jobList, cancelJobs, taskReturnLines } from '@/api/job/task'
import { jobList, cancelJobs, taskReturnLines, returnHomeCluster } from '@/api/job/task'
import { ElMessage } from 'element-plus'
import DeviceJobDetails from '../DeviceJobDetails.vue'
import CancelTaskDialog from '../CancelTaskDialog.vue'
@@ -224,7 +215,12 @@
}
// 返航
const turnBack = row => {
   taskReturnLines(row.device_sns).then(res => {
   if (row.returnStatus === '待机') return

   if (row.returnStatus === '自动返航') return ElMessage.success('无人机返航中')

   if (row.returnStatus === '自动降落') return ElMessage.success('无人机降落中')
   returnHomeCluster(row.device_sns).then(res => {
      if (res.data.code !== 0) return
      ElMessage.success('返航操作成功')
      getJobList()
@@ -242,7 +238,7 @@
   flex: 1;
   margin: 0 10px 10px 10px;
   background-color: #ffffff;
   padding: 20px;
   padding: 10px 20px;
   border-radius: 5px;
   display: flex;
   flex-direction: column;
@@ -299,11 +295,7 @@

   :deep(.el-pagination) {
      display: flex;
<<<<<<< HEAD
      justify-content: right;
=======
      justify-content: flex-end;
>>>>>>> 28c246747fe4214c22f3df73ad62b3cd2668dc3c
   }

   :deep(.el-pagination button) {