From 648904d076ae6e17892b40675598b1c8dc474277 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 24 Apr 2026 16:21:12 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.3' into feature/v9.0/9.0.4
---
src/subPackages/taskDetail/inProgress/index.vue | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/subPackages/taskDetail/inProgress/index.vue b/src/subPackages/taskDetail/inProgress/index.vue
index 9b9e1cc..5e1dd5c 100644
--- a/src/subPackages/taskDetail/inProgress/index.vue
+++ b/src/subPackages/taskDetail/inProgress/index.vue
@@ -1,13 +1,3 @@
-<!--
- * @Author : yuan
- * @Date : 2025-12-05 11:32:36
- * @LastEditors : yuan
- * @LastEditTime : 2025-12-19 15:56:31
- * @FilePath : \src\subPackages\inProgress\index.vue
- * @Description :
- * Copyright 2025 OBKoro1, All Rights Reserved.
- * 2025-12-05 11:32:36
--->
<template>
<WebViewPlus
v-if="showComponent"
@@ -22,6 +12,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) {
@@ -35,16 +26,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}`,
});
}
// #endif
}
-onLoad((options) => {
- wayLineJobInfoId.value = options.wayLineJobInfoId;
+onLoad((queryParams) => {
+ wayLineJobInfoId.value = queryParams.wayLineJobInfoId;
+ batchNo.value = queryParams.batchNo
viewUrl.value = getWebViewUrl("/TaskInProgress", {
wayLineJobInfoId: wayLineJobInfoId.value,
+ batchNo: batchNo.value,
});
});
--
Gitblit v1.9.3