zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13 from yangbit/master 

fix: fix case sensitivity on Linux
This commit is contained in:
Pan 2017-04-27 15:20:24 +08:00 committed by GitHub
parent 168150ff20 b112c6c86d
commit bc2955bb11
2 changed files with 133 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/components/Charts/linemarker.vue → src/components/Charts/lineMarker.vue
View File

34
src/router/index.js
View File

@ -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);
@ -79,16 +79,14 @@ export default new Router({
{ 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: '/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',
@ -98,8 +96,7 @@ export default new Router({
children: [
{ path: 'index', component: Introduction, name: '简述' }
]
},
{
}, {
path: '/permission',
component: Layout,
redirect: '/permission/index',
@ -110,8 +107,7 @@ export default new Router({
children: [
{ path: 'index', component: Permission, name: '权限测试页', meta: { role: ['admin'] } }
]
},
{
}, {
path: '/components',
component: Layout,
redirect: '/components/index',
@ -130,8 +126,7 @@ export default new Router({
{ path: 'countto', component: CountTo, name: 'CountTo' },
{ path: 'mixin', component: Mixin, name: '小组件' }
]
},
{
}, {
path: '/charts',
component: Layout,
redirect: '/charts/index',
@ -144,8 +139,7 @@ export default new Router({
{ path: 'line', component: LineMarker, name: '折线图' },
{ path: 'mixchart', component: MixChart, name: '混合图表' }
]
},
{
}, {
path: '/errorpage',
component: Layout,
redirect: 'noredirect',
@ -155,8 +149,7 @@ export default new Router({
{ path: '401', component: Err401, name: '401' },
{ path: '404', component: Err404, name: '404' }
]
},
{
}, {
path: '/errlog',
component: Layout,
redirect: 'noredirect',
@ -166,8 +159,7 @@ export default new Router({
children: [
{ path: 'log', component: ErrorLog, name: '错误日志' }
]
},
{
}, {
path: '/excel',
component: Layout,
redirect: 'noredirect',
@ -177,8 +169,7 @@ export default new Router({
children: [
{ path: 'download', component: ExcelDownload, name: '导出excel' }
]
},
{
}, {
path: '/theme',
component: Layout,
redirect: 'noredirect',
@ -188,8 +179,7 @@ export default new Router({
children: [
{ path: 'index', component: Theme, name: '换肤' }
]
},
{
}, {
path: '/example',
component: Layout,
redirect: 'noredirect',