Commit 43377ac9 authored by 皮倩雯's avatar 皮倩雯

修改数据字典搜索功能交互逻辑

parent 0ec0835b
Pipeline #38005 skipped with stages
# PUBLIC_PATH = reactOMS, 默认转发 /cityinterface
PROXY=/Cityinterface:http://192.168.19.105:8049;/PandaOMS:http://192.168.19.105:8049;/Web4:http://192.168.19.105:8049;/CityTemp:http://192.168.19.105:8049
PROXY=/Cityinterface:http://192.168.19.105:8049;/PandaOMS:http://192.168.12.65:8085;/Web4:http://192.168.19.105:8049;/CityTemp:http://192.168.19.105:8049
# PROXY=/Cityinterface:http://192.168.12.121:8082;/PandaOMS:http://192.168.12.121:8082;/Web4:http://192.168.12.121:8082;/CityTemp:http://192.168.12.121:8082
# 可设置第二个代理,test为转发前缀,后面为代理转发的地址
# PROXY2 = test : http://localhost:8006/
......
This diff is collapsed.
......@@ -45,10 +45,10 @@ const ProjectManage = () => {
dataIndex: 'name',
key: 'name',
render: (text, record) => (
<div>{record.type == '定时推送' ? text : <div style={{display:'flex',alignItems:'center'}}>
<div>{record.type == '定时推送' ? text : <div style={{ display: 'flex', alignItems: 'center' }}>
<Tooltip title={text} >
<FieldTimeOutlined
style={{ fontSize: '16px',color: '#1890FF' ,marginRight:'0.1rem'}}
style={{ fontSize: '16px', color: '#1890FF', marginRight: '0.1rem' }}
/>
</Tooltip>
{text}
......@@ -269,7 +269,7 @@ const ProjectManage = () => {
const pagenation = {
showTotal: (total, range) => `第${range[0]}-${range[1]} 条/共 ${total} 条`,
pageSizeOptions: [10, 20, 50, 100],
defaultPageSize: '10',
defaultPageSize: 10,
showQuickJumper: true,
showSizeChanger: true,
};
......@@ -316,7 +316,13 @@ const ProjectManage = () => {
</div>
<div className={styles.list_view}>
<Table bordered columns={columns} dataSource={dataList} pagination={pagenation} rowKey='ID' />
<Table
bordered
columns={columns}
dataSource={dataList}
pagination={pagenation}
rowKey='ID'
/>
</div>
<EditModal
visible={visibleParams.editVisible}
......
......@@ -56,6 +56,7 @@
.ant-table-container{
max-height: calc(100vh - 240px)!important;
min-height:calc(100vh - 240px)!important;
overflow-y: scroll;
}
}
......
......@@ -76,6 +76,7 @@ const TemplateManage = () => {
const selectFocus = (obj) => {
GetThirdpartyTemplates(obj).then(res => {
if (res.msg === "Ok") {
console.log(res.data)
setOption(res.data);
} else {
notification.error({
......
......@@ -102,7 +102,7 @@ const SiteManageV2 = () => {
return {
title: (
<div className={styles.title}>
<div>{org.text}</div>
<div className={styles.titleText}>{org.text}</div>
<div className={styles.tip}>
<Tooltip title="添加下级站点" className={styles.fs}>
<PlusSquareOutlined style={{ fontSize: '16px', color: '#1890FF' }} onClick={e => addSite(e, org)} />
......
......@@ -403,6 +403,12 @@
width: 100%;
}
}
.titleText{
width: 12rem;
overflow:hidden;
white-space:nowrap;
text-overflow:ellipsis;
}
.fs{
font-size: 18px;
margin-left: 10px;
......
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