Merge branch 'test'

shuishen

2025-07-17 aed141813bc64c7afdf3a337d631585b0a3cf42e

 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"
@@ -299,11 +290,7 @@

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

   :deep(.el-pagination button) {