Commit 9f127906 authored by mayongxin's avatar mayongxin

接口优化

parent 35e4d3c2
Pipeline #28450 skipped with stages
......@@ -269,10 +269,18 @@ const TableManager = () => {
<Table
columns={columns}
dataSource={tableData}
pagination={{ pageSize: 10 }}
scroll={{ y: 700 }}
//pagination={{ pageSize: 10 }}
scroll={{ x: 'max-content', y: 'calc(100vh - 238px)' }}
size="small"
rowKey={(record, index) => `complete${record.tableID}${index}`}
pagination={{
showTotal: (total, range) =>
`第${range[0]}-${range[1]} 条/共 ${total} 条`,
pageSizeOptions: [10, 20, 50, 100],
defaultPageSize: 20,
showQuickJumper: true,
showSizeChanger: true,
}}
/>
</div>
</div>
......
......@@ -67,7 +67,7 @@ const VisibleRoleModal = props => {
useEffect(() => {
setSelectRole(props.value)
GetRoleGroupList()
}, [props])
}, [])
const handleCancel = () => {
......@@ -110,7 +110,7 @@ const VisibleRoleModal = props => {
<SiteModal
{...props}
title={title ? `选择${title}` : 关联角色}
title={title ? `选择${title}` : "关联角色"}
bodyStyle={{ width: '100%', minHeight: '100px' }}
style={{ top: 200, borderRadius: '20px' }}
width="800px"
......
......@@ -38,7 +38,7 @@ const VectorPreviewModal = props => {
map && map.clearMap()
map && map.remove(map.getLayers())
setIsLoading(true)
map && GetMetaData(metaData.serviceName).then(
map && GetMetaData(metaData.GISServerProjectName).then(
res2 => {
if (res2 && res2.units) {
setIsLoading(false)
......@@ -54,7 +54,7 @@ const VectorPreviewModal = props => {
};
const wmsOption = {
tileSize: 512,
url: `${location.origin}/Cityinterface/rest/services/MapServer.svc/${metaData.serviceName}/GeoServerProxy/wms`,
url: `${location.origin}/Cityinterface/rest/services/MapServer.svc/${metaData.GISServerProjectName}/GeoServerProxy/wms`,
blend: false,
params: params,
zooms: [2, 20],
......
......@@ -177,28 +177,28 @@ export default {
// },
// ],
},
{
path: '/platformCenter/iot',
name: '组态平台',
component: BaseFrameContainer,
tabs: [
{
tabName: '模型类型',
url:
'/web4/?widget=configuration/ConfigurationsOperationV1/ModelTypeManage/ModelTypeManage|hideMap=true',
},
{
tabName: '模型文件',
url:
'/web4/?widget=configuration/ConfigurationsOperationV1/ModelFileManage/ModelFileManage|hideMap=true',
},
{
tabName: '画板管理',
url:
'/web4/?widget=configuration/ConfigurationsOperationV1/DrawBoardManage/DrawBoardManage|hideMap=true',
},
],
},
// {
// path: '/platformCenter/iot',
// name: '组态平台',
// component: BaseFrameContainer,
// tabs: [
// {
// tabName: '模型类型',
// url:
// '/web4/?widget=configuration/ConfigurationsOperationV1/ModelTypeManage/ModelTypeManage|hideMap=true',
// },
// {
// tabName: '模型文件',
// url:
// '/web4/?widget=configuration/ConfigurationsOperationV1/ModelFileManage/ModelFileManage|hideMap=true',
// },
// {
// tabName: '画板管理',
// url:
// '/web4/?widget=configuration/ConfigurationsOperationV1/DrawBoardManage/DrawBoardManage|hideMap=true',
// },
// ],
// },
// {
// path: '/platformCenter/order',
// name: '业务平台',
......
......@@ -6,5 +6,9 @@ export const GetAllConfig = param =>
export const GetMetaData = param =>
get(`${CITY_SERVICE}/MapServer.svc/${param}`);
//3.获取元数据新
export const GetMetaDataNew = param =>
get(`${CITY_SERVICE}/MapServer.svc/${param}`);
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