Browse Source

路由调整

daxiongYang 7 years ago
parent
commit
397d56f287

+ 4 - 4
gulpfile.js

@ -12,10 +12,10 @@ var env         = ''; // 运行环境
12 12
(function () {
13 13
  var d = new Date();
14 14
  var yy = d.getFullYear().toString().slice(2);
15
  var MM = d.getMonth() + 1 >= 10 ? (d.getMonth() + 1) : '0' + (d.getMonth() + 1)
16
  var dd = d.getDate() >= 10 ? d.getDate() : '0' + d.getDate()
17
  var HH = d.getHours() >= 10 ? d.getHours() : '0' + d.getHours()
18
  var MM = d.getMinutes() >= 10 ? d.getMinutes() : '0' + d.getMinutes()
15
  var MM = d.getMonth() + 1 >= 10 ? (d.getMonth() + 1) : '0' + (d.getMonth() + 1);
16
  var dd = d.getDate() >= 10 ? d.getDate() : '0' + d.getDate();
17
  var HH = d.getHours() >= 10 ? d.getHours() : '0' + d.getHours();
18
  var MM = d.getMinutes() >= 10 ? d.getMinutes() : '0' + d.getMinutes();
19 19
  version = yy + MM + dd + HH + MM;
20 20
  versionPath = distPath + '/' + version;
21 21
})();

+ 9 - 8
src/main.js

@ -1,20 +1,21 @@
1
// The Vue build version to load with the `import` command
2
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
3 1
import Vue from 'vue'
2
import router from '@/router'
3
import store from '@/store'
4
import VueCookie from 'vue-cookie'
5
4 6
import App from '@/App'
5
import router from '@/router'       // api: https://github.com/vuejs/vue-router
6
import store from '@/store'         // api: https://github.com/vuejs/vuex
7
import VueCookie from 'vue-cookie'  // api: https://github.com/alfhen/vue-cookie
8
import '@/element-ui'               // api: https://github.com/ElemeFE/element
9
import '@/icons'                    // api: http://www.iconfont.cn/
7
8
import '@/element-ui'
9
import '@/icons'
10 10
import '@/assets/scss/index.scss'
11
11 12
import http from '@/utils/http'
12 13
import { isAuth } from '@/utils'
13 14
14 15
Vue.use(VueCookie)
15 16
Vue.config.productionTip = false
16 17
17
// 非生产环境, 适配mockjs模拟数据.         api: https://github.com/nuysoft/Mock
18
// 非生产环境, 适配mockjs模拟数据
18 19
if (process.env.NODE_ENV !== 'production') {
19 20
  require('@/mock')
20 21
}

+ 6 - 6
src/router/index.js

