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
39a277af
Commit
39a277af
authored
Jan 20, 2022
by
皮倩雯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: '重构站点管理勾选站点人员模块'
parent
7b02121e
Pipeline
#43210
skipped with stages
Changes
5
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
39 additions
and
38 deletions
+39
-38
AddModal.jsx
src/pages/bsmanager/workOrder/incident/AddModal.jsx
+5
-1
ProxyConfig.jsx
...es/platformCenter/hostmanager/proxyConfig/ProxyConfig.jsx
+17
-17
index.jsx
src/pages/platformCenter/videoManager/index.jsx
+7
-20
SiteManage.jsx
src/pages/userCenter/siteManage/SiteManage.jsx
+0
-0
api.js
src/services/siteManage/api.js
+10
-0
No files found.
src/pages/bsmanager/workOrder/incident/AddModal.jsx
View file @
39a277af
...
...
@@ -1272,7 +1272,11 @@ const AddModal = props => {
},
]
}
>
<
Input
value=
{
prefixName
}
placeholder=
"请输入编码前缀"
/>
<
Input
value=
{
prefixName
}
placeholder=
"请输入编码前缀"
style=
{
{
marginLeft
:
'-3px'
}
}
/>
</
Item
>
</
Col
>
<
Col
span=
{
24
}
>
...
...
src/pages/platformCenter/hostmanager/proxyConfig/ProxyConfig.jsx
View file @
39a277af
...
...
@@ -59,7 +59,7 @@ const ProxyConfig = () => {
OperateStopNginx
();
}
};
//开启Nginx
//
开启Nginx
const
OperateStartNginx
=
()
=>
{
StartNginx
().
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
...
...
@@ -70,7 +70,7 @@ const ProxyConfig = () => {
}
});
};
//停止Nginx
//
停止Nginx
const
OperateStopNginx
=
()
=>
{
StopNginx
().
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
...
...
@@ -81,7 +81,7 @@ const ProxyConfig = () => {
}
});
};
//开启/关闭缓存
//
开启/关闭缓存
const
OperateNginxCache
=
isOpen
=>
{
NginxCache
({
isOpen
:
isOpen
?
1
:
0
,
...
...
@@ -94,7 +94,7 @@ const ProxyConfig = () => {
}
});
};
//开启/关闭日志
//
开启/关闭日志
const
OperateNginxLog
=
isOpen
=>
{
NginxLog
({
isOpen
:
isOpen
?
1
:
0
,
...
...
@@ -133,7 +133,6 @@ const ProxyConfig = () => {
Object
.
keys
(
currentConfig
).
forEach
(
k
=>
{
obj
[
k
]
=
res
.
data
[
k
];
});
console
.
log
(
obj
);
form
.
setFieldsValue
(
obj
);
}
else
{
message
.
errorInfo
(
res
.
msg
);
...
...
@@ -181,22 +180,24 @@ const ProxyConfig = () => {
</
div
>
<
Divider
/>
<
Form
.
Item
style=
{
{
marginLeft
:
'20px'
}
}
label=
"端口(ngnix)"
style=
{
{
marginLeft
:
'12px'
}
}
label=
"Nginx端口"
labelAlign=
"right"
name=
"NginxPort"
rules=
{
[
{
required
:
true
,
pattern
:
new
RegExp
(
/^
[
1-9
]\d
*$/
,
'g'
),
message
:
'请输入
ngni
x端口,例如:8091'
,
message
:
'请输入
Ngin
x端口,例如:8091'
,
},
]
}
>
<
Input
style=
{
{
marginLeft
:
'15px'
,
width
:
'300px'
}
}
placeholder=
"请输入ngni
x端口"
/>
<
Input
style=
{
{
width
:
'300px'
}
}
placeholder=
"请输入Ngin
x端口"
/>
</
Form
.
Item
>
<
Form
.
Item
style=
{
{
marginLeft
:
'20px'
}
}
label=
"地址(IIS)"
style=
{
{
marginLeft
:
'34px'
}
}
label=
"IIS地址"
labelAlign=
"right"
name=
"IISIPProt"
rules=
{
[
{
...
...
@@ -208,15 +209,14 @@ const ProxyConfig = () => {
message
:
'请输入正确的IP例如:192.168.12.231:8231'
,
},
]
}
hasFeedback
>
<
Input
style=
{
{
marginLeft
:
'34px'
,
width
:
'300px'
}
}
placeholder=
"请输入IIS地址"
/>
<
Input
style=
{
{
width
:
'300px'
}
}
placeholder=
"请输入IIS地址"
/>
</
Form
.
Item
>
<
Form
.
Item
style=
{
{
marginLeft
:
'20px'
}
}
label=
"地址(EMQ)"
label=
"EMQ地址"
labelAlign=
"right"
name=
"EMQIPPort"
hasFeedback
rules=
{
[
{
required
:
true
,
...
...
@@ -228,10 +228,10 @@ const ProxyConfig = () => {
},
]
}
>
<
Input
style=
{
{
marginLeft
:
'18px'
,
width
:
'300px'
}
}
placeholder=
"请输入EMQ地址"
/>
<
Input
style=
{
{
width
:
'300px'
}
}
placeholder=
"请输入EMQ地址"
/>
</
Form
.
Item
>
<
Form
.
Item
>
<
Button
type=
"primary"
htmlType=
"submit"
style=
{
{
marginLeft
:
'1
30
px'
}
}
>
<
Button
type=
"primary"
htmlType=
"submit"
style=
{
{
marginLeft
:
'1
03
px'
}
}
>
保存
</
Button
>
</
Form
.
Item
>
...
...
src/pages/platformCenter/videoManager/index.jsx
View file @
39a277af
...
...
@@ -28,10 +28,7 @@ import {
}
from
'@ant-design/icons'
;
import
voca
from
'voca'
;
import
styles
from
'./index.less'
;
import
{
GetVideoConfigList
,
deleteInsertVideoConfig
,
}
from
'@/services/videoManger/videoManger'
;
import
{
GetVideoConfigList
,
deleteInsertVideoConfig
}
from
'@/services/videoManger/videoManger'
;
import
AddModal
from
'./AddModal'
;
import
CheckModal
from
'./CheckModal'
;
import
VideoModal
from
'./VideoModal'
;
...
...
@@ -149,10 +146,7 @@ const videoManager = () => {
render
:
record
=>
(
<
Space
size=
"middle"
>
<
Tooltip
title=
"编辑"
>
<
EditTwoTone
onClick=
{
()
=>
edit
(
record
)
}
style=
{
{
fontSize
:
'16px'
}
}
/>
<
EditTwoTone
onClick=
{
()
=>
edit
(
record
)
}
style=
{
{
fontSize
:
'16px'
}
}
/>
</
Tooltip
>
<
Tooltip
title=
"预览"
>
<
VideoCameraOutlined
...
...
@@ -171,10 +165,7 @@ const videoManager = () => {
placement=
"bottomRight"
title=
{
<
p
>
即将删除
{
' '
}
<
span
className=
{
styles
.
redText
}
>
{
voca
.
stripTags
(
record
.
Name
)
}
</
span
>
即将删除
<
span
className=
{
styles
.
redText
}
>
{
voca
.
stripTags
(
record
.
Name
)
}
</
span
>
,是否确认删除?
</
p
>
}
...
...
@@ -194,10 +185,7 @@ const videoManager = () => {
const
searchStyle
=
val
=>
{
let
n
;
if
(
showSearchStyle
)
{
n
=
val
.
replace
(
new
RegExp
(
searchWord
,
'g'
),
`<span style='color:red'>
${
searchWord
}
</span>`
,
);
n
=
val
.
replace
(
new
RegExp
(
searchWord
,
'g'
),
`<span style='color:red'>
${
searchWord
}
</span>`
);
}
else
{
n
=
val
;
}
...
...
@@ -356,12 +344,12 @@ const videoManager = () => {
<
Col
span=
{
24
}
>
<
span
>
配置类型:
</
span
>
<
Select
defaultValue=
"
莹
石云"
defaultValue=
"
萤
石云"
value=
{
configurationType
}
onChange=
{
selectChange
}
className=
{
styles
.
sel
}
>
<
Option
value=
"1"
>
莹
石云
</
Option
>
<
Option
value=
"1"
>
萤
石云
</
Option
>
<
Option
value=
"2"
>
海康
</
Option
>
<
Option
value=
"3"
>
海康1.2
</
Option
>
<
Option
value=
"4"
>
海康NVR
</
Option
>
...
...
@@ -415,8 +403,7 @@ const videoManager = () => {
},
// 双击
})
}
pagination=
{
{
showTotal
:
(
total
,
range
)
=>
`第${range[0]}-${range[1]} 条/共 ${total} 条`
,
showTotal
:
(
total
,
range
)
=>
`第${range[0]}-${range[1]} 条/共 ${total} 条`
,
pageSizeOptions
:
[
10
,
20
,
50
,
100
],
defaultPageSize
:
20
,
showQuickJumper
:
true
,
...
...
src/pages/userCenter/siteManage/SiteManage.jsx
View file @
39a277af
This diff is collapsed.
Click to expand it.
src/services/siteManage/api.js
View file @
39a277af
/*
* @Description:
* @Author: leizhe
* @Date: 2022-01-13 17:26:14
* @LastEditTime: 2022-01-19 17:00:53
* @LastEditors: leizhe
*/
import
{
get
,
post
,
CITY_SERVICE
,
PUBLISH_SERVICE
}
from
'@/services/index'
;
/*
...
...
@@ -37,6 +44,9 @@ export const getStationUserList = params =>
// 获取站点管理一二级列表+分页
export
const
groupUserPagingList
=
params
=>
post
(
`
${
PUBLISH_SERVICE
}
/UserCenter/GroupUserPagingList`
,
params
);
export
const
getGroupUserTree
=
params
=>
get
(
`
${
PUBLISH_SERVICE
}
/UserCenter/GetGroupUserTree`
,
params
);
// 添加子站点
export
const
addChildSiteNode
=
params
=>
get
(
`
${
PUBLISH_SERVICE
}
/UserCenter/AddChildSiteNode`
,
params
);
...
...
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