From 1f2cd35dd0724e859dbba52bf35299f9c2985d63 Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 19:31:34 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E8=B7=AF=E6=94=BF=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E9=9D=A2?=
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, 6 insertions(+), 2 deletions(-)

diff --git a/web/client/src/sections/fillion/containers/luzheng.js b/web/client/src/sections/fillion/containers/luzheng.js
index 57cba564..01fc708b 100644
--- a/web/client/src/sections/fillion/containers/luzheng.js
+++ b/web/client/src/sections/fillion/containers/luzheng.js
@@ -51,7 +51,8 @@ function Assess(props) {
 
     const getData = () => {
         setLoading(true)
-        dispatch(getRoadadministration(query)).then(res => {
+        console.log(query,'query')
+        dispatch(getRoadadministration({...query})).then(res => {
             if(res?.success){
                 setdatasource(res?.payload?.data?.rows)
                 settotal(res?.payload?.data?.count)
@@ -146,8 +147,10 @@ function Assess(props) {
                                     setLoading(true)
                                     dispatch(delRoadadministration(record.id)).then(res => {
                                         setLoading(false)
+                                        
                                         if (res.success) {
-                                            getData()
+                                            setQuery({...query, page: 1, pageSize: 10, limit: 10})
+                                            // getData(page)
                                         }
                                     })
                                 }}
@@ -165,6 +168,7 @@ function Assess(props) {
                     defaultPageSize: 10,
                     showSizeChanger: false,
                     onChange: (page, pageSize) => {
+                        console.log(page,'page')
                         setQuery({
                             ...query,
                             page, limit: pageSize

From f50bf1b949178ca6cf4d6ffc45fc61155452a478 Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 19:33:18 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E8=B7=AF=E6=94=BF=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=AC=AC=E4=B8=80=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/web/client/src/sections/fillion/containers/luzheng.js b/web/client/src/sections/fillion/containers/luzheng.js
index 01fc708b..d09f3825 100644
--- a/web/client/src/sections/fillion/containers/luzheng.js
+++ b/web/client/src/sections/fillion/containers/luzheng.js
@@ -147,7 +147,6 @@ function Assess(props) {
                                     setLoading(true)
                                     dispatch(delRoadadministration(record.id)).then(res => {
                                         setLoading(false)
-                                        
                                         if (res.success) {
                                             setQuery({...query, page: 1, pageSize: 10, limit: 10})
                                             // getData(page)

From 06b074ab32f354aff50203e61e1fea93dabd9c37 Mon Sep 17 00:00:00 2001
From: liujiangyong <liu.jiangyong@free-sun.com.cn>
Date: Fri, 4 Aug 2023 19:47:17 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E4=BA=8B=E9=A1=B9=20?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8-=E8=B4=A3=E4=BB=BB=E4=BA=BA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 weapp/src/packages/patrol/index.jsx | 83 ++++++++++++-----------------
 1 file changed, 35 insertions(+), 48 deletions(-)

diff --git a/weapp/src/packages/patrol/index.jsx b/weapp/src/packages/patrol/index.jsx
index 1cfbe228..aad264a0 100644
--- a/weapp/src/packages/patrol/index.jsx
+++ b/weapp/src/packages/patrol/index.jsx
@@ -1443,53 +1443,36 @@ const Index = () => {
           {
             isSuperAdmin && (wait === 'wait' || kind === 'handle') && <View className='appoint'>
               {
-                handleState === '待处理' ? // 管理员指派
-                  <>
-                    <RadioGroup onChange={(e) => {
-                      setIsAppoint(e.detail.value === '指派' ? true : false)
-                    }}>
-                      <Radio value='指派' checked={isAppoint} color='#0080EE' className='radio'>指派</Radio>
-                      <Radio value='不处理' checked={!isAppoint} color='#0080EE' className='radio' style={{ marginLeft: 10 }}>不处理</Radio>
-                    </RadioGroup>
-                    {
-                      isAppoint && <>
-                        <View className='picker'>
-                          <Text>责任人：{appointUser !== null ? userList[appointUser]?.name : ''}</Text>
-                          <Picker
-                            mode='selector'
-                            range={userList}
-                            rangeKey='name'
-                            onChange={e => setAppointUser(Number(e.detail.value))}
-                          >
-                            <Image src={arrowIcon} className='arrow' />
-                          </Picker>
-                        </View>
-                        <Textarea
-                          placeholder='请输入处理意见'
-                          value={handleAdvice}
-                          onInput={e => setHandleAdvice(e.target.value)}
-                          disabled={isView && handleState !== '待处理'}
-                          maxlength={1024}
-                        />
-                      </>
-                    }
-                  </>
-                  : // 管理员查看
-                  <>
-                    {/* {
-                      handleState === '不处理' && <Text>
-                        处理结果：暂不进行处理
-                      </Text>
-                    } */}
-                    {/* {
-                      (handleState === '已指派' || handleState === '已处理') && <>
-                        <View>处理意见：</View>
-                        <View>{handleAdvice}</View>
-                        <View style={{ marginTop: 10 }}>责任人：</View>
-                        <View>{appointUser !== null ? allDepUsers.find(d => d.depId === userList[appointUser]?.departmentId)?.depName : ''}-{appointUser !== null ? userList[appointUser]?.name : ''}</View>
-                      </>
-                    } */}
-                  </>
+                handleState === '待处理' && <>
+                  <RadioGroup onChange={(e) => {
+                    setIsAppoint(e.detail.value === '指派' ? true : false)
+                  }}>
+                    <Radio value='指派' checked={isAppoint} color='#0080EE' className='radio'>指派</Radio>
+                    <Radio value='不处理' checked={!isAppoint} color='#0080EE' className='radio' style={{ marginLeft: 10 }}>不处理</Radio>
+                  </RadioGroup>
+                  {
+                    isAppoint && <>
+                      <View className='picker'>
+                        <Text>责任人：{appointUser !== null ? userList[appointUser]?.name : ''}</Text>
+                        <Picker
+                          mode='selector'
+                          range={userList}
+                          rangeKey='name'
+                          onChange={e => setAppointUser(Number(e.detail.value))}
+                        >
+                          <Image src={arrowIcon} className='arrow' />
+                        </Picker>
+                      </View>
+                      <Textarea
+                        placeholder='请输入处理意见'
+                        value={handleAdvice}
+                        onInput={e => setHandleAdvice(e.target.value)}
+                        disabled={isView && handleState !== '待处理'}
+                        maxlength={1024}
+                      />
+                    </>
+                  }
+                </>
               }
             </View>
           }
@@ -1510,7 +1493,11 @@ const Index = () => {
               {
                 (isSuperAdmin && (handleState === '已指派' || handleState === '已处理')) && <>
                   <View style={{ marginTop: 10 }}>责任人：</View>
-                  <View>{appointUser !== null ? allDepUsers.find(d => d.depId === userList[appointUser]?.departmentId)?.depName : ''}-{appointUser !== null ? userList[appointUser]?.name : ''}</View>
+                  <View>
+                    {appointUser !== null ? allDepUsers.find(d => d.depId === userList.find(u => u.id === appointUser)?.departmentId)?.depName : ''}
+                    -
+                    {appointUser !== null ? userList.find(u => u.id === appointUser)?.name : ''}
+                  </View>
                 </>
               }
             </View>

From bf7f9cffaa7bff3a4f74e0f851c0318872ac355d Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 19:49:57 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/web/client/src/sections/fillion/components/uploads.js b/web/client/src/sections/fillion/components/uploads.js
index 782fc311..1f6aa15b 100644
--- a/web/client/src/sections/fillion/components/uploads.js
+++ b/web/client/src/sections/fillion/components/uploads.js
@@ -20,7 +20,7 @@ class Uploads extends Component {
     }
     
     dealName = (uploaded) => {
-        console.log(uploaded)
+       
         let realName = uploaded.split('/')[2]
         let x1 = realName.split('.')
         let x2 = x1[0].split('_')
@@ -31,6 +31,7 @@ class Uploads extends Component {
     setFileList = (value) => {
         let defaultFileList = [];
         defaultFileList = value.map((u, index) => {
+            // let fileUrl = `${this.ApiRoot}/${u.url}`;
             let fileUrl = `${u.url}`;
             return {
                 uid: -index - 1,
@@ -60,7 +61,8 @@ class Uploads extends Component {
         const setFileList = () => {
             let defaultFileList = [];
             defaultFileList = nextEditData.map((u, index) => {
-                let fileUrl = `${this.ApiRoot}/${u.storageUrl}`;
+                // let fileUrl = `${this.ApiRoot}/${u.storageUrl}`;
+                let fileUrl = `${u.storageUrl}`;
                 return {
                     uid: -index - 1,
                     name: this.dealName(u.storageUrl),
@@ -268,7 +270,7 @@ class Uploads extends Component {
         //     }
         //     return f
         // })
-        console.log('fileList_：', fileList_);
+        
         return (
             <div>
                 <Spin spinning={delPicIng}>

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

---
 web/client/src/sections/fillion/components/uploads.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/client/src/sections/fillion/components/uploads.js b/web/client/src/sections/fillion/components/uploads.js
index 1f6aa15b..920bf5c8 100644
--- a/web/client/src/sections/fillion/components/uploads.js
+++ b/web/client/src/sections/fillion/components/uploads.js
@@ -18,7 +18,6 @@ class Uploads extends Component {
             removeFilesList: []
         };
     }
-    
     dealName = (uploaded) => {
        
         let realName = uploaded.split('/')[2]

From aa4b8105f0022b27900fceebc388e2ca96c4627c Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 19:51:12 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E5=BB=BA=E8=AE=BE=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=B7=AF=E7=BA=BFGIS=E9=83=A8=E7=BD=B2=E5=B9=B6=E5=93=8D?=
 =?UTF-8?q?=E5=BA=94=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quanju/containers/public/olMap.js         | 121 +++++++++++++++++-
 1 file changed, 114 insertions(+), 7 deletions(-)

diff --git a/web/client/src/sections/quanju/containers/public/olMap.js b/web/client/src/sections/quanju/containers/public/olMap.js
index 721ebc81..002d5dfa 100644
--- a/web/client/src/sections/quanju/containers/public/olMap.js
+++ b/web/client/src/sections/quanju/containers/public/olMap.js
@@ -4,6 +4,7 @@ import request from 'superagent'
 import Hua from '../footer/leadership/centerleft/hudong'
 import moment from 'moment';
 import { OlMapRequest } from '$utils'
+import { useRef } from 'react';
 
 export const busWillRun = [
     { text: '非运营', value: '0' },
@@ -17,16 +18,25 @@ export const busWillRun = [
     { text: '检车', value: '8' },
 ]
 
+const codeMap = {
+    x: 'gpsxd',
+    y: 'gpsyd',
+    c: 'gpscd',
+}
 const OlMap = (props) => {
-    const { dispatch, actions, user, olMapArcgisHost, olMapGeoDataHost, patrolList, roadProjectList, tab, busRunTime, busLine } = props
+    const { dispatch, actions, user, olMapArcgisHost, olMapGeoDataHost, patrolList, roadProjectList, tab, busRunTime, busLine, projectList } = props
 
     const [olMapOpenData, setOlMapOpenData] = useState([])
     const [olMap, setOlMap] = useState()
+    const [curClickCoordinate, setCurClickCoordinate] = useState([])
     const [pointItem, setPointItem] = useState({})
     //
     const [busRunData, setBusRunData] = useState([])
+    //
+    const curTab = useRef(tab)
 
     useEffect(() => {
+        curTab.current = tab
         setOlMapOpenData([])
         setPointItem({})
         if (olMap) {
@@ -79,6 +89,10 @@ const OlMap = (props) => {
                 olMapTool.closeOverlay('pointClickOpen')
                 olMapTool.removeGeometryLayer('geometry0')
 
+                setCurClickCoordinate(p.coordinate)
+                if (curTab.current == 'build') {
+                    return
+                }
                 // 请求路线坐标
                 request.post(`${olMapGeoDataHost || 'http://36.2.6.32:8811'}/geoserver-pg/rest/bufferSearch`)
                     .type('form')
@@ -201,11 +215,6 @@ const OlMap = (props) => {
                                     })
                                     // 请求路线坐标
                                     if (d.code_road) {
-                                        let codeMap = {
-                                            x: 'gpsxd',
-                                            y: 'gpsyd',
-                                            c: 'gpscd',
-                                        }
                                         let roadCodeStart = d.code_road[0]
                                         let layerName = codeMap[roadCodeStart.toLowerCase()]
                                         if (layerName) {
@@ -461,6 +470,103 @@ const OlMap = (props) => {
         }
     }, [busLine, olMap, tab])
 
+    useEffect(async () => {
+        if (olMap) {
+            if (tab == 'build') {
+                const roadRes = await Promise.all(projectList.map((d, index) => {
+                    let roadCodeStart = d.roadCodeStart ? d.roadCodeStart[0] : 'N'
+                    let layerName = codeMap[roadCodeStart.toLowerCase()]
+                    if (layerName) {
+                        return request.post(`${olMapGeoDataHost || 'http://36.2.6.32:8811'}/geoserver-pg/rest/search`)
+                            .type('form')
+                            .send({
+                                params: `{"layerName":"${layerName}","filter":"(roadcode = '${d.roadCodeStart}')","spatialFilter":"","isReturnGeometry":"true","orderByFields":"roadcode, roadstart asc","spatialRel":"INTERSECTS","pageNum":1,"pageSize":99}`
+                            })
+                    } else {
+                        return new Promise(resolve => setTimeout(() => resolve(), 0));
+                    }
+                }))
+
+                let renderIndex = 0
+                for (let res of roadRes) {
+                    if (res) {
+                        if (res.status == 200 && res.body && res.body.code == 1) {
+                            const data = res.body.data
+                            const { datalist } = data
+                            if (datalist?.list?.length) {
+                                let dataIndex = 0
+                                for (let d of datalist.list) {
+                                    const corData = projectList[renderIndex]
+                                    olMap.addGeometryJMLayer({
+                                        features: [
+                                            {
+                                                geometry: d.shape,
+                                                geometryType: 'LineString',
+                                                // geometryType: 'Point',
+                                                attributes: {
+                                                    callbackParams: {},
+                                                    callback: (p, x) => { 
+                                                        let extent = p?.selected[0]?.values_?.geometry?.flatCoordinates
+                                                        let coordinate = []
+                                                        if (extent && extent.length) {
+                                                            let coordinateIndex = Math.ceil((extent.length - 1) / 2)
+                                                            if (coordinateIndex % 2) {
+                                                                coordinateIndex -= 1
+                                                            }
+                                                            coordinate = [extent[coordinateIndex], extent[coordinate + 1]]
+                                                        }
+                                                        if (coordinate.length) {
+                                                            setOlMapOpenData([{
+                                                                n: '项目名称',
+                                                                v: corData.entryName
+                                                            }, {
+                                                                n: '项目规模(公里)',
+                                                                v: corData.projectMileage
+                                                            }, {
+                                                                n: '项目投资(万元)',
+                                                                v: corData.investment
+                                                            }, {
+                                                                n: '业主单位',
+                                                                v: corData.buildUnit,
+                                                            }, {
+                                                                n: '施工单位',
+                                                                v: corData.constructionUnit
+                                                            }, {
+                                                                n: '开工日期',
+                                                                v: corData.startTime ? moment(corData.startTime).format('YYYY-MM-DD') : ''
+                                                            },])
+                                                            olMap.addOverlay('clickOpen', {
+                                                                id: 'clickOpen',
+                                                                offset: [0, 4], // 偏移
+                                                                position: coordinate, // 坐标
+                                                                // position: [115.944220000000, 28.545380000000],
+                                                                autoPan: true,
+                                                                autoPanMargin: 100,
+                                                                positioning: 'top-right'
+                                                            })
+                                                        }
+                                                    }
+                                                },
+                                            },
+                                        ],
+                                        style: { stroke: { width: 5, color: '#9933FF' } },
+                                        selectStyle: { stroke: { width: 8, color: '#9933FF' } },
+                                        layerName: 'geometry_build_road_' + renderIndex
+                                    });
+                                }
+                            }
+                        }
+                    }
+                    renderIndex++
+                }
+            } else {
+                projectList.forEach((d, index) => {
+                    olMap.removeGeometryLayer('geometry_build_road_' + index)
+                })
+            }
+        }
+    }, [projectList, olMap, tab])
+
     const isRoadProject = pointItem.report_type == 'road'
     // const isBusPoint = pointItem.busNoChar
     return (
@@ -624,7 +730,7 @@ const OlMap = (props) => {
 }
 
 function mapStateToProps (state) {
-    const { auth, global, busRunTime, busLine } = state;
+    const { auth, global, busRunTime, busLine, projectList } = state;
     return {
         user: auth.user,
         actions: global.actions,
@@ -632,6 +738,7 @@ function mapStateToProps (state) {
         olMapGeoDataHost: global.olMapGeoDataHost,
         busRunTime: busRunTime.data || [],
         busLine: busLine.data || [],
+        projectList: projectList.data || []
     };
 }
 

From 25d4c60362bed60b04a97f671e51e41a57d851b4 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 20:05:05 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=A4=A7=E5=B1=8F-?=
 =?UTF-8?q?=E5=85=AC=E4=BA=A4=E8=BF=90=E8=90=A5=E4=BF=A1=E6=81=AF=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E5=AD=97=E6=90=9C=E7=B4=A2=E4=BC=9A=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containers/footer/operation/right.js      | 151 ++++++++++--------
 1 file changed, 86 insertions(+), 65 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 f1ce70d2..4bbd5c84 100644
--- a/web/client/src/sections/quanju/containers/footer/operation/right.js
+++ b/web/client/src/sections/quanju/containers/footer/operation/right.js
@@ -30,16 +30,55 @@ const Right = ({ busRunTime }) => {
     const [queryStr, setQueryStr] = useState('')
 
     useEffect(() => {
-        setBusRunTimeList(
-            queryStr ?
-                busRunTime.filter(b => {
-                    return b?.busNoChar?.indexOf(queryStr) > -1
-                })
-                : busRunTime
-        )
+        let repeatCarNo = []
+        let nextBusRunList = queryStr ?
+            busRunTime.filter(b => {
+                let queryMatch = b?.busNoChar?.indexOf(queryStr) > -1
+                if (repeatCarNo.some(c => c == b.busNoChar.trim())) {
+                    return false
+                } else {
+                    repeatCarNo.push(b.busNoChar.trim())
+                    return queryMatch && true
+                }
+            })
+            : busRunTime.filter(b => {
+                if (repeatCarNo.some(c => c == b.busNoChar.trim())) {
+                    return false
+                } else {
+                    repeatCarNo.push(b.busNoChar.trim())
+                    return true
+                }
+            })
+        console.log(nextBusRunList);
+        setBusRunTimeList(nextBusRunList)
     }, [queryStr, busRunTime])
 
     const style = { height: "97%", marginTop: "3%" }
+    const carouselContent = busRunTimeList.map((d, index) => {
+        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>
+                        <h5>{d.lastDepTime}</h5>
+                    </span>
+                    <span style={{ position: 'relative', left: '21%' }}>
+                        <h3>司机</h3>
+                        <h5>{d.employeeName}</h5>
+                        <h3>工号</h3>
+                        <h4>{d.opNo}</h4>
+                    </span>
+                </div>
+            </div>
+        )
+    })
     return (
         <div style={{ position: 'absolute', right: 0, width: "23%", height: "100%", marginRight: "1%", }}>
             <Module style={style} customize={true}
@@ -70,71 +109,53 @@ const Right = ({ busRunTime }) => {
                         />
                     </div>
 
-                    <Carousel
-                        autoplay
-                        infinite
-                        // autoplaySpeed={300000}
-                        autoplaySpeed={1000 * 3}
-                        vertical={true}
-                        slidesToShow={4}
-                    >
-                        {
-                            busRunTimeList.map((d, index) => {
-                                return (
+                    {
+                        carouselContent.length > 3 ?
+                            <Carousel
+                                autoplay
+                                infinite
+                                // autoplaySpeed={300000}
+                                autoplaySpeed={1000 * 3}
+                                vertical={true}
+                                slidesToShow={4}
+                            >
+                                {
+                                    carouselContent
+                                }
+                                {/* {
+                                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>
-                                                <h5>{d.busNoChar}</h5>
-                                                <h3>调度状态</h3>
-                                                <h4>{busWillRun.find(w => w.value == d.willRun)?.text || '--'}</h4>
-                                            </span>
-                                            <span>
-                                                <h3>发车时间</h3>
-                                                <h5>{d.lastDepTime}</h5>
-                                            </span>
-                                            <span style={{ position: 'relative', left: '21%' }}>
-                                                <h3>司机</h3>
-                                                <h5>{d.employeeName}</h5>
-                                                <h3>工号</h3>
-                                                <h4>{d.opNo}</h4>
+                                                <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>
-                                )
-                            })
-                        }
-                        {/* {
-                            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>
+                                ))
+                            } */}
+                            </Carousel>
+                            :
+                            carouselContent
+                    }
+
                 </div>
             </Module>
         </div>

From 3c602be0dfa0d44154eb69d3a35500495a7f024f Mon Sep 17 00:00:00 2001
From: zhaobing <zhao.bing@free-sun.com.cn>
Date: Fri, 4 Aug 2023 20:10:51 +0800
Subject: [PATCH 08/14] feat:fix bugs

---
 api/app/lib/controllers/data/vehicle.js       |  1 -
 .../fillion/components/bridgeTable.js         | 10 +++++---
 .../fillion/components/highwaysTable.js       |  7 +++---
 .../fillion/components/transportationTable.js | 23 +++++++++++++------
 .../footer/leadership/centerleft/daolu.js     |  4 ++--
 .../footer/leadership/centerleft/top.js       | 14 +++++------
 6 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/api/app/lib/controllers/data/vehicle.js b/api/app/lib/controllers/data/vehicle.js
index 554e4e5a..4ba183a5 100644
--- a/api/app/lib/controllers/data/vehicle.js
+++ b/api/app/lib/controllers/data/vehicle.js
@@ -26,7 +26,6 @@ async function get(ctx) {
          }
       }
       const vehicleRes = await models.Statistic.findAll(findOption)
-      console.log('vehicleRes', vehicleRes)
       ctx.status = 200;
       ctx.body = {
          vehicleRes: vehicleRes.filter(item => item.dataValues.name === '标志牌' || item.dataValues.name === '养护责任牌')
diff --git a/web/client/src/sections/fillion/components/bridgeTable.js b/web/client/src/sections/fillion/components/bridgeTable.js
index f32c0e89..1f9b43bb 100644
--- a/web/client/src/sections/fillion/components/bridgeTable.js
+++ b/web/client/src/sections/fillion/components/bridgeTable.js
@@ -39,6 +39,12 @@ const BrideTable = (props) => {
             setDelet(res)
         })
     }
+    useEffect(async () => {
+        const res = await dispatch(getBridge())
+        setSmallBridge(res.payload.data?.filter(item => item.bridgeClassification === '小桥'))
+        setMiddleBridge(res.payload.data?.filter(item => item.bridgeClassification === '中桥'))
+        setBigBridge(res.payload.data?.filter(item => item.bridgeClassification === '大桥'))
+    }, [])
     const deldatas = (id) => { // 工程
         const query = {
             projectId: id
@@ -1813,9 +1819,7 @@ 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,
diff --git a/web/client/src/sections/fillion/components/highwaysTable.js b/web/client/src/sections/fillion/components/highwaysTable.js
index 2d19929a..248e503c 100644
--- a/web/client/src/sections/fillion/components/highwaysTable.js
+++ b/web/client/src/sections/fillion/components/highwaysTable.js
@@ -91,15 +91,14 @@ const TransporTationTable = (props) => {
                 width: 160,
                 fixed: 'right',
                 render: (dom, record) => {
-                    console.log('record', record.id === null)
-                    return <div><Button type="link"
+                    return <div>{record.id !== null ? (<Button type="link"
                         onClick={() => {
                             hightModal('edit', record)
                             setTypecard('compile')
                             setRecortd(record)
                         }}
-                        disabled={editAble && record.id === null}
-                    >编辑</Button></div>
+                        disabled={editAble}
+                    >编辑</Button>) : null}</div>
 
                 }
             },
diff --git a/web/client/src/sections/fillion/components/transportationTable.js b/web/client/src/sections/fillion/components/transportationTable.js
index 99e35d15..6fabd4b7 100644
--- a/web/client/src/sections/fillion/components/transportationTable.js
+++ b/web/client/src/sections/fillion/components/transportationTable.js
@@ -76,6 +76,20 @@ const TransporTationTable = (props) => {
             setDelet(res)
         })
     }
+    useEffect(async () => {
+        console.log('whichofits', whichofits)
+        let query = {}
+        if (whichofits === '县') {
+            query.level = '县'
+        } else if (whichofits === '乡') {
+            query.level = '乡'
+        } else if (whichofits === '村') {
+            query.level = '村'
+        }
+        const res = await dispatch(getRoadway(query))
+        const uniqueArray = [...new Set(res.payload.data?.map(item => item.routeName))];
+        setRoadData(uniqueArray)
+    }, [whichofits])
     const columns = {
         tab1: [
             {
@@ -3823,8 +3837,7 @@ 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)
@@ -3840,8 +3853,6 @@ 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)
@@ -3856,8 +3867,6 @@ 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)
@@ -3883,7 +3892,7 @@ const TransporTationTable = (props) => {
                     search={{
                         defaultCollapsed: false,
                         optionRender: (searchConfig, formProps, dom) => [
-                            <span style={{ marginRight: 20 }}>{`共有${whichofits}道:${roadData.length || 0}条`}</span>,
+                            <span >{`共有${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 : ''}
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 8ef8046d..9d8f5b47 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
@@ -38,6 +38,7 @@ const Right = (props) => {
             // const
         })
     }, [])
+    const roadMile = 2481.2
     const renderBody = () => {
         return (
 
@@ -117,8 +118,7 @@ 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" }}>{roadMile}</span><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>{((2481.2 / 2689) * 100).toFixed(2)}</span><span>%</span></p>
 
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 eb227e7b..7049020d 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
@@ -28,7 +28,7 @@ const Leftcenter = (props) => {
                 {/* <div className={tabKey == "build" ? "tabKey-map" : "notabKey"} style={{ backgroundImage: "url(/assets/images/quanju/zuobeijing.png)", backgroundSize: "100% 100%" }} onClick={() => {
                     onClick("build")
                 }}><a>建设</a></div> */}
-                <div style={{ width: "30%", height: "10vh", backgroundColor: "", position: "relative", left: "2%", top: "100%" }} onClick={() => {
+                <div style={{ width: "35%", height: "10vh", backgroundColor: "", position: "relative", left: "10%", top: "100%" }} onClick={() => {
                     onClick("daolu")
                 }} >
                     {
@@ -37,14 +37,14 @@ const Leftcenter = (props) => {
                     <div style={{ width: "50%", height: "100%", position: "absolute", left: "17%", top: "23%" }}>
                         <img src='/assets/images/leadership/lu.png' style={{ width: "50%" }} />
                     </div>
-                    <div style={{ width: "50%", height: "100%", position: "absolute", left: "50%", top: "11%" }}>
+                    <div style={{ width: "60%", height: "100%", position: "absolute", left: "50%", top: "11%" }}>
+                        <p style={{ fontFamily: "YouSheBiaoTiHei", color: "#ffffff", fontSize: "2.5vh", marginTop: "-2%" }}>2689</p>
                         <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%" }}>2689</p>
 
                     </div>
                 </div>
-                <div style={{ width: "30%", height: "10vh", backgroundColor: "", position: "relative", left: "35%", top: "-105%" }} onClick={() => {
+                {/* <div style={{ width: "30%", height: "10vh", backgroundColor: "", position: "relative", left: "35%", top: "-105%" }} onClick={() => {
                     onClick("handong")
                 }} >
                     {
@@ -57,8 +57,8 @@ const Leftcenter = (props) => {
                         <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: "#24FFEE", fontSize: "2.5vh" }}>{isNaN((culvert?.["县"] + culvert?.["乡"] + culvert?.["村"]).toFixed(0)) ? "" : (culvert?.["县"] + culvert?.["乡"] + culvert?.["村"]).toFixed(0)}</p>
                     </div>
-                </div>
-                <div style={{ width: "30%", height: "10vh", backgroundColor: "", position: "relative", left: "68%", top: "-315%" }} onClick={() => {
+                </div> */}
+                <div style={{ width: "35%", height: "10vh", backgroundColor: "", position: "relative", left: "55%", top: "-100%" }} onClick={() => {
                     onClick("qiaoliang")
                 }} >
                     {
@@ -68,8 +68,8 @@ const Leftcenter = (props) => {
                         <img src='/assets/images/leadership/qiao.png' style={{ width: "50%" }} />
                     </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%" }}>165</p>
+                        <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: "#00F1FF", fontSize: "2.5vh", marginTop: "-2%" }}>{isNaN((bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])) ? "" : (bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])}</p> */}
                     </div>

From 9ab155df113e9b42f6ec29e7c4c379780324d37d Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 20:11:44 +0800
Subject: [PATCH 09/14] =?UTF-8?q?fix=20=E7=AE=A1=E7=90=86=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F-=E4=BB=8E=E5=BB=BA=E8=AE=BE=E5=88=87=E5=88=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A4=A7=E5=B1=8F=E5=B1=95=E7=A4=BA=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=BE=E7=82=B9=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quanju/containers/public/olMap.js         | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/web/client/src/sections/quanju/containers/public/olMap.js b/web/client/src/sections/quanju/containers/public/olMap.js
index 002d5dfa..4d50a3be 100644
--- a/web/client/src/sections/quanju/containers/public/olMap.js
+++ b/web/client/src/sections/quanju/containers/public/olMap.js
@@ -434,34 +434,35 @@ const OlMap = (props) => {
 
     useEffect(() => {
         if (busLine && olMap && tab == 'operation') {
-            olMap.addGeometryLayer({
-                features: [
-                    {
-                        name: 'busLine',
-                        attributes: {
-                        },
-                        geometry: busLine.map(b => {
-                            return [b.pointLng, b.pointLat]
-                        }),
-                        // geometry: [115.944220000000, 28.545380000000],
-                        geometryType: 'LineString',
-                        style: { stroke: { width: 5, color: '#9933FF' } },
-                        selectStyle: { stroke: { width: 8, color: '#9933FF' } },
-                    },
-                ],
-                style: { stroke: { width: 5, color: '#9933FF' } },
-                selectStyle: { stroke: { width: 8, color: '#9933FF' } },
-                layerName: 'geometry_bus_line'
-            });
             if (busLine.length) {
                 olMap.closeOverlay('clickOpen')
+                busRunData.forEach((d, index) => {
+                    olMap.removeGeometryLayer('geometry_bus_' + index)
+                })
+                olMap.addGeometryLayer({
+                    features: [
+                        {
+                            name: 'busLine',
+                            attributes: {
+                            },
+                            geometry: busLine.map(b => {
+                                return [b.pointLng, b.pointLat]
+                            }),
+                            // geometry: [115.944220000000, 28.545380000000],
+                            geometryType: 'LineString',
+                            style: { stroke: { width: 5, color: '#9933FF' } },
+                            selectStyle: { stroke: { width: 8, color: '#9933FF' } },
+                        },
+                    ],
+                    style: { stroke: { width: 5, color: '#9933FF' } },
+                    selectStyle: { stroke: { width: 8, color: '#9933FF' } },
+                    layerName: 'geometry_bus_line'
+                });
                 olMap.setCenter([
                     (busLine[0].pointLng + busLine[busLine.length - 1].pointLng) / 2,
                     (busLine[0].pointLat + busLine[busLine.length - 1].pointLat) / 2
                 ])
-                busRunData.forEach((d, index) => {
-                    olMap.removeGeometryLayer('geometry_bus_' + index)
-                })
+
             } else {
                 drawBusRunPoint()
             }
@@ -505,7 +506,7 @@ const OlMap = (props) => {
                                                 // geometryType: 'Point',
                                                 attributes: {
                                                     callbackParams: {},
-                                                    callback: (p, x) => { 
+                                                    callback: (p, x) => {
                                                         let extent = p?.selected[0]?.values_?.geometry?.flatCoordinates
                                                         let coordinate = []
                                                         if (extent && extent.length) {

From df3ece6fa27c79497965f6b9193146db0a9e3f04 Mon Sep 17 00:00:00 2001
From: zhaobing <zhao.bing@free-sun.com.cn>
Date: Fri, 4 Aug 2023 20:13:01 +0800
Subject: [PATCH 10/14] =?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 ----
 scripts/1.3.1/schema/4.update_report.sql | 11 +++++++++--
 2 files changed, 9 insertions(+), 6 deletions(-)
 delete 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
deleted file mode 100644
index da99eb71..00000000
--- a/scripts/1.3.0/schema/6.update_report.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-alter table report
-    add handle_opinions varchar(1024);
-
-comment on column report.handle_opinions is '处理意见';
\ No newline at end of file
diff --git a/scripts/1.3.1/schema/4.update_report.sql b/scripts/1.3.1/schema/4.update_report.sql
index eefe3537..51ab0ebc 100644
--- a/scripts/1.3.1/schema/4.update_report.sql
+++ b/scripts/1.3.1/schema/4.update_report.sql
@@ -1,6 +1,13 @@
 ALTER TABLE "public"."report" 
-  ADD COLUMN "handle_advice" varchar(1024);
+  ADD COLUMN "handle_advice" varchar(1024)
+    add handle_opinions varchar(1024);
 
 COMMENT ON COLUMN "public"."report"."handle_state" IS '待处理 / 已指派 / 已处理 / 不处理';
 
-COMMENT ON COLUMN "public"."report"."handle_advice" IS '管理员处理意见';
\ No newline at end of file
+COMMENT ON COLUMN "public"."report"."handle_advice" IS '管理员处理意见';
+
+comment on column report.handle_opinions is '处理意见';
+
+
+
+

From 3d10104cc7ade2dba5d645f32acb272941c7184e Mon Sep 17 00:00:00 2001
From: liujiangyong <liu.jiangyong@free-sun.com.cn>
Date: Fri, 4 Aug 2023 20:20:59 +0800
Subject: [PATCH 11/14] =?UTF-8?q?handleState=E9=BB=98=E8=AE=A4=E5=B7=B2?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/models/report.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/app/lib/models/report.js b/api/app/lib/models/report.js
index adb7d806..00a2c074 100644
--- a/api/app/lib/models/report.js
+++ b/api/app/lib/models/report.js
@@ -163,7 +163,7 @@ module.exports = dc => {
     handleState: {
       type: DataTypes.STRING,
       allowNull: true,
-      defaultValue: null,
+      defaultValue: '已处理',
       comment: null,
       primaryKey: false,
       field: "handle_state",

From f3e924642250c1e47ec1ab27277bb5edcfd1c265 Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 20:27:48 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/fillion/components/uploads.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/client/src/sections/fillion/components/uploads.js b/web/client/src/sections/fillion/components/uploads.js
index 920bf5c8..eb523956 100644
--- a/web/client/src/sections/fillion/components/uploads.js
+++ b/web/client/src/sections/fillion/components/uploads.js
@@ -56,12 +56,12 @@ class Uploads extends Component {
     componentWillReceiveProps (np) {
         const { dispatch, value: thisEditData, onChange } = this.props;
         const { value: nextEditData, clearFileList } = np;
-
+        console.log(nextEditData,'哈哈哈哈')
         const setFileList = () => {
             let defaultFileList = [];
             defaultFileList = nextEditData.map((u, index) => {
                 // let fileUrl = `${this.ApiRoot}/${u.storageUrl}`;
-                let fileUrl = `${u.storageUrl}`;
+                let fileUrl = `${u.url}`;
                 return {
                     uid: -index - 1,
                     name: this.dealName(u.storageUrl),

From f86ff509c6179fc2c0aece73af088d47202724b2 Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 20:28:28 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/fillion/components/uploads.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/client/src/sections/fillion/components/uploads.js b/web/client/src/sections/fillion/components/uploads.js
index eb523956..a10cdb2f 100644
--- a/web/client/src/sections/fillion/components/uploads.js
+++ b/web/client/src/sections/fillion/components/uploads.js
@@ -75,7 +75,6 @@ class Uploads extends Component {
                 fileList: defaultFileList
             });
         };
-
         if (nextEditData && nextEditData.length) {
             if (!thisEditData || !this.state.fileList.length) {
                 setFileList();

From 3a39e4e9e8229cd8ed658149f8ebb9425acaa8c9 Mon Sep 17 00:00:00 2001
From: dengyinhuan <deng.yinhuan@free-sun.com.cn>
Date: Fri, 4 Aug 2023 20:39:21 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/client/src/sections/fillion/components/uploads.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/client/src/sections/fillion/components/uploads.js b/web/client/src/sections/fillion/components/uploads.js
index a10cdb2f..90088077 100644
--- a/web/client/src/sections/fillion/components/uploads.js
+++ b/web/client/src/sections/fillion/components/uploads.js
@@ -57,6 +57,7 @@ class Uploads extends Component {
         const { dispatch, value: thisEditData, onChange } = this.props;
         const { value: nextEditData, clearFileList } = np;
         console.log(nextEditData,'哈哈哈哈')
+        
         const setFileList = () => {
             let defaultFileList = [];
             defaultFileList = nextEditData.map((u, index) => {