Merge branch 'refs/heads/feature/v9.0/9.0.1' into feature/v9.0/9.0.2

张含笑

2025-12-10 93fd50d4705b441125a05439b20a8531a2e453f7

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

@@ -85,9 +85,19 @@
                  <el-button icon="el-icon-view" type="text" @click="handleDetail(scope.row)">查看</el-button>
               </template>
            </el-table-column>
        <template #empty>
          <el-empty
            class="custom-empty"
            :image-size="100"
          >
            <template #description>
              <span class="custom-text">暂无数据</span>
            </template>
          </el-empty>
        </template>
         </el-table>
      </div>
      <div class="pagination">
      <div class="pagination" v-if="jobListData.length > 0">
         <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"
@@ -104,7 +114,7 @@
   /> -->
   <!-- 历史任务详情 -->
   <DeviceJobDetails v-if="isShowDeviceJobDetails" v-model:show="isShowDeviceJobDetails" :wayLineJobInfoId="rowData.id"
      :batchNo="rowData.batch_no" :jobId="jobId"/>
      :batchNo="rowData.batch_no" :jobId="jobId" :waylineJobId="rowData.wayline_job_id"/>
   <CancelTaskDialog ref="cancelTaskDialogRef" v-model:isShowCancelTask="isShowCancelTask" :row-data="rowData"
      @refresh="getJobList" />
</template>
@@ -298,7 +308,22 @@
      flex: 1;
      margin-top: 18px;
      overflow: auto;
    :deep(.el-scrollbar__view) {
      height: 100%;
    }
    :deep(.el-table--fit,.el-scrollbar__view) {
      height: 100%;
    }
   }

  .custom-empty {
    //font-family: Source Han Sans CN, Source Han Sans CN;
    //margin-top: 15%;
    //.custom-text {
    //  color: #fff;
    //  font-size: 16px;
    //}
  }

   .btnItem {
      height: 27px;
@@ -344,6 +369,7 @@

   :deep(.el-pagination) {
      display: flex;
    padding: 20px 0;
      justify-content: right;
   }