@ -24,13 +24,13 @@ export default new Router({
24 24
        // 通过isTab属性, 设定是否通过tab标签页展示内容
25 25
        { path: '/home', component: _import('home/index'), name: 'home', desc: '首页' },
26 26
        { path: '/theme', component: _import('theme/index'), name: 'theme', desc: '主题' },
27
        { path: '/job/schedule', component: _import('modules/job/schedule'), name: 'schedule', desc: '定时任务', meta: { isTab: true } },
27
        { path: '/schedule', component: _import('modules/schedule/index'), name: 'schedule', desc: '定时任务', meta: { isTab: true } },
28 28
        { path: '/oss', component: _import('modules/oss/index'), name: 'oss', desc: '文件上传', meta: { isTab: true } },
29
        { path: '/sys/config', component: _import('modules/sys/config'), name: 'config', desc: '参数管理', meta: { isTab: true } },
30
        { path: '/sys/log', component: _import('modules/sys/log'), name: 'log', desc: '系统日志', meta: { isTab: true } },
31
        { path: '/sys/menu', component: _import('modules/sys/menu'), name: 'menu', desc: '菜单管理', meta: { isTab: true } },
32
        { path: '/sys/role', component: _import('modules/sys/role'), name: 'role', desc: '角色管理', meta: { isTab: true } },
33
        { path: '/sys/user', component: _import('modules/sys/user'), name: 'user', desc: '管理员管理', meta: { isTab: true } }
29
        { path: '/config', component: _import('modules/config/index'), name: 'config', desc: '参数管理', meta: { isTab: true } },
30
        { path: '/log', component: _import('modules/log/index'), name: 'log', desc: '系统日志', meta: { isTab: true } },
31
        { path: '/menu', component: _import('modules/menu/index'), name: 'menu', desc: '菜单管理', meta: { isTab: true } },
32
        { path: '/role', component: _import('modules/role/index'), name: 'role', desc: '角色管理', meta: { isTab: true } },
33
        { path: '/user', component: _import('modules/user/index'), name: 'user', desc: '管理员管理', meta: { isTab: true } }
34 34
      ],
35 35
      beforeEnter (to, from, next) {
36 36
        let token = Vue.cookie.get('token')

+ 0 - 0
src/views/main-sidebar-sub-menu-nav.vue


src/views/modules/sys/config-add-or-update.vue → src/views/modules/config/add-or-update.vue


+ 1 - 1
src/views/modules/sys/config.vue

@ -74,7 +74,7 @@
74 74
</template>
75 75
76 76
<script>
77
  import AddOrUpdate from './config-add-or-update'
77
  import AddOrUpdate from './add-or-update'
78 78
  export default {
79 79
    data () {
80 80
      return {

src/views/modules/sys/log.vue → src/views/modules/log/index.vue


src/views/modules/sys/menu-add-or-update.vue → src/views/modules/menu/add-or-update.vue


+ 1 - 1
src/views/modules/sys/menu.vue

@ -90,7 +90,7 @@
90 90
91 91
<script>
92 92
  import TableTreeColumn from '@/components/table-tree-column'
93
  import AddOrUpdate from './menu-add-or-update'
93
  import AddOrUpdate from './add-or-update'
94 94
  import { treeDataTranslate } from '@/utils'
95 95
  export default {
96 96
    data () {

src/views/modules/oss/oss-config.vue → src/views/modules/oss/config.vue


+ 2 - 2
src/views/modules/oss/index.vue

@ -67,8 +67,8 @@
67 67
</template>
68 68
69 69
<script>
70
  import Config from './oss-config'
71
  import Upload from './oss-upload'
70
  import Config from './config'
71
  import Upload from './upload'
72 72
  export default {
73 73
    data () {
74 74
      return {

src/views/modules/oss/oss-upload.vue → src/views/modules/oss/upload.vue


src/views/modules/sys/role-add-or-update.vue → src/views/modules/role/add-or-update.vue


+ 1 - 1
src/views/modules/sys/role.vue

@ -75,7 +75,7 @@
75 75
</template>
76 76
77 77
<script>
78
  import AddOrUpdate from './role-add-or-update'
78
  import AddOrUpdate from './add-or-update'
79 79
  export default {
80 80
    data () {
81 81
      return {

src/views/modules/job/schedule-add-or-update.vue → src/views/modules/schedule/add-or-update.vue


+ 2 - 2
src/views/modules/job/schedule.vue

@ -105,8 +105,8 @@
105 105
</template>
106 106
107 107
<script>
108
  import AddOrUpdate from './schedule-add-or-update'
109
  import Log from './schedule-log'
108
  import AddOrUpdate from './add-or-update'
109
  import Log from './log'
110 110
  export default {
111 111
    data () {
112 112
      return {

src/views/modules/job/schedule-log.vue → src/views/modules/schedule/log.vue


src/views/modules/sys/user-add-or-update.vue → src/views/modules/user/add-or-update.vue


+ 1 - 1
src/views/modules/sys/user.vue

@ -91,7 +91,7 @@
91 91
</template>
92 92
93 93
<script>
94
  import AddOrUpdate from './user-add-or-update'
94
  import AddOrUpdate from './add-or-update'
95 95
  export default {
96 96
    data () {
97 97
      return {