From 64ff8265168254c7d51d2a344de7d6bfc99ef41c Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 20 Oct 2025 11:24:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/pages.json | 14 +++++++-------
src/subPackages/inProgress/index.vue | 35 +++++++++++++++++++++++++++++++++++
src/pages/inspectionTask/index.vue | 2 +-
3 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/src/pages.json b/src/pages.json
index e839174..8e23071 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -32,13 +32,7 @@
"navigationBarTitleText": "我的"
}
},
- {
- "path": "pages/inspectionTask/TaskDetails/TaskDetails",
- "style": {
- "navigationBarTitleText": "执行中",
- "navigationStyle": "custom"
- }
- },
+
{
"path": "pages/inspectionTask/DroneConsole/DroneConsole",
"style": {
@@ -77,6 +71,12 @@
}
},
{
+ "path": "inProgress/index",
+ "style": {
+ "navigationBarTitleText": "执行中"
+ }
+ },
+ {
"path": "taskDetail/addTask/index",
"style": {
"navigationBarTitleText": "新建任务"
diff --git a/src/pages/inspectionTask/index.vue b/src/pages/inspectionTask/index.vue
index 30211dc..8789b73 100644
--- a/src/pages/inspectionTask/index.vue
+++ b/src/pages/inspectionTask/index.vue
@@ -14,7 +14,7 @@
if (data.type === 'taskDetails'){
if ([1,2].includes(data.rowItem.status)){
uni.navigateTo({
- url: `/pages/inspectionTask/TaskDetails/TaskDetails?wayLineJodInfoId=${data.rowItem.id}`
+ url: `/subPackages/inProgress/index?wayLineJodInfoId=${data.rowItem.id}`
});
}else{
uni.navigateTo({
diff --git a/src/subPackages/inProgress/index.vue b/src/subPackages/inProgress/index.vue
new file mode 100644
index 0000000..140dfba
--- /dev/null
+++ b/src/subPackages/inProgress/index.vue
@@ -0,0 +1,35 @@
+<template>
+ <WebViewPlus :src="`${viewUrl}`" @webMessage="onPostMessage"/>
+</template>
+
+<script setup>
+import WebViewPlus from "@/components/WebViewPlus.vue";
+import {getWebViewUrl} from "@/utils/index.js";
+import {onLoad} from "@dcloudio/uni-app";
+
+const wayLineJodInfoId = ref(null)
+const viewUrl = ref('')
+
+function onPostMessage(data) {
+ if (data.type === 'back') {
+ uni.switchTab({
+ url: '/pages/inspectionTask/index'
+ });
+ } else if (data.type === 'control') {
+ uni.redirectTo({
+ url: `/pages/inspectionTask/DroneConsole/DroneConsole?wayLineJodInfoId=${wayLineJodInfoId.value}`
+ });
+ }
+}
+
+onLoad((options) => {
+ wayLineJodInfoId.value = options.wayLineJodInfoId
+ viewUrl.value = getWebViewUrl('/TaskInProgress', {wayLineJodInfoId: wayLineJodInfoId.value})
+})
+</script>
+
+<style scoped lang="scss">
+.page-wrap {
+ font-size: 20px;
+}
+</style>
--
Gitblit v1.9.3