diff --git a/src/app.config.ts b/src/app.config.ts index 6e116ca..5b1441a 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -86,6 +86,7 @@ export default defineAppConfig({ "pages/face_report/face_report", "pages/face_report_one/face_report_one", "pages/moisture_test_report/moisture_test_report", + "pages/face_report/face_report", ], }, { diff --git a/src/moduleIOT/pages/iotCarePlan/WL200.tsx b/src/moduleIOT/pages/iotCarePlan/WL200.tsx index b54a119..e9f56c2 100644 --- a/src/moduleIOT/pages/iotCarePlan/WL200.tsx +++ b/src/moduleIOT/pages/iotCarePlan/WL200.tsx @@ -1928,10 +1928,7 @@ class IotCarePlanWL200 extends Component { goFaceReport = () => { // 跳转前置空定时器,防止重复提交 if (currentTimeTimer) clearInterval(currentTimeTimer); - go( - "/recoding/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/face_report/face_report.tsx b/src/recoding/pages/face_report/face_report.tsx index cfdcb19..6f681a3 100644 --- a/src/recoding/pages/face_report/face_report.tsx +++ b/src/recoding/pages/face_report/face_report.tsx @@ -1,9 +1,9 @@ import Taro from "@tarojs/taro"; import classnames from "classnames"; import { Component, PropsWithChildren, useEffect, useState } from "react"; -import { Progress } from "@antmjs/vantui"; +import { Progress , Tab, Tabs, Dialog, Popup } from "@antmjs/vantui"; import { showModal } from "@/utils/traoAPI"; -import { Tab, Tabs, Dialog, Popup } from "@antmjs/vantui"; + import { Block, View, @@ -13,11 +13,11 @@ import { Button, Textarea, } from "@tarojs/components"; -import { date, getdates, previewImage } from "@/utils/util"; +import { date, getdates, previewImage } from "../../../utils/util"; /** 自定义组件 **/ -import Navbar from "@/components/navbar/navbar"; -import { InstrumentInfo } from "@/utils/Interface"; +import Navbar from "../../../components/navbar/navbar"; +import { InstrumentInfo } from "../../../utils/Interface"; /** 自定义组件 **/ import "./face_report.less"; @@ -298,18 +298,18 @@ export default class Index extends Component { } = this.state; return ( - - - - + + + + {statistics.nursingNum} - + - 本月护理天数 + 本月护理天数 - - {statistics.nursingTime} - 本月护理时间 + + {statistics.nursingTime} + 本月护理时间 {/* */} @@ -325,23 +325,23 @@ export default class Index extends Component { {recordData.online == 1 ? "在线" : "离线"} - + - - - {recordData.instrumentName} - - 模式:{recordData.modeName} - + + + {recordData.instrumentName} + + 模式:{recordData.modeName} + 护理时间:{recordData.nursingTime} - + 完成度: { ? 100 : recordData.completionPercentage * 100 } - strokeWidth="12" - color="linearGradient(to right, #eecda1, #ffe9c7) !important" + strokeWidth='12' + color='linearGradient(to right, #eecda1, #ffe9c7) !important' /> - + {" "} {recordData.completionPercentage * 100 > 100 ? 100 @@ -363,11 +363,11 @@ export default class Index extends Component { - 历史记录 + 历史记录 {recordList.map((item) => ( - - - {item.createTime} + + + {item.createTime} { {item.online == 1 ? "在线" : "离线"} - + - - - {item.instrumentName} - - 模式:{item.modeName} - 护理时间:{item.nursingTime} + + + {item.instrumentName} + + 模式:{item.modeName} + 护理时间:{item.nursingTime} - + 完成度: { ? 100 : item.completionPercentage * 100 } - strokeWidth="12" - color="linearGradient(to right, #eecda1, #ffe9c7) !important" + strokeWidth='12' + color='linearGradient(to right, #eecda1, #ffe9c7) !important' /> - + {" "} {item.completionPercentage * 100 > 100 ? 100 @@ -415,75 +415,75 @@ export default class Index extends Component { ))} {reportShow ? ( - - + + 前往打卡 - + 跳过 - + ) : null} this.setState({ show: false })}> - + - 今日打卡 - + 今日打卡 + 本月您已打卡 - {clockStatistics[0]?.clockNum}{" "} + {clockStatistics[0]?.clockNum}{" "} 天,超越 - + {(clockStatistics[0]?.percentage * 100).toFixed(1)}% 花至用户 - + {punchInInfo.clockImageList.map((item, index) => ( - - + + ))} {punchInInfo.clockImageList.length < 3 && ( )} - - + + - + {"(" + (punchInInfo.clockContent.length || 0) + "/120)"} - - + + 确认提交 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 { rightFace: 0 } }, - instrumentId: 0, isClock: false, xinde: '', imglist: [], @@ -55,7 +54,11 @@ class MoistureTestReport extends Component { 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 { 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 { } 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 = { diff --git a/src/recoding/pages/recording/recording.tsx b/src/recoding/pages/recording/recording.tsx index d562116..e9c71d7 100644 --- a/src/recoding/pages/recording/recording.tsx +++ b/src/recoding/pages/recording/recording.tsx @@ -311,7 +311,7 @@ export default class Recording extends Component { } // let report =false - // go("/pages/face_report/face_report?id=" + id + "&recordId=" + recordId+ "&report=" + report ); + // go("/recording/pages/face_report/face_report?id=" + id + "&recordId=" + recordId+ "&report=" + report ); } // 打开第一种类型 One = async (item) => {