From b91eee93cc9533d088010e1f797e38e084c2dfb6 Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Mon, 22 Apr 2024 10:59:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A0=E6=97=B6=E9=97=B4=E6=97=B6?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue  |  4 ++--
 src/views/task/content/Content.vue             | 11 +++++++----
 src/views/worksheet/components/PictureWall.vue |  4 ++--
 src/views/worksheet/components/pictureCard.vue |  2 +-
 src/views/worksheet/content/Content.vue        | 11 ++++++++---
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index 066b9c7..97c590d 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -753,12 +753,12 @@ watch(() => show.value, async (newVal) => {
                     <div class="time-item" style="margin-bottom: 4px;">
                       <SvgIcon color="#FFF" size="16" name="camera" style="margin-right: 4px;" />
                       <span class="time-value">{{ item?.photoDateTimestamp
-                        ? formatToDateHMS(Number(item.photoDateTimestamp)) : '-' }} </span>
+                        ? formatToDateHMS(Number(item.photoDateTimestamp)) : '- -' }} </span>
                     </div>
                     <div class="time-item">
                       <SvgIcon class="svg-time" color="#FFF" size="16" name="time" />
                       <span>{{ item.submitDateTimestamp
-                        ? formatToDateHMS(Number(item.submitDateTimestamp)) : '-' }}</span>
+                        ? formatToDateHMS(Number(item.submitDateTimestamp)) : '- -' }}</span>
                     </div>
                   </div>
                 </div>
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 54f9e49..7a45d03 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -309,7 +309,10 @@ async function handleDragEnd(event, item) {
       setBatch(false)
       getTableData()
       getImgList()
+    }else{
+       message.error(res.message)
     }
+  
     taskStore.setInFile(false)
     taskStore.setInFile(item.pictureId)
   }
@@ -989,7 +992,7 @@ function nodrage(){
                     <span>{{
                       item.photoDateTimestamp
                         ? formatToDateHMS(Number(item.photoDateTimestamp))
-                        : "-"
+                        : "- -"
                     }}</span>
                   </div>
                   <div class="time-item time-item2">
@@ -997,7 +1000,7 @@ function nodrage(){
                     <span>{{
                       item.submitDateTimestamp
                         ? formatToDateHMS(Number(item.submitDateTimestamp))
-                        : "-"
+                        : "- -"
                     }}</span>
                   </div>
                 </div>
@@ -1232,7 +1235,7 @@ function nodrage(){
                 <span>{{
                   item.photoDateTimestamp
                     ? formatToDateHMS(Number(item.photoDateTimestamp))
-                    : "-"
+                    : "- -"
                 }}</span>
               </div>
               <div class="time-item time-item2">
@@ -1240,7 +1243,7 @@ function nodrage(){
                 <span>{{
                   item.submitDateTimestamp
                     ? formatToDateHMS(Number(item.submitDateTimestamp))
-                    : "-"
+                    : "- -"
                 }}</span>
               </div>
             </div>
diff --git a/src/views/worksheet/components/PictureWall.vue b/src/views/worksheet/components/PictureWall.vue
index 6bb9a37..817f52e 100644
--- a/src/views/worksheet/components/PictureWall.vue
+++ b/src/views/worksheet/components/PictureWall.vue
@@ -340,13 +340,13 @@ onUnmounted(() => {
           <div class="time">
             <SvgIcon color="#FFF" size="16" name="camera" />
             <span class="current-time">{{ item.photoDateTimestamp ? formatToDateHMS(Number(item.photoDateTimestamp) ||
-              0) : '-'
+              0) : '- -'
             }}</span>
           </div>
           <div class="time">
             <SvgIcon color="#FFF" size="16" name="save" />
             <span class="current-time">{{ item.submitDateTimestamp ? formatToDateHMS(Number(item.submitDateTimestamp)
-              || 0) : '-'
+              || 0) : '- -'
             }}</span>
           </div>
         </div>
diff --git a/src/views/worksheet/components/pictureCard.vue b/src/views/worksheet/components/pictureCard.vue
index cb616fa..315bdfb 100644
--- a/src/views/worksheet/components/pictureCard.vue
+++ b/src/views/worksheet/components/pictureCard.vue
@@ -190,7 +190,7 @@ function previewHandler(event: MouseEvent) {
       <div class="time-item">
         <SvgIcon class="svg-time" color="#FFF" size="16" name="camera-time" />
 
-        <span>{{ taskDetailInfo?.ocrPicture?.photoDateTimestamp ?? "-" }}</span>
+        <span>{{ taskDetailInfo?.ocrPicture?.photoDateTimestamp ?? "- -" }}</span>
       </div>
       <div class="time-item time-item2">
         <SvgIcon class="svg-time" color="#FFF" size="16" name="submit-time" />
diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue
index 3a40788..e2db64f 100644
--- a/src/views/worksheet/content/Content.vue
+++ b/src/views/worksheet/content/Content.vue
@@ -647,14 +647,19 @@ defineExpose({
             <div class="footer-times">
               <div class="time" style="margin-bottom: 4px">
                 <SvgIcon color="#FFF" size="16" name="camera" />
-                <span class="time-value">{{ taskDetailInfo?.photoDateTimestamp }} </span>
+                 <span class="time-value">{{
+                  taskDetailInfo?.photoDateTimestamp
+                    ? format(taskDetailInfo?.photoDateTimestamp, "yyyy-MM-dd HH:mm:ss")
+                    : "- -"
+                }}
+                </span>
               </div>
               <div class="time">
                 <SvgIcon color="#FFF" size="16" name="save" />
                 <span class="time-value">{{
                   taskDetailInfo?.submitDateTimestamp
                     ? format(taskDetailInfo?.submitDateTimestamp, "yyyy-MM-dd HH:mm:ss")
-                    : "-"
+                    : "- -"
                 }}
                 </span>
               </div>
@@ -856,7 +861,7 @@ defineExpose({
                 <span class="current-time">{{
                   item.photoDateTimestamp
                     ? formatToDateHMS(Number(item.photoDateTimestamp) || 0)
-                    : "-"
+                    : "- -"
                 }}</span>
               </div>
               <div class="time">