From 6de8b8a3e3790b874045d20b77bb7aa71dcdfb37 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 29 Jun 2021 08:17:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity

---
 src/router/views/index.js |   43 +++++++++++++++++++++++++++++--------------
 1 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/router/views/index.js b/src/router/views/index.js
index c8f1e00..d681fc3 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -11,7 +11,7 @@
                 i18n: 'dashboard'
             },
             component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/alarmManagement/alarmAnalysis')
+                import ( /* webpackChunkName: "views" */ '@/views/realTimePolice/real')
         }]
     },
 
@@ -300,9 +300,9 @@
     }, {
         path: '/article',
         component: Layout,
-        redirect: '/article/article',
+        redirect: '/article/index',
         children: [{
-            path: 'article',
+            path: 'index',
             name: '资讯管理',
             meta: {
                 i18n: 'article'
@@ -313,9 +313,9 @@
     }, {
         path: '/feedbackReport',
         component: Layout,
-        redirect: '/feedbackReport/feedbackReport',
+        redirect: '/feedbackReport/index',
         children: [{
-            path: 'feedbackReport',
+            path: 'index',
             name: '取证上报',
             meta: {
                 i18n: 'feedbackReport'
@@ -323,7 +323,22 @@
             component: () =>
                 import ( /* webpackChunkName: "views" */ '@/views/feedbackReport/feedbackReport')
         }]
-    }, {
+    },
+  {
+    path: '/chatgroup',
+    component: Layout,
+    redirect: 'chatgroup',
+    children: [{
+      path: 'index',
+      name: '群管理',
+      meta: {
+        i18n: 'chatgroup'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/chatrg/chatgroup')
+    }]
+  },
+  {
         path: '/alarm',
         component: Layout,
         redirect: '/alarm/alarmPage',
@@ -391,10 +406,10 @@
     },
     {
         path: '/patrolManagement',
-        redirect: '/policeInformationDistribution/patrolManagement',
+        redirect: '/policeInformationDistribution/index',
         component: Layout,
         children: [{
-            path: 'patrolManagement',
+            path: 'index',
             name: '巡逻管理',
             meta: {
                 i18n: 'policeInformationDistribution'
@@ -403,17 +418,17 @@
                 import ( /* webpackChunkName: "views" */ '@/views/policeInformationDistribution/patrolManagement')
         }]
     }, {
-        path: '/policeInformationDistribution',
-        redirect: '/policeInformationDistribution/policeManagementTeam',
+        path: '/security',
+        redirect: '/security/index',
         component: Layout,
         children: [{
-            path: 'policeManagementTeam',
-            name: '处警队伍管理',
+            path: 'index',
+            name: '保安管理',
             meta: {
                 i18n: 'policeInformationDistribution'
             },
             component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/policeInformationDistribution/policeManagementTeam')
+                import ( /* webpackChunkName: "views" */ '@/views/security/security')
         }]
     }, {
         path: '/report',
@@ -460,4 +475,4 @@
 
 
 
-]
\ No newline at end of file
+]

--
Gitblit v1.9.3