system-clients 3.2.96 → 3.2.98
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "system-clients",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.98",
|
|
4
4
|
"description": "系统基础框架",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
"style": "0.0.3",
|
|
80
80
|
"style-loader": "^0.20.3",
|
|
81
81
|
"url-loader": "^0.5.7",
|
|
82
|
-
"vue-client": "1.24.
|
|
82
|
+
"vue-client": "1.24.160",
|
|
83
83
|
"vue-hot-reload-api": "^1.2.0",
|
|
84
84
|
"vue-html-loader": "^1.0.0",
|
|
85
85
|
"vue-loader": "^8.2.1",
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
//找到跟节点
|
|
81
81
|
ergodicList (val,parentname) {
|
|
82
82
|
if(val.children.length > 0 ){
|
|
83
|
-
if (val.name !== '组织机构'){
|
|
83
|
+
if (val.name !== '组织机构' && parentname !== '资源管理'){
|
|
84
84
|
this.resoptions.push({label: parentname === '组织机构' ? val.name : val.name+' - '+parentname, value: val.id})
|
|
85
85
|
}
|
|
86
86
|
parentname=parentname+val.name
|
|
@@ -9,10 +9,14 @@ let loginGen = async function (username, password, cue) {
|
|
|
9
9
|
})
|
|
10
10
|
if (getLogin.data) {
|
|
11
11
|
//获取jwt
|
|
12
|
-
|
|
12
|
+
if (getLogin.data.resources.data && getLogin.data.resources.data.id){
|
|
13
|
+
Vue.$login.jwt = getLogin.data.resources.data.id
|
|
14
|
+
Vue.$login.f = getLogin.data.resources.data
|
|
15
|
+
}else {
|
|
16
|
+
Vue.$login.jwt = getLogin.data.resources.id
|
|
17
|
+
Vue.$login.f = getLogin.data.resources
|
|
18
|
+
}
|
|
13
19
|
Vue.$login.jwtNew = getLogin.data.access_token
|
|
14
|
-
// 调用远程登录服务，获取所有有权访问的功能
|
|
15
|
-
Vue.$login.f = getLogin.data.resources.data
|
|
16
20
|
// 把登录用户添加到cookie里
|
|
17
21
|
Vue.cookie.set('loginId', Vue.$login.f.id)
|
|
18
22
|
try {
|