From 09743da858ef7f4ed9c2df75c22050a44874892f Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Wed, 9 Apr 2025 17:43:19 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E7=99=BD=E8=9A=81=E9=98=B2=E6=B2=BB?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/wait.png | Bin 0 -> 9217 bytes src/service/apiurl.js | 4 +- .../Home/MapCtrl/components/Jcsj/index.js | 15 +++---- .../MapCtrl/components/Sksjcx/drpOption.js | 8 +++- src/views/Home/fhxs/index.js | 2 +- src/views/Home/fhxs/jyxx.js | 7 ++- src/views/Home/fhxs/sksw.js | 8 +++- src/views/fxzb/ddgc/index.less | 8 ++++ src/views/gcaqjc/sjtjcx/syjc/toolbar.js | 1 + src/views/rcgl/byfz/bypc/index.js | 2 +- src/views/rcgl/jdkh/khrwgl/PfDetail.js | 42 +++++++++++------- src/views/rcgl/jdkh/khrwgl/form.js | 4 +- src/views/rcgl/jdkh/khrwgl/toolbar.js | 2 +- src/views/rcgl/zmjk/ModalToolBar.js | 2 +- src/views/sq/qfg/zcdjxx.js | 5 ++- src/views/sz/szzf/ajdj/editTabs.js | 4 +- src/views/sz/szzf/ajdj/index.js | 4 +- src/views/sz/szzf/ajdj/toolbar.js | 4 +- src/views/sz/szzf/clyj/content.js | 2 +- src/views/sz/szzf/clyj/form.js | 8 +++- src/views/sz/szzf/form/index.js | 6 +-- src/views/sz/zdgl/form.js | 5 ++- src/views/sz/zdgl/index.js | 6 ++- src/views/sz/zdgl/toolbar.js | 2 + src/views/szydd/ddjl/toolbar.js | 4 +- 25 files changed, 101 insertions(+), 54 deletions(-) create mode 100644 src/assets/img/wait.png diff --git a/src/assets/img/wait.png b/src/assets/img/wait.png new file mode 100644 index 0000000000000000000000000000000000000000..a9e9d77e267b645add072253ac513974426b9e03 GIT binary patch literal 9217 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 RKkxy8bTsufO4My5{uh1AbXx!b literal 0 HcmV?d00001 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 })