From 3d52e75cca813442b10a9f2d9d782a3c5f3e8abb Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Fri, 19 Apr 2024 10:03:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:location=E5=AD=97=E6=AE=B5=E5=8A=A0?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/content/Content.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index fee342a..35ae621 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -419,9 +419,10 @@ async function getTableData() {
   fieldList.forEach((v) => {
     if (userFieldList.includes(v.name)) {
       let locationobj = { address: '' }
-      if (v.name == 'location') {
+      
+      if (v.name == 'location'&& taskDetailInfo.value.ocrPicture[v.name]!=null&& taskDetailInfo.value.ocrPicture[v.name]!="null") {
         locationobj = JSON.parse(
-          taskDetailInfo.value.ocrPicture ? taskDetailInfo.value.ocrPicture[v.name] : '{}',
+          taskDetailInfo.value.ocrPicture ? taskDetailInfo.value.ocrPicture[v.name] : {},
         )
       }
       const item = {
-- 
2.39.3


From 92049e5c6c46767da1d12dabb1f6b7dc1ddc5f2c Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Sat, 20 Apr 2024 12:50:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=8B=96?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index 83a3238..c8b91e3 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -203,7 +203,7 @@ async function loadMore() {
 onUpdated(() => {
   if (startCalTime) {
     endTime = new Date().getTime()
-    if (endTime - startTime > 500)
+    if (endTime - startTime > 300)
       createDom()
   }
   else {
@@ -281,7 +281,7 @@ function isSelected(pictureId: number) {
 function moveHandler(e: MouseEvent) {
   if (startCalTime) {
     endTime = new Date().getTime()
-    if (endTime - startTime > 500)
+    if (endTime - startTime > 300)
       createDom()
   }
   else {
@@ -324,7 +324,7 @@ function removeDom() {
 function upHandler(event: MouseEvent) {
   endTime = new Date().getTime()
   startCalTime = false
-  if (endTime - startTime > 500)
+  if (endTime - startTime > 300)
     createDom()
   else
     removeDom()
-- 
2.39.3