Commit 64c58a35 authored by 皮倩雯's avatar 皮倩雯

修改事件管理UI界面

parent 6b741fc7
Pipeline #34189 passed with stages
...@@ -154,7 +154,8 @@ const ProcessModal = props => { ...@@ -154,7 +154,8 @@ const ProcessModal = props => {
color: '#1890FF', color: '#1890FF',
fontSize: '25px', fontSize: '25px',
verticalAlign: 'middle', verticalAlign: 'middle',
marginLeft: '25px' marginLeft: '25px',
marginBottom: '10px'
}} }}
/> />
</Tooltip> </Tooltip>
......
...@@ -47,7 +47,7 @@ const SortModal = props => { ...@@ -47,7 +47,7 @@ const SortModal = props => {
> >
<div className={styles.cardContent} style={{width: '26rem', marginLeft:'24px'}}> <div className={styles.cardContent} style={{width: '26rem', marginLeft:'24px'}}>
<div className={styles.doctorTable}> <div className={styles.doctorTable}>
<table> <table style={{width: '104%', marginLeft: '-5px'}}>
<thead> <thead>
<tr> <tr>
<td>事件名称</td> <td>事件名称</td>
......
...@@ -215,7 +215,8 @@ const ViewModal = props => { ...@@ -215,7 +215,8 @@ const ViewModal = props => {
color: '#1890FF', color: '#1890FF',
fontSize: '25px', fontSize: '25px',
verticalAlign: 'middle', verticalAlign: 'middle',
marginLeft: '25px' marginLeft: '25px',
marginBottom: '10px'
}} }}
/> />
</Tooltip> </Tooltip>
......
...@@ -164,14 +164,14 @@ const AddModal = props => { ...@@ -164,14 +164,14 @@ const AddModal = props => {
{flag === 0 ? {flag === 0 ?
<> <>
<div className={styles.cardContent}> <div className={styles.cardContent}>
<span style={{color: 'red',fontSize: '1.5rem', marginLeft: '25px'}}>请先选择事件主表</span> <span style={{color: 'red',fontSize: '1rem', marginLeft: '25px'}}>请先选择事件主表</span>
</div> </div>
</>: </>:
<> <>
{JSON.stringify(filed) == "{}" ? {JSON.stringify(filed) == "{}" ?
<> <>
<div className={styles.cardContent}> <div className={styles.cardContent}>
<span style={{color: 'red',fontSize: '1.5rem', marginLeft: '25px'}}>表字段缺失暂无数据</span> <span style={{color: 'red',fontSize: '1rem', marginLeft: '25px'}}>表字段缺失请先配置表/字段</span>
</div> </div>
</> </>
: :
...@@ -261,10 +261,10 @@ const AddModal = props => { ...@@ -261,10 +261,10 @@ const AddModal = props => {
<td>字段名</td> <td>字段名</td>
</tr> </tr>
</thead> </thead>
<tbody id='doctor-drag-items'> <tbody>
{selectData && selectData.length > 0 ? {selectData && selectData.length > 0 ?
selectData.map((item, index) => { selectData.map((item, index) => {
return <tr drag-id={item} key={index} style={{ cursor: 'move' }}> return <tr key={index} >
<td><span title={item}>{item}</span></td> <td><span title={item}>{item}</span></td>
</tr> </tr>
}) })
......
...@@ -52,6 +52,7 @@ const incident = () => { ...@@ -52,6 +52,7 @@ const incident = () => {
const [sortData,setSortData] = useState([]) const [sortData,setSortData] = useState([])
const [rember, setRember] = useState(0) const [rember, setRember] = useState(0)
const [rember1, setRember1] = useState()
const [maxLength, setMaxLength] = useState(0); const [maxLength, setMaxLength] = useState(0);
const [pickItem, setPickItem] = useState(''); const [pickItem, setPickItem] = useState('');
...@@ -303,6 +304,7 @@ const incident = () => { ...@@ -303,6 +304,7 @@ const incident = () => {
console.log(arrr) console.log(arrr)
setTableData(arrr) setTableData(arrr)
setPickItem(newArr[rember]) setPickItem(newArr[rember])
setRember1(newArr[0])
console.log(newArr, 'newArr'); console.log(newArr, 'newArr');
setTreeData(newArr) setTreeData(newArr)
} }
...@@ -319,9 +321,6 @@ const incident = () => { ...@@ -319,9 +321,6 @@ const incident = () => {
} }
}) })
},[]) },[])
useEffect(()=>{
})
const formateArrDataA = (initialArr, name) => { const formateArrDataA = (initialArr, name) => {
console.log(initialArr) console.log(initialArr)
console.log(name) console.log(name)
...@@ -477,7 +476,7 @@ const incident = () => { ...@@ -477,7 +476,7 @@ const incident = () => {
return <div className={classnames({ return <div className={classnames({
[styles.listItem]: true, [styles.listItem]: true,
[styles.pickItem]: item === pickItem, [styles.pickItem]: item === pickItem,
})} onClick={e => {setPickItem(item);setRember(index)}} key={index}>{item}{tableData[item] ? tableData[item].length : ''}{item === pickItem ? <RightOutlined /> : ''} </div> })} onClick={e => {setPickItem(item);setRember(index);setRember1(item)}} key={index}>{item}{tableData[item] ? tableData[item].length : ''}{item === pickItem ? <RightOutlined /> : ''} </div>
}) })
)} )}
</div> </div>
...@@ -540,6 +539,7 @@ const incident = () => { ...@@ -540,6 +539,7 @@ const incident = () => {
visible={addVisible} visible={addVisible}
type={isType} type={isType}
formObj={formObj} formObj={formObj}
rember1={rember1}
maxLength={maxLength} maxLength={maxLength}
onCancel={() => setAddvisible(false)} onCancel={() => setAddvisible(false)}
treeData={treeData} treeData={treeData}
......
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