diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue index f24faff..d3a551e 100644 --- a/src/layout/components/Header/RecycleModal.vue +++ b/src/layout/components/Header/RecycleModal.vue @@ -11,6 +11,7 @@ import { debounce } from 'lodash-es' import { audit } from '@/api/task/task' import NotPassed from '@/components/Approval/NotPassed.vue' +import { formatToDateHMS } from '@/utils/dateUtil' import { off, on } from '@/utils/domUtils' import ConfrimModal from "./ConfrimModal.vue" @@ -37,7 +38,7 @@ const timeLabel = computed(() => { return item?.label }) -const viewMode = ref('masonry') +const viewMode = ref('horizontalVersion') const viewLabel = computed(() => { const item = viewOptions.find((option) => { @@ -134,6 +135,7 @@ async function loadMore() { } onUpdated(() => { + console.log('onUpdated', onUpdated) layout() }) @@ -242,6 +244,7 @@ async function showModal() { pagination.pageNo = 1 const list = await featchList() listData.value = list + layout() } async function onChange() { @@ -265,8 +268,8 @@ async function commit() { layout() } } - function remove() { - if ( !selectIds.value|| selectIds.value.length === 0) { +function remove() { + if (!selectIds.value || selectIds.value.length === 0) { message.error('至少选中一个') return } @@ -313,9 +316,8 @@ function rejectHandler() { function reset() { batch.value = false; - pagination.pageNo = 0; + pagination.pageNo = 1; pagination.pageSize = 20; - listData.value.length = 0; selectedApproveItems.value.length = 0; loading = false; canloadMore = true; @@ -386,9 +388,11 @@ function doAudit(param: any) { function reloadList() { refreshHandler() } -function refreshHandler() { +async function refreshHandler() { reset() - featchList() + const list = await featchList() + listData.value = list + layout() } @@ -413,13 +417,13 @@ function refreshHandler() {
- {{ timeLabel || '时间排序' }} + 时间排序
- {{ viewLabel || '视图模式' }} + 视图模式
@@ -456,17 +460,35 @@ function refreshHandler() {
- - - + + + + +
+ {{ item.similarityScore }}% +
+
+ +
+ + {{ item.submitDateTimestamp ? + formatToDateHMS(Number(item.submitDateTimestamp)) : '-' }} +
+
@@ -480,7 +502,7 @@ function refreshHandler() { - + @@ -597,29 +619,75 @@ function refreshHandler() { width: 214px; padding: 16px; position: relative; + + .tag-status { + width: 46px; + height: 22px; + position: absolute; + left: 16px; + top: 20px; + } + + } + .grid-item-selected { + background-color: #dae3ff; } .percent { position: absolute; - text-align: center; + display: flex; + align-items: center; + justify-content: center; width: 35px; height: 18px; opacity: 0.9; background: #6f92fd; border-radius: 6px 0px 6px 0px; z-index: 5; - right: 22px; - top: 22px; + right: 28px; + top: 20px; color: #fff; + font-size: 14px; + + .percent-unit { + font-size: 8px; + margin-top: 4px; + } } - .grid-item-selected { - background-color: #dae3ff; + .percent-red { + background: #ff4e4f; } + .time { + position: absolute; + z-index: 3; + left: 32px; + bottom: 32px; + + .time-item { + display: flex; + align-items: center; + font-size: 14px; + font-family: PingFang SC, PingFang SC-Medium; + font-weight: 500; + color: #ffffff; + margin-bottom: 4px; + } + + .time-item2 { + margin-bottom: 0; + } + + .svg-time { + margin-right: 5px; + } + } + .scroll { overflow-y: auto; height: calc(100vh - 282px); + margin-left: 20px; } } } @@ -642,5 +710,4 @@ function refreshHandler() { height: 100%; object-fit: cover; } -} - +}