From 2d213c6a0520aa77dfb116fa237a7d0a1022fd08 Mon Sep 17 00:00:00 2001
From: rongweikang <1174906669@qq.com>
Date: Fri, 22 Mar 2024 14:28:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/moduleIOT/pages/iotCarePlan/FR200.tsx      |  2 +-
 .../moisture_test_report.tsx                   | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/moduleIOT/pages/iotCarePlan/FR200.tsx b/src/moduleIOT/pages/iotCarePlan/FR200.tsx
index 91d3685..7006d22 100644
--- a/src/moduleIOT/pages/iotCarePlan/FR200.tsx
+++ b/src/moduleIOT/pages/iotCarePlan/FR200.tsx
@@ -1980,7 +1980,7 @@ class IotCarePlanFR200 extends Component<any, any> {
     } else if ("moistureTest" === nursingData.workMode) {
       console.log("水分测试");
     } else {
-      go("/pages/face_report/face_report?id=" + this.state.currentDevice.id);
+      go("/recording/pages/face_report/face_report?id=" + this.state.currentDevice.id);
     }
   };
 
diff --git a/src/recoding/pages/moisture_test_report/moisture_test_report.tsx b/src/recoding/pages/moisture_test_report/moisture_test_report.tsx
index 9b95f9a..bae9395 100644
--- a/src/recoding/pages/moisture_test_report/moisture_test_report.tsx
+++ b/src/recoding/pages/moisture_test_report/moisture_test_report.tsx
@@ -35,7 +35,6 @@ class MoistureTestReport extends Component<any, any> {
           rightFace: 0
         }
       },
-      instrumentId: 0,
       isClock: false,
       xinde: '',
       imglist: [],
@@ -55,7 +54,11 @@ class MoistureTestReport extends Component<any, any> {
   componentDidHide() { }
 
   onLoad(option) {
+    console.log(option.data);
+    
     let data = JSON.parse(option.data)
+   console.log(data);
+   
     let { reportData } = this.state
     reportData.curDate = option.date
     data.GearData.map(item => {
@@ -74,14 +77,15 @@ class MoistureTestReport extends Component<any, any> {
         reportData.shuifenGear.rightFace = gear
       }
     })
-    this.setState({ reportData, modeId: option.modeId, instrumentId: option.id });
-    this.moistureTest()
+
+    this.setState({ reportData, modeId: option.modeId });
+    this.moistureTest(option.id, reportData.curDate)
   }
   async initData() { }
-  async moistureTest() {
+  async moistureTest(id, curDate) {
     let data = {
-      queryDate: this.state.reportData.curDate,
-      instrumentId: this.state.instrumentId
+      queryDate: curDate,
+      instrumentId: id
     }
     let res = await InstrumentInfo.fr200.moistureTest(data);
 
@@ -95,7 +99,7 @@ class MoistureTestReport extends Component<any, any> {
   }
 
   render() {
-    let { name, imgUrl, reportData, reportData1, isClock, xinde, imglist, id, show, modeId, instrumentId } = this.state
+    let { name, imgUrl, reportData, reportData1, isClock, xinde, imglist, id, show, modeId } = this.state
 
     const getStatusData = (level) => {
       var bgCssData = {