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 | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/src/subPackages/taskDetail/inProgress/index.vue b/src/subPackages/taskDetail/inProgress/index.vue
index 9026fa0..5e1dd5c 100644
--- a/src/subPackages/taskDetail/inProgress/index.vue
+++ b/src/subPackages/taskDetail/inProgress/index.vue
@@ -1,43 +1,57 @@
<template>
- <WebViewPlus v-if="showComponent" :src="`${viewUrl}`" @webMessage="onPostMessage"/>
+ <WebViewPlus
+ v-if="showComponent"
+ :src="`${viewUrl}`"
+ @webMessage="onPostMessage"
+ />
</template>
<script setup>
import WebViewPlus from "@/components/WebViewPlus.vue";
-import {getWebViewUrl} from "@/utils/index.js";
-import {onHide, onLoad, onShow} from "@dcloudio/uni-app";
+import { getWebViewUrl } from "@/utils/index.js";
+import { onHide, onLoad, onShow } from "@dcloudio/uni-app";
-const wayLineJobInfoId = ref(null)
-const viewUrl = ref('')
-const showComponent = ref(false)
+const wayLineJobInfoId = ref(null);
+const batchNo = ref(null)
+const viewUrl = ref("");
+const showComponent = ref(false);
function onPostMessage(data) {
- if (data.type === 'back') {
+ // #ifdef MP-WEIXIN
+ // #endif
+
+ // #ifndef MP-WEIXIN
+ if (data.type === "back") {
uni.switchTab({
- url: '/pages/inspectionTask/index'
+ url: "/pages/inspectionTask/index",
});
- } else if (data.type === 'control') {
+ } 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
- 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 () {
- showComponent.value = true
+ showComponent.value = true;
// #ifdef APP-PLUS
plus.navigator.setFullscreen(false);
plus.screen.lockOrientation("portrait-primary");
// #endif
-})
+});
-onHide(() =>{
- showComponent.value = false
-})
+onHide(() => {
+ showComponent.value = false;
+});
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3