From 44dd9c4eb8a2489c63a5eb53fd4254bbb3510e95 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 18 Jun 2026 09:14:57 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.4'
---
src/subPackages/droneConsole/index.vue | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/subPackages/droneConsole/index.vue b/src/subPackages/droneConsole/index.vue
index 7128beb..b296006 100644
--- a/src/subPackages/droneConsole/index.vue
+++ b/src/subPackages/droneConsole/index.vue
@@ -6,21 +6,19 @@
import {onHide, onLoad, onShow} from "@dcloudio/uni-app";
import WebViewPlus from "@/components/WebViewPlus.vue";
import {getEnvObj, getWebViewUrl} from "@/utils/index.js";
-import Recorder from "js-audio-recorder";
-import dayjs from "dayjs";
import {useUserStore} from "@/store/index.js";
-
-const queryParams = ref({})
-
-const viewUrl = computed(() => {
- return getWebViewUrl('/DroneConsole', queryParams.value)
-})
function onPostMessage(data) {
if (data.type === 'back'){
- uni.navigateTo({
- url: `/subPackages/inProgress/index?wayLineJodInfoId=${data.taskDetails.id}`
+ // #ifdef H5
+ window.history.back()
+ // #endif
+
+ // #ifdef APP-PLUS
+ uni.navigateBack({
+ delta: 1 // 返回的页面数，默认1（返回上一页）
});
+ // #endif
}
}
@@ -78,8 +76,12 @@
})
}
+const viewUrl = ref("");
onLoad((options) => {
- queryParams.value = options
+ viewUrl.value = getWebViewUrl("/DroneConsole", {
+ wayLineJobInfoId: options.wayLineJobInfoId,
+ dockSn: options.dockSn,
+ });
})
--
Gitblit v1.9.3