正在显示
13 个修改的文件
包含
19 行增加
和
20 行删除
| @@ -55,7 +55,7 @@ | @@ -55,7 +55,7 @@ | ||
| 55 | "vue": "2.6.12", | 55 | "vue": "2.6.12", |
| 56 | "vue-count-to": "1.0.13", | 56 | "vue-count-to": "1.0.13", |
| 57 | "vue-cropper": "0.5.5", | 57 | "vue-cropper": "0.5.5", |
| 58 | - "vue-meta": "^2.4.0", | 58 | + "vue-meta": "2.4.0", |
| 59 | "vue-router": "3.4.9", | 59 | "vue-router": "3.4.9", |
| 60 | "vuedraggable": "2.24.3", | 60 | "vuedraggable": "2.24.3", |
| 61 | "vuex": "3.6.0" | 61 | "vuex": "3.6.0" |
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <el-breadcrumb class="app-breadcrumb" separator="/"> | 2 | <el-breadcrumb class="app-breadcrumb" separator="/"> |
| 3 | <transition-group name="breadcrumb"> | 3 | <transition-group name="breadcrumb"> |
| 4 | <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path"> | 4 | <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path"> |
| 5 | - <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span> | 5 | + <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ item.meta.title }}</span> |
| 6 | <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a> | 6 | <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a> |
| 7 | </el-breadcrumb-item> | 7 | </el-breadcrumb-item> |
| 8 | </transition-group> | 8 | </transition-group> |
| @@ -5,8 +5,7 @@ | @@ -5,8 +5,7 @@ | ||
| 5 | </div> | 5 | </div> |
| 6 | <el-dropdown-menu slot="dropdown"> | 6 | <el-dropdown-menu slot="dropdown"> |
| 7 | <el-dropdown-item v-for="item of sizeOptions" :key="item.value" :disabled="size===item.value" :command="item.value"> | 7 | <el-dropdown-item v-for="item of sizeOptions" :key="item.value" :disabled="size===item.value" :command="item.value"> |
| 8 | - {{ | ||
| 9 | - item.label }} | 8 | + {{ item.label }} |
| 10 | </el-dropdown-item> | 9 | </el-dropdown-item> |
| 11 | </el-dropdown-menu> | 10 | </el-dropdown-menu> |
| 12 | </el-dropdown> | 11 | </el-dropdown> |
| @@ -29,7 +29,7 @@ export default { | @@ -29,7 +29,7 @@ export default { | ||
| 29 | variables() { | 29 | variables() { |
| 30 | return variables; | 30 | return variables; |
| 31 | }, | 31 | }, |
| 32 | - sideTheme() { | 32 | + sideTheme() { |
| 33 | return this.$store.state.settings.sideTheme | 33 | return this.$store.state.settings.sideTheme |
| 34 | } | 34 | } |
| 35 | }, | 35 | }, |
| @@ -10,7 +10,7 @@ import '@/assets/styles/ruoyi.scss' // ruoyi css | @@ -10,7 +10,7 @@ import '@/assets/styles/ruoyi.scss' // ruoyi css | ||
| 10 | import App from './App' | 10 | import App from './App' |
| 11 | import store from './store' | 11 | import store from './store' |
| 12 | import router from './router' | 12 | import router from './router' |
| 13 | -import directive from './directive' //directive | 13 | +import directive from './directive' // directive |
| 14 | import plugins from './plugins' // plugins | 14 | import plugins from './plugins' // plugins |
| 15 | import { download } from '@/utils/request' | 15 | import { download } from '@/utils/request' |
| 16 | 16 |
| @@ -15,7 +15,7 @@ export default { | @@ -15,7 +15,7 @@ export default { | ||
| 15 | responseType: 'blob', | 15 | responseType: 'blob', |
| 16 | headers: { 'Authorization': 'Bearer ' + getToken() } | 16 | headers: { 'Authorization': 'Bearer ' + getToken() } |
| 17 | }).then(async (res) => { | 17 | }).then(async (res) => { |
| 18 | - const isLogin = await this.blobValidate(res.data); | 18 | + const isLogin = await blobValidate(res.data); |
| 19 | if (isLogin) { | 19 | if (isLogin) { |
| 20 | const blob = new Blob([res.data]) | 20 | const blob = new Blob([res.data]) |
| 21 | this.saveAs(blob, decodeURI(res.headers['download-filename'])) | 21 | this.saveAs(blob, decodeURI(res.headers['download-filename'])) |
| @@ -32,7 +32,7 @@ export default { | @@ -32,7 +32,7 @@ export default { | ||
| 32 | responseType: 'blob', | 32 | responseType: 'blob', |
| 33 | headers: { 'Authorization': 'Bearer ' + getToken() } | 33 | headers: { 'Authorization': 'Bearer ' + getToken() } |
| 34 | }).then(async (res) => { | 34 | }).then(async (res) => { |
| 35 | - const isLogin = await this.blobValidate(res.data); | 35 | + const isLogin = await blobValidate(res.data); |
| 36 | if (isLogin) { | 36 | if (isLogin) { |
| 37 | const blob = new Blob([res.data]) | 37 | const blob = new Blob([res.data]) |
| 38 | this.saveAs(blob, decodeURI(res.headers['download-filename'])) | 38 | this.saveAs(blob, decodeURI(res.headers['download-filename'])) |
| @@ -95,7 +95,7 @@ export const constantRoutes = [ | @@ -95,7 +95,7 @@ export const constantRoutes = [ | ||
| 95 | path: 'role/:userId(\\d+)', | 95 | path: 'role/:userId(\\d+)', |
| 96 | component: (resolve) => require(['@/views/system/user/authRole'], resolve), | 96 | component: (resolve) => require(['@/views/system/user/authRole'], resolve), |
| 97 | name: 'AuthRole', | 97 | name: 'AuthRole', |
| 98 | - meta: { title: '分配角色', activeMenu: '/system/user'} | 98 | + meta: { title: '分配角色', activeMenu: '/system/user' } |
| 99 | } | 99 | } |
| 100 | ] | 100 | ] |
| 101 | }, | 101 | }, |
| @@ -108,7 +108,7 @@ export const constantRoutes = [ | @@ -108,7 +108,7 @@ export const constantRoutes = [ | ||
| 108 | path: 'user/:roleId(\\d+)', | 108 | path: 'user/:roleId(\\d+)', |
| 109 | component: (resolve) => require(['@/views/system/role/authUser'], resolve), | 109 | component: (resolve) => require(['@/views/system/role/authUser'], resolve), |
| 110 | name: 'AuthUser', | 110 | name: 'AuthUser', |
| 111 | - meta: { title: '分配用户', activeMenu: '/system/role'} | 111 | + meta: { title: '分配用户', activeMenu: '/system/role' } |
| 112 | } | 112 | } |
| 113 | ] | 113 | ] |
| 114 | }, | 114 | }, |
| @@ -121,7 +121,7 @@ export const constantRoutes = [ | @@ -121,7 +121,7 @@ export const constantRoutes = [ | ||
| 121 | path: 'index/:dictId(\\d+)', | 121 | path: 'index/:dictId(\\d+)', |
| 122 | component: (resolve) => require(['@/views/system/dict/data'], resolve), | 122 | component: (resolve) => require(['@/views/system/dict/data'], resolve), |
| 123 | name: 'Data', | 123 | name: 'Data', |
| 124 | - meta: { title: '字典数据', activeMenu: '/system/dict'} | 124 | + meta: { title: '字典数据', activeMenu: '/system/dict' } |
| 125 | } | 125 | } |
| 126 | ] | 126 | ] |
| 127 | }, | 127 | }, |
| @@ -134,7 +134,7 @@ export const constantRoutes = [ | @@ -134,7 +134,7 @@ export const constantRoutes = [ | ||
| 134 | path: 'index', | 134 | path: 'index', |
| 135 | component: (resolve) => require(['@/views/monitor/job/log'], resolve), | 135 | component: (resolve) => require(['@/views/monitor/job/log'], resolve), |
| 136 | name: 'JobLog', | 136 | name: 'JobLog', |
| 137 | - meta: { title: '调度日志', activeMenu: '/monitor/job'} | 137 | + meta: { title: '调度日志', activeMenu: '/monitor/job' } |
| 138 | } | 138 | } |
| 139 | ] | 139 | ] |
| 140 | }, | 140 | }, |
| @@ -147,7 +147,7 @@ export const constantRoutes = [ | @@ -147,7 +147,7 @@ export const constantRoutes = [ | ||
| 147 | path: 'index', | 147 | path: 'index', |
| 148 | component: (resolve) => require(['@/views/tool/gen/editTable'], resolve), | 148 | component: (resolve) => require(['@/views/tool/gen/editTable'], resolve), |
| 149 | name: 'GenEdit', | 149 | name: 'GenEdit', |
| 150 | - meta: { title: '修改生成配置', activeMenu: '/tool/gen'} | 150 | + meta: { title: '修改生成配置', activeMenu: '/tool/gen' } |
| 151 | } | 151 | } |
| 152 | ] | 152 | ] |
| 153 | } | 153 | } |
| 1 | import { constantRoutes } from '@/router' | 1 | import { constantRoutes } from '@/router' |
| 2 | import { getRouters } from '@/api/menu' | 2 | import { getRouters } from '@/api/menu' |
| 3 | import Layout from '@/layout/index' | 3 | import Layout from '@/layout/index' |
| 4 | -import ParentView from '@/components/ParentView'; | 4 | +import ParentView from '@/components/ParentView' |
| 5 | import InnerLink from '@/layout/components/InnerLink' | 5 | import InnerLink from '@/layout/components/InnerLink' |
| 6 | 6 | ||
| 7 | const permission = { | 7 | const permission = { |
| @@ -24,7 +24,7 @@ const permission = { | @@ -24,7 +24,7 @@ const permission = { | ||
| 24 | // 顶部导航菜单默认添加统计报表栏指向首页 | 24 | // 顶部导航菜单默认添加统计报表栏指向首页 |
| 25 | const index = [{ | 25 | const index = [{ |
| 26 | path: 'index', | 26 | path: 'index', |
| 27 | - meta: { title: '统计报表', icon: 'dashboard'} | 27 | + meta: { title: '统计报表', icon: 'dashboard' } |
| 28 | }] | 28 | }] |
| 29 | state.topbarRouters = routes.concat(index); | 29 | state.topbarRouters = routes.concat(index); |
| 30 | }, | 30 | }, |
| @@ -8,7 +8,7 @@ const state = { | @@ -8,7 +8,7 @@ const state = { | ||
| 8 | theme: storageSetting.theme || '#409EFF', | 8 | theme: storageSetting.theme || '#409EFF', |
| 9 | sideTheme: storageSetting.sideTheme || sideTheme, | 9 | sideTheme: storageSetting.sideTheme || sideTheme, |
| 10 | showSettings: showSettings, | 10 | showSettings: showSettings, |
| 11 | - topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav, | 11 | + topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav, |
| 12 | tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView, | 12 | tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView, |
| 13 | fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader, | 13 | fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader, |
| 14 | sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo, | 14 | sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo, |
-
请 注册 或 登录 后发表评论