From 6329bdc20dae22398bd29bf7873d29156835e4e0 Mon Sep 17 00:00:00 2001
From: ww664853070 <wei.wei@free-sun.com.cn>
Date: Fri, 4 Aug 2023 14:11:29 +0800
Subject: [PATCH 01/21] =?UTF-8?q?(*)=E7=9F=AD=E4=BF=A1=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/anspectionNotificationPhone.js            |  2 +-
 .../src/sections/fillion/components/patrolTable.js | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/api/app/lib/controllers/data/anspectionNotificationPhone.js b/api/app/lib/controllers/data/anspectionNotificationPhone.js
index 2b965152..079f37bc 100644
--- a/api/app/lib/controllers/data/anspectionNotificationPhone.js
+++ b/api/app/lib/controllers/data/anspectionNotificationPhone.js
@@ -36,7 +36,7 @@ async function addAnspectionNotificationPhone(ctx) {
             })
         })
         await models.AnspectionNotificationPhone.bulkCreate(dataList);
-        await transaction.commit();
+        // await transaction.commit();
         ctx.status = 204
     } catch (error) {
         ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js
index 69cd3670..be4f401b 100644
--- a/web/client/src/sections/fillion/components/patrolTable.js
+++ b/web/client/src/sections/fillion/components/patrolTable.js
@@ -713,6 +713,7 @@ const PatrolTable = (props) => {
     const isPatrol = !isRoad && !isAnomaly
     const reportType = isRoad ? 'road' : isAnomaly ? 'anomaly' : 'patrol';
     const [isModalOpen, setIsModalOpen] = useState(false);
+    const [phoneList, setPhoneList] = useState([]);
     const [form] = Form.useForm();
     useEffect(() => {
         queryData();
@@ -823,6 +824,7 @@ const PatrolTable = (props) => {
             })
         }
         console.log(phoneList, '789789789789');
+        setPhoneList(phoneList)
 
     }, [anspectionNotificationPhoneList])
     const showModal = () => {
@@ -924,17 +926,9 @@ const PatrolTable = (props) => {
             </Card>
             <Modal title="短信提醒" maskClosable={false} destroyOnClose={true} visible={isModalOpen} onOk={handleOk} onCancel={handleCancel}>
                 <Form form={form} name="dynamic_form_item" {...formItemLayoutWithOutLabel} >
-                    <Form.List
+                    <Form.List 
                         name="phone"
-                    // rules={[
-                    //     {
-                    //         validator: async (_, names) => {
-                    //             if (!names || names.length < 1) {
-                    //                 return Promise.reject(new Error('At least 2 passengers'));
-                    //             }
-                    //         },
-                    //     },
-                    // ]}
+                        initialValue={phoneList}
                     >
                         {(fields, { add, remove }, { errors }) => (
                             <>

From ff5f45b3d70c52a4d80d5497556194d70613d965 Mon Sep 17 00:00:00 2001
From: ww664853070 <wei.wei@free-sun.com.cn>
Date: Fri, 4 Aug 2023 14:17:59 +0800
Subject: [PATCH 02/21] ignore

---
 .gitignore | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index d1ff1eb2..2cff9c17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -139,8 +139,8 @@ dist
 *package-lock.json
 *log/
 *downloadFiles/
-web/client/assets/color.less
-package-lock.json
-development.text
-web/package-lock.json
-web/log/development.txt
+web/client/assets/color.less*
+package-lock.json*
+development.text*
+web/package-lock.json*
+web/log/development.txt*

From f21e3f4dede68679fd54098d21c49bc40e31f2ba Mon Sep 17 00:00:00 2001
From: ww664853070 <wei.wei@free-sun.com.cn>
Date: Fri, 4 Aug 2023 14:27:13 +0800
Subject: [PATCH 03/21] =?UTF-8?q?=EF=BC=88+=EF=BC=89=E7=9F=AD=E4=BF=A1?=
 =?UTF-8?q?=E6=8F=90=E9=86=92=E9=85=8D=E7=BD=AE=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../1.3.1/schema/1create_table_telephone.sql  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 scripts/1.3.1/schema/1create_table_telephone.sql

diff --git a/scripts/1.3.1/schema/1create_table_telephone.sql b/scripts/1.3.1/schema/1create_table_telephone.sql
new file mode 100644
index 00000000..f0f79700
--- /dev/null
+++ b/scripts/1.3.1/schema/1create_table_telephone.sql
@@ -0,0 +1,19 @@
+CREATE SEQUENCE "public"."inspection_notification_phone_seq" 
+INCREMENT 1
+MINVALUE  1
+MAXVALUE 9223372036854775807
+START 1
+CACHE 1;
+
+
+
+CREATE TABLE "public"."inspection_notification_phone" (
+  "id" int4 NOT NULL DEFAULT nextval('inspection_notification_phone_seq'::regclass),
+  "phone" varchar(255) COLLATE "pg_catalog"."default",
+  PRIMARY KEY ("id")
+)
+;
+
+
+COMMENT ON COLUMN "public"."inspection_notification_phone"."phone" IS '电话号码';
+

From 4d93d90500295a34217ae731b5d95a7a24d6078d Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 14:29:48 +0800
Subject: [PATCH 04/21] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E6=8C=AA=E4=BD=8D?=
 =?UTF-8?q?=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schema/2.roadadministration.sql}                              | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename scripts/{1.3.0/schema/6.roadadministration.sql => 1.3.1/schema/2.roadadministration.sql} (100%)

diff --git a/scripts/1.3.0/schema/6.roadadministration.sql b/scripts/1.3.1/schema/2.roadadministration.sql
similarity index 100%
rename from scripts/1.3.0/schema/6.roadadministration.sql
rename to scripts/1.3.1/schema/2.roadadministration.sql

From 2b3c6215ada94fa6f4107792b6f8a8104373849a Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 15:52:41 +0800
Subject: [PATCH 05/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=AF=E6=94=BF?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/luzheng/index.js      |  3 +-
 .../fillion/components/luzhengmodel.js        | 41 ++++++++++------
 .../sections/fillion/containers/luzheng.js    | 47 ++++++++++++-------
 3 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/api/app/lib/controllers/luzheng/index.js b/api/app/lib/controllers/luzheng/index.js
index 6299fffe..3d2e6090 100644
--- a/api/app/lib/controllers/luzheng/index.js
+++ b/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')] 
             }
            
         }
diff --git a/web/client/src/sections/fillion/components/luzhengmodel.js b/web/client/src/sections/fillion/components/luzhengmodel.js
index 991c3d6c..57d96842 100644
--- a/web/client/src/sections/fillion/components/luzhengmodel.js
+++ b/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({
-                        ...values,
-                        month: moment(values.month).format('YYYY-MM-DD'),
-                        assessId: editData ? editData.id : undefined
-                    })).then(res => {
-                        if (res.success) {
-                            onCancel()
-                        }
-                    })
+                    if(editData){
+                        dispatch(modifyRoadadministration(editData?.id,{
+                            ...values
+                        })).then(res => {
+                            if (res.success) {
+                                onCancel()
+                            }
+                        })
+                    }else{
+                        dispatch(addRoadadministration({
+                            ...values,
+                        })).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);
diff --git a/web/client/src/sections/fillion/containers/luzheng.js b/web/client/src/sections/fillion/containers/luzheng.js
index 918da324..584d558a 100644
--- a/web/client/src/sections/fillion/containers/luzheng.js
+++ b/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 => {
-            setLoading(false)
+            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,

From 5919ea8b77e03dbcb9c9c7b1e0f151a341fc6be3 Mon Sep 17 00:00:00 2001
From: ww664853070 <wei.wei@free-sun.com.cn>
Date: Fri, 4 Aug 2023 15:54:37 +0800
Subject: [PATCH 06/21] =?UTF-8?q?(*)=E7=9F=AD=E4=BF=A1=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E5=8F=AA=E5=9C=A8=E5=BC=82=E5=B8=B8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sections/fillion/components/patrolTable.js    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js
index be4f401b..36449bd5 100644
--- a/web/client/src/sections/fillion/components/patrolTable.js
+++ b/web/client/src/sections/fillion/components/patrolTable.js
@@ -95,7 +95,6 @@ const DetailForm = (props) => {
     ];
 
     const changeBoolean = (bool) => {
-        //console.log('bool', bool)
         return bool ? '无异常' : '有异常'
     }
     const renderContent = (data) => {
@@ -616,7 +615,6 @@ const PatrolNameList = (props) => {
             }
 
         }
-        //  console.log('selectedKeys', selectedKeys, selected, selectedNodes, node)
 
     };
 
@@ -816,14 +814,12 @@ const PatrolTable = (props) => {
         }
     }
     useEffect(() => {
-        console.log(anspectionNotificationPhoneList, '数据');
         let phoneList = []
         if (anspectionNotificationPhoneList && anspectionNotificationPhoneList.length) {
             phoneList = anspectionNotificationPhoneList.map(e => {
                 return e.phone
             })
         }
-        console.log(phoneList, '789789789789');
         setPhoneList(phoneList)
 
     }, [anspectionNotificationPhoneList])
