From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop

---
 src/router/index.ts |  175 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 135 insertions(+), 40 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 574c3a9..7db93c4 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,64 +1,159 @@
 import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router'
 import { ERouterName } from '/@/types/index'
+import CreatePlan from '/@/components/task/CreatePlan.vue'
+import WaylinePanel from '/@/pages/page-web/projects/wayline.vue'
+import DockPanel from '/@/pages/page-web/projects/dock.vue'
+import LiveAgora from '/@/components/livestream-agora.vue'
+import LiveOthers from '/@/components/livestream-others.vue'
 
 const routes: Array<RouteRecordRaw> = [
   {
-    path: '/' + ERouterName.Project,
-    name: ERouterName.Project,
-    // redirect: {
-    //   name: ERouterName.Project
-    // },
-    component: () => import('/@/pages/project-app/index.vue'),
-    children: [
-      {
-        path: '/' + ERouterName.Livestream,
-        component: () => import('/@/pages/project-app/projects/livestream.vue')
-      },
-      {
-        path: '/' + ERouterName.Tsa,
-        component: () => import('/@/pages/project-app/projects/tsa.vue')
-      },
-      {
-        path: '/' + ERouterName.Layer,
-        name: ERouterName.Layer,
-        component: () => import('/@/pages/project-app/projects/layer.vue')
-      },
-      {
-        path: '/' + ERouterName.Media,
-        name: ERouterName.Media,
-        component: () => import('/@/pages/project-app/projects/media.vue')
-      },
-      {
-        path: '/' + ERouterName.Wayline,
-        name: ERouterName.Wayline,
-        component: () => import('/@/pages/project-app/projects/wayline.vue')
-      },
-    ]
+    path: '/',
+    redirect: '/' + ERouterName.LOGIN
   },
+  // 首页 登陆页面
   {
-    path: '/' + ERouterName.Pilot,
-    name: ERouterName.Pilot,
-    component: () => import('/@/pages/page-pilot/pilot-index.vue'),
+    path: '/' + ERouterName.LOGIN,
+    name: ERouterName.LOGIN,
+    component: () => import('/@/pages/page-web/index.vue')
+  },
+  // members, devices
+  {
+    path: '/' + ERouterName.HOME,
+    name: ERouterName.HOME,
+    component: () => import('/@/pages/page-web/home.vue'),
     children: [
+      {
+        path: '/' + ERouterName.MEMBERS,
+        name: ERouterName.MEMBERS,
+        component: () => import('/@/pages/page-web/projects/members.vue')
+      },
+      {
+        path: '/' + ERouterName.DEVICES,
+        name: ERouterName.DEVICES,
+        component: () => import('/@/pages/page-web/projects/devices.vue')
+      },
+      // 项目列表
+      {
+        path: '/' + ERouterName.PROJECT,
+        name: ERouterName.PROJECT,
+        redirect: '/' + ERouterName.PROJECT_LIST,
+        component: () => import('/@/pages/page-web/projects/project_list/index.vue'),
+        children: [
+          {
+            path: '/' + ERouterName.PROJECT_LIST,
+            name: ERouterName.PROJECT_LIST,
+            component: () => import('/@/pages/page-web/projects/project_list/list_page/list.vue')
+          },
+          {
+            path: '/' + ERouterName.ADD_PROJECT,
+            name: ERouterName.ADD_PROJECT,
+            component: () => import('/@/pages/page-web/projects/project_list/add_page/add.vue')
+          },
+          {
+            path: '/' + ERouterName.EDIT_PROJECT,
+            name: ERouterName.EDIT_PROJECT,
+            component: () => import('/@/pages/page-web/projects/project_list/add_page/add.vue')
+          },
+          // workspace
+          {
+            path: '/' + ERouterName.WORKSPACE,
+            name: ERouterName.WORKSPACE,
+            component: () => import('/@/pages/page-web/projects/workspace.vue'),
+            redirect: '/' + ERouterName.TSA,
+            children: [
+              {
+                path: '/' + ERouterName.LIVESTREAM,
+                name: ERouterName.LIVESTREAM,
+                component: () => import('/@/pages/page-web/projects/livestream.vue'),
+                children: [
+                  {
+                    path: ERouterName.LIVING,
+                    name: ERouterName.LIVING,
+                    components: {
+                      LiveAgora,
+                      LiveOthers
+                    }
+                  }
+                ]
+              },
+              {
+                path: '/' + ERouterName.TSA,
+                component: () => import('/@/pages/page-web/projects/tsa.vue')
+              },
+              {
+                path: '/' + ERouterName.LAYER,
+                name: ERouterName.LAYER,
+                component: () => import('/@/pages/page-web/projects/layer.vue')
+              },
+              {
+                path: '/' + ERouterName.MEDIA,
+                name: ERouterName.MEDIA,
+                component: () => import('/@/pages/page-web/projects/media.vue')
+              },
+              {
+                path: '/' + ERouterName.WAYLINE,
+                name: ERouterName.WAYLINE,
+                component: () => import('/@/pages/page-web/projects/wayline.vue')
+              },
+              {
+                path: '/' + ERouterName.TASK,
+                name: ERouterName.TASK,
+                component: () => import('/@/pages/page-web/projects/task.vue'),
+                children: [
+                  {
+                    path: ERouterName.CREATE_PLAN,
+                    name: ERouterName.CREATE_PLAN,
+                    component: CreatePlan,
+                    children: [
+                      {
+                        path: ERouterName.SELECT_PLAN,
+                        name: ERouterName.SELECT_PLAN,
+                        components: {
+                          WaylinePanel,
+                          DockPanel
+                        }
+                      }
+                    ]
+                  }
 
+                ]
+              }
+            ],
+            meta: {
+              header: false
+            }
+          },
+        ]
+      },
+      {
+        path: '/' + ERouterName.FIRMWARES,
+        name: ERouterName.FIRMWARES,
+        component: () => import('../pages/page-web/projects/Firmwares.vue')
+      }
     ]
   },
+  // pilot
   {
-    path: '/' + ERouterName.PilotHome,
+    path: '/' + ERouterName.PILOT,
+    name: ERouterName.PILOT,
+    component: () => import('/@/pages/page-pilot/pilot-index.vue'),
+  },
+  {
+    path: '/' + ERouterName.PILOT_HOME,
     component: () => import('/@/pages/page-pilot/pilot-home.vue')
   },
   {
-    path: '/' + ERouterName.PilotMedia,
+    path: '/' + ERouterName.PILOT_MEDIA,
     component: () => import('/@/pages/page-pilot/pilot-media.vue')
   },
   {
-    path: '/' + ERouterName.PilotLiveshare,
+    path: '/' + ERouterName.PILOT_LIVESHARE,
     component: () => import('/@/pages/page-pilot/pilot-liveshare.vue')
   },
   {
-    path: '/' + ERouterName.Element,
-    name: ERouterName.Element,
-    component: () => import('/@/pages/elements/elements.vue')
+    path: '/' + ERouterName.PILOT_BIND,
+    component: () => import('/@/pages/page-pilot/pilot-bind.vue')
   }
 ]
 

--
Gitblit v1.9.3