diff --git a/src/assets/img/wait.png b/src/assets/img/wait.png new file mode 100644 index 000000000..a9e9d77e2 Binary files /dev/null and b/src/assets/img/wait.png differ diff --git a/src/service/apiurl.js b/src/service/apiurl.js index c75cbcf7e..e5ee5b6a8 100644 --- a/src/service/apiurl.js +++ b/src/service/apiurl.js @@ -1159,7 +1159,9 @@ const apiurl = { edit:service_fxdd + '/szTreatmentBasis/update', add:service_fxdd + '/szTreatmentBasis/insert', del:service_fxdd + '/szTreatmentBasis/del/', - detail:service_fxdd + '/szTreatmentBasis/get/' + detail: service_fxdd + '/szTreatmentBasis/get/', + tree1:service_fxdd + '/szTreatmentBasis/get/treeFiltered', + } }, flfg:{ diff --git a/src/views/Home/MapCtrl/components/Jcsj/index.js b/src/views/Home/MapCtrl/components/Jcsj/index.js index c458e3294..3ae3c3230 100644 --- a/src/views/Home/MapCtrl/components/Jcsj/index.js +++ b/src/views/Home/MapCtrl/components/Jcsj/index.js @@ -70,20 +70,19 @@ function DrpSearch({record}) { option = { stcd: record?.stcd, 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 || 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 || (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: current == 0 ? - params?.endTime || 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")) : + 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: [ - params?.tm[0] || - moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0}), + params?.tm[0] || + (record?.stm ?moment(record?.stm) :moment().subtract(7, 'days').add(1, 'hour').set({minute: 0, second: 0})), 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) { setParams(option) getData(option) diff --git a/src/views/Home/MapCtrl/components/Sksjcx/drpOption.js b/src/views/Home/MapCtrl/components/Sksjcx/drpOption.js index 9604e490a..68eec8749 100644 --- a/src/views/Home/MapCtrl/components/Sksjcx/drpOption.js +++ b/src/views/Home/MapCtrl/components/Sksjcx/drpOption.js @@ -7,11 +7,15 @@ export default function drpOption ({ desFloodLev, calFloodLev }) { + + // flLowLimLev 汛限水位 desFloodLev 设计水位 calFloodLev校核水位 console.log('data', data) + console.log(flLowLimLev,desFloodLev,calFloodLev); + const maxVal = Math.max(...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 minSw = Math.floor(Math.min(...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),flLowLimLev,desFloodLev,calFloodLev)) const maxKr = Math.max(...data.map(obj => obj.w)) const minKr = Math.min(...data.map(obj => obj.w)) return { diff --git a/src/views/Home/fhxs/index.js b/src/views/Home/fhxs/index.js index 168893b05..3000dd5b7 100644 --- a/src/views/Home/fhxs/index.js +++ b/src/views/Home/fhxs/index.js @@ -91,7 +91,7 @@ const Page = ({showPanels}) => { -
+ {myKey== '1' &&
}
); diff --git a/src/views/Home/fhxs/jyxx.js b/src/views/Home/fhxs/jyxx.js index 5eb824371..b84b94024 100644 --- a/src/views/Home/fhxs/jyxx.js +++ b/src/views/Home/fhxs/jyxx.js @@ -83,7 +83,12 @@ const Page = ({showPanels,setTms2}) => { // dispatch.map.setLayerVisible({"HdswLayer":true}); dispatch.runtime.setFeaturePop({ 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', lgtd: data.lgtd, lttd: data.lttd, diff --git a/src/views/Home/fhxs/sksw.js b/src/views/Home/fhxs/sksw.js index 715a603e3..955af5a4d 100644 --- a/src/views/Home/fhxs/sksw.js +++ b/src/views/Home/fhxs/sksw.js @@ -12,7 +12,13 @@ const Page = ({ data, list }) => { const dispatch = useDispatch(); const columns = [ { 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) => 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} + }, { title: '时间', key: 'tm', dataIndex: 'tm',align: "center", ellipsis: true }, ]; diff --git a/src/views/fxzb/ddgc/index.less b/src/views/fxzb/ddgc/index.less index ad80c0a9c..99536f2e7 100644 --- a/src/views/fxzb/ddgc/index.less +++ b/src/views/fxzb/ddgc/index.less @@ -15,6 +15,14 @@ height: 40px; // margin-right: 10px; } + span{ + display: block; + width: 180px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + } .delete-icon{ // margin-left: 1%; diff --git a/src/views/gcaqjc/sjtjcx/syjc/toolbar.js b/src/views/gcaqjc/sjtjcx/syjc/toolbar.js index 85b8cd8b3..f41fedebd 100644 --- a/src/views/gcaqjc/sjtjcx/syjc/toolbar.js +++ b/src/views/gcaqjc/sjtjcx/syjc/toolbar.js @@ -102,6 +102,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { { diff --git a/src/views/rcgl/byfz/bypc/index.js b/src/views/rcgl/byfz/bypc/index.js index f2bc2fc8e..0e9f91543 100644 --- a/src/views/rcgl/byfz/bypc/index.js +++ b/src/views/rcgl/byfz/bypc/index.js @@ -209,7 +209,7 @@ const Page = () => { {count.noData} 个 - 无数据 + 离线 diff --git a/src/views/rcgl/jdkh/khrwgl/PfDetail.js b/src/views/rcgl/jdkh/khrwgl/PfDetail.js index b3dae0ebc..a783972c9 100644 --- a/src/views/rcgl/jdkh/khrwgl/PfDetail.js +++ b/src/views/rcgl/jdkh/khrwgl/PfDetail.js @@ -89,6 +89,8 @@ const EditableRow = ({ index, ...props }) => { // 总分 const [tableData, setTableData] = useState([]) + // 为了切换全部和不及格 + const [checkList, setCheckList] = useState([]) const score = useMemo(() => tableData?.reduce((total, cur) => total + (cur?.assessScore ?? 0), 0), [tableData]); const columns = [ { @@ -195,12 +197,14 @@ const EditableRow = ({ index, ...props }) => { try { const res = await httpget2(url + `/${id}`) if (res.code == 200) { + res.data.forEach(item => { if (item.rowSpan) delete item.rowSpan; }) const result = handleData(res.data, "name") setTableData(result) - tableDataRef.current = result; + tableDataRef.current = result; + setCheckList(result) } } catch (error) { console.log(error); @@ -304,7 +308,7 @@ const EditableRow = ({ index, ...props }) => { }) const newData = handleData(result, "name") setTableData(newData) - + setCheckList(newData) } } catch (error) { console.log(error); @@ -417,12 +421,21 @@ const EditableRow = ({ index, ...props }) => { } const handleRadioChange = (e) => { if (e.target.value == 1) { - if (tabs == 2) { - getQdViewData(Item?.id) - } else { - getZbTableData(Item?.id,2) - } + // if (tabs == 2) { + // getQdViewData(Item?.id) + // } else { + // 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 { + setCheckList(tableData) const newData = tabs == 2 ? tableData.filter(item => item.standardScore > item.indicatorScore) : tableData.filter(item => item.standardScore > item.assessScore) newData.forEach(item => { @@ -502,16 +515,6 @@ const EditableRow = ({ index, ...props }) => { // 获取指标表格数据 useEffect(() => { - // if (Item.type != "start") { - // if (tabs == 2) { - // getQdViewData(Item?.id) - // } else { - // getZbTableData(Item?.id,2) - // } - // } else { - // getZbTableData(record?.templateId,1) - - // } if (tabs == 2) { getQdViewData(Item?.id) } else { @@ -630,6 +633,11 @@ const EditableRow = ({ index, ...props }) => { dateString} getValueProps={(value) => ({ value: value ? moment(value) : undefined })} > diff --git a/src/views/rcgl/jdkh/khrwgl/form.js b/src/views/rcgl/jdkh/khrwgl/form.js index 7d4ee2499..101e92aba 100644 --- a/src/views/rcgl/jdkh/khrwgl/form.js +++ b/src/views/rcgl/jdkh/khrwgl/form.js @@ -122,8 +122,8 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { onEdit(apiurl.rcgl.jdkh.khrwgl.edit, { ...record, ...values }); } if (mode === 'save') { - values.startDate = values.dateRangeSo[0]; - values.endDate = values.dateRangeSo[1]; + values.startDate = values.dateRangeSo[0] ? moment(values.dateRangeSo[0]).format("YYYY-MM-DD 00:00:00"):''; + values.endDate = values.dateRangeSo[1]?moment(values.dateRangeSo[1]).format("YYYY-MM-DD 23:59:59"):''; onSave(apiurl.rcgl.jdkh.khrwgl.save,values) } } diff --git a/src/views/rcgl/jdkh/khrwgl/toolbar.js b/src/views/rcgl/jdkh/khrwgl/toolbar.js index 8b3aa35dd..f58c56444 100644 --- a/src/views/rcgl/jdkh/khrwgl/toolbar.js +++ b/src/views/rcgl/jdkh/khrwgl/toolbar.js @@ -39,7 +39,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { <>
- + { if (values.tm) { dateTimeSo = { 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 diff --git a/src/views/sq/qfg/zcdjxx.js b/src/views/sq/qfg/zcdjxx.js index d32e27720..8aba27771 100644 --- a/src/views/sq/qfg/zcdjxx.js +++ b/src/views/sq/qfg/zcdjxx.js @@ -1,9 +1,10 @@ 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 = () => { return (
- +
) } diff --git a/src/views/sz/szzf/ajdj/editTabs.js b/src/views/sz/szzf/ajdj/editTabs.js index f046b572e..831bc14ae 100644 --- a/src/views/sz/szzf/ajdj/editTabs.js +++ b/src/views/sz/szzf/ajdj/editTabs.js @@ -43,7 +43,7 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => { console.log(key); setKeys(key) if(key == 2){ - const res = await httpget(apiurl.szzf.clyj.tree) + const res = await httpget(apiurl.szzf.clyj.tree1) const arr = clqkData.map(item=>{ if(item.key == 'treatmentBasis'){ item.treeData = res.data @@ -68,7 +68,7 @@ const Page = ({ mode, onCrudSuccess,record,submit }) => { if (mode == 'save') { addBasic(params) } else if (mode == 'edit') { - editBasic(params) + editBasic({...params,caseDate:undefined}) } } const addBasic = (params) => { diff --git a/src/views/sz/szzf/ajdj/index.js b/src/views/sz/szzf/ajdj/index.js index db177a56b..ea6e58b99 100644 --- a/src/views/sz/szzf/ajdj/index.js +++ b/src/views/sz/szzf/ajdj/index.js @@ -71,8 +71,8 @@ const Page = () => { refModal.current.showSave(); } else if (type === 'edit') { let obj={} - if(params.caseDate){ - obj.caseDate= dayjs(params.caseDate) + if (params.caseDate) { + obj.caseDate = params.caseDate ? dayjs(params.caseDate) :undefined } if(params.IllegalDate){ obj.IllegalDate= dayjs(params.IllegalDate) diff --git a/src/views/sz/szzf/ajdj/toolbar.js b/src/views/sz/szzf/ajdj/toolbar.js index 14cec06b7..a7408cdc8 100644 --- a/src/views/sz/szzf/ajdj/toolbar.js +++ b/src/views/sz/szzf/ajdj/toolbar.js @@ -13,8 +13,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { let dateSo; if (values.createTime) { dateSo = { - stm: moment(values.createTime[0]).format('YYYY-MM-DD'), - etm: moment(values.createTime[1]).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 23:59:59') } } delete values.createTime diff --git a/src/views/sz/szzf/clyj/content.js b/src/views/sz/szzf/clyj/content.js index e46452922..1135027f5 100644 --- a/src/views/sz/szzf/clyj/content.js +++ b/src/views/sz/szzf/clyj/content.js @@ -24,7 +24,7 @@ const Page = ({ treeSelect }) => { refModal.current.showEdit({...data}); } 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}) }) } diff --git a/src/views/sz/szzf/clyj/form.js b/src/views/sz/szzf/clyj/form.js index 174569824..fa3bb806d 100644 --- a/src/views/sz/szzf/clyj/form.js +++ b/src/views/sz/szzf/clyj/form.js @@ -24,7 +24,13 @@ const ModalForm = ({ mode, record, onEdit, onSave, onCrudSuccess }) => { const onfinish = (values) => { - onEdit(apiurl.szzf.clyj.edit, {...record,...values}) + + let params = { + ...record, + ...values, + pid:record.pId + } + onEdit(apiurl.szzf.clyj.edit, params) } useEffect(() => { if(record){ diff --git a/src/views/sz/szzf/form/index.js b/src/views/sz/szzf/form/index.js index 3eee74ca9..75a46eb4e 100644 --- a/src/views/sz/szzf/form/index.js +++ b/src/views/sz/szzf/form/index.js @@ -20,7 +20,7 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for const [fileListUp, setFileLisUp] = useState([]) const [url, setUrl] = useState('') const [isModal, setIsModal] = useState(false) - const [loading, setLoading] = useState(false) + const [loading, setLoading] = useState(false) @@ -34,8 +34,8 @@ const FormZdy = ({ fileKey,typeName = "ddForm", formJson, getFormInfo, type, for } const getInfo = () => { 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([]) }).catch((errorInfo) => { diff --git a/src/views/sz/zdgl/form.js b/src/views/sz/zdgl/form.js index 8fedf63d9..4841d98d0 100644 --- a/src/views/sz/zdgl/form.js +++ b/src/views/sz/zdgl/form.js @@ -79,6 +79,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { 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)) // debugger if (mode === 'edit') { @@ -148,7 +149,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { getValueFromEvent={(e, dateString) => dateString} getValueProps={(value) => ({ value: value ? moment(value) : undefined })} > - + @@ -183,7 +184,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { >

点击或拖拽文件到此区域上传

- 支持扩展名：.doc .docx .pdf .jpg .png .ppt + 支持扩展名：.doc .docx .xls .pdf .jpg .png .ppt

} diff --git a/src/views/sz/zdgl/index.js b/src/views/sz/zdgl/index.js index bae1e3ae2..8ca6c484c 100644 --- a/src/views/sz/zdgl/index.js +++ b/src/views/sz/zdgl/index.js @@ -42,7 +42,11 @@ const Page = () => { title: '上传时间', key: 'minUpTime', dataIndex: 'minUpTime' }, { - title: '附件', key: 'files', dataIndex: 'files', render:(v,r)=>download(v[0].fileId,v[0]?.fileName)}>{v[0]?.fileName} + title: '附件', key: 'files', dataIndex: 'files', render: (v, r) => { + return ( + download(v[0].fileId, v[0]?.fileName)}>{v.length > 0 ? :''}{v[0]?.fileName} + ) + } }, { title: '操作', key: 'operation', fixed: 'right', align: 'center', diff --git a/src/views/sz/zdgl/toolbar.js b/src/views/sz/zdgl/toolbar.js index dccdad91c..cbc9a5dbb 100644 --- a/src/views/sz/zdgl/toolbar.js +++ b/src/views/sz/zdgl/toolbar.js @@ -10,6 +10,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { const [form] = Form.useForm(); const [showGj, setShowGj] = useState(false) const onFinish = (values) => { + values.name = values.name != '' ?values.name: undefined; + values.fillUnit = values.fillUnit != '' ?values.fillUnit:undefined let dataSo; if (values.releaseDate) { dataSo = { diff --git a/src/views/szydd/ddjl/toolbar.js b/src/views/szydd/ddjl/toolbar.js index cef574aa6..bd5cad134 100644 --- a/src/views/szydd/ddjl/toolbar.js +++ b/src/views/szydd/ddjl/toolbar.js @@ -25,7 +25,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role, setIsChecked, setDelVa if (values.tm) { dateTimeSo = { 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 @@ -35,7 +35,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role, setIsChecked, setDelVa useEffect(() => { let dateTimeSo = { 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)]) setSearchVal({ dateTimeSo })