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

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

@@ -229,7 +229,7 @@ async function addPatrolRecord (ctx, next) {
             where: { patrolPlanId: patrolPlanId }
         });
 
-        const patrolCount = curPlanRecord.count;
+        const patrolCount = curPlanRecord.count + 1;
         await models.PatrolPlan.update({ patrolCount }, {
             where: { id: patrolPlanId },
             transaction

weapp/package/pointsStatus/pointsStatus.wxml

@@ -8,7 +8,7 @@
             data-id="{{item.pointId}}" 
             data-show="{{item.show}}"
             class="point" 
-            style="left:{{(item.position.relativeX * 100) + '%'}}; top:{{(item.position.relativeY * 100) + '%'}}"
+            style="left:calc({{(item.position.relativeX * 100) + '%'}} - 3px); top:calc({{(item.position.relativeY * 100) + '%'}} - 3px)"
             bind:tap="calcTooltip"
         ></image>
         <view 

weapp/package/pointsStatus/pointsStatus.wxss

@@ -10,8 +10,8 @@
 
 .image-box .point {
     position: absolute;
-    width: 10px;
+    width: 12px;
-    height: 10px;
+    height: 12px;
 }
 
 .image-box .tooltip {