From 76184999822e1040755ce920b7dc8d36d267d0ce Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 15 Oct 2025 13:59:36 +0800
Subject: [PATCH] feat: 已执行,控制台
---
/dev/null | 30 ---------------
src/pages.json | 4 +-
src/pages/inspectionTask/TaskDetails/TaskDetails.vue | 5 +-
src/pages/inspectionTask/DroneConsole/DroneConsole.vue | 30 +++++++++++++++
src/utils/common/index.js | 1
5 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/src/pages.json b/src/pages.json
index 1136615..714e855 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -40,7 +40,7 @@
}
},
{
- "path": "pages/inspectionTask/TaskDetails/DroneConsole/DroneConsole",
+ "path": "pages/inspectionTask/DroneConsole/DroneConsole",
"style": {
"navigationBarTitleText": "控制台",
"navigationStyle": "custom"
@@ -184,4 +184,4 @@
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
}
-}
\ No newline at end of file
+}
diff --git a/src/pages/inspectionTask/DroneConsole/DroneConsole.vue b/src/pages/inspectionTask/DroneConsole/DroneConsole.vue
new file mode 100644
index 0000000..8d63450
--- /dev/null
+++ b/src/pages/inspectionTask/DroneConsole/DroneConsole.vue
@@ -0,0 +1,30 @@
+<template>
+ <WebViewPlus :src="`${viewUrl}`" @webMessage="onPostMessage"/>
+</template>
+<script setup>
+import {onHide, onShow} from "@dcloudio/uni-app";
+import WebViewPlus from "@/components/WebViewPlus.vue";
+import {getWebViewUrl} from "@/utils/index.js";
+
+const viewUrl = getWebViewUrl('/DroneConsole', {wayLineJodInfoId: 6120})
+
+function onPostMessage(event) {
+
+}
+
+
+// onShow(() => {
+// // #ifdef APP-PLUS
+// plus.screen.lockOrientation("landscape-primary");
+// // #endif
+// });
+//
+// onHide(() => {
+// // #ifdef APP-PLUS
+// plus.screen.lockOrientation("portrait-primary");
+// // #endif
+// });
+</script>
+<style scoped lang="scss">
+
+</style>
diff --git a/src/pages/inspectionTask/TaskDetails/DroneConsole/DroneConsole.vue b/src/pages/inspectionTask/TaskDetails/DroneConsole/DroneConsole.vue
deleted file mode 100644
index 8c5b7d7..0000000
--- a/src/pages/inspectionTask/TaskDetails/DroneConsole/DroneConsole.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-<template>
- <WebViewPlus :src="`${viewUrl}`" @webMessage="onPostMessage"/>
-</template>
-<script setup>
-import {onHide, onShow} from "@dcloudio/uni-app";
-import WebViewPlus from "@/components/WebViewPlus.vue";
-import {getWebViewUrl} from "@/utils/index.js";
-
-const viewUrl = getWebViewUrl('/droneConsole', {wayLineJodInfoId: 6120})
-
-function onPostMessage(event) {
-
-}
-
-
-onShow(() => {
- // #ifdef APP-PLUS
- plus.screen.lockOrientation("landscape-primary");
- // #endif
-});
-
-onHide(() => {
- // #ifdef APP-PLUS
- plus.screen.lockOrientation("portrait-primary");
- // #endif
-});
-</script>
-<style scoped lang="scss">
-
-</style>
diff --git a/src/pages/inspectionTask/TaskDetails/TaskDetails.vue b/src/pages/inspectionTask/TaskDetails/TaskDetails.vue
index 9ccebd5..c1f955c 100644
--- a/src/pages/inspectionTask/TaskDetails/TaskDetails.vue
+++ b/src/pages/inspectionTask/TaskDetails/TaskDetails.vue
@@ -8,8 +8,7 @@
import {getWebViewUrl} from "@/utils/index.js";
const userStore = useUserStore()
-
-const viewUrl = getWebViewUrl('/appTaskDetails', {wayLineJodInfoId: 6120})
+const viewUrl = getWebViewUrl('/TaskInProgress', {wayLineJodInfoId: 6120})
function onPostMessage(data) {
@@ -19,7 +18,7 @@
});
}else if(data.type === 'control'){
uni.redirectTo({
- url: '/pages/inspectionTask/TaskDetails/DroneConsole/DroneConsole'
+ url: '/pages/inspectionTask/DroneConsole/DroneConsole'
});
}
}
diff --git a/src/utils/common/index.js b/src/utils/common/index.js
index 63a29a5..da64f3f 100644
--- a/src/utils/common/index.js
+++ b/src/utils/common/index.js
@@ -32,6 +32,7 @@
export function getWebViewUrl(targetUrl,otherParams){
const userStore = useUserStore()
const url = import.meta.env.VITE_APP_WEBVIEW_URL
+ console.log(url,686)
// 构建查询参数
const params = new URLSearchParams()
params.append('params', JSON.stringify(userStore?.userInfo))
--
Gitblit v1.9.3