RuoYi преди 4 години
родител
ревизия
337d1bab02

+ 1 - 1
ruoyi-ui/package.json

@@ -56,7 +56,7 @@
56 56
     "vue-count-to": "1.0.13",
57 57
     "vue-cropper": "0.5.5",
58 58
     "vue-router": "3.4.9",
59
-    "vue-meta": "^2.4.0",
59
+    "vue-meta": "2.4.0",
60 60
     "vuedraggable": "2.24.3",
61 61
     "vuex": "3.6.0"
62 62
   },

+ 1 - 1
ruoyi-ui/src/components/Breadcrumb/index.vue

@@ -2,7 +2,7 @@
2 2
   <el-breadcrumb class="app-breadcrumb" separator="/">
3 3
     <transition-group name="breadcrumb">
4 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 6
         <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
7 7
       </el-breadcrumb-item>
8 8
     </transition-group>

+ 1 - 1
ruoyi-ui/src/components/RuoYi/Doc/index.vue

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <div>
3
-    <svg-icon icon-class="question" @click="goto"/>
3
+    <svg-icon icon-class="question" @click="goto" />
4 4
   </div>
5 5
 </template>
6 6
 

+ 1 - 1
ruoyi-ui/src/components/RuoYi/Git/index.vue

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <div>
3
-    <svg-icon icon-class="github" @click="goto"/>
3
+    <svg-icon icon-class="github" @click="goto" />
4 4
   </div>
5 5
 </template>
6 6
 

+ 1 - 2
ruoyi-ui/src/components/SizeSelect/index.vue

@@ -5,8 +5,7 @@
5 5
     </div>
6 6
     <el-dropdown-menu slot="dropdown">
7 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 9
       </el-dropdown-item>
11 10
     </el-dropdown-menu>
12 11
   </el-dropdown>

+ 1 - 1
ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -29,7 +29,7 @@ export default {
29 29
     variables() {
30 30
       return variables;
31 31
     },
32
-	sideTheme() {
32
+    sideTheme() {
33 33
       return this.$store.state.settings.sideTheme
34 34
     }
35 35
   },

+ 1 - 1
ruoyi-ui/src/layout/index.vue

@@ -98,7 +98,7 @@ export default {
98 98
   }
99 99
 
100 100
   .hideSidebar .fixed-header {
101
-    width: calc(100% - 54px)
101
+    width: calc(100% - 54px);
102 102
   }
103 103
 
104 104
   .mobile .fixed-header {

+ 1 - 1
ruoyi-ui/src/main.js

@@ -10,7 +10,7 @@ import '@/assets/styles/ruoyi.scss' // ruoyi css
10 10
 import App from './App'
11 11
 import store from './store'
12 12
 import router from './router'
13
-import directive from './directive' //directive
13
+import directive from './directive' // directive
14 14
 import plugins from './plugins' // plugins
15 15
 import { download } from '@/utils/request'
16 16
 

+ 5 - 5
ruoyi-ui/src/router/index.js

@@ -95,7 +95,7 @@ export const constantRoutes = [
95 95
         path: 'role/:userId(\\d+)',
96 96
         component: (resolve) => require(['@/views/system/user/authRole'], resolve),
97 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 108
         path: 'user/:roleId(\\d+)',
109 109
         component: (resolve) => require(['@/views/system/role/authUser'], resolve),
110 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 121
         path: 'index/:dictId(\\d+)',
122 122
         component: (resolve) => require(['@/views/system/dict/data'], resolve),
123 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 134
         path: 'index',
135 135
         component: (resolve) => require(['@/views/monitor/job/log'], resolve),
136 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 147
         path: 'index',
148 148
         component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
149 149
         name: 'GenEdit',
150
-        meta: { title: '修改生成配置', activeMenu: '/tool/gen'}
150
+        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
151 151
       }
152 152
     ]
153 153
   }

+ 2 - 2
ruoyi-ui/src/store/modules/permission.js

@@ -1,7 +1,7 @@
1 1
 import { constantRoutes } from '@/router'
2 2
 import { getRouters } from '@/api/menu'
3 3
 import Layout from '@/layout/index'
4
-import ParentView from '@/components/ParentView';
4
+import ParentView from '@/components/ParentView'
5 5
 import InnerLink from '@/layout/components/InnerLink'
6 6
 
7 7
 const permission = {
@@ -24,7 +24,7 @@ const permission = {
24 24
       // 顶部导航菜单默认添加统计报表栏指向首页
25 25
       const index = [{
26 26
         path: 'index',
27
-        meta: { title: '统计报表', icon: 'dashboard'}
27
+        meta: { title: '统计报表', icon: 'dashboard' }
28 28
       }]
29 29
       state.topbarRouters = routes.concat(index);
30 30
     },

+ 1 - 1
ruoyi-ui/src/store/modules/settings.js

@@ -8,7 +8,7 @@ const state = {
8 8
   theme: storageSetting.theme || '#409EFF',
9 9
   sideTheme: storageSetting.sideTheme || sideTheme,
10 10
   showSettings: showSettings,
11
-  topNav:  storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
11
+  topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
12 12
   tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
13 13
   fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
14 14
   sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,

+ 1 - 1
ruoyi-ui/src/utils/dict/index.js

@@ -5,7 +5,7 @@ export default function(Vue, options) {
5 5
   mergeOptions(options)
6 6
   Vue.mixin({
7 7
     data() {
8
-      if (this.$options.dicts === undefined || this.$options.dicts === null) {
8
+      if (this.$options === undefined || this.$options.dicts === undefined || this.$options.dicts === null) {
9 9
         return {}
10 10
       }
11 11
       const dict = new Dict()