feat:更新

chenyao

2025-07-14 4610f91aea4402a2aa71d6ee414789e0e695f606

feat:更新

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

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

    :deep(.el-pagination button) {