diff --git a/package.json b/package.json index f2cd289..4ebe340 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "sortablejs": "^1.15.1", "vue": "^3.3.8", "vue-draggable-plus": "^0.3.5", + "vue-lazyload": "^3.0.0", "vue-mousetrap": "^1.0.5", "vue-router": "^4.1.6", "vue-types": "^4.2.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3dde4d4..e1125a6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -71,6 +71,9 @@ dependencies: vue-draggable-plus: specifier: ^0.3.5 version: 0.3.5(@types/sortablejs@1.15.7) + vue-lazyload: + specifier: ^3.0.0 + version: 3.0.0 vue-mousetrap: specifier: ^1.0.5 version: 1.0.5 @@ -7320,6 +7323,10 @@ packages: - supports-color dev: true + /vue-lazyload@3.0.0: + resolution: {integrity: sha512-h2keL/Rj550dLgesgOtXJS9qOiSMmuJNeVlfNAYV1/IYwOQYaWk5mFJlwRxmZDK9YC5gECcFLYYj7z1lKSf9ug==} + dev: false + /vue-mousetrap@1.0.5: resolution: {integrity: sha512-mDyPBBTnOrpUNDZ4vjd7X8emYwKFG2/Rsi5coZKDmF+dM5XpENrnvdmef4xHq2gcZ1HVmHqeI5jQP17p9fFpzA==} dependencies: diff --git a/src/assets/images/not-pass.png b/src/assets/images/not-pass.png new file mode 100644 index 0000000..dc4d19c Binary files /dev/null and b/src/assets/images/not-pass.png differ diff --git a/src/assets/images/pass.png b/src/assets/images/pass.png new file mode 100644 index 0000000..21c87ee Binary files /dev/null and b/src/assets/images/pass.png differ diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue index cd0f085..83a3238 100644 --- a/src/layout/components/Header/RecycleModal.vue +++ b/src/layout/components/Header/RecycleModal.vue @@ -732,7 +732,7 @@ watch(() => pagination.pageNo, (newVal, oldVal) => { > { percentPosition: true, stagger: 10, }) + loading.value = false + // 暂时注释,请忽略 + // _imagesload = imagesloaded('.grid-item') + + // _imagesload.on('done', (instance) => { + // (_masonry as any).layout() + // if (!el.value) + // return + // loading.value = false + // }) - _imagesload = imagesloaded('.grid-item') - - _imagesload.on('done', (instance) => { - (_masonry as any).layout() - if (!el.value) - return - loading.value = false - }) - - _imagesload.on('fail', (instance) => { - message.error('图片错误') - loading.value = false - }) + // _imagesload.on('fail', (instance) => { + // message.error('图片错误') + // loading.value = false + // }) }, 300) useInfiniteScroll( @@ -250,7 +251,7 @@ async function featchList(userSearchId?: string) { const list = data.map((item) => { return { imgUrl: item.imgurl, - thumburl: item.serverThumbnailUrl || item.imgurl || '', + thumburl: item.serverThumbnailUrl || item.imgurl || bgLoadingImg, upname: item.upname, ocrPictureclass: item.ocrPictureclass, uphead: item.uphead, @@ -295,6 +296,16 @@ const gridHeight = computed(() => { return height }) +const gridMinHeight = computed(() => { + let height = '' + if (viewMode.value === 'masonry' && loading.value) + height = '145px' + else + height = '' + + return height +}) + async function oneCheck() { const asideVal = cloneDeep(configStore.getAsideValue) asideVal.upUserName = searchValue.value @@ -699,7 +710,7 @@ defineExpose({
@@ -724,17 +735,27 @@ defineExpose({ :preview-src="item.imgUrl" :src="item.thumburl" :fallback-src="bgLoadingImg" + style="display: none" /> + @@ -941,7 +962,7 @@ defineExpose({ width: 182px; border-radius: 7px; margin-bottom: 10px; - overflow: hidden; + overflow-x: visible; position: relative; transition: 0.5s; margin: 0 6px 10px 6px; @@ -950,7 +971,7 @@ defineExpose({ width: 46px; height: 22px; position: absolute; - left: -1px; + left: -3px; top: 10px; } diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index d4f18cd..66f9ad9 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -813,18 +813,18 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') { flex: 1, // flex: 0.75, // 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`, - background: `url(${taskDetailInfo?.ocrPicture?.imgurl}), url(${bgLoadingImg})`, + background: `url(${taskDetailInfo?.ocrPicture?.imgurl ? taskDetailInfo?.ocrPicture?.imgurl : bgLoadingImg})`, } : { height: '92vh', flex: 1, // 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`, - background: `url(${taskDetailInfo?.ocrPicture?.imgurl}), url(${bgLoadingImg})`, + background: `url(${taskDetailInfo?.ocrPicture?.imgurl ? taskDetailInfo?.ocrPicture?.imgurl : bgLoadingImg})`, } : { // 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`, - background: `url(${taskDetailInfo?.ocrPicture?.imgurl}), url(${bgLoadingImg})`, + background: `url(${taskDetailInfo?.ocrPicture?.imgurl ? taskDetailInfo?.ocrPicture?.imgurl : bgLoadingImg})`, } " @mouseover="overTaskHandle" @@ -1002,9 +1002,7 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') { class="img-wrapper" :style="{ // 'background-image': `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl})`, - background: `url(${ - item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl - }), url(${bgLoadingImg})`, + background: `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl ? item.imgUrl : bgLoadingImg})`, }" />
@@ -1230,9 +1228,7 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') { class="img-wrapper" :style="{ // 'background-image': `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl})`, - background: `url(${ - item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl - }), url(${bgLoadingImg})`, + background: `url(${item.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl ? item.imgUrl : bgLoadingImg})`, }" @mouseover="overTaskHandelr(item)" @mouseleave="leaveTaskHandler" diff --git a/src/views/worksheet/components/pictureCard.vue b/src/views/worksheet/components/pictureCard.vue index f3b37a2..cb616fa 100644 --- a/src/views/worksheet/components/pictureCard.vue +++ b/src/views/worksheet/components/pictureCard.vue @@ -70,17 +70,17 @@ function previewHandler(event: MouseEvent) { position: 'relative', flex: 2, // 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`, - background: `url(${taskDetailInfo?.ocrPicture?.imgurl}), url(${bgLoadingImg})`, + background: `url(${taskDetailInfo?.ocrPicture?.imgurl ? taskDetailInfo?.ocrPicture?.imgurl : bgLoadingImg})`, } : { height: '92vh', flex: 2, // 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`, - background: `url(${taskDetailInfo?.ocrPicture?.imgurl}), url(${bgLoadingImg})`, + background: `url(${taskDetailInfo?.ocrPicture?.imgurl ? taskDetailInfo?.ocrPicture?.imgurl : bgLoadingImg})`, } : { // 'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`, - background: `url(${taskDetailInfo?.ocrPicture?.imgurl}), url(${bgLoadingImg})`, + background: `url(${taskDetailInfo?.ocrPicture?.imgurl ? taskDetailInfo?.ocrPicture?.imgurl : bgLoadingImg})`, } " @mouseover="overTaskHandle" diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index 0d4bb24..388bc17 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -834,11 +834,7 @@ defineExpose({ >