fix: 合并test分支处理冲突

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']

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

@@ -71,7 +71,7 @@ defineExpose({
           </div>
           <div class="item">
             <SvgIcon name="modal_reImg" width="49" height="58" />
-            <div class="num_box">{{ 83 }}</div>
+            <div class="num_box">{{ toolsData?.repeat }}</div>
             <div class="title_box">重复图片</div>
           </div>
         </div>

src/views/task/content/Content.vue

@@ -148,16 +148,12 @@ function handleKeydown(event) {
       // 清除已经设置的定时器（如果有的话）
       clearTimeout(keyPressTimer);
       const item = taskDetailInfo.value;
-      if (
+      if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
-        item?.userapprove?.statshis === 2 ||
-        item?.userapprove?.statshis == 3
-      ) {
         overTask.value = null;
         return;
       }
 
-      if (validate([item]) == null && batch.value === false)
+      if (validate([item]) == null && batch.value === false) overTask.value = item;
-        overTask.value = item;
       // 执行想要的操作
       approvalHandler();
 
@@ -183,16 +179,12 @@ function handleKeydown(event) {
       // 清除已经设置的定时器（如果有的话）
       clearTimeout(keyPressTimer);
       const item = taskDetailInfo.value;
-      if (
+      if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) {
-        item?.userapprove?.statshis === 2 ||
-        item?.userapprove?.statshis == 3
-      ) {
         overTask.value = null;
         return;
       }
 
-      if (validate([item]) == null && batch.value === false)
+      if (validate([item]) == null && batch.value === false) overTask.value = item;
-        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))
+  if (items !== undefined && !(items instanceof PointerEvent)) processItems = items;
-    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(
+  const hasCurrentId = param.flowTaskInfoList.find((item) => item.formId === id);
-    (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)
+  if (validate([item]) == null && batchtwo.value === false) overTasktwo.value = item;
-    overTasktwo.value = item;
 }
 function closePassno() {
   console.log(notPassModalRef.value);
@@ -591,8 +579,7 @@ function checkBottom() {
   const scrollTop = window.pageYOffset || document.documentElement.scrollTop;
 
   // 获取视口的内部高度
-  const clientHeight =
+  const clientHeight = window.innerHeight || document.documentElement.clientHeight;
-    window.innerHeight || document.documentElement.clientHeight;
 
   // 获取整个文档的高度
   const scrollHeight = document.documentElement.scrollHeight;
@@ -661,18 +648,8 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
       <div class="left">
         <span class="font">任务ID：{{ taskDetailInfo.fromtaskname }}</span>
         <template v-if="!isDetail">
-          <SvgIcon
+          <SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" />
-            size="22"
+          <SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" />
-            class="forward"
-            name="arrow-left"
-            @click="backHandler"
-          />
-          <SvgIcon
-            size="22"
-            class="back"
-            name="arrow-right"
-            @click="forwardHandler"
-          />
         </template>
       </div>
       <div v-if="!isDetail" class="right">
@@ -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',
         }"
-      ></div>
+      />
       <div
         v-show="!imgbigshow"
         class="aside-collapse-btn"
@@ -812,7 +786,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
               : {
                   height: '92vh',
                   //flex: 1,
-             
+
                   'background-image': `url(${taskDetailInfo?.ocrPicture?.imgurl})`,
                 }
             : {
@@ -864,21 +838,17 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
             class="img-status"
             src="@/assets/images/task/not_pass.png"
             alt=""
+            HEAD
           />
         </div>
         <div class="mark">
-          <SvgIcon
+          <SvgIcon v-show="taskDetailInfo?.iztrueorfalse === 0" size="128" name="jia" />
-            v-show="taskDetailInfo?.iztrueorfalse === 0"
-            size="128"
-            name="jia"
-          />
         </div>
         <div class="mark">
-          <SvgIcon
+          <SvgIcon v-show="taskDetailInfo?.iztrueorfalse === 0" size="128" name="jia" />
-            v-show="taskDetailInfo?.iztrueorfalse === 1"
+        </div>
-            size="128"
+        <div class="mark">
-            name="zhen"
+          <SvgIcon v-show="taskDetailInfo?.iztrueorfalse === 1" size="128" name="zhen" />
-          />
         </div>
         <div class="big-mark" />
         <div class="preview" @click="previewHandler">
@@ -888,11 +858,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
           <n-grid x-gap="12" y-gap="10" :cols="12">
             <n-gi span="4" class="gi1">
               <span>
-                <img
+                <img class="icon-status" src="@/assets/images/task/status.png" alt="" />t
-                  class="icon-status"
-                  src="@/assets/images/task/status.png"
-                  alt=""
-                />
               </span>
             </n-gi>
             <n-gi span="8" class="gi2">
@@ -911,39 +877,23 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
               </span>
             </n-gi>
             <n-gi span="8" class="gi2">
-              <span class="value num"
+              <span class="value num">{{ totalCount }}<span class="unit">张</span> </span>
-                >{{ totalCount }}<span class="unit">张</span>
-              </span>
               <span class="label">相似匹配</span>
             </n-gi>
           </n-grid>
         </div>
         <div class="time">
           <div class="time-item">
-            <SvgIcon
+            <SvgIcon class="svg-time" color="#FFF" size="16" name="camera-time" />
-              class="svg-time"
-              color="#FFF"
-              size="16"
-              name="camera-time"
-            />
 
-            <span>{{
+            <span>{{ taskDetailInfo?.ocrPicture?.photoDateTimestamp ?? "-" }}</span>
-              taskDetailInfo?.ocrPicture?.photoDateTimestamp ?? "-"
-            }}</span>
           </div>
           <div class="time-item time-item2">
-            <SvgIcon
+            <SvgIcon class="svg-time" color="#FFF" size="16" name="submit-time" />
-              class="svg-time"
-              color="#FFF"
-              size="16"
-              name="submit-time"
-            />
 
             <span>{{
               taskDetailInfo?.ocrPicture?.submitDateTimestamp
-                ? formatToDateHMS(
+                ? formatToDateHMS(Number(taskDetailInfo.ocrPicture.submitDateTimestamp))
-                    Number(taskDetailInfo.ocrPicture.submitDateTimestamp)
-                  )
                 : "-"
             }}</span>
           </div>
@@ -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 }
         "
       >
         <div
@@ -991,8 +942,8 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
           />
         </div>
         <n-scrollbar v-if="totalCount > 0" style="max-height: 100%">
-         <div class="right-card">
+          <div class="right-card">
-        <div v-show="!isFullScreen" class="header">
+            <div v-show="!isFullScreen" class="header">
               <span>相似图片({{ totalCount }})</span>
               <SvgIcon
                 style="margin-right: 20px; cursor: pointer"
@@ -1043,12 +994,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
                 />
                 <div class="time">
                   <div class="time-item">
-                    <SvgIcon
+                    <SvgIcon class="svg-time" color="#FFF" size="8" name="camera-time" />
-                      class="svg-time"
-                      color="#FFF"
-                      size="8"
-                      name="camera-time"
-                    />
                     <span>{{
                       item.photoDateTimestamp
                         ? formatToDateHMS(Number(item.photoDateTimestamp))
@@ -1056,12 +1002,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
                     }}</span>
                   </div>
                   <div class="time-item time-item2">
-                    <SvgIcon
+                    <SvgIcon class="svg-time" color="#FFF" size="8" name="submit-time" />
-                      class="svg-time"
-                      color="#FFF"
-                      size="8"
-                      name="submit-time"
-                    />
                     <span>{{
                       item.submitDateTimestamp
                         ? formatToDateHMS(Number(item.submitDateTimestamp))
@@ -1078,12 +1019,10 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
               </div>
             </div>
             <n-scrollbar v-else style="max-height: 100%">
-              <div
+              <div :style="{ fontSize: '22px', fontWeight: 500, color: '#0D0B22' }">
-                :style="{ fontSize: '22px', fontWeight: 500, color: '#0D0B22' }"
-              >
                 {{ taskDetailInfo.fromtaskname }}
               </div>
-           <div class="tags">
+              <div class="tags">
                 <div
                   v-if="taskDetailInfo?.userapprove?.statshis == 1"
                   class="tag tag-submiting"
@@ -1143,16 +1082,10 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
                       {{ item[0].value }}
                     </div>
                   </div>
-                  <div
+                  <div v-if="!(item[0].label == '拜访终端名称')" class="viewlabel">
-                    v-if="!(item[0].label == '拜访终端名称')"
-                    class="viewlabel"
-                  >
                     {{ item[0].label }}
                   </div>
-                  <div
+                  <div v-if="!(item[0].label == '拜访终端名称')" class="viewvalue">
-                    v-if="!(item[0].label == '拜访终端名称')"
-                    class="viewvalue"
-                  >
                     {{ item[0].value }}
                   </div>
                   <div
@@ -1195,11 +1128,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
     <div v-else class="imgbottom">
       <div
         v-show="imgbigshow"
-        style="
+        style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0"
-          display: flex;
-          justify-content: space-between;
-          padding: 12px 0px 3px 0;
-        "
       >
         <div>
           <span
@@ -1223,36 +1152,16 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
         >
           <div style="cursor: pointer" @click="sortHandler('createdate')">
             <span>时间排序</span>
-            <SvgIcon
+            <SvgIcon v-if="true" style="margin-left: 5px" name="sort" size="12" />
-              v-if="true"
+            <SvgIcon v-else style="margin-left: 5px" name="active-sort" size="12" />
-              style="margin-left: 5px"
-              name="sort"
-              size="12"
-            />
-            <SvgIcon
-              v-else
-              style="margin-left: 5px"
-              name="active-sort"
-              size="12"
-            />
           </div>
           <div
             style="margin-left: 15px; cursor: pointer"
             @click="sortHandler('similarityScore')"
           >
             <span>相似度排序</span>
-            <SvgIcon
+            <SvgIcon v-if="true" style="margin-left: 5px" name="sort" size="12" />
-              v-if="true"
+            <SvgIcon v-else style="margin-left: 5px" name="active-sort" size="12" />
-              style="margin-left: 5px"
-              name="sort"
-              size="12"
-            />
-            <SvgIcon
-              v-else
-              style="margin-left: 5px"
-              name="active-sort"
-              size="12"
-            />
           </div>
         </div>
       </div>
@@ -1317,12 +1226,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
             />
             <div class="time">
               <div class="time-item">
-                <SvgIcon
+                <SvgIcon class="svg-time" color="#FFF" size="16" name="camera-time" />
-                  class="svg-time"
-                  color="#FFF"
-                  size="16"
-                  name="camera-time"
-                />
                 <span>{{
                   item.photoDateTimestamp
                     ? formatToDateHMS(Number(item.photoDateTimestamp))
@@ -1330,12 +1234,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
                 }}</span>
               </div>
               <div class="time-item time-item2">
-                <SvgIcon
+                <SvgIcon class="svg-time" color="#FFF" size="16" name="submit-time" />
-                  class="svg-time"
-                  color="#FFF"
-                  size="16"
-                  name="submit-time"
-                />
                 <span>{{
                   item.submitDateTimestamp
                     ? formatToDateHMS(Number(item.submitDateTimestamp))
@@ -1343,10 +1242,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
                 }}</span>
               </div>
             </div>
-            <div
+            <div :class="{ 'percent-red': item.similarityScore === 100 }" class="percent">
-              :class="{ 'percent-red': item.similarityScore === 100 }"
-              class="percent"
-            >
               {{ item.similarityScore }}<span class="percent-unit">%</span>
             </div>
           </div>
@@ -1433,16 +1329,8 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
         </div>
       </div> -->
     </div>
-    <NotPassed
+    <NotPassed ref="notPassModalRef" @success="notPassSuccess" @close="closePassno" />
-      ref="notPassModalRef"
+    <BatchModal ref="batchModalRef" @reject="rejectHandler" @approval="approvalHandler" />
-      @success="notPassSuccess"
-      @close="closePassno"
-    />
-    <BatchModal
-      ref="batchModalRef"
-      @reject="rejectHandler"
-      @approval="approvalHandler"
-    />
     <CustomSettingModal ref="CustomSettingModalRef" @on-ok="getDetail" />
   </div>
 </template>
@@ -2151,11 +2039,7 @@ function sortHandler(orderby: "similarityScore" | "createdate") {
     .small-mark {
       width: 100%;
       height: 53px;
-      background: linear-gradient(
+      background: linear-gradient(180deg, rgba(0, 0, 0, 0.01), rgba(0, 0, 0, 0.44) 88%);
-        180deg,
-        rgba(0, 0, 0, 0.01),
-        rgba(0, 0, 0, 0.44) 88%
-      );
       border-radius: 0px 8px 8px 8px;
       position: absolute;
       left: 0;