diff --git a/src/views/Home/MapCtrl/components/Jcsj/index.js b/src/views/Home/MapCtrl/components/Jcsj/index.js index dec9cb35e..e8fbf8057 100644 --- a/src/views/Home/MapCtrl/components/Jcsj/index.js +++ b/src/views/Home/MapCtrl/components/Jcsj/index.js @@ -29,12 +29,17 @@ function DrpSearch({record}) { }, [echartData]) const searchTm = (e) => { - setParams({ - ...params, - startTime: e[0].format("YYYY-MM-DD HH:mm"), - endTime: e[1].format("YYYY-MM-DD HH:mm"), - tm:e, - }) + if (!e) { + setParams({...params, tm: "" }) + } else { + setParams({ + ...params, + stm: e[0].format("YYYY-MM-DD HH:mm"), + etm: e[1].format("YYYY-MM-DD HH:mm"), + tm:e, + }) + + } }; const doSearch = () => { getData(params) diff --git a/src/views/Home/MapCtrl/components/Sksjcx/index.js b/src/views/Home/MapCtrl/components/Sksjcx/index.js index 92a7f5dbb..0bcbc61fd 100644 --- a/src/views/Home/MapCtrl/components/Sksjcx/index.js +++ b/src/views/Home/MapCtrl/components/Sksjcx/index.js @@ -23,12 +23,17 @@ function DrpSearch({ record }) { // 设置早上八点的时间 const eightAM = moment().set({hour: 8, minute: 0, second: 0, millisecond: 0}); const searchTm = (e) => { - setParams({ - ...params, - stm: e[0].format("YYYY-MM-DD HH:mm"), - etm: e[1].format("YYYY-MM-DD HH:mm"), - tm:e, - }) + if (!e) { + setParams({...params, tm: "" }) + } else { + setParams({ + ...params, + stm: e[0].format("YYYY-MM-DD HH:mm"), + etm: e[1].format("YYYY-MM-DD HH:mm"), + tm:e, + }) + + } }; const doSearch = () => { getData(params) diff --git a/src/views/Home/MapCtrl/components/Sqjcsj/index.js b/src/views/Home/MapCtrl/components/Sqjcsj/index.js index 4232aace7..8e1752f7c 100644 --- a/src/views/Home/MapCtrl/components/Sqjcsj/index.js +++ b/src/views/Home/MapCtrl/components/Sqjcsj/index.js @@ -28,12 +28,17 @@ function DrpSearch({record}) { // 设置早上八点的时间 const eightAM = moment().set({hour: 8, minute: 0, second: 0, millisecond: 0}); const searchTm = (e) => { - setParams({ - ...params, - stm: e[0].format("YYYY-MM-DD HH:mm"), - etm: e[1].format("YYYY-MM-DD HH:mm"), - tm:e, - }) + if (!e) { + setParams({...params, tm: "" }) + } else { + setParams({ + ...params, + stm: e[0].format("YYYY-MM-DD HH:mm"), + etm: e[1].format("YYYY-MM-DD HH:mm"), + tm:e, + }) + + } }; const doSearch = () => { console.log(params); diff --git a/src/views/gxsl/gsnlfx/KrLine.js b/src/views/gxsl/gsnlfx/KrLine.js index e5406ddf8..64a50a3c1 100644 --- a/src/views/gxsl/gsnlfx/KrLine.js +++ b/src/views/gxsl/gsnlfx/KrLine.js @@ -1,5 +1,5 @@ import React,{useEffect,useMemo,useState} from 'react' -import { Button, DatePicker, Table } from 'antd'; +import { Button, DatePicker, Table,message } from 'antd'; import { createCrudService } from '../../../components/crud/_'; import usePageTable from '../../../components/crud/usePageTable2'; import moment from 'moment'; @@ -32,15 +32,24 @@ export default function KrLine({ record }) { return drpOption({data}); }, [data]) const searchTm = (e) => { + if (!e) { + setParams({...params, tm: "" }) + } else { setParams({ ...params, stm: e[0].format("YYYY-MM-DD HH:mm:ss"), etm: e[1].format("YYYY-MM-DD HH:mm:ss"), tm:e, }) + + } }; - const doSearch = () => { + const doSearch = () => { + if (!params?.tm) { + message.warning('请选择查询时间段') + return; + } const exportParams={ ...params, stm: params.tm[0].format("YYYY-MM-DD HH:mm:ss"), diff --git a/src/views/gxsl/gstjfx/gsOption.js b/src/views/gxsl/gstjfx/gsOption.js index c38a81093..c218ee209 100644 --- a/src/views/gxsl/gstjfx/gsOption.js +++ b/src/views/gxsl/gstjfx/gsOption.js @@ -53,7 +53,6 @@ export default function drpOption (data) { { type: 'category', data: data.map(o => o.tm), - inverse: true, splitLine: { show: false }, diff --git a/src/views/gxsl/gstjfx/index.js b/src/views/gxsl/gstjfx/index.js index 643148aa5..667dfde96 100644 --- a/src/views/gxsl/gstjfx/index.js +++ b/src/views/gxsl/gstjfx/index.js @@ -225,11 +225,13 @@ const Page = () => { const params = { search: { ...searchVal, - searchType:mode + searchType: mode, + isAsc: false, + orderField:"tm" } }; search(params) - getGsChartData(params?.search) + getGsChartData({...params?.search, isAsc: true, }) }, [searchVal, mode]) useEffect(() => { @@ -264,8 +266,8 @@ const Page = () => {
-
生态供水总合计(万m³)：
-
生活供水总合计(万m³)：
+
发电灌溉总合计(万m³)：
+
水厂取水总合计(万m³)：
供水总合计(万m³)：
diff --git a/src/views/gxsl/gstjfx/tjOption.js b/src/views/gxsl/gstjfx/tjOption.js index 867e19933..144a4247e 100644 --- a/src/views/gxsl/gstjfx/tjOption.js +++ b/src/views/gxsl/gstjfx/tjOption.js @@ -3,11 +3,11 @@ let title = "总计"; let color = ["#73a0fa", "#52c1f5"]; let echartData = [ { - name: "生活供水", + name: "发电灌溉", value: parseFloat(obj?.shgs?.toFixed(2)) }, { - name: "生态供水", + name: "水厂取水", value: parseFloat(obj?.stgs?.toFixed(2)), }, ]; diff --git a/src/views/rcgl/aqgl/aqjcgl/toolbar.js b/src/views/rcgl/aqgl/aqjcgl/toolbar.js index 5aa08797b..cdc4de3cb 100644 --- a/src/views/rcgl/aqgl/aqjcgl/toolbar.js +++ b/src/views/rcgl/aqgl/aqjcgl/toolbar.js @@ -13,7 +13,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { if (values.tm) { dateSo = { 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 @@ -23,7 +23,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { useEffect(() => { let dateSo = { start: moment().subtract(1,"years").format('YYYY-MM-DD 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(dateSo.start), moment(dateSo.end)]) setSearchVal({ dateSo }) diff --git a/src/views/rcgl/aqgl/aqsgdj/toolbar.js b/src/views/rcgl/aqgl/aqsgdj/toolbar.js index 010efeb92..25bcd2ab5 100644 --- a/src/views/rcgl/aqgl/aqsgdj/toolbar.js +++ b/src/views/rcgl/aqgl/aqsgdj/toolbar.js @@ -13,7 +13,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { if (values.tm) { dateSo = { 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 @@ -23,7 +23,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData,role }) => { useEffect(() => { let dateSo = { start: moment().subtract(1,"years").format('YYYY-MM-DD 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(dateSo.start), moment(dateSo.end)]) setSearchVal({ dateSo }) diff --git a/src/views/rcgl/aqgl/aqyhpc/toolbar.js b/src/views/rcgl/aqgl/aqyhpc/toolbar.js index afa786fac..b3bee90e3 100644 --- a/src/views/rcgl/aqgl/aqyhpc/toolbar.js +++ b/src/views/rcgl/aqgl/aqyhpc/toolbar.js @@ -13,7 +13,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { if (values.tm) { dateSo = { 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 @@ -23,7 +23,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { useEffect(() => { let dateSo = { start: moment().subtract(1,"years").format('YYYY-MM-DD 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(dateSo.start), moment(dateSo.end)]) setSearchVal({ dateSo }) diff --git a/src/views/rcgl/aqgl/fxgkqd/form.js b/src/views/rcgl/aqgl/fxgkqd/form.js index 83784df46..914a52637 100644 --- a/src/views/rcgl/aqgl/fxgkqd/form.js +++ b/src/views/rcgl/aqgl/fxgkqd/form.js @@ -115,8 +115,9 @@ const getResultList = async() => { const onfinish = (values) => { + debugger let oldFiles = fileList.map(item => ({ fileId: item.response?.data?.fileId })) - const dicId = values.result.map(item=> ({sysDictId:item})) + const dicId = values?.result?.map(item=> ({sysDictId:item})) values.menuId = record.code; values.result = dicId; if (mode === 'edit') { diff --git a/src/views/rcgl/jdkh/khtj/jgOptions.js b/src/views/rcgl/jdkh/khtj/jgOptions.js index da724e820..aca945321 100644 --- a/src/views/rcgl/jdkh/khtj/jgOptions.js +++ b/src/views/rcgl/jdkh/khtj/jgOptions.js @@ -1,6 +1,6 @@ export default function jgOptions(personData) { let personObj = {}; - const Xdata = personData.map(item => item.taskName + '考核') + const Xdata = personData.map(item => item.taskName ) // 查找所有人员并去重 const allPerson= personData.map(item => { return item.assessObjects.map(o => o.objectUserName ) @@ -10,7 +10,7 @@ export default function jgOptions(personData) { // 所有人员数据 const allData = personData.map(item => { return item.assessObjects.map(o => { - return [item.taskName + '考核',o.objectUserName,o.assessScore||0,o.assessLevel] + return [item.taskName ,o.objectUserName,o.assessScore||0,o.assessLevel] }) }).flat() @@ -27,7 +27,7 @@ export default function jgOptions(personData) { xAxis: { type: 'category', axisLabel: { - interval: Xdata.length > 5 ? 0 : 1, // 强制显示所有标签 + interval: Xdata.length > 5 ? 0 : 0, // 强制显示所有标签 rotate: Xdata.length > 5 ? 20 : 0 // 旋转角度 }, data: Xdata diff --git a/src/views/rcgl/xcxj/xjrw/detailForm.js b/src/views/rcgl/xcxj/xjrw/detailForm.js index 7fc38ba2d..b35dddc2e 100644 --- a/src/views/rcgl/xcxj/xjrw/detailForm.js +++ b/src/views/rcgl/xcxj/xjrw/detailForm.js @@ -70,7 +70,7 @@ console.log(record);
}, - { title: '巡查问题描述', key: 'itemProblemDesc', dataIndex: 'itemProblemDesc', width: 300,ellipsis:true }, + { title: '巡查问题描述', key: 'problemDesc', dataIndex: 'problemDesc', width: 300,ellipsis:true }, { title: '巡查图片', key: 'inspectPics', dataIndex: 'inspectPics', width: 100,align: "center", render: (value) =>
{value ? reviewPic(value)}> { value.length} : ''}
@@ -219,8 +219,7 @@ console.log(record); - { - record?.status != 0 ? + - : null - } + ({ value: value ? moment(value) : undefined })} placeholder="" > - + - {record?.status == 2 ? - + - : null - } + diff --git a/src/views/rcgl/xcxj/xjwtcl/form.js b/src/views/rcgl/xcxj/xjwtcl/form.js index 98364a519..62c9cae82 100644 --- a/src/views/rcgl/xcxj/xjwtcl/form.js +++ b/src/views/rcgl/xcxj/xjwtcl/form.js @@ -222,7 +222,7 @@ console.log(record); { - record?.isHandle ? + (record?.isHandle || record?.isHandle == 0) ? { if (values.tm) { dateTimeRangeSo = { 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 @@ -23,7 +23,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => { useEffect(() => { let dateTimeRangeSo = { start: moment().subtract(1,"years").format('YYYY-MM-DD 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(dateTimeRangeSo.start), moment(dateTimeRangeSo.end)]) setSearchVal({ dateTimeRangeSo }) diff --git a/src/views/sz/pxjhgl/form.js b/src/views/sz/pxjhgl/form.js index 5a0093663..fadc880ea 100644 --- a/src/views/sz/pxjhgl/form.js +++ b/src/views/sz/pxjhgl/form.js @@ -317,7 +317,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => { label="填报人" name="applicant" > - + diff --git a/src/views/sz/pxjhgl/toolbar.js b/src/views/sz/pxjhgl/toolbar.js index 21d30a14b..714bdd5f1 100644 --- a/src/views/sz/pxjhgl/toolbar.js +++ b/src/views/sz/pxjhgl/toolbar.js @@ -20,8 +20,8 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role = [],callback,exportFil let dateSo; if (values.tm) { dateSo = { - stm: moment(values.tm[0]).format('YYYY'), - etm: moment(values.tm[1]).format('YYYY') + stm: moment(values.tm[0]).format('YYYY-01-01'), + etm: moment(values.tm[1]).format('YYYY-12-31') } } delete values.tm diff --git a/src/views/sz/pxjlgl/index.js b/src/views/sz/pxjlgl/index.js index 911611718..0e9e7f5ae 100644 --- a/src/views/sz/pxjlgl/index.js +++ b/src/views/sz/pxjlgl/index.js @@ -128,8 +128,8 @@ const Page = () => {
本年培训期数 计划/实际 - { staData?.numberOfPeriods2 ?? 1} 期/ - { staData?.numberOfPeriods1 ?? 1} 期 + { staData?.numberOfPeriods2 ?? "--"} 期/ + { staData?.numberOfPeriods1 ?? "--"} 期
@@ -138,8 +138,8 @@ const Page = () => {
本年培训人次 计划/实际 - { staData?.personNum2 ?? 1} 人次/ - { staData?.personNum1 ?? 1} 人次 + { staData?.personNum2 ?? "--"} 人次/ + { staData?.personNum1 ?? "--"} 人次