From 92005c9d1c4e6cb475c09639afc3c3c7c6cf968a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 09 Mar 2021 10:17:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

---
 src/router/views/index.js |  315 ++++++++++++++++++++++++++--------------------------
 1 files changed, 157 insertions(+), 158 deletions(-)

diff --git a/src/router/views/index.js b/src/router/views/index.js
index fc6c3b1..5605128 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -23,163 +23,162 @@
       import( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
   }]
 },
-{
-  path: '/distribution',
-  component: Layout,
-  redirect: '/distribution/index',
-  children: [{
-    path: 'index',
-    name: '警情分发处置',
-    meta: {
-      i18n: 'distribution'
-    },
-    component: () =>
-      import( /* webpackChunkName: "views" */ '@/views/distribution/index')
-  }]
-},
-{
-  path: '/test',
-  component: Layout,
-  redirect: '/test/index',
-  children: [{
-    path: 'index',
-    name: '测试页',
-    meta: {
-      i18n: 'test'
-    },
-    component: () =>
-      import( /* webpackChunkName: "views" */ '@/views/util/test')
-  }]
-}, {
-  path: '/dict-horizontal',
-  component: Layout,
-  redirect: '/dict-horizontal/index',
-  children: [{
-    path: 'index',
-    name: '字典管理',
-    meta: {
-      i18n: 'dict'
-    },
-    component: () =>
-      import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
-  }]
-}, {
-  path: '/dict-vertical',
-  component: Layout,
-  redirect: '/dict-vertical/index',
-  children: [{
-    path: 'index',
-    name: '字典管理',
-    meta: {
-      i18n: 'dict'
-    },
-    component: () =>
-      import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
-  }]
-}, {
-  path: '/info',
-  component: Layout,
-  redirect: '/info/index',
-  children: [{
-    path: 'index',
-    name: '个人信息',
-    meta: {
-      i18n: 'info'
-    },
-    component: () =>
-      import( /* webpackChunkName: "views" */ '@/views/system/userinfo')
-  }]
-}, {
-  path: '/real',
-  component: Layout,
-  redirect: '/real/video',
-  children: [{
-    path: 'video/:channelNumber/:serialNumber',
-    name: '视频',
-    meta: {
-      i18n: 'real'
-    },
-    component: () =>
-      import( /* webpackChunkName: "views" */ '@/views/Video/video')
-  }
-    , {
-    path: 'history/:historyId',
-    name: '设备历史',
-    meta: {
-      i18n: 'real'
-    },
-    component: () =>
-      import( /* webpackChunkName: "views" */ '@/views/realTimePolice/realHistory')
-  }]
-}, {
-  path: '/work/process/leave',
-  component: Layout,
-  redirect: '/work/process/leave/form',
-  children: [{
-    path: 'form/:processDefinitionId',
-    name: '请假流程',
-    meta: {
-      i18n: 'work'
-    },
-    component: () =>
-      import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
-  }, {
-    path: 'handle/:taskId/:processInstanceId/:businessId',
-    name: '处理请假流程',
-    meta: {
-      i18n: 'work'
-    },
-    component: () =>
-      import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
-  }, {
-    path: 'detail/:processInstanceId/:businessId',
-    name: '请假流程详情',
-    meta: {
-      i18n: 'work'
-    },
-    component: () =>
-      import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
-  }]
-},
-{
-  path: '/realTimePolice',
-  component: Layout,
-  redirect: '/realTimePolice/real',
-  children: [{
-    path: 'index',
-    name: '实时报警',
-    meta: {
-      i18n: 'real'
-    },
-    component: () =>
-      import( /* webpackChunkName: "views" */ '@/views/realTimePolice/real')
-  }]
-},
-{
-  path: '/clientManagement',
-  component: Layout,
-  redirect: '/clientManagement/clientManagement',
-  children: [{
-    path: 'index',
-    name: '客户管理',
-    meta: {
-      i18n: 'clientManagement'
-    },
-    component: () =>
-      import( /* webpackChunkName: "views" */ '@/views/clientManagement/clientManagement')
-  }]
-},
-{
-  path: '/attendance',
+  {
+    path: '/distribution',
     component: Layout,
-  redirect: '/attendance/attendance',
-  children: [{
-  path: 'index',
-  name: '考勤管理',
-  meta: {
-    i18n: 'attendance'
+    redirect: '/distribution/index',
+    children: [{
+      path: 'index',
+      name: '警情分发处置',
+      meta: {
+        i18n: 'distribution'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/distribution/index')
+    }]
   },
-  component: () =>
-    import( /* webpackChunkName: "views" */ '@/views/attendance/attendance')
-}]
-}]
+  {
+    path: '/test',
+    component: Layout,
+    redirect: '/test/index',
+    children: [{
+      path: 'index',
+      name: '测试页',
+      meta: {
+        i18n: 'test'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/util/test')
+    }]
+  }, {
+    path: '/dict-horizontal',
+    component: Layout,
+    redirect: '/dict-horizontal/index',
+    children: [{
+      path: 'index',
+      name: '字典管理',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
+    }]
+  }, {
+    path: '/dict-vertical',
+    component: Layout,
+    redirect: '/dict-vertical/index',
+    children: [{
+      path: 'index',
+      name: '字典管理',
+      meta: {
+        i18n: 'dict'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
+    }]
+  }, {
+    path: '/info',
+    component: Layout,
+    redirect: '/info/index',
+    children: [{
+      path: 'index',
+      name: '个人信息',
+      meta: {
+        i18n: 'info'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/system/userinfo')
+    }]
+  }, {
+    path: '/real',
+    component: Layout,
+    redirect: '/real/video',
+    children: [{
+      path: 'video',
+      name: '视频',
+      meta: {
+        i18n: 'real'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/Video/video')
+    }
+      , {
+        path: 'history/:historyId',
+        name: '设备历史',
+        meta: {
+          i18n: 'real'
+        },
+        component: () =>
+          import( /* webpackChunkName: "views" */ '@/views/realTimePolice/realHistory')
+      }]
+  }, {
+    path: '/policeTracking',
+    component: Layout,
+    redirect: '/policeTracking/track',
+    children: [{
+      path: 'track',
+      name: '警情追踪',
+      meta: {
+        i18n: 'track'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/policeTracking/policeTracking')
+    }]
+  }, {
+    path: '/work/process/leave',
+    component: Layout,
+    redirect: '/work/process/leave/form',
+    children: [{
+      path: 'form/:processDefinitionId',
+      name: '请假流程',
+      meta: {
+        i18n: 'work'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
+    }, {
+      path: 'handle/:taskId/:processInstanceId/:businessId',
+      name: '处理请假流程',
+      meta: {
+        i18n: 'work'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
+    }, {
+      path: 'detail/:processInstanceId/:businessId',
+      name: '请假流程详情',
+      meta: {
+        i18n: 'work'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
+    }]
+  },
+  {
+    path: '/realTimePolice',
+    component: Layout,
+    redirect: '/realTimePolice/real',
+    children: [{
+      path: 'index',
+      name: '实时报警',
+      meta: {
+        i18n: 'real'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/realTimePolice/real')
+    }]
+  },
+  {
+    path: '/clientManagement',
+    component: Layout,
+    redirect: '/clientManagement/clientManagement',
+    children: [{
+      path: 'index',
+      name: '客户管理',
+      meta: {
+        i18n: 'clientManagement'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/clientManagement/clientManagement')
+    }]
+  }]

--
Gitblit v1.9.3