Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivWeb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
CivWeb
Commits
e340e254
Commit
e340e254
authored
Sep 02, 2022
by
崔佳豪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 升级GetAllGroupsInfoForUser接口
parent
6e73f297
Pipeline
#59142
passed with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
41 deletions
+4
-41
base.js
src/api/service/base.js
+1
-1
reducer.js
src/containers/App/store/reducer.js
+0
-37
Site.js
src/layouts/Site.js
+3
-3
No files found.
src/api/service/base.js
View file @
e340e254
...
...
@@ -27,7 +27,7 @@ export const API = {
?
'/cityjson?ie=utf-8'
:
'https://pv.sohu.com'
,
GET_ALL_GROUPS_INFO_FORUSER
:
'/
CityInterface/rest/Services/Portal.svc/AuthorityManage
/GetAllGroupsInfoForUser'
,
'/
PandaCore/GCK/CloudPlat
/GetAllGroupsInfoForUser'
,
GET_WEATHER
:
'/CityInterface/rest/services/CountyProduct.svc/GetWeather'
,
SEND_MESSAGE_CODE
:
'CityInterface/rest/services/portal.svc/SendMessVerificationCode'
,
...
...
src/containers/App/store/reducer.js
View file @
e340e254
...
...
@@ -89,43 +89,6 @@ const appReducer = (state = initialState, action) => {
window
.
__INITIAL_STATE__
.
menu
=
'banner-left'
;
window
.
globalConfig
=
AppConfig
(
window
.
__INITIAL_STATE__
);
// 临时补充messageVoice。后续需要加到AppConfig中。
action
.
data
&&
action
.
data
.
hasOwnProperty
(
'messageVoice'
)
&&
(
window
.
globalConfig
.
messageVoice
=
action
.
data
.
messageVoice
)
action
.
data
&&
action
.
data
.
hasOwnProperty
(
'topMenu'
)
&&
(
window
.
globalConfig
.
topMenu
=
action
.
data
.
topMenu
)
window
.
globalConfig
.
transformUserInfo
=
(
data
)
=>
{
return
{
City
:
data
.
city
,
DDid
:
data
.
dDid
,
Email
:
data
.
email
,
EnterprisesType
:
data
.
enterprisesType
,
GisState
:
data
.
gisState
,
Groups
:
data
.
groups
,
IP
:
data
.
ip
,
IsManager
:
data
.
isManager
,
LocalSite
:
data
.
localSite
,
Mark
:
data
.
mark
,
OID
:
data
.
oid
,
Phone
:
data
.
phone
,
Port
:
data
.
port
,
UserImge
:
data
.
userImge
,
// UserLevel: data. // 老接口有,新接口没有
// UserType: // 老接口有,新接口没有
WXid
:
data
.
wXid
,
WxImage
:
data
.
wxImage
,
WxName
:
data
.
wxName
,
cloudStationOID
:
data
.
cloudStationOID
,
depart
:
data
.
depart
,
// 嵌套里面一层的大小写也不一样
exportCAD
:
data
.
exportCAD
,
// 嵌套里面一层的大小写也不一样
extraInfo
:
data
.
extraInfo
,
fullName
:
data
.
fullName
,
loginName
:
data
.
loginName
,
roles
:
data
.
roles
,
// 嵌套里面一层的大小写也不一样
site
:
data
.
site
,
token
:
data
.
token
,
tokenexp
:
data
.
tokenexp
,
}
},
// eslint-disable-next-line no-undef
createStoreage
.
set
(
'globalConfig'
,
window
.
globalConfig
);
...
...
src/layouts/Site.js
View file @
e340e254
...
...
@@ -69,12 +69,12 @@ class Site {
ignoreSite
:
true
,
})
.
then
(
res
=>
{
if
(
res
&&
res
.
say
.
errMsg
===
''
&&
res
.
say
.
statusCode
===
ERR_OK
)
{
const
result
=
res
.
getMe
;
if
(
res
&&
res
.
code
===
0
)
{
const
result
=
res
.
data
||
[]
;
let
city
=
self
.
weatherCity
;
let
arr
=
[];
self
.
globalConfig
.
userInfo
.
groupType
=
''
;
self
.
globalConfig
.
userInfo
.
Groups
=
res
.
getMe
;
self
.
globalConfig
.
userInfo
.
Groups
=
res
ult
;
// eslint-disable-next-line no-array-constructor
self
.
globalConfig
.
userInfo
.
Industries
=
new
Array
();
if
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment