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/execution/index.vue |   60 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/subPackages/taskDetail/execution/index.vue b/src/subPackages/taskDetail/execution/index.vue
index 034aa96..8a11578 100644
--- a/src/subPackages/taskDetail/execution/index.vue
+++ b/src/subPackages/taskDetail/execution/index.vue
@@ -1,34 +1,54 @@
 <!-- 已执行 -->
 <template>
-  <web-view ref="sWebViewRef" :src="`${viewUrl}`" @message="onPostMessage" @onPostMessage="onPostMessage" />
+  <WebViewPlus v-if="isApp" :src="`${viewUrl}`" @webMessage="onPostMessage"/>
 </template>
 
 <script setup>
-import {onLoad} from "@dcloudio/uni-app";
-import {useUserStore} from "@/store/index.js";
+import {onHide, onLoad, onShow} from "@dcloudio/uni-app";
+import WebViewPlus from "@/components/WebViewPlus.vue";
+import {getWebViewUrl} from "@/utils/index.js";
 
-const sWebViewRef = ref(null);
-const userStore = useUserStore();
-let viewUrl = ''
+const wayLineJobInfoId = ref(null)
+const viewUrl = ref('')
+// const viewUrl = ref(getWebViewUrl('/execution'))
 
-function onPostMessage(event) {
-  if (event.detail.data[0].type === 'back') {
-    // active.value = null
+// function onPostMessage(data) {
+//   console.log(data, '9999')
+//   if (data.type === 'taskDetails'){
+//     console.log('4444')
+//     uni.switchTab({
+//       url: '/subPackages/taskDetail/execution/index'
+//     });
+//   }
+// }
+function onPostMessage(data) {
+  if (data.type === 'back') {
+    uni.switchTab({
+      url: '/pages/inspectionTask/index'
+    });
+  } else if (data.type === 'control') {
+    uni.redirectTo({
+      url: `/pages/inspectionTask/execution/index?wayLineJobInfoId=${wayLineJobInfoId.value}`
+    });
+  } else if(data.type === 'workid') {
+    uni.navigateTo({
+      url: `/subPackages/workDetail/index?eventNum=${data.eventNum}&wLJobInfoId=${data.wLJobInfoId}&current=${data.current}`
+    });
   }
 }
 
-// onLoad(() => {
-//   window.addEventListener('message', function (e) {
-//     if (e.data.data.type === 'back') {
-//       // active.value = null
-//     }
-//   });
-// })
-
 onLoad((options) => {
-  // console.log('options1111111', JSON.parse(decodeURIComponent(options)));
-  const id=3333
-  viewUrl = `http://192.168.1.178:5173/drone-app-web-view/#/webViewWrapper/execution?rowItem=${id}`;
+  wayLineJobInfoId.value = options.wayLineJobInfoId
+  viewUrl.value = getWebViewUrl('/execution', {wayLineJobInfoId: wayLineJobInfoId.value, waylineJobId: options.waylineJobId, batch_no: options.batch_no})
+})
+const isApp = ref(false)
+onShow(() => {
+  isApp.value = true
+});
+
+onHide(() => {
+  // 如果工单详情返回任务详情，那么tab栏对应的是关联事件一项
+  // isApp.value = false
 });
 </script>
 

--
Gitblit v1.9.3