src/models/auth/_.ts

@@ -236,7 +236,7 @@ export async function loadMenu(): Promise<MenuItem[]> {
           id: id(), title: '管理体系', redirect: '/mgr/sz/gltx/zzjgck',
           children: [
             {
-              id: id(), title: '组织机构查看', path: '/mgr/sz/gltx/zzjgck',
+              id: id(), title: '管理体系', path: '/mgr/sz/gltx/zzjgck',
             },
             {
               id: id(), title: '责任人管理', path: '/mgr/sz/gltx/zrrgl',

src/views/Home/MapCtrl/Pops/ShenYa/index.js

@@ -8,7 +8,6 @@ import moment from "moment"
 import ToolBar from './toolbar';
 import TableData from './TableData'
 import drpOption from './drpOption';
-import '../TangYanBa.less'
 
 function ShenYa({ id, data, dispatch, onCancel }) {
   console.log('SY',data);

src/views/Home/MapCtrl/Pops/TangYanBa.less

@@ -103,7 +103,6 @@
         flex: 1;
         display: flex;
         flex-direction: row-reverse;
-        // float: right;
       }
     }
   }
@@ -112,13 +111,3 @@
         border-radius: 10px;
     }
   }
-  .homeModal2{
-    display: flex;
-    flex-direction: column;
-    .homeModal2_content{
-      height: 504px;
-      display: flex;
-      padding: 5px 20px 20px 20px;
-    }
-  }
-  

src/views/Home/MapCtrl/Pops/XunJian.js

