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 a32cead..c6b9646 100644 --- a/src/recoding/pages/moisture_test_report/moisture_test_report.tsx +++ b/src/recoding/pages/moisture_test_report/moisture_test_report.tsx @@ -191,84 +191,84 @@ class MoistureTestReport extends Component { }; return ( - - - {reportData.curDate} - + + + {reportData.curDate} + - - 额头 - + + 额头 + {getStatusData(reportData.shuifenLevel.head)!.title} - + - - 左脸颊 - + + 左脸颊 + {getStatusData(reportData.shuifenLevel.leftFace)!.title} - + - - 右脸颊 - + + 右脸颊 + {getStatusData(reportData.shuifenLevel.rightFace)!.title} - + - + - - - + + + - - - - 额头 - + + + + 额头 + { > {/* style='{width: {reportData.shuifenLevel.head * 10}%;{util.getStatusData(reportData.shuifenLevel.head).progressBg}}' */} - + {reportData.shuifenLevel.head}级 - - 左脸颊 - + + 左脸颊 + { }} > - + {reportData.shuifenLevel.leftFace}级 - - 右脸颊 - + + 右脸颊 + { }} > - + {reportData.shuifenLevel.rightFace}级 - - - - 水分等级 + + + + 水分等级 - - - - 严重缺水:1-2级 + + + + 严重缺水:1-2级 - - - 中度缺水:3-4级 + + + 中度缺水:3-4级 - - - 轻微缺水:5-6级 + + + 轻微缺水:5-6级 - - - 水分正常:7-8级 + + + 水分正常:7-8级 - - - 水分充足:9-10级 + + + 水分充足:9-10级 - + 注:各水分等级依据测量得出肌肤含水量划分 - - 肌肤整体水分测试报告 - + + 肌肤整体水分测试报告 + - - - 促渗档位推荐 - {reportShow ? 前往护理 : null} + + + 促渗档位推荐 + {reportShow ? 前往护理 : null} - - + + - 面膜促渗 + 面膜促渗 - - - 促渗档位推荐 - 前往护理 + + + 促渗档位推荐 + 前往护理 - - + + - 面膜促渗 + 面膜促渗 - - - + + + - 额头 - + 额头 + {reportData.shuifenGear.head}档 - + - 左脸颊 - + 左脸颊 + {reportData.shuifenGear.leftFace}档 - + - 右脸颊 - + 右脸颊 + {reportData.shuifenGear.rightFace}档 @@ -436,13 +436,13 @@ class MoistureTestReport extends Component { {reportShow ? ( - - + + 继续护理 - - 主页 - + + 主页 + ) : null} diff --git a/src/recoding/pages/recording/recording.tsx b/src/recoding/pages/recording/recording.tsx index 03903db..e09198b 100644 --- a/src/recoding/pages/recording/recording.tsx +++ b/src/recoding/pages/recording/recording.tsx @@ -70,9 +70,9 @@ export default class Recording extends Component { }; } - componentDidMount() {} + componentDidMount() { } - componentWillUnmount() {} + componentWillUnmount() { } // 格式化时间 getTime(time) { const hour = time.slice(0, 2); @@ -271,9 +271,9 @@ export default class Recording extends Component { this.initData(); } - componentDidShow() {} + componentDidShow() { } - componentDidHide() {} + componentDidHide() { } initData = async () => { this.getRecord(null); @@ -340,11 +340,11 @@ export default class Recording extends Component { go( "/recoding/pages/face_report_one/face_report_one?id=" + - item.id + - "&report=" + - report + - "&obj=" + - JSON.stringify(obj) + item.id + + "&report=" + + report + + "&obj=" + + JSON.stringify(obj) ); }; // 打开第二种类型 @@ -353,11 +353,11 @@ export default class Recording extends Component { let report = false; go( "/recoding/pages/face_report/face_report?id=" + - item.id + - "&recordId=" + - item.instrumentId + - "&report=" + - report + item.id + + "&recordId=" + + item.instrumentId + + "&report=" + + report ); }; // 打开第三种类型 @@ -409,10 +409,8 @@ export default class Recording extends Component { setStorageSync("moistureEachtsData", JSON.stringify(echartsData)); let report = false; go( - `/recoding/pages/moisture_test_report/moisture_test_report?data=${ - allData.nursingData - }&date=${allData.createTime}&modeId=${allData.modeId}&id=${ - allData.instrumentId + `/recoding/pages/moisture_test_report/moisture_test_report?data=${allData.nursingData + }&date=${allData.createTime}&modeId=${allData.modeId}&id=${allData.instrumentId }&echartsData=${JSON.stringify(echartsData)}&report=${report}` ); }