fix

app.json

@@ -10,7 +10,6 @@
       "pages": [
         "main/main",
         "scan/scan",
-        "mine/mine",
         "sleepReport/sleepReport",
         "data/data",
         "testSAS/testSAS",
@@ -50,7 +49,6 @@
   ],
   "sitemapLocation": "sitemap.json",
   "tabBar": {
-    "custom": true,
     "selectedColor": "#0BC3AA",
     "color": "#AAAFC4",
     "list": [

subpages/data/data.js

@@ -4390,21 +4390,21 @@ Page({
 		let roomcodeTemp = wx.getStorageSync("roomEmpower");
 		// hotelcodeTemp = wx.getStorageSync('res').result.split('|')[0];
 		// roomcodeTemp = wx.getStorageSync('res').result.split('|')[1];
-		this.getData(null, hotelcodeTemp, roomcodeTemp, null);
+		this.getData(null, hotelcodeTemp, roomcodeTemp, this.data.reportId);
 		// 设置canvas的宽高  
 		this.setData({
 			hotelcode: hotelcodeTemp,
 			roomcode: roomcodeTemp,
 		});
 
-		this.initChartCircle();
-		this.initOutOfBed();
-		this.initBodyMovements();
-		this.initCardiacSystem();
-		this.initChartRespiratory();
-		this.initChartSnoring();
-		this.initChartApnea();
-		this.initTimeWaterfall();
+		this.initChartCircle(this.data.reportId);
+		this.initOutOfBed(this.data.reportId);
+		this.initBodyMovements(this.data.reportId);
+		this.initCardiacSystem(this.data.reportId);
+		this.initChartRespiratory(this.data.reportId);
+		this.initChartSnoring(this.data.reportId);
+		this.initChartApnea(this.data.reportId);
+		this.initTimeWaterfall(this.data.reportId);
 	},
 	/**			
 	 * 生命周期函数--监听页面加载

subpages/sleepReport/sleepReport.js

@@ -158,8 +158,8 @@ Page({
       let minutesStr = parts[1].split("分钟")[0]; // 获取分钟部分的字符串
       minutes = parseInt(minutesStr, 10); // 将分钟部分转换为整数
     }
-    console.log("小时:", hours); // 输出小时
-    console.log("分钟:", minutes); // 输出分钟
+    // console.log("小时:", hours); // 输出小时
+    // console.log("分钟:", minutes); // 输出分钟
     return {
       hours: hours || 0,
       minutes: minutes || 0