Skip to content

C
CivManage
Commit 217fe785 authored by 皮倩雯's avatar 皮倩雯
Browse files
Options

事件管理界面优化

parent 098df0bf
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 24 deletions
.env
View file @ 217fe785
# PUBLIC_PATH = reactOMS, 默认转发 /cityinterface # 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.161:8888;/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 # 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为转发前缀，后面为代理转发的地址 # 可设置第二个代理，test为转发前缀，后面为代理转发的地址
# PROXY2 = test : http://localhost:8006/ # PROXY2 = test : http://localhost:8006/
......
src/pages/platformCenter/bsmanager/workOrder/AddFlowsModal.jsx
View file @ 217fe785
...@@ -4,6 +4,8 @@ import { PlusOutlined } from '@ant-design/icons'; ...@@ -4,6 +4,8 @@ import { PlusOutlined } from '@ant-design/icons';
import ChangeAddFlows from './ChangeAddFlows' import ChangeAddFlows from './ChangeAddFlows'
import { CM_Event_ReloadFlows, CM_Event_LoadDepartmentAndRoles, CM_Event_AddEvenFlow, CM_Event_EditEvenFlow } from '@/services/standingBook/api'; import { CM_Event_ReloadFlows, CM_Event_LoadDepartmentAndRoles, CM_Event_AddEvenFlow, CM_Event_EditEvenFlow } from '@/services/standingBook/api';
import styles from './incident.less'; import styles from './incident.less';
const { Option } = Select;
const AddFlowsModal = props => { const AddFlowsModal = props => {
const { callBackSubmit = () => { }, type, visible, onCancel, formObj, obj, maxLength, record } = props; const { callBackSubmit = () => { }, type, visible, onCancel, formObj, obj, maxLength, record } = props;
const [form] = Form.useForm(); const [form] = Form.useForm();
...@@ -15,6 +17,7 @@ const AddFlowsModal = props => { ...@@ -15,6 +17,7 @@ const AddFlowsModal = props => {
const [pickItem, setPickItem] = useState('') const [pickItem, setPickItem] = useState('')
const [checkedList1, setCheckedList1] = useState([]) const [checkedList1, setCheckedList1] = useState([])
const [inputValue, setInputValue] = useState({ Roles: '' }); const [inputValue, setInputValue] = useState({ Roles: '' });
const [selectValue, setSelectValue] = useState('')
const [characterValue, setCharacterValue] = useState('') const [characterValue, setCharacterValue] = useState('')
const [Order, setOrder] = useState(''); // 弹窗类型 const [Order, setOrder] = useState(''); // 弹窗类型
const [strr, setStrr] = useState('') const [strr, setStrr] = useState('')
...@@ -39,9 +42,12 @@ const AddFlowsModal = props => { ...@@ -39,9 +42,12 @@ const AddFlowsModal = props => {
setFiled1({}) setFiled1({})
form.resetFields(); form.resetFields();
}else if(type==='edit'){ }else if(type==='edit'){
console.log(record)
setInputValue({ setInputValue({
Roles:record.FlowRoles Roles:record.FlowRoles
}) })
setSelectValue(record.FlowName)
console.log(selectValue)
} }
}, [visible]) }, [visible])
...@@ -153,6 +159,8 @@ const AddFlowsModal = props => { ...@@ -153,6 +159,8 @@ const AddFlowsModal = props => {
callBackSubmit(); callBackSubmit();
// setLoading(true); // setLoading(true);
let aa = form.getFieldsValue().FlowName let aa = form.getFieldsValue().FlowName
var index=aa.lastIndexOf("\\");
aa=aa.substring(index+1,aa.length);
console.log(aa) console.log(aa)
console.log(inputValue) console.log(inputValue)
console.log(strr) console.log(strr)
...@@ -272,6 +280,8 @@ const AddFlowsModal = props => { ...@@ -272,6 +280,8 @@ const AddFlowsModal = props => {
<Form form={form} labelCol={{ span: 7 }} style={{ height: '8rem', overflowY: 'scroll' }}> <Form form={form} labelCol={{ span: 7 }} style={{ height: '8rem', overflowY: 'scroll' }}>
<Row> <Row>
<Col span={24}> <Col span={24}>
{type === 'edit'?
<>
<Item <Item
label="受理流程" label="受理流程"
name="FlowName" name="FlowName"
...@@ -280,10 +290,29 @@ const AddFlowsModal = props => { ...@@ -280,10 +290,29 @@ const AddFlowsModal = props => {
<Select <Select
style={{ width: '580px' }} style={{ width: '580px' }}
placeholder="选择受理流程" placeholder="选择受理流程"
placeholder={selectValue}
disabled
> >
{standingTable ? standingTable.map((item, index) => { return <Option key={index} value={item}>{item}</Option> }) : ''} {standingTable ? standingTable.map((item, index) => { return <Option key={index} value={item}>{item}</Option> }) : ''}
</Select> </Select>
</Item> </Item>
</>
:<>
<Item
label="受理流程"
name="FlowName"
labelCol={{ span: 4 }}
>
<Select
style={{ width: '580px' }}
placeholder="选择受理流程"
>
{standingTable ? standingTable.map((item, index) => { return <Option key={index} value={item}>{item}</Option> }) : ''}
</Select>
</Item>
</>
}
</Col> </Col>
<Col span={24}> <Col span={24}>
<Item <Item
......
src/pages/platformCenter/bsmanager/workOrder/AddModal.jsx
View file @ 217fe785
...@@ -30,6 +30,7 @@ const AddModal = props => { ...@@ -30,6 +30,7 @@ const AddModal = props => {
const [checkAll, setCheckAll] = useState(true); const [checkAll, setCheckAll] = useState(true);
const [pickItem, setPickItem] = useState('') const [pickItem, setPickItem] = useState('')
const [prefixName, setPrefixName] = useState('') const [prefixName, setPrefixName] = useState('')
const [selectValue, setSelectValue] = useState('')
const [standingTable, setStandingTable] = useState([]); const [standingTable, setStandingTable] = useState([]);
...@@ -57,6 +58,11 @@ const AddModal = props => { ...@@ -57,6 +58,11 @@ const AddModal = props => {
console.log(obj.CreateMode) console.log(obj.CreateMode)
console.log(obj.ReportFromWeb) console.log(obj.ReportFromWeb)
console.log(inputValue) console.log(inputValue)
console.log(obj.tableName)
if(obj.TableName===undefined){
console.log(selectValue)
obj.TableName = selectValue
}
if (obj.CreateMode === 0 || 1) { if (obj.CreateMode === 0 || 1) {
obj.CreateMode = obj.CreateMode.toString() obj.CreateMode = obj.CreateMode.toString()
} }
...@@ -106,6 +112,11 @@ const AddModal = props => { ...@@ -106,6 +112,11 @@ const AddModal = props => {
message: '提示', message: '提示',
description: '当允许客户端上报时需选择事件权限', description: '当允许客户端上报时需选择事件权限',
}) })
}else if(inputValue.SummaryFields===''){
notification.warning({
message: '提示',
description: '摘要字段必填',
})
}else{ }else{
let data = type == 'add' ? { ...obj, ...inputValue, Order: maxLength } : { ...obj, Order, ID: formObj.ID } let data = type == 'add' ? { ...obj, ...inputValue, Order: maxLength } : { ...obj, Order, ID: formObj.ID }
if (type == 'edit') { if (type == 'edit') {
...@@ -214,6 +225,13 @@ const AddModal = props => { ...@@ -214,6 +225,13 @@ const AddModal = props => {
if (res.msg === 'Ok') { if (res.msg === 'Ok') {
console.log(res.data) console.log(res.data)
setStandingTable(res.data) setStandingTable(res.data)
let arr = []
res.data.map((item, index)=>{
arr.push(item.text)
})
console.log(arr)
setSelectValue(arr[0])
changTable(arr[0])
} }
}) })
} }
...@@ -475,17 +493,12 @@ const AddModal = props => { ...@@ -475,17 +493,12 @@ const AddModal = props => {
label="事件主表" label="事件主表"
name="TableName" name="TableName"
labelCol={{ span: 4 }} labelCol={{ span: 4 }}
rules={[
{
required: true,
message: '请选择事件主表',
},
]}
> >
<Select <Select
style={{ width: '580px' }} style={{ width: '580px' }}
placeholder="选择事件主表" placeholder="选择事件主表"
onChange={changTable} onChange={changTable}
defaultValue={selectValue}
> >
{standingTable ? standingTable.map((item, index) => { return <Option key={index} value={item.text}>{item.text}</Option> }) : ''} {standingTable ? standingTable.map((item, index) => { return <Option key={index} value={item.text}>{item.text}</Option> }) : ''}
</Select> </Select>
...@@ -574,7 +587,7 @@ const AddModal = props => { ...@@ -574,7 +587,7 @@ const AddModal = props => {
> >
<div className={styles.filed_listItem} > <div className={styles.filed_listItem} >
<Input style={{ width: '500px' }} placeholder="请选择摘要字段" onChange={(e) => changeText(e, 'SummaryFields')} value={inputValue.SummaryFields} allowClear /> <Input style={{ width: '500px' }} placeholder="请选择摘要字段" onChange={(e) => changeText(e, 'SummaryFields')} value={inputValue.SummaryFields} allowClear />
<Button type="dashed" onClick={() => pickFiled('SummaryFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '3.5rem' }} /> <Button type="dashed" onClick={() => pickFiled('SummaryFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
</div> </div>
</Item> </Item>
...@@ -587,7 +600,7 @@ const AddModal = props => { ...@@ -587,7 +600,7 @@ const AddModal = props => {
> >
<div className={styles.filed_listItem} > <div className={styles.filed_listItem} >
<Input style={{ width: '500px' }} placeholder="请选择上报字段" onChange={(e) => changeText(e, 'ReportFields')} value={inputValue.ReportFields} allowClear /> <Input style={{ width: '500px' }} placeholder="请选择上报字段" onChange={(e) => changeText(e, 'ReportFields')} value={inputValue.ReportFields} allowClear />
<Button type="dashed" onClick={() => pickFiled('ReportFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '3.5rem' }} /> <Button type="dashed" onClick={() => pickFiled('ReportFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
</div> </div>
</Item> </Item>
</Col> </Col>
...@@ -599,7 +612,7 @@ const AddModal = props => { ...@@ -599,7 +612,7 @@ const AddModal = props => {
> >
<div className={styles.filed_listItem} > <div className={styles.filed_listItem} >
<Input style={{ width: '500px' }} placeholder="请选择显示字段" onChange={(e) => changeText(e, 'DisplayFields')} value={inputValue.DisplayFields} allowClear /> <Input style={{ width: '500px' }} placeholder="请选择显示字段" onChange={(e) => changeText(e, 'DisplayFields')} value={inputValue.DisplayFields} allowClear />
<Button type="dashed" onClick={() => pickFiled('DisplayFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '3.5rem' }} /> <Button type="dashed" onClick={() => pickFiled('DisplayFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
</div> </div>
</Item> </Item>
</Col> </Col>
...@@ -611,7 +624,7 @@ const AddModal = props => { ...@@ -611,7 +624,7 @@ const AddModal = props => {
> >
<div className={styles.filed_listItem} > <div className={styles.filed_listItem} >
<Input style={{ width: '500px' }} placeholder="请选择编辑字段" onChange={(e) => changeText(e, 'EditableFields')} value={inputValue.EditableFields} allowClear /> <Input style={{ width: '500px' }} placeholder="请选择编辑字段" onChange={(e) => changeText(e, 'EditableFields')} value={inputValue.EditableFields} allowClear />
<Button type="dashed" onClick={() => pickFiled('EditableFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '3.5rem' }} /> <Button type="dashed" onClick={() => pickFiled('EditableFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
</div> </div>
</Item> </Item>
</Col> </Col>
...@@ -623,7 +636,7 @@ const AddModal = props => { ...@@ -623,7 +636,7 @@ const AddModal = props => {
> >
<div className={styles.filed_listItem} > <div className={styles.filed_listItem} >
<Input style={{ width: '500px' }} placeholder="请选择转单字段" onChange={(e) => changeText(e, 'TransitFields')} value={inputValue.TransitFields} allowClear /> <Input style={{ width: '500px' }} placeholder="请选择转单字段" onChange={(e) => changeText(e, 'TransitFields')} value={inputValue.TransitFields} allowClear />
<Button type="dashed" onClick={() => pickFiled('TransitFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '3.5rem' }} /> <Button type="dashed" onClick={() => pickFiled('TransitFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
</div> </div>
</Item> </Item>
</Col> </Col>
...@@ -635,7 +648,7 @@ const AddModal = props => { ...@@ -635,7 +648,7 @@ const AddModal = props => {
> >
<div className={styles.filed_listItem} > <div className={styles.filed_listItem} >
<Input style={{ width: '500px' }} placeholder="请选择事件权限" onChange={(e) => changeText(e, 'Roles')} value={inputValue.Roles} allowClear /> <Input style={{ width: '500px' }} placeholder="请选择事件权限" onChange={(e) => changeText(e, 'Roles')} value={inputValue.Roles} allowClear />
<Button type="dashed" onClick={() => pickFiled1('Roles')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '3.5rem' }} /> <Button type="dashed" onClick={() => pickFiled1('Roles')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
</div> </div>
</Item> </Item>
</Col> </Col>
...@@ -683,7 +696,7 @@ const AddModal = props => { ...@@ -683,7 +696,7 @@ const AddModal = props => {
> >
<div className={styles.filed_listItem} > <div className={styles.filed_listItem} >
<Input style={{ width: '500px' }} placeholder="请选择关联字段" onChange={(e) => changeText(e, 'RelatedEventFields')} value={inputValue.RelatedEventFields} allowClear /> <Input style={{ width: '500px' }} placeholder="请选择关联字段" onChange={(e) => changeText(e, 'RelatedEventFields')} value={inputValue.RelatedEventFields} allowClear />
<Button type="dashed" onClick={() => pickFiled('RelatedEventFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '3.5rem' }} /> <Button type="dashed" onClick={() => pickFiled('RelatedEventFields')} icon={<PlusOutlined/>} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
</div> </div>
</Item> </Item>
</Col> </Col>
...@@ -704,7 +717,7 @@ const AddModal = props => { ...@@ -704,7 +717,7 @@ const AddModal = props => {
> >
<div className={styles.filed_listItem} > <div className={styles.filed_listItem} >
<Input style={{ width: '500px' }} placeholder="请选择图片表达" onChange={(e) => changeText(e, 'pictureFields')} value={inputValue.pictureFields} allowClear /> <Input style={{ width: '500px' }} placeholder="请选择图片表达" onChange={(e) => changeText(e, 'pictureFields')} value={inputValue.pictureFields} allowClear />
<Button type="dashed" onClick={() => pickFiled('pictureFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '3.5rem' }} /> <Button type="dashed" onClick={() => pickFiled('pictureFields')} icon={<PlusOutlined />} style={{ marginLeft: '0.5rem', height: '100%', width: '4rem' }} />
</div> </div>
</Item> </Item>
</Col> </Col>
......
src/pages/platformCenter/bsmanager/workOrder/ProcessModal.jsx
View file @ 217fe785
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { Form, Modal, Table, Input, Select, Tooltip, Button, notification, Image, Menu, Dropdown, Space, Popconfirm } from 'antd'; import { Modal, Table, Tooltip, notification, Space, Popconfirm } from 'antd';
import { import {
DoubleLeftOutlined,
DoubleRightOutlined,
PlusSquareFilled, PlusSquareFilled,
RightOutlined,
EditTwoTone, EditTwoTone,
DeleteOutlined, DeleteOutlined,
OrderedListOutlined,
ApartmentOutlined,
DesktopOutlined
} from '@ant-design/icons'; } from '@ant-design/icons';
import styles from './incident.less'; import styles from './incident.less';
import { GetCM_Event_LoadEvenFlows, CM_Event_RemoveEvenFlow } from '@/services/standingBook/api'; import { GetCM_Event_LoadEvenFlows, CM_Event_RemoveEvenFlow } from '@/services/standingBook/api';
...@@ -176,7 +170,8 @@ const ProcessModal = props => { ...@@ -176,7 +170,8 @@ const ProcessModal = props => {
}} }}
columns={columns} columns={columns}
dataSource={tableData} dataSource={tableData}
scroll={{ x: 'max-content', y: 'calc(100vh - 150px)' }} pagination={false}
scroll={{ x: 'max-content' }}
/> />
<AddFlowsModal <AddFlowsModal
visible={addVisible} visible={addVisible}
......
src/pages/platformCenter/bsmanager/workOrder/ViewModal.jsx
View file @ 217fe785
...@@ -228,7 +228,8 @@ const ViewModal = props => { ...@@ -228,7 +228,8 @@ const ViewModal = props => {
}} }}
columns={columns} columns={columns}
dataSource={tableData} dataSource={tableData}
scroll={{ x: 'max-content', y: 'calc(100vh - 150px)' }} pagination={false}
scroll={{ x: 'max-content'}}
/> />
<AddViewModal <AddViewModal
visible={addViewVisible} visible={addViewVisible}
......
src/pages/platformCenter/bsmanager/workOrder/incident.less
View file @ 217fe785
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
padding: 8px 14px; padding: 8px 14px;
} }
.ant-btn .anticon.anticon-plus > svg, .ant-btn .anticon.anticon-minus > svg {
margin-top: -5px;
}
.pickItem{ .pickItem{
background-color: #F5F6F9; background-color: #F5F6F9;
} }
......
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