Skip to content

Commit

Permalink
路由调整
Browse files Browse the repository at this point in the history
  • Loading branch information
daxiongYang committed Apr 26, 2018
1 parent 1903dc7 commit 397d56f
Show file tree
Hide file tree
Showing 19 changed files with 27 additions and 26 deletions.
8 changes: 4 additions & 4 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ var env = ''; // 运行环境
(function () {
var d = new Date();
var yy = d.getFullYear().toString().slice(2);
var MM = d.getMonth() + 1 >= 10 ? (d.getMonth() + 1) : '0' + (d.getMonth() + 1)
var dd = d.getDate() >= 10 ? d.getDate() : '0' + d.getDate()
var HH = d.getHours() >= 10 ? d.getHours() : '0' + d.getHours()
var MM = d.getMinutes() >= 10 ? d.getMinutes() : '0' + d.getMinutes()
var MM = d.getMonth() + 1 >= 10 ? (d.getMonth() + 1) : '0' + (d.getMonth() + 1);
var dd = d.getDate() >= 10 ? d.getDate() : '0' + d.getDate();
var HH = d.getHours() >= 10 ? d.getHours() : '0' + d.getHours();
var MM = d.getMinutes() >= 10 ? d.getMinutes() : '0' + d.getMinutes();
version = yy + MM + dd + HH + MM;
versionPath = distPath + '/' + version;
})();
Expand Down
17 changes: 9 additions & 8 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import Vue from 'vue'
import router from '@/router'
import store from '@/store'
import VueCookie from 'vue-cookie'

import App from '@/App'
import router from '@/router' // api: https://github.com/vuejs/vue-router
import store from '@/store' // api: https://github.com/vuejs/vuex
import VueCookie from 'vue-cookie' // api: https://github.com/alfhen/vue-cookie
import '@/element-ui' // api: https://github.com/ElemeFE/element
import '@/icons' // api: http://www.iconfont.cn/

import '@/element-ui'
import '@/icons'
import '@/assets/scss/index.scss'

import http from '@/utils/http'
import { isAuth } from '@/utils'

Vue.use(VueCookie)
Vue.config.productionTip = false

// 非生产环境, 适配mockjs模拟数据. api: https://github.com/nuysoft/Mock
// 非生产环境, 适配mockjs模拟数据
if (process.env.NODE_ENV !== 'production') {
require('@/mock')
}
Expand Down
12 changes: 6 additions & 6 deletions src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ export default new Router({
// 通过isTab属性, 设定是否通过tab标签页展示内容
{ path: '/home', component: _import('home/index'), name: 'home', desc: '首页' },
{ path: '/theme', component: _import('theme/index'), name: 'theme', desc: '主题' },
{ path: '/job/schedule', component: _import('modules/job/schedule'), name: 'schedule', desc: '定时任务', meta: { isTab: true } },
{ path: '/schedule', component: _import('modules/schedule/index'), name: 'schedule', desc: '定时任务', meta: { isTab: true } },
{ path: '/oss', component: _import('modules/oss/index'), name: 'oss', desc: '文件上传', meta: { isTab: true } },
{ path: '/sys/config', component: _import('modules/sys/config'), name: 'config', desc: '参数管理', meta: { isTab: true } },
{ path: '/sys/log', component: _import('modules/sys/log'), name: 'log', desc: '系统日志', meta: { isTab: true } },
{ path: '/sys/menu', component: _import('modules/sys/menu'), name: 'menu', desc: '菜单管理', meta: { isTab: true } },
{ path: '/sys/role', component: _import('modules/sys/role'), name: 'role', desc: '角色管理', meta: { isTab: true } },
{ path: '/sys/user', component: _import('modules/sys/user'), name: 'user', desc: '管理员管理', meta: { isTab: true } }
{ path: '/config', component: _import('modules/config/index'), name: 'config', desc: '参数管理', meta: { isTab: true } },
{ path: '/log', component: _import('modules/log/index'), name: 'log', desc: '系统日志', meta: { isTab: true } },
{ path: '/menu', component: _import('modules/menu/index'), name: 'menu', desc: '菜单管理', meta: { isTab: true } },
{ path: '/role', component: _import('modules/role/index'), name: 'role', desc: '角色管理', meta: { isTab: true } },
{ path: '/user', component: _import('modules/user/index'), name: 'user', desc: '管理员管理', meta: { isTab: true } }
],
beforeEnter (to, from, next) {
let token = Vue.cookie.get('token')
Expand Down
Empty file.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</template>

<script>
import AddOrUpdate from './config-add-or-update'
import AddOrUpdate from './add-or-update'
export default {
data () {
return {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@

<script>
import TableTreeColumn from '@/components/table-tree-column'
import AddOrUpdate from './menu-add-or-update'
import AddOrUpdate from './add-or-update'
import { treeDataTranslate } from '@/utils'
export default {
data () {
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/views/modules/oss/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
</template>

<script>
import Config from './oss-config'
import Upload from './oss-upload'
import Config from './config'
import Upload from './upload'
export default {
data () {
return {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</template>

<script>
import AddOrUpdate from './role-add-or-update'
import AddOrUpdate from './add-or-update'
export default {
data () {
return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@
</template>

<script>
import AddOrUpdate from './schedule-add-or-update'
import Log from './schedule-log'
import AddOrUpdate from './add-or-update'
import Log from './log'
export default {
data () {
return {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
</template>

<script>
import AddOrUpdate from './user-add-or-update'
import AddOrUpdate from './add-or-update'
export default {
data () {
return {
Expand Down

0 comments on commit 397d56f

Please sign in to comment.