From a53d92f6b1a8a423b7c797ba41831df21c845280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?zhaobing=E2=80=99?= <zhao.bin@free-sun.com.cn>
Date: Mon, 30 Oct 2023 15:35:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:fix=20=E4=B8=BB=E5=8A=A8=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=AE=BE=E5=A4=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 weapp/package/report/report.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/weapp/package/report/report.js b/weapp/package/report/report.js
index d806058..702e204 100644
--- a/weapp/package/report/report.js
+++ b/weapp/package/report/report.js
@@ -256,9 +256,14 @@ Page({
         }
         const { id, name, departmentId, deptName } = wx.getStorageSync('userInfo');
         const newData = that.data.data.map((item) => {
+            let pointDevices=[]
+            item.devices.map(child=>{
+                const {pointDevice,...newItem } = child;
+                pointDevices.push({device:newItem,deviceId:pointDevice.deviceId}) 
+            })
             // 使用对象的解构赋值去掉 project 和 devices 属性
                 const { project, devices, ...newItem } = item;
-                return newItem;
+                return {...newItem,pointDevices}
           });
         const nextItemData=newData.find(item=>item.id===pointList[pointIndex].id)
         // const curPlan = that.data.planList.find(item=>item.id==patrolTemplate[patrolTemplateIndex].id)