Commit d01f930e authored by 皮倩雯's avatar 皮倩雯

fix: '修改三维配置,地图配置界面留白样式'

parent 39a277af
Pipeline #43225 skipped with stages
......@@ -228,7 +228,7 @@ const TileData = props => {
dataSource={tileData}
bordered
rowKey="type"
scroll={{ y: 400 }}
scroll={{ y: 600 }}
pagination={{
showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
}}
......
......@@ -190,7 +190,7 @@ const VectorData = props => {
dataSource={tileData}
bordered
rowKey="id"
scroll={{ y: 400 }}
scroll={{ y: 600 }}
pagination={{
showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
}}
......
import { Button,Spin } from 'antd';
/* eslint-disable indent */
import { Button, Spin } from 'antd';
import React, { useState, useEffect } from 'react';
import styles from '../dimensionsConfig.less'
import {
GetSchemaInfoList
} from '@/services/webConfig/api';
import AddModal from './AddModal'
import Cards from './components/card'
import styles from '../dimensionsConfig.less';
import { GetSchemaInfoList } from '@/services/webConfig/api';
import AddModal from './AddModal';
import Cards from './components/card';
const VectorData = props => {
const [treeLoading, setTreeLoading] = useState(false);// 弹窗显示
const [treeLoading, setTreeLoading] = useState(false); // 弹窗显示
const [tileData, setTileData] = useState([]); // 页面初始化数据
const [visible, setVisible] = useState(false); // 弹窗
const [flag, setFlag] = useState(0); // 状态更新
const [type, setType] = useState(''); // 弹窗类型
const [formObj, setFormObj] = useState({});
const onSubmit = prop => {
setVisible(false);
setFlag(flag + 1)
setFlag(flag + 1);
};
const onDeletebaseMap = value => {
setFlag(flag + 1);
};
const onDeletebaseMap = (value) => {
setFlag(flag + 1)
}
const handleAdd = () => {
setType('schemeAdd');
setVisible(true);
}
};
useEffect(() => {
renderTile();
}, [flag]);
// 获取瓦片数据配置数据
const renderTile = () => {
setTreeLoading(true);
GetSchemaInfoList().then(
res => {
if (res.msg ==='Ok') {
GetSchemaInfoList().then(res => {
if (res.msg === 'Ok') {
setTreeLoading(false);
setTileData(res.data);
} else {
setTreeLoading(false);
}
}
)
});
};
return (
<>
<Spin tip="loading..." spinning={treeLoading}>
<div style={{ width: 'calc(100vw - 265px)' }}>
<div style={{ height: '780px', overflow: 'scroll' }}>
<div className={styles.tileBtn}>
<Button type="primary" onClick={() => {
<Button
type="primary"
onClick={() => {
handleAdd();
}} >
}}
>
新增
</Button>
</div>
<div className={styles.cardsList}>
{tileData && tileData.length ?
tileData.map((item, index) => {
return <div className={styles.cardItem} key={index} span={5} offset={2} style={{ marginBottom: '1rem' }}>
<Cards item={item} deletebaseMaps={onDeletebaseMap} ></Cards>
{tileData && tileData.length
? tileData.map((item, index) => {
return (
<div
className={styles.cardItem}
key={index}
span={5}
offset={2}
style={{ marginBottom: '1rem' }}
>
<Cards item={item} deletebaseMaps={onDeletebaseMap} />
</div>
);
})
: ''}
</div>
}) : ''}
</div >
<AddModal
visible={visible}
onCancel={() => setVisible(false)}
......@@ -73,6 +80,6 @@ const VectorData = props => {
</div>
</Spin>
</>
)
}
export default VectorData
\ No newline at end of file
);
};
export default VectorData;
import { Space, Table, Button, Popconfirm, notification, Spin } from 'antd';
import React, { useState, useEffect } from 'react';
import styles from '../SchemeConfig.less'
import {
GettMaplayer,
deleteConfig
} from '@/services/webConfig/api';
import AddModal from './AddModal'
import styles from '../SchemeConfig.less';
import { GettMaplayer, deleteConfig } from '@/services/webConfig/api';
import AddModal from './AddModal';
const TileData = props => {
const [treeLoading, setTreeLoading] = useState(false);// 弹窗显示
const [treeLoading, setTreeLoading] = useState(false); // 弹窗显示
const [tileData, setTileData] = useState([]); // table表格数据
const [visible, setVisible] = useState(false); // 弹窗
const [type, setType] = useState(''); // 弹窗类型
......@@ -19,25 +16,25 @@ const TileData = props => {
title: '服务名',
dataIndex: 'servicename',
key: 'servicename',
align: 'center'
align: 'center',
},
{
title: '标签',
dataIndex: 'label',
key: 'label',
align: 'center'
align: 'center',
},
{
title: '类型',
dataIndex: 'type',
key: 'type',
align: 'center'
align: 'center',
},
{
title: '透明度',
dataIndex: 'alpha',
key: 'alpha',
align: 'center'
align: 'center',
},
{
title: '编辑',
......@@ -70,27 +67,27 @@ const TileData = props => {
</Space>
),
},
];
const changebaseMap = (record) => {
const changebaseMap = record => {
setType('edit');
setFormObj(record);
setVisible(true);
}
};
const onSubmit = prop => {
setVisible(false);
setFlag(flag + 1)
setFlag(flag + 1);
};
const delConfirm = (record) => {
const delConfirm = record => {
const { servicename = '' } = record;
setTreeLoading(true);
deleteConfig({
servicename: servicename,
terminalType: 'base',
isBaseMap: true
}).then(res => {
setFlag(flag + 1)
isBaseMap: true,
})
.then(res => {
setFlag(flag + 1);
setTreeLoading(false);
if (res.msg === 'Ok') {
// form.resetFields();
......@@ -107,47 +104,45 @@ const TileData = props => {
description: res.message || '删除失败',
});
}
}).catch(err => {
setFlag(flag + 1)
setTreeLoading(false);
})
}
.catch(err => {
setFlag(flag + 1);
setTreeLoading(false);
});
};
const handleAdd = () => {
if (baseMap.length) {
setType('add');
setVisible(true);
}
else {
} else {
notification.warning({
message: '提示',
duration: 3,
description: '地图类型已都存在,可编辑修改',
});
}
}
};
useEffect(() => {
renderTile();
}, [flag]);
// 获取瓦片数据配置数据
const renderTile = () => {
setTreeLoading(true);
const baseMapData = ['高德地形', '高德影像', '天地图地形', '天地图影像']
const baseMapData = ['高德地形', '高德影像', '天地图地形', '天地图影像'];
GettMaplayer({
terminalType: 'base',
isBaseMap: true
}).then(
res => {
if (res.msg === "Ok") {
isBaseMap: true,
}).then(res => {
if (res.msg === 'Ok') {
setTreeLoading(false);
setTileData(res.data.general.baseMap.layers);
res.data.general.baseMap.layers.map((item) => {
res.data.general.baseMap.layers.map(item => {
let index = baseMapData.indexOf(item.servicename);
if (index != -1) {
baseMapData.splice(index, 1);
}
})
setBaseMap(baseMapData)
});
setBaseMap(baseMapData);
} else {
setTreeLoading(false);
notification.error({
......@@ -155,17 +150,19 @@ const TileData = props => {
description: res.message,
});
}
}
)
});
};
return (
<>
<Spin tip="loading..." spinning={treeLoading}>
<div className={styles.tileBtn}>
<Button type="primary" onClick={() => {
<Button
type="primary"
onClick={() => {
handleAdd();
}} >
}}
>
新增
</Button>
</div>
......@@ -174,14 +171,11 @@ const TileData = props => {
dataSource={tileData}
bordered
rowKey="type"
scroll={{ y: 400 }}
scroll={{ y: 600 }}
pagination={{
showTotal: (total, range) =>
`第${range[0]}-${range[1]} 条/共 ${total} 条`
showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
}}
>
</Table>
/>
<AddModal
visible={visible}
onCancel={() => setVisible(false)}
......@@ -192,6 +186,6 @@ const TileData = props => {
/>
</Spin>
</>
)
}
export default TileData
\ No newline at end of file
);
};
export default TileData;
......@@ -215,7 +215,7 @@ const VectorData = props => {
dataSource={tileData}
bordered
rowKey="CreateTime"
scroll={{ y: 400 }}
scroll={{ y: 600 }}
pagination={{
showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
}}
......
import { Button,Spin } from 'antd';
/* eslint-disable indent */
import { Button, Spin } from 'antd';
import React, { useState, useEffect } from 'react';
import styles from '../SchemeConfig.less'
import {
GetMaplayerByTerminalType
} from '@/services/webConfig/api';
import AddModal from './AddModal'
import Cards from './components/card'
import styles from '../SchemeConfig.less';
import { GetMaplayerByTerminalType } from '@/services/webConfig/api';
import AddModal from './AddModal';
import Cards from './components/card';
const VectorData = props => {
const [treeLoading, setTreeLoading] = useState(false);// 弹窗显示
const [treeLoading, setTreeLoading] = useState(false); // 弹窗显示
const [tileData, setTileData] = useState([]); // 页面初始化数据
const [visible, setVisible] = useState(false); // 弹窗
const [flag, setFlag] = useState(0); // 状态更新
const [type, setType] = useState(''); // 弹窗类型
const [formObj, setFormObj] = useState({});
const onSubmit = prop => {
setVisible(false);
setFlag(flag + 1)
setFlag(flag + 1);
};
const onDeletebaseMap = value => {
setFlag(flag + 1);
};
const onDeletebaseMap = (value) => {
setFlag(flag + 1)
}
const handleAdd = () => {
setType('schemeAdd');
setVisible(true);
}
};
useEffect(() => {
renderTile();
}, [flag]);
......@@ -34,39 +32,48 @@ const VectorData = props => {
setTreeLoading(true);
GetMaplayerByTerminalType({
terminalType: 'scheme',
isBaseMap: false
}).then(
res => {
console.log('res',res);
if (res.msg ==='Ok') {
isBaseMap: false,
}).then(res => {
console.log('res', res);
if (res.msg === 'Ok') {
setTreeLoading(false);
setTileData(res.data.scheme.optionalLayer.layers);
} else {
setTreeLoading(false);
}
}
)
});
};
return (
<>
<Spin tip="loading..." spinning={treeLoading}>
<div style={{ width: 'calc(100vw - 265px)' }}>
<div style={{ height: '780px', overflow: 'scroll' }}>
<div className={styles.tileBtn}>
<Button type="primary" onClick={() => {
<Button
type="primary"
onClick={() => {
handleAdd();
}} >
}}
>
新增
</Button>
</div>
<div className={styles.cardsList}>
{tileData && tileData.length ?
tileData.map((item, index) => {
return <div className={styles.cardItem} key={index} span={5} offset={2} style={{ marginBottom: '1rem' }}>
<Cards item={item} deletebaseMaps={onDeletebaseMap} ></Cards>
{tileData && tileData.length
? tileData.map((item, index) => {
return (
<div
className={styles.cardItem}
key={index}
span={5}
offset={2}
style={{ marginBottom: '1rem' }}
>
<Cards item={item} deletebaseMaps={onDeletebaseMap} />
</div>
);
})
: ''}
</div>
}) : ''}
</div >
<AddModal
visible={visible}
onCancel={() => setVisible(false)}
......@@ -77,6 +84,6 @@ const VectorData = props => {
</div>
</Spin>
</>
)
}
export default VectorData
\ No newline at end of file
);
};
export default VectorData;
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