From 18688e9d36b2d75efa79a9b0a7a8b1b44fdee6bd Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 01 十一月 2022 16:08:43 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master

---
 src/router/index.js |  140 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 99 insertions(+), 41 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index d1422bc..1987346 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -21,39 +21,82 @@
         component: () => import('@/views/systemSetting'),
         children: [
           {
-            path: "user",
-            name: "user",
-            component: () => import('@/views/systemSetting/baseSetting/user')
+            path: 'userSetting',
+            name: 'userSetting',
+            component: () => import('@/views/systemSetting/baseSetting'),
+            children: [
+              {
+                path: "user",
+                name: "user",
+                component: () => import('@/views/systemSetting/baseSetting/user')
+              },
+              {
+                path: 'role',
+                name: 'role',
+                component: () => import('@/views/systemSetting/baseSetting/role')
+              },
+              {
+                path: 'department',
+                name: 'department',
+                component: () => import('@/views/systemSetting/baseSetting/department')
+              },
+
+            ]
           },
           {
-            path: 'role',
-            name: 'role',
-            component: () => import('@/views/systemSetting/baseSetting/role')
+            path: 'platform',
+            name: 'platform',
+            component: () => import('@/views/systemSetting/platform'),
+            children: [
+              {
+                path: 'portalSetting',
+                name: 'portalSetting',
+                component: () => import('@/views/systemSetting/platform/portalSetting')
+              },
+              {
+                path: 'otherInterface',
+                name: 'otherInterface',
+                component: () => import('@/views/systemSetting/platform/otherInterface')
+              },
+              {
+                path: 'mySetting',
+                name: 'mySetting',
+                component: () => import('@/views/systemSetting/platform/mySetting')
+              }
+            ]
           },
           {
-            path: 'authority',
-            name: 'authority',
-            component: () => import('@/views/systemSetting/baseSetting/authority')
-          },
-          {
-            path: 'department',
-            name: 'department',
-            component: () => import('@/views/systemSetting/baseSetting/department')
-          },
-          {
-            path: 'portalSetting',
-            name: 'portalSetting',
-            component: () => import('@/views/systemSetting/platform/portalSetting')
-          },
-          {
-            path: 'otherInterface',
-            name: 'otherInterface',
-            component: () => import('@/views/systemSetting/platform/otherInterface')
-          },
-          {
-            path: 'mySetting',
-            name: 'mySetting',
-            component: () => import('@/views/systemSetting/platform/mySetting')
+            path: 'device',
+            name: 'device',
+            component: () => import('@/views/systemSetting/device'),
+            children: [
+              {
+                path: 'bayonet',
+                name: 'bayonet',
+                component: () => import('@/views/systemSetting/device/bayonet')
+              },
+              {
+                path: 'grid',
+                name: 'grid',
+                component: () => import('@/views/systemSetting/device/grid'),
+              },
+              {
+                path: 'point',
+                name: 'point',
+                component: () => import('@/views/systemSetting/device/point'),
+              },
+              {
+                path: 'handheldTerminal',
+                name: 'handheldTerminal',
+                component: () => import('@/views/systemSetting/device/handheldTerminal'),
+              }
+              ,
+              {
+                path: 'loudspeaker',
+                name: 'loudspeaker',
+                component: () => import('@/views/systemSetting/device/loudspeaker'),
+              }
+            ]
           }
         ]
       },
@@ -77,11 +120,6 @@
                 name: 'illegalBuild',
                 component: () => import('@/views/operate/baseSetting/illegalBuild'),
               },
-              {
-                path: "threepack",
-                name: 'threepack',
-                component: () => import('@/views/operate/baseSetting/threepack'),
-              }
             ]
           },
           {
@@ -175,7 +213,12 @@
                 path: 'myIndex',
                 name: 'myIndex',
                 component: () => import('@/views/operate/management/myIndex'),
-              }
+              },
+              {
+                path: 'managementMessage',
+                name: 'managementMessage',
+                component: () => import('@/views/operate/management/message'),
+              },
             ]
           },
           {
@@ -189,13 +232,13 @@
                 component: () => import('@/views/operate/car/myIndex'),
               },
               {
-                path:'lawTrajectory',
-                name:'lawTrajectory',
+                path: 'lawTrajectory',
+                name: 'lawTrajectory',
                 component: () => import('@/views/operate/car/lawCar'),
               },
               {
-                path:'soilTrajectory',
-                name:'soilTrajectory',
+                path: 'soilTrajectory',
+                name: 'soilTrajectory',
                 component: () => import('@/views/operate/car/soilCar'),
               }
             ]
@@ -211,11 +254,26 @@
                 component: () => import('@/views/operate/message/myIndex'),
               },
               {
-                path:'mycontrol',
-                name:'mycontrol',
+                path: 'mycontrol',
+                name: 'mycontrol',
                 component: () => import('@/views/operate/message/mycontrol'),
               },
             ]
+          },
+          {
+            path: 'log',
+            name: 'log',
+            component: () => import('@/views/operate/log'),
+          },
+          {
+            path: 'viewEvent',
+            name: 'viewEvent',
+            component: () => import('@/views/operate/viewEvent'),
+          },
+          {
+            path: 'images',
+            name: 'images',
+            component: () => import('@/views/operate/images'),
           }
         ]
       },

--
Gitblit v1.8.0