diff --git a/jero-web/src/mixins/JeroListMixin.js b/jero-web/src/mixins/JeroListMixin.js index a63723895..a5ddfabce 100644 --- a/jero-web/src/mixins/JeroListMixin.js +++ b/jero-web/src/mixins/JeroListMixin.js @@ -87,6 +87,10 @@ export const JeroListMixin = { getAction(this.url.list, params).then((res) => { if (res.success) { //update-begin---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------ + if (res.result.current > 1 && res.result.records.length == 0) { + this.loadData(1) + return + } this.dataSource = res.result.records||res.result; if(res.result.total) { diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index d24754c0c..fe5a2a79f 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -261,6 +261,11 @@ this.loading = true getAction(this.url.list, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue index 5ab1f05dc..bbab9da1b 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -126,6 +126,11 @@ this.loading = true getAction(this.url.getInfoList, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.conList = res.result.records this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 335d28489..ef8eccc3b 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -241,6 +241,11 @@ this.loading = true getAction(this.url.list, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index e8efb5c01..4e5f366ef 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -183,6 +183,11 @@ this.loading = true getAction(this.url.getInfoList, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.conList = res.result.records if (this.conList && this.conList.length > 0) { this.conList.forEach(val => { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index 674d582b4..f752ef697 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -131,6 +131,11 @@ this.loading = true getAction(this.url.getInfoList, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.conList = res.result.records if (this.conList && this.conList.length > 0) { this.conList.forEach(val => { diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 16c344de0..d002831c3 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -206,7 +206,7 @@ getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue index ed6094a76..ff3d45cfd 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue @@ -194,7 +194,7 @@ getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 8e83798ae..14d71ee58 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -331,6 +331,11 @@ this.loading = true getAction(this.url.list, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue index ab4f0e675..9c27a5711 100644 --- a/jero-web/src/views/documentManage/collection/index.vue +++ b/jero-web/src/views/documentManage/collection/index.vue @@ -164,6 +164,11 @@ this.loading = true postAction(`collection/onlCgformCollection/page`, params).then(res => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.queryParams.pageNo = 1 + this.loadData() + return + } this.tableData = [...res.result.records] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/documentManage/subscribtion/index.vue b/jero-web/src/views/documentManage/subscribtion/index.vue index e0df9d449..3e45140b2 100644 --- a/jero-web/src/views/documentManage/subscribtion/index.vue +++ b/jero-web/src/views/documentManage/subscribtion/index.vue @@ -185,6 +185,11 @@ this.loading = true postAction(`subscribe/onlCgformSubscribe/page`, params).then(res => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.queryParams.pageNo = 1 + this.loadData() + return + } this.tableData = [...res.result.records] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue index 1191b6f42..40d188a13 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue @@ -71,7 +71,7 @@ {{$t('selectedStandard')}} {{selectedRowKeysLeftRecord[0]?selectedRowKeysLeftRecord[0].serialNumber+' '+selectedRowKeysLeftRecord[0].fileName:$t('noComparisonDocumentSelected')}} @@ -357,6 +357,11 @@ this.loadingLeft = true getAction(this.url.list, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNoLeft = 1 + this.getListLeft() + return + } this.dataSourceLeft = res.result.records || [] this.totalLeft = res.result.total this.loadingLeft = false @@ -381,6 +386,11 @@ this.loadingRight = true getAction(this.url.list, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNoRight = 1 + this.getListRight() + return + } this.dataSourceRight = res.result.records || [] this.totalRight = res.result.total this.loadingRight = false diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index 64eaaeb48..93c6ef10e 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -258,6 +258,11 @@ this.loading = true getAction(this.url.list, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false @@ -491,11 +496,11 @@ } ::v-deep .ant-table-row:first-child { - background: #fff!important; + background: #fff !important; opacity: 0.9; } ::v-deep .ant-table-body { - background: transparent!important; + background: transparent !important; } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index 5b1458226..2111503b6 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -276,6 +276,11 @@ this.loading = true getAction(this.url.list, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index 9df85be2d..3c4cbfda3 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -413,7 +413,7 @@ getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index 1d08acb9a..e29fd17b3 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -364,7 +364,7 @@ export default { getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/parameter/escalationlibrary/index.vue b/jero-web/src/views/parameter/escalationlibrary/index.vue index e039f52ea..dbb9e4a8a 100644 --- a/jero-web/src/views/parameter/escalationlibrary/index.vue +++ b/jero-web/src/views/parameter/escalationlibrary/index.vue @@ -236,7 +236,7 @@ getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index aa785af22..92c247e1b 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -363,7 +363,7 @@ export default { getAction(this.url.tableList, params).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getTableList() return } diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index da66a2fcd..dd2a91bbe 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -339,7 +339,7 @@ export default { getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 61397d9ca..68c210b30 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -390,7 +390,7 @@ export default { getAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index b314f466d..89c1b78a8 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -353,7 +353,7 @@ postAction(this.url.list, query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index a2e1e0a74..3c58f2543 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -342,6 +342,11 @@ this.loading = true getAction(this.url.page, query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } this.dataSource = res.result.records || [] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 5112ee0ac..b7366a734 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -359,13 +359,11 @@ export default { postAction(this.url.list, query).then((res) => { if (res) { if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = res.result.current - 1 + this.pageNo = 1 this.getList() return } - console.log(res.result) this.dataSource = res.result.records || [] - this.total = res.result.total this.loading = false } else {