Commit 0c7c176c authored by 皮倩雯's avatar 皮倩雯

fix: '消息平台配置优化'

parent 0adf9d2f
Pipeline #64697 passed with stages
...@@ -40,7 +40,22 @@ const patrolFeedback = () => { ...@@ -40,7 +40,22 @@ const patrolFeedback = () => {
title: '巡检对象', title: '巡检对象',
dataIndex: 'layerName', dataIndex: 'layerName',
key: 'layerName', key: 'layerName',
width: 150,
onCell: () => ({
style: {
maxWidth: 150,
overflow: 'hidden',
whiteSpace: 'nowrap',
textOverflow: 'ellipsis',
cursor: 'pointer',
},
}),
align: 'center', align: 'center',
render: record => (
<Tooltip placement="topLeft" title={record}>
{record}
</Tooltip>
),
}, },
{ {
title: '分组', title: '分组',
...@@ -52,13 +67,43 @@ const patrolFeedback = () => { ...@@ -52,13 +67,43 @@ const patrolFeedback = () => {
title: 'GIS图层', title: 'GIS图层',
dataIndex: 'gisLayer', dataIndex: 'gisLayer',
key: 'gisLayer', key: 'gisLayer',
width: 100,
onCell: () => ({
style: {
maxWidth: 100,
overflow: 'hidden',
whiteSpace: 'nowrap',
textOverflow: 'ellipsis',
cursor: 'pointer',
},
}),
align: 'center', align: 'center',
render: record => (
<Tooltip placement="topLeft" title={record}>
{record}
</Tooltip>
),
}, },
{ {
title: 'GIS条件', title: 'GIS条件',
dataIndex: 'gisFilterValue', dataIndex: 'gisFilterValue',
key: 'gisFilterValue', key: 'gisFilterValue',
width: 100,
onCell: () => ({
style: {
maxWidth: 100,
overflow: 'hidden',
whiteSpace: 'nowrap',
textOverflow: 'ellipsis',
cursor: 'pointer',
},
}),
align: 'center', align: 'center',
render: record => (
<Tooltip placement="topLeft" title={record}>
{record}
</Tooltip>
),
}, },
{ {
title: '反馈表', title: '反馈表',
...@@ -106,7 +151,7 @@ const patrolFeedback = () => { ...@@ -106,7 +151,7 @@ const patrolFeedback = () => {
title: '字段集', title: '字段集',
dataIndex: 'fields', dataIndex: 'fields',
key: 'fields', key: 'fields',
width: 100, width: 50,
align: 'center', align: 'center',
}, },
// { // {
...@@ -128,7 +173,7 @@ const patrolFeedback = () => { ...@@ -128,7 +173,7 @@ const patrolFeedback = () => {
dataIndex: 'roles', dataIndex: 'roles',
key: 'roles', key: 'roles',
align: 'center', align: 'center',
width: 100, width: 50,
}, },
// { // {
// title: '分组', // title: '分组',
...@@ -187,6 +232,8 @@ const patrolFeedback = () => { ...@@ -187,6 +232,8 @@ const patrolFeedback = () => {
if (other.length > 0) { if (other.length > 0) {
data.未分组 = other; data.未分组 = other;
setGroupName(['区域巡检', 'DMA巡检', '未分组']); setGroupName(['区域巡检', 'DMA巡检', '未分组']);
} else {
setGroupName(['区域巡检', 'DMA巡检']);
} }
} }
console.log(data); console.log(data);
......
...@@ -95,6 +95,8 @@ ...@@ -95,6 +95,8 @@
position: relative; position: relative;
transition: width 0.5s; transition: width 0.5s;
.title { .title {
margin: 16px 0 10px 16px; margin: 16px 0 10px 16px;
display: inline-block; display: inline-block;
......
...@@ -171,7 +171,7 @@ const EditModal = props => { ...@@ -171,7 +171,7 @@ const EditModal = props => {
to_person: template.PushGroup, to_person: template.PushGroup,
push_mode: template.PushMode === null ? '' : template.PushMode.split(','), push_mode: template.PushMode === null ? '' : template.PushMode.split(','),
webIcon: template.WebIcon, webIcon: template.WebIcon,
webTitile: template.WebTitile, Title: template.Title,
app_template: template.AppTemplateID, app_template: template.AppTemplateID,
app_path: template.AppFunctionPath, app_path: template.AppFunctionPath,
wx_template: template.PublicTemplateID ? parseInt(template.PublicTemplateID) : '', wx_template: template.PublicTemplateID ? parseInt(template.PublicTemplateID) : '',
...@@ -371,7 +371,7 @@ const EditModal = props => { ...@@ -371,7 +371,7 @@ const EditModal = props => {
PushGroup: fv.to_person ? fv.to_person.toString() : '', PushGroup: fv.to_person ? fv.to_person.toString() : '',
WorkWeiXinTemplateId: aa, WorkWeiXinTemplateId: aa,
WebIcon: fv.webIcon, WebIcon: fv.webIcon,
WebTitile: fv.webTitile, Title: fv.Title,
}; };
UpdateMessageConfig(a).then(res => { UpdateMessageConfig(a).then(res => {
...@@ -436,7 +436,7 @@ const EditModal = props => { ...@@ -436,7 +436,7 @@ const EditModal = props => {
PushGroup: fv.to_person ? fv.to_person.toString() : '', PushGroup: fv.to_person ? fv.to_person.toString() : '',
WorkWeiXinTemplateId: bb, WorkWeiXinTemplateId: bb,
WebIcon: fv.webIcon, WebIcon: fv.webIcon,
WebTitile: fv.webTitile, Title: fv.Title,
}; };
InsertMessageConfig(b).then(res => { InsertMessageConfig(b).then(res => {
if (res.code === 0) { if (res.code === 0) {
...@@ -697,6 +697,8 @@ const EditModal = props => { ...@@ -697,6 +697,8 @@ const EditModal = props => {
<Form form={form} onFinish={onSubmit}> <Form form={form} onFinish={onSubmit}>
<div className={styles.content}> <div className={styles.content}>
<Card title="方案" style={{ width: '100%' }}> <Card title="方案" style={{ width: '100%' }}>
<Row>
<Col span={11}>
<Item <Item
label="方案名称" label="方案名称"
name="name" name="name"
...@@ -715,6 +717,13 @@ const EditModal = props => { ...@@ -715,6 +717,13 @@ const EditModal = props => {
onChange={onNameChange} onChange={onNameChange}
/> />
</Item> </Item>
</Col>
<Col span={12}>
<Item label="消息标题" name="Title" labelCol={{ span: 6 }}>
<Input placeholder="请输入标题" style={{ width: '25rem' }} />
</Item>
</Col>
</Row>
<Item label="方案类型" labelAlign="right" style={{ marginLeft: '12px' }}> <Item label="方案类型" labelAlign="right" style={{ marginLeft: '12px' }}>
<div className={styles.cardList}> <div className={styles.cardList}>
{listType.map(item => ( {listType.map(item => (
...@@ -834,22 +843,12 @@ const EditModal = props => { ...@@ -834,22 +843,12 @@ const EditModal = props => {
))} ))}
</Select> </Select>
</Item> </Item>
<Row>
<Col span={15}>
<Item label="标题" name="webTitile" labelCol={{ span: 8 }}>
<Input
placeholder="请输入标题"
style={{ width: '97%' }}
disabled={!currentTrench.isWEBShow}
/>
</Item>
</Col>
<Col span={8}>
<Item <Item
label="图标" label="图标"
name="WebIcon" name="WebIcon"
style={{ height: '82px' }} style={{ height: '82px' }}
labelCol={{ span: 12 }} labelCol={{ span: 5 }}
> >
{imageUrl ? ( {imageUrl ? (
<div <div
...@@ -924,8 +923,7 @@ const EditModal = props => { ...@@ -924,8 +923,7 @@ const EditModal = props => {
/> />
)} )}
</Item> </Item>
</Col>
</Row>
<Item label="功能路径" name="web_path" labelCol={{ span: 5 }}> <Item label="功能路径" name="web_path" labelCol={{ span: 5 }}>
{/* <TextArea {/* <TextArea
rows={1} rows={1}
......
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