@@ -54,9 +54,7 @@ function Wxq({ id, data, dispatch }) {
               <Descriptions labelStyle={{padding:"5px 0"}}>
                 <Descriptions.Item label="巡查完成日期" span={3} contentStyle={{ padding: "5px 0" }}>{data?.finishTime || detail?.adnm}</Descriptions.Item>
                 <Descriptions.Item label="检查人" span={3} contentStyle={{padding:"5px 0"}}>{data?.inspectUserName || detail?.ptcount}</Descriptions.Item>
-                <Descriptions.Item label="任务类型" span={3} contentStyle={{padding:"5px 0"}}>
+                <Descriptions.Item label="任务类型" span={3} contentStyle={{padding:"5px 0"}}>{data?.etcount || detail?.etcount}</Descriptions.Item>
-                  {{0: "日常巡查",1: "特别检查",2: "汛前巡检"}?.[data?.taskType]}
-                  </Descriptions.Item>  
                 <Descriptions.Item label="问题数量" span={3} contentStyle={{padding:"5px 0"}}>{data.problemNum  || detail?.htcount}</Descriptions.Item>
                 <Descriptions.Item label="待处理" span={3} contentStyle={{padding:"5px 0"}}>{data.handleNum  || detail?.htcount}</Descriptions.Item>
               </Descriptions>

src/views/Home/MapCtrl/components/Jcsj/index.js

@@ -29,17 +29,12 @@ function DrpSearch({record}) {
   }, [echartData])
 
   const searchTm = (e) => {
-    if (!e) {
-      setParams({...params, tm: "" })
-    } else {
     setParams({
       ...params,
-        stm: e[0].format("YYYY-MM-DD HH:mm"),
+      startTime: e[0].format("YYYY-MM-DD HH:mm"),
-        etm: e[1].format("YYYY-MM-DD HH:mm"),
+      endTime: e[1].format("YYYY-MM-DD HH:mm"),
       tm:e,
     })
-      
-    }
   };
   const doSearch = () => {
     getData(params)

src/views/Home/MapCtrl/components/Sksjcx/index.js

@@ -23,17 +23,12 @@ function DrpSearch({ record }) {
   // 设置早上八点的时间
   const eightAM = moment().set({hour: 8, minute: 0, second: 0, millisecond: 0});
   const searchTm = (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)

src/views/Home/MapCtrl/components/Sqjcsj/index.js

@@ -28,17 +28,12 @@ function DrpSearch({record}) {
   // 设置早上八点的时间
   const eightAM = moment().set({hour: 8, minute: 0, second: 0, millisecond: 0});
   const searchTm = (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);

src/views/Home/homePanelsLayoutPage/item_gongshui.js

@@ -43,7 +43,7 @@ const Page = () => {
                 <div className="home_gongshui_item">
                     <div className="home_gongshui_item_title">
                         <img width={50} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/gongshui2.png`} alt=""/>
-                        灌溉发电
+                        生态供水
                     </div>
                     <div className="home_gongshui_item_text" style={{display:'flex',flexDirection:'column'}}>
                         <div style={{display:'flex'}}>
@@ -67,7 +67,7 @@ const Page = () => {
                 <div className="home_gongshui_item">
                     <div className="home_gongshui_item_title">
                         <img width={50} src={`${process.env.PUBLIC_URL}/assets/xyt/homeImg/gongshui1.png`} alt=""/>
-                        水厂取水
+                        生活供水
                     </div>
                     <div className="home_gongshui_item_text" style={{display:'flex',flexDirection:'column'}}>
                         <div style={{display:'flex'}}>

src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js

@@ -164,15 +164,15 @@ const Page = ({mySetTms}) => {
                     onRow={
                         (data)=>({
                             onClick:()=>{
-                                data.data = {
+                                // data.data = {
-                                    "type":"MultiLineString",
+                                //     "type":"MultiLineString",
-                                    "coordinates":[
+                                //     "coordinates":[
-                                        [
+                                //         [
-                                            [114.746, 31.479],
+                                //             [114.746, 31.479],
-                                            [114.776, 31.509]
+                                //             [114.776, 31.509]
-                                        ]
+                                //         ]
-                                    ]
+                                //     ]
-                                }
+                                // }
                                 if(!data.data){
                                     message.error('无轨迹信息')
                                     return

src/views/gcaqjc/gcaqfx/jrx/index.js

@@ -317,13 +317,13 @@ export default function Xmzlmb() {
               columns={columns1}
               key="inx"
               dataSource={dataSources}
-              pagination={{pageSize:5}}
               scroll={{ x: width, y: 250, scrollToFirstRowOnChange: true }}
               onRow={record => {
                 return {
                   onClick:() => {echartsRef.current.getEchartsInstance().setOption(jrxOption(record,dbType))}
                 }
               }}
+              pagination={false} 
           />
           </div>
       </div>

src/views/gxsl/gsnlfx/KrLine.js

@@ -1,5 +1,5 @@
 import React,{useEffect,useMemo,useState} from 'react'
-import { Button, DatePicker, Table,message } from 'antd';
+import { Button, DatePicker, Table } from 'antd';
 import { createCrudService } from '../../../components/crud/_';
 import usePageTable from '../../../components/crud/usePageTable2';
 import moment from 'moment';
@@ -32,24 +32,15 @@ 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 = () => {
-    if (!params?.tm) {
-        message.warning('请选择查询时间段')
-        return;
-      }
       const exportParams={
         ...params,
         stm: params.tm[0].format("YYYY-MM-DD HH:mm:ss"),

src/views/gxsl/gstjfx/gsOption.js

@@ -53,6 +53,7 @@ export default function drpOption (data) {
       {
         type: 'category',
         data: data.map(o => o.tm),
+        inverse: true,
         splitLine: {
           show: false
         },

src/views/gxsl/gstjfx/index.js

@@ -225,13 +225,11 @@ const Page = () => {
     const params = {
       search: {
         ...searchVal,
-        searchType: mode,
+        searchType:mode
-        isAsc: false,
-        orderField:"tm"
       }
     };
     search(params)
-    getGsChartData({...params?.search, isAsc: true, })
+    getGsChartData(params?.search)
   }, [searchVal, mode])
 
   useEffect(() => {
@@ -266,8 +264,8 @@ const Page = () => {
               <div style={{flex:1}}>
                 <div style={{color:"#ffa87c",display:"flex",columnGap:20}}>
                     <div className='des-title'>
-                    <div>发电灌溉总合计(万m³)：</div>
+                    <div>生态供水总合计(万m³)：</div>
-                    <div style={{margin:"10px 0"}}>水厂取水总合计(万m³)：</div>
+                    <div style={{margin:"10px 0"}}>生活供水总合计(万m³)：</div>
                     <div>供水总合计(万m³)：</div>
                   </div>
                   <div className='des-title'>

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

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 23:59:59')
+        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
       }
     }
     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 23:59:59')
+      end: moment().format('YYYY-MM-DD 00:00:00')
     }
     form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)])
     setSearchVal({ dateSo })

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 23:59:59')
+        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
       }
     }
     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 23:59:59')
+      end: moment().format('YYYY-MM-DD 00:00:00')
     }
     form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)])
     setSearchVal({ dateSo })

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 23:59:59')
+        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
       }
     }
     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 23:59:59')
+      end: moment().format('YYYY-MM-DD 00:00:00')
     }
     form.setFieldValue("tm", [moment(dateSo.start), moment(dateSo.end)])
     setSearchVal({ dateSo })

src/views/rcgl/aqgl/fxgkqd/form.js

@@ -115,9 +115,8 @@ 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') {

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 : 0, // 强制显示所有标签
+              interval: Xdata.length > 5 ? 0 : 1, // 强制显示所有标签
               rotate: Xdata.length > 5 ? 20 : 0 // 旋转角度
           },
             data: Xdata

src/views/rcgl/xcxj/xjrw/detailForm.js

@@ -70,7 +70,7 @@ console.log(record);
             <img style={{width:value ? 20: 17,height:value ? 20: 17}} src={`${process.env.PUBLIC_URL}/assets/xyt/rcgl/${xjStatus[value]}.png`}
           alt='' /></div>
        },  
-      { title: '巡查问题描述', key: 'problemDesc', dataIndex: 'problemDesc', width: 300,ellipsis:true },
+      { title: '巡查问题描述', key: 'itemProblemDesc', dataIndex: 'itemProblemDesc', width: 300,ellipsis:true },
       { title: '巡查图片', key: 'inspectPics', dataIndex: 'inspectPics', width: 100,align: "center",
          render: (value) => <div>{value ? <a onClick={()=>reviewPic(value)}> { value.length} </a>: ''}</div>
         
@@ -219,7 +219,8 @@ console.log(record);
           </Col>
       </Row>
       <Row>
-         
+          {
+            record?.status != 0 ? 
             <Col span={12}>
             <Form.Item
               label="开始日期"
@@ -230,7 +231,8 @@ console.log(record);
             >
               <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
             </Form.Item>
-           </Col>
+           </Col> : null
+          }
           <Col span={12}>
               <Form.Item
                 label="结束日期"
@@ -252,9 +254,10 @@ console.log(record);
                 getValueProps={(value) => ({ value: value ? moment(value) : undefined })}
                 placeholder=""
               >
-                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD HH:mm'} style={{width:'100%'}} allowClear />
+                <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
               </Form.Item>
           </Col>
+          {record?.status == 2 ? 
            <Col span={12}>
            <Form.Item
              label="完成时间"
@@ -264,9 +267,10 @@ console.log(record);
              placeholder=""
 
            >
-             <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD HH:mm'} style={{width:'100%'}} allowClear />
+             <DatePicker disabled={mode==='view'} format={'YYYY-MM-DD'} style={{width:'100%'}} allowClear />
            </Form.Item>
-       </Col> 
+       </Col> : null
+        }
       </Row>   
       <Row>
           <Col span={12}>

src/views/rcgl/xcxj/xjwtcl/form.js

@@ -222,7 +222,7 @@ console.log(record);
               </Form.Item>
           </Col>
          {
-          (record?.isHandle || record?.isHandle == 0) ?  
+          record?.isHandle ?  
           <Col span={12}>
           <Form.Item
             label="处理人"

src/views/rcgl/xcxj/xjwtcl/toolbar.js

@@ -13,7 +13,7 @@ const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
     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 23:59:59')
+        end: moment(values.tm[1]).format('YYYY-MM-DD 00:00:00')
       }
     }
     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 23:59:59')
+      end: moment().format('YYYY-MM-DD 00:00:00')
     }
     form.setFieldValue("tm", [moment(dateTimeRangeSo.start), moment(dateTimeRangeSo.end)])
     setSearchVal({ dateTimeRangeSo })

src/views/sq/qys/kqys/index.js

@@ -66,7 +66,7 @@ const Page = () => {
                 >
             <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', width:'72%',height:'98%',}}>
                
-                    <Image src={url} id="img" style={{margin:'auto',margin:'20px',height:'750px'}}  preview={false} />
+                    <Image src={url} id="img"  preview={false} />
                 
             </div>
             </Rnd>

src/views/sz/flfg/form.js

@@ -232,6 +232,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
                   </p>
                 </Dragger>
               }
+              {JSON.stringify(fileList)}
               <Row gutter={[16]}>
                 {
                   fileList.length > 0 && fileList.map(file => {

src/views/sz/pxjhgl/form.js

@@ -317,7 +317,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
                 label="填报人"
                 name="applicant"
               >
-                <Input disabled={true} style={{width:'100%'}} allowClear />
+                <Input disabled={mode==='view'} style={{width:'100%'}} allowClear />
               </Form.Item>
           </Col>   
         </Row>

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-01-01'),
+        stm: moment(values.tm[0]).format('YYYY'),
-        etm: moment(values.tm[1]).format('YYYY-12-31')
+        etm: moment(values.tm[1]).format('YYYY')
       }
     }
     delete values.tm

src/views/sz/pxjlgl/index.js

@@ -128,8 +128,8 @@ const Page = () => {
                 <div className='children-itm'>
                     <span>本年培训期数</span>
                     <span>计划/实际</span>
-                  <span><span style={{ fontSize: 22, fontWeight: "bold" }}>{ staData?.numberOfPeriods2 ?? "--"}</span>&nbsp;期/
+                  <span><span style={{ fontSize: 22, fontWeight: "bold" }}>{ staData?.numberOfPeriods2 ?? 1}</span>&nbsp;期/
-                    <span style={{fontSize:22,fontWeight:"bold"}}>{ staData?.numberOfPeriods1 ?? "--"}</span>&nbsp;期</span>
+                    <span style={{fontSize:22,fontWeight:"bold"}}>{ staData?.numberOfPeriods1 ?? 1}</span>&nbsp;期</span>
                 </div>
                
                 </div>
@@ -138,8 +138,8 @@ const Page = () => {
                 <div className='children-itm'>
                     <span>本年培训人次</span>
                     <span>计划/实际</span>
-                    <span><span style={{fontSize:22,fontWeight:"bold"}}>{ staData?.personNum2 ?? "--"}</span>&nbsp;人次/
+                    <span><span style={{fontSize:22,fontWeight:"bold"}}>{ staData?.personNum2 ?? 1}</span>&nbsp;人次/
-                    <span style={{fontSize:22,fontWeight:"bold"}}>{ staData?.personNum1 ?? "--"}</span>&nbsp;人次</span>
+                    <span style={{fontSize:22,fontWeight:"bold"}}>{ staData?.personNum1 ?? 1}</span>&nbsp;人次</span>
                 </div>
                 </div>
             </div>

src/views/sz/szzf/ajtj/ldCharts.js

@@ -20,7 +20,7 @@ const Page = ({ title = '标题' }) => {
     const [inspectordata, setInspectorData] = useState([{}])
     const [plandata, setPlanData] = useState([])
     const [problemdata, setProblemData] = useState(Object())
-    const [MaxMin, setMaxMin] = useState({max:0,min:0})
+    const [sumTotal, setSum] = useState(0)
 
     const getPlanOption = useMemo((name, data) => {
         return {
@@ -40,20 +40,20 @@ const Page = ({ title = '标题' }) => {
             },
             radiusAxis: {
                 min: 0,
-                max:MaxMin.max,
+                max: 20,
-                interval: 1,
+                interval: 2,
-                // // 刻度
+                // 刻度
                 axisTick:{
                   show:false
                 },
-                // //刻度数值
+                //刻度数值
                 axisLabel:{
                   show:false
                 },
-                // // 线
+                // 线
-                // axisLine:{
+                axisLine:{
-                //   show:false
+                  show:false
-                // },
+                },
             },
             series: [
                 {
@@ -115,10 +115,10 @@ const Page = ({ title = '标题' }) => {
                 setPlanData([])
             }else{
                 setPlanData(arr)
-                setMaxMin({max:Math.max.apply(Math,res.data.map(item => { return item.count })),min:Math.min.apply(Math,res.data.map(item => { return item.count }))})  
-                console.log({max:Math.max.apply(Math,res.data.map(item => { return item.count })),min:Math.min.apply(Math,res.data.map(item => { return item.count }))});
-                              
             }
+            
+            setSum(sum)
+
         })
     }
     useEffect(() => {

src/views/szydd/ddjl/form.js

@@ -76,7 +76,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
     if (mode === 'edit') {
       values.files = oldFiles;
       values.id = record.id;
-      values.createTime = record.createTime;
+      // values.opUserId = record.opUserId;
       onEdit(apiurl.ddjl.edit,values)
     }
     if (mode === 'save') {