Skip to content

C
CivManage
Commit edd403c8 authored by 张烨's avatar 张烨
Browse files
Options

Merge branch 'master' of https://g.civnet.cn:8443/test/maintenance

parents 7d3ca512 23d0703a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 296 additions and 56 deletions
src/pages/database/CurrentSolution.less
View file @ edd403c8
.divbox{
display: flex;
display: flex!important;
align-items: center;
}
.cardbox{
......@@ -7,7 +7,7 @@
}
.btnBox{
margin-top: 40px;
display: flex;
display: flex!important;
justify-content: center;
align-items: center;
}
......
src/pages/database/InitDataBase.jsx
View file @ edd403c8
......@@ -224,7 +224,7 @@ const InitDataBase = props => {
setCardLoading(false);
if (res.GetMe === true) {
notification.success({
message: '通知',
message: '提示',
duration: 3,
description: '连接成功',
});
......@@ -257,7 +257,7 @@ const InitDataBase = props => {
setOption(res.root);
} else {
notification.error({
message: '通知',
message: '提示',
duration: 15,
description: res.message,
});
......
src/pages/userCenter/roleManage/AddModal.jsx
View file @ edd403c8
import React, { useState } from 'react';
import { Form, Input, notification } from 'antd';
import React, { useState, useEffect } from 'react';
import { Form, Input, notification, Select } from 'antd';
import SiteModal from '@/components/Modal/SiteModa';
import { addStation } from '@/services/userCenter/siteManage/api';
import { addRole, getRoleGroup } from '@/services/userCenter/roleManage/api';
const { Item } = Form;
const { Option } = Select;
const AddModal = props => {
const [form] = Form.useForm();
const [formLayout, setFormLayout] = useState('horizontal');
const [groupList, setGroupList] = useState([]);
const [loading, setLoading] = useState(false);
const { confirmModal } = props;
const { confirmModal, itemObj } = props;
useEffect(() => {
itemObj.groupflag &&
form.setFieldsValue({
group: itemObj.groupflag,
});
return () => {
form.resetFields();
};
}, [itemObj]);
const onSubmit = () => {
form
.validateFields()
.then(res => {
console.log(res, 'res');
setLoading(true);
addStation({
stationName: res.stationName,
addRole({
roleName: res.roleName,
description: res.description,
group: res.group,
subSystemValue: itemObj.subSystemValue || itemObj.visibleValue || '',
_version: 9999,
_dc: new Date().getTime(),
})
......@@ -25,7 +38,7 @@ const AddModal = props => {
if (res.success) {
form.resetFields();
notification.success({
message: '通知',
message: '提示',
duration: 3,
description: '新增成功',
});
......@@ -33,7 +46,7 @@ const AddModal = props => {
} else {
notification.error({
message: '提示',
duration: 3,
duration: 15,
description: res.message,
});
}
......@@ -51,6 +64,38 @@ const AddModal = props => {
console.error(err);
});
};
const onChange = value => {
console.log(value);
const { length } = value;
form.setFieldsValue({
group: value[length - 1],
});
};
// 获取分组列表
const selectFocus = e => {
setGroupList([]);
getRoleGroup({
_version: 9999,
_dc: Date.now(),
subSystemValue: itemObj.subSystemValue || itemObj.visibleValue || '',
subSystemName: itemObj.subSystemValue || itemObj.visibleValue || '',
})
.then(res => {
if (res) {
setGroupList(res);
} else {
notification.error({
message: '提示',
duration: 15,
description: res.message,
});
setGroupList([]);
}
})
.catch(err => {
console.error(err);
});
};
const onFinish = value => {};
return (
......@@ -58,11 +103,11 @@ const AddModal = props => {
{...props}
title="新增角色"
bodyStyle={{ width: '100%', minHeight: '100px' }}
style={{ top: 200, borderRadius: '20px' }}
style={{ top: 100 }}
width="600px"
destroyOnClose
cancelText="取消"
okText="确认选择"
okText="确认"
onOk={() => onSubmit()}
confirmLoading={loading}
>
......@@ -74,7 +119,7 @@ const AddModal = props => {
>
<Item
label="角色名称"
name="stationName"
name="roleName"
rules={[
{
required: true,
......@@ -84,7 +129,27 @@ const AddModal = props => {
>
<Input placeholder="请输入角色名称" />
</Item>
<Item label="角色类别">all</Item>
<Item label="角色类别" name="subSystemValue">
{itemObj.subSystemValue || itemObj.visibleValue}
</Item>
<Item label="角色分组" name="group">
<Select
mode="tags"
placeholder="请选择分组"
onFocus={() => {
selectFocus();
}}
onChange={e => {
onChange(e);
}}
>
{groupList.map((item, index) => (
<Option value={item.value} key={index}>
{item.text}
</Option>
))}
</Select>
</Item>
<Item label="角色描述" name="description">
<Input placeholder="请输入角色描述" />
</Item>
......
src/pages/userCenter/roleManage/DelModal.jsx
View file @ edd403c8
import React, { useState } from 'react';
import { notification } from 'antd';
import SiteModal from '@/components/Modal/SiteModa';
import { deleteStation } from '@/services/userCenter/siteManage/api';
import { deleteRole } from '@/services/userCenter/roleManage/api';
const DelModal = props => {
const { confirmModal, stationId } = props;
const { confirmModal, itemObj } = props;
const [loading, setLoading] = useState(false);
const onSubmit = props => {
setLoading(true);
deleteStation({
stationID: stationId,
deleteRole({
roleID: itemObj.roleID || '',
_version: 9999,
_dc: new Date().getTime(),
})
......@@ -47,11 +47,15 @@ const DelModal = props => {
width="400px"
destroyOnClose
cancelText="取消"
okText="确认删除"
okText="确认"
onOk={() => onSubmit()}
confirmLoading={loading}
>
是否删除该角色?
是否删除角色
<span style={{ color: 'red' }}>
{itemObj.roleName && itemObj.roleName}
</span>
?
</SiteModal>
);
};
......
src/pages/userCenter/roleManage/EditGroup.jsx 0 → 100644
View file @ edd403c8
import React, { useState, useEffect } from 'react';
import { notification, Form, Input } from 'antd';
import SiteModal from '@/components/Modal/SiteModa';
import { setRoleGroupName } from '@/services/userCenter/roleManage/api';
const { Item } = Form;
const EditGroup = props => {
const { confirmModal, itemObj } = props;
const [loading, setLoading] = useState(false);
const [form] = Form.useForm();
useEffect(() => {
console.log(itemObj.groupflag, 'flag');
form.setFieldsValue({
newName: itemObj.groupflag,
});
}, [itemObj]);
const onSubmit = props => {
setLoading(true);
setRoleGroupName({
subSystemValue: itemObj.visibleValue || itemObj.subSystemValue,
oldName: itemObj.groupflag,
newName: form.getFieldsValue().newName,
_version: 9999,
_dc: new Date().getTime(),
})
.then(res => {
setLoading(false);
if (res.success) {
form.resetFields();
notification.success({
message: '提示',
duration: 3,
description: '修改成功',
});
confirmModal();
} else {
notification.error({
message: '提示',
duration: 15,
description: res.message,
});
}
})
.catch(err => {
setLoading(false);
});
};
return (
<SiteModal
{...props}
title="编辑分组名称"
bodyStyle={{ width: '100%', minHeight: '50px' }}
style={{ top: 200 }}
width="600px"
destroyOnClose
cancelText="取消"
okText="确认"
onOk={() => onSubmit()}
confirmLoading={loading}
>
<Form form={form} wrapperCol={{ span: 20 }}>
<Item label="分组名称" name="newName">
<Input placeholder="请输入分组名称" />
</Item>
</Form>
</SiteModal>
);
};
export default EditGroup;
src/pages/userCenter/roleManage/EditModal.jsx
View file @ edd403c8
import React, { useState, useEffect, useRef } from 'react';
import { Form, Input, notification } from 'antd';
import React, { useState, useEffect } from 'react';
import { Form, Input, notification, Select } from 'antd';
import SiteModal from '@/components/Modal/SiteModa';
import { editStation } from '@/services/userCenter/siteManage/api';
import { editRole, getRoleGroup } from '@/services/userCenter/roleManage/api';
const { Item } = Form;
const EditModal = props => {
const { Option } = Select;
const AddModal = props => {
const [form] = Form.useForm();
const [formLayout, setFormLayout] = useState('horizontal');
const [groupList, setGroupList] = useState([]);
const [loading, setLoading] = useState(false);
const flag = useRef();
const { confirmModal, stationObj } = props;
const { confirmModal, itemObj } = props;
console.log(itemObj, 'itemObj');
useEffect(() => {
form.setFieldsValue({
roleName: itemObj.roleName,
description: itemObj.description,
group: itemObj.group,
subSystemValue: itemObj.subSystemValue,
});
}, [itemObj]);
const onSubmit = () => {
form
.validateFields()
.then(res => {
console.log(res, 'res');
setLoading(true);
flag.current = res;
editStation({
stationName: res.stationName,
editRole({
roleID: itemObj.roleID,
roleName: res.roleName,
description: res.description,
stationID: stationObj.stationID,
group: res.group,
subSystemValue: itemObj.subSystemValue || itemObj.visibleValue || '',
_version: 9999,
_dc: new Date().getTime(),
})
......@@ -27,7 +40,7 @@ const EditModal = props => {
if (res.success) {
form.resetFields();
notification.success({
message: '通知',
message: '提示',
duration: 3,
description: '编辑成功',
});
......@@ -53,29 +66,62 @@ const EditModal = props => {
console.error(err);
});
};
useEffect(() => {
const onChange = value => {
console.log(value);
const { length } = value;
form.setFieldsValue({
stationName: stationObj.text,
description: stationObj.description,
group: value[length - 1],
});
}, [stationObj]);
};
// 获取分组列表
const selectFocus = e => {
setGroupList([]);
getRoleGroup({
_version: 9999,
_dc: Date.now(),
subSystemValue: itemObj.subSystemValue || itemObj.visibleValue || '',
subSystemName: itemObj.subSystemValue || itemObj.visibleValue || '',
})
.then(res => {
if (res) {
setGroupList(res);
} else {
notification.error({
message: '提示',
duration: 15,
description: res.message,
});
setGroupList([]);
}
})
.catch(err => {
console.error(err);
});
};
const onFinish = value => {};
return (
<SiteModal
{...props}
title="编辑角色"
bodyStyle={{ width: '100%', minHeight: '100px' }}
style={{ top: 200, borderRadius: '20px' }}
style={{ top: 100 }}
width="600px"
destroyOnClose
cancelText="取消"
okText="确认编辑"
okText="确认"
onOk={() => onSubmit()}
confirmLoading={loading}
>
<Form form={form} layout={formLayout} labelCol={{ span: 4 }}>
<Form
form={form}
layout={formLayout}
onFinish={onFinish}
labelCol={{ span: 4 }}
>
<Item
label="角色名称"
name="stationName"
name="roleName"
rules={[
{
required: true,
......@@ -85,7 +131,27 @@ const EditModal = props => {
>
<Input placeholder="请输入角色名称" />
</Item>
<Item label="角色类别">all</Item>
<Item label="角色类别" name="subSystemValue">
{itemObj.subSystemValue || itemObj.visibleValue}
</Item>
<Item label="角色分组" name="group">
<Select
mode="tags"
placeholder="请选择分组"
onFocus={() => {
selectFocus();
}}
onChange={e => {
onChange(e);
}}
>
{groupList.map((item, index) => (
<Option value={item.value} key={index}>
{item.text}
</Option>
))}
</Select>
</Item>
<Item label="角色描述" name="description">
<Input placeholder="请输入角色描述" />
</Item>
......@@ -94,4 +160,4 @@ const EditModal = props => {
);
};
export default EditModal;
export default AddModal;
src/pages/userCenter/roleManage/RoleManage.less
View file @ edd403c8
.cardBox{
min-height: calc(100vh - 80px);
max-height: calc(100vh - 80px);
overflow-y: scroll;
min-height: calc(100vh - 200px);
// max-height: calc(100vh - 200px);
// overflow-y: scroll;
}
.ant-tree-node-content-wrapper-open{
display: flex;
......@@ -29,4 +29,11 @@
min-height: calc(100vh - 172px);
max-height: calc(100vh - 172px);
overflow-y: scroll;
}
:global{
.ant-tree-switcher{
display: flex;
align-items: center;
color:#1890FF;
}
}
\ No newline at end of file
src/pages/userCenter/siteManage/AddModal.jsx
View file @ edd403c8
......@@ -62,7 +62,7 @@ const AddModal = props => {
width="600px"
destroyOnClose
cancelText="取消"
okText="确认选择"
okText="确认"
onOk={() => onSubmit()}
confirmLoading={loading}
>
......
src/pages/userCenter/siteManage/DelModal.jsx
View file @ edd403c8
......@@ -47,7 +47,7 @@ const DelModal = props => {
width="400px"
destroyOnClose
cancelText="取消"
okText="确认删除"
okText="确认"
onOk={() => onSubmit()}
confirmLoading={loading}
>
......
src/pages/userCenter/siteManage/EditModal.jsx
View file @ edd403c8
......@@ -68,7 +68,7 @@ const EditModal = props => {
width="600px"
destroyOnClose
cancelText="取消"
okText="确认编辑"
okText="确认"
onOk={() => onSubmit()}
confirmLoading={loading}
>
......
src/pages/userCenter/siteManage/SiteManage.less
View file @ edd403c8
......@@ -30,7 +30,12 @@
.listItem{
padding-left: 5px;
cursor: pointer;
font-size: 16px;
}
.listItem:hover{
background-color: #f8f8f8 ;
}
.selected{
background-color: #bae7ff;
font-weight: bold;
background-color: #bae7ff!important;
}
\ No newline at end of file
src/services/userCenter/RoleManage/api.js
View file @ edd403c8
import { get, post } from '@/services/index';
// 获取站点信息
export const getWebModuleTree = params =>
get('/Cityinterface/rest/services/OMS.svc/W4_GetWeb4ModuleTree', params);
import { get, post, PUBLISH_SERVICE } from '@/services/index';
// 新增站点
export const addStation = params =>
......@@ -33,3 +29,27 @@ export const setMenuToRole = (params, options) =>
params,
options,
);
/**
* @角色管理
*/
// 获取角色树
export const getRoleGroupList = params =>
get(`${PUBLISH_SERVICE}/UserCenter/RoleGroupList`, params);
// 新增角色
export const addRole = params =>
get(`/Cityinterface/rest/services/OMS.svc/P_AddRole`, params);
// 获取分组列表
export const getRoleGroup = params =>
get(`/Cityinterface/rest/services/OMS.svc/P_GetRoleGroup`, params);
// 编辑角色
export const editRole = params =>
get('/Cityinterface/rest/services/OMS.svc/P_EditRole', params);
// 删除角色
export const deleteRole = params =>
get('/Cityinterface/rest/services/OMS.svc/P_DeleteRole', params);
// 编辑分组名称
export const setRoleGroupName = params =>
get('/Cityinterface/rest/services/OMS.svc/P_SetRoleGroupName', 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