Merge branch 'test'

shuishen

2025-07-17 aed141813bc64c7afdf3a337d631585b0a3cf42e

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

@@ -50,12 +50,22 @@
            <el-table-column prop="creator_name" label="创建人" align="center" show-overflow-tooltip />
            <el-table-column label="操作" width="200" align="center">
               <template #default="scope">
                  <div v-if="scope.row.status === 2" class="btnItem turnBack" link type="primary"
                     @click="turnBack(scope.row)">
                  <div
                     v-if="scope.row.status === 2"
                     class="btnItem"
                     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)">
                  <div
                     v-if="scope.row.status === 1"
                     class="btnItem"
                     link
                     type="primary"
                     @click="cancelTask(scope.row)"
                  >
                     取消任务
                  </div>
                  <div class="btnItem" link type="primary" @click="handleDetail(scope.row)">查看</div>
@@ -64,10 +74,19 @@
         </el-table>
      </div>
      <div class="pagination">
         <el-pagination class="ztzf-pagination" popper-class="custom-pagination-dropdown"
            v-model:current-page="jobListParams.current" v-model:page-size="jobListParams.size"
            :page-sizes="[10, 20, 30, 40]" layout="prev, pager, next, sizes, jumper" :total="total"
            @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         <el-pagination
            class="ztzf-pagination"
            popper-class="custom-pagination-dropdown"
            background
            :page-sizes="[10, 20, 30, 40,50,100]"
            :size="size"
            v-model:current-page="jobListParams.current"
            v-model:page-size="jobListParams.size"
            layout="total, sizes, prev, pager, next, jumper"
            :total="total"
            @size-change="handleSizeChange"
            @current-change="handleCurrentChange"
         />
      </div>
   </div>
   <!-- 添加任务 -->
@@ -271,7 +290,7 @@

   :deep(.el-pagination) {
      display: flex;
      justify-content: flex-end;
      justify-content: right;
   }

   :deep(.el-pagination button) {