From b25c960937dca235e56704aaed8c2b1bf1ff8a41 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 20 Dec 2025 10:52:26 +0800
Subject: [PATCH] feat: 批次id

---
 src/subPackages/inProgress/index.vue |   13 +++++++++----
 src/pages/inspectionTask/index.vue   |    2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/pages/inspectionTask/index.vue b/src/pages/inspectionTask/index.vue
index b76d02f..23665c8 100644
--- a/src/pages/inspectionTask/index.vue
+++ b/src/pages/inspectionTask/index.vue
@@ -29,7 +29,7 @@
   if (data.type === 'taskDetails'){
     if ([1,2].includes(data.rowItem.status)){
       uni.navigateTo({
-        url: `/subPackages/inProgress/index?wayLineJobInfoId=${data.rowItem.id}`
+        url: `/subPackages/inProgress/index?wayLineJobInfoId=${data.rowItem.id}batchNo=${data.rowItem.batch_no}`
       });
     } else {
       uni.navigateTo({
diff --git a/src/subPackages/inProgress/index.vue b/src/subPackages/inProgress/index.vue
index 9026fa0..c13c04b 100644
--- a/src/subPackages/inProgress/index.vue
+++ b/src/subPackages/inProgress/index.vue
@@ -8,6 +8,7 @@
 import {onHide, onLoad, onShow} from "@dcloudio/uni-app";
 
 const wayLineJobInfoId = ref(null)
+const batchNo = ref(null)
 const viewUrl = ref('')
 const showComponent = ref(false)
 function onPostMessage(data) {
@@ -17,14 +18,18 @@
     });
   } else if (data.type === 'control') {
     uni.navigateTo({
-      url: `/subPackages/droneConsole/index?wayLineJobInfoId=${wayLineJobInfoId.value}&dockSn=${data.dockSn}`
+      url: `/subPackages/droneConsole/index?wayLineJobInfoId=${wayLineJobInfoId.value}&dockSn=${data.dockSn}&batchNo=${batchNo.value}`,
     });
   }
 }
 
-onLoad((options) => {
-  wayLineJobInfoId.value = options.wayLineJobInfoId
-  viewUrl.value = getWebViewUrl('/TaskInProgress', {wayLineJobInfoId: wayLineJobInfoId.value})
+onLoad((queryParams) => {
+  wayLineJobInfoId.value = queryParams.wayLineJobInfoId
+  batchNo.value = queryParams.batchNo
+  viewUrl.value = getWebViewUrl('/TaskInProgress', {
+    wayLineJobInfoId: wayLineJobInfoId.value,
+    batchNo: batchNo.value
+  })
 })
 
 onShow(function () {

--
Gitblit v1.9.3