From f2251d2f5c47fbe00a819f02f8d8c7ed70e60aaf Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 20 Oct 2025 22:08:33 +0800
Subject: [PATCH] feat: 调整路径

---
 /dev/null                              |   35 -----------------------------------
 src/pages.json                         |   14 ++++++--------
 src/subPackages/inProgress/index.vue   |    4 ++--
 package.json                           |    2 +-
 src/subPackages/droneConsole/index.vue |    0 
 5 files changed, 9 insertions(+), 46 deletions(-)

diff --git a/package.json b/package.json
index 8b2d519..07ef59b 100644
--- a/package.json
+++ b/package.json
@@ -143,7 +143,7 @@
         "env": {
           "UNI_PLATFORM": "h5",
           "NAME_ER": "development",
-          "VITE_APP_WEBVIEW_URL": "https://wrj.shuixiongit.com/drone-app-web-view/#/webViewWrapper"
+          "VITE_APP_WEBVIEW_URL": "http://192.168.9.211:5173/drone-app-web-view/#/webViewWrapper"
         }
       },
       "h5-test": {
diff --git a/src/pages.json b/src/pages.json
index 8e23071..18d9a66 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -32,14 +32,6 @@
         "navigationBarTitleText": "我的"
       }
     },
-
-    {
-      "path": "pages/inspectionTask/DroneConsole/DroneConsole",
-      "style": {
-        "navigationBarTitleText": "控制台",
-        "navigationStyle": "custom"
-      }
-    },
     {
       "path": "pages/login/index",
       "style": {
@@ -77,6 +69,12 @@
           }
         },
         {
+          "path": "droneConsole/index",
+          "style": {
+            "navigationBarTitleText": "控制台"
+          }
+        },
+        {
           "path": "taskDetail/addTask/index",
           "style": {
             "navigationBarTitleText": "新建任务"
diff --git a/src/pages/inspectionTask/TaskDetails/TaskDetails.vue b/src/pages/inspectionTask/TaskDetails/TaskDetails.vue
deleted file mode 100644
index 140dfba..0000000
--- a/src/pages/inspectionTask/TaskDetails/TaskDetails.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<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>
diff --git a/src/pages/inspectionTask/DroneConsole/DroneConsole.vue b/src/subPackages/droneConsole/index.vue
similarity index 100%
rename from src/pages/inspectionTask/DroneConsole/DroneConsole.vue
rename to src/subPackages/droneConsole/index.vue
diff --git a/src/subPackages/inProgress/index.vue b/src/subPackages/inProgress/index.vue
index 140dfba..a23c9b8 100644
--- a/src/subPackages/inProgress/index.vue
+++ b/src/subPackages/inProgress/index.vue
@@ -16,8 +16,8 @@
       url: '/pages/inspectionTask/index'
     });
   } else if (data.type === 'control') {
-    uni.redirectTo({
-      url: `/pages/inspectionTask/DroneConsole/DroneConsole?wayLineJodInfoId=${wayLineJodInfoId.value}`
+    uni.navigateTo({
+      url: `/subPackages/droneConsole/index?wayLineJodInfoId=${wayLineJodInfoId.value}`
     });
   }
 }

--
Gitblit v1.9.3