From 259d846d8687de6c8d71feaf9b032076410b2228 Mon Sep 17 00:00:00 2001 From: raofuzi <2641346316@qq.com> Date: Wed, 17 Apr 2024 12:29:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 23 +++++++++++++++++++++++ src/views/home/content/Content.vue | 28 ++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/components.d.ts b/components.d.ts index ddd3db7..298dbe9 100644 --- a/components.d.ts +++ b/components.d.ts @@ -10,17 +10,40 @@ declare module 'vue' { Application: typeof import('./src/components/Application/Application.vue')['default'] BasicModal: typeof import('./src/components/Modal/BasicModal.vue')['default'] DataHeader: typeof import('./src/components/DataHeader/index.vue')['default'] + NAvatar: typeof import('naive-ui')['NAvatar'] NButton: typeof import('naive-ui')['NButton'] + NCard: typeof import('naive-ui')['NCard'] NCheckbox: typeof import('naive-ui')['NCheckbox'] + NCollapse: typeof import('naive-ui')['NCollapse'] + NCollapseItem: typeof import('naive-ui')['NCollapseItem'] NConfigProvider: typeof import('naive-ui')['NConfigProvider'] + NDatePicker: typeof import('naive-ui')['NDatePicker'] NDialogProvider: typeof import('naive-ui')['NDialogProvider'] + NDivider: typeof import('naive-ui')['NDivider'] + NDropdown: typeof import('naive-ui')['NDropdown'] NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] + NGrid: typeof import('naive-ui')['NGrid'] + NGridItem: typeof import('naive-ui')['NGridItem'] + NImage: typeof import('naive-ui')['NImage'] NInput: typeof import('naive-ui')['NInput'] NMessageProvider: typeof import('naive-ui')['NMessageProvider'] NModal: typeof import('naive-ui')['NModal'] NNotificationProvider: typeof import('naive-ui')['NNotificationProvider'] NotPassed: typeof import('./src/components/NotPassed.vue')['default'] + NPopover: typeof import('naive-ui')['NPopover'] + NPopselect: typeof import('naive-ui')['NPopselect'] + NProgress: typeof import('naive-ui')['NProgress'] + NScrollbar: typeof import('naive-ui')['NScrollbar'] + NSelect: typeof import('naive-ui')['NSelect'] + NSlider: typeof import('naive-ui')['NSlider'] + NSpace: typeof import('naive-ui')['NSpace'] + NSpin: typeof import('naive-ui')['NSpin'] + NSwitch: typeof import('naive-ui')['NSwitch'] + NTag: typeof import('naive-ui')['NTag'] + NTooltip: typeof import('naive-ui')['NTooltip'] + NUpload: typeof import('naive-ui')['NUpload'] + NUploadDragger: typeof import('naive-ui')['NUploadDragger'] Quill: typeof import('./src/components/RichEditor/Quill.vue')['default'] Robot: typeof import('./src/components/Robot/index.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 7ec3a35..7c41f40 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -1027,6 +1027,34 @@ defineExpose({ .scroll { overflow-y: scroll; + // 滚动条整体部分 + &::-webkit-scrollbar { + width: 6px; + height: 6px; + background: #f1f1f1; + display: none; + } + &:hover { + &::-webkit-scrollbar { + display: block; + } + } + /* 定义滚动条轨道的样式 */ + &::-webkit-scrollbar-track { + background-color: #e1e1e1; + border-radius: 10px; /* 圆角 */ + } + + /* 定义滚动条滑块的样式 */ + &::-webkit-scrollbar-thumb { + background-color: #888; + border-radius: 10px; /* 圆角 */ + } + + /* 滑块hover时的样式 */ + &::-webkit-scrollbar-thumb:hover { + background-color: #555; + } } } .flex-btn-icon { From 9783d5f0abfa9eb7d01a10d08b13359b73316c0f Mon Sep 17 00:00:00 2001 From: lihui_ocr Date: Wed, 17 Apr 2024 12:56:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E9=98=88=E5=80=BC?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=EF=BC=8C=E5=85=A8=E9=83=A8=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/final/content/Content.vue | 7 ++-- src/views/final/content/ListContent.vue | 43 ++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index d3e9066..0dd543c 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -479,7 +479,7 @@ async function query( ) { console.log("query", taskName); const asideParmas = cloneDeep(unref(finalStore.getAsideValue)); - console.log(asideParmas); + // console.log(asideParmas); if (asideParmas.izyear) { asideParmas.izuptime = cloneDeep(asideParmas.izyear); @@ -498,7 +498,10 @@ async function query( // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数 // let params = filterId ? { userSearchId: filterId } : asideParmas let params = asideParmas; - params = params?.izshowall ? {} : params; + if(params?.izshowall==false){ + params.isFail=false + } + params = params?.izshowall ? {isFail:true} : params; const result = await getFinalList({ sortorder: sortorder.value, diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue index c22489b..2715ed9 100644 --- a/src/views/final/content/ListContent.vue +++ b/src/views/final/content/ListContent.vue @@ -93,8 +93,11 @@ async function initData( const asideParmas = unref(finalStore.getAsideValue) // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数 // let params = filterId ? { userSearchId: filterId } : asideParmas - let params = asideParmas - params = params?.izshowall ? {} : params + let params = asideParmas; + if(params?.izshowall==false){ + params.isFail=false + } + params = params?.izshowall ? {isFail:true} : params; const result = await getFinalList({ sortorder: sortorder.value, @@ -549,7 +552,7 @@ defineExpose({ /> -
+
+ >
+ +
+ {{ `${item.similarityscore}%` }} +
+
Date: Wed, 17 Apr 2024 14:11:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=9B=B8=E4=BC=BC=E5=BA=A6=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/task/content/Content.vue | 2 ++ src/views/task/modal/BatchModal.vue | 1 + 2 files changed, 3 insertions(+) diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index f507af0..1be24ed 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -445,6 +445,7 @@ async function getImgList() { const { data, total } = await getSimilarityList({ ...taskpagination, ...sortBy, + taskNode: taskDetailInfo.value.taskNode, pictureId: taskDetailInfo.value.ocrPicture.id, }) taskDetailPictureList.value = data @@ -637,6 +638,7 @@ async function fetchList() { const { data, pageCount, total } = await getSimilarityList({ ...pagination, ...sortBy, + taskNode: taskDetailInfo.value.taskNode, pictureId: taskDetailInfo.value.ocrPicture.id, }) canloadMore = pageCount >= pagination.pageNo && pageCount > 0 diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue index a8d4e3e..27ab9ad 100644 --- a/src/views/task/modal/BatchModal.vue +++ b/src/views/task/modal/BatchModal.vue @@ -144,6 +144,7 @@ async function fetchList() { { ...pagination, ...sortBy, + taskNode: taskDetailInfo.value.taskNode, pictureId: taskDetailInfo.value.ocrPicture.id, }, )