diff --git a/src/router/index.js b/src/router/index.js index 5540266a..0e81fa0f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -18,8 +18,8 @@ import Layout from '../views/layout/Layout' export const constantRouterMap = [ { path: '/login', component: _import('login/index'), hidden: true }, { path: '/authredirect', component: _import('login/authredirect'), hidden: true }, - { path: '/404', component: _import('error/404'), hidden: true }, - { path: '/401', component: _import('error/401'), hidden: true }, + { path: '/404', component: _import('errorPage/404'), hidden: true }, + { path: '/401', component: _import('errorPage/401'), hidden: true }, { path: '/', component: Layout, @@ -117,14 +117,14 @@ export const asyncRouterMap = [ ] }, { - path: '/errorpage', + path: '/error', component: Layout, redirect: 'noredirect', name: '错误页面', icon: '404', children: [ - { path: '401', component: _import('error/401'), name: '401' }, - { path: '404', component: _import('error/404'), name: '404' } + { path: '401', component: _import('errorPage/401'), name: '401' }, + { path: '404', component: _import('errorPage/404'), name: '404' } ] }, { @@ -139,12 +139,12 @@ export const asyncRouterMap = [ { path: '/excel', component: Layout, - redirect: 'noredirect', + redirect: '/excel/download', name: 'excel', icon: 'EXCEL', children: [ { path: 'download', component: _import('excel/index'), name: '导出excel' }, - { path: 'download2', component: _import('excel/selectExcel'), name: '选择导出excel' } + { path: 'download2', component: _import('excel/selectExcel'), name: '导出已选择项' } ] }, { diff --git a/src/views/error/401.vue b/src/views/errorPage/401.vue similarity index 99% rename from src/views/error/401.vue rename to src/views/errorPage/401.vue index ce281489..5e265287 100644 --- a/src/views/error/401.vue +++ b/src/views/errorPage/401.vue @@ -20,7 +20,6 @@ Girl has dropped her ice cream. - diff --git a/src/views/error/404.vue b/src/views/errorPage/404.vue similarity index 99% rename from src/views/error/404.vue rename to src/views/errorPage/404.vue index 5233d461..a8ab241d 100644 --- a/src/views/error/404.vue +++ b/src/views/errorPage/404.vue @@ -225,5 +225,4 @@ export default { } } } - diff --git a/src/views/example/tab/components/tabPane.vue b/src/views/example/tab/components/tabPane.vue index 74925eef..cd2f55e1 100644 --- a/src/views/example/tab/components/tabPane.vue +++ b/src/views/example/tab/components/tabPane.vue @@ -28,7 +28,7 @@ @@ -51,7 +51,6 @@ import { fetchList } from 'api/article_table' export default { - name: 'articleDetail', props: { type: { type: String, @@ -61,7 +60,6 @@ export default { data() { return { list: null, - total: null, listQuery: { page: 1, limit: 5, @@ -86,10 +84,8 @@ export default { methods: { getList() { this.$emit('create') // for test - fetchList(this.listQuery).then(response => { this.list = response.data.items - this.total = response.data.total }) } } diff --git a/src/views/example/tab/index.vue b/src/views/example/tab/index.vue index 72661059..4b69d7c8 100644 --- a/src/views/example/tab/index.vue +++ b/src/views/example/tab/index.vue @@ -20,10 +20,10 @@ export default { data() { return { tabMapOptions: [ - { label: '中国', key: 'CN' }, - { label: '美国', key: 'US' }, - { label: '日本', key: 'JP' }, - { label: '欧元区', key: 'EU' } + { label: '中国', key: 'CN' }, + { label: '美国', key: 'US' }, + { label: '日本', key: 'JP' }, + { label: '欧元区', key: 'EU' } ], activeName: 'CN', createdTimes: 0 diff --git a/src/views/excel/index.vue b/src/views/excel/index.vue index 3023e24d..cab49c9c 100644 --- a/src/views/excel/index.vue +++ b/src/views/excel/index.vue @@ -1,6 +1,6 @@