From c1ced224d86e6f3ae6f4703a83f062bc0bcdcfa7 Mon Sep 17 00:00:00 2001
From: liujiangyong <liu.jiangyong@free-sun.com.cn>
Date: Fri, 10 Mar 2023 13:47:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E5=B7=A1=E6=A3=80=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/patrolManage/patrolRecord.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/app/lib/controllers/patrolManage/patrolRecord.js b/api/app/lib/controllers/patrolManage/patrolRecord.js
index f790006..4bb4ff2 100644
--- a/api/app/lib/controllers/patrolManage/patrolRecord.js
+++ b/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

From f55494b5c77ab17a3e71595813eee3f451233a53 Mon Sep 17 00:00:00 2001
From: liujiangyong <liu.jiangyong@free-sun.com.cn>
Date: Fri, 10 Mar 2023 14:22:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?(*)=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=B8=83?=
 =?UTF-8?q?=E8=AE=BE=E5=B1=95=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/package/pointsStatus/pointsStatus.wxml | 2 +-
 weapp/package/pointsStatus/pointsStatus.wxss | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/weapp/package/pointsStatus/pointsStatus.wxml b/weapp/package/pointsStatus/pointsStatus.wxml
index 639c321..0301075 100644
--- a/weapp/package/pointsStatus/pointsStatus.wxml
+++ b/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 
diff --git a/weapp/package/pointsStatus/pointsStatus.wxss b/weapp/package/pointsStatus/pointsStatus.wxss
index 30fb0e0..53a9fcd 100644
--- a/weapp/package/pointsStatus/pointsStatus.wxss
+++ b/weapp/package/pointsStatus/pointsStatus.wxss
@@ -10,8 +10,8 @@
 
 .image-box .point {
     position: absolute;
-    width: 10px;
-    height: 10px;
+    width: 12px;
+    height: 12px;
 }
 
 .image-box .tooltip {