From 78ad865bc08dfff6fcd0084389b9cbba9f834608 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 21 Oct 2025 10:18:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/pages.json | 3 ++-
src/subPackages/taskDetail/execution/index.vue | 4 ++++
package.json | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 07ef59b..8b2d519 100644
--- a/package.json
+++ b/package.json
@@ -143,7 +143,7 @@
"env": {
"UNI_PLATFORM": "h5",
"NAME_ER": "development",
- "VITE_APP_WEBVIEW_URL": "http://192.168.9.211:5173/drone-app-web-view/#/webViewWrapper"
+ "VITE_APP_WEBVIEW_URL": "https://wrj.shuixiongit.com/drone-app-web-view/#/webViewWrapper"
}
},
"h5-test": {
diff --git a/src/pages.json b/src/pages.json
index 18d9a66..f00f4c1 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -71,7 +71,8 @@
{
"path": "droneConsole/index",
"style": {
- "navigationBarTitleText": "控制台"
+ "navigationBarTitleText": "控制台",
+ "navigationStyle": "custom"
}
},
{
diff --git a/src/subPackages/taskDetail/execution/index.vue b/src/subPackages/taskDetail/execution/index.vue
index bef53e1..e31d002 100644
--- a/src/subPackages/taskDetail/execution/index.vue
+++ b/src/subPackages/taskDetail/execution/index.vue
@@ -30,6 +30,10 @@
uni.redirectTo({
url: `/pages/inspectionTask/execution/index?wayLineJodInfoId=${wayLineJodInfoId.value}`
});
+ } else if(data.type === 'workid') {
+ uni.navigateTo({
+ url: `/subPackages/workDetail/index?eventNum=${data.eventNum}`
+ });
}
}
--
Gitblit v1.9.3