File tree Expand file tree Collapse file tree 9 files changed +44
-12
lines changed Expand file tree Collapse file tree 9 files changed +44
-12
lines changed Original file line number Diff line number Diff line change 19
19
"normalize.css" : " 7.0.0" ,
20
20
"nprogress" : " 0.2.0" ,
21
21
"vue" : " 2.5.2" ,
22
+ "vue-multiselect" : " ^2.0.8" ,
22
23
"vue-router" : " 2.7.0" ,
23
24
"vuex" : " 2.3.1"
24
25
},
Original file line number Diff line number Diff line change 1
1
import Vue from 'vue'
2
2
import ElementUI from 'element-ui'
3
3
import 'element-ui/lib/theme-chalk/index.css'
4
+ import 'vue-multiselect/dist/vue-multiselect.min.css'
4
5
import locale from 'element-ui/lib/locale/lang/en'
5
6
import App from './App'
6
7
import router from './router'
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ const getters = {
6
6
name : state => state . user . name ,
7
7
roles : state => state . user . roles ,
8
8
permission_routers : state => state . permission . routers ,
9
- addRouters : state => state . permission . addRouters
9
+ addRouters : state => state . permission . addRouters ,
10
+ AllRouters :state => state . permission . AllRouters
10
11
}
11
12
export default getters
Original file line number Diff line number Diff line change @@ -34,12 +34,17 @@ function filterAsyncRouter(asyncRouterMap, roles) {
34
34
const permission = {
35
35
state : {
36
36
routers : constantRouterMap ,
37
- addRouters : [ ]
37
+ addRouters : [ ] ,
38
+ AllRouters :[ ]
38
39
} ,
39
40
mutations : {
40
41
SET_ROUTERS : ( state , routers ) => {
41
42
state . addRouters = routers
42
43
state . routers = constantRouterMap . concat ( routers )
44
+ } ,
45
+
46
+ SET_ALLROUTERS : ( state ) => {
47
+ state . AllRouters = constantRouterMap . concat ( asyncRouterMap )
43
48
}
44
49
} ,
45
50
actions : {
@@ -53,6 +58,9 @@ const permission = {
53
58
accessedRouters = filterAsyncRouter ( asyncRouterMap , roles )
54
59
}
55
60
commit ( 'SET_ROUTERS' , accessedRouters )
61
+
62
+ commit ( 'SET_ALLROUTERS' )
63
+
56
64
resolve ( )
57
65
} )
58
66
}
Original file line number Diff line number Diff line change 1
1
<template >
2
2
<div class =" dashboard-container" >
3
3
<el-row >
4
- <el-col :span =" 8 " >
4
+ <el-col :span =" 6 " >
5
5
<el-card :body-style =" { padding: '15px 0px',height:'250px'}" >
6
6
<i class =" el-icon-edit" style =" font-size :30px " ></i >
7
7
16
16
17
17
</el-card >
18
18
</el-col >
19
- <el-col :span =" 8 " :offset =" 2" >
19
+ <el-col :span =" 6 " :offset =" 2" >
20
20
<el-card :body-style =" { padding: '15px 0px',height:'250px'}" >
21
21
<i class =" el-icon-location" style =" font-size :30px " ></i >
22
22
23
23
<div class =" dashboard-text" style =" padding-top :0px " >{{weather.city}}天气</div >
24
- <div class =" dashboard-text" >空气质量:{{weather.data.quality}},气温:{{weather.data.wendu}}℃,湿度:{{weather.data.shidu}}</div >
24
+ <div class =" dashboard-text" >空气质量:{{weather.data.quality}}。</div >
25
+ <div class =" dashboard-text" >气温:{{weather.data.wendu}}℃,湿度:{{weather.data.shidu}}。</div >
25
26
26
27
</el-card >
27
28
</el-col >
Original file line number Diff line number Diff line change @@ -46,4 +46,11 @@ export default {
46
46
cursor : text ;
47
47
}
48
48
}
49
+ .app-levelbar.el-breadcrumb :focus {
50
+ outline :none ;
51
+ }
52
+
53
+
54
+
55
+
49
56
</style >
Original file line number Diff line number Diff line change @@ -11,8 +11,13 @@ export default {
11
11
components: { SidebarItem },
12
12
computed: {
13
13
... mapGetters ([
14
- ' permission_routers'
14
+ ' permission_routers' ,
15
+ ' AllRouters'
15
16
])
17
+ },
18
+ created (){
19
+ console .log (this .AllRouters )
20
+
16
21
}
17
22
}
18
23
</script >
Original file line number Diff line number Diff line change 2
2
<div class =" login-container" >
3
3
<el-form autoComplete =" on" :model =" loginForm" ref =" loginForm" label-position =" left" label-width =" 0px"
4
4
class =" card-box login-form" >
5
- <h3 class =" title" > <img style =" width :7% " src =' /favicon .ico' > Anshare</h3 >
5
+ <h3 class =" title" > <img style =" width :7% " src =' /logo .ico' > Anshare</h3 >
6
6
7
7
8
8
<el-form-item prop =" username" >
Original file line number Diff line number Diff line change 81
81
</el-form-item >
82
82
83
83
<el-form-item label =" 角色" >
84
- <el-select v-model =" RoleID" placeholder =" 请选择" >
84
+ <!-- < el-select v-model="RoleID" placeholder="请选择">
85
85
<el-option v-for="item in options" :key="item.ID" :label="item.RoleName" :value="item.ID">
86
86
</el-option>
87
- </el-select >
87
+ </el-select> -->
88
+ <multiselect :value =" RoleID" :options =" options" :searchable =" false" :close-on-select =" true" :allow-empty =" false" label =" RoleName"
89
+ placeholder =" 请选择角色" track-by =" RoleName" >
90
+ </multiselect >
88
91
</el-form-item >
89
92
</el-form >
90
93
<div slot =" footer" class =" dialog-footer" >
111
114
import {
112
115
GetRoles
113
116
} from " @/api/system/role" ;
117
+ import Multiselect from ' vue-multiselect'
114
118
115
119
export default {
116
120
data () {
117
121
return {
122
+ RoleID: " " ,
118
123
depttree: [],
119
124
textMap: {
120
125
update: " 编辑" ,
139
144
defaultProps: {
140
145
children: " children" ,
141
146
label: " text"
142
- }
147
+ },
148
+ selected: null
149
+
143
150
};
144
151
},
152
+ components: {
153
+ Multiselect
154
+ },
145
155
146
156
created () {
147
157
this .fetchData ();
199
209
200
210
GetUsersDetail (ID ).then (response => {
201
211
202
- this .dialogStatus = " update" ;
203
212
this .temp = response .data ;
204
213
this .$refs .tree .setCheckedKeys ([this .temp .DeptID ]);
205
214
this .RoleID = this .temp .RoleID ;
206
- this .fetchData ();
207
215
});
208
216
},
209
217
You can’t perform that action at this time.
0 commit comments