Merge branch 'main' into shen

src/api/dictionary/index.ts

@@ -23,12 +23,12 @@ export async function getRegionList(params: PageParam = { pageNo: 1, pageSize: 1
  */
 export async function getPictureTypeList(): Promise<any> {
   const res = await http.request({
-    url: `/ocr/ocrPicturetype/rootList`,
+    url: `/static/admin/web/distionary/bytypecode/izpicturetype`,
     method: 'get',
   })
 
-  const { data } = res
+  const list = res.data[0].distionaryList
-  return data
+  return list
 }
 
 /**

src/api/work/work.ts

@@ -102,7 +102,8 @@ export async function getTaskDetailPictureList(params: PageParam & PictureSortPa
       taskname: item.fromtaskname,
       assignee: item.assignee,
       pictureid: item.pictureid,
-      imgurl: item.imgUrl,
+      imgurl: item.serverThumbnailUrl,
+      maxSimilarity: item.maxSimilarity,
       thumburl: item.ocrPicture?.serverThumbnailUrl || item.ocrPicture?.imgurl,
       iztrueorfalse: item.iztrueorfalse,
       states: item.states,

src/views/final/comp/CustomTabelModal.vue

@@ -340,7 +340,7 @@ function removeHandler(id: string, type: "fix" | "unfix") {
               <div>
                 <n-input placeholder="搜索关键字">
                   <template #suffix>
-                    <SvgIcon size="14px" name="magnifying-1" />
+                    <SvgIcon size="14px" name="magnifying-1" color="#999999" />
                   </template>
                 </n-input>
                 <div class="draggable-ul left-wrap">
@@ -483,6 +483,7 @@ function removeHandler(id: string, type: "fix" | "unfix") {
     position: relative;
     color: #333333;
     font-size: 14px;
+    background: #F8F8F8;
 
     &:before {
       background-color: #1980ff;
@@ -562,6 +563,7 @@ function removeHandler(id: string, type: "fix" | "unfix") {
 ::v-deep(.n-card > .n-card-header .n-card-header__main) {
   font-weight: lighter !important;
   font-size: 14px;
+  color: #666666;
 }
 ::v-deep(.n-scrollbar) {
   border-top: none !important;

src/views/home/content/Content.vue

@@ -164,7 +164,7 @@ async function featchList() {
         upname: item.upname,
         ocrPictureclass: item.ocrPictureclass,
         uphead: item.uphead,
-        similar: item.similarityscore || 0,
+        similar: item.similarityscore || -1,
         imgName: item.imgname
       }
     })
@@ -203,45 +203,39 @@ async function oneCheck() {
   const asideVal = cloneDeep(configStore.getAsideValue)
   asideVal.izyear = dayjs(asideVal.izyear[0]).format("YYYY/MM/DD") + '-' + dayjs(asideVal.izyear[1]).format("YYYY/MM/DD")
   const tasksLoadingModal = queryRepeatedTasksModalRef.value as any
-  const checkingTaskModal = checkingTaskModalRef.value as any
-  delete asideVal.izsimilarity
-  if (checkDuplicateNo.value) {
-    getCheckDuplicateStatus(checkDuplicateNo.value).then((res) => {
-      if (res.code === "OK") {
-        checkTaskStatus.value = res.data.status // 1.执行中 2.执行完毕
-        if (isRefresh.value === false) {
-          const modal = packageModalRef.value as any
-          modal.showModal()
-          return
-        }
 
-        if (checkTaskStatus.value === 2 && isRefresh) {
+  // 查重任务编号,状态不为空,或者状态执行中..
-          checkingTaskModal.closeModal()
+  if(checkDuplicateNo.value && checkTaskStatus.value && checkTaskStatus.value===1){
-          tasksLoadingModal.closeModal()
+	 tasksLoadingModal.showModal()
-          isRefresh.value = false
+	 return;
-          message.success('任务执行完毕，正在刷新数据...');
-          reset()
-          loadMore()
-        } else if (checkTaskStatus.value === 1) {
-          checkingTaskModal.showModal()
-          tasksLoadingModal.showModal()
-          return
-        }
-      }
-    })
-    return
   }
-  checkingTaskModal.showModal()
+  
-  tasksLoadingModal.showModal()
+  //调用查重任务开启流程
   oneClickCheckTaskPackage(asideVal).then((res) => {
     if (res.code === "OK") {
       checkDuplicateNo.value = res.data.checkDuplicateNo
+  	  checkTaskStatus.value = res.data.status
+  	  tasksLoadingModal.showModal()
     } else {
       message.error(res.message || '查重失败')
     }
   })
 }
 
+/**
+ * 显示添加任务包
+ */
+async function showAddPackage() {
+	const modal = packageModalRef.value as any
+	modal.showModal()
+}
+
+//查重任务加载提示框,关闭回调
+async function tasksLoadingCloseCallback() {
+	const checkingTaskModal = checkingTaskModalRef.value as any
+	checkingTaskModal.showModal()
+}
+
 async function showLoginSuccessModal() {
   const modal = LoginSuccessModalRef.value as any
   // modal.showModal()
@@ -260,6 +254,9 @@ async function commitHandler(settingParam) {
       message.success(res.data);
       modal.closeModal()
       finishModal.showModal()
+	  //清空查重任务状态和编号
+	  checkDuplicateNo.value='';
+	  checkTaskStatus.value = null;
     }
   })
   const asideVal = configStore.getAsideValue
@@ -381,13 +378,47 @@ function previewHandler(index: number, event: MouseEvent) {
   if (imageRef.value?.[index] && (imageRef.value[index] as any).src)
     (imageRef.value?.[index] as any).mergedOnClick();
 }
+
+/**
+ * 检查查重状态
+ */
 function refresh(val) {
-  oneCheck()
+  // delete asideVal.izsimilarity
+  const checkingTaskModal = checkingTaskModalRef.value as any
+  if (checkDuplicateNo.value) {
+    getCheckDuplicateStatus(checkDuplicateNo.value).then((res) => {
+      if (res.code === "OK") {
+        checkTaskStatus.value = res.data.status // 1.执行中 2.执行完毕
+        // if (isRefresh.value === false) {
+        //   const modal = packageModalRef.value as any
+        //   modal.showModal()
+        //   return
+        // }
+  
+        if (checkTaskStatus.value === 2 && isRefresh) {
+          checkingTaskModal.closeModal()
+          isRefresh.value = false
+          message.success('任务执行完毕，正在刷新数据...');
+          reset()
+          loadMore()
+        } else if (checkTaskStatus.value === 1) {
+          // checkingTaskModal.showModal()
+          return
+        }
+      }
+    })
+    return
+  }
 }
+/**
+ * 取消查重任务
+ */
 function cancel(val) {
   if (checkTaskStatus.value === 1) {
     removeCheckDuplicate(checkDuplicateNo.value).then((res) => {
       if (res.code === "OK") {
+		checkDuplicateNo.value='';
+		checkTaskStatus.value = null;
         message.success("查重任务取消成功")
       }
     })
@@ -406,17 +437,17 @@ function cancel(val) {
       <SvgIcon v-show="checkTaskStatus !== 2" style="cursor: pointer;" size="105" name="yijianchachong"
         @click="oneCheck" />
       <SvgIcon v-show="checkTaskStatus === 2" style="cursor: pointer;" size="105" name="shengchengrenwubao"
-        @click="oneCheck" />
+        @click="showAddPackage" />
     </div>
     <div class="wrapper-content">
       <div style="display: flex;justify-content: space-between;">
         <div class="form">
-          <n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click">
+<!--          <n-popselect v-model:value="timeRange" :options="timeOptions" trigger="click">
             <div class="dropdown">
               <span>{{ timeLabel || '请选择' }}</span>
               <SvgIcon class="gap" name="arrow-botton" size="14" />
             </div>
-          </n-popselect>
+          </n-popselect> -->
           <n-popselect v-model:value="viewMode" :options="viewOptions" trigger="click">
             <div class="dropdown">
               <!-- <span>{{ viewLabel || '请选择' }}</span> -->
@@ -449,7 +480,7 @@ function cancel(val) {
               <n-image class="img" :img-props="{ onClick: hideDownload }"
                 :class="{ 'img-fit': viewMode === 'horizontalVersion', 'img-full': viewMode === '3:4' || viewMode === 'verticalVersion' }"
                 :preview-src="item.imgUrl" :src="item.thumburl" ref="imageRef" />
-              <div class="percent">
+              <div class="percent" v-if="item.simila!=-1">
                 <SvgIcon size="42" name="tag" />
                 <div class="val">
                   {{ `${item.similar}%` }}
@@ -484,7 +515,7 @@ function cancel(val) {
     </div>
     <PackageSettingsModal ref="packageModalRef" @commit="commitHandler" />
     <GeneratePackageModal ref="generateModalRef" />
-    <QueryRepeatedTasksModal ref="queryRepeatedTasksModalRef" />
+    <QueryRepeatedTasksModal ref="queryRepeatedTasksModalRef" @closeCallback="tasksLoadingCloseCallback"/>
     <LoginSuccessModal ref="LoginSuccessModalRef" />
     <FinishPackageModal ref="finishPackageModal" />
     <CheckingTaskModal ref="checkingTaskModalRef" @refresh="refresh" @cancel="cancel" />

src/views/home/content/modal/CheckingTaskModal.vue

@@ -45,7 +45,7 @@ defineExpose({
 
 <template>
   <div>
-    <n-modal v-model:show="show" transform-origin="center" style="position: fixed;right: 0;bottom: 0;">
+    <n-modal v-model:show="show" :mask-closable="false" transform-origin="center" style="position: fixed;right: 0;bottom: 0;">
       <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true" style="padding: 8px 8px 0 8px;">
         <div class="wrapper">
           <div class="title">查重进度</div>

src/views/home/content/modal/FinishPackageModal.vue

@@ -29,7 +29,7 @@ defineExpose({
 
 <template>
   <div>
-    <n-modal v-model:show="show" transform-origin="center" style="padding: 8px;">
+    <n-modal v-model:show="show" :mask-closable="false" transform-origin="center" style="padding: 8px;">
       <n-card :style="cardStyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
         <div style="display: flex;">
           <div><svg-icon size="80" name="robot2" /></div>
@@ -78,4 +78,5 @@ defineExpose({
   color: #666666;
   line-height: 22px;
 }
+
 </style>

src/views/home/content/modal/QueryRepeatedTasksModal.vue

@@ -1,6 +1,12 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 
+
+const emit = defineEmits<{
+  (e: 'closeCallback', value: any),
+}>()
+
+
 const show = ref(false)
 
 const stys = {
@@ -20,16 +26,20 @@ function showModal() {
 
 function closeModal() {
   show.value = false
+  emit('closeCallback', true)
 }
 
 defineExpose({
   showModal,
   closeModal,
 })
+
+
+
 </script>
 
 <template>
-  <n-modal v-model:show="show" :mask-closable="false" transform-origin="center">
+  <n-modal v-model:show="show" :mask-closable="false"  transform-origin="center">
     <n-card :style="stys" :bordered="false" role="dialog" aria-modal="true">
       <svg-icon size="15" name="close" @click="closeModal" style="position:absolute; right:6px;top:6px;cursor: pointer;"/>
       <div class="wrapper">
@@ -48,4 +58,5 @@ defineExpose({
   justify-content: center;
   align-items: center;
 }
+
 </style>

src/views/worksheet/content/Content.vue

@@ -443,6 +443,7 @@ function previewHandler(event: MouseEvent) {
         </div>
       </div>
     </div>
+
     <n-spin :show="loading">
       <div ref="el" class="scroll">
         <div class="wrapper-detail">
@@ -549,7 +550,7 @@ function previewHandler(event: MouseEvent) {
                   >图片大小
                 </span>
                 <span style=" color: #333333; font-size: 16px"
-                  >{{ (taskDetailInfo?.pictureInfo?.imgSize /1000).toFixed(2) }}KB</span
+                  >{{ taskDetailInfo?.pictureInfo && (taskDetailInfo?.pictureInfo?.imgSize /1000).toFixed(2) }}KB</span
                 >
               </div>
               <div class="property">
@@ -557,7 +558,7 @@ function previewHandler(event: MouseEvent) {
                   >图片格式
                 </span>
                 <span style=" color: #333333; font-size: 16px"
-                  >{{ taskDetailInfo?.pictureInfo?.imgSpace }}</span
+                  >{{ taskDetailInfo?.pictureInfo?.imgFormat }}</span
                 >
               </div>
               <div class="property">
@@ -573,7 +574,7 @@ function previewHandler(event: MouseEvent) {
                   >色彩空间
                 </span>
                 <span style=" color: #333333; font-size: 16px"
-                  >{{ taskDetailInfo?.pictureInfo?.imgMeasure }}</span
+                  >{{ taskDetailInfo?.pictureInfo?.imgSpace }}</span
                 >
               </div>
               <div class="property">
@@ -653,7 +654,7 @@ function previewHandler(event: MouseEvent) {
             <div class="percent">
               <SvgIcon size="42" name="tag" />
               <div class="val">
-                {{ getPercent(item.pictureid) }}
+                {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0)  }}%
               </div>
             </div>
             <div class="mark">
@@ -892,7 +893,7 @@ function previewHandler(event: MouseEvent) {
     .grid-item {
       box-sizing: border-box;
       border-radius: 8px;
-      padding: 9px 10px;
+      padding: 9px 5px;
       position: relative;
 
       .img-wrapper {