From aca86784550b3ef016f9c514548be97abc2dfff2 Mon Sep 17 00:00:00 2001 From: raoyongjun <2641346316@qq.com> Date: Mon, 29 Apr 2024 16:56:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Header/RecycleModal.vue | 29 ++++++++++-------- src/views/home/content/Content.vue | 23 +++++++++----- src/views/task/modal/BatchModal.vue | 30 +++++++++++-------- 3 files changed, 50 insertions(+), 32 deletions(-) diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue index cb45839..cda60ae 100644 --- a/src/layout/components/Header/RecycleModal.vue +++ b/src/layout/components/Header/RecycleModal.vue @@ -211,8 +211,8 @@ async function loadMore() { if (pagination.pageNo <= 2) { listData.value = [] listData.value = listData.value.concat(more) - console.log('listData.value出来了11111111111111', listData.value) - if (pagination.pageNo == 1) + console.log('listData.value出来了11111111111111', listData.value, pagination.pageNo) + if (pagination.pageNo <= 2) waterfallRef.value?.resize() } else { @@ -499,7 +499,7 @@ function setBatch(value) { batch.value = !value else batch.value = value - + waterfallRef.value?.resize() if (value === false) { selectIds.value = [] selectedApproveItems.value.forEach(item => (item.checked = false)) @@ -612,13 +612,17 @@ function doAudit(param: any) { if (code === 'OK') { message.info(res.message) // emitter.emit('refresh') - refreshHandler() + // refreshHandler() + reset() + loadMore() } else { message.error(res.message) } }) } function reloadList() { - refreshHandler() + // refreshHandler() + reset() + loadMore() } async function refreshHandler(filtersearchId?: any) { // 注释 rao start @@ -738,7 +742,7 @@ watch(() => show.value, async (newVal) => { 批量审批
- + @@ -853,7 +857,7 @@ watch(() => show.value, async (newVal) => { :style="{ backgroundImage: `url(${loading ? bgLoadingImg : 'none'})`, display: 'none' }" /> @@ -1039,7 +1043,7 @@ watch(() => show.value, async (newVal) => { width: 46px; height: 22px; position: absolute; - left: 16px; + left: 2px; top: 20px; } @@ -1056,8 +1060,8 @@ watch(() => show.value, async (newVal) => { background: #6f92fd; border-radius: 6px 0px 6px 0px; z-index: 5; - right: 28px; - top: 0px; + right: 16px; + top: 6px; color: #fff; font-size: 14px; @@ -1073,10 +1077,10 @@ watch(() => show.value, async (newVal) => { .time { position: absolute; width: 182px; - // padding-left: 10px; + padding-left: 10px; z-index: 3; left: 6px; - bottom: 0px; + bottom: 6px; background: linear-gradient(180deg,rgba(6,0,0,0.01),rgba(0, 0, 0, 0.44) 100%); border-radius: 0 0 7px 7px; .time-item { @@ -1100,6 +1104,7 @@ watch(() => show.value, async (newVal) => { .scroll { overflow-y: auto; + overflow-x: hidden; // height: calc(100vh - 282px); height: 800px; margin-left: 20px; diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 79a4e6b..0925eb0 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -225,17 +225,23 @@ watch( console.log('搜索框的值', newVal, oldVal) if (newVal) { isInitSeaerch.value = true - pagination.pageNo = 0 - const more = await featchList() - listData.value = more + // pagination.pageNo = 0 + // const more = await featchList() + // listData.value = more + // isInitSeaerch.value = false + // // configStore.setSearchValue(""); + reset() + loadMore() isInitSeaerch.value = false - // configStore.setSearchValue(""); } else { isInitSeaerch.value = true - pagination.pageNo = 0 - const more = await featchList() - listData.value = more + // pagination.pageNo = 0 + // const more = await featchList() + // listData.value = more + // isInitSeaerch.value = false + reset() + loadMore() isInitSeaerch.value = false } }, @@ -244,6 +250,7 @@ watch( watch( () => configStore.getAsideValue, async (newVal, oldVal) => { + console.log('configStore.getAsideValue变化了啊', configStore.getAsideValue, pagination.pageNo) if (pagination.pageNo > 1 && newVal && !(Object.entries(newVal).toString() === Object.entries(oldVal).toString())) { reset() loadMore() @@ -347,6 +354,8 @@ async function loadMore() { listData.value = listData.value.concat(more) console.log('listData.value出来了', listData.value) waterfallRef.value?.resize() + if (listData.value.length == 0) + waterfallRef.value?.clear() } else { listData.value = listData.value.concat(more) diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue index 1dc8741..2ad14e4 100644 --- a/src/views/task/modal/BatchModal.vue +++ b/src/views/task/modal/BatchModal.vue @@ -349,11 +349,16 @@ watch(() => selectIds.value.length, () => { }) const showActions = computed(() => { - return selectIds.value.length > 0 && batch + return selectIds.value.length > 0 && batch.value }) function setBatch(value: boolean) { batch.value = value + console.log('batch.value是什么', batch.value) + listData.value.forEach((item) => { + item.pictureId += 1 + }) + waterfallRef.value?.resize() if (value === false) { selectIds.value = [] listData.value.forEach((item) => { @@ -612,7 +617,7 @@ defineExpose({
@@ -657,9 +662,8 @@ defineExpose({
-
+
@@ -673,7 +677,7 @@ defineExpose({
@@ -718,10 +722,10 @@ defineExpose({
-
+
@@ -791,8 +795,8 @@ defineExpose({ .time { position: absolute; z-index: 3; - left: 6px; - bottom: 6px; + left: 12px; + bottom: 12px; .time-item{ display: flex; align-items: center; @@ -1005,8 +1009,8 @@ defineExpose({ .check{ position: absolute; z-index: 3; - left: 6px; - top: 6px; + left: 12px; + top: 12px; } .percent { @@ -1020,7 +1024,7 @@ defineExpose({ background: #6f92fd; border-radius: 6px 0px 6px 0px; z-index: 5; - right: 6px; + right: 18px; top: 6px; color: #fff; font-size: 14px;