护理报告

src/app.config.ts

@@ -85,7 +85,7 @@ export default defineAppConfig({
         "pages/recording/recording",
         "pages/face_report_one/face_report_one",
         "pages/moisture_test_report/moisture_test_report",
-       
+        "pages/face_report/face_report",
       ],
     },
     {

src/moduleIOT/pages/iotCarePlan/FR200.tsx

@@ -2037,6 +2037,7 @@ class IotCarePlanFR200 extends Component<any, any> {
 
       return nursingData;
     }
+    return { nursingData:JSON.stringify({workMode: nowFR200NursingHistory.workMode,})  }  
   };
 
   // 计算挡位
@@ -2073,11 +2074,14 @@ class IotCarePlanFR200 extends Component<any, any> {
       };
     }
     let res1: any = await this.todoPromise();
-    console.log(res1, "查看返回数据");
+    if(res1){
       params = { ...params, ...res1 };
-    let res: any = await InstrumentInfo.apiNursingLog.addLog(params);
+    }
-    console.log("PostNursingLogClock", res);
+    console.log(res1, "查看返回数据");
-    if (res.data.code === 200) {
+    
+    let res2: any = await InstrumentInfo.apiNursingLog.addLog(params);
+    console.log("PostNursingLogClock", res2);
+    if (res2.data.code === 200) {
       let params = {
         instrumentId: currentDevice.id,
       };
@@ -2095,7 +2099,7 @@ class IotCarePlanFR200 extends Component<any, any> {
             isShowNursingSuccess: false,
           });
 
-          this.goFaceReport(res1, ActiveModeItem.id); // 跳转
+          this.goFaceReport(res1, ActiveModeItem.id, res2.data.data, currentDevice.id); // 跳转
         }, 2000);
       }
     }
@@ -2191,7 +2195,7 @@ class IotCarePlanFR200 extends Component<any, any> {
   };
 
   /** 完成护理提交：跳转护理报告页 */
-  goFaceReport = (data, id) => {
+  goFaceReport = async (data, id, deviceid, currentDevice) => {
     let nursingData = JSON.parse(data.nursingData);
     // 跳转前置空定时器，防止重复提交
     if (currentTimeTimer) clearInterval(currentTimeTimer);
@@ -2204,31 +2208,39 @@ class IotCarePlanFR200 extends Component<any, any> {
         "headLiftingPro",
       ].includes(nursingData.workMode)
     ) {
-      // let obj = {
+      let ids = Number(deviceid)
-      //   modeName: nursingData.modeName,
+      // 获取echarts数据 这个是获取接口更新echarts页面
-      //   data: nursingData,
+      let res2 = await InstrumentInfo.apiNursingLog.getStatiCDE(ids);
-      // };
+
+      let nursingDatas = JSON.parse(res2.data.data.nursingData)
+      let obj = {
+        modeName: res2.data.data.modeName,
+        data: nursingDatas
+      }
+
       let report = true;
       go(
         "/recoding/pages/face_report_one/face_report_one?id=" +
-          id +
+        ids +
         "&report=" +
-          report 
+        report + "&obj=" +
+        JSON.stringify(obj)
       );
     } else if ("moistureTest" === nursingData.workMode) {
       console.log("水分测试");
     } else {
+      console.log('跳转11111111');
+      
       let report = true;
+      
       go(
         "/recoding/pages/face_report/face_report?id=" +
-          this.state.currentDevice.id+
+        deviceid +
+        "&recordId=" + currentDevice +
         "&report=" +
         report
       );
-      // go(
+
-      //   "/recoding/pages/face_report/face_report?id=" +
-      //   this.state.currentDevice.id
-      // );
     }
   };
 

src/recoding/pages/recording/recording.tsx

@@ -320,12 +320,10 @@ export default class Recording extends Component<any, any> {
     // 获取echarts数据 这个是获取接口更新echarts页面
     let res2 = await InstrumentInfo.apiNursingLog.getStatiCDE(ids);
     let nursingData = JSON.parse(res2.data.data.nursingData)
-
     let obj = {
       modeName: res2.data.data.modeName,
       data: nursingData
     }
- 
     let report = false;
 
     go(