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

weapp/package/pointsStatus/pointsStatus.js

@@ -1,5 +1,5 @@
 // package/pointsStatus/pointsStatus.js
-import { getProjectGraph, getDeployPoints } from "../../utils/getApiUrl";
+import { getProjectGraph, getDeployPoints, getProjectPoints } from "../../utils/getApiUrl";
 import { Request } from "../../common";
 
 Page({
@@ -19,21 +19,24 @@ Page({
     wx.showLoading({ title: '加载中...' });
     Request.get(getProjectGraph(projectId)).then(res => {
       if (res) {
-        Request.get(getDeployPoints(res.id)).then(pointsRes => {
+        Request.get(getDeployPoints(res.id)).then(deployPointsRes => {
-          that.setData({
+          Request.get(getProjectPoints(projectId)).then(allPointRes => {
-            image: res.graph,
+            wx.hideLoading();
-            allPoints: pointsRes.allPoints,
+            that.setData({
-            setedPoints: pointsRes.setedPoints.map(p => ({
+              image: res.graph,
-              ...p,
+              allPoints: allPointRes,
-              position: JSON.parse(p.position),
+              setedPoints: deployPointsRes.map(p => ({
-              pointInfo: pointsRes.allPoints.find(a => a.id === p.pointId),
+                ...p,
-            })),
+                position: JSON.parse(p.position),
+                pointInfo: allPointRes.find(a => a.id === p.pointId),
+              })),
+            })
           })
         })
       } else {
+        wx.hideLoading();
         // 未布设
       }
-      wx.hideLoading()
     })
   },
 

weapp/utils/getApiUrl.js

@@ -20,6 +20,9 @@ exports.getProjectGraph = (projectId) => {
 exports.getDeployPoints = (pictureId) => {
     return `/picture/${pictureId}/deploy/points`
 }
+exports.getProjectPoints = (projectId) => {
+    return `/project/${projectId}/all/points`
+}
 
 // 获取巡检计划
 exports.getPatrolPlan = () => {