feat(): 白蚁防治功能修改
parent
631899e393
commit
09743da858
Binary file not shown.
|
After Width: | Height: | Size: 9.0 KiB |
|
|
@ -1159,7 +1159,9 @@ const apiurl = {
|
||||||
edit:service_fxdd + '/szTreatmentBasis/update',
|
edit:service_fxdd + '/szTreatmentBasis/update',
|
||||||
add:service_fxdd + '/szTreatmentBasis/insert',
|
add:service_fxdd + '/szTreatmentBasis/insert',
|
||||||
del:service_fxdd + '/szTreatmentBasis/del/',
|
del:service_fxdd + '/szTreatmentBasis/del/',
|
||||||
detail:service_fxdd + '/szTreatmentBasis/get/'
|
detail: service_fxdd + '/szTreatmentBasis/get/',
|
||||||
|
tree1:service_fxdd + '/szTreatmentBasis/get/treeFiltered',
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
flfg:{
|
flfg:{
|
||||||
|
|
|
||||||
|
|
@ -70,20 +70,19 @@ function DrpSearch({record}) {
|
||||||
option = {
|
option = {
|
||||||
stcd: record?.stcd,
|
stcd: record?.stcd,
|
||||||
startTime: current == 0 ?
|
startTime: current == 0 ?
|
||||||
params?.startTime || moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm") :
|
params?.startTime ||(record?.stm ? moment(record?.stm).format("YYYY-MM-DD HH:mm"):moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm")) :
|
||||||
params?.startTime || moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"),
|
params?.startTime || (record?.stm ? moment(record?.stm).format("YYYY-MM-DD HH:mm"):moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm")),
|
||||||
endTime:
|
endTime:
|
||||||
current == 0 ?
|
current == 0 ?
|
||||||
params?.endTime || moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm") :
|
params?.endTime ||(record?.etm ? moment(record?.etm).format("YYYY-MM-DD HH:mm"):moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm")) :
|
||||||
params?.endTime || moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"),
|
params?.endTime || (record?.etm ? moment(record?.etm).format("YYYY-MM-DD HH:mm"):moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm")),
|
||||||
tm: [
|
tm: [
|
||||||
params?.tm[0] ||
|
params?.tm[0] ||
|
||||||
moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0}),
|
(record?.stm ?moment(record?.stm) :moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0})),
|
||||||
params?.tm[1] ||
|
params?.tm[1] ||
|
||||||
moment().add(1, 'hour').set({minute: 0, second: 0})
|
(record?.etm ?moment(record?.etm) :moment().add(1, 'hour').set({minute: 0, second: 0}))
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
if (record.stcd) {
|
if (record.stcd) {
|
||||||
setParams(option)
|
setParams(option)
|
||||||
getData(option)
|
getData(option)
|
||||||
|
|
|
||||||
|
|
@ -7,11 +7,15 @@ export default function drpOption ({
|
||||||
desFloodLev,
|
desFloodLev,
|
||||||
calFloodLev
|
calFloodLev
|
||||||
}) {
|
}) {
|
||||||
|
|
||||||
|
// flLowLimLev 汛限水位 desFloodLev 设计水位 calFloodLev校核水位
|
||||||
console.log('data', data)
|
console.log('data', data)
|
||||||
|
console.log(flLowLimLev,desFloodLev,calFloodLev);
|
||||||
|
|
||||||
const maxVal = Math.max(...data.map(obj => obj.drp))
|
const maxVal = Math.max(...data.map(obj => obj.drp))
|
||||||
// const minVal = Math.min(...data.map(obj => obj.drp))
|
// const minVal = Math.min(...data.map(obj => obj.drp))
|
||||||
const maxSw = Math.ceil(Math.max(...data.map(obj => obj.rz)))
|
const maxSw = Math.ceil(Math.max(...data.map(obj => obj.rz),flLowLimLev,desFloodLev,calFloodLev))
|
||||||
const minSw = Math.floor(Math.min(...data.map(obj => obj.rz)))
|
const minSw = Math.floor(Math.min(...data.map(obj => obj.rz),flLowLimLev,desFloodLev,calFloodLev))
|
||||||
const maxKr = Math.max(...data.map(obj => obj.w))
|
const maxKr = Math.max(...data.map(obj => obj.w))
|
||||||
const minKr = Math.min(...data.map(obj => obj.w))
|
const minKr = Math.min(...data.map(obj => obj.w))
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ const Page = ({showPanels}) => {
|
||||||
</Panel>
|
</Panel>
|
||||||
</Collapse>
|
</Collapse>
|
||||||
</div>
|
</div>
|
||||||
<div style={{position:'absolute',left:'calc( 40% + 50px)',top:'10px'}} className='homePage_centerBox2'><RangePicker showTime value={tms} disabled/></div>
|
{myKey== '1' &&<div style={{position:'absolute',left:'calc( 40% + 50px)',top:'10px'}} className='homePage_centerBox2'><RangePicker showTime value={tms} disabled/></div> }
|
||||||
<div style={{position:'absolute',left:'20px',top:'calc( 100vh - 400px )'}}><TuLi/></div>
|
<div style={{position:'absolute',left:'20px',top:'calc( 100vh - 400px )'}}><TuLi/></div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,12 @@ const Page = ({showPanels,setTms2}) => {
|
||||||
// dispatch.map.setLayerVisible({"HdswLayer":true});
|
// dispatch.map.setLayerVisible({"HdswLayer":true});
|
||||||
dispatch.runtime.setFeaturePop({
|
dispatch.runtime.setFeaturePop({
|
||||||
id: data.stcd,
|
id: data.stcd,
|
||||||
data:{...data,myParams:tms},
|
data: {
|
||||||
|
...data,
|
||||||
|
myParams: tms,
|
||||||
|
stm: tms[0] ? moment(tms[0]).format("YYYY-MM-DD HH:mm") : '',
|
||||||
|
etm: tms[1] ? moment(tms[1]).format("YYYY-MM-DD HH:mm") : '',
|
||||||
|
},
|
||||||
type: 'drp',
|
type: 'drp',
|
||||||
lgtd: data.lgtd,
|
lgtd: data.lgtd,
|
||||||
lttd: data.lttd,
|
lttd: data.lttd,
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,13 @@ const Page = ({ data, list }) => {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
const columns = [
|
const columns = [
|
||||||
{ title: '站名', key: 'stnm', dataIndex: 'stnm',align: "center", ellipsis: true },
|
{ title: '站名', key: 'stnm', dataIndex: 'stnm',align: "center", ellipsis: true },
|
||||||
{ title: '水位(m)', key: 'rz', dataIndex: 'rz', align: "center", render: (v) => v === null ? '-' : v },
|
{
|
||||||
|
title: '水位(m)', key: 'rz', dataIndex: 'rz', align: "center",
|
||||||
|
render: (v,rec) => <span style={{color:(rec.rz && rec.calFloodLev)&&(rec.rz > rec.calFloodLev ) ? "rgba(255,29,29,.2)" :
|
||||||
|
(rec.rz && rec.desFloodLev)&&(rec.rz > rec.desFloodLev) ? "rgba(255,141,39,.2)" :
|
||||||
|
rec.afsltdz && rec.afsltdz > 0 > 0 ? "rgba(247,221,6,.2)" :
|
||||||
|
"#000"}}>{v === null ? '-' : v}</span>
|
||||||
|
},
|
||||||
{ title: '时间', key: 'tm', dataIndex: 'tm',align: "center", ellipsis: true },
|
{ title: '时间', key: 'tm', dataIndex: 'tm',align: "center", ellipsis: true },
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,14 @@
|
||||||
height: 40px;
|
height: 40px;
|
||||||
// margin-right: 10px;
|
// margin-right: 10px;
|
||||||
}
|
}
|
||||||
|
span{
|
||||||
|
display: block;
|
||||||
|
width: 180px;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
.delete-icon{
|
.delete-icon{
|
||||||
// margin-left: 1%;
|
// margin-left: 1%;
|
||||||
|
|
|
||||||
|
|
@ -102,6 +102,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
|
||||||
<Form.Item label="上报时间" name="tm">
|
<Form.Item label="上报时间" name="tm">
|
||||||
<RangePicker
|
<RangePicker
|
||||||
allowClear
|
allowClear
|
||||||
|
showTime
|
||||||
style={{ width: "350px" }}
|
style={{ width: "350px" }}
|
||||||
format="YYYY-MM-DD HH:mm:ss"
|
format="YYYY-MM-DD HH:mm:ss"
|
||||||
onChange={(v)=>{
|
onChange={(v)=>{
|
||||||
|
|
|
||||||
|
|
@ -209,7 +209,7 @@ const Page = () => {
|
||||||
<span className='number' style={{ color: '#8c8c8c' }}>{count.noData}</span>
|
<span className='number' style={{ color: '#8c8c8c' }}>{count.noData}</span>
|
||||||
<span className="unit">个</span>
|
<span className="unit">个</span>
|
||||||
</div>
|
</div>
|
||||||
<span className='label'>无数据</span>
|
<span className='label'>离线</span>
|
||||||
</div>
|
</div>
|
||||||
</Col>
|
</Col>
|
||||||
</Row>
|
</Row>
|
||||||
|
|
|
||||||
|
|
@ -89,6 +89,8 @@ const EditableRow = ({ index, ...props }) => {
|
||||||
|
|
||||||
// 总分
|
// 总分
|
||||||
const [tableData, setTableData] = useState([])
|
const [tableData, setTableData] = useState([])
|
||||||
|
// 为了切换全部和不及格
|
||||||
|
const [checkList, setCheckList] = useState([])
|
||||||
const score = useMemo(() => tableData?.reduce((total, cur) => total + (cur?.assessScore ?? 0), 0), [tableData]);
|
const score = useMemo(() => tableData?.reduce((total, cur) => total + (cur?.assessScore ?? 0), 0), [tableData]);
|
||||||
const columns = [
|
const columns = [
|
||||||
{
|
{
|
||||||
|
|
@ -195,12 +197,14 @@ const EditableRow = ({ index, ...props }) => {
|
||||||
try {
|
try {
|
||||||
const res = await httpget2(url + `/${id}`)
|
const res = await httpget2(url + `/${id}`)
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
|
|
||||||
res.data.forEach(item => {
|
res.data.forEach(item => {
|
||||||
if (item.rowSpan) delete item.rowSpan;
|
if (item.rowSpan) delete item.rowSpan;
|
||||||
})
|
})
|
||||||
const result = handleData(res.data, "name")
|
const result = handleData(res.data, "name")
|
||||||
setTableData(result)
|
setTableData(result)
|
||||||
tableDataRef.current = result;
|
tableDataRef.current = result;
|
||||||
|
setCheckList(result)
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
|
|
@ -304,7 +308,7 @@ const EditableRow = ({ index, ...props }) => {
|
||||||
})
|
})
|
||||||
const newData = handleData(result, "name")
|
const newData = handleData(result, "name")
|
||||||
setTableData(newData)
|
setTableData(newData)
|
||||||
|
setCheckList(newData)
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
|
|
@ -417,12 +421,21 @@ const EditableRow = ({ index, ...props }) => {
|
||||||
}
|
}
|
||||||
const handleRadioChange = (e) => {
|
const handleRadioChange = (e) => {
|
||||||
if (e.target.value == 1) {
|
if (e.target.value == 1) {
|
||||||
if (tabs == 2) {
|
// if (tabs == 2) {
|
||||||
getQdViewData(Item?.id)
|
// getQdViewData(Item?.id)
|
||||||
} else {
|
// } else {
|
||||||
getZbTableData(Item?.id,2)
|
// getZbTableData(Item?.id,2)
|
||||||
}
|
// }
|
||||||
|
// const res = checkList.map(item => {
|
||||||
|
// const assessScore = tableData.find(it => it.id == item.id)?.assessScore || item.assessScore;
|
||||||
|
// return {
|
||||||
|
// ...item,
|
||||||
|
// assessScore
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
setTableData(handleData(checkList, "name"))
|
||||||
} else {
|
} else {
|
||||||
|
setCheckList(tableData)
|
||||||
const newData = tabs == 2 ? tableData.filter(item => item.standardScore > item.indicatorScore) :
|
const newData = tabs == 2 ? tableData.filter(item => item.standardScore > item.indicatorScore) :
|
||||||
tableData.filter(item => item.standardScore > item.assessScore)
|
tableData.filter(item => item.standardScore > item.assessScore)
|
||||||
newData.forEach(item => {
|
newData.forEach(item => {
|
||||||
|
|
@ -502,16 +515,6 @@ const EditableRow = ({ index, ...props }) => {
|
||||||
|
|
||||||
// 获取指标表格数据
|
// 获取指标表格数据
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// if (Item.type != "start") {
|
|
||||||
// if (tabs == 2) {
|
|
||||||
// getQdViewData(Item?.id)
|
|
||||||
// } else {
|
|
||||||
// getZbTableData(Item?.id,2)
|
|
||||||
// }
|
|
||||||
// } else {
|
|
||||||
// getZbTableData(record?.templateId,1)
|
|
||||||
|
|
||||||
// }
|
|
||||||
if (tabs == 2) {
|
if (tabs == 2) {
|
||||||
getQdViewData(Item?.id)
|
getQdViewData(Item?.id)
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -630,6 +633,11 @@ const EditableRow = ({ index, ...props }) => {
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label="整改期限"
|
label="整改期限"
|
||||||
name="rectifyLastDate"
|
name="rectifyLastDate"
|
||||||
|
rules={[
|
||||||
|
{
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
]}
|
||||||
getValueFromEvent={(e,dateString) => dateString}
|
getValueFromEvent={(e,dateString) => dateString}
|
||||||
getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
|
getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -122,8 +122,8 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
|
||||||
onEdit(apiurl.rcgl.jdkh.khrwgl.edit, { ...record, ...values });
|
onEdit(apiurl.rcgl.jdkh.khrwgl.edit, { ...record, ...values });
|
||||||
}
|
}
|
||||||
if (mode === 'save') {
|
if (mode === 'save') {
|
||||||
values.startDate = values.dateRangeSo[0];
|
values.startDate = values.dateRangeSo[0] ? moment(values.dateRangeSo[0]).format("YYYY-MM-DD 00:00:00"):'';
|
||||||
values.endDate = values.dateRangeSo[1];
|
values.endDate = values.dateRangeSo[1]?moment(values.dateRangeSo[1]).format("YYYY-MM-DD 23:59:59"):'';
|
||||||
onSave(apiurl.rcgl.jdkh.khrwgl.save,values)
|
onSave(apiurl.rcgl.jdkh.khrwgl.save,values)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
|
||||||
<>
|
<>
|
||||||
<div style={{display:'flex',justifyContent:'space-between'}}>
|
<div style={{display:'flex',justifyContent:'space-between'}}>
|
||||||
<Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
|
<Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
|
||||||
<Form.Item label="上报时间" name="tm">
|
<Form.Item label="考核时间" name="tm">
|
||||||
<RangePicker
|
<RangePicker
|
||||||
allowClear
|
allowClear
|
||||||
style={{ width: "300px" }}
|
style={{ width: "300px" }}
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ const ToolBar = ({ setSearchVal, exportFile,list }) => {
|
||||||
if (values.tm) {
|
if (values.tm) {
|
||||||
dateTimeSo = {
|
dateTimeSo = {
|
||||||
start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
|
start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
|
||||||
end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
|
end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
delete values.tm
|
delete values.tm
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
import { Image } from "antd"
|
import { Image } from "antd"
|
||||||
import zd from '../../../assets/img/u0.png'
|
// import zd from '../../../assets/img/u0.png'
|
||||||
|
import zd from '../../../assets/img/wait.png'
|
||||||
const Page = () => {
|
const Page = () => {
|
||||||
return (
|
return (
|
||||||
<div style={{display:'flex',justifyContent:'center',alignItems:'center',backgroundColor:'#fff',height:'100%',padding:'20px'}}>
|
<div style={{display:'flex',justifyContent:'center',alignItems:'center',backgroundColor:'#fff',height:'100%',padding:'20px'}}>
|
||||||
<Image src={zd} style={{margin:'auto',margin:'20px',height:'750px'}} preview={false}/>
|
<Image src={zd} style={{margin:'auto',margin:'20px',height:'530px'}} preview={false}/>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => {
|
||||||
console.log(key);
|
console.log(key);
|
||||||
setKeys(key)
|
setKeys(key)
|
||||||
if(key == 2){
|
if(key == 2){
|
||||||
const res = await httpget(apiurl.szzf.clyj.tree)
|
const res = await httpget(apiurl.szzf.clyj.tree1)
|
||||||
const arr = clqkData.map(item=>{
|
const arr = clqkData.map(item=>{
|
||||||
if(item.key == 'treatmentBasis'){
|
if(item.key == 'treatmentBasis'){
|
||||||
item.treeData = res.data
|
item.treeData = res.data
|
||||||
|
|
@ -68,7 +68,7 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => {
|
||||||
if (mode == 'save') {
|
if (mode == 'save') {
|
||||||
addBasic(params)
|
addBasic(params)
|
||||||
} else if (mode == 'edit') {
|
} else if (mode == 'edit') {
|
||||||
editBasic(params)
|
editBasic({...params,caseDate:undefined})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const addBasic = (params) => {
|
const addBasic = (params) => {
|
||||||
|
|
|
||||||
|
|
@ -71,8 +71,8 @@ const Page = () => {
|
||||||
refModal.current.showSave();
|
refModal.current.showSave();
|
||||||
} else if (type === 'edit') {
|
} else if (type === 'edit') {
|
||||||
let obj={}
|
let obj={}
|
||||||
if(params.caseDate){
|
if (params.caseDate) {
|
||||||
obj.caseDate= dayjs(params.caseDate)
|
obj.caseDate = params.caseDate ? dayjs(params.caseDate) :undefined
|
||||||
}
|
}
|
||||||
if(params.IllegalDate){
|
if(params.IllegalDate){
|
||||||
obj.IllegalDate= dayjs(params.IllegalDate)
|
obj.IllegalDate= dayjs(params.IllegalDate)
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
|
||||||
let dateSo;
|
let dateSo;
|
||||||
if (values.createTime) {
|
if (values.createTime) {
|
||||||
dateSo = {
|
dateSo = {
|
||||||
stm: moment(values.createTime[0]).format('YYYY-MM-DD'),
|
stm: moment(values.createTime[0]).format('YYYY-MM-DD 00:00:00'),
|
||||||
etm: moment(values.createTime[1]).format('YYYY-MM-DD')
|
etm: moment(values.createTime[1]).format('YYYY-MM-DD 23:59:59')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
delete values.createTime
|
delete values.createTime
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ const Page = ({ treeSelect }) => {
|
||||||
refModal.current.showEdit({...data});
|
refModal.current.showEdit({...data});
|
||||||
}
|
}
|
||||||
const getInfo=()=>{
|
const getInfo=()=>{
|
||||||
httpget(apiurl.szzf.clyj.detail+treeSelect?.key).then(res=>{
|
httpget(apiurl.szzf.clyj.detail + treeSelect?.key).then(res => {
|
||||||
setData({...res.data,name:treeSelect.name})
|
setData({...res.data,name:treeSelect.name})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,13 @@ const ModalForm = ({ mode, record, onEdit, onSave, onCrudSuccess }) => {
|
||||||
|
|
||||||
|
|
||||||
const onfinish = (values) => {
|
const onfinish = (values) => {
|
||||||
onEdit(apiurl.szzf.clyj.edit, {...record,...values})
|
|
||||||
|
let params = {
|
||||||
|
...record,
|
||||||
|
...values,
|
||||||
|
pid:record.pId
|
||||||
|
}
|
||||||
|
onEdit(apiurl.szzf.clyj.edit, params)
|
||||||
}
|
}
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if(record){
|
if(record){
|
||||||
|
|
|
||||||
|
|
@ -34,8 +34,8 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for
|
||||||
}
|
}
|
||||||
const getInfo = () => {
|
const getInfo = () => {
|
||||||
form.validateFields().then((values) => {
|
form.validateFields().then((values) => {
|
||||||
// debugger;
|
|
||||||
getFormInfo({ ...values, [fileKey]: fileList, fileIds: fileList.map(item => item.fileId) })
|
getFormInfo({ ...values,caseDate:type != 'edit'? values?.caseDate:"", [fileKey]: fileList, fileIds: fileList.map(item => item.fileId) })
|
||||||
|
|
||||||
setFileList([])
|
setFileList([])
|
||||||
}).catch((errorInfo) => {
|
}).catch((errorInfo) => {
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
|
||||||
|
|
||||||
|
|
||||||
const onfinish = (values) => {
|
const onfinish = (values) => {
|
||||||
|
values.releaseDate = values.releaseDate ? moment(values.releaseDate).format('YYYY-MM-DD 00:00:00'):''
|
||||||
let oldFiles = fileList.map(item => (item.response?.data??item))
|
let oldFiles = fileList.map(item => (item.response?.data??item))
|
||||||
// debugger
|
// debugger
|
||||||
if (mode === 'edit') {
|
if (mode === 'edit') {
|
||||||
|
|
@ -148,7 +149,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
|
||||||
getValueFromEvent={(e, dateString) => dateString}
|
getValueFromEvent={(e, dateString) => dateString}
|
||||||
getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
|
getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
|
||||||
>
|
>
|
||||||
<DatePicker disabled={mode === 'view'} format={'YYYY-MM-DD HH:mm:ss'} style={{ width: '100%' }} allowClear />
|
<DatePicker disabled={mode === 'view'} format={'YYYY-MM-DD'} style={{ width: '100%' }} allowClear />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</Col>
|
</Col>
|
||||||
<Col span={12}>
|
<Col span={12}>
|
||||||
|
|
@ -183,7 +184,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
|
||||||
>
|
>
|
||||||
<p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
|
<p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
|
||||||
<p className="ant-upload-hint">
|
<p className="ant-upload-hint">
|
||||||
支持扩展名:.doc .docx .pdf .jpg .png .ppt
|
支持扩展名:.doc .docx .xls .pdf .jpg .png .ppt
|
||||||
</p>
|
</p>
|
||||||
</Dragger>
|
</Dragger>
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,11 @@ const Page = () => {
|
||||||
title: '上传时间', key: 'minUpTime', dataIndex: 'minUpTime'
|
title: '上传时间', key: 'minUpTime', dataIndex: 'minUpTime'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '附件', key: 'files', dataIndex: 'files', render:(v,r)=><a onClick={()=>download(v[0].fileId,v[0]?.fileName)}><PaperClipOutlined />{v[0]?.fileName}</a>
|
title: '附件', key: 'files', dataIndex: 'files', render: (v, r) => {
|
||||||
|
return (
|
||||||
|
<a onClick={() => download(v[0].fileId, v[0]?.fileName)}>{v.length > 0 ? <PaperClipOutlined />:''}{v[0]?.fileName}</a>
|
||||||
|
)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '操作', key: 'operation', fixed: 'right', align: 'center',
|
title: '操作', key: 'operation', fixed: 'right', align: 'center',
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
|
||||||
const [form] = Form.useForm();
|
const [form] = Form.useForm();
|
||||||
const [showGj, setShowGj] = useState(false)
|
const [showGj, setShowGj] = useState(false)
|
||||||
const onFinish = (values) => {
|
const onFinish = (values) => {
|
||||||
|
values.name = values.name != '' ?values.name: undefined;
|
||||||
|
values.fillUnit = values.fillUnit != '' ?values.fillUnit:undefined
|
||||||
let dataSo;
|
let dataSo;
|
||||||
if (values.releaseDate) {
|
if (values.releaseDate) {
|
||||||
dataSo = {
|
dataSo = {
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role, setIsChecked, setDelVa
|
||||||
if (values.tm) {
|
if (values.tm) {
|
||||||
dateTimeSo = {
|
dateTimeSo = {
|
||||||
start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
|
start: moment(values.tm[0]).format('YYYY-MM-DD 00:00:00'),
|
||||||
end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
|
end: moment(values.tm[1]).format('YYYY-MM-DD 23:59:59')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
delete values.tm
|
delete values.tm
|
||||||
|
|
@ -35,7 +35,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role, setIsChecked, setDelVa
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let dateTimeSo = {
|
let dateTimeSo = {
|
||||||
start: moment().format('YYYY-01-01 00:00:00'),
|
start: moment().format('YYYY-01-01 00:00:00'),
|
||||||
end: moment().format('YYYY-MM-DD 00:00:00')
|
end: moment().format('YYYY-MM-DD 23:59:59')
|
||||||
}
|
}
|
||||||
form.setFieldValue("tm", [moment(dateTimeSo.start), moment(dateTimeSo.end)])
|
form.setFieldValue("tm", [moment(dateTimeSo.start), moment(dateTimeSo.end)])
|
||||||
setSearchVal({ dateTimeSo })
|
setSearchVal({ dateTimeSo })
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue