Commit 39a277af authored by 皮倩雯's avatar 皮倩雯

fix: '重构站点管理勾选站点人员模块'

parent 7b02121e
Pipeline #43210 skipped with stages
...@@ -1272,7 +1272,11 @@ const AddModal = props => { ...@@ -1272,7 +1272,11 @@ const AddModal = props => {
}, },
]} ]}
> >
<Input value={prefixName} placeholder="请输入编码前缀" /> <Input
value={prefixName}
placeholder="请输入编码前缀"
style={{ marginLeft: '-3px' }}
/>
</Item> </Item>
</Col> </Col>
<Col span={24}> <Col span={24}>
......
...@@ -59,7 +59,7 @@ const ProxyConfig = () => { ...@@ -59,7 +59,7 @@ const ProxyConfig = () => {
OperateStopNginx(); OperateStopNginx();
} }
}; };
//开启Nginx // 开启Nginx
const OperateStartNginx = () => { const OperateStartNginx = () => {
StartNginx().then(res => { StartNginx().then(res => {
if (res.code === 0) { if (res.code === 0) {
...@@ -70,7 +70,7 @@ const ProxyConfig = () => { ...@@ -70,7 +70,7 @@ const ProxyConfig = () => {
} }
}); });
}; };
//停止Nginx // 停止Nginx
const OperateStopNginx = () => { const OperateStopNginx = () => {
StopNginx().then(res => { StopNginx().then(res => {
if (res.code === 0) { if (res.code === 0) {
...@@ -81,7 +81,7 @@ const ProxyConfig = () => { ...@@ -81,7 +81,7 @@ const ProxyConfig = () => {
} }
}); });
}; };
//开启/关闭缓存 // 开启/关闭缓存
const OperateNginxCache = isOpen => { const OperateNginxCache = isOpen => {
NginxCache({ NginxCache({
isOpen: isOpen ? 1 : 0, isOpen: isOpen ? 1 : 0,
...@@ -94,7 +94,7 @@ const ProxyConfig = () => { ...@@ -94,7 +94,7 @@ const ProxyConfig = () => {
} }
}); });
}; };
//开启/关闭日志 // 开启/关闭日志
const OperateNginxLog = isOpen => { const OperateNginxLog = isOpen => {
NginxLog({ NginxLog({
isOpen: isOpen ? 1 : 0, isOpen: isOpen ? 1 : 0,
...@@ -133,7 +133,6 @@ const ProxyConfig = () => { ...@@ -133,7 +133,6 @@ const ProxyConfig = () => {
Object.keys(currentConfig).forEach(k => { Object.keys(currentConfig).forEach(k => {
obj[k] = res.data[k]; obj[k] = res.data[k];
}); });
console.log(obj);
form.setFieldsValue(obj); form.setFieldsValue(obj);
} else { } else {
message.errorInfo(res.msg); message.errorInfo(res.msg);
...@@ -181,22 +180,24 @@ const ProxyConfig = () => { ...@@ -181,22 +180,24 @@ const ProxyConfig = () => {
</div> </div>
<Divider /> <Divider />
<Form.Item <Form.Item
style={{ marginLeft: '20px' }} style={{ marginLeft: '12px' }}
label="端口(ngnix)" label="Nginx端口"
labelAlign="right"
name="NginxPort" name="NginxPort"
rules={[ rules={[
{ {
required: true, required: true,
pattern: new RegExp(/^[1-9]\d*$/, 'g'), pattern: new RegExp(/^[1-9]\d*$/, 'g'),
message: '请输入ngnix端口,例如:8091', message: '请输入Nginx端口,例如:8091',
}, },
]} ]}
> >
<Input style={{ marginLeft: '15px', width: '300px' }} placeholder="请输入ngnix端口" /> <Input style={{ width: '300px' }} placeholder="请输入Nginx端口" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
style={{ marginLeft: '20px' }} style={{ marginLeft: '34px' }}
label="地址(IIS)" label="IIS地址"
labelAlign="right"
name="IISIPProt" name="IISIPProt"
rules={[ rules={[
{ {
...@@ -208,15 +209,14 @@ const ProxyConfig = () => { ...@@ -208,15 +209,14 @@ const ProxyConfig = () => {
message: '请输入正确的IP例如:192.168.12.231:8231', 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>
<Form.Item <Form.Item
style={{ marginLeft: '20px' }} style={{ marginLeft: '20px' }}
label="地址(EMQ)" label="EMQ地址"
labelAlign="right"
name="EMQIPPort" name="EMQIPPort"
hasFeedback
rules={[ rules={[
{ {
required: true, required: true,
...@@ -228,10 +228,10 @@ const ProxyConfig = () => { ...@@ -228,10 +228,10 @@ const ProxyConfig = () => {
}, },
]} ]}
> >
<Input style={{ marginLeft: '18px', width: '300px' }} placeholder="请输入EMQ地址" /> <Input style={{ width: '300px' }} placeholder="请输入EMQ地址" />
</Form.Item> </Form.Item>
<Form.Item> <Form.Item>
<Button type="primary" htmlType="submit" style={{ marginLeft: '130px' }}> <Button type="primary" htmlType="submit" style={{ marginLeft: '103px' }}>
保存 保存
</Button> </Button>
</Form.Item> </Form.Item>
......
...@@ -28,10 +28,7 @@ import { ...@@ -28,10 +28,7 @@ import {
} from '@ant-design/icons'; } from '@ant-design/icons';
import voca from 'voca'; import voca from 'voca';
import styles from './index.less'; import styles from './index.less';
import { import { GetVideoConfigList, deleteInsertVideoConfig } from '@/services/videoManger/videoManger';
GetVideoConfigList,
deleteInsertVideoConfig,
} from '@/services/videoManger/videoManger';
import AddModal from './AddModal'; import AddModal from './AddModal';
import CheckModal from './CheckModal'; import CheckModal from './CheckModal';
import VideoModal from './VideoModal'; import VideoModal from './VideoModal';
...@@ -149,10 +146,7 @@ const videoManager = () => { ...@@ -149,10 +146,7 @@ const videoManager = () => {
render: record => ( render: record => (
<Space size="middle"> <Space size="middle">
<Tooltip title="编辑"> <Tooltip title="编辑">
<EditTwoTone <EditTwoTone onClick={() => edit(record)} style={{ fontSize: '16px' }} />
onClick={() => edit(record)}
style={{ fontSize: '16px' }}
/>
</Tooltip> </Tooltip>
<Tooltip title="预览"> <Tooltip title="预览">
<VideoCameraOutlined <VideoCameraOutlined
...@@ -171,10 +165,7 @@ const videoManager = () => { ...@@ -171,10 +165,7 @@ const videoManager = () => {
placement="bottomRight" placement="bottomRight"
title={ title={
<p> <p>
即将删除{' '} 即将删除 <span className={styles.redText}>{voca.stripTags(record.Name)}</span>
<span className={styles.redText}>
{voca.stripTags(record.Name)}
</span>
,是否确认删除? ,是否确认删除?
</p> </p>
} }
...@@ -194,10 +185,7 @@ const videoManager = () => { ...@@ -194,10 +185,7 @@ const videoManager = () => {
const searchStyle = val => { const searchStyle = val => {
let n; let n;
if (showSearchStyle) { if (showSearchStyle) {
n = val.replace( n = val.replace(new RegExp(searchWord, 'g'), `<span style='color:red'>${searchWord}</span>`);
new RegExp(searchWord, 'g'),
`<span style='color:red'>${searchWord}</span>`,
);
} else { } else {
n = val; n = val;
} }
...@@ -356,12 +344,12 @@ const videoManager = () => { ...@@ -356,12 +344,12 @@ const videoManager = () => {
<Col span={24}> <Col span={24}>
<span>配置类型:</span> <span>配置类型:</span>
<Select <Select
defaultValue="石云" defaultValue="石云"
value={configurationType} value={configurationType}
onChange={selectChange} onChange={selectChange}
className={styles.sel} className={styles.sel}
> >
<Option value="1">石云</Option> <Option value="1">石云</Option>
<Option value="2">海康</Option> <Option value="2">海康</Option>
<Option value="3">海康1.2</Option> <Option value="3">海康1.2</Option>
<Option value="4">海康NVR</Option> <Option value="4">海康NVR</Option>
...@@ -415,8 +403,7 @@ const videoManager = () => { ...@@ -415,8 +403,7 @@ const videoManager = () => {
}, // 双击 }, // 双击
})} })}
pagination={{ pagination={{
showTotal: (total, range) => showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
`第${range[0]}-${range[1]} 条/共 ${total} 条`,
pageSizeOptions: [10, 20, 50, 100], pageSizeOptions: [10, 20, 50, 100],
defaultPageSize: 20, defaultPageSize: 20,
showQuickJumper: true, showQuickJumper: true,
......
/*
* @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'; import { get, post, CITY_SERVICE, PUBLISH_SERVICE } from '@/services/index';
/* /*
...@@ -37,6 +44,9 @@ export const getStationUserList = params => ...@@ -37,6 +44,9 @@ export const getStationUserList = params =>
// 获取站点管理一二级列表+分页 // 获取站点管理一二级列表+分页
export const groupUserPagingList = params => export const groupUserPagingList = params =>
post(`${PUBLISH_SERVICE}/UserCenter/GroupUserPagingList`, params); post(`${PUBLISH_SERVICE}/UserCenter/GroupUserPagingList`, params);
export const getGroupUserTree = params =>
get(`${PUBLISH_SERVICE}/UserCenter/GetGroupUserTree`, params);
// 添加子站点 // 添加子站点
export const addChildSiteNode = params => export const addChildSiteNode = params =>
get(`${PUBLISH_SERVICE}/UserCenter/AddChildSiteNode`, params); get(`${PUBLISH_SERVICE}/UserCenter/AddChildSiteNode`, params);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment