Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity

tangzy

2021-06-29 6de8b8a3e3790b874045d20b77bb7aa71dcdfb37

 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'
@@ -406,10 +406,10 @@
    },
    {
        path: '/patrolManagement',
        redirect: '/policeInformationDistribution/patrolManagement',
        redirect: '/policeInformationDistribution/index',
        component: Layout,
        children: [{
            path: 'patrolManagement',
            path: 'index',
            name: '巡逻管理',
            meta: {
                i18n: 'policeInformationDistribution'
@@ -418,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',