Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/Highways4Good into dev

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

@@ -114,7 +114,7 @@ async function reportList(ctx) {
                 }
                     ) AS NR
                         left join "user" on "user".id = NR.user_id
-                WHERE NEWINDEX = 1;
+                WHERE NEWINDEX = 1 order by id desc;
             `
             reportRes = await sequelize.query(sqlStr, { type: QueryTypes.SELECT });
             if (reportType == 'road') {

web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js

@@ -48,7 +48,10 @@ const RightTop = (props) => {
     useEffect(() => {
         dispatch(getRoadmaintain()).then((res) => {
             setRoadmaintainList(res.payload.data.reportList.filter((item, index) => {
-                return item.projectType == "road" || item.projectType == "countyRoad" || item.projectType == "villageRoad" || item.projectType == "rusticRoad"
+                return item.projectType == "road" 
+                || item.projectType == "countyRoad" 
+                || item.projectType == "villageRoad" 
+                || item.projectType == "rusticRoad" 
             }))
         })
     }, [])

web/client/src/sections/quanju/containers/public/olMap.js

@@ -393,6 +393,7 @@ const OlMap = (props) => {
                 layerName: 'geometry_bus_line'
             });
             if (busLine.length) {
+                olMap.closeOverlay('clickOpen')
                 olMap.setCenter([
                     (busLine[0].pointLng + busLine[busLine.length - 1].pointLng) / 2,
                     (busLine[0].pointLat + busLine[busLine.length - 1].pointLat) / 2