Commit 2bc8f01a authored by 皮倩雯's avatar 皮倩雯

优化消息平台功能

parent f6b7cc32
Pipeline #31027 skipped with stages
......@@ -8,7 +8,8 @@ import {
Select,
Popconfirm,
message,
Tooltip
Tooltip,
notification
} from 'antd';
import { PlusCircleOutlined, EditTwoTone, DeleteOutlined} from '@ant-design/icons';
......@@ -35,11 +36,12 @@ const TemplateManage = () => {
const [currentTemplate, setCurrentTempalte] = useState({});
const [data, setData] = useState([])
const [flag,setFlag] = useState(0)
const [option, setOption] = useState([]); // 下拉列表数据
useEffect(() => {
getTemplateList()
selectFocus()
}, [flag])
const getTemplateList = (obj) => {
......@@ -65,6 +67,30 @@ const TemplateManage = () => {
}
)
}
const selectFocus = (obj) => {
setOption([]);
GetThirdpartyTemplates(obj).then(res => {
if (res.msg==="Ok") {
console.log(res.data);
setOption(res.data);
console.log(2)
} else {
console.log(1);
notification.error({
message: '提示',
duration: 15,
description: res.message,
});
setOption([]);
}
})
.catch(err => {
console.log(3)
console.error(err);
});
};
const columns = [
{
title: '编号',
......@@ -291,12 +317,15 @@ const TemplateManage = () => {
visible={visibleParams.editVisible}
template={currentTemplate}
onCancel={() => handleShowModal('editVisible', false)}
option={option}
confirmModal={editModal}
onSubmit={ onSubmit}
/>
<AddModal
visible={visibleParams.addVisible}
template={currentTemplate}
onCancel={() => handleShowModal('addVisible', false)}
option={option}
confirmModal={addModal}
onSubmit={ onAddSubmit}
/>
......
.template_container{
width: 100%;
height: calc(100vh - 124px);
height: calc(100vh - 124px);
.operate_bar{
width: 100%;
height: 60px;
......@@ -35,6 +34,16 @@
}
}
}
.ant-modal-body ant-form{
width: 100%;
}
.ant-popover-message {
margin-bottom: 10px !important;
}
.anticon svg {
margin-top: -5px;
}
.list_view{
width: 100%;
height: calc(100vh - 184px);
......@@ -49,4 +58,8 @@
.ant-col ant-form-item-control{
margin-top: 0;
}
}
\ No newline at end of file
.ant-table-body{
max-height: 610px !important;
}
}
......@@ -81,6 +81,29 @@
border-bottom: 1px solid #ccc;
}
.userManageContainer{
.ant-form-item {
vertical-align: top;
}
.ant-form-item-label > label {
align-items:middle;
}
.ant-modal-body{
padding-bottom:0px;
padding-right:40px;
padding-left:40px;
.ant-form{
width: 90%;
}
}
.anticon svg {
margin-top: -3px;
}
.ant-popover-message {
position: relative;
padding: 0px 0 0px;
color: rgba(0, 0, 0, 0.85);
font-size: 14px;
}
.ant-tree-treenode{
width: 100% !important;
.ant-tree-node-content-wrapper{
......@@ -102,6 +125,9 @@
display: inline-block;
}
}
.ant-radio-group {
margin: 0px !important;
}
.contentContainer{
display: flex;
width: 100%;
......@@ -146,6 +172,9 @@
top: 0;
width: 26px;
}
.ant-popover-message-title {
padding-left: 20px;
}
.userContainer{
height: calc(100vh - 74px) !important;
z-index: 999;
......@@ -223,14 +252,7 @@
height: 50vh;
}
}
.ant-modal-body{
padding-bottom:0px;
padding-right:40px;
padding-left:40px;
.ant-form{
width: 90%;
}
}
.ant-modal-content{
border-radius: 5px;
}
......@@ -287,27 +309,8 @@
.ant-popover-inner-content {
padding: 10px 10px;
}
.ant-popover-message {
position: relative;
padding: 0px 0 0px;
color: rgba(0, 0, 0, 0.85);
font-size: 14px;
}
.ant-popover-message {
padding: 0px 0 0px;
}
.ant-popover-message-title {
padding-left: 20px;
}
.ant-form-item {
vertical-align: top;
}
.ant-form-item-label > label {
align-items:middle;
}
.ant-radio-group {
margin: 8px;
}
.ant-popover-message > .anticon {
top: 7.0005px
}
......@@ -316,7 +319,4 @@
// height: calc(100vh - 150px);
// }
.anticon svg {
margin-top: -3px;
}
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