|
|
@ -170,15 +170,16 @@ async function featchList() {
|
|
|
|
loading = true
|
|
|
|
loading = true
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
// const result = await dubiousfilelist({ ...pagination, orderbyname: timeRange.value })
|
|
|
|
// const result = await dubiousfilelist({ ...pagination, orderbyname: timeRange.value })
|
|
|
|
pagination.pageNo += 1
|
|
|
|
|
|
|
|
// console.log('pagination.pageNo------------', pagination.pageNo)
|
|
|
|
// console.log('pagination.pageNo------------', pagination.pageNo)
|
|
|
|
const result = await dubiousfilelist({ ...pagination, ...sortObj })
|
|
|
|
const result = await dubiousfilelist({ ...pagination, ...sortObj })
|
|
|
|
// TODO:测试数据
|
|
|
|
// TODO:测试数据
|
|
|
|
// result.data = Array.from({ length: 30 })
|
|
|
|
// result.data = Array.from({ length: 30 })
|
|
|
|
const { data, pageCount, current } = result
|
|
|
|
const { data, pageCount, current } = result
|
|
|
|
pagination.pageNo = data.current
|
|
|
|
// pagination.pageNo = data.current
|
|
|
|
// canloadMore = pageCount >= pagination.pageNo && pageCount > 0;
|
|
|
|
// canloadMore = pageCount >= pagination.pageNo && pageCount > 0;
|
|
|
|
canloadMore = data.pages >= pagination.pageNo && data.pages > 0
|
|
|
|
canloadMore = data.pages >= pagination.pageNo && data.pages > 0
|
|
|
|
|
|
|
|
pagination.pageNo += 1
|
|
|
|
// console.log('canloadMore------------', canloadMore)
|
|
|
|
// console.log('canloadMore------------', canloadMore)
|
|
|
|
loading = false
|
|
|
|
loading = false
|
|
|
|
return result.data.records
|
|
|
|
return result.data.records
|
|
|
@ -207,16 +208,16 @@ async function loadMore() {
|
|
|
|
more.forEach((item) => {
|
|
|
|
more.forEach((item) => {
|
|
|
|
item.calHeight = 182 * item.high / item.wide
|
|
|
|
item.calHeight = 182 * item.high / item.wide
|
|
|
|
})
|
|
|
|
})
|
|
|
|
if (pagination.pageNo <= 2) {
|
|
|
|
if (pagination.pageNo <= 1) {
|
|
|
|
listData.value = []
|
|
|
|
listData.value = []
|
|
|
|
listData.value = listData.value.concat(more)
|
|
|
|
listData.value = listData.value.concat(more)
|
|
|
|
console.log('listData.value出来了11111111111111', listData.value, pagination.pageNo)
|
|
|
|
console.log('listData.value出来了11111111111111', listData.value, pagination.pageNo)
|
|
|
|
if (pagination.pageNo <= 2)
|
|
|
|
if (pagination.pageNo <= 1)
|
|
|
|
waterfallRef.value?.resize()
|
|
|
|
waterfallRef.value?.resize()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
listData.value = listData.value.concat(more)
|
|
|
|
listData.value = listData.value.concat(more)
|
|
|
|
console.log('listData.value出来了2222222222', listData.value)
|
|
|
|
console.log('listData.value出来了2222222222', listData.value, pagination.pageNo)
|
|
|
|
waterfallRef.value?.mix()
|
|
|
|
waterfallRef.value?.mix()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// layout()
|
|
|
|
// layout()
|
|
|
@ -546,7 +547,7 @@ function reset() {
|
|
|
|
batch.value = false
|
|
|
|
batch.value = false
|
|
|
|
// pagination.pageNo = 1;
|
|
|
|
// pagination.pageNo = 1;
|
|
|
|
pagination.pageNo = 1
|
|
|
|
pagination.pageNo = 1
|
|
|
|
pagination.pageSize = 20
|
|
|
|
pagination.pageSize = 30
|
|
|
|
selectIds.value = []
|
|
|
|
selectIds.value = []
|
|
|
|
selectedApproveItems.value.length = 0
|
|
|
|
selectedApproveItems.value.length = 0
|
|
|
|
loading = false
|
|
|
|
loading = false
|
|
|
|