From 51bcad93cea8dc6649e82ef27e23ac22d39b9013 Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Fri, 15 Nov 2024 14:04:53 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/crud/usePageTable2.ts | 2 +- .../Home/MapCtrl/components/Skssjc/index.js | 49 +++++++++++-------- .../MapCtrl/components/Sqjcsj/drpOption.js | 5 +- src/views/fxzb/ddgc/form.js | 9 ++-- src/views/fxzb/fxya/form.js | 9 ++-- src/views/fxzb/qxwl/gc/form.js | 4 +- src/views/fxzb/qxwl/gc/index.js | 5 +- src/views/gbyj/toolbar.js | 2 +- src/views/gxsl/gsnlfx/index.js | 2 +- src/views/rcgl/aqgl/aqjcgl/toolbar.js | 2 +- src/views/rcgl/aqgl/aqsgdj/form.js | 4 +- src/views/rcgl/aqgl/aqsgdj/toolbar.js | 2 +- src/views/rcgl/aqgl/aqyhpc/form.js | 6 ++- src/views/rcgl/aqgl/aqyhpc/toolbar.js | 2 +- src/views/rcgl/aqgl/fxgkqd/form.js | 2 +- src/views/rcgl/aqgl/fxgkqd/index.js | 7 ++- src/views/sq/qth/hdsq/sssw.js | 6 +-- src/views/sq/qth/sksq/sssw.js | 19 +++++-- src/views/sz/pxjlgl/chartToolbar.js | 6 +-- src/views/sz/pxjlgl/form.js | 17 ++++++- src/views/sz/pxjlgl/index.js | 23 +++++++++ src/views/szydd/ddjl/index.js | 2 +- src/views/zbgl/zbb/form.js | 2 +- src/views/zbgl/zbb/toolbar.js | 2 +- src/views/zbgl/zbrz/toolbar.js | 2 +- 25 files changed, 128 insertions(+), 63 deletions(-) diff --git a/src/components/crud/usePageTable2.ts b/src/components/crud/usePageTable2.ts index 176e8a96b..23a56d040 100644 --- a/src/components/crud/usePageTable2.ts +++ b/src/components/crud/usePageTable2.ts @@ -169,7 +169,7 @@ function usePageTable( current: state.pageNumber, total: state.total, pageSizeOptions: ['10', '15', '20', '50', '100'], - hideOnSinglePage: true, + hideOnSinglePage: false, position: ['bottomRight'], }, loading: state.loading, diff --git a/src/views/Home/MapCtrl/components/Skssjc/index.js b/src/views/Home/MapCtrl/components/Skssjc/index.js index 94cd3dd7c..fd0722ea1 100644 --- a/src/views/Home/MapCtrl/components/Skssjc/index.js +++ b/src/views/Home/MapCtrl/components/Skssjc/index.js @@ -7,7 +7,7 @@ import './index.less' import MyImg from './myImg.js' import { httpget,httppost } from '../../../../../utils/request'; import apiurl from '../../../../../service/apiurl'; -import { Image } from 'antd'; +import { Image,Divider } from 'antd'; function Skssjc({data}) { @@ -45,28 +45,35 @@ function Skssjc({data}) {
-
设计洪水位:
-
{data.desFloodLev ? data.desFloodLev.toFixed(2):'-'}
-
m
-
+
校验洪水位:
+
{data?.calFloodLev ? data?.calFloodLev.toFixed(2) : '-'}
+ +
{(data.calFloodLev && data?.rz) ? (data?.rz - data.calFloodLev).toFixed(2):'-'}
+
m
+ +
+
设计洪水位:
+
{data?.desFloodLev ? data?.desFloodLev.toFixed(2):'-'}
+ +
{(data.desFloodLev && data?.rz) ? (data?.rz - data.desFloodLev).toFixed(2):'-'}
+
m
+
-
-
正常蓄水位:
-
{data.normWatLev ? data.normWatLev.toFixed(2):'-'}
-
m
-
+
+
汛限水位:
+
{data.flLowLimLev ? data.flLowLimLev.toFixed(2):'-'}
+ +
{(data.flLowLimLev && data?.rz) ? (data?.rz - data.flLowLimLev).toFixed(2):'-'}
+
m
+
-
-
汛限水位:
-
{data.flLowLimLev ? data.flLowLimLev.toFixed(2):'-'}
-
m
-
- -
-
死水位:
-
{data.deadLev ? data.deadLev.toFixed(2):'-'}
-
m
-
+
+
死水位:
+
{data.deadLev ? data.deadLev.toFixed(2):'-'}
+ +
{(data.deadLev && data?.rz) ? (data?.rz - data.deadLev).toFixed(2):'-'}
+
m
+
坝顶高程:
{data.crestElev}
diff --git a/src/views/Home/MapCtrl/components/Sqjcsj/drpOption.js b/src/views/Home/MapCtrl/components/Sqjcsj/drpOption.js index 004d3a93d..40704cfc0 100644 --- a/src/views/Home/MapCtrl/components/Sqjcsj/drpOption.js +++ b/src/views/Home/MapCtrl/components/Sqjcsj/drpOption.js @@ -1,12 +1,11 @@ export default function drpOption({ data, wrz, grz }) { console.log("data",wrz, grz); const maxVal = Math.max(...data.map(obj => obj.drp)) - const maxSw = Math.max(...data.map(obj => obj.z)) - const minSw = Math.min(...data.map(obj => obj.z)) + const maxSw = Math.ceil(Math.max(...data.map(obj => obj.z))) + const minSw = Math.floor(Math.min(...data.map(obj => obj.z))) const maxLl = Math.max(...data.map(obj => obj.tq)) const minLl = Math.min(...data.map(obj => obj.tq)) return { - tooltip: { trigger: 'axis', diff --git a/src/views/fxzb/ddgc/form.js b/src/views/fxzb/ddgc/form.js index f4aa6d72e..65495d258 100644 --- a/src/views/fxzb/ddgc/form.js +++ b/src/views/fxzb/ddgc/form.js @@ -121,6 +121,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { @@ -137,6 +138,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { @@ -150,7 +152,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { })} rules={[{ required: true }]} > - + @@ -164,6 +166,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { @@ -177,7 +180,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { })} rules={[{ required: true }]} > - + @@ -212,7 +215,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { - + { loading ? 文件正在上传中，请等待 : fileList.length > 0 && fileList.map(file => { diff --git a/src/views/fxzb/fxya/form.js b/src/views/fxzb/fxya/form.js index e74746326..07bd6e3e4 100644 --- a/src/views/fxzb/fxya/form.js +++ b/src/views/fxzb/fxya/form.js @@ -121,6 +121,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { @@ -137,6 +138,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { @@ -150,7 +152,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { })} rules={[{ required: true }]} > - + @@ -164,6 +166,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { @@ -177,7 +180,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { })} rules={[{ required: true }]} > - + @@ -212,7 +215,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onCrudSuccess }) => { - + { loading ? 文件正在上传中，请等待 : fileList.length > 0 && fileList.map(file => { diff --git a/src/views/fxzb/qxwl/gc/form.js b/src/views/fxzb/qxwl/gc/form.js index e9d8d5e30..79445b1b8 100644 --- a/src/views/fxzb/qxwl/gc/form.js +++ b/src/views/fxzb/qxwl/gc/form.js @@ -242,7 +242,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => { @@ -271,7 +271,7 @@ const ModalForm = ({ mode, record,onEdit,onSave,onSimilarSave }) => { { record.unit === 8 ? "箱" : record.unit === 9 ? "卷" : record.unit === 10 ? "立方米" : - "平方米" + record.unit === 11 ? "平方米" : + "" } }, { title: '库存数量', key: 'storeQuantity', dataIndex: 'storeQuantity', width: 150, ellipsis: true }, @@ -132,7 +133,7 @@ const Page = () => { { title: '联系电话', key: 'phone', dataIndex: 'phone', width: 150, ellipsis: true }, { title: '操作', key: 'operation', width: 240, fixed: 'right',align: 'center', - render: (value, row, index) => ( () => command(cmd)(row)} />) + render: (value, row, index) => ( () => command(cmd)(row)} />) }, ]; diff --git a/src/views/gbyj/toolbar.js b/src/views/gbyj/toolbar.js index 091e3a39f..420d27d06 100644 --- a/src/views/gbyj/toolbar.js +++ b/src/views/gbyj/toolbar.js @@ -26,7 +26,7 @@ const ToolBar = ({ setSearchVal,jh}) => { - + { if (tableData[0]?.nowCap && tableData[0]?.deadCap) { - let num = ((tableData[0]?.nowCap - tableData[0]?.deadCap) / 10000).toFixed(2) + let num = (tableData[0]?.nowCap - tableData[0]?.deadCap).toFixed(2) return num } else { return "--" diff --git a/src/views/rcgl/aqgl/aqjcgl/toolbar.js b/src/views/rcgl/aqgl/aqjcgl/toolbar.js index cdc4de3cb..fcb511ea2 100644 --- a/src/views/rcgl/aqgl/aqjcgl/toolbar.js +++ b/src/views/rcgl/aqgl/aqjcgl/toolbar.js @@ -22,7 +22,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { useEffect(() => { let dateSo = { - start: moment().subtract(1,"years").format('YYYY-MM-DD 00:00:00'), + start: moment().startOf("year").format('YYYY-MM-DD 00:00:00'), end: moment().format('YYYY-MM-DD 23:59:59') } form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)]) diff --git a/src/views/rcgl/aqgl/aqsgdj/form.js b/src/views/rcgl/aqgl/aqsgdj/form.js index 05ef9dc35..4d6412a90 100644 --- a/src/views/rcgl/aqgl/aqsgdj/form.js +++ b/src/views/rcgl/aqgl/aqsgdj/form.js @@ -79,7 +79,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { const onfinish = (values) => { - values.accidentDate = values.accidentDate?moment(values.accidentDate).format("YYYY-MM-DD 00:00:00"):'' + values.accidentDate = values.accidentDate?moment(values.accidentDate).format("YYYY-MM-DD HH:mm:00"):'' values.closeCaseDate = values.closeCaseDate?moment(values.closeCaseDate).format("YYYY-MM-DD 00:00:00"):'' let oldFiles = fileList.map(item => ({fileId:item.response?.data?.fileId}) ) let oldFiles1 = imgfileList.map(item => ({fileId:item.response?.data?.fileId}) ) @@ -197,7 +197,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { }, ]} > - + diff --git a/src/views/rcgl/aqgl/aqsgdj/toolbar.js b/src/views/rcgl/aqgl/aqsgdj/toolbar.js index 25bcd2ab5..1e8da5063 100644 --- a/src/views/rcgl/aqgl/aqsgdj/toolbar.js +++ b/src/views/rcgl/aqgl/aqsgdj/toolbar.js @@ -22,7 +22,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { useEffect(() => { let dateSo = { - start: moment().subtract(1,"years").format('YYYY-MM-DD 00:00:00'), + start: moment().startOf("year").format('YYYY-MM-DD 00:00:00'), end: moment().format('YYYY-MM-DD 23:59:59') } form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)]) diff --git a/src/views/rcgl/aqgl/aqyhpc/form.js b/src/views/rcgl/aqgl/aqyhpc/form.js index 95e5c532f..6c803823e 100644 --- a/src/views/rcgl/aqgl/aqyhpc/form.js +++ b/src/views/rcgl/aqgl/aqyhpc/form.js @@ -71,7 +71,11 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { const onfinish = (values) => { - values.eventsDate = values.eventsDate?moment(values.eventsDate).format("YYYY-MM-DD 00:00:00"):'' + const userId = localStorage.getItem('userId') + const userName = localStorage.getItem('userName') + values.reportUserId = userId; + values.reportUserName = userName; + values.eventsDate = values.eventsDate ? moment(values.eventsDate).format("YYYY-MM-DD 00:00:00") : '' let oldFiles = fileList.map(item => ({fileId:item.response?.data?.fileId}) ) if (mode === 'edit') { values.files = oldFiles; diff --git a/src/views/rcgl/aqgl/aqyhpc/toolbar.js b/src/views/rcgl/aqgl/aqyhpc/toolbar.js index b3bee90e3..8bdf364bb 100644 --- a/src/views/rcgl/aqgl/aqyhpc/toolbar.js +++ b/src/views/rcgl/aqgl/aqyhpc/toolbar.js @@ -22,7 +22,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { useEffect(() => { let dateSo = { - start: moment().subtract(1,"years").format('YYYY-MM-DD 00:00:00'), + start: moment().startOf("year").format('YYYY-MM-DD 00:00:00'), end: moment().format('YYYY-MM-DD 23:59:59') } form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)]) diff --git a/src/views/rcgl/aqgl/fxgkqd/form.js b/src/views/rcgl/aqgl/fxgkqd/form.js index 1f7d2099a..74d62dc99 100644 --- a/src/views/rcgl/aqgl/fxgkqd/form.js +++ b/src/views/rcgl/aqgl/fxgkqd/form.js @@ -122,7 +122,7 @@ const getResultList = async() => { if (mode === 'edit') { values.files = oldFiles; values.id = record.id; - onEdit(apiurl.rcgl.aqgl.fxgkqd.edit,values) + onEdit(apiurl.rcgl.aqgl.fxgkqd.edit,{...record,...values}); } if (mode === 'save') { values.files = oldFiles diff --git a/src/views/rcgl/aqgl/fxgkqd/index.js b/src/views/rcgl/aqgl/fxgkqd/index.js index ceaa0720e..19401ae9f 100644 --- a/src/views/rcgl/aqgl/fxgkqd/index.js +++ b/src/views/rcgl/aqgl/fxgkqd/index.js @@ -10,7 +10,7 @@ import apiurl from '../../../../service/apiurl'; import usePageTable from '../../../../components/crud/usePageTable2'; import { createCrudService } from '../../../../components/crud/_'; import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender'; - +import moment from 'moment'; const url = "http://223.75.53.141:9102/test.by-lyf.tmp" const Page = () => { const role = useSelector(state => state.auth.role); @@ -50,7 +50,10 @@ const Page = () => { render: (value) => {value ? value.map(item => item.dictNm).join():''} }, {title: '主要防范措施', key: 'preventMeasure', dataIndex: 'preventMeasure', width: 300,ellipsis: true,align: 'center',}, - {title: '创建日期', key: 'createDate', dataIndex: 'createDate', width: 200,align: 'center',}, + { + title: '创建日期', key: 'createDate', dataIndex: 'createDate', width: 200, align: 'center', + render: (v) => {v ? moment(v).format("YYYY-MM-DD"): ''} + }, { title: '操作', key: 'operation', width: 200, fixed: 'right',align: 'center', render: (value, row, index) => ( diff --git a/src/views/sq/qth/hdsq/sssw.js b/src/views/sq/qth/hdsq/sssw.js index 69b3a30ae..bd6c189fa 100644 --- a/src/views/sq/qth/hdsq/sssw.js +++ b/src/views/sq/qth/hdsq/sssw.js @@ -19,15 +19,15 @@ export default function Sssw({data}) {
警戒水位:
{data?.wrz ? data?.wrz.toFixed(2) : '-'}
-
{(data.wrz && data?.z) ? (data.wrz - data?.z).toFixed(2):'-'}
+
{(data.wrz && data?.z) ? (data?.z - data.wrz).toFixed(2):'-'}
m
-
危险水位:
+
保证水位:
{data.grz ? data.grz.toFixed(2) : '-'}
-
{(data.grz && data?.z) ? (data.grz - data?.z).toFixed(2):'-'}
+
{(data.grz && data?.z) ? (data?.z - data.grz ).toFixed(2):'-'}
m
diff --git a/src/views/sq/qth/sksq/sssw.js b/src/views/sq/qth/sksq/sssw.js index b45a46ae9..d6b3b3d07 100644 --- a/src/views/sq/qth/sksq/sssw.js +++ b/src/views/sq/qth/sksq/sssw.js @@ -1,6 +1,8 @@ import React from 'react' import moment from 'moment' import MyImg from '../../../Home/MapCtrl/components/Skssjc/myImg' +import {Divider} from "antd" + export default function Sssw({data}) { return (
@@ -17,26 +19,33 @@ export default function Sssw({data}) {
-
设计洪水位:
-
{data?.desFloodLev ? data?.desFloodLev.toFixed(2):'-'}
+
校验洪水位:
+
{data?.calFloodLev ? data?.calFloodLev.toFixed(2) : '-'}
+ +
{(data.calFloodLev && data?.rz) ? (data?.rz - data.calFloodLev).toFixed(2):'-'}
m
-
-
正常蓄水位:
-
{data.normWatLev ? data.normWatLev.toFixed(2):'-'}
+
设计洪水位:
+
{data?.desFloodLev ? data?.desFloodLev.toFixed(2):'-'}
+ +
{(data.desFloodLev && data?.rz) ? (data?.rz - data.desFloodLev).toFixed(2):'-'}
m
汛限水位:
{data.flLowLimLev ? data.flLowLimLev.toFixed(2):'-'}
+ +
{(data.flLowLimLev && data?.rz) ? (data?.rz - data.flLowLimLev).toFixed(2):'-'}
m
死水位:
{data.deadLev ? data.deadLev.toFixed(2):'-'}
+ +
{(data.deadLev && data?.rz) ? (data?.rz - data.deadLev).toFixed(2):'-'}
m
diff --git a/src/views/sz/pxjlgl/chartToolbar.js b/src/views/sz/pxjlgl/chartToolbar.js index 349014c51..6f46415bf 100644 --- a/src/views/sz/pxjlgl/chartToolbar.js +++ b/src/views/sz/pxjlgl/chartToolbar.js @@ -20,7 +20,7 @@ const ToolBar = ({ setSearchVal }) => { } useEffect(() => { - const value = {teamName:1,year:moment()} + const value = {year:moment()} form.setFieldsValue(value) setSearchVal({...value,year:moment().format("YYYY")}) }, []) @@ -29,9 +29,9 @@ const ToolBar = ({ setSearchVal }) => { <>
- + {/* - + */} { + + + + + + + @@ -419,7 +432,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { {mode !== "view" && { console.log(info.dataTransfer.files); }} @@ -430,7 +443,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { >

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

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

} diff --git a/src/views/sz/pxjlgl/index.js b/src/views/sz/pxjlgl/index.js index 9650fe25e..d42a4c15d 100644 --- a/src/views/sz/pxjlgl/index.js +++ b/src/views/sz/pxjlgl/index.js @@ -16,6 +16,25 @@ import { httpget2 } from '../../../utils/request'; import moment from 'moment'; const Page = () => { + const types = [ + { + label: "水利", + value:1 + }, + { + label: "岗前培训", + value:2 + },{ + label: "在岗培训", + value:3 + },{ + label: "政治学习教育", + value:4 + },{ + label: "其他", + value:5 + }, + ] const role = useSelector(state => state.auth.role); const editBtn = role?.rule?.find(item => item.menuName == "编辑") || true; const viewBtn = role?.rule?.find(item => item.menuName == "查看") || true; @@ -30,6 +49,10 @@ const Page = () => { title: '标题', key: 'name', dataIndex: 'name', width: 200,ellipsis: true }, { title: '主办单位', key: 'unit', dataIndex: 'unit', width: 150 }, + { + title: '培训分类', key: 'type', dataIndex: 'type', width: 150, + render: (v) => {types[v]?.label} + }, { title: '培训内容', key: 'content', dataIndex: 'content', width: 200,ellipsis: true }, diff --git a/src/views/szydd/ddjl/index.js b/src/views/szydd/ddjl/index.js index b3e1656b0..d95a50dd3 100644 --- a/src/views/szydd/ddjl/index.js +++ b/src/views/szydd/ddjl/index.js @@ -139,7 +139,7 @@ const Page = () => {
diff --git a/src/views/zbgl/zbb/form.js b/src/views/zbgl/zbb/form.js index a44219a23..68b45e5ae 100644 --- a/src/views/zbgl/zbb/form.js +++ b/src/views/zbgl/zbb/form.js @@ -208,7 +208,7 @@ useEffect(() => { { : null} - +
diff --git a/src/views/zbgl/zbrz/toolbar.js b/src/views/zbgl/zbrz/toolbar.js index 4b664bea7..bd336eb11 100644 --- a/src/views/zbgl/zbrz/toolbar.js +++ b/src/views/zbgl/zbrz/toolbar.js @@ -41,7 +41,7 @@ const ToolBar = ({ setSearchVal, onSave, exportFile,role }) => {
{searchBtn ?