@@ -834,7 +830,6 @@ const PatrolTable = (props) => {
     const handleOk = () => {
         // setIsModalOpen(false);
         form.validateFields().then(values => {
-            console.log(values, '----------');
             dispatch(addAnspectionNotificationPhone(values)).then(res => {
                 if (res.success) {
                     setIsModalOpen(false);
@@ -864,7 +859,10 @@ const PatrolTable = (props) => {
             sm: { span: 20, offset: 4 },
         },
     };
+    let routerUrl = window.location.href
+    routerUrl = routerUrl.substring(routerUrl.length - 14)
 
+    console.log(routerUrl, '=========');
     return (
         <div className='card-protable'>
             <Card >
@@ -910,7 +908,10 @@ const PatrolTable = (props) => {
                                     : ''
                             }
                             <Button style={{ marginLeft: 20 }}>查询</Button>
-                            <Button onClick={() => { showModal() }} style={{ float: 'right', marginRight: 30 }}> 短信提醒</Button>
+                            {
+                                routerUrl == 'patrol_anomaly' ? <Button onClick={() => { showModal() }} style={{ float: 'right', marginRight: 30 }}> 短信提醒</Button> : ''
+                            }
+
 
                             {/* <Button style={{ marginLeft: 20 }} onClick={handleExport} >导出</Button> */}
                         </div> : ''
@@ -926,7 +927,7 @@ const PatrolTable = (props) => {
             </Card>
             <Modal title="短信提醒" maskClosable={false} destroyOnClose={true} visible={isModalOpen} onOk={handleOk} onCancel={handleCancel}>
                 <Form form={form} name="dynamic_form_item" {...formItemLayoutWithOutLabel} >
-                    <Form.List 
+                    <Form.List
                         name="phone"
                         initialValue={phoneList}
                     >

From 25cacae4d9ec2a39e78a400a4388deb40ad49cb1 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 16:22:16 +0800
Subject: [PATCH 07/21] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E7=9A=84=E8=BD=A6=E7=9A=84=E7=82=B9=E4=BD=8D=E7=9A=84=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E4=BF=A1=E6=81=AF=20=E5=A2=9E=E5=8A=A0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/sections/fillion/actions/infor.js     |   2 +-
 .../containers/footer/build/Rightcenter.js    |   2 -
 .../quanju/containers/footer/build/index.js   | 123 ++++++----
 .../quanju/containers/footer/build/style.less |   8 +
 .../containers/footer/operation/right.js      | 214 ++++++++++++------
 .../quanju/containers/public/olMap.js         |  28 +--
 6 files changed, 243 insertions(+), 134 deletions(-)

diff --git a/web/client/src/sections/fillion/actions/infor.js b/web/client/src/sections/fillion/actions/infor.js
index 06afa907..f35bd2a5 100644
--- a/web/client/src/sections/fillion/actions/infor.js
+++ b/web/client/src/sections/fillion/actions/infor.js
@@ -142,7 +142,7 @@ export function getProject(query) {
       actionType: 'GET_PROJECT',
       url: ApiTable.getProject,
       msg: { error: '获取工程信息失败' },
-
+    reducer: { name: 'projectList' }
    });
 }
 export function putProject(query) {
diff --git a/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js b/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js
index 8c62e979..7cc464d5 100644
--- a/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js
+++ b/web/client/src/sections/quanju/containers/footer/build/Rightcenter.js
@@ -27,7 +27,6 @@ const THIRD = "linear-gradient(360deg, rgba(148, 148, 255, 0.1) 0%, rgba(148, 14
 const OTHER = "linear-gradient(360deg, rgba(28, 96, 253, 0) 0%, rgba(28, 96, 253, 0.2) 100%)"
 let TOTALS = data?.map(({ name, total }, index) => {
   let max = Math.max(...data.map(item=>item.total))
-  // console.log(data.map(item=>item.total),'好朋友吗')
   return {
     name,
     value: total,
@@ -38,7 +37,6 @@ let new_TOTALS = TOTALS && TOTALS.length > 10 ? TOTALS.slice(0, 10) : TOTALS
 function Cell(props) {
   const { name, rank, value, percent, style = {},cebg } = props
   let bg = RNAKS[rank] || OTHER
-  // console.log(percent,'百分比')
   return <div style={{
     width: "100%", height: 34, display: "flex", justifyContent: 'center',
     alignItems: "center", marginTop: 7, marginBottom: 7,
diff --git a/web/client/src/sections/quanju/containers/footer/build/index.js b/web/client/src/sections/quanju/containers/footer/build/index.js
index 557d6184..54a0ef62 100644
--- a/web/client/src/sections/quanju/containers/footer/build/index.js
+++ b/web/client/src/sections/quanju/containers/footer/build/index.js
@@ -13,9 +13,11 @@ import AutoRollComponent from './AutoRollComponent'
 import './style.less'
 import { getdaolutongji, getxuanchuan } from '../../../actions/example'
 import { Carousel } from 'antd';
+import { getProject } from '../../../../fillion/actions/infor'
+
 // import { number } from 'echarts';
 const Build = (props) => {
-    const { dispatch } = props
+    const { dispatch, projectList } = props
     let data1 = [
         { name: "县", value: 207 },
         { name: "乡", value: 729 },
@@ -26,8 +28,6 @@ const Build = (props) => {
     //   {name: '二级公路', value: 17},
     //   {name: '三级公路', value: 17},
     //   {name: '四级公路', value: 30},
-
-
     //   ]
     const [buildingnumber, setbuildingnumber] = useState(0)
     const [data, setdata] = useState([])
@@ -43,22 +43,17 @@ const Build = (props) => {
     const requestbuildingnumber = async () => {
         const res = await dispatch(getdaolutongji());
         let alltype = Object.keys(res.payload.data?.roadType || {}).map((item) => ({ name: item, value: Number(keepThreeNum(res.payload.data.roadType[item])) }))
-        // console.log(alltype,'打他啊')
         setdata(alltype.filter(item => item.name === '县' || item.name === "乡" || item.name === '村'))
         setbuildingnumber(res.payload.data)
-        console.log(res.payload.data, '哈哈哈')
-
     }
 
     //获取宣传栏数据
     const requestxuanchuanlan = async () => {
         const res = await dispatch(getxuanchuan());
-
         // setdata(alltype.filter(item=>item.name!=='null'))
         setxuandata(res.payload.data || [])
-        console.log(res.payload.data, '宣传栏数据')
-
     }
+
     let t1 = Object.values(buildingnumber?.townRoad || {})
 
     let totalgongli = t1.length !== 0 ? t1.reduce((x, y) => x + y.mileage, 0) : 0      //乡镇道路占比总公里数
@@ -86,7 +81,6 @@ const Build = (props) => {
         return b.number - a.number
     })
     list = list.filter(item => item.name !== "其他")
-    //   console.log(list,'红红火')
 
     //道路等级数据
     let alldengji = Object.keys(buildingnumber?.roadLevel || {}).map((item) => ({ name: item, value: Number(keepThreeNum(buildingnumber.roadLevel[item])) }))
@@ -95,10 +89,8 @@ const Build = (props) => {
     onlineproject = onlineproject.sort((a, b) => {
         return b.total - a.total
     })
-    //console.log('onlineproject', onlineproject)
     let sunonlineproject = onlineproject?.reduce((x, y) => x + y.total, 0)
     let buildingCount = buildingnumber?.buildingCount
-    //console.log('projectAll', projectAll)
     //let projectAll=
     let safetyData = alldengji?.filter(item => item.name === '一级公路' || item.name === '二级公路' || item.name === '三级公路' || item.name === '四级公路' || item.name === '等外公路')
     let sundata = data?.reduce((x, y) => x + y.value, 0)
@@ -107,10 +99,13 @@ const Build = (props) => {
     useEffect(() => {
         requestbuildingnumber();
         requestxuanchuanlan()
+        dispatch(getProject())
     }, [])
+
     useEffect(() => {
         lunbo.current.goTo(lunboindex)
     }, [lunboindex])
+
     const rendercontent = () => {
         return (<div className='build-left-center-content'>
             {list.map(({ name, number, gongli }, index) => <div className='build-left-center-item' key={index}>
@@ -128,8 +123,6 @@ const Build = (props) => {
     //         "enable": true
     //     }
     // ]
-    // console.log(localStorage.getItem("qndmn"), '七牛')
-    // console.log(xuandata, "宣传")
 
     let videos = []
     if (xuandata && xuandata.length) {
@@ -143,7 +136,7 @@ const Build = (props) => {
             }
         }
     }
-    console.log(lunboindex)
+
     return (
         <>
             <div className='bgbuild-left'>
@@ -174,35 +167,75 @@ const Build = (props) => {
                         </div> : <NoData />}
                     </div>
                 </Module>
-                <Module title={"各乡镇现有道路统计"} style={{
+                {/* <Module title={"各乡镇现有道路统计"} style={{
                     width: "100%",
                     height: " 33%", marginTop: '3%'
                 }} customize={true}>
-                    {totalcount && totalcount !== 0 ? <div className='build-left-center'>
-                        <div className='build-left-center-top'>
-                            <div>
-                                <img src='/assets/images/quanju/gonglugongli.png'></img>
-                                <div>
-                                    <span>公路公里数/公里</span>
-                                    <span>{keepThreeNum(totalgongli)}</span>
+                    {
+                        totalcount && totalcount !== 0 ?
+                            <div className='build-left-center'>
+                                <div className='build-left-center-top'>
+                                    <div>
+                                        <img src='/assets/images/quanju/gonglugongli.png'></img>
+                                        <div>
+                                            <span>公路公里数/公里</span>
+                                            <span>{keepThreeNum(totalgongli)}</span>
+                                        </div>
+                                    </div>
+                                    <div>
+                                        <img src='/assets/images/quanju/gongluzong.png'></img>
+                                        <div>
+                                            <span>公路总数/条</span>
+                                            <span>{totalcount || 0}</span>
+                                        </div>
+                                    </div>
                                 </div>
+                                <div className='build-left-center-titile'>
+                                    <span>乡镇名称</span>
+                                    <span>公路数量/条</span>
+                                    <span>公里</span>
+                                </div>
+                                <AutoRollComponent content={rendercontent()} containerStyle={{ position: "relative", height: "50%", }}
+                                    divHeight={"100%"} divId={"chart"} />
                             </div>
-                            <div>
-                                <img src='/assets/images/quanju/gongluzong.png'></img>
-                                <div>
-                                    <span>公路总数/条</span>
-                                    <span>{totalcount || 0}</span>
+                            : <NoData />
+                    }
+                </Module> */}
+                <Module title={"在建项目列表"} style={{
+                    width: "100%",
+                    height: " 33%", marginTop: '3%'
+                }} customize={true}>
+                    {
+                        totalcount && totalcount !== 0 ?
+                            <div className='build-left-center' style={{ padding: 12 }}>
+                                <div className='build-left-center'>
+                                    <div className='build-left-center-titile'>
+                                        <span>项目名称</span>
+                                        <span>项目规模(公里)</span>
+                                        <span>项目投资(万元)</span>
+                                    </div>
+                                    <AutoRollComponent content={
+                                        <div className='build-left-center-content'>
+                                            {
+                                                projectList.map((p, index) => {
+                                                    return (
+                                                        <div className='build-left-center-item' key={index}>
+                                                            <span className='ellipsis' title={p.entryName}>{p.entryName}</span>
+                                                            <span>{p.projectMileage}</span>
+                                                            <span>{p.investment}</span>
+                                                        </div>
+                                                    )
+                                                })
+                                            }
+                                        </div>
+                                    }
+                                        containerStyle={{ position: "relative", height: "85%", }}
+                                        divHeight={"100%"} divId={"chart"}
+                                    />
                                 </div>
                             </div>
-                        </div>
-                        <div className='build-left-center-titile'>
-                            <span>乡镇名称</span>
-                            <span>公路数量/条</span>
-                            <span>公里</span>
-                        </div>
-                        <AutoRollComponent content={rendercontent()} containerStyle={{ position: "relative", height: "50%", }}
-                            divHeight={"100%"} divId={"chart"} />
-                    </div> : <NoData />}
+                            : <NoData />
+                    }
                 </Module>
                 <Module title={"道路统计"} style={{
                     width: "100%",
@@ -231,17 +264,13 @@ const Build = (props) => {
                         <Carousel dots={false} ref={lunbo} key={lunboindex}>
                             {/* {
                                 videos.map((v, i) => {
-                                    console.log('first')
                                     return i == lunboMsg.current.index ?
                                         <video src={`${localStorage.getItem("qndmn")}/${v}`} key={Math.random()} autoPlay={i == lunboMsg.current.index} onEnded={() => {
-                                            console.log('end', i + 1, videos.length)
-
                                             if (i == videos.length - 1) {
                                                 setlunboindex(0)
                                                 lunboMsg.current.index = 0
                                                 lunbo.current.goTo(1)
                                             } else {
-                                                console.log('first222', i + 1)
                                                 setlunboindex(i + 1)
                                                 lunboMsg.current.index = i + 1
                                                 lunbo.current.next()
@@ -256,23 +285,16 @@ const Build = (props) => {
 
                                     if (item.video && item.video !== null && item.video.length !== 0) {
                                         return item.video.map((i, index) => {
-                                            // console.log(i,'视频')
-                                            console.log(index1, 'index1')
                                             if (index1 === lunboindex) {
-                                                // lunbo.current.goTo(lunboindex)
-                                                console.log("自动播放", index1)
                                                 return <video src={`${localStorage.getItem("qndmn")}/${i}`} autoPlay={true} ref={lunbovideo} onEnded={() => {
                                                     if (index1 < xuandata.filter(i => i.enable).length - 1) {
-                                                        // console.log(index1,xuandata,'触发了')
                                                         setlunboindex(lunboindex + 1)
                                                     } else {
-                                                        // console.log(index1,xuandata,'触发了')
                                                         setlunboindex(0)
                                                     }
 
                                                 }}></video>
                                             } else {
-                                                // console.log("不自动播放",index1)
                                                 return <video src={`${localStorage.getItem("qndmn")}/${i}`} autoPlay={false} ></video>
                                             }
                                         })
@@ -307,8 +329,8 @@ const Build = (props) => {
         </>
     )
 }
-function mapStateToProps(state) {
-    const { auth, depMessage } = state;
+function mapStateToProps (state) {
+    const { auth, depMessage, projectList } = state;
     const pakData = (dep) => {
         return dep.map((d) => {
             return {
@@ -325,6 +347,7 @@ function mapStateToProps(state) {
         depMessage: depMessage.data || [],
         depLoading: depMessage.isRequesting,
         depData,
+        projectList: projectList.data || []
     };
 }
 export default connect(mapStateToProps)(Build);
diff --git a/web/client/src/sections/quanju/containers/footer/build/style.less b/web/client/src/sections/quanju/containers/footer/build/style.less
index 8bc78504..23ff48fe 100644
--- a/web/client/src/sections/quanju/containers/footer/build/style.less
+++ b/web/client/src/sections/quanju/containers/footer/build/style.less
@@ -158,6 +158,14 @@
                 height: 28px;
                 align-items: center;
 
+                .ellipsis {
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    width: 144px;
+                    display: inline-block;
+                }
+
                 &:hover {
                     background: linear-gradient(270deg, rgba(0, 124, 230, 0) 0%, rgba(0, 70, 200, 0.8700) 100%);
                 }
diff --git a/web/client/src/sections/quanju/containers/footer/operation/right.js b/web/client/src/sections/quanju/containers/footer/operation/right.js
index e5cc28db..81d3924c 100644
--- a/web/client/src/sections/quanju/containers/footer/operation/right.js
+++ b/web/client/src/sections/quanju/containers/footer/operation/right.js
@@ -1,71 +1,151 @@
 import React, { useState } from 'react'
-import { Carousel } from 'antd';
+import { Carousel, Input } from 'antd';
 import Module from '../../public/module'
+import AutoRollComponent from '../build/AutoRollComponent'
+import { useEffect } from 'react';
+import { connect } from 'react-redux';
+import { busWillRun } from '../../public/olMap'
 
-const Right = () => {
-   const [dataLists, setDataList] = useState([
-      {
-         route: '147',
-         plate: '赣APJ090'
-      }, {
-         route: '166',
-         plate: '赣APJ087'
-      }, {
-         route: '171',
-         plate: '赣APJ184'
-      }, {
-         route: '186',
-         plate: '赣APJ241'
-      }, {
-         route: '199',
-         plate: '赣APJ337'
-      }
-   ])
-   const style = { height: "97%", marginTop: "3%" }
-   return (
-      <div style={{ position: 'absolute', right: 0, width: "23%", height: "100%", marginRight: "1%", }}>
-         <Module style={style} customize={true} title={"车辆视频监控"}>
-            <div style={{ width: '90%', height: '96%', margin: '2% 5%', overflow: 'hidden' }}>
-               <Carousel
-                  autoplay
-                  infinite
-                  autoplaySpeed={300000}
-                  vertical={true}
-                  slidesToShow={4}
-               >
-                  {
-                     dataLists.map((data, index) => (
-                        <div key={index} style={{ width: '100%', height: '40%' }}>
-                           <div className='busInformation'>
-                              <img src='/assets/images/quanju/theBus.png' style={{ width: '15%', display: 'block', float: 'left' }} />
-                              <span>
-                                 <h3>所属线路</h3>
-                                 <h4>{data.route}</h4>
-                                 <h3>车辆牌照号</h3>
-                                 <h5>{data.plate}</h5>
-                              </span>
-                           </div>
-                           <div className='busVideo'>
-                              <div style={{
-                                 width: '98%', margin: '1% 1%', height: 152, display: 'block', float: 'left', boxShadow: '0px 1px 5px 0px #1C60FE',
-                                 border: '1px solid #1C60FE'
-                              }}><img src='/assets/images/quanju/fake/gj1.png' style={{ width: '100%', height: '100%' }} /></div>
-                              <div style={{
-                                 width: '48%', margin: '1% 1%', height: 100, display: 'block', float: 'left', boxShadow: '0px 1px 5px 0px #1C60FE',
-                                 border: '1px solid #1C60FE'
-                              }}><img src='/assets/images/quanju/fake/gj2.png' style={{ width: '100%', height: '100%' }} /></div>
-                              <div style={{
-                                 width: '48%', margin: '1% 1%', height: 100, display: 'block', float: 'left', boxShadow: '0px 1px 5px 0px #1C60FE',
-                                 border: '1px solid #1C60FE'
-                              }}><img src='/assets/images/quanju/fake/gj3.png' style={{ width: '100%', height: '100%' }} /></div>
-                           </div>
-                        </div>
-                     ))
-                  }
-               </Carousel>
-            </div>
-         </Module>
-      </div>
-   )
+let queryTimeout = null
+const Right = ({ busRunTime }) => {
+    const [dataLists, setDataList] = useState([
+        {
+            route: '147',
+            plate: '赣APJ090'
+        }, {
+            route: '166',
+            plate: '赣APJ087'
+        }, {
+            route: '171',
+            plate: '赣APJ184'
+        }, {
+            route: '186',
+            plate: '赣APJ241'
+        }, {
+            route: '199',
+            plate: '赣APJ337'
+        }
+    ])
+    const [busRunTimeList, setBusRunTimeList] = useState(busRunTime)
+    const [queryStr, setQueryStr] = useState('')
+
+    useEffect(() => {
+        setBusRunTimeList(
+            queryStr ?
+                busRunTime.filter(b => {
+                    return b?.busNoChar?.indexOf(queryStr) > -1
+                })
+                : busRunTime
+        )
+    }, [queryStr, busRunTime])
+
+    const style = { height: "97%", marginTop: "3%" }
+    return (
+        <div style={{ position: 'absolute', right: 0, width: "23%", height: "100%", marginRight: "1%", }}>
+            <Module style={style} customize={true}
+                // title={"车辆视频监控"}
+                title={"公交运营信息"}
+            >
+                <div style={{ width: '90%', height: '96%', margin: '2% 5%', overflow: 'hidden' }}>
+                    <div style={{ border: '1px solid rgba(10, 114, 255, 1)', backgroundColor: 'rgba(10, 114, 255, 0.1)' }}>
+                        <img src='/assets/images/quanju/search.png' style={{ width: '5%', margin: '0 1.5% 1% 3.5%' }} />
+                        <Input
+                            style={{
+                                width: '90%',
+                                background: 'none',
+                                backgroundColor: 'none',
+                                color: 'rgba(216, 240, 255, 0.8)',
+                                border: 'none',
+                                boxShadow: 'none',
+                            }}
+                            placeholder="请输入车牌号"
+                            onChange={(e) => {
+                                if (queryTimeout) {
+                                    clearTimeout(queryTimeout)
+                                }
+                                queryTimeout = setTimeout(() => {
+                                    setQueryStr(e.target.value)
+                                }, 600)
+                            }}
+                        />
+                    </div>
+
+                    <Carousel
+                        autoplay
+                        infinite
+                        // autoplaySpeed={300000}
+                        autoplaySpeed={1000 * 3}
+                        vertical={true}
+                        slidesToShow={4}
+                    >
+                        {
+                            busRunTimeList.map((b, i) => {
+                                return (
+                                    <div key={index} style={{ width: '100%', height: '40%' }}>
+                                        <div className='busInformation'>
+                                            <img src='/assets/images/quanju/theBus.png' style={{ width: '15%', display: 'block', float: 'left' }} />
+                                            <span>
+                                                <h3>车辆牌照</h3>
+                                                <h5>{d.busNoChar}</h5>
+                                                <h3>调度状态</h3>
+                                                <h4>{busWillRun.find(w => w.value == d.willRun)?.text || '--'}</h4>
+                                            </span>
+                                            <span>
+                                                <h3>发车时间</h3>
+                                                <h4>{d.lastDepTime}</h4>
+                                            </span>
+                                            <span>
+                                                <h3>司机</h3>
+                                                <h5>{d.employeeName}</h5>
+                                                <h3>工号</h3>
+                                                <h4>{d.opNo}</h4>
+                                            </span>
+                                        </div>
+                                    </div>
+                                )
+                            })
+                        }
+                        {/* {
+                            dataLists.map((data, index) => (
+                                <div key={index} style={{ width: '100%', height: '40%' }}>
+                                    <div className='busInformation'>
+                                        <img src='/assets/images/quanju/theBus.png' style={{ width: '15%', display: 'block', float: 'left' }} />
+                                        <span>
+                                            <h3>所属线路</h3>
+                                            <h4>{data.route}</h4>
+                                            <h3>车辆牌照号</h3>
+                                            <h5>{data.plate}</h5>
+                                        </span>
+                                    </div>
+                                    <div className='busVideo'>
+                                        <div style={{
+                                            width: '98%', margin: '1% 1%', height: 152, display: 'block', float: 'left', boxShadow: '0px 1px 5px 0px #1C60FE',
+                                            border: '1px solid #1C60FE'
+                                        }}><img src='/assets/images/quanju/fake/gj1.png' style={{ width: '100%', height: '100%' }} /></div>
+                                        <div style={{
+                                            width: '48%', margin: '1% 1%', height: 100, display: 'block', float: 'left', boxShadow: '0px 1px 5px 0px #1C60FE',
+                                            border: '1px solid #1C60FE'
+                                        }}><img src='/assets/images/quanju/fake/gj2.png' style={{ width: '100%', height: '100%' }} /></div>
+                                        <div style={{
+                                            width: '48%', margin: '1% 1%', height: 100, display: 'block', float: 'left', boxShadow: '0px 1px 5px 0px #1C60FE',
+                                            border: '1px solid #1C60FE'
+                                        }}><img src='/assets/images/quanju/fake/gj3.png' style={{ width: '100%', height: '100%' }} /></div>
+                                    </div>
+                                </div>
+                            ))
+                        } */}
+                    </Carousel>
+                </div>
+            </Module>
+        </div>
+    )
 }
-export default Right
\ No newline at end of file
+
+function mapStateToProps (state) {
+    const { busRunTime, } = state;
+    return {
+        busRunTime: busRunTime.data || [],
+    };
+}
+
+export default connect(mapStateToProps)(Right);
\ No newline at end of file
diff --git a/web/client/src/sections/quanju/containers/public/olMap.js b/web/client/src/sections/quanju/containers/public/olMap.js
index a3da1c71..721ebc81 100644
--- a/web/client/src/sections/quanju/containers/public/olMap.js
+++ b/web/client/src/sections/quanju/containers/public/olMap.js
@@ -5,9 +5,21 @@ import Hua from '../footer/leadership/centerleft/hudong'
 import moment from 'moment';
 import { OlMapRequest } from '$utils'
 
+export const busWillRun = [
+    { text: '非运营', value: '0' },
+    { text: '运营', value: '1' },
+    { text: '维修', value: '2' },
+    { text: '保养', value: '3' },
+    { text: '专车', value: '4' },
+    { text: '机动车', value: '5' },
+    { text: '包车', value: '6' },
+    { text: '班车', value: '7' },
+    { text: '检车', value: '8' },
+]
+
 const OlMap = (props) => {
     const { dispatch, actions, user, olMapArcgisHost, olMapGeoDataHost, patrolList, roadProjectList, tab, busRunTime, busLine } = props
-    console.log(patrolList)
+
     const [olMapOpenData, setOlMapOpenData] = useState([])
     const [olMap, setOlMap] = useState()
     const [pointItem, setPointItem] = useState({})
@@ -188,7 +200,6 @@ const OlMap = (props) => {
                                         positioning: 'top-right'
                                     })
                                     // 请求路线坐标
-                                    console.log(d.code_road);
                                     if (d.code_road) {
                                         let codeMap = {
                                             x: 'gpsxd',
@@ -205,7 +216,6 @@ const OlMap = (props) => {
                                                 })
                                                 .then(res => {
                                                     if (res.status == 200 && res.body && res.body.code == 1) {
-                                                        console.log(res);
                                                         const data = res.body.data
                                                         const { datalist } = data
                                                         if (datalist?.list?.length) {
@@ -365,17 +375,7 @@ const OlMap = (props) => {
                                 }, {
                                     n: '调度状态',
                                     v: d.willRun,
-                                    map: [
-                                        { text: '非运营', value: '0' },
-                                        { text: '运营', value: '1' },
-                                        { text: '维修', value: '2' },
-                                        { text: '保养', value: '3' },
-                                        { text: '专车', value: '4' },
-                                        { text: '机动车', value: '5' },
-                                        { text: '包车', value: '6' },
-                                        { text: '班车', value: '7' },
-                                        { text: '检车', value: '8' },
-                                    ],
+                                    map: busWillRun,
                                 }, {
                                     n: '实际发车时间',
                                     v: d.lastDepTime

From 0e92c652791abf607b6de1f735e10580599ce8eb Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 16:58:21 +0800
Subject: [PATCH 08/21] =?UTF-8?q?=E5=9C=A8=E5=BB=BA=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=A7=8B=E8=B7=AF=E6=AE=B5=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/models/project.js                         | 11 ++++++++++-
 scripts/1.3.1/schema/3.alert_project.sql              |  2 ++
 .../sections/fillion/components/project/project.js    |  5 +++--
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 scripts/1.3.1/schema/3.alert_project.sql

diff --git a/api/app/lib/models/project.js b/api/app/lib/models/project.js
index 8ae65cf0..89138792 100644
--- a/api/app/lib/models/project.js
+++ b/api/app/lib/models/project.js
@@ -141,7 +141,16 @@ module.exports = dc => {
       primaryKey: false,
       field: "qutity_unit",
       autoIncrement: false
-    }
+    },
+    roadCodeStart: {
+        type: DataTypes.STRING,
+        allowNull: true,
+        defaultValue: null,
+        comment: "开始的路段编码",
+        primaryKey: false,
+        field: "road_code_start",
+        autoIncrement: false
+      }
   }, {
     tableName: "project",
     comment: "",
diff --git a/scripts/1.3.1/schema/3.alert_project.sql b/scripts/1.3.1/schema/3.alert_project.sql
new file mode 100644
index 00000000..73a77329
--- /dev/null
+++ b/scripts/1.3.1/schema/3.alert_project.sql
@@ -0,0 +1,2 @@
+alter table project
+	add road_code_start varchar(1024);
diff --git a/web/client/src/sections/fillion/components/project/project.js b/web/client/src/sections/fillion/components/project/project.js
index c6caac02..34fa4e80 100644
--- a/web/client/src/sections/fillion/components/project/project.js
+++ b/web/client/src/sections/fillion/components/project/project.js
@@ -15,7 +15,8 @@ const data = {
     "designUnit": "设计单位",
     "constructionControlUnit": "监理单位",
     //"startTime": "开工时间",
-    //"remark": "备注"
+    //"remark": "备注",
+    "roadCodeStart": "起点路段编码",
 }
 const ProjectModal = (props) => {
     const { visible, onVisibleChange, typecard, rewkeys, recortd, dispatch, setRecortd, setDelet, getData } = props
@@ -214,7 +215,7 @@ const ProjectModal = (props) => {
         </Spin>
     )
 }
-function mapStateToProps(state) {
+function mapStateToProps (state) {
     const { depMessage } = state;
     const pakData = (dep) => {
         return dep.map((d) => {

From f489bd6e878ad8e8237135daeac81c2af811c4bd Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 16:59:15 +0800
Subject: [PATCH 09/21] =?UTF-8?q?=E8=B7=AF=E6=94=BF=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/1.3.1/schema/3.insert_resource.sql  | 3 +++
 web/client/src/sections/fillion/nav-item.js | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 scripts/1.3.1/schema/3.insert_resource.sql

diff --git a/scripts/1.3.1/schema/3.insert_resource.sql b/scripts/1.3.1/schema/3.insert_resource.sql
new file mode 100644
index 00000000..0df80bf9
--- /dev/null
+++ b/scripts/1.3.1/schema/3.insert_resource.sql
@@ -0,0 +1,3 @@
+INSERT INTO resource (code, name, parent_resource) VALUES ('LUZHENG', '路政管理', 'ALLSELECT');
+DELETE FROM user_resource WHERE resource_id = 'OVERLOADMANAGE';
+DELETE FROM resource WHERE code = 'OVERLOADMANAGE';
\ No newline at end of file
diff --git a/web/client/src/sections/fillion/nav-item.js b/web/client/src/sections/fillion/nav-item.js
index 8ac54677..deb62352 100644
--- a/web/client/src/sections/fillion/nav-item.js
+++ b/web/client/src/sections/fillion/nav-item.js
@@ -20,20 +20,21 @@ export function getNavItem(user, dispatch) {
             i.resourceId === 'ASSESSMANAGE' ||
             i.resourceId === 'VIDEOCENTER' ||
             i.resourceId === 'BUILDINGPROJECT' ||
-            i.resourceId === 'MAINTENANCESPOTCHECK'
+            i.resourceId === 'MAINTENANCESPOTCHECK' ||
+            i.resourceId === 'LUZHENG'
         )
 
     return (
         user?.username == 'SuperAdmin' || isshow ?
             <SubMenu key="fillion" icon={<ReadOutlined />} title={'数据管理'}>
-                {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'OVERLOADMANAGE') ?
+                {/* {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'OVERLOADMANAGE') ?
                     <Menu.Item key="fillioninfor">
                         <Link to="/fillion/infor">治超管理</Link>
-                    </Menu.Item> : ''}
+                    </Menu.Item> : ''} */}
                 {/* <Menu.Item key="filliontask">
                     <Link to="/fillion/task">任务管理</Link>
                 </Menu.Item> */}
-                {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'OVERLOADMANAGE') ?
+                {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'LUZHENG') ?
                     <Menu.Item key="luzheng">
                         <Link to="/fillion/luzheng">路政管理</Link>
                     </Menu.Item> : ''}

From 042058f6ae4c02d9fe4b2f92ae63adf3866066b7 Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 17:01:24 +0800
Subject: [PATCH 10/21] =?UTF-8?q?=E8=B7=AF=E6=94=BF=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/1.3.1/schema/3.insert_resource.sql  | 2 +-
 web/client/src/sections/fillion/nav-item.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/1.3.1/schema/3.insert_resource.sql b/scripts/1.3.1/schema/3.insert_resource.sql
index 0df80bf9..a29e8582 100644
--- a/scripts/1.3.1/schema/3.insert_resource.sql
+++ b/scripts/1.3.1/schema/3.insert_resource.sql
@@ -1,3 +1,3 @@
 INSERT INTO resource (code, name, parent_resource) VALUES ('LUZHENG', '路政管理', 'ALLSELECT');
 DELETE FROM user_resource WHERE resource_id = 'OVERLOADMANAGE';
-DELETE FROM resource WHERE code = 'OVERLOADMANAGE';
\ No newline at end of file
+DELETE FROM resource WHERE code = 'OVERLOADMANAGE'；
\ No newline at end of file
diff --git a/web/client/src/sections/fillion/nav-item.js b/web/client/src/sections/fillion/nav-item.js
index deb62352..f8644ec0 100644
--- a/web/client/src/sections/fillion/nav-item.js
+++ b/web/client/src/sections/fillion/nav-item.js
@@ -34,6 +34,7 @@ export function getNavItem(user, dispatch) {
                 {/* <Menu.Item key="filliontask">
                     <Link to="/fillion/task">任务管理</Link>
                 </Menu.Item> */}
+                
                 {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'LUZHENG') ?
                     <Menu.Item key="luzheng">
                         <Link to="/fillion/luzheng">路政管理</Link>

From 2426fab172477dbc653a4e3dc51d8dfe96896ea9 Mon Sep 17 00:00:00 2001
From: zhaobing <zhao.bing@free-sun.com.cn>
Date: Fri, 4 Aug 2023 17:06:19 +0800
Subject: [PATCH 11/21] =?UTF-8?q?feat:0804=E7=AC=AC=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/data/appointed.js     |   4 +-
 api/app/lib/controllers/data/vehicle.js       |  36 ++-
 api/app/lib/models/report.js                  |  73 +++--
 .../fillion/components/bridgeTable.js         |  60 +++--
 .../fillion/components/enforceTable.js        | 254 +++++++++---------
 .../components/feedback/nominateModalcopy.js  |  11 +-
 .../fillion/components/highwaysTable.js       |  14 +-
 .../fillion/components/maintenanceTable.js    |  57 ++--
 .../fillion/components/patrolTable.js         |  10 +-
 .../fillion/components/transportationTable.js |  21 +-
 .../containers/maintenanceSpotCheck.js        |   1 +
 .../containers/footer/build/Leftbottom.js     | 138 +++++-----
 .../containers/footer/build/Rightbottom.js    |  35 +--
 .../quanju/containers/footer/build/index.js   |   1 +
 .../footer/leadership/centerleft/daolu.js     |  12 +-
 .../footer/leadership/centerleft/top.js       |   8 +-
 16 files changed, 399 insertions(+), 336 deletions(-)

diff --git a/api/app/lib/controllers/data/appointed.js b/api/app/lib/controllers/data/appointed.js
index b24e0c0b..937e8154 100644
--- a/api/app/lib/controllers/data/appointed.js
+++ b/api/app/lib/controllers/data/appointed.js
@@ -4,9 +4,9 @@ const moment = require('moment')
 async function appoint(ctx) {
     try {
         const models = ctx.fs.dc.models
-        const { recordId, performerId } = ctx.request.body
+        const { recordId, performerId, handleOpinions } = ctx.request.body
         await models.Report.update({
-            performerId
+            performerId, handleOpinions
         }, { where: { id: recordId } })
         ctx.status = 204;
     } catch (error) {
diff --git a/api/app/lib/controllers/data/vehicle.js b/api/app/lib/controllers/data/vehicle.js
index b3ad5dfb..554e4e5a 100644
--- a/api/app/lib/controllers/data/vehicle.js
+++ b/api/app/lib/controllers/data/vehicle.js
@@ -1,11 +1,20 @@
 'use strict';
+const { QueryTypes } = require('sequelize');
 
-async function get (ctx) {
+async function get(ctx) {
    try {
       const models = ctx.fs.dc.models;
       const { type } = ctx.request.body;
       const { name } = ctx.query;
-
+      const sequelize = ctx.fs.dc.orm
+      const sqlStr = `select count(p.road_marking)  标线,count(p.roadside_ditch) 边沟,
+       count(p.guardrail) 护栏, count(p.roadside_trees) 行道树,count(p.wrong_lane) 错车道
+       from (
+   select t.*,row_number() over (partition by t.luduan order by t.time desc )  rn from (
+   select code_road||'-'||road_section_start||'-'||road_section_end luduan,
+   road_marking,roadside_ditch,guardrail,roadside_trees,wrong_lane,time from   report
+   where report_type='conserve') t ) p where p.rn=1`
+      const conserveData = await sequelize.query(sqlStr, { type: QueryTypes.SELECT })
       let findOption = {
          where: {
             type
@@ -17,9 +26,12 @@ async function get (ctx) {
          }
       }
       const vehicleRes = await models.Statistic.findAll(findOption)
-
+      console.log('vehicleRes', vehicleRes)
       ctx.status = 200;
-      ctx.body = vehicleRes
+      ctx.body = {
+         vehicleRes: vehicleRes.filter(item => item.dataValues.name === '标志牌' || item.dataValues.name === '养护责任牌')
+         , conserveData
+      }
    } catch (error) {
       ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
       ctx.status = 400;
@@ -29,7 +41,7 @@ async function get (ctx) {
    }
 }
 
-async function edit (ctx) {
+async function edit(ctx) {
    try {
       const models = ctx.fs.dc.models;
       const { id, name, count, type } = ctx.request.body;
@@ -58,7 +70,7 @@ async function edit (ctx) {
    }
 }
 
-async function del (ctx) {
+async function del(ctx) {
    try {
       const models = ctx.fs.dc.models;
       const { id } = ctx.params;
@@ -79,7 +91,7 @@ async function del (ctx) {
    }
 }
 
-async function specificGet (ctx) {
+async function specificGet(ctx) {
    try {
       const models = ctx.fs.dc.models;
       const { type } = ctx.query;
@@ -109,7 +121,7 @@ async function specificGet (ctx) {
    }
 }
 
-async function specificEdit (ctx) {
+async function specificEdit(ctx) {
    try {
       const models = ctx.fs.dc.models;
       const data = ctx.request.body;
@@ -134,7 +146,7 @@ async function specificEdit (ctx) {
    }
 }
 
-async function specificDel (ctx) {
+async function specificDel(ctx) {
    try {
       const models = ctx.fs.dc.models;
       const { vehicleId } = ctx.params;
@@ -155,7 +167,7 @@ async function specificDel (ctx) {
    }
 }
 
-async function businessGet (ctx) {
+async function businessGet(ctx) {
    try {
       const models = ctx.fs.dc.models;
       const { nameOfBusinessOwner } = ctx.query;
@@ -183,7 +195,7 @@ async function businessGet (ctx) {
    }
 }
 
-async function businessEdit (ctx) {
+async function businessEdit(ctx) {
    try {
       const models = ctx.fs.dc.models;
       const data = ctx.request.body;
@@ -208,7 +220,7 @@ async function businessEdit (ctx) {
    }
 }
 
-async function businessDel (ctx) {
+async function businessDel(ctx) {
    try {
       const models = ctx.fs.dc.models;
       const { businessId } = ctx.params;
diff --git a/api/app/lib/models/report.js b/api/app/lib/models/report.js
index eb532b72..0e6b827d 100644
--- a/api/app/lib/models/report.js
+++ b/api/app/lib/models/report.js
@@ -7,7 +7,6 @@ module.exports = dc => {
   const sequelize = dc.orm;
   const Report = sequelize.define("report", {
     id: {
-      index: 1,
       type: DataTypes.INTEGER,
       allowNull: false,
       defaultValue: null,
@@ -18,87 +17,78 @@ module.exports = dc => {
       unique: "report_id_uindex"
     },
     reportType: {
-      index: 2,
       type: DataTypes.STRING,
       allowNull: false,
       defaultValue: null,
-      comment: "上报类型",
+      comment: "上报类型 巡查：patrol / 养护：conserve",
       primaryKey: false,
       field: "report_type",
       autoIncrement: false
     },
     projectType: {
-      index: 3,
       type: DataTypes.STRING,
-      allowNull: false,
+      allowNull: true,
       defaultValue: null,
-      comment: "工程类型",
+      comment: "工程类型 道路：road / 桥梁：birdge / 涵洞：culvert",
       primaryKey: false,
       field: "project_type",
       autoIncrement: false
     },
     road: {
-      index: 4,
       type: DataTypes.STRING,
       allowNull: true,
       defaultValue: null,
-      comment: '所属道路',
+      comment: null,
       primaryKey: false,
       field: "road",
       autoIncrement: false
     },
     roadSectionStart: {
-      index: 5,
       type: DataTypes.STRING,
       allowNull: true,
       defaultValue: null,
-      comment: '开始路段',
+      comment: null,
       primaryKey: false,
       field: "road_section_start",
       autoIncrement: false
     },
     roadSectionEnd: {
-      index: 6,
       type: DataTypes.STRING,
       allowNull: true,
       defaultValue: null,
-      comment: '结束路段',
+      comment: null,
       primaryKey: false,
       field: "road_section_end",
       autoIncrement: false
     },
     longitude: {
-      index: 7,
       type: DataTypes.DOUBLE,
       allowNull: true,
       defaultValue: null,
-      comment: '经度',
+      comment: null,
       primaryKey: false,
       field: "longitude",
       autoIncrement: false
     },
     latitude: {
-      index: 8,
       type: DataTypes.DOUBLE,
       allowNull: true,
       defaultValue: null,
-      comment: '纬度',
+      comment: null,
       primaryKey: false,
       field: "latitude",
       autoIncrement: false
     },
     content: {
-      index: 9,
       type: DataTypes.STRING,
       allowNull: true,
       defaultValue: null,
-      comment: '具体内容',
+      comment: null,
       primaryKey: false,
       field: "content",
       autoIncrement: false
     },
     scenePic: {
-      index: 10,
       type: DataTypes.ARRAY(DataTypes.STRING),
       allowNull: true,
       defaultValue: null,
@@ -108,7 +98,6 @@ module.exports = dc => {
       autoIncrement: false
     },
     conserveBeforePic: {
-      index: 11,
       type: DataTypes.ARRAY(DataTypes.STRING),
       allowNull: true,
       defaultValue: null,
@@ -118,7 +107,6 @@ module.exports = dc => {
       autoIncrement: false
     },
     conserveUnderwayPic: {
-      index: 12,
       type: DataTypes.ARRAY(DataTypes.STRING),
       allowNull: true,
       defaultValue: null,
@@ -128,7 +116,6 @@ module.exports = dc => {
       autoIncrement: false
     },
     conserveAfterPic: {
-      index: 13,
       type: DataTypes.ARRAY(DataTypes.STRING),
       allowNull: true,
       defaultValue: null,
@@ -138,7 +125,6 @@ module.exports = dc => {
       autoIncrement: false
     },
     userId: {
-      index: 14,
       type: DataTypes.INTEGER,
       allowNull: true,
       defaultValue: null,
@@ -148,52 +134,39 @@ module.exports = dc => {
       autoIncrement: false
     },
     time: {
-      index: 15,
       type: DataTypes.DATE,
       allowNull: false,
       defaultValue: null,
-      comment: '创建日期',
+      comment: null,
       primaryKey: false,
       field: "time",
       autoIncrement: false
     },
     address: {
-      index: 16,
       type: DataTypes.STRING,
       allowNull: true,
       defaultValue: null,
-      comment: '具体位置',
+      comment: null,
       primaryKey: false,
       field: "address",
       autoIncrement: false
     },
     projectName: {
-      index: 17,
       type: DataTypes.STRING,
       allowNull: true,
       defaultValue: null,
-      comment: "工程名称",
+      comment: null,
       primaryKey: false,
       field: "project_name",
       autoIncrement: false
     },
     handleState: {
-      index: 18,
-      type: DataTypes.STRING,
-      allowNull: false,
-      defaultValue: "已处理",
-      // comment: "处理状态",
-      primaryKey: false,
-      field: "handle_state",
-      autoIncrement: false
-    },
-    codeRoad: {
       type: DataTypes.STRING,
       allowNull: true,
       defaultValue: null,
       comment: null,
       primaryKey: false,
-      field: "code_road",
+      field: "handle_state",
       autoIncrement: false
     },
     performerId: {
@@ -209,7 +182,7 @@ module.exports = dc => {
       type: DataTypes.STRING,
       allowNull: true,
       defaultValue: null,
-      comment: "",
+      comment: "执行内容描述",
       primaryKey: false,
       field: "handle_content",
       autoIncrement: false
@@ -223,6 +196,15 @@ module.exports = dc => {
       field: "handle_pic",
       autoIncrement: false
     },
+    codeRoad: {
+      type: DataTypes.STRING,
+      allowNull: true,
+      defaultValue: null,
+      comment: null,
+      primaryKey: false,
+      field: "code_road",
+      autoIncrement: false
+    },
     videoUrl: {
       type: DataTypes.ARRAY(DataTypes.STRING),
       allowNull: true,
@@ -456,6 +438,15 @@ module.exports = dc => {
       primaryKey: false,
       field: "other_description",
       autoIncrement: false
+    },
+    handleOpinions: {
+      type: DataTypes.STRING,
+      allowNull: true,
+      defaultValue: null,
+      comment: "处理意见",
+      primaryKey: false,
+      field: "handle_opinions",
+      autoIncrement: false
     }
   }, {
     tableName: "report",
diff --git a/web/client/src/sections/fillion/components/bridgeTable.js b/web/client/src/sections/fillion/components/bridgeTable.js
index 23d74b38..f32c0e89 100644
--- a/web/client/src/sections/fillion/components/bridgeTable.js
+++ b/web/client/src/sections/fillion/components/bridgeTable.js
@@ -25,6 +25,9 @@ const BrideTable = (props) => {
     const [whichofits, setWhichofits] = useState('qiaoliang')
     const [delet, setDelet] = useState()
     const [differentiate, setDifferentiate] = useState('bridge')
+    const [smallBridge, setSmallBridge] = useState([])
+    const [middleBridge, setMiddleBridge] = useState([])
+    const [bigBridge, setBigBridge] = useState([])
     const [editAble, setEditAble] = useState(user?.username !== 'SuperAdmin' && user?.userResources?.filter(i => i.resourceId === 'BRIDGEMANAGE')[0].isshow === "true" ? true : '')
     const ref = useRef()
     useEffect(() => { ref.current.reload() }, [whichofits, delet])
@@ -161,7 +164,7 @@ const BrideTable = (props) => {
                     getPopupContainer: (triggerNode) => triggerNode.parentNode,
                 }
             }, {
-                title: '跨越地物类型1',
+                title: '跨越地物类型',
                 search: false,
                 dataIndex: 'time8',
                 valueType: 'dateRange',
@@ -175,7 +178,7 @@ const BrideTable = (props) => {
                     getPopupContainer: (triggerNode) => triggerNode.parentNode,
                 }
             }, {
-                title: '跨越地物名称1',
+                title: '跨越地物名称',
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
@@ -1810,7 +1813,9 @@ const BrideTable = (props) => {
                             setRowSelected([]);
                             const res = await dispatch(getBridge(query));
                             // console.log(res)
-
+                            setSmallBridge(res.payload.data?.filter(item => item.bridgeClassification === '小桥'))
+                            setMiddleBridge(res.payload.data?.filter(item => item.bridgeClassification === '中桥'))
+                            setBigBridge(res.payload.data?.filter(item => item.bridgeClassification === '大桥'))
                             setCounts(res.payload.data)
                             return {
                                 ...res,
@@ -1833,6 +1838,7 @@ const BrideTable = (props) => {
                     search={{
                         defaultCollapsed: false,
                         optionRender: (searchConfig, formProps, dom) => [
+                            <span style={{ marginRight: 80 }}>{`共有小桥${smallBridge.length}座，中桥${middleBridge.length}座，大桥${bigBridge.length}座`}</span>,
                             ...dom.reverse(),
                             <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, differentiate) }} disabled={editAble}>
                                 <Button
@@ -1847,28 +1853,32 @@ const BrideTable = (props) => {
                 >
                 </ProTable>
             </div>
-            {modalVisible ? <UserModal
-                visible={modalVisible}
-                onVisibleChange={setModalVisible}
-                modalRecord={modalRecord}
-                typecard={typecard}
-                rewkeys={'bridge'}
-                data={date}
-                recortd={recortd}
-                setDelet={setDelet}
-                // sitename={sitename}
-                setRecortd={setRecortd}
-            /> : ''}
-            {modalVisibleyilan ? <ProjectModal
-                visible={modalVisibleyilan}
-                onVisibleChange={setModalVisibleyilan}
-                modalRecord={modalRecord}
-                typecard={typecard}
-                rewkeys={'bridge'}
-                setDelet={setDelet}
-                recortd={recortd}
-                setRecortd={setRecortd}
-            /> : ''}
+            {
+                modalVisible ? <UserModal
+                    visible={modalVisible}
+                    onVisibleChange={setModalVisible}
+                    modalRecord={modalRecord}
+                    typecard={typecard}
+                    rewkeys={'bridge'}
+                    data={date}
+                    recortd={recortd}
+                    setDelet={setDelet}
+                    // sitename={sitename}
+                    setRecortd={setRecortd}
+                /> : ''
+            }
+            {
+                modalVisibleyilan ? <ProjectModal
+                    visible={modalVisibleyilan}
+                    onVisibleChange={setModalVisibleyilan}
+                    modalRecord={modalRecord}
+                    typecard={typecard}
+                    rewkeys={'bridge'}
+                    setDelet={setDelet}
+                    recortd={recortd}
+                    setRecortd={setRecortd}
+                /> : ''
+            }
         </Spin >
     )
 }
diff --git a/web/client/src/sections/fillion/components/enforceTable.js b/web/client/src/sections/fillion/components/enforceTable.js
index 7ddc2662..3271ce90 100644
--- a/web/client/src/sections/fillion/components/enforceTable.js
+++ b/web/client/src/sections/fillion/components/enforceTable.js
@@ -18,33 +18,33 @@ const enforceTable = (props) => {
     const [modalVisible, setModalVisible] = useState(false);
     const [modalRecord, setModalRecord] = useState();
     const [typecard, setTypecard] = useState();
- 
-//打开弹窗
-const openModal = (type, record) => {
-    setModalVisible(true);
-    // setModalType(type);
-    if (type == 'edit') {
-        setModalRecord(record);
-    } else {
-        setModalRecord(null);
+
+    //打开弹窗
+    const openModal = (type, record) => {
+        setModalVisible(true);
+        // setModalType(type);
+        if (type == 'edit') {
+            setModalRecord(record);
+        } else {
+            setModalRecord(null);
+        }
+    }
+    //批量导出
+    const exports = (ids, counts) => {
+        // console.log(user);
+        let reportIds = [];
+        if (ids.length)
+            reportIds = ids
+        else
+            reportIds = (counts || {}).ids || [];
+        superagent.post('/_report/http')
+            .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
+                const resTextIs = res.text.split('/').pop()
+                window.open(
+                    '/_api/' +
+                    `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
+            })
     }
-}
-   //批量导出
-   const exports = (ids, counts) => {
-    // console.log(user);
-    let reportIds = [];
-    if (ids.length)
-        reportIds = ids
-    else
-        reportIds = (counts || {}).ids || [];
-    superagent.post('/_report/http')
-        .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => {
-            const resTextIs = res.text.split('/').pop()
-            window.open(
-                '/_api/' +
-                `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`)
-        })
-}
     const columns =
         [
             {
@@ -95,7 +95,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time3',
                 valueType: 'dateRange',
-               
+
 
 
                 width: 120,
@@ -110,7 +110,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time4',
                 valueType: 'dateRange',
-               
+
 
                 width: 120,
                 render: (dom, record) => {
@@ -124,7 +124,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time5',
                 valueType: 'dateRange',
-               
+
 
                 width: 120,
                 render: (dom, record) => {
@@ -138,7 +138,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time6',
                 valueType: 'dateRange',
-               
+
 
                 width: 120,
                 render: (dom, record) => {
@@ -152,7 +152,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time7',
                 valueType: 'dateRange',
-               
+
 
                 width: 120,
                 render: (dom, record) => {
@@ -166,7 +166,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time8',
                 valueType: 'dateRange',
-               
+
 
                 width: 120,
                 render: (dom, record) => {
@@ -180,7 +180,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -195,7 +195,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -210,7 +210,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -225,7 +225,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -240,7 +240,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -255,7 +255,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -270,7 +270,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -285,7 +285,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -300,7 +300,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -315,7 +315,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -330,7 +330,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -345,7 +345,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -360,7 +360,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -375,7 +375,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -390,7 +390,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -405,7 +405,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -420,7 +420,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -435,7 +435,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -450,7 +450,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -465,7 +465,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -480,7 +480,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -495,7 +495,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -510,7 +510,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -525,7 +525,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -540,7 +540,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -555,7 +555,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -570,7 +570,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -585,7 +585,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -600,7 +600,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -615,7 +615,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -630,7 +630,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -645,7 +645,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -660,7 +660,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -675,7 +675,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -690,7 +690,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -705,7 +705,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -720,7 +720,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -735,7 +735,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -750,7 +750,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -765,7 +765,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -780,7 +780,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -795,7 +795,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -810,7 +810,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -825,7 +825,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -840,7 +840,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -855,7 +855,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -870,7 +870,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -885,7 +885,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -900,7 +900,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -915,7 +915,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -930,7 +930,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -945,7 +945,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -960,7 +960,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -975,7 +975,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -990,7 +990,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1005,7 +1005,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1020,7 +1020,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1035,7 +1035,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1050,7 +1050,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1065,7 +1065,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1080,7 +1080,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1095,7 +1095,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1110,7 +1110,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1125,7 +1125,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1140,7 +1140,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1155,7 +1155,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1171,7 +1171,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1186,7 +1186,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1201,7 +1201,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1216,7 +1216,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1231,7 +1231,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1246,7 +1246,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1261,7 +1261,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1276,7 +1276,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1291,7 +1291,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1306,7 +1306,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1321,7 +1321,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1336,7 +1336,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1351,7 +1351,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1366,7 +1366,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1381,7 +1381,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1396,7 +1396,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1411,7 +1411,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1426,7 +1426,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1441,7 +1441,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1456,7 +1456,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1471,7 +1471,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1486,7 +1486,7 @@ const openModal = (type, record) => {
                 search: false,
                 dataIndex: 'time9',
                 valueType: 'dateRange',
-               
+
 
                 width: 140,
 
@@ -1506,11 +1506,11 @@ const openModal = (type, record) => {
                 fixed: 'right',
                 render: (dom, record) => {
                     return <div><Button type="link"
-                    onClick={() => {
-                        openModal('edit', record)
-                        setTypecard('compile')
-                        
-                    }}
+                        onClick={() => {
+                            openModal('edit', record)
+                            setTypecard('compile')
+
+                        }}
                     >编辑</Button><Button type="link">删除</Button></div>
 
                 }
@@ -1520,7 +1520,7 @@ const openModal = (type, record) => {
                 hideInTable: true,
                 dataIndex: "direction",
                 order: 6,
-                renderFormItem: (item, { type, defaultRender, ...rest }, form,record) => {
+                renderFormItem: (item, { type, defaultRender, ...rest }, form, record) => {
                     return (
                         <div> <Button
                             type="primary"
@@ -1607,7 +1607,7 @@ const openModal = (type, record) => {
 
                 >
                 </ProTable></div>
-                <UserModal
+            <UserModal
                 visible={modalVisible}
                 onVisibleChange={setModalVisible}
                 modalRecord={modalRecord}
diff --git a/web/client/src/sections/fillion/components/feedback/nominateModalcopy.js b/web/client/src/sections/fillion/components/feedback/nominateModalcopy.js
index 516b662e..f20adfe6 100644
--- a/web/client/src/sections/fillion/components/feedback/nominateModalcopy.js
+++ b/web/client/src/sections/fillion/components/feedback/nominateModalcopy.js
@@ -1,13 +1,14 @@
 'use strict';
 import React, { useState, useEffect, useCallback, useRef } from 'react';
 import { connect } from 'react-redux';
-import { Spin, TreeSelect, Modal, Form, Select } from 'antd';
+import { Spin, TreeSelect, Modal, Form, Select, Input } from 'antd';
 import ProForm, { ProFormText, ModalForm, ProFormSwitch, ProFormTreeSelect, ProFormSelect } from '@ant-design/pro-form';
 import { getDepUser } from '../../../organization/actions/user'
 import { appointTask } from '../../actions/appointTask'
-import moment from 'moment';
+import moment from 'moment'
 import { v4 as uuidv4 } from 'uuid';
 
+const { TextArea } = Input;
 
 const NominateModal = (props) => {
     const { queryData, recordId, visible, user, onCancel, depMessage, loading, depUser, clientHeight, depData, onVisibleChange, dispatch } = props
@@ -38,7 +39,7 @@ const NominateModal = (props) => {
     }
     const handleFinish = () => {
         form.validateFields().then(values => {
-            dispatch(appointTask({ recordId: recordId, performerId: values.nameId })).then((res) => {
+            dispatch(appointTask({ recordId: recordId, performerId: values.nameId, handleOpinions: values.handleOpinions })).then((res) => {
                 if (res.success) {
                     setSelectedUserId(null)
                     queryData()
@@ -92,9 +93,13 @@ const NominateModal = (props) => {
                                     onChange={(value) => setSelectedUserId(value)}
                                 >
                                 </Select>
+
                             </Form.Item>
                         </div>
                     </div>
+                    <Form.Item label='处理意见:' name='handleOpinions'>
+                        <TextArea />
+                    </Form.Item>
                 </Form>
             </Modal>
         </Spin>
diff --git a/web/client/src/sections/fillion/components/highwaysTable.js b/web/client/src/sections/fillion/components/highwaysTable.js
index 4fce5c9d..2d19929a 100644
--- a/web/client/src/sections/fillion/components/highwaysTable.js
+++ b/web/client/src/sections/fillion/components/highwaysTable.js
@@ -76,6 +76,7 @@ const TransporTationTable = (props) => {
                 fixed: 'left',
                 width: 120,
                 render: (dom, record) => {
+
                     return record.count
                 },
                 fieldProps: {
@@ -90,13 +91,14 @@ const TransporTationTable = (props) => {
                 width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
+                    console.log('record', record.id === null)
                     return <div><Button type="link"
                         onClick={() => {
                             hightModal('edit', record)
                             setTypecard('compile')
                             setRecortd(record)
                         }}
-                        disabled={editAble}
+                        disabled={editAble && record.id === null}
                     >编辑</Button></div>
 
                 }
@@ -316,7 +318,15 @@ const TransporTationTable = (props) => {
                             }
                             setRowSelected([]);
                             const res = await dispatch(getHighways(query));
-                            setCounts(res.payload.data.filter(item => item.name !== '路牌名'))
+                            let rslt = res.payload.data?.vehicleRes?.filter(item => item.name !== '路牌名')
+                            const additionalProperties = Object.entries(res.payload.data?.conserveData[0]).map(([key, value]) => ({
+                                id: null,
+                                name: key,
+                                count: Number(value),
+                                type: null
+                            }))
+                            additionalProperties.forEach(item => { rslt.push(item) })
+                            setCounts(rslt)
                             return {
                                 ...res,
                                 total: res.payload.data ? res.payload.data.count : 0
diff --git a/web/client/src/sections/fillion/components/maintenanceTable.js b/web/client/src/sections/fillion/components/maintenanceTable.js
index f94a7758..6f3e83ad 100644
--- a/web/client/src/sections/fillion/components/maintenanceTable.js
+++ b/web/client/src/sections/fillion/components/maintenanceTable.js
@@ -25,24 +25,25 @@ const DetailForm = (props) => {
         { key: '养护路段', name: 'roadSectionStart' },
         { key: '具体位置', name: 'address' },
         { key: '路面类型', name: 'roadType' },
-        { key: '路面宽度', name: 'roadWidth' },
-        { key: '错车道', name: 'wrongLane' },
-        { key: '行道树', name: 'roadsideTrees' },
-        { key: '边沟', name: 'roadsideDitch' },
-        { key: '护栏', name: 'guardrail' },
-        { key: '标线', name: 'roadMarking' },
-        { key: '养护人员人数', name: 'maintenanceStaffCount' },
-        { key: '修整路肩', name: 'shoulderRepair' },
-        { key: '清理边沟', name: 'ditchCleaning' },
-        { key: '修补沥青路面', name: 'asphaltRepair' },
-        { key: '修补水泥路面', name: 'concreteRepair' },
-        { key: '除草', name: 'grassMowing' },
-        { key: '树刷白', name: 'treeWhitening' },
-        { key: '桩刷白', name: 'pileWhitening' },
-        { key: '维护护栏', name: 'guardrailMaintenance' },
-        { key: '修复端头', name: 'endHeadRepair' },
+        { key: '路面宽度(米)', name: 'roadWidth' },
+        { key: '错车道（个）', name: 'wrongLane' },
+        { key: '行道树（棵）', name: 'roadsideTrees' },
+        { key: '边沟（米）', name: 'roadsideDitch' },
+        { key: '护栏（米）', name: 'guardrail' },
+        { key: '标线（米）', name: 'roadMarking' },
+        { key: '养护人员人数（人）', name: 'maintenanceStaffCount' },
+        { key: '修整路肩（平方米）', name: 'shoulderRepair' },
+        { key: '清理边沟（米）', name: 'ditchCleaning' },
+        { key: '修补沥青路面（平方米）', name: 'asphaltRepair' },
+        { key: '修补水泥路面（平方米）', name: 'concreteRepair' },
+        { key: '除草（米）', name: 'grassMowing' },
+        { key: '树刷白（株/公里）', name: 'treeWhitening' },
+        { key: '桩刷白（个）', name: 'pileWhitening' },
+        { key: '维护护栏（个）', name: 'guardrailMaintenance' },
+        { key: '修复端头（块）', name: 'endHeadRepair' },
         { key: '其他养护内容', name: 'otherDescription' },
         { key: '养护前图片', name: 'conserveBeforePic' },
+        { key: '养护中图片', name: 'conserveUnderwayPic' },
         { key: '养护后图片', name: 'conserveAfterPic' },
         { key: '上报视频', name: 'videoUrl' },
 
@@ -62,14 +63,14 @@ const DetailForm = (props) => {
     ];
     const renderContent = (data) => {
         if (data) {
-            if ( moment(data.time).isAfter(moment('2023-08-03 00:00:00'))) {
+            if (moment(data.time).isAfter(moment('2023-08-03 00:00:00'))) {
                 return keyList.map(obj => {
                     return <div style={{ display: 'flex', width: '100%', justifyContent: 'space-between', margin: '12px 0' }}>
                         <span style={{ fontSize: 16, color: 'gray', minWidth: '26%' }}>{obj.key}</span>
                         {
                             obj.name != 'conserveBeforePic' && obj.name != 'conserveAfterPic' && obj.name != 'roadSectionStart' && obj.name != 'videoUrl' && obj.name.indexOf('conserve') == -1 ?
                                 <Input
-                                    style={{ width: '70%' }}
+                                    style={{ width: '60%' }}
                                     value={
                                         obj.name == 'id' ?
                                             moment(data.time).format("YYYYMMDD") * 10000 + data.id
@@ -91,7 +92,7 @@ const DetailForm = (props) => {
                                                 </div>
                                             }) : '暂无图片'
                                         }
-                                    </div> : obj.name != 'videoUrl' ? <div style={{ width: '70%', display: 'flex', position: 'relative', flexWrap: 'wrap' }}>
+                                    </div> : obj.name != 'videoUrl' ? <div style={{ width: '60%', display: 'flex', position: 'relative', flexWrap: 'wrap' }}>
                                         <Input style={{ width: '100%' }} disabled value={data[obj.name] + '-' + data['roadSectionEnd']} />
 
                                     </div> : <div style={{ width: '70%', display: 'flex', position: 'relative', flexWrap: 'wrap' }}>
@@ -216,14 +217,14 @@ const DetailList = (props) => {
             key: 'projectType',
             dataIndex: 'projectType',
             align: 'center',
-            render: (text, record) => { 
-                return record.projectType?.length > 0 ? reportTypeText(text)  : (record.codeRoad && record.codeRoad.length > 0)
-                ? record.codeRoad[0] === 'X'
-                  ? '县道'
-                  : record.codeRoad[0] === 'Y'
-                  ? '乡道'
-                  : '村道'
-                : ''
+            render: (text, record) => {
+                return record.projectType?.length > 0 ? reportTypeText(text) : (record.codeRoad && record.codeRoad.length > 0)
+                    ? record.codeRoad[0] === 'X'
+                        ? '县道'
+                        : record.codeRoad[0] === 'Y'
+                            ? '乡道'
+                            : '村道'
+                    : ''
             }
         }, {
             title: '所属道路',
@@ -648,7 +649,7 @@ const MaintenanceTable = (props) => {
     );
 };
 
-function mapStateToProps (state) {
+function mapStateToProps(state) {
     const { auth, depMessage, userList, reportList, reportDetail, depUser, global, allDepUsers } = state;
     const pakData = (dep) => {
         return dep.map((d) => {
diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js
index 36449bd5..bdab013e 100644
--- a/web/client/src/sections/fillion/components/patrolTable.js
+++ b/web/client/src/sections/fillion/components/patrolTable.js
@@ -45,7 +45,7 @@ const DetailForm = (props) => {
     const keyList = [
         // { key: '编号', name: 'id' },
         // isPatrol ?'巡查管理详情' :isRoad ? '建设上报详情' : '异常反馈详情'
-        { key: '工程类型', name: 'projectType', skip: isPatrol },
+        { key: '工程类型', name: 'projectType', skip: !isPatrol },
         { key: '反馈类型', name: 'projectType', skip: !isAnomaly },
         { key: '工程名称', name: 'projectName', skip: !isRoad },
         { key: '所在路段', name: 'road', skip: isPatrol },
@@ -53,6 +53,7 @@ const DetailForm = (props) => {
         { key: '巡查内容', name: 'content', skip: isPatrol },
         { key: '路线代码', name: 'codeRoad', skip: !isAnomaly && isPatrol },
         { key: '现场照片', name: 'scenePic', skip: isPatrol },
+        { key: '处理意见', name: 'handleOpinions', skip: !isAnomaly },
         { key: '处理详情', name: 'handleContent', skip: !isAnomaly },
         { key: '处理图片', name: 'handlePic', skip: !isAnomaly },
         { key: '处理人', name: 'performerName', skip: !isAnomaly },
@@ -89,6 +90,7 @@ const DetailForm = (props) => {
         { key: '巡查内容', name: 'content' },
         { key: '路线代码', name: 'codeRoad', skip: !isAnomaly && !isPatrol },
         { key: '现场照片', name: 'scenePic' },
+        { key: '处理意见', name: 'handleOpinions', skip: !isAnomaly },
         { key: '处理详情', name: 'handleContent', skip: !isAnomaly },
         { key: '处理图片', name: 'handlePic', skip: !isAnomaly },
         { key: '处理人', name: 'performerName', skip: !isAnomaly }
@@ -112,7 +114,7 @@ const DetailForm = (props) => {
                             <div style={{ display: 'flex', width: '100%', justifyContent: 'space-between', margin: '12px 0' }}>
                                 <span style={{ fontSize: 16, color: 'gray', minWidth: '26%' }}>{obj.key}</span>
                                 {
-                                    obj.name != 'scenePic' && obj.name != 'roadSectionStart' && obj.name != 'videoUrl' && obj.name.indexOf('conserve') == -1 ?
+                                    obj.name != 'handlePic' && obj.name != 'scenePic' && obj.name != 'roadSectionStart' && obj.name != 'videoUrl' && obj.name.indexOf('conserve') == -1 ?
                                         <Input
                                             style={{ width: '70%' }}
                                             value={
@@ -996,7 +998,11 @@ const PatrolTable = (props) => {
 };
 
 function mapStateToProps(state) {
+<<<<<<< Updated upstream
     const { auth, depMessage, userList, reportList, reportDetail, global, allDepUsers, anspectionNotificationPhoneList } = state;
+=======
+    const { auth, depMessage, userList, reportList, reportDetail, global, allDepUsers } = state;
+>>>>>>> Stashed changes
     const pakData = (dep) => {
         return dep.map((d) => {
             return {
diff --git a/web/client/src/sections/fillion/components/transportationTable.js b/web/client/src/sections/fillion/components/transportationTable.js
index d4d4264d..99e35d15 100644
--- a/web/client/src/sections/fillion/components/transportationTable.js
+++ b/web/client/src/sections/fillion/components/transportationTable.js
@@ -24,6 +24,7 @@ const TransporTationTable = (props) => {
     const [differentiate, setDifferentiate] = useState('road')
     const [grade, setGrade] = useState('县')
     const [departmentInfo, setDepartment] = useState('')
+    const [roadData, setRoadData] = useState([])//道路数据
     const [editAble, setEditAble] = useState(user?.username !== 'SuperAdmin' && user?.userResources?.filter(i => i.resourceId === 'ROADMANAGE')[0].isshow === "true" ? true : '')
     const ref = useRef()
     useEffect(() => { ref.current.reload() }, [whichofits, delet])
@@ -3761,6 +3762,7 @@ const TransporTationTable = (props) => {
                                         setWhichofits('县')
                                         setDifferentiate('road')
                                         setGrade('县')
+                                        setRoadData([])
                                     }}>县道{activeKey === 'tab1'}</span>,
                                 },
                                 {
@@ -3769,6 +3771,7 @@ const TransporTationTable = (props) => {
                                         setWhichofits('乡')
                                         setGrade('乡')
                                         setDifferentiate('road')
+                                        setRoadData([])
 
                                     }}>乡道{activeKey === 'tab2'}</span>,
                                 },
@@ -3778,6 +3781,7 @@ const TransporTationTable = (props) => {
                                         setWhichofits('村')
                                         setDifferentiate('road')
                                         setGrade('村')
+                                        setRoadData([])
 
                                     }}>村道{activeKey === 'tab3'}</span>,
                                 },
@@ -3819,8 +3823,8 @@ const TransporTationTable = (props) => {
                             }
                             setRowSelected([]);
                             const res = await dispatch(getRoadway(query));
-                            // console.log(res)
-
+                            const uniqueArray = [...new Set(res.payload.data?.map(item => item.routeName))];
+                            setRoadData(uniqueArray)
                             setCounts(departmentInfo ? res.payload.data.filter((item) => {
                                 return item.townshipCode === departmentInfo.areaCode
                             }) : res.payload.data)
@@ -3836,6 +3840,8 @@ const TransporTationTable = (props) => {
                             }
                             setRowSelected([]);
                             const res = await dispatch(getRoadway(query));
+                            const uniqueArray = [...new Set(res.payload.data?.map(item => item.routeName))];
+                            setRoadData(uniqueArray)
                             setCounts(departmentInfo ? res.payload.data.filter((item) => {
                                 return item.townshipCode === departmentInfo.areaCode
                             }) : res.payload.data)
@@ -3849,7 +3855,9 @@ const TransporTationTable = (props) => {
                                 road: sitename
                             }
                             setRowSelected([]);
-                            const res = await dispatch(getRoadway(query));
+                            const res = await dispatch(getRoadway(query))
+                            const uniqueArray = [...new Set(res.payload.data?.map(item => item.routeName))];
+                            setRoadData(uniqueArray)
                             setCounts(departmentInfo ? res.payload.data.filter((item) => {
                                 return item.townshipCode === departmentInfo.areaCode
                             }) : res.payload.data)
@@ -3864,8 +3872,8 @@ const TransporTationTable = (props) => {
                                 entryName: sitename
                             }
                             setRowSelected([]);
-                            const res = await dispatch(getProject(query));
-                            setCounts(res.payload.data)
+                            const res = await dispatch(getProject(query))
+                            console.log('56666666', res)
                             return {
                                 ...res,
                                 total: res.payload.data ? res.payload.data.count : 0
@@ -3875,6 +3883,7 @@ const TransporTationTable = (props) => {
                     search={{
                         defaultCollapsed: false,
                         optionRender: (searchConfig, formProps, dom) => [
+                            <span style={{ marginRight: 20 }}>{`共有${whichofits}道:${roadData.length || 0}条`}</span>,
                             ...dom.reverse(),
                             <Popconfirm title="确认导出?" onConfirm={() => { props.exports(rowSelected, grade, differentiate) }}
                                 disabled={user?.username !== 'SuperAdmin' && user?.userResources?.filter(i => i.resourceId === 'ROADMANAGE')[0].isshow === "true" ? true : ''}
@@ -3884,7 +3893,7 @@ const TransporTationTable = (props) => {
                                 >
                                     导出
                                 </Button>
-                            </Popconfirm>
+                            </Popconfirm>,
                         ],
                     }}
                 >
diff --git a/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js b/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js
index 4fcbd1aa..28d119a7 100644
--- a/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js
+++ b/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js
@@ -61,6 +61,7 @@ const DetailForm = (props) => {
         { key: '修复端头（块）', name: 'endHeadRepair' },
         { key: '其他养护内容', name: 'otherDescription' },
         { key: '养护前图片', name: 'conserveBeforePic' },
+        { key: '养护中图片', name: 'conserveUnderwayPic' },
         { key: '养护后图片', name: 'conserveAfterPic' },
         { key: '上报视频', name: 'videoUrl' },
 
diff --git a/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js b/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js
index ceb389b5..c2d5009f 100644
--- a/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js
+++ b/web/client/src/sections/quanju/containers/footer/build/Leftbottom.js
@@ -17,9 +17,15 @@ function Leftbottom(props) {
     "rgba(4,251,240,0.5)",
   ]
   const safetyData = [
-  {name: '县道', value: 72},
-  {name: '乡道', value: 17},
-  {name: '村道', value: 4},
+    { name: '县道', value: 72 },
+    { name: '乡道', value: 17 },
+    { name: '村道', value: 4 },
+  ]
+  //写死数据
+  const dataNo = [
+    { name: '县', value: 207.8 },
+    { name: '乡', value: 680.5 },
+    { name: '村', value: 1800.7 },
   ]
   const chartTitle = '道路总公里';
   const title = '基础设施安全监测版块';
@@ -34,7 +40,7 @@ function Leftbottom(props) {
       value: d.value
     })
   })
-  
+
   // let safetyOption = {
   //   tooltip: {
   //     show: true,
@@ -63,7 +69,7 @@ function Leftbottom(props) {
   //   //         fontSize: 12,
   //   //         fontWeight:500,
   //   //         color:'#E9F7FF',
- 
+
   //   //     }
   //   // },
   //   legend: [
@@ -141,60 +147,60 @@ function Leftbottom(props) {
       },
       formatter: (values) => `${values.seriesName}<br /> ${values.marker} ${values.name}<b>${values.value}</b>公里`,
     },
-//      title: {
-//    text:total,//主标题文本
-//    left:'20%',
-//   //  top:'35%',
-//      subtext:chartTitle,//副标题文本
-//      textStyle:{
-//        fontFamily : "YouSheBiaoTiHei",
-//        fontSize: 20,
-//        color:'#FFFFFF',
-//        marginLeft:'20%',
-//        align:'center'
-//        },
-//        subtextStyle:{
-//          fontFamily : "PingFangSC-Medium PingFang SC",
-//          fontSize: 12,
-//          fontWeight:500,
-//          color:'#E9F7FF',
-//          align:'center'
+    //      title: {
+    //    text:total,//主标题文本
+    //    left:'20%',
+    //   //  top:'35%',
+    //      subtext:chartTitle,//副标题文本
+    //      textStyle:{
+    //        fontFamily : "YouSheBiaoTiHei",
+    //        fontSize: 20,
+    //        color:'#FFFFFF',
+    //        marginLeft:'20%',
+    //        align:'center'
+    //        },
+    //        subtextStyle:{
+    //          fontFamily : "PingFangSC-Medium PingFang SC",
+    //          fontSize: 12,
+    //          fontWeight:500,
+    //          color:'#E9F7FF',
+    //          align:'center'
 
-//     }
-// },
-legend: {
-  orient: "vertical",
-  itemWidth: 10,
-  itemHeight: 10,
-  // right: '30%',
-  right: '10%',
-  top: 'center',
-  align: 'left',
-  data: name,
-  formatter: (name) => {
-    for (let i = 0; i < option.series[1].data.length; i += 1) {
-      if (name === option.series[1].data[i].name) {
-        let arr = [`{a|${name}}`, `{b|${option.series[1].data[i].value}}`]
-        return arr.join('\t');
-      }
-    }
-  },
-  textStyle: {
-    rich: {
-      a: {
-        color: '#E9F7FF',
-        fontSize: 14,
-        padding:[0,10]
-      },
-      b: {
-        fontSize: 16,
-        fontFamily: 'YouSheBiaoTiHei',
-        color: '#fff',
-        padding:[0,0,0,12]
+    //     }
+    // },
+    legend: {
+      orient: "vertical",
+      itemWidth: 10,
+      itemHeight: 10,
+      // right: '30%',
+      right: '10%',
+      top: 'center',
+      align: 'left',
+      data: name,
+      formatter: (name) => {
+        for (let i = 0; i < option.series[1].data.length; i += 1) {
+          if (name === option.series[1].data[i].name) {
+            let arr = [`{a|${name}}`, `{b|${option.series[1].data[i].value}}`]
+            return arr.join('\t');
+          }
+        }
       },
-    }
-  }
-},
+      textStyle: {
+        rich: {
+          a: {
+            color: '#E9F7FF',
+            fontSize: 14,
+            padding: [0, 10]
+          },
+          b: {
+            fontSize: 16,
+            fontFamily: 'YouSheBiaoTiHei',
+            color: '#fff',
+            padding: [0, 0, 0, 12]
+          },
+        }
+      }
+    },
     grid: {
       left: '10%'
     },
@@ -229,7 +235,8 @@ legend: {
         label: {
           show: false
         },
-        data: data,
+        data: dataNo,
+        // data: data,
       },
     ],
   };
@@ -262,23 +269,24 @@ legend: {
     //   highlightPie();
     // }
     // let changePieInterval = setInterval(selectPie, 1000);
-      
+
     myChart.onChartReady = (instance) => {
       chartRef.current.safetyChart = instance;
     }
     myChart.setOption(option);
-    return ()=>{
+    return () => {
       // clearInterval(changePieInterval)
     }
-}, [data]);
+  }, [data]);
 
   return (
     <div className='build-left-bottom'>
-       <span style={{position:"absolute",width:"10%",color:"#FFF",backgroundColor:'rgba(216, 240, 255, 0.1)',right:"5%",textAlign:"center",top:0}}>公里</span>
-     <div className='build-left-bottom-title'>
-        <h2>{total}</h2>
+      <span style={{ position: "absolute", width: "10%", color: "#FFF", backgroundColor: 'rgba(216, 240, 255, 0.1)', right: "5%", textAlign: "center", top: 0 }}>公里</span>
+      <div className='build-left-bottom-title'>
+        <h2>2689.00</h2>
+        {/* <h2>{total}</h2> */}
         <span>道路总公里</span>
-     </div>
+      </div>
       <img src='/assets/images/quanju/chart-circle.png'></img>
       <div ref={chartRef} style={{ width: width || "70%", height: height || "90%" }} id="ech"></div>
     </div>
diff --git a/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js b/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js
index fdc5d7ea..f057bbc5 100644
--- a/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js
+++ b/web/client/src/sections/quanju/containers/footer/build/Rightbottom.js
@@ -4,7 +4,7 @@ import { Col, Progress, Row } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
 // import ReactEcharts from 'echarts-for-react';
 import * as echarts from 'echarts';
-function Rightbottom (props) {
+function Rightbottom(props) {
     const { width, height, total, data, text } = props
     const chartRef = useRef(null);
     const [shuzu, setShuzu] = useState()
@@ -208,16 +208,17 @@ function Rightbottom (props) {
     return (
         <div className='build-right-bottom'>
             <div className='build-right-bottom-item1'>
-                                <div>
-                                    
-                                    <span />
-                                    <span className='sanji'><i style={{color: 'rgba(28,96,254,1)'}}>&#9658;</i>&nbsp;三级及以上</span>
-                                </div>
-                                <div>{sanji[2] + sanji[3] + sanji[4]}</div>
-                            </div>
+                <div>
+
+                    <span />
+                    <span className='sanji'><i style={{ color: 'rgba(28,96,254,1)' }}>&#9658;</i>&nbsp;三级及以上</span>
+                </div>
+                <div>{sanji[2] + sanji[3] + sanji[4]}</div>
+            </div>
             {/* <span style={{position:"absolute",width:"10%",color:"#FFF",backgroundColor:'rgba(216, 240, 255, 0.1)',right:"5%",textAlign:"center",top:0}}>段</span> */}
             <div className='build-right-bottom-title'>
-                <h2>{total || 0}</h2>
+                {/* <h2>{total || 0}</h2> */}
+                <h2>2689.00</h2>
                 <span>道路总公里</span>
             </div>
             {/* <div className='img1'>
@@ -226,16 +227,16 @@ function Rightbottom (props) {
             <div className='img'>
                 <img src='/assets/images/quanju/chart-circle.png' />
             </div>
-            <div /* ref={chartRef} */ style={{ width: width || "70%", height: height || "90%"}} /* id="ech" */>
-                <div  ref={chartRef} style={{ width:  "65%", height:  "90%"}} id="ech"></div>
+            <div /* ref={chartRef} */ style={{ width: width || "70%", height: height || "90%" }} /* id="ech" */>
+                <div ref={chartRef} style={{ width: "65%", height: "90%" }} id="ech"></div>
                 <div className='build-right-bottom-item2'>
-                <div>
-                    
-                    <span />
-                    <span className='siji'><i style={{color:"rgba(4,251,240,1)"}}>&#9658;</i>&nbsp;四级</span>
+                    <div>
+
+                        <span />
+                        <span className='siji'><i style={{ color: "rgba(4,251,240,1)" }}>&#9658;</i>&nbsp;四级</span>
+                    </div>
+                    <div>{siji[0] + siji[1]}</div>
                 </div>
-                <div>{siji[0] + siji[1]}</div>
-            </div>
             </div>
         </div>
     );
diff --git a/web/client/src/sections/quanju/containers/footer/build/index.js b/web/client/src/sections/quanju/containers/footer/build/index.js
index 54a0ef62..42bb3d79 100644
--- a/web/client/src/sections/quanju/containers/footer/build/index.js
+++ b/web/client/src/sections/quanju/containers/footer/build/index.js
@@ -246,6 +246,7 @@ const Build = (props) => {
                         width='100%'
                         height='100%'
                         text='道路总公里'
+                        //total={keepThreeNum(sundata)}
                         total={keepThreeNum(sundata)}
                     //   colorList={colorList}
                     //   underColorList={underColorList}
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
index d4cf5fdd..8ef8046d 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
@@ -104,8 +104,9 @@ const Right = (props) => {
                 <div style={{ width: "100%", height: "43%", position: "relative", left: "1%" }}>
                     <div style={{ width: "96%", position: "relative", left: "2%" }}>
                         {/* <Spin spinning={!roads} tip="Loading" > */}
-                        <p style={{ position: "absolute", color: "rgba(216,240,255,0.8)", top: "10px" }}>占比<span style={{ fontFamily: " PingFangSC-Regular, PingFang SC" }}>{isNaN(((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)) ? "" : ((roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}</span>%</p>
-                        <p style={{ width: "50%", position: "absolute", right: "0%", fontFamily: "YouSheBiaoTiHei", textAlign: "right", fontSize: "24px", color: "#F5FCFF", marginLeft: "10%" }}>{isNaN(roads?.["县"].toFixed(3)) ? "" : roads?.["县"].toFixed(3)}<span style={{ color: "#F5FCFF", fontSize: "16px", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>公里</span><span style={{ fontSize: "18px", color: "rgba(216,240,255,0.8)", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>县道道路</span></p>
+                        <p style={{ position: "absolute", color: "rgba(216,240,255,0.8)", top: "10px" }}>占比<span style={{ fontFamily: " PingFangSC-Regular, PingFang SC" }}>{((207.8 / 2689) * 100).toFixed(2)}</span>%</p>
+                        <p style={{ width: "50%", position: "absolute", right: "0%", fontFamily: "YouSheBiaoTiHei", textAlign: "right", fontSize: "24px", color: "#F5FCFF", marginLeft: "10%" }}>207.8<span style={{ color: "#F5FCFF", fontSize: "16px", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>公里</span><span style={{ fontSize: "18px", color: "rgba(216,240,255,0.8)", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>县道道路</span></p>
+                        {/* <p style={{ width: "50%", position: "absolute", right: "0%", fontFamily: "YouSheBiaoTiHei", textAlign: "right", fontSize: "24px", color: "#F5FCFF", marginLeft: "10%" }}>{isNaN(roads?.["县"].toFixed(3)) ? "" : roads?.["县"].toFixed(3)}<span style={{ color: "#F5FCFF", fontSize: "16px", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>公里</span><span style={{ fontSize: "18px", color: "rgba(216,240,255,0.8)", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>县道道路</span></p> */}
                         {/* </Spin> */}
                     </div>
                     <div style={{ width: "96%", position: "relative", left: "2%", height: "50%" }}>
@@ -116,9 +117,12 @@ const Right = (props) => {
                     </div>
                     <div style={{ width: "96%", position: "relative", left: "2%" }}>
                         {/* <Spin spinning={!roads} tip="Loading" > */}
+                        <p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>乡村道道路<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}></span>2481.2<span style={{ marginLeft: "4%" }}>公里</span></p>
 
-                        <p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>乡村道道路<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}>{isNaN((roads?.["乡"] + roads?.["村"]).toFixed(3)) ? "" : (roads?.["乡"] + roads?.["村"]).toFixed(3)}</span><span style={{ marginLeft: "4%" }}>公里</span></p>
-                        <p style={{ position: "absolute", right: "0", color: "rgba(216,240,255,0.8)", top: "10px" }}>占比<span>{isNaN((((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)) ? "" : (((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}</span><span>%</span></p>
+                        {/* <p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>乡村道道路<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}>{isNaN((roads?.["乡"] + roads?.["村"]).toFixed(3)) ? "" : (roads?.["乡"] + roads?.["村"]).toFixed(3)}</span><span style={{ marginLeft: "4%" }}>公里</span></p> */}
+                        <p style={{ position: "absolute", right: "0", color: "rgba(216,240,255,0.8)", top: "10px" }}>占比<span>{((2481.2 / 2689) * 100).toFixed(2)}</span><span>%</span></p>
+
+                        {/* <p style={{ position: "absolute", right: "0", color: "rgba(216,240,255,0.8)", top: "10px" }}>占比<span>{isNaN((((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)) ? "" : (((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])) * 100).toFixed(2)}</span><span>%</span></p> */}
                         {/* </Spin> */}
 
                     </div>
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/top.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/top.js
index a18262cf..eb227e7b 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/top.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/top.js
@@ -39,7 +39,9 @@ const Leftcenter = (props) => {
                     </div>
                     <div style={{ width: "50%", height: "100%", position: "absolute", left: "50%", top: "11%" }}>
                         <p style={{ fontSize: "2vh", color: "#D8F0FF", fontFamily: "PingFangSC-Regular, PingFang SC", marginTop: "3%" }}>道路统计<span style={{ marginLeft: "10px", color: "rgba(216,240,255,0.8000)" }}>公里</span></p>
-                        <p style={{ fontFamily: "YouSheBiaoTiHei", color: "#ffffff", fontSize: "2.5vh", marginTop: "-2%" }}>{isNaN((list?.["县"] + list?.["乡"] + list?.["村"]).toFixed(3)) ? "" : (list?.["县"] + list?.["乡"] + list?.["村"]).toFixed(3)}</p>
+                        {/* <p style={{ fontFamily: "YouSheBiaoTiHei", color: "#ffffff", fontSize: "2.5vh", marginTop: "-2%" }}>{isNaN((list?.["县"] + list?.["乡"] + list?.["村"]).toFixed(3)) ? "" : (list?.["县"] + list?.["乡"] + list?.["村"]).toFixed(3)}</p> */}
+                        <p style={{ fontFamily: "YouSheBiaoTiHei", color: "#ffffff", fontSize: "2.5vh", marginTop: "-2%" }}>2689</p>
+
                     </div>
                 </div>
                 <div style={{ width: "30%", height: "10vh", backgroundColor: "", position: "relative", left: "35%", top: "-105%" }} onClick={() => {
@@ -67,7 +69,9 @@ const Leftcenter = (props) => {
                     </div>
                     <div style={{ width: "50%", height: "100%", position: "absolute", left: "50%", top: "8%" }}>
                         <p style={{ fontSize: "2vh", color: "#D8F0FF", fontFamily: "PingFangSC-Regular, PingFang SC", marginTop: "3%" }}>桥梁统计<span style={{ fontSize: "14px", marginLeft: "10px", color: "rgba(216,240,255,0.8000)" }}>座</span></p>
-                        <p style={{ fontFamily: "YouSheBiaoTiHei", color: "#00F1FF", fontSize: "2.5vh", marginTop: "-2%" }}>{isNaN((bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])) ? "" : (bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])}</p>
+                        <p style={{ fontFamily: "YouSheBiaoTiHei", color: "#00F1FF", fontSize: "2.5vh", marginTop: "-2%" }}>165</p>
+
+                        {/* <p style={{ fontFamily: "YouSheBiaoTiHei", color: "#00F1FF", fontSize: "2.5vh", marginTop: "-2%" }}>{isNaN((bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])) ? "" : (bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])}</p> */}
                     </div>
                 </div>
             </div>

From 245da262b2050b53cfb99f0915b75c94be1e3bd4 Mon Sep 17 00:00:00 2001
From: zhaobing <zhao.bing@free-sun.com.cn>
Date: Fri, 4 Aug 2023 17:09:41 +0800
Subject: [PATCH 12/21] =?UTF-8?q?feat:report=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/1.3.0/schema/6.update_report.sql | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 scripts/1.3.0/schema/6.update_report.sql

diff --git a/scripts/1.3.0/schema/6.update_report.sql b/scripts/1.3.0/schema/6.update_report.sql
new file mode 100644
index 00000000..da99eb71
--- /dev/null
+++ b/scripts/1.3.0/schema/6.update_report.sql
@@ -0,0 +1,4 @@
+alter table report
+    add handle_opinions varchar(1024);
+
+comment on column report.handle_opinions is '处理意见';
\ No newline at end of file

From 021cb01f02082ab95672952e01bf206526f0e604 Mon Sep 17 00:00:00 2001
From: zhaobing <zhao.bing@free-sun.com.cn>
Date: Fri, 4 Aug 2023 17:13:00 +0800
Subject: [PATCH 13/21] =?UTF-8?q?feat=EF=BC=9Afix=20bugs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/fillion/components/patrolTable.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js
index bdab013e..efbb9d50 100644
--- a/web/client/src/sections/fillion/components/patrolTable.js
+++ b/web/client/src/sections/fillion/components/patrolTable.js
@@ -998,11 +998,7 @@ const PatrolTable = (props) => {
 };
 
 function mapStateToProps(state) {
-<<<<<<< Updated upstream
     const { auth, depMessage, userList, reportList, reportDetail, global, allDepUsers, anspectionNotificationPhoneList } = state;
-=======
-    const { auth, depMessage, userList, reportList, reportDetail, global, allDepUsers } = state;
->>>>>>> Stashed changes
     const pakData = (dep) => {
         return dep.map((d) => {
             return {

From 1ee5ab3fcb9d22c7629846a725e2385deac8c242 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 17:22:57 +0800
Subject: [PATCH 14/21] =?UTF-8?q?fix=20=E5=85=AC=E4=BA=A4=E8=BF=90?=
 =?UTF-8?q?=E8=90=A5=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sections/quanju/containers/footer/operation/right.js    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/client/src/sections/quanju/containers/footer/operation/right.js b/web/client/src/sections/quanju/containers/footer/operation/right.js
index 81d3924c..f1ce70d2 100644
--- a/web/client/src/sections/quanju/containers/footer/operation/right.js
+++ b/web/client/src/sections/quanju/containers/footer/operation/right.js
@@ -79,7 +79,7 @@ const Right = ({ busRunTime }) => {
                         slidesToShow={4}
                     >
                         {
-                            busRunTimeList.map((b, i) => {
+                            busRunTimeList.map((d, index) => {
                                 return (
                                     <div key={index} style={{ width: '100%', height: '40%' }}>
                                         <div className='busInformation'>
@@ -92,9 +92,9 @@ const Right = ({ busRunTime }) => {
                                             </span>
                                             <span>
                                                 <h3>发车时间</h3>
-                                                <h4>{d.lastDepTime}</h4>
+                                                <h5>{d.lastDepTime}</h5>
                                             </span>
-                                            <span>
+                                            <span style={{ position: 'relative', left: '21%' }}>
                                                 <h3>司机</h3>
                                                 <h5>{d.employeeName}</h5>
                                                 <h3>工号</h3>

From a49b7a0b1d7289da46d06eb30bac30bba18d3d75 Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 17:31:57 +0800
Subject: [PATCH 15/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=AF=E6=94=BF?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fillion/components/luzhengmodel.js        |  14 +-
 .../sections/fillion/components/uploads.js    | 328 ++++++++++++++++++
 .../sections/fillion/containers/luzheng.js    |  21 +-
 3 files changed, 349 insertions(+), 14 deletions(-)
 create mode 100644 web/client/src/sections/fillion/components/uploads.js

diff --git a/web/client/src/sections/fillion/components/luzhengmodel.js b/web/client/src/sections/fillion/components/luzhengmodel.js
index 57d96842..eaf98008 100644
--- a/web/client/src/sections/fillion/components/luzhengmodel.js
+++ b/web/client/src/sections/fillion/components/luzhengmodel.js
@@ -6,13 +6,13 @@ 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'
-
+// import Uploads from '../../../components/Upload/index'
+import Uploads from './uploads'
 const { Option } = Select;
 
 const LuzhengModel = ({ editData, check, visible, onCancel, dispatch }) => {
     const [form] = Form.useForm();
-
+    console.log(editData,'editData')
     return (
         <Modal
             title="路政信息"
@@ -75,19 +75,21 @@ const LuzhengModel = ({ editData, check, visible, onCancel, dispatch }) => {
                     <DatePicker/>
                 </Form.Item>
 
-                <Form.Item name="roadname" label="执法道路" rules={[{ required: true, message: '请填写' }]}>
+                <Form.Item name="roadname" label="执法道路" rules={[{ required: true, message: '请填写' },{ max: 100, message: '不可超过一百个字符' }]}>
                     <Input/>
                 </Form.Item>
 
-                <Form.Item name="enforcementreslt" label="执法成果" rules={[{ required: true, message: '请填写' }]}>
+                <Form.Item name="enforcementreslt" label="执法成果" rules={[{ required: true, message: '请填写' },{ max: 100, message: '不可超过一百个字符' }]}>
                     <Input/>
                 </Form.Item>
 
                 <Form.Item name="picfile" label="执法图片">
                 <Uploads
-                           maxFilesNum={1}
+                           maxFilesNum={3}
                            fileTypes={['png','jpg','jpeg']}
                            maxFileSize={200}
+                           fileList={editData?.picfile}
+                           listType ={'picture-card'} 
                         />
                 </Form.Item>
             </Form>
diff --git a/web/client/src/sections/fillion/components/uploads.js b/web/client/src/sections/fillion/components/uploads.js
new file mode 100644
index 00000000..09226232
--- /dev/null
+++ b/web/client/src/sections/fillion/components/uploads.js
@@ -0,0 +1,328 @@
+'use strict';
+
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { Spin, Upload, message, Modal, Card, Button } from 'antd';
+import moment from 'moment';
+import { PlusOutlined, UploadOutlined, CloseOutlined } from '@ant-design/icons';
+
+class Uploads extends Component {
+    constructor(props) {
+        super(props);
+        this.ApiRoot = localStorage.getItem('tyApiRoot')
+        this.state = {
+            fileUploading: false,
+            fileList: [],
+            curPreviewPic: '',
+            delPicIng: false,
+            removeFilesList: []
+        };
+    }
+
+    dealName = (uploaded) => {
+        console.log(uploaded)
+        let realName = uploaded.split('/')[2]
+        let x1 = realName.split('.')
+        let x2 = x1[0].split('_')
+        let showName = `${x2[0]}.${x1[1]}`
+        return showName
+    }
+
+    setFileList = (value) => {
+        console.log(value,'value')
+        let defaultFileList = [];
+        defaultFileList = value.map((u, index) => {
+            let fileUrl = `${u.url}`;
+            return {
+                uid: -index - 1,
+                name: this.dealName(u.url),
+                status: 'done',
+                storageUrl: u.url,
+                url: fileUrl
+            };
+        });
+        // onChange(defaultFileList)
+        this.setState({
+            fileList: defaultFileList
+        });
+    };
+
+    componentDidMount () {
+        const { value } = this.props;
+        if (value) {
+            this.setFileList(value);
+        }
+    }
+
+    componentWillReceiveProps (np) {
+        const { dispatch, value: thisEditData, onChange } = this.props;
+        const { value: nextEditData, clearFileList } = np;
+        console.log(np,'npp')
+        const setFileList = () => {
+            let defaultFileList = [];
+            defaultFileList = nextEditData.map((u, index) => {
+                let fileUrl = `${u.storageUrl}`;
+                return {
+                    uid: -index - 1,
+                    name: this.dealName(u.storageUrl),
+                    status: 'done',
+                    storageUrl: u.storageUrl,
+                    url: fileUrl,
+                    size: u.size || -1
+                };
+            });
+            this.setState({
+                fileList: defaultFileList
+            });
+        };
+
+        if (nextEditData && nextEditData.length) {
+            if (!thisEditData || !this.state.fileList.length) {
+                setFileList();
+            } else if (nextEditData.length != thisEditData.length) {
+                setFileList();
+            } else {
+                let repeat = true;
+                for (let i = 0; i < thisEditData.length; i++) {
+                    if (thisEditData[i] != nextEditData[i]) {
+                        repeat = false;
+                        break;
+                    }
+                }
+                if (!repeat) {
+                    setFileList();
+                }
+            }
+        }
+
+
+        if (clearFileList) {
+            this.setState({
+                fileList: []
+            });
+        }
+
+
+        // else{
+        //     this.setState({
+        //         fileList:[],
+        //     })
+        // }
+    }
+
+    render () {
+        const UploadPath = {
+            project: ['txt', 'dwg', 'doc', 'docx', 'xls', 'xlsx', 'pdf', 'png', 'jpg', 'rar', 'zip'],
+            report: ['doc', 'docx', 'xls', 'xlsx', 'pdf'],
+            data: ['txt', 'xls', 'xlsx'],
+            image: ['png', 'jpg', 'svg', 'jpeg'],
+            three: ['js'],
+            video: ['mp4']
+        };
+        /**
+         * uploadType 【string】 主要区别文件上传路径 以及类型 以 web/routes/attachment/index.js 中 UploadPath 的 key 值为准；默认 project；
+         * disabled 【boolean】 上传是否可用
+         * maxFilesNum 【number】 最大上传数量
+         * fileTypes 【array[string]】 可允许上传的文件类型；
+         * maxFileSize 【number】 单个文件最大大小 M
+         * listType 【antd】 upload 组件的属性
+         * onChange 【function】 文件数量变化时候回调 返回文件
+         * value 【array[obj]】 编辑数据 [{url:'xxx', [size:999]}]
+         * onStateChange 【function】 文件状态改变回调函数 上传中 return { uploading:true/false }
+         */
+        const {
+            uploadType,
+            disabled,
+            maxFilesNum,
+            fileTypes,
+            maxFileSize,
+            listType,
+            onChange,
+            value,
+            showUploadList,
+            onStateChange
+        } = this.props;
+        const { fileList, curPreviewPic, delPicIng, removeFilesList } = this.state;
+        const that = this;
+        let uploadType_ = uploadType || 'project';
+        let maxFilesNum_ = maxFilesNum || 1;
+        let defaultFileTypes = fileTypes || UploadPath[uploadType_];
+        const uploadProps = {
+            name: 'checkFile_',
+            multiple: false,
+            showUploadList: showUploadList || true,
+            action: `attachments/${uploadType_}`,
+            listType: listType || 'text',
+            disabled: disabled,
+            beforeUpload: (file) => {
+                if (fileList.length >= maxFilesNum_) {
+                    message.warning(`最多选择${maxFilesNum_}个文件上传`);
+                    return false;
+                }
+                if (file.name.length > 60) {
+                    message.warning(`文件名过长(大于60字符)，请修改后上传`);
+                    return false;
+                }
+                const extNames = file.name.split('.');
+                var reg = /^[\.\s\u4e00-\u9fa5a-zA-Z0-9_-]{0,}$/;
+                if (!reg.exec(file.name)) {
+                    message.warning(`文件名包含除字母、汉字、数字、中划线、下划线之外的字符，请修改后上传`);
+                    return false;
+                }
+                let isDAE = false;
+                if (extNames.length > 0) {
+                    let fileType = extNames[extNames.length - 1].toLowerCase();
+                    isDAE = defaultFileTypes.some((f) => f == fileType);
+                }
+                if (!isDAE) {
+                    message.error(`只能上传 ${defaultFileTypes.join()} 格式的文件!`);
+                    return false;
+                }
+                const isLt = file.size / 1024 / 1024 < (maxFileSize || 3);
+                if (!isLt) {
+                    message.error(`文件必须小于${maxFileSize || 3}MB!`);
+                    return false;
+                }
+                this.setState({
+                    fileUploading: true
+                });
+                if (onStateChange) {
+                    onStateChange({ uploading: true });
+                }
+            },
+            onChange (info) {
+                const status = info.file.status;
+                if (status === 'uploading') {
+                    that.setState({
+                        fileList: info.fileList
+                    });
+                }
+                if (status === 'done') {
+                    let { uploaded, url } = info.file.response;
+                    let size = info.file.size;
+                    let nextFileList = fileList;
+                    nextFileList[nextFileList.length - 1] = {
+                        uid: -moment().unix(),
+                        name: that.dealName(uploaded),
+                        status: 'done',
+                        storageUrl: uploaded,
+                        url: url,
+                        size: size
+                    };
+                    onChange(nextFileList);
+                    that.setState({
+                        fileUploading: false,
+                        fileList: nextFileList
+                    });
+                    if (onStateChange) {
+                        onStateChange({ uploading: false });
+                    }
+                } else if (status === 'error') {
+                    that.setState({
+                        fileUploading: false
+                    });
+                    message.error(`${info.file.name} 上传失败，请重试`);
+                    if (onStateChange) {
+                        onStateChange({ uploading: false });
+                    }
+                }
+            },
+            onRemove (file) {
+                let nextFileList = [];
+                fileList.map((f, i) => {
+                    if (f.uid != file.uid) {
+                        nextFileList.push(f);
+                    }
+                });
+                let nextRemoveFiles = removeFilesList.concat([file.storageUrl]);
+                if (curPreviewPic == file.url) {
+                    that.setState({
+                        curPreviewPic: ''
+                    });
+                }
+                onChange(nextFileList);
+                that.setState({
+                    fileList: nextFileList,
+                    removeFilesList: nextRemoveFiles
+                });
+            },
+            onPreview (file) {
+                console.log(file,'file')
+                let filePostfix = file.url.split('.').pop();
+                filePostfix = filePostfix.toLowerCase();
+                if (UploadPath.image.some((img) => img == filePostfix)) {
+                    that.setState({
+                        curPreviewPic: file.url
+                    });
+                } else {
+                    message.warn('仅支持图片预览');
+                }
+            }
+        };
+
+        let fileList_ = fileList
+        // .map(f => {
+        //     if (f.storageUrl) {
+        //         let realName = f.storageUrl.split('/').pop()
+        //         if (f.name != realName) {
+        //             f.name = realName
+        //         }
+        //     }
+        //     return f
+        // })
+        console.log('fileList_：', fileList_);
+        return (
+            <div>
+                <Spin spinning={delPicIng}>
+                    <Upload {...uploadProps} fileList={fileList_}>
+                        {
+                            disabled ? (
+                                ''
+                            ) :
+                                listType == 'picture-card' ?
+                                    (
+                                        fileList.length >= maxFilesNum_ ? null : (
+                                            <div style={{}}>
+                                                <PlusOutlined />
+                                                <div>上传图片</div>
+                                            </div>
+                                        )
+                                    ) : (
+                                        <Button disabled={fileList.length >= maxFilesNum_} icon={<UploadOutlined />}>  文件上传 </Button>
+                                    )
+                        }
+                    </Upload>
+                    {
+                        curPreviewPic ? (
+                            <Card
+                                bodyStyle={{
+                                    padding: 8
+                                }}
+                            >
+                                <div style={{ marginBottom: 8 }} >
+                                    <span>文件预览</span>
+                                    <span
+                                        style={{ float: 'right' }}
+                                        onClick={() => { this.setState({ curPreviewPic: '' }); }}
+                                    >
+                                        <CloseOutlined style={{ fontSize: 20 }} />
+                                    </span>
+                                </div>
+                                <img style={{ width: '100%' }} src={curPreviewPic}></img>
+                            </Card>
+                        ) : ''
+                    }
+                </Spin>
+            </div>
+        );
+    }
+}
+
+function mapStateToProps (state) {
+    const { auth } = state
+    return {
+        user: auth.user
+    };
+}
+
+export default connect(mapStateToProps)(Uploads);
diff --git a/web/client/src/sections/fillion/containers/luzheng.js b/web/client/src/sections/fillion/containers/luzheng.js
index 584d558a..f158e243 100644
--- a/web/client/src/sections/fillion/containers/luzheng.js
+++ b/web/client/src/sections/fillion/containers/luzheng.js
@@ -106,12 +106,17 @@ function Assess(props) {
                     dataIndex: 'picfile',
                     key: 'picfile',
                     render:(t,r)=>{
-                       return r?.picfile?.map(i=>{
-                            return  <Image
-                            width={200}
-                            src={i?.storageUrl}
-                          />
+                      
+                        
+                        return r?.picfile?.map(i=>{
+                            return <span style={{marginRight:10}}>
+                                <Image src={i?.url} width={80}/>
+                            </span>
                         })
+                      
+                      
+                          
+                        
                        
                     }
                 },
@@ -128,8 +133,8 @@ function Assess(props) {
                             <Button type="link" onClick={() => {
                                 setAssessModalVisible(true)
                                 setEditData(record)
-                                disabled = { editAble }
-                            }}>编辑</Button>
+                                
+                            }} disabled = { editAble }>编辑</Button>
                             <Popconfirm
                                 title="确定删除此条数据吗?"
                                 onConfirm={() => {
@@ -166,7 +171,7 @@ function Assess(props) {
                 search={false}
             />
             {
-                assessModalVisible ? <AssessModal check={isCheck} visible={assessModalVisible} editData={editData} onCancel={() => {
+               assessModalVisible && editData ? <AssessModal check={isCheck} visible={assessModalVisible} editData={editData} onCancel={() => {
                     getData()
                     setIsCheck(false)
                     setEditData(null)

From 00dd0ed88f8bcc1cb3263921b007fd40080c7962 Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 17:33:40 +0800
Subject: [PATCH 16/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=AF=E6=94=BF?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/fillion/components/luzhengmodel.js | 1 -
 web/client/src/sections/fillion/components/uploads.js      | 1 +
 web/client/src/sections/fillion/containers/luzheng.js      | 2 --
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/client/src/sections/fillion/components/luzhengmodel.js b/web/client/src/sections/fillion/components/luzhengmodel.js
index eaf98008..72cabb2b 100644
--- a/web/client/src/sections/fillion/components/luzhengmodel.js
+++ b/web/client/src/sections/fillion/components/luzhengmodel.js
@@ -82,7 +82,6 @@ const LuzhengModel = ({ editData, check, visible, onCancel, dispatch }) => {
                 <Form.Item name="enforcementreslt" label="执法成果" rules={[{ required: true, message: '请填写' },{ max: 100, message: '不可超过一百个字符' }]}>
                     <Input/>
                 </Form.Item>
-
                 <Form.Item name="picfile" label="执法图片">
                 <Uploads
                            maxFilesNum={3}
diff --git a/web/client/src/sections/fillion/components/uploads.js b/web/client/src/sections/fillion/components/uploads.js
index 09226232..50686cf4 100644
--- a/web/client/src/sections/fillion/components/uploads.js
+++ b/web/client/src/sections/fillion/components/uploads.js
@@ -261,6 +261,7 @@ class Uploads extends Component {
         };
 
         let fileList_ = fileList
+        
         // .map(f => {
         //     if (f.storageUrl) {
         //         let realName = f.storageUrl.split('/').pop()
diff --git a/web/client/src/sections/fillion/containers/luzheng.js b/web/client/src/sections/fillion/containers/luzheng.js
index f158e243..780b1257 100644
--- a/web/client/src/sections/fillion/containers/luzheng.js
+++ b/web/client/src/sections/fillion/containers/luzheng.js
@@ -106,8 +106,6 @@ function Assess(props) {
                     dataIndex: 'picfile',
                     key: 'picfile',
                     render:(t,r)=>{
-                      
-                        
                         return r?.picfile?.map(i=>{
                             return <span style={{marginRight:10}}>
                                 <Image src={i?.url} width={80}/>

From 3597e00fed80ac376c0e27c68b4efbf26c2da22a Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 17:36:38 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/fillion/containers/luzheng.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/client/src/sections/fillion/containers/luzheng.js b/web/client/src/sections/fillion/containers/luzheng.js
index 780b1257..7faf9b13 100644
--- a/web/client/src/sections/fillion/containers/luzheng.js
+++ b/web/client/src/sections/fillion/containers/luzheng.js
@@ -169,7 +169,7 @@ function Assess(props) {
                 search={false}
             />
             {
-               assessModalVisible && editData ? <AssessModal check={isCheck} visible={assessModalVisible} editData={editData} onCancel={() => {
+               assessModalVisible ? <AssessModal check={isCheck} visible={assessModalVisible} editData={editData} onCancel={() => {
                     getData()
                     setIsCheck(false)
                     setEditData(null)

From e0b36b3436f22f891c841d3b2527ef5f5784336f Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 17:44:00 +0800
Subject: [PATCH 18/21] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/sections/fillion/components/luzhengmodel.js   |  1 +
 web/client/src/sections/fillion/components/uploads.js | 11 ++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/web/client/src/sections/fillion/components/luzhengmodel.js b/web/client/src/sections/fillion/components/luzhengmodel.js
index 72cabb2b..292e87a2 100644
--- a/web/client/src/sections/fillion/components/luzhengmodel.js
+++ b/web/client/src/sections/fillion/components/luzhengmodel.js
@@ -89,6 +89,7 @@ const LuzhengModel = ({ editData, check, visible, onCancel, dispatch }) => {
                            maxFileSize={200}
                            fileList={editData?.picfile}
                            listType ={'picture-card'} 
+                           isedit={editData?true:false}
                         />
                 </Form.Item>
             </Form>
diff --git a/web/client/src/sections/fillion/components/uploads.js b/web/client/src/sections/fillion/components/uploads.js
index 50686cf4..782fc311 100644
--- a/web/client/src/sections/fillion/components/uploads.js
+++ b/web/client/src/sections/fillion/components/uploads.js
@@ -18,7 +18,7 @@ class Uploads extends Component {
             removeFilesList: []
         };
     }
-
+    
     dealName = (uploaded) => {
         console.log(uploaded)
         let realName = uploaded.split('/')[2]
@@ -29,7 +29,6 @@ class Uploads extends Component {
     }
 
     setFileList = (value) => {
-        console.log(value,'value')
         let defaultFileList = [];
         defaultFileList = value.map((u, index) => {
             let fileUrl = `${u.url}`;
@@ -57,11 +56,11 @@ class Uploads extends Component {
     componentWillReceiveProps (np) {
         const { dispatch, value: thisEditData, onChange } = this.props;
         const { value: nextEditData, clearFileList } = np;
-        console.log(np,'npp')
+
         const setFileList = () => {
             let defaultFileList = [];
             defaultFileList = nextEditData.map((u, index) => {
-                let fileUrl = `${u.storageUrl}`;
+                let fileUrl = `${this.ApiRoot}/${u.storageUrl}`;
                 return {
                     uid: -index - 1,
                     name: this.dealName(u.storageUrl),
@@ -151,7 +150,7 @@ class Uploads extends Component {
             name: 'checkFile_',
             multiple: false,
             showUploadList: showUploadList || true,
-            action: `attachments/${uploadType_}`,
+            action: `${this.ApiRoot}/attachments/${uploadType_}`,
             listType: listType || 'text',
             disabled: disabled,
             beforeUpload: (file) => {
@@ -247,7 +246,6 @@ class Uploads extends Component {
                 });
             },
             onPreview (file) {
-                console.log(file,'file')
                 let filePostfix = file.url.split('.').pop();
                 filePostfix = filePostfix.toLowerCase();
                 if (UploadPath.image.some((img) => img == filePostfix)) {
@@ -261,7 +259,6 @@ class Uploads extends Component {
         };
 
         let fileList_ = fileList
-        
         // .map(f => {
         //     if (f.storageUrl) {
         //         let realName = f.storageUrl.split('/').pop()

From 51cfccbaf8d5a4f3f08177281783293b26d62459 Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 17:50:42 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/sections/fillion/containers/luzheng.js    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/web/client/src/sections/fillion/containers/luzheng.js b/web/client/src/sections/fillion/containers/luzheng.js
index 7faf9b13..5158c3e7 100644
--- a/web/client/src/sections/fillion/containers/luzheng.js
+++ b/web/client/src/sections/fillion/containers/luzheng.js
@@ -106,11 +106,16 @@ function Assess(props) {
                     dataIndex: 'picfile',
                     key: 'picfile',
                     render:(t,r)=>{
-                        return r?.picfile?.map(i=>{
-                            return <span style={{marginRight:10}}>
-                                <Image src={i?.url} width={80}/>
-                            </span>
-                        })
+                            if(r?.picfile){
+                                return r?.picfile?.map(i=>{
+                                    return <span style={{marginRight:10}}>
+                                        <Image src={i?.url} width={80}/>
+                                    </span>
+                                })
+                            }else{
+                                return '--'
+                            }
+                       
                       
                       
                           

From cd731a579a7edbb0cf040182d2e1f5269d39545a Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 18:00:30 +0800
Subject: [PATCH 20/21] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B7=AF=E6=94=BF?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/fillion/containers/luzheng.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/web/client/src/sections/fillion/containers/luzheng.js b/web/client/src/sections/fillion/containers/luzheng.js
index 5158c3e7..b2153fac 100644
--- a/web/client/src/sections/fillion/containers/luzheng.js
+++ b/web/client/src/sections/fillion/containers/luzheng.js
@@ -38,6 +38,7 @@ function Assess(props) {
     const [datasource,setdatasource] = useState([])
     const [dateRange, setDateRange] = useState(['1970-1-1', '2099-12-31']);
     const { RangePicker } = DatePicker
+    const [total,settotal]= useState(0)
     const [editAble, setEditAble] = useState(user?.username !== 'SuperAdmin' && user?.userResources?.find(i => i.resourceId === 'ASSESSMANAGE')?.isshow === "true" ? true : '')
     useEffect(() => {
         
@@ -53,6 +54,7 @@ function Assess(props) {
         dispatch(getRoadadministration(query)).then(res => {
             if(res?.success){
                 setdatasource(res?.payload?.data?.rows)
+                settotal(res?.payload?.data?.count)
                 setLoading(false)
             }
         })
@@ -63,8 +65,8 @@ function Assess(props) {
             <div style={{ marginBottom: '20px', display: 'flex', justifyContent: 'space-between' }}>
                 <Form layout="inline" onFinish={(v) => {
                    
-                    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') })
+                    setQuery({ ...query, page:1,unit: v.unit,startTime : v?.time && moment(v?.time[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+                    endTime : v?.time && moment(v?.time[1]).add(1, 'days').endOf('day').format('YYYY-MM-DD HH:mm:ss') })
                 }}>
                    
 
@@ -158,7 +160,7 @@ function Assess(props) {
                 dataSource={datasource || []}
                 loading={loading}
                 pagination={{
-                    total: assess?.count || 0,
+                    total: total || 0,
                     pageSize: 10,
                     defaultPageSize: 10,
                     showSizeChanger: false,

From d5cbc15662852a59d137f03eb53e47cd2932435c Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 18:03:09 +0800
Subject: [PATCH 21/21] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/fillion/containers/luzheng.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/client/src/sections/fillion/containers/luzheng.js b/web/client/src/sections/fillion/containers/luzheng.js
index b2153fac..57cba564 100644
--- a/web/client/src/sections/fillion/containers/luzheng.js
+++ b/web/client/src/sections/fillion/containers/luzheng.js
@@ -108,7 +108,7 @@ function Assess(props) {
                     dataIndex: 'picfile',
                     key: 'picfile',
                     render:(t,r)=>{
-                            if(r?.picfile){
+                            if(r?.picfile && r?.picfile?.length!==0){
                                 return r?.picfile?.map(i=>{
                                     return <span style={{marginRight:10}}>
                                         <Image src={i?.url} width={80}/>