Merge branch 'dev' of https://gitea.anxinyun.cn/free-sun/Highways4Good into dev

api/app/lib/controllers/luzheng/index.js

@@ -1,5 +1,6 @@
 'use strict'
 //查询路政
+const moment = require('moment');
 async function getRoadadministration(ctx, next) {
     try {
         
@@ -10,7 +11,7 @@ async function getRoadadministration(ctx, next) {
       
         if(startTime && endTime){
            where.enforcementdate = {
-            where: { enforcementdate: { $between: [moment(startTime).format('YYYY-MM-DD'), moment(endTime).format('YYYY-MM-DD')] } },
+             $between: [moment(startTime).format('YYYY-MM-DD'), moment(endTime).format('YYYY-MM-DD')] 
             }
            
         }

web/client/src/sections/fillion/components/luzhengmodel.js

@@ -6,9 +6,11 @@ import { getAssess, delAssess, editAssess } from '../actions/assess';
 import moment from 'moment';
 import { getRoadadministration,addRoadadministration,delRoadadministration,modifyRoadadministration } from '../actions/luzheng';
 // import Uploads from "../../../../components/Upload/index"
+import Uploads from '../../../components/Upload/index'
+
 const { Option } = Select;
 
-const AssessModal = ({ editData, check, visible, onCancel, dispatch }) => {
+const LuzhengModel = ({ editData, check, visible, onCancel, dispatch }) => {
     const [form] = Form.useForm();
 
     return (
@@ -24,15 +26,24 @@ const AssessModal = ({ editData, check, visible, onCancel, dispatch }) => {
                     return onCancel()
                 }
                 form.validateFields().then(values => {
-                    dispatch(editAssess({
+                    if(editData){
+                        dispatch(modifyRoadadministration(editData?.id,{
+                            ...values
+                        })).then(res => {
+                            if (res.success) {
+                                onCancel()
+                            }
+                        })
+                    }else{
+                        dispatch(addRoadadministration({
                             ...values,
-                        month: moment(values.month).format('YYYY-MM-DD'),
-                        assessId: editData ? editData.id : undefined
                         })).then(res => {
                             if (res.success) {
                                 onCancel()
                             }
                         }) 
+                    }
+                  
                 })
             }}
             onCancel={() => {
@@ -43,7 +54,7 @@ const AssessModal = ({ editData, check, visible, onCancel, dispatch }) => {
                 form={form}
                 initialValues={editData ? {
                     ...editData,
-                    month: moment(editData.month),
+                    enforcementdate: moment(editData.enforcementdate)
                 } : {}}
                 disabled={check}
                 labelCol={{
@@ -73,11 +84,11 @@ const AssessModal = ({ editData, check, visible, onCancel, dispatch }) => {
                 </Form.Item>
 
                 <Form.Item name="picfile" label="执法图片">
-                {/* <Uploads
+                <Uploads
                            maxFilesNum={1}
-                           fileTypes={['mp4']}
+                           fileTypes={['png','jpg','jpeg']}
                            maxFileSize={200}
-                        /> */}
+                        />
                 </Form.Item>
             </Form>
         </Modal>
@@ -91,4 +102,4 @@ function mapStateToProps (state) {
         assess: assess.data || []
     }
 }
-export default connect(mapStateToProps)(AssessModal);
+export default connect(mapStateToProps)(LuzhengModel);

web/client/src/sections/fillion/containers/luzheng.js

@@ -4,8 +4,9 @@ import { getAssess, delAssess, editAssess } from '../actions/assess';
 import { getRoadadministration,addRoadadministration,delRoadadministration,modifyRoadadministration } from '../actions/luzheng';
 import ProTable from '@ant-design/pro-table';
 import AssessModal from '../components/luzhengmodel';
-import { Form, Space, DatePicker, Button, Select, Popconfirm } from 'antd'
+import { Form, Space, DatePicker, Button, Select, Popconfirm ,Image} from 'antd'
 import moment from 'moment';
+import { values } from 'lodash';
 
 export const unitList = [
     '县道',
@@ -34,9 +35,12 @@ function Assess(props) {
     const [query, setQuery] = useState({ page: 1, pageSize: 10 })
     const [loading, setLoading] = useState(false);
     const [isCheck, setIsCheck] = useState(false)
+    const [datasource,setdatasource] = useState([])
+    const [dateRange, setDateRange] = useState(['1970-1-1', '2099-12-31']);
+    const { RangePicker } = DatePicker
     const [editAble, setEditAble] = useState(user?.username !== 'SuperAdmin' && user?.userResources?.find(i => i.resourceId === 'ASSESSMANAGE')?.isshow === "true" ? true : '')
     useEffect(() => {
-        dispatch(getRoadadministration()).then(res=>{console.log(res,'res')})
+        
         return () => { };
     }, []);
 
@@ -47,7 +51,10 @@ function Assess(props) {
     const getData = () => {
         setLoading(true)
         dispatch(getRoadadministration(query)).then(res => {
+            if(res?.success){
+                setdatasource(res?.payload?.data?.rows)
                 setLoading(false)
+            }
         })
     }
 
@@ -55,20 +62,14 @@ function Assess(props) {
         <div>
             <div style={{ marginBottom: '20px', display: 'flex', justifyContent: 'space-between' }}>
                 <Form layout="inline" onFinish={(v) => {
-                    setQuery({ ...query, unit: v.unit, month: v.month ? moment(v.month).format() : undefined })
+                   
+                    setQuery({ ...query, unit: v.unit,startTime : moment(v?.time[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+                    endTime :moment(v?.time[1]).add(1, 'days').endOf('day').format('YYYY-MM-DD HH:mm:ss') })
                 }}>
-                    <Form.Item name="unit" label="责任单位" >
-                        <Select style={{ width: 200 }} placeholder="全部" allowClear>
-                            {
-                                unitList.map(item => (
-                                    <Option value={item} key={item} />
-                                ))
-                            }
-                        </Select>
-                    </Form.Item>
                    
-                    <Form.Item name="month" label="考核月份">
+
-                        <DatePicker picker="month" style={{ width: 200 }} />
+                    <Form.Item name="time" label="执行日期">
+                    <RangePicker onChange={(date, dateString) => { setDateRange(dateString) }} style={{ marginRight: '50px' }} />
                     </Form.Item>
 
                     <Form.Item>
@@ -86,6 +87,9 @@ function Assess(props) {
                     title: '执法日期',
                     dataIndex: 'enforcementdate',
                     key: 'enforcementdate',
+                    render:(t,r)=>{
+                        return r?.enforcementdate?moment(r?.enforcementdate).format('YYYY-MM-DD'):'--'
+                    }
                 },
                 {
                     title: '执法道路',
@@ -101,6 +105,15 @@ function Assess(props) {
                     title: '执法图片',
                     dataIndex: 'picfile',
                     key: 'picfile',
+                    render:(t,r)=>{
+                       return r?.picfile?.map(i=>{
+                            return  <Image
+                            width={200}
+                            src={i?.storageUrl}
+                          />
+                        })
+                       
+                    }
                 },
                 {
                     title: '操作',
@@ -121,7 +134,7 @@ function Assess(props) {
                                 title="确定删除此条数据吗?"
                                 onConfirm={() => {
                                     setLoading(true)
-                                    dispatch(delAssess({ id: record.id })).then(res => {
+                                    dispatch(delRoadadministration(record.id)).then(res => {
                                         setLoading(false)
                                         if (res.success) {
                                             getData()
@@ -134,7 +147,7 @@ function Assess(props) {
                         </span>
                     ),
                 },]}
-                dataSource={assess.rows || []}
+                dataSource={datasource || []}
                 loading={loading}
                 pagination={{
                     total: assess?.count || 0,