Commit 35e4d3c2 authored by mayongxin's avatar mayongxin

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

Please enter a commit message to explain why this merge is necessary,
parents e05df2da cfa10ca3
Pipeline #28205 passed with stages
in 24 minutes 18 seconds
......@@ -146,7 +146,7 @@ const editor = props => {
return (
<>
<Modal
title={`${type === 'add' ? '元数据发布' : '编辑'}`}
title='建表'
bodyStyle={{ width: '100%', minHeight: '100px' }}
style={{ top: '150px' }}
width="700px"
......
......@@ -41,9 +41,6 @@ const AddModal = props => {
setLoading(true);
let obj = form.getFieldsValue();
let params = { tableName: obj.tableName, alias: obj.tableAlias || '', fieldNames: checkedList }
console.log(checkedList,'checkedList');
addTables({ tableName: obj.tableName, alias: obj.tableAlias || '', fieldNames: checkedList.join(',')}).then(res => {
setLoading(false);
if (res.msg === "Ok") {
......@@ -121,7 +118,7 @@ const AddModal = props => {
return (
<Modal
title={`${type === 'add' ? '元数据发布' : '编辑'}`}
title='附加'
bodyStyle={{ width: '100%', minHeight: '100px' }}
style={{ top: '150px' }}
width="700px"
......
......@@ -47,7 +47,7 @@ const AddModal = props => {
return (
<Modal
title={`${type === 'add' ? '元数据发布' : '编辑'}`}
title='修改'
bodyStyle={{ width: '100%', minHeight: '100px' }}
style={{ top: '150px' }}
width="700px"
......@@ -85,7 +85,7 @@ const AddModal = props => {
<Radio.Group>
<Radio value='大'>大(3)</Radio>
<Radio value='中'>中(4)</Radio>
<Radio value='小'>小(4)</Radio>
<Radio value='小'>小(5)</Radio>
<Radio value='较小'>较小(6)</Radio>
</Radio.Group>
</Item>
......
......@@ -204,23 +204,10 @@ export default {
// name: '业务平台',
// component: JumpContainer,
// },
{
path: '/platformCenter/notify',
name: '消息平台',
component: MessageManager,
},
{
path: '/platformCenter/emq',
name: '宿主管理',
url:
'/web4/?widget=product/oms/MqttConfig/MqttConfig.js|hideMap=true',
component: HostManager,
},
{
path: '/platformCenter/artificial',
component: BlankLayout,
name: '人工智能',
name: '智能平台',
icon: <CopyOutlined style={iconStyle} />,
routes: [
......@@ -236,6 +223,20 @@ export default {
}
],
},
{
path: '/platformCenter/notify',
name: '消息平台',
component: MessageManager,
},
{
path: '/platformCenter/emq',
name: '宿主管理',
url:
'/web4/?widget=product/oms/MqttConfig/MqttConfig.js|hideMap=true',
component: HostManager,
},
{
path: '/platformCenter/bsmanger',
component: BlankLayout,
......
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