Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivManage
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
CivManage
Commits
235cebb3
Commit
235cebb3
authored
May 26, 2022
by
邓超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改路由名称及沙箱参数名
parent
ec575bf1
Pipeline
#51377
passed with stages
in 7 minutes 34 seconds
Changes
12
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
61 additions
and
58 deletions
+61
-58
BasicLayout.jsx
src/layouts/BasicLayout.jsx
+1
-1
filedConfig.jsx
...s/bsmanager/base/tablemanager/filedConfig/filedConfig.jsx
+5
-5
index.jsx
src/pages/bsmanager/base/tablemanager/index.jsx
+4
-2
incident.jsx
src/pages/bsmanager/workOrder/incident/incident.jsx
+2
-2
incidentFlow.jsx
src/pages/bsmanager/workOrder/incident/incidentFlow.jsx
+1
-1
incidentView.jsx
src/pages/bsmanager/workOrder/incident/incidentView.jsx
+1
-1
flow.jsx
src/pages/bsmanager/workOrder/workFlow/flow.jsx
+1
-1
flowNode.jsx
src/pages/bsmanager/workOrder/workFlow/flowNode/flowNode.jsx
+1
-1
ProjectManage.jsx
...tformCenter/messageManage/projectManage/ProjectManage.jsx
+2
-2
schemeDetail.jsx
...latformCenter/messageManage/schemeDetail/schemeDetail.jsx
+1
-1
config.js
src/routes/config.js
+38
-38
authority.js
src/utils/authority.js
+4
-3
No files found.
src/layouts/BasicLayout.jsx
View file @
235cebb3
...
...
@@ -65,7 +65,7 @@ const BasicLayout = props => {
return
(
<>
{
sessionStorage
.
getItem
(
'
isS
andbox'
)
==
'true'
?
(
{
sessionStorage
.
getItem
(
'
s
andbox'
)
==
'true'
?
(
<>
{
renderRoutes
(
props
.
route
.
routes
)
}
</>
)
:
(
<
ProLayout
...
...
src/pages/bsmanager/base/tablemanager/filedConfig/filedConfig.jsx
View file @
235cebb3
...
...
@@ -301,8 +301,8 @@ const AddModal = props => {
useEffect
(()
=>
{
console
.
log
(
props
);
console
.
log
(
treeSelectValue
);
console
.
log
(
props
.
match
.
params
.
id
);
if
(
props
.
match
.
params
.
id
)
{
console
.
log
(
props
.
location
.
state
.
id
);
if
(
props
.
location
.
state
.
id
)
{
setSelectTreeData
(
props
.
location
.
state
.
keepTreeSelect
);
setSelectDataFirst
(
props
.
location
.
state
.
keepTreeFirst
);
if
(
treeSelectValue
)
{
...
...
@@ -335,9 +335,9 @@ const AddModal = props => {
}
});
}
else
{
setFormObj
(
props
.
match
.
params
.
id
);
setFormObj
(
props
.
location
.
state
.
id
);
reloadTableFields
({
tableName
:
props
.
match
.
params
.
id
,
tableName
:
props
.
location
.
state
.
id
,
}).
then
(
res
=>
{
setTreeLoading
(
false
);
if
(
res
.
msg
===
'Ok'
)
{
...
...
@@ -463,7 +463,7 @@ const AddModal = props => {
console
.
log
(
keepValue
);
console
.
log
(
pickIndex
,
groupArr
,
'back'
);
history
.
push
({
pathname
:
'/b
smanger/base/tablemanger
'
,
pathname
:
'/b
iz/account/table
'
,
query
:
{
template
,
tableScroll
,
...
...
src/pages/bsmanager/base/tablemanager/index.jsx
View file @
235cebb3
...
...
@@ -171,8 +171,9 @@ const TableManager = props => {
e
.
stopPropagation
();
setFormObj
(
record
);
history
.
push
({
pathname
:
`/b
smanger/base/filedConfig/
${
record
.
tableName
}
`
,
pathname
:
`/b
iz/account/fieldConfig
`
,
state
:
{
id
:
record
.
tableName
,
template
:
record
,
tableScroll
:
document
.
querySelector
(
'.ant-table-body'
).
scrollTop
,
groupArr
:
groupArr
,
...
...
@@ -534,8 +535,9 @@ const TableManager = props => {
onDoubleClick
:
event
=>
{
event
.
stopPropagation
();
history
.
push
({
pathname
:
`/b
smanger/base/filedConfig/${record.tableName}
`
,
pathname
:
`/b
iz/account/fieldConfig
`
,
state
:
{
id
:
record
.
tableName
,
template
:
record
,
tableScroll
:
document
.
querySelector
(
'.ant-table-body'
).
scrollTop
,
groupArr
:
groupArr
,
...
...
src/pages/bsmanager/workOrder/incident/incident.jsx
View file @
235cebb3
...
...
@@ -400,14 +400,14 @@ const incident = () => {
const
process1
=
record
=>
{
history
.
push
({
pathname
:
'/b
smanger/workOrder/incid
entFlow'
,
pathname
:
'/b
iz/workflow/ev
entFlow'
,
state
:
{
formObj
:
record
,
title1
:
record
.
name
,
rember
},
});
};
const
auxiliaryView1
=
record
=>
{
history
.
push
({
pathname
:
'/b
smanger/workOrder/incid
entView'
,
pathname
:
'/b
iz/workflow/ev
entView'
,
state
:
{
formObj
:
record
,
title2
:
record
.
name
,
rember
},
});
};
...
...
src/pages/bsmanager/workOrder/incident/incidentFlow.jsx
View file @
235cebb3
...
...
@@ -107,7 +107,7 @@ const incidentFlow = props => {
const
back
=
()
=>
{
let
{
rember
}
=
props
.
location
.
state
;
history
.
push
({
pathname
:
'/b
smanger/workOrder/incid
ent'
,
pathname
:
'/b
iz/workflow/ev
ent'
,
state
:
{
rember
},
});
};
...
...
src/pages/bsmanager/workOrder/incident/incidentView.jsx
View file @
235cebb3
...
...
@@ -209,7 +209,7 @@ const incidentView = props => {
const
back
=
()
=>
{
let
rember
=
props
.
location
.
state
.
rember
;
history
.
push
({
pathname
:
'/b
smanger/workOrder/incid
ent'
,
pathname
:
'/b
iz/workflow/ev
ent'
,
state
:
{
rember
},
});
};
...
...
src/pages/bsmanager/workOrder/workFlow/flow.jsx
View file @
235cebb3
...
...
@@ -115,7 +115,7 @@ const Flow = () => {
const
toNode
=
flowName
=>
{
console
.
log
(
flowName
);
history
.
push
({
pathname
:
'/b
smanger/workOrder/flow
Node'
,
pathname
:
'/b
iz/workflow/case
Node'
,
state
:
{
flowName
,
pickItemIndex
},
});
};
...
...
src/pages/bsmanager/workOrder/workFlow/flowNode/flowNode.jsx
View file @
235cebb3
...
...
@@ -306,7 +306,7 @@ const FlowNode = () => {
// 返回
const
backFlow
=
()
=>
{
history
.
push
({
pathname
:
'/b
smanger/workOrder/flow
'
,
pathname
:
'/b
iz/workflow/case
'
,
state
:
{
pickItemIndex
},
});
};
...
...
src/pages/platformCenter/messageManage/projectManage/ProjectManage.jsx
View file @
235cebb3
...
...
@@ -230,7 +230,7 @@ const ProjectManage = props => {
const
changeDesc
=
record
=>
{
setCurrentTempalte
(
record
);
history
.
push
({
pathname
:
`/platform
Center
/schemeDetail`
,
pathname
:
`/platform/schemeDetail`
,
state
:
{
template
:
record
,
currentPage
},
});
// handleShowModal("editVisible", true)
...
...
@@ -298,7 +298,7 @@ const ProjectManage = props => {
setCurrentTempalte
({});
// handleShowModal("addVisible", true)
history
.
push
({
pathname
:
`/platform
Center
/schemeDetail`
,
pathname
:
`/platform/schemeDetail`
,
state
:
{
template
:
{}
},
});
};
...
...
src/pages/platformCenter/messageManage/schemeDetail/schemeDetail.jsx
View file @
235cebb3
...
...
@@ -353,7 +353,7 @@ const EditModal = props => {
};
const
back
=
()
=>
{
history
.
push
({
pathname
:
'/platform
Center/notify
'
,
pathname
:
'/platform
/notification
'
,
query
:
{
currentPage
,
},
...
...
src/routes/config.js
View file @
235cebb3
...
...
@@ -106,13 +106,13 @@ export default {
component
:
InitDataBase
,
},
{
path
:
'/dbm/db
sm
'
,
path
:
'/dbm/db
Update
'
,
name
:
'数据库升级'
,
authority
:
adminAuthority
,
component
:
ManagementDataBase
,
},
{
path
:
'/dbm/
connectConfig
'
,
path
:
'/dbm/
dbSource
'
,
name
:
'多数据源'
,
authority
:
adminAuthority
,
component
:
DatabaseConnectConfig
,
...
...
@@ -120,145 +120,145 @@ export default {
],
},
{
path
:
'/
userCenter
'
,
path
:
'/
authority
'
,
name
:
'组织架构'
,
component
:
BlankLayout
,
icon
:
<
UsergroupAddOutlined
style
=
{
iconStyle
}
/>
,
routes
:
[
{
path
:
'/
userCenter/UserManage
'
,
path
:
'/
authority/user
'
,
name
:
'机构管理'
,
component
:
UserManage
,
},
{
path
:
'/
userCenter/RoleManag
e'
,
path
:
'/
authority/rol
e'
,
name
:
'角色管理'
,
component
:
RoleManage
,
},
{
path
:
'/
userCenter/SiteManage
'
,
path
:
'/
authority/station
'
,
name
:
'站点管理'
,
component
:
SiteManage
,
},
],
},
{
path
:
'/
productCenter
'
,
path
:
'/
application
'
,
component
:
BlankLayout
,
name
:
'应用搭建'
,
icon
:
<
AppstoreOutlined
style
=
{
iconStyle
}
/>
,
routes
:
[
{
path
:
'/
productCenter
/product'
,
path
:
'/
application
/product'
,
name
:
'产品授权'
,
component
:
ProductConfig
,
},
{
path
:
'/
productCenter
/web'
,
path
:
'/
application
/web'
,
name
:
'Web搭建'
,
component
:
WebConfigPage
,
},
{
path
:
'/
productCenter/app
'
,
path
:
'/
application/mobile
'
,
name
:
'Mobile搭建'
,
component
:
MobileConfigPage
,
},
],
},
{
path
:
'/b
smanger
'
,
path
:
'/b
iz
'
,
component
:
BlankLayout
,
name
:
'台账/工作流'
,
icon
:
<
CreditCardOutlined
style
=
{
iconStyle
}
/>
,
routes
:
[
{
path
:
'/b
smanger/base
'
,
path
:
'/b
iz/account
'
,
name
:
'台账'
,
component
:
BlankLayout
,
routes
:
[
{
path
:
'/b
smanger/base/tablemanger
'
,
path
:
'/b
iz/account/table
'
,
name
:
'表/字段'
,
component
:
TableManager
,
},
{
path
:
'/b
smanger/base/filedConfig/:id
'
,
path
:
'/b
iz/account/fieldConfig
'
,
name
:
'字段配置'
,
component
:
FiledConfig
,
hideMenu
:
true
,
},
{
path
:
'/b
smanger/base/standingBook
'
,
path
:
'/b
iz/account/list
'
,
name
:
'台账列表'
,
component
:
StandingBook
,
},
],
},
{
path
:
'/b
smanger/workOrder
'
,
path
:
'/b
iz/workflow
'
,
name
:
'工作流'
,
component
:
BlankLayout
,
routes
:
[
{
path
:
'/b
smanger/workOrder/incid
ent'
,
path
:
'/b
iz/workflow/ev
ent'
,
name
:
'事件'
,
component
:
Incident
,
},
{
path
:
'/b
smanger/workOrder/incid
entFlow'
,
path
:
'/b
iz/workflow/ev
entFlow'
,
name
:
'事件受理流程'
,
hideMenu
:
true
,
component
:
IncidentFlow
,
},
{
path
:
'/b
smanger/workOrder/incid
entView'
,
path
:
'/b
iz/workflow/ev
entView'
,
name
:
'事件辅助视图'
,
hideMenu
:
true
,
component
:
IncidentView
,
},
{
path
:
'/b
smanger/workOrder/flow
'
,
name
:
'
流程
'
,
path
:
'/b
iz/workflow/case
'
,
name
:
'
工单
'
,
component
:
Flow
,
},
{
path
:
'/b
smanger/workOrder/flow
Node'
,
path
:
'/b
iz/workflow/case
Node'
,
name
:
'流程节点'
,
hideMenu
:
true
,
component
:
FlowNode
,
},
{
path
:
'/b
smanger/workOrder/Workflow
'
,
path
:
'/b
iz/workflow/editor
'
,
name
:
'工作流编辑'
,
component
:
Workflow
,
},
],
},
{
path
:
'/b
smanger
/maintenance'
,
path
:
'/b
iz
/maintenance'
,
name
:
'巡维保'
,
component
:
Maintenance
,
},
],
},
{
path
:
'/platform
Center
'
,
path
:
'/platform'
,
component
:
BlankLayout
,
name
:
'平台管理'
,
icon
:
<
FundProjectionScreenOutlined
style
=
{
iconStyle
}
/>
,
routes
:
[
{
path
:
'/platform
Center
/gis'
,
path
:
'/platform/gis'
,
name
:
'GIS平台'
,
component
:
BlankLayout
,
routes
:
[
{
path
:
'/platform
Center/gis/twoDimensionConfig
'
,
path
:
'/platform
/gis/map
'
,
name
:
'地图配置'
,
component
:
SchemeConfig
,
},
{
path
:
'/platform
Center/gis/threeDimensionConfig
'
,
path
:
'/platform
/gis/3Dmap
'
,
name
:
'三维配置'
,
component
:
DimensionsConfig
,
},
...
...
@@ -286,23 +286,23 @@ export default {
// ],
},
{
path
:
'/platform
Center/notify
'
,
path
:
'/platform
/notification
'
,
name
:
'消息中心'
,
component
:
MessageManager
,
},
{
path
:
'/platform
Center/S
chemeDetail'
,
path
:
'/platform
/s
chemeDetail'
,
name
:
'模板编辑'
,
component
:
SchemeDetail
,
hideMenu
:
true
,
},
{
path
:
'/platform
Center
/video'
,
path
:
'/platform/video'
,
name
:
'视频'
,
component
:
VideoManager
,
},
{
path
:
'/platform
Center/iot
'
,
path
:
'/platform
/configuration
'
,
name
:
'组态'
,
component
:
BaseFrameContainer
,
// tabs: [
...
...
@@ -324,7 +324,7 @@ export default {
// ],
},
{
path
:
'/platform
Center/emq
'
,
path
:
'/platform
/host
'
,
name
:
'宿主管理'
,
url
:
'/web4/?widget=product/oms/MqttConfig/MqttConfig.js|hideMap=true'
,
component
:
HostManager
,
...
...
@@ -333,7 +333,7 @@ export default {
},
{
path
:
'/data
Center/dictionary
'
,
path
:
'/data
/dic
'
,
name
:
'数据字典'
,
icon
:
<
ReadOutlined
style
=
{
iconStyle
}
/>
,
component
:
Dictionary
,
...
...
@@ -352,23 +352,23 @@ export default {
// ],
// },
{
path
:
'/
log
'
,
path
:
'/
system
'
,
component
:
BlankLayout
,
name
:
'系统日志'
,
icon
:
<
FileTextOutlined
style
=
{
iconStyle
}
/>
,
routes
:
[
{
path
:
'/
log/s
ervice'
,
path
:
'/
system/apiS
ervice'
,
name
:
'服务监控'
,
component
:
ServiceLog
,
},
{
path
:
'/
log/login
'
,
path
:
'/
system/loginLog
'
,
name
:
'登录日志'
,
component
:
LoginLog
,
},
{
path
:
'/
log
/omsLog'
,
path
:
'/
system
/omsLog'
,
name
:
'运维痕迹'
,
component
:
OmsLog
,
},
...
...
src/utils/authority.js
View file @
235cebb3
import
RenderAuthorize
from
'@/components/Authorized/index.jsx'
;
import
{
isDev
}
from
'./tools.ts'
;
// const isDev = false;
...
...
@@ -43,14 +44,14 @@ export default Authorized;
// use localStorage to store the authority info, which might be sent from server in actual project.
export
function
getAuthority
(
str
)
{
const
isSandBox
=
getQueryVariable
(
'
isS
andbox'
);
const
sandbox
=
sessionStorage
.
getItem
(
'
isS
andbox'
);
const
isSandBox
=
getQueryVariable
(
'
s
andbox'
);
const
sandbox
=
sessionStorage
.
getItem
(
'
s
andbox'
);
if
(
!
isDev
)
{
// return [...auth];
// 支持可以指直接访问
if
(
isSandBox
==
'true'
)
{
sessionStorage
.
setItem
(
'
isS
andbox'
,
isSandBox
);
sessionStorage
.
setItem
(
'
s
andbox'
,
isSandBox
);
return
[
'LOGIN'
,
'admin'
];
}
if
(
sandbox
==
'true'
)
{
...
...
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