Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/Inspection

api/app/lib/controllers/patrolManage/patrolRecord.js

@@ -119,6 +119,7 @@ async function findPatrolRecord (ctx, next) {
             }
         }
         let userInfo = ctx.fs.api.userInfo;
+        rslt = rslt.filter(f => f)
         if (userInfo.username != 'SuperAdmin') {
             if (userInfo.structure) {
                 rslt = rslt.filter(s => userInfo.structure.find(x => x == s.points.project.id))
@@ -204,7 +205,7 @@ async function addPatrolRecord (ctx, next) {
         ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
         ctx.status = 400;
         ctx.body = {
-            "message": '新增巡检计划失败'
+            "message": '新增巡检记录失败'
         }
     }
 }

web/client/src/sections/projectRegime/components/projectAddModel.js

@@ -38,15 +38,15 @@ const ProjectAddModel = ({ dispatch, actions, user, modelData, close, success, f
             if (e) {
                placeSearch.setCity(e.poi.adcode);
                placeSearch.search(e.poi.name, function (status, result) {
-                  form.setFieldValue('longitude', result.poiList.pois[0].location.lat)
+                  form.setFieldValue('longitude', result.poiList.pois[0].location.lng)
-                  form.setFieldValue('latitude', result.poiList.pois[0].location.lng)
+                  form.setFieldValue('latitude', result.poiList.pois[0].location.lat)
                }) //关键字查询查询
             }
          }
          auto.on("select", select);//注册监听，当选中某条记录时会触发
          map.on('click', function (e) {  //点击地图获取经纬度
-            form.setFieldValue('longitude', e.lnglat.lat)
+            form.setFieldValue('longitude', e.lnglat.lng)
-            form.setFieldValue('latitude', e.lnglat.lng)
+            form.setFieldValue('latitude', e.lnglat.lat)
          });
       });