Merge remote-tracking branch 'origin/master'

zengh

2021-06-23 21e76a22fffcfcb82990c25ef2a9076ed55ae678

 src/router/views/index.js

@@ -311,6 +311,19 @@
                import ( /* webpackChunkName: "views" */ '@/views/article/article')
        }]
    }, {
        path: '/feedbackReport',
        component: Layout,
        redirect: '/feedbackReport/feedbackReport',
        children: [{
            path: 'feedbackReport',
            name: '取证上报',
            meta: {
                i18n: 'feedbackReport'
            },
            component: () =>
                import ( /* webpackChunkName: "views" */ '@/views/feedbackReport/feedbackReport')
        }]
    }, {
        path: '/alarm',
        component: Layout,
        redirect: '/alarm/alarmPage',