From 1584bd8398cf7aa044df53605261e84f895d949f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 02 Apr 2021 12:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/router/views/index.js |  586 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 317 insertions(+), 269 deletions(-)

diff --git a/src/router/views/index.js b/src/router/views/index.js
index 1426f66..3014528 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1,280 +1,328 @@
 import Layout from '@/page/index/'
 
 export default [{
-        path: '/wel',
-        component: Layout,
-        redirect: '/wel/index',
-        children: [{
-            path: 'index',
-            name: '首页',
-            meta: {
-                i18n: 'dashboard'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/home/home')
-        }, {
-            path: 'dashboard',
-            name: '控制台',
-            meta: {
-                i18n: 'dashboard',
-                menu: false,
-            },
-            component: () =>
-                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',
-            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/index',
-        children: [{
-            path: 'index',
-            name: '实时报警',
-            meta: {
-                i18n: 'real'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/realTimePolice/real')
-        }]
-    },
-    {
-        path: '/attendance',
-        component: Layout,
-        redirect: '/attendance/attendance',
-        children: [{
-            path: 'index',
-            name: '考勤管理',
-            meta: {
-                i18n: 'attendance'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/attendance/attendance')
-        }]
-    },
-    {
-        path: '/clientManagement',
-        component: Layout,
-        redirect: '/clientManagement/clientManagement',
-        children: [{
+    path: '/wel',
+    component: Layout,
+    redirect: '/wel/index',
+    children: [{
+      path: 'index',
+      name: '首页',
+      meta: {
+        i18n: 'dashboard'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/data')
+    }]
+  },
 
-            path: 'index',
-            name: '设备管理',
-            meta: {
-                i18n: 'clientManagement'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/clientManagement/clientManagement')
-        }]
-    },
-    {
-        path: '/suser',
-        component: Layout,
-        redirect: '/suser/suser',
-        children: [{
-            path: 'index',
-            name: '客户管理',
-            meta: {
-                i18n: 'suser'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/suser/suser')
-        }]
+  // {
+  //     path: '/wel',
+  //     component: Layout,
+  //     redirect: '/wel/index',
+  //     children: [{
+  //         path: 'index',
+  //         name: '首页',
+  //         meta: {
+  //             i18n: 'dashboard'
+  //         },
+  //         component: () =>
+  //             import ( /* webpackChunkName: "views" */ '@/views/home/home')
+  //     }, {
+  //         path: 'dashboard',
+  //         name: '控制台',
+  //         meta: {
+  //             i18n: 'dashboard',
+  //             menu: false,
+  //         },
+  //         component: () =>
+  //             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',
+      name: '视频',
+      meta: {
+        i18n: 'real'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/Video/video')
     }, {
-        path: '/policeTracking',
-        component: Layout,
-        redirect: '/policeTracking/track',
-        children: [{
-            path: 'track',
-            name: '警情追踪',
-            meta: {
-                i18n: 'track'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/policeTracking/policeTracking')
-        }]
+      path: 'history/:historyId',
+      name: '设备历史',
+      meta: {
+        i18n: 'real'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/realTimePolice/realHistory')
+    }]
+  },
+  {
+    path: '/welcomeData',
+    component: Layout,
+    redirect: '/welcomeData/data',
+    children: [{
+      path: 'data',
+      name: '数据模式',
+      meta: {
+        i18n: 'data'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/data')
     }, {
-        path: '/healthcode',
-        component: Layout,
-        redirect: '/healthcode/healthcodePage',
-        children: [{
-            path: 'healthcodePage',
-            name: '健康码',
-            meta: {
-                i18n: 'healthcode'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/healthcode/healthcode')
-        }]
+      path: 'map',
+      name: '地图模式',
+      meta: {
+        i18n: 'map'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/map')
     }, {
-        path: '/animalHeat',
-        component: Layout,
-        redirect: '/animalHeat/animalHeatPage',
-        children: [{
-            path: 'animalHeatPage',
-            name: '体温检测',
-            meta: {
-                i18n: 'animalHeat'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/animalHeat/animalHeat')
-        }]
+      path: 'card',
+      name: '卡片模式',
+      meta: {
+        i18n: 'card'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/card')
+    }]
+  },
+
+  {
+    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: '/alarm',
-        component: Layout,
-        redirect: '/alarm/alarmPage',
-        children: [{
-            path: 'alarmPage',
-            name: '实时警情',
-            meta: {
-                i18n: 'alarm'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/alarm/alarm')
-        }]
+      path: 'handle/:taskId/:processInstanceId/:businessId',
+      name: '处理请假流程',
+      meta: {
+        i18n: 'work'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
     }, {
-        path: '/parcel',
-        component: Layout,
-        redirect: '/parcel/index',
-        children: [{
-            path: 'index',
-            name: '安检包裹',
-            meta: {
-                i18n: 'parcel'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/parcel/parcel')
-        }]
-    }, {
-        path: '/parcelKind',
-        component: Layout,
-        redirect: '/parcelKind/index',
-        children: [{
-            path: 'index',
-            name: '违禁品',
-            meta: {
-                i18n: 'parcelKind'
-            },
-            component: () =>
-                import ( /* webpackChunkName: "views" */ '@/views/parcel/parcelKind')
-        }]
-    }
+      path: 'detail/:processInstanceId/:businessId',
+      name: '请假流程详情',
+      meta: {
+        i18n: 'work'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
+    }]
+  },
+  {
+    path: '/realTimePolice',
+    component: Layout,
+    redirect: '/realTimePolice/index',
+    children: [{
+      path: 'index',
+      name: '实时报警',
+      meta: {
+        i18n: 'real'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/realTimePolice/real')
+    }]
+  },
+  {
+    path: '/attendance',
+    component: Layout,
+    redirect: '/attendance/attendance',
+    children: [{
+      path: 'index',
+      name: '考勤管理',
+      meta: {
+        i18n: 'attendance'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/attendance/attendance')
+    }]
+  },
+  {
+    path: '/clientManagement',
+    component: Layout,
+    redirect: '/clientManagement/clientManagement',
+    children: [{
+
+      path: 'index',
+      name: '设备管理',
+      meta: {
+        i18n: 'clientManagement'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/clientManagement/clientManagement')
+    }]
+  },
+  {
+    path: '/suser',
+    component: Layout,
+    redirect: '/suser/suser',
+    children: [{
+      path: 'index',
+      name: '客户管理',
+      meta: {
+        i18n: 'suser'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/suser/suser')
+    }]
+  }, {
+    path: '/policeTracking',
+    component: Layout,
+    redirect: '/policeTracking/track',
+    children: [{
+      path: 'track',
+      name: '警情追踪',
+      meta: {
+        i18n: 'track'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/policeTracking/policeTracking')
+    }]
+  }, {
+    path: '/healthcode',
+    component: Layout,
+    redirect: '/healthcode/healthcodePage',
+    children: [{
+      path: 'healthcodePage',
+      name: '健康码',
+      meta: {
+        i18n: 'healthcode'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/healthcode/healthcode')
+    }]
+  }, {
+    path: '/animalHeat',
+    component: Layout,
+    redirect: '/animalHeat/animalHeatPage',
+    children: [{
+      path: 'animalHeatPage',
+      name: '体温检测',
+      meta: {
+        i18n: 'animalHeat'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/animalHeat/animalHeat')
+    }]
+  }, {
+    path: '/alarm',
+    component: Layout,
+    redirect: '/alarm/alarmPage',
+    children: [{
+      path: 'alarmPage',
+      name: '实时警情',
+      meta: {
+        i18n: 'alarm'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/alarm/alarm')
+    }]
+  }, {
+    path: '/parcel',
+    component: Layout,
+    redirect: '/parcel/index',
+    children: [{
+      path: 'index',
+      name: '安检包裹',
+      meta: {
+        i18n: 'parcel'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/parcel/parcel')
+    }]
+  }, {
+    path: '/parcelKind',
+    component: Layout,
+    redirect: '/parcelKind/index',
+    children: [{
+      path: 'index',
+      name: '违禁品',
+      meta: {
+        i18n: 'parcelKind'
+      },
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/parcel/parcelKind')
+    }]
+  }
 
 
-]
\ No newline at end of file
+]

--
Gitblit v1.9.3