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/pages/inspectionTask/index.vue | 91 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 76 insertions(+), 15 deletions(-)
diff --git a/src/pages/inspectionTask/index.vue b/src/pages/inspectionTask/index.vue
index 30211dc..4955d45 100644
--- a/src/pages/inspectionTask/index.vue
+++ b/src/pages/inspectionTask/index.vue
@@ -1,38 +1,99 @@
<!-- 巡检任务 -->
<template>
- <WebViewPlus v-if="isApp" :src="`${viewUrl}`" @webMessage="onPostMessage"/>
+ <view>
+ <WebViewPlus :src="`${viewUrl}`" @webMessage="onPostMessage" />
+ </view>
</template>
<script setup>
import { getWebViewUrl } from "@/utils/index.js";
import WebViewPlus from "@/components/WebViewPlus.vue";
-import {onHide, onShow} from "@dcloudio/uni-app";
+import { onHide, onShow } from "@dcloudio/uni-app";
+import { useAppStore } from "@/store/index.js";
-const viewUrl = getWebViewUrl('/inspectionTask')
+const appStore = useAppStore();
+
+// const viewUrl = getWebViewUrl('/inspectionTask')
+
+const updateKey = ref(0);
+const sxListKey = ref(0);
+const viewUrl = computed(() => {
+ // #ifdef MP-WEIXIN
+ return getWebViewUrl("/inspectionTask", {
+ updateKey: updateKey.value,
+ sxListKey: sxListKey.value,
+ showAddBtn: 1,
+ });
+ // #endif
+
+ // #ifndef MP-WEIXIN
+ return getWebViewUrl("/inspectionTask", {
+ updateKey: updateKey.value,
+ sxListKey: sxListKey.value,
+ showAddBtn: 0,
+ });
+ // #endif
+});
+
+watch(
+ () => [appStore.jobUpdateKey, appStore.deviceUpdateKey],
+ () => {
+ sxListKey.value = sxListKey.value + 1;
+ }
+);
function onPostMessage(data) {
- if (data.type === 'taskDetails'){
- if ([1,2].includes(data.rowItem.status)){
+ if (data.type === "taskDetails") {
+ // #ifdef MP-WEIXIN
+ // #endif
+
+ // #ifndef MP-WEIXIN
+ if ([1, 2].includes(data.rowItem.status)) {
uni.navigateTo({
- url: `/pages/inspectionTask/TaskDetails/TaskDetails?wayLineJodInfoId=${data.rowItem.id}`
+ url: `/subPackages/taskDetail/inProgress/index?wayLineJobInfoId=${data.rowItem.id}&batchNo=${data.rowItem.batch_no}`,
});
- }else{
+ } else {
uni.navigateTo({
- url: '/subPackages/taskDetail/execution/index'
+ url: `/subPackages/taskDetail/execution/index?wayLineJobInfoId=${data.rowItem.id}&waylineJobId=${data.rowItem.wayline_job_id}&batch_no=${data.rowItem.batch_no}`,
});
}
+ // #endif
+ }
+
+ if (data.type === "addTask") {
+ // #ifdef MP-WEIXIN
+ // #endif
}
}
-const isApp = ref(false)
+
onShow(() => {
- isApp.value = true
+ const joinParams = uni.getStorageSync("joinParams");
+ if (joinParams) {
+ // 使用后清除
+ console.log("是否打印", updateKey.value);
+ updateKey.value = updateKey.value + 1;
+ uni.removeStorageSync("joinParams");
+ }
+ // isApp.value = true
+ // 清除数据
+ const encodedData = encodeURIComponent(JSON.stringify({ device_sn: "" }));
+ uni.setStorageSync("webview_params", encodedData);
+
+ // #ifndef MP-WEIXIN
+ uni.setTabBarItem({
+ index: 2, // Tab 的索引（从0开始）
+ visible: true,
+ pagePath: "subPackages/taskDetail/addTask/index",
+ });
+ uni.setTabBarItem({
+ index: 3, // Tab
+ visible: false,
+ });
+ // #endif
});
onHide(() => {
- isApp.value = false
+ // isApp.value = false
});
-
</script>
-<style scoped lang="scss">
-
-</style>
+<style scoped lang="scss"></style>
--
Gitblit v1.9.3