From 0bcf4a242a8aa0a0b8f1f2043f7c820292c7fc1a Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 08 Dec 2025 09:50:06 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v9.0/9.0.1' into test
---
src/views/job/components/SearchBox.vue | 8 +-
src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue | 32 +++++++++-
src/views/tickets/ticket.vue | 32 ++++++++--
src/views/tickets/orderLog.vue | 19 ++++++
src/views/dataCenter/dataCenter.vue | 28 +++++++++
src/views/algorithmMange/algorithmMange.vue | 19 ++++++
6 files changed, 123 insertions(+), 15 deletions(-)
diff --git a/src/views/algorithmMange/algorithmMange.vue b/src/views/algorithmMange/algorithmMange.vue
index 1695145..59a6d5b 100644
--- a/src/views/algorithmMange/algorithmMange.vue
+++ b/src/views/algorithmMange/algorithmMange.vue
@@ -56,9 +56,19 @@
<el-button icon="el-icon-edit" type="text" @click="handleEdit(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="tableList.length > 0">
<el-pagination class="ztzf-pagination" popper-class="custom-pagination-dropdown" background
:page-sizes="[10, 20, 30, 40, 50, 100]" :size="params.size" v-model:current-page="params.current"
v-model:page-size="params.size" layout="total, sizes, prev, pager, next, jumper" :total="total"
@@ -286,10 +296,17 @@
flex: 1;
//margin-top: 18px;
overflow: auto;
+ :deep(.el-scrollbar__view) {
+ height: 100%;
+ }
+ :deep(.el-table--fit,.el-scrollbar__view) {
+ height: 100%;
+ }
}
:deep(.el-pagination) {
display: flex;
justify-content: right;
+ padding: 20px 0;
}
:deep(.el-pagination button) {
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index a1baa56..130dfb8 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -53,6 +53,16 @@
>
</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>
<!-- 表格部分 -->
@@ -171,10 +181,20 @@
>
</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="!switchFolders ? tableData.length > 0 : folderList.length > 0">
<el-pagination
:current-page="switchFolders ? FolderListParams.page : jobListParams.current"
:page-size="switchFolders ? FolderListParams.page_size : jobListParams.size"
@@ -935,6 +955,12 @@
height: 0;
flex: 1;
overflow: auto;
+ :deep(.el-scrollbar__view) {
+ height: 100%;
+ }
+ :deep(.el-table--fit,.el-scrollbar__view) {
+ height: 100%;
+ }
.look {
color: #1c5cff;
diff --git a/src/views/job/components/SearchBox.vue b/src/views/job/components/SearchBox.vue
index 83bba63..d6fe8f3 100644
--- a/src/views/job/components/SearchBox.vue
+++ b/src/views/job/components/SearchBox.vue
@@ -318,7 +318,7 @@
let timeList = ['today', 'week', 'month', 'year'];
let timeListStr = ['今日', '本周', '本月', '本年'];
let timeListEnum = ['TODAY', 'CURRENT_WEEK', 'CURRENT_MONTH', 'CURRENT_YEAR'];
-let checked = ref('month');
+let checked = ref('');
// 根据 周期 获取时间段
function getDateRange(date_enum) {
@@ -464,13 +464,15 @@
const dateArray = [date, date];
dateRange.value = dateArray;
+ searchForm.date_enum = ''
const find = store.state.tags.bsTagList.find(i => i.path === '/job/jobstatistics')
find && (find.query = {})
} else {
+ checked.value = 'month'
getDateRange('month')
}
- // 查询一次
- handleSearch()
+ // 查询一次
+ // handleSearch()
});
</script>
<style lang="scss"></style>
diff --git a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
index e79c353..bc543ab 100644
--- a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/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"
@@ -181,7 +191,7 @@
// isShowCurrentTaskDetails.value = true
// 跳转大屏当前任务详情
const adminUrl = `${import.meta.env.VITE_APP_AREA_NAME}/command-center-dashboard/#/taskManage`
- const targetPath = `id=${encodeURIComponent(rowData.value.id)}&batchNo=${encodeURIComponent(rowData.value.batch_no)}`
+ const targetPath = `id=${encodeURIComponent(rowData.value.id)}&batchNo=${encodeURIComponent(rowData.value.batch_no)}&dockSn=${encodeURIComponent(rowData.value.device_sns[0])}`
window.open(`${adminUrl}?${targetPath}`, '_blank')
} else {
isShowDeviceJobDetails.value = true
@@ -273,7 +283,7 @@
})
onBeforeUnmount(() => {
- clearInterval(polling)
+ // clearInterval(polling)
})
onMounted(() => {
@@ -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;
}
diff --git a/src/views/tickets/orderLog.vue b/src/views/tickets/orderLog.vue
index 595c86c..5cbacaf 100644
--- a/src/views/tickets/orderLog.vue
+++ b/src/views/tickets/orderLog.vue
@@ -72,9 +72,19 @@
<!-- </template>-->
</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="orderListTable.length > 0">
<el-pagination class="ztzf-pagination" popper-class="custom-pagination-dropdown" background
:page-sizes="[10, 20, 30, 40, 50, 100]" v-model:current-page="orderListParams.current"
v-model:page-size="orderListParams.size" layout="total, sizes, prev, pager, next, jumper" :total="total"
@@ -463,6 +473,12 @@
height: calc(100vh - 380px);
margin-top: 18px;
overflow: auto;
+ :deep(.el-scrollbar__view) {
+ height: 100%;
+ }
+ :deep(.el-table--fit,.el-scrollbar__view) {
+ height: 100%;
+ }
}
.btnItem {
@@ -501,6 +517,7 @@
:deep(.el-pagination) {
display: flex;
justify-content: right;
+ padding: 20px 0;
}
:deep(.el-pagination button) {
diff --git a/src/views/tickets/ticket.vue b/src/views/tickets/ticket.vue
index fde578b..fd2761f 100644
--- a/src/views/tickets/ticket.vue
+++ b/src/views/tickets/ticket.vue
@@ -227,9 +227,9 @@
<el-button type="text" icon="el-icon-view" @click="handleViewDetail(row)">详情</el-button>
</template>
- <template v-if="row.status === 4 && !isProd">
+ <!-- <template v-if="row.status === 4 && !isProd">
<el-button type="text" icon="el-icon-download" @click="exportTheTick(row)">导出</el-button>
- </template>
+ </template> -->
<template v-if="permission.tickets_repeat_review">
<el-button
@@ -243,9 +243,19 @@
</template>
</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="tableData.length > 0">
<el-pagination
class="table-pagination"
v-model:current-page="page.currentPage"
@@ -1472,9 +1482,15 @@
flex-direction: column;
}
.dataTable {
- height: 0;
- flex: 1;
- overflow: auto;
+ // height: 0;
+ // flex: 1;
+ height: calc(100vh - 365px);
+ :deep(.el-scrollbar__view) {
+ height: 100%;
+ }
+ :deep(.el-table--fit,.el-scrollbar__view) {
+ height: 100%;
+ }
}
.pagination {
display: flex;
@@ -1531,6 +1547,10 @@
:deep(.el-table--border) {
border: 1px solid #ebeef5;
}
+
+ :deep(.el-table__empty-block) {
+ height: calc(100vh - 400px) !important;
+ }
}
::v-deep(.el-tabs) {
height: 100%;
--
Gitblit v1.9.3