lishenfeng
/
tsg-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(): 白蚁防治功能修改

qzc-dev-demo
李神峰 2025-04-09 17:43:19 +08:00
parent 631899e393
commit 09743da858
25 changed files with 101 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/img/wait.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

4
src/service/apiurl.js
View File

@ -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:{

15
src/views/Home/MapCtrl/components/Jcsj/index.js
View File

@ -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)

8
src/views/Home/MapCtrl/components/Sksjcx/drpOption.js
View File

@ -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 {

2
src/views/Home/fhxs/index.js
View File

@ -91,7 +91,7 @@ const Page = ({showPanels}) => {
</Panel>
</Collapse>
</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>
);

7
src/views/Home/fhxs/jyxx.js
View File

@ -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,

8
src/views/Home/fhxs/sksw.js
View File

@ -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) => <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 },
];

8
src/views/fxzb/ddgc/index.less
View File

@ -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%;

1
src/views/gcaqjc/sjtjcx/syjc/toolbar.js
View File

@ -102,6 +102,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => {
<Form.Item label="上报时间" name="tm">
<RangePicker
allowClear
showTime
style={{ width: "350px" }}
format="YYYY-MM-DD HH:mm:ss"
onChange={(v)=>{

2
src/views/rcgl/byfz/bypc/index.js
View File

@ -209,7 +209,7 @@ const Page = () => {
<span className='number' style={{ color: '#8c8c8c' }}>{count.noData}</span>
<span className="unit">个</span>
</div>
<span className='label'>无数据</span>
<span className='label'>离线</span>
</div>
</Col>
</Row>

42
src/views/rcgl/jdkh/khrwgl/PfDetail.js
View File

@ -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 }) => {
<Form.Item
label="整改期限"
name="rectifyLastDate"
rules={[
{
required: true,
},
]}
getValueFromEvent={(e,dateString) => dateString}
getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
>

4
src/views/rcgl/jdkh/khrwgl/form.js
View File

@ -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)
}
}

2
src/views/rcgl/jdkh/khrwgl/toolbar.js
View File

@ -39,7 +39,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
<>
<div style={{display:'flex',justifyContent:'space-between'}}>
<Form form={form} className='toolbarBox' layout="inline" onFinish={onFinish}>
<Form.Item label="上报时间" name="tm">
<Form.Item label="考核时间" name="tm">
<RangePicker
allowClear
style={{ width: "300px" }}

2
src/views/rcgl/zmjk/ModalToolBar.js
View File

@ -40,7 +40,7 @@ const ToolBar = ({ setSearchVal, exportFile,list }) => {
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

5
src/views/sq/qfg/zcdjxx.js
View File

@ -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 (
<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>
)
}

4
src/views/sz/szzf/ajdj/editTabs.js
View File

@ -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) => {

4
src/views/sz/szzf/ajdj/index.js
View File

@ -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)

4
src/views/sz/szzf/ajdj/toolbar.js
View File

@ -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

2
src/views/sz/szzf/clyj/content.js
View File

@ -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})
})
}

8
src/views/sz/szzf/clyj/form.js
View File

@ -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){

6
src/views/sz/szzf/form/index.js
View File

@ -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) => {

5
src/views/sz/zdgl/form.js
View File

@ -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 })}
>
<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>
</Col>
<Col span={12}>
@ -183,7 +184,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
>
<p className="ant-upload-text">点击或拖拽文件到此区域上传</p>
<p className="ant-upload-hint">
支持扩展名：.doc .docx .pdf .jpg .png .ppt
支持扩展名：.doc .docx .xls .pdf .jpg .png .ppt
</p>
</Dragger>
}

6
src/views/sz/zdgl/index.js
View File

@ -42,7 +42,11 @@ const Page = () => {
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',

2
src/views/sz/zdgl/toolbar.js
View File

@ -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 = {

4
src/views/szydd/ddjl/toolbar.js
View File

@ -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 })