From d17304c9ffd27bd4f524762642727ba4917a7d36 Mon Sep 17 00:00:00 2001
From: zhouxiaoan <13598091228@139.com>
Date: Thu, 18 Apr 2024 11:19:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=B8=BB=E5=9B=BE=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0taskindex=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/task/task.ts                          | 4 ++--
 src/views/final/comp/RepeatTaskTableModal.vue | 2 +-
 src/views/final/content/Content.vue           | 2 +-
 src/views/final/content/ListContent.vue       | 2 +-
 src/views/task/content/Content.vue            | 8 +++++++-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/api/task/task.ts b/src/api/task/task.ts
index 395607b..a1f80c4 100644
--- a/src/api/task/task.ts
+++ b/src/api/task/task.ts
@@ -132,10 +132,10 @@ export async function getSimilarityList(params: any) {
  * @returns
  */
 
-export async function getTaskDetailInfo(taskId: string, packageid: string) {
+export async function getTaskDetailInfo(taskId: string, packageid: string, taskNode: string) {
   const pid = packageid || 0
   const res = await http.request({
-    url: `/backstage/jifen/ocrtaskchildpicture/getdata/${taskId}/${pid}`,
+    url: `/backstage/jifen/ocrtaskchildpicture/getdata/${taskId}/${pid}/${taskNode}`,
     method: 'get',
   })
 
diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue
index 496cb3d..9362f7f 100644
--- a/src/views/final/comp/RepeatTaskTableModal.vue
+++ b/src/views/final/comp/RepeatTaskTableModal.vue
@@ -363,7 +363,7 @@ function reload() {
 }
 
 function goDetail(row) {
-  router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid } })
+  router.push({ name: 'final-detail', query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex } })
 }
 
 const showActions = computed(() => {
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index e1b055a..bbefabf 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -720,7 +720,7 @@ function validate(items: any[]) {
 function goDetail(row) {
   router.push({
     name: 'final-detail',
-    query: { id: row.id, packageid: row.packageid },
+    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex },
   })
 }
 
diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue
index d951661..7528b4c 100644
--- a/src/views/final/content/ListContent.vue
+++ b/src/views/final/content/ListContent.vue
@@ -199,7 +199,7 @@ function isValidTimestamp(value) {
 function goDetail(row) {
   router.push({
     name: 'final-detail',
-    query: { id: row.id, packageid: row.packageid },
+    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex },
   })
 }
 // 小结批量不通过
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index d4f18cd..adaa088 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -49,6 +49,7 @@ const batchModalRef: any = ref(null)
 const totalCount = ref(0)
 const taskId: any = ref('') // 任务id
 const packageId: any = ref('') // 包id
+const taskIndex = ref<string>('') // 包标识
 const CustomSettingModalRef = ref(null)
 const taskTableData = ref<any[]>([])
 const route = useRoute()
@@ -115,6 +116,7 @@ onMounted(() => {
   if (route.query.id) {
     taskId.value = route.query.id
     packageId.value = route.query.packageid
+    taskIndex.value = route.query.taskindex as string
     isDetail.value = true
     getDetail()
   }
@@ -513,6 +515,10 @@ watch(
     if (!isEmpty(taskStore.getActiveId)) {
       packageId.value = taskStore.getPackageid
       taskId.value = taskStore.getActiveId
+      // console.log(taskStore, 'taskStore')
+      // 找到当前选中的数据
+      const task = taskStore.getApprovalList.find(i => i.id === taskStore.activeId)
+      taskIndex.value = task.taskIndex
       getDetail()
     }
   },
@@ -520,7 +526,7 @@ watch(
 
 // 获取数据
 async function getDetail() {
-  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, packageId.value)
+  taskDetailInfo.value = await getTaskDetailInfo(taskId.value, packageId.value, taskIndex.value)
   setBatch(false)
   getTableData()
   getImgList()

From 57849f1f150187b739cee32d789002af4c911c3d Mon Sep 17 00:00:00 2001
From: zhouxiaoan <13598091228@139.com>
Date: Thu, 18 Apr 2024 11:20:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=B8=BB=E5=9B=BE=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0taskindex=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/content/Content.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index adaa088..4510e9e 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -515,7 +515,6 @@ watch(
     if (!isEmpty(taskStore.getActiveId)) {
       packageId.value = taskStore.getPackageid
       taskId.value = taskStore.getActiveId
-      // console.log(taskStore, 'taskStore')
       // 找到当前选中的数据
       const task = taskStore.getApprovalList.find(i => i.id === taskStore.activeId)
       taskIndex.value = task.taskIndex