diff --git a/components.d.ts b/components.d.ts index 6458938..11049e1 100644 --- a/components.d.ts +++ b/components.d.ts @@ -11,7 +11,6 @@ declare module 'vue' { BasicModal: typeof import('./src/components/Modal/BasicModal.vue')['default'] DataHeader: typeof import('./src/components/DataHeader/index.vue')['default'] NAvatar: typeof import('naive-ui')['NAvatar'] - NBackTop: typeof import('naive-ui')['NBackTop'] NButton: typeof import('naive-ui')['NButton'] NCard: typeof import('naive-ui')['NCard'] NCheckbox: typeof import('naive-ui')['NCheckbox'] @@ -22,8 +21,6 @@ declare module 'vue' { NDialogProvider: typeof import('naive-ui')['NDialogProvider'] NDivider: typeof import('naive-ui')['NDivider'] NDropdown: typeof import('naive-ui')['NDropdown'] - NEllipsis: typeof import('naive-ui')['NEllipsis'] - NEmpty: typeof import('naive-ui')['NEmpty'] NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] NGi: typeof import('naive-ui')['NGi'] @@ -35,7 +32,6 @@ declare module 'vue' { NModal: typeof import('naive-ui')['NModal'] NNotificationProvider: typeof import('naive-ui')['NNotificationProvider'] NotPassed: typeof import('./src/components/NotPassed.vue')['default'] - NPopconfirm: typeof import('naive-ui')['NPopconfirm'] NPopover: typeof import('naive-ui')['NPopover'] NPopselect: typeof import('naive-ui')['NPopselect'] NProgress: typeof import('naive-ui')['NProgress'] @@ -45,11 +41,7 @@ declare module 'vue' { NSpace: typeof import('naive-ui')['NSpace'] NSpin: typeof import('naive-ui')['NSpin'] NSwitch: typeof import('naive-ui')['NSwitch'] - NTabPane: typeof import('naive-ui')['NTabPane'] - NTabs: typeof import('naive-ui')['NTabs'] NTag: typeof import('naive-ui')['NTag'] - NTimeline: typeof import('naive-ui')['NTimeline'] - NTimelineItem: typeof import('naive-ui')['NTimelineItem'] NTooltip: typeof import('naive-ui')['NTooltip'] NUpload: typeof import('naive-ui')['NUpload'] NUploadDragger: typeof import('naive-ui')['NUploadDragger'] diff --git a/src/views/home/content/modal/LoginSuccessModal.vue b/src/views/home/content/modal/LoginSuccessModal.vue index a9629aa..9155a61 100644 --- a/src/views/home/content/modal/LoginSuccessModal.vue +++ b/src/views/home/content/modal/LoginSuccessModal.vue @@ -71,7 +71,7 @@ defineExpose({
-
{{ 83 }}
+
{{ toolsData?.repeat }}
重复图片
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index 7b738b9..c58ef34 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -148,16 +148,12 @@ function handleKeydown(event) { // 清除已经设置的定时器(如果有的话) clearTimeout(keyPressTimer); const item = taskDetailInfo.value; - if ( - item?.userapprove?.statshis === 2 || - item?.userapprove?.statshis == 3 - ) { + if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) { overTask.value = null; return; } - if (validate([item]) == null && batch.value === false) - overTask.value = item; + if (validate([item]) == null && batch.value === false) overTask.value = item; // 执行想要的操作 approvalHandler(); @@ -183,16 +179,12 @@ function handleKeydown(event) { // 清除已经设置的定时器(如果有的话) clearTimeout(keyPressTimer); const item = taskDetailInfo.value; - if ( - item?.userapprove?.statshis === 2 || - item?.userapprove?.statshis == 3 - ) { + if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) { overTask.value = null; return; } - if (validate([item]) == null && batch.value === false) - overTask.value = item; + if (validate([item]) == null && batch.value === false) overTask.value = item; // 执行想要的操作 const modal = unref(notPassModalRef)! as any; modal.showModal([taskDetailInfo.value]); @@ -265,8 +257,7 @@ function approvalHandler(items?: any) { processItems = [cloneItem]; } - if (items !== undefined && !(items instanceof PointerEvent)) - processItems = items; + if (items !== undefined && !(items instanceof PointerEvent)) processItems = items; const msg = validate(processItems); @@ -520,9 +511,7 @@ function notPassSuccess(param) { function reloadList(param, text) { // 修改左侧状态 const id = currentTaskId(); - const hasCurrentId = param.flowTaskInfoList.find( - (item) => item.formId === id - ); + const hasCurrentId = param.flowTaskInfoList.find((item) => item.formId === id); finalStore.setListKey(); if (hasCurrentId) emit("setAsideItemName", text); @@ -556,8 +545,7 @@ function overTaskHandelr(item: any) { return; } - if (validate([item]) == null && batchtwo.value === false) - overTasktwo.value = item; + if (validate([item]) == null && batchtwo.value === false) overTasktwo.value = item; } function closePassno() { console.log(notPassModalRef.value); @@ -591,8 +579,7 @@ function checkBottom() { const scrollTop = window.pageYOffset || document.documentElement.scrollTop; // 获取视口的内部高度 - const clientHeight = - window.innerHeight || document.documentElement.clientHeight; + const clientHeight = window.innerHeight || document.documentElement.clientHeight; // 获取整个文档的高度 const scrollHeight = document.documentElement.scrollHeight; @@ -661,18 +648,8 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
任务ID:{{ taskDetailInfo.fromtaskname }}
@@ -760,7 +737,6 @@ function sortHandler(orderby: "similarityScore" | "createdate") { isFullScreen ? { height: '596px', - } : {} " @@ -769,16 +745,14 @@ function sortHandler(orderby: "similarityScore" | "createdate") { v-show="!imgbigshow" :style="{ position: 'fixed', - height: '100vh', zIndex: 169, - height: '100vh', background: 'rgb(80, 122, 253)', right: '16px', marginTop: '5px', width: '2px', height: '91.5vh', }" - >
+ />
- +
- + +
+
+
@@ -888,11 +858,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") { - + t @@ -911,39 +877,23 @@ function sortHandler(orderby: "similarityScore" | "createdate") { - {{ totalCount }} - + {{ totalCount }} 相似匹配
- + - {{ - taskDetailInfo?.ocrPicture?.photoDateTimestamp ?? "-" - }} + {{ taskDetailInfo?.ocrPicture?.photoDateTimestamp ?? "-" }}
- + {{ taskDetailInfo?.ocrPicture?.submitDateTimestamp - ? formatToDateHMS( - Number(taskDetailInfo.ocrPicture.submitDateTimestamp) - ) + ? formatToDateHMS(Number(taskDetailInfo.ocrPicture.submitDateTimestamp)) : "-" }}
@@ -962,15 +912,16 @@ function sortHandler(orderby: "similarityScore" | "createdate") { class="right" :style=" isFullScreen - ? {flex: 0.3, - // flex: 0, + ? { + flex: 0.3, + // flex: 0, //width: '30vw', borderLeft: '2px solid #507AFD', position: 'relative', borderRadius: 0, - height:'596px' + height: '596px', } - : { flex: 0.5} + : { flex: 0.5 } " >
-
-
+
+
相似图片({{ totalCount }})
- + {{ item.photoDateTimestamp ? formatToDateHMS(Number(item.photoDateTimestamp)) @@ -1056,12 +1002,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") { }}
- + {{ item.submitDateTimestamp ? formatToDateHMS(Number(item.submitDateTimestamp)) @@ -1078,12 +1019,10 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
-
+
{{ taskDetailInfo.fromtaskname }}
-
+
-
+
{{ item[0].label }}
-
+
{{ item[0].value }}
时间排序 - - + +
相似度排序 - - + +
@@ -1317,12 +1226,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") { />
- + {{ item.photoDateTimestamp ? formatToDateHMS(Number(item.photoDateTimestamp)) @@ -1330,12 +1234,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") { }}
- + {{ item.submitDateTimestamp ? formatToDateHMS(Number(item.submitDateTimestamp)) @@ -1343,10 +1242,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") { }}
-
+
{{ item.similarityScore }}%
@@ -1433,16 +1329,8 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
-->
- - + +
@@ -2151,11 +2039,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") { .small-mark { width: 100%; height: 53px; - background: linear-gradient( - 180deg, - rgba(0, 0, 0, 0.01), - rgba(0, 0, 0, 0.44) 88% - ); + background: linear-gradient(180deg, rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 0.44) 88%); border-radius: 0px 8px 8px 8px; position: absolute; left: 0; diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index c50ab8b..7f57b74 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -1,18 +1,18 @@ 返回 -
+
@@ -577,19 +549,16 @@ defineExpose({ @@ -599,13 +568,13 @@ defineExpose({ class="img-status" src="@/assets/images/task/pass.png" alt="" - > + /> + />
@@ -616,7 +585,7 @@ defineExpose({ class="icon-status" src="@/assets/images/task/status.png" alt="" - > + /> @@ -631,11 +600,12 @@ defineExpose({ class="icon-status" src="@/assets/images/task/similarity.png" alt="" - > + /> - {{ totalCount }} + {{ totalCount }} 相似匹配 @@ -682,11 +652,7 @@ defineExpose({
任务包图片 + >任务包图片
+ <<<<<<< HEAD
- -
- {{ - item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) - }}% + ======= +
+ >>>>>>> test + +
+ {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) + }}% +
+
+
+ +
+
+
-
-
- -
-
- -
-
- - - +
+ + + +
-
- -
- -
-
+ > + +
+ +
@@ -958,14 +927,14 @@ defineExpose({ .left { flex: 0.6; - background-size: auto 346px; - + // background-size: auto 346px; + background-size: cover; background-position: center; background-repeat: no-repeat; border-radius: 8px; position: relative; - width: 632px; - height: 346px; + // width: 632px; + // height: 346px; .preview { position: absolute; @@ -1359,11 +1328,7 @@ defineExpose({ border-radius: 8px; align-items: center; justify-content: center; - background: linear-gradient( - 180deg, - rgba(0, 0, 0, 0.01), - rgba(0, 0, 0, 0.44) 88% - ); + background: linear-gradient(180deg, rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 0.44) 88%); } } }