Commit 9f127906 authored by mayongxin's avatar mayongxin

接口优化

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