From 43b3ebd07869f2e58f8348ff2e6445e855a4ec9c Mon Sep 17 00:00:00 2001 From: Dragon <> Date: Tue, 2 Apr 2024 15:35:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BB=88=E5=AE=A1=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=202=E3=80=81=E7=9B=B8=E4=BC=BC=E5=9B=BE=E6=A0=B7=E5=BC=8F=203?= =?UTF-8?q?=E3=80=81=E7=BB=88=E5=AE=A1=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=204=E3=80=81=E5=AE=A1=E6=A0=B8=E5=AE=8C=E6=88=90=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=94=B9=E5=8F=98bug=205=E3=80=81=E7=9B=B8=E4=BC=BC?= =?UTF-8?q?=E5=9B=BE=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98=206=E3=80=81?= =?UTF-8?q?=E7=BC=A9=E7=95=A5=E5=9B=BE=E9=97=AE=E9=A2=98=207=E3=80=81?= =?UTF-8?q?=E5=B0=8F=E7=BB=93=E6=9F=A5=E9=87=8D=E9=87=8D=E5=A4=8D=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E9=97=AE=E9=A2=98=208=E3=80=81=E7=A7=BB=E5=85=A5?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/final/comp/ListAction.vue | 16 ++- src/views/final/comp/RepeatTaskTableModal.vue | 55 ++++++--- src/views/final/content/Content.vue | 7 +- src/views/task/aside/Aside.vue | 2 - src/views/task/content/Content.vue | 13 +- src/views/task/modal/BatchModal.vue | 112 ++++++++++++++---- 6 files changed, 155 insertions(+), 50 deletions(-) diff --git a/src/views/final/comp/ListAction.vue b/src/views/final/comp/ListAction.vue index f1ef5e2..72da761 100644 --- a/src/views/final/comp/ListAction.vue +++ b/src/views/final/comp/ListAction.vue @@ -28,19 +28,25 @@ const actions = computed(() => { diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue index 8ed0c10..cb18e8b 100644 --- a/src/views/task/aside/Aside.vue +++ b/src/views/task/aside/Aside.vue @@ -70,10 +70,8 @@ const showSearch = ref(false) function setShowSearch(value: boolean) { if (!value) { - console.log('setShowSearch', value) search.value = '' taskListRef.value.search('') - return } showSearch.value = value } diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index 5c7b2c4..8b271ef 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -240,7 +240,9 @@ async function handleDragEnd(event, item) { const res = await dubiousfileyd({ pictureid: item.pictureId }) if (res.code === 'OK') { message.success('加入成功') + setBatch(false) getTableData() + getImgList() } else { message.error(res.message) @@ -355,6 +357,11 @@ async function getDetail() { getImgList() } +function notPassSuccess(param) { + batchModalRef.value.reload() + reloadList(param, '不通过') +} + function reloadList(param, text) { // 修改左侧状态 const id = currentTaskId() @@ -643,10 +650,8 @@ function switchBatch() { { let canloadMore = true -useInfiniteScroll( - el as any, - () => { - loadMore() - }, - { distance: 10, canLoadMore: () => canloadMore }, -) +// useInfiniteScroll( +// el as any, +// () => { +// console.log(123456) +// loadMore() +// }, +// { distance: 10, canLoadMore: () => canloadMore }, +// ) async function loadMore() { + console.log('loadMore') if (loading.value || el.value == null) return @@ -285,8 +287,12 @@ const showActions = computed(() => { function setBatch(value: boolean) { batch.value = value - if (value === false) - selectIds.value.length = 0 + if (value === false) { + selectIds.value = [] + listData.value.forEach((item) => { + item.checked = false + }) + } } function reject() { @@ -321,13 +327,15 @@ async function refreshHandler() { taskDetailInfo.value = await getTaskDetailInfo(taskId.value, '') nextTick(() => { - useInfiniteScroll( - el as any, - () => { - loadMore() - }, - { distance: 10, canLoadMore: () => canloadMore }, - ) + setTimeout(() => { + useInfiniteScroll( + el as any, + () => { + loadMore() + }, + { distance: 10, canLoadMore: () => canloadMore }, + ) + }, 300) }) } @@ -343,8 +351,31 @@ function switchBatch() { function reload() { selectIds.value = [] + setBatch(false) refreshHandler() } + +function sortHandler(orderby: 'similarityScore' | 'createdate') { + sortBy.orderName = orderby + sortBy.orderType = sortBy.orderType === 'asc' ? 'desc' : 'asc' + + refreshHandler() +} + +// const gridHeight = computed(() => { +// let height = '' +// if (viewMode.value === 'masonry') +// height = '' +// else if (viewMode.value === 'horizontalVersion') +// height = '145px' +// else if (viewMode.value === 'verticalVersion') +// height = '300px' +// else if (viewMode.value === '3:4') +// height = '240px' + +// return height +// }) + defineExpose({ showModal, reload, @@ -364,10 +395,10 @@ defineExpose({
- 任务审批 + 任务审批
- 任务ID:{{ taskDetailInfo.fromtaskname }} + 任务ID:{{ taskDetailInfo.fromtaskname }}
@@ -422,7 +453,7 @@ defineExpose({
- + + +
+ + 视图 + +
+
+ 时间排序 + +
+
+ 相似度排序 + +
@@ -466,10 +512,15 @@ defineExpose({ class="grid-item" >
- + > --> +
@@ -659,7 +710,7 @@ defineExpose({ margin-bottom: 10px; th { - color: #d7d7d7; + color: #999999; text-align: left; } @@ -733,6 +784,23 @@ defineExpose({ } } + .img { + border-radius: 7px; + display: block; + height: calc(100% - 25px); + } + + .img-full { + width: 100%; + overflow: hidden; + + ::v-deep(img) { + width: 100%; + height: 100%; + object-fit: cover; + } + } + .grid-item { width: 214px; padding: 16px;