diff --git a/src/components/Charts/linemarker.vue b/src/components/Charts/lineMarker.vue
similarity index 100%
rename from src/components/Charts/linemarker.vue
rename to src/components/Charts/lineMarker.vue
diff --git a/src/router/index.js b/src/router/index.js
index a1eb1023..da42eb92 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -26,11 +26,11 @@ const Tinymce = resolve => require(['../views/components/tinymce'], resolve);
const Markdown = resolve => require(['../views/components/markdown'], resolve);
const JsonEditor = resolve => require(['../views/components/jsoneditor'], resolve);
const DndList = resolve => require(['../views/components/dndlist'], resolve);
-const AvatarUpload = resolve => require(['../views/components/avatarupload'], resolve);
+const AvatarUpload = resolve => require(['../views/components/avatarUpload'], resolve);
const Dropzone = resolve => require(['../views/components/dropzone'], resolve);
const Sticky = resolve => require(['../views/components/sticky'], resolve);
const SplitPane = resolve => require(['../views/components/splitpane'], resolve);
-const CountTo = resolve => require(['../views/components/countto'], resolve);
+const CountTo = resolve => require(['../views/components/countTo'], resolve);
const Mixin = resolve => require(['../views/components/mixin'], resolve);
@@ -71,150 +71,140 @@ const Permission = resolve => require(['../views/permission/index'], resolve);
Vue.use(Router);
export default new Router({
- // mode: 'history', //后端支持可开
- scrollBehavior: () => ({ y: 0 }),
- routes: [
+ // mode: 'history', //后端支持可开
+ scrollBehavior: () => ({ y: 0 }),
+ routes: [
{ path: '/login', component: Login, hidden: true },
{ path: '/authredirect', component: authRedirect, hidden: true },
{ path: '/sendpwd', component: sendPWD, hidden: true },
{ path: '/reset', component: reset, hidden: true },
{ path: '/404', component: Err404, hidden: true },
- { path: '/401', component: Err401, hidden: true },
- {
- path: '/',
- component: Layout,
- redirect: '/dashboard',
- name: '首页',
- hidden: true,
- children: [{ path: 'dashboard', component: dashboard }]
- },
- {
- path: '/introduction',
- component: Layout,
- redirect: '/introduction/index',
- name: '简述',
- icon: 'xinrenzhinan',
- noDropdown: true,
- children: [
- { path: 'index', component: Introduction, name: '简述' }
- ]
- },
- {
- path: '/permission',
- component: Layout,
- redirect: '/permission/index',
- name: '权限测试',
- icon: 'quanxian',
- meta: { role: ['admin'] },
- noDropdown: true,
- children: [
- { path: 'index', component: Permission, name: '权限测试页', meta: { role: ['admin'] } }
- ]
- },
- {
- path: '/components',
- component: Layout,
- redirect: '/components/index',
- name: '组件',
- icon: 'zujian',
- children: [
- { path: 'index', component: componentsIndex, name: '介绍 ' },
- { path: 'tinymce', component: Tinymce, name: '富文本编辑器' },
- { path: 'markdown', component: Markdown, name: 'Markdown' },
- { path: 'jsoneditor', component: JsonEditor, name: 'JSON编辑器' },
- { path: 'dndlist', component: DndList, name: '列表拖拽' },
- { path: 'splitpane', component: SplitPane, name: 'SplitPane' },
- { path: 'avatarupload', component: AvatarUpload, name: '头像上传' },
- { path: 'dropzone', component: Dropzone, name: 'Dropzone' },
- { path: 'sticky', component: Sticky, name: 'Sticky' },
- { path: 'countto', component: CountTo, name: 'CountTo' },
- { path: 'mixin', component: Mixin, name: '小组件' }
- ]
- },
- {
- path: '/charts',
- component: Layout,
- redirect: '/charts/index',
- name: '图表',
- icon: 'tubiaoleixingzhengchang',
- children: [
- { path: 'index', component: chartIndex, name: '介绍' },
- { path: 'keyboard', component: KeyboardChart, name: '键盘图表' },
- { path: 'keyboard2', component: KeyboardChart2, name: '键盘图表2' },
- { path: 'line', component: LineMarker, name: '折线图' },
- { path: 'mixchart', component: MixChart, name: '混合图表' }
- ]
- },
- {
- path: '/errorpage',
- component: Layout,
- redirect: 'noredirect',
- name: '错误页面',
- icon: '404',
- children: [
- { path: '401', component: Err401, name: '401' },
- { path: '404', component: Err404, name: '404' }
- ]
- },
- {
- path: '/errlog',
- component: Layout,
- redirect: 'noredirect',
- name: 'errlog',
- icon: 'bug',
- noDropdown: true,
- children: [
- { path: 'log', component: ErrorLog, name: '错误日志' }
- ]
- },
- {
- path: '/excel',
- component: Layout,
- redirect: 'noredirect',
- name: 'excel',
- icon: 'EXCEL',
- noDropdown: true,
- children: [
- { path: 'download', component: ExcelDownload, name: '导出excel' }
- ]
- },
- {
- path: '/theme',
- component: Layout,
- redirect: 'noredirect',
- name: 'theme',
- icon: 'theme',
- noDropdown: true,
- children: [
- { path: 'index', component: Theme, name: '换肤' }
- ]
- },
- {
- path: '/example',
- component: Layout,
- redirect: 'noredirect',
- name: '综合实例',
- icon: 'zonghe',
- children: [
- { path: 'dynamictable', component: DynamicTable, name: '动态table' },
- { path: 'table', component: Table, name: '综合table' },
- { path: 'form1', component: Form1, name: '综合form1' }
- // { path: 'form2', component: Form2, name: '综合form2' }
- ]
- },
- // {
- // path: '/admin',
- // component: Layout,
- // redirect: 'noredirect',
- // name: '后台管理',
- // icon: 'geren1',
- // children: [
- // { path: 'createuser', component: AdminCreateUser, name: '管理员', meta: { role: ['admin'] } },
- // { path: 'list', component: UsersList, name: '后台用户列表', meta: { role: ['super_editor', 'product', 'author_assistant'] } },
- // { path: 'qicklyCreate', component: QuicklyCreateUser, name: '一键创建账户', meta: { role: ['super_editor', 'gold_editor', 'weex_editor', 'wscn_editor', 'author_assistant', 'product'] } },
- // { path: 'profile', component: UserProfile, name: '个人' }
- // ]
- // },
- { path: '*', redirect: '/404', hidden: true }
- ]
+ { path: '/401', component: Err401, hidden: true }, {
+ path: '/',
+ component: Layout,
+ redirect: '/dashboard',
+ name: '首页',
+ hidden: true,
+ children: [{ path: 'dashboard', component: dashboard }]
+ }, {
+ path: '/introduction',
+ component: Layout,
+ redirect: '/introduction/index',
+ name: '简述',
+ icon: 'xinrenzhinan',
+ noDropdown: true,
+ children: [
+ { path: 'index', component: Introduction, name: '简述' }
+ ]
+ }, {
+ path: '/permission',
+ component: Layout,
+ redirect: '/permission/index',
+ name: '权限测试',
+ icon: 'quanxian',
+ meta: { role: ['admin'] },
+ noDropdown: true,
+ children: [
+ { path: 'index', component: Permission, name: '权限测试页', meta: { role: ['admin'] } }
+ ]
+ }, {
+ path: '/components',
+ component: Layout,
+ redirect: '/components/index',
+ name: '组件',
+ icon: 'zujian',
+ children: [
+ { path: 'index', component: componentsIndex, name: '介绍 ' },
+ { path: 'tinymce', component: Tinymce, name: '富文本编辑器' },
+ { path: 'markdown', component: Markdown, name: 'Markdown' },
+ { path: 'jsoneditor', component: JsonEditor, name: 'JSON编辑器' },
+ { path: 'dndlist', component: DndList, name: '列表拖拽' },
+ { path: 'splitpane', component: SplitPane, name: 'SplitPane' },
+ { path: 'avatarupload', component: AvatarUpload, name: '头像上传' },
+ { path: 'dropzone', component: Dropzone, name: 'Dropzone' },
+ { path: 'sticky', component: Sticky, name: 'Sticky' },
+ { path: 'countto', component: CountTo, name: 'CountTo' },
+ { path: 'mixin', component: Mixin, name: '小组件' }
+ ]
+ }, {
+ path: '/charts',
+ component: Layout,
+ redirect: '/charts/index',
+ name: '图表',
+ icon: 'tubiaoleixingzhengchang',
+ children: [
+ { path: 'index', component: chartIndex, name: '介绍' },
+ { path: 'keyboard', component: KeyboardChart, name: '键盘图表' },
+ { path: 'keyboard2', component: KeyboardChart2, name: '键盘图表2' },
+ { path: 'line', component: LineMarker, name: '折线图' },
+ { path: 'mixchart', component: MixChart, name: '混合图表' }
+ ]
+ }, {
+ path: '/errorpage',
+ component: Layout,
+ redirect: 'noredirect',
+ name: '错误页面',
+ icon: '404',
+ children: [
+ { path: '401', component: Err401, name: '401' },
+ { path: '404', component: Err404, name: '404' }
+ ]
+ }, {
+ path: '/errlog',
+ component: Layout,
+ redirect: 'noredirect',
+ name: 'errlog',
+ icon: 'bug',
+ noDropdown: true,
+ children: [
+ { path: 'log', component: ErrorLog, name: '错误日志' }
+ ]
+ }, {
+ path: '/excel',
+ component: Layout,
+ redirect: 'noredirect',
+ name: 'excel',
+ icon: 'EXCEL',
+ noDropdown: true,
+ children: [
+ { path: 'download', component: ExcelDownload, name: '导出excel' }
+ ]
+ }, {
+ path: '/theme',
+ component: Layout,
+ redirect: 'noredirect',
+ name: 'theme',
+ icon: 'theme',
+ noDropdown: true,
+ children: [
+ { path: 'index', component: Theme, name: '换肤' }
+ ]
+ }, {
+ path: '/example',
+ component: Layout,
+ redirect: 'noredirect',
+ name: '综合实例',
+ icon: 'zonghe',
+ children: [
+ { path: 'dynamictable', component: DynamicTable, name: '动态table' },
+ { path: 'table', component: Table, name: '综合table' },
+ { path: 'form1', component: Form1, name: '综合form1' }
+ // { path: 'form2', component: Form2, name: '综合form2' }
+ ]
+ },
+ // {
+ // path: '/admin',
+ // component: Layout,
+ // redirect: 'noredirect',
+ // name: '后台管理',
+ // icon: 'geren1',
+ // children: [
+ // { path: 'createuser', component: AdminCreateUser, name: '管理员', meta: { role: ['admin'] } },
+ // { path: 'list', component: UsersList, name: '后台用户列表', meta: { role: ['super_editor', 'product', 'author_assistant'] } },
+ // { path: 'qicklyCreate', component: QuicklyCreateUser, name: '一键创建账户', meta: { role: ['super_editor', 'gold_editor', 'weex_editor', 'wscn_editor', 'author_assistant', 'product'] } },
+ // { path: 'profile', component: UserProfile, name: '个人' }
+ // ]
+ // },
+ { path: '*', redirect: '/404', hidden: true }
+ ]
});