From 9137e55cb60a429d7b7b7de5ab7b5bf846a1abb0 Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 13:53:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=AF=E6=94=BF=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sections/fillion/containers/luzheng.js    | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/web/client/src/sections/fillion/containers/luzheng.js b/web/client/src/sections/fillion/containers/luzheng.js
index 8f56c7dc..918da324 100644
--- a/web/client/src/sections/fillion/containers/luzheng.js
+++ b/web/client/src/sections/fillion/containers/luzheng.js
@@ -1,9 +1,9 @@
 import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { getAssess, delAssess, editAssess } from '../actions/assess';
-import {getRoadadministration} from '../actions/luzheng'
+import { getRoadadministration,addRoadadministration,delRoadadministration,modifyRoadadministration } from '../actions/luzheng';
 import ProTable from '@ant-design/pro-table';
-import AssessModal from '../components/assessModal';
+import AssessModal from '../components/luzhengmodel';
 import { Form, Space, DatePicker, Button, Select, Popconfirm } from 'antd'
 import moment from 'moment';
 
@@ -46,7 +46,7 @@ function Assess(props) {
 
     const getData = () => {
         setLoading(true)
-        dispatch(getAssess(query)).then(res => {
+        dispatch(getRoadadministration(query)).then(res => {
             setLoading(false)
         })
     }
@@ -83,22 +83,24 @@ function Assess(props) {
             </div>
             <ProTable
                 columns={[{
-                    title: '责任单位',
-                    dataIndex: 'unit',
-                    key: 'unit',
+                    title: '执法日期',
+                    dataIndex: 'enforcementdate',
+                    key: 'enforcementdate',
                 },
                 {
-                    title: '考核月份',
-                    dataIndex: 'month',
-                    key: 'month',
-                    render: (text, record) => (
-                        text ? moment(record.month).format('YYYY-MM') : ''
-                    )
+                    title: '执法道路',
+                    dataIndex: 'roadname',
+                    key: 'roadname'
+                },
+                {
+                    title: '执法成果',
+                    dataIndex: 'enforcementreslt',
+                    key: 'enforcementreslt',
                 },
                 {
-                    title: '考核得分',
-                    dataIndex: 'totalPoints',
-                    key: 'totalPoints',
+                    title: '执法图片',
+                    dataIndex: 'picfile',
+                    key: 'picfile',
                 },
                 {
                     title: '操作',