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/taskDetail/execution/index.vue |   44 ++++++++++++++++++++++++++++++++------------
 1 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/subPackages/taskDetail/execution/index.vue b/src/subPackages/taskDetail/execution/index.vue
index 957529d..201e281 100644
--- a/src/subPackages/taskDetail/execution/index.vue
+++ b/src/subPackages/taskDetail/execution/index.vue
@@ -1,24 +1,44 @@
 <!-- 已执行 -->
 <template>
-  <WebViewPlus :src="`${viewUrl}`"/>
+  <WebViewPlus v-if="isApp" :src="`${viewUrl}`" @webMessage="onPostMessage"/>
 </template>
 
 <script setup>
-import {onLoad} from "@dcloudio/uni-app";
+import {onHide, onLoad, onShow} from "@dcloudio/uni-app";
 import WebViewPlus from "@/components/WebViewPlus.vue";
 import {getWebViewUrl} from "@/utils/index.js";
 
-const viewUrl = ref(getWebViewUrl('/execution'))
+const wayLineJobInfoId = ref(null)
+const viewUrl = ref('')
 
-// 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((options) => {
+  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(() => {
+
+});
 </script>
 
 <style lang="scss" scoped></style>

--
Gitblit v1.9.3