feat:修改冲突

components.d.ts

@@ -11,6 +11,7 @@ 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']
@@ -21,8 +22,11 @@ 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']
     NGrid: typeof import('naive-ui')['NGrid']
     NGridItem: typeof import('naive-ui')['NGridItem']
     NImage: typeof import('naive-ui')['NImage']
@@ -31,6 +35,7 @@ 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']
@@ -40,7 +45,11 @@ 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/layout/components/Header/RecycleModal.vue

@@ -732,7 +732,7 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
                 >
                   <n-image
                     ref="imageRef"
-                    :src="item.imgUrl"
+                    :src="item?.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgUrl"
                     :preview-src="item.imgUrl"
                     :fallback-src="bgLoadingImg"
                     class="img "

src/views/home/content/Content.vue

@@ -248,7 +248,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,
@@ -726,13 +726,13 @@ defineExpose({
               <img
                 v-if="item.states == 3"
                 class="tag-status"
-                src="@/assets/images/task/tag-pass.png"
+                src="@/assets/images/pass.png"
                 alt=""
               >
               <img
                 v-if="item.states == 5"
                 class="tag-status"
-                src="@/assets/images/task/tag-not-pass.png"
+                src="@/assets/images/not-pass.png"
                 alt=""
               >
               <!-- @load="loadImgOver(item)" -->
@@ -926,7 +926,8 @@ defineExpose({
       width: 182px;
       border-radius: 7px;
       margin-bottom: 10px;
-      overflow: hidden;
+      overflow-x: visible;
+      // overflow-y: hidden;
       position: relative;
       transition: 0.5s;
 
@@ -934,7 +935,7 @@ defineExpose({
         width: 46px;
         height: 22px;
         position: absolute;
-        left: -1px;
+        left: -3px;
         top: 10px;
       }
 

src/views/task/content/Content.vue

@@ -811,18 +811,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"
@@ -1000,7 +1000,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})`,
                   }"
                 />
                 <div class="small-mark" />
@@ -1226,7 +1226,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"

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"

src/views/worksheet/content/Content.vue

@@ -800,7 +800,7 @@ defineExpose({
           >
             <div
               class="img-wrapper"
-              :style="{ background: `url(${item?.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgurl}), url(${bgLoadingImg})` }"
+              :style="{ background: `url(${item?.serverThumbnailUrl ? item.serverThumbnailUrl : item.imgurl ? item.imgurl: bgLoadingImg})` }"
             />
             <div class="time-wrapper">
               <div class="time">