diff --git a/src/moduleIOT/pages/iotCarePlan/FR200.tsx b/src/moduleIOT/pages/iotCarePlan/FR200.tsx index 7a3f0c8..d27368c 100644 --- a/src/moduleIOT/pages/iotCarePlan/FR200.tsx +++ b/src/moduleIOT/pages/iotCarePlan/FR200.tsx @@ -748,12 +748,12 @@ class IotCarePlanFR200 extends Component { eDate, }; setStorageSync("moistureEachtsData", JSON.stringify(echartsData)); - + let report = true; // go(`/recoding/pages/moisture_test_report/moisture_test_report?data=${allData.nursingData}&date=${allData.createTime}&modeId=${allData.modeId}&id=${allData.instrumentId}&echartsData=${JSON.stringify(echartsData)}`); go( `/recoding/pages/moisture_test_report/moisture_test_report?data=${nursingData}&date=${formattedDate}&modeId=${ActiveModeItemId}&id=${currentDeviceId}&echartsData=${JSON.stringify( echartsData - )}` + )}&report=${report}` ); } @@ -2671,7 +2671,7 @@ class IotCarePlanFR200 extends Component { showFullscreenBtn={false} onLoadedMetaData={this.GetVideosTime} /> - {/* */} + {errorTips && ( diff --git a/src/recoding/pages/face_report/face_report.less b/src/recoding/pages/face_report/face_report.less index 1eb5e22..e181a9d 100644 --- a/src/recoding/pages/face_report/face_report.less +++ b/src/recoding/pages/face_report/face_report.less @@ -139,6 +139,10 @@ page { height: 100% !important; border-radius: 20rpx; } + .showImg:last-child{ + width: 40rpx !important; + height: 40rpx !important; + } } .info4 { position: relative; diff --git a/src/recoding/pages/face_report_one/face_report_one.less b/src/recoding/pages/face_report_one/face_report_one.less index a96cb79..c8bce06 100644 --- a/src/recoding/pages/face_report_one/face_report_one.less +++ b/src/recoding/pages/face_report_one/face_report_one.less @@ -82,6 +82,7 @@ page { .text-title{ font-size: 18rpx; color: #999999; + margin: 8rpx 0rpx; } .main { border-radius: 30rpx; @@ -179,6 +180,10 @@ page { height: 100% !important; border-radius: 20rpx; } + .showImg:last-child{ + width: 40rpx !important; + height: 40rpx !important; + } } .info4 { position: relative; @@ -309,18 +314,18 @@ page { // background-color: red; } -.content { - display: flex; - flex-flow: column; - justify-content: space-between; - background-color: #f8f8f8; - border-radius: 30rpx; - padding: 21rpx; - border-radius: 20rpx; - width: 457rpx; - height: 195rpx; +// .content { +// display: flex; +// flex-flow: column; +// justify-content: space-between; +// background-color: #f8f8f8; +// border-radius: 30rpx; +// padding: 21rpx; +// border-radius: 20rpx; +// width: 457rpx; +// height: 195rpx; -} +// } .content_top{ height: 140rpx; diff --git a/src/recoding/pages/face_report_one/face_report_one.tsx b/src/recoding/pages/face_report_one/face_report_one.tsx index e68d682..e78f5c9 100644 --- a/src/recoding/pages/face_report_one/face_report_one.tsx +++ b/src/recoding/pages/face_report_one/face_report_one.tsx @@ -17,7 +17,6 @@ import { InstrumentInfo } from "@/utils/Interface"; // 引入ecahrts图表 // import EchartsForm from '@/moduleIOT/pages/iotCarePlan/components/Echart_face' import EchartsForm from '../../../moduleIOT/pages/iotCarePlan/components/Echart_face' -import Echarts1 from '../../../moduleIOT/pages/iotCarePlan/components/Echart' /** 自定义组件 **/ @@ -213,6 +212,8 @@ export default class Index extends Component { if (res.data.code === 200) { this.state.clockStatistics.map((item) => { + console.log(item,'iiiiiiii',id); + if (item.id === id) { item.detail = res.data.data; item.detail.map((obj) => { @@ -258,13 +259,27 @@ export default class Index extends Component { punchInInfo.clockImageList.splice(i, 1); this.setState({ punchInInfo }); } - getRouteId() { + async getRouteId() { + let clockStatistics =this.state.clockStatistics const searchParams = new URLSearchParams(window.location.search); const id = searchParams.get("id"); const recordId = searchParams.get("recordId"); this.getStatistics(id); - // this.getRecord(id, recordId); - // console.log(recordId); + let res1 = await InstrumentInfo.apiClock.getLatestClockRecord(); + + let obj:any ={} + obj.detail = res1.data.data; + obj.updateTime = getdates(res1.data.data.updateTime).replace(/-/g, "."); + let arr:any =[] + arr.push(obj) + + this.setState({ clockStatistics:arr }); + +setTimeout(function() { + +}, ) + + } getTime(time) { const hour = time.slice(0, 2); @@ -348,11 +363,10 @@ export default class Index extends Component { {statistics.nursingTime} 本月护理时间 - {/* */} + - { 能量等级图谱-{recordData.modeName} - {/* */} + 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 617950a..4f95a06 100644 --- a/src/recoding/pages/moisture_test_report/moisture_test_report.tsx +++ b/src/recoding/pages/moisture_test_report/moisture_test_report.tsx @@ -22,6 +22,7 @@ class MoistureTestReport extends Component { this.state = { name: "重新登录", imgUrl: '', + reportShow: true, reportData: { curDate: '', shuifenLevel: { @@ -58,10 +59,16 @@ class MoistureTestReport extends Component { onLoad(option) { console.log(option); - + let Bool = JSON.parse(option?.report) + if (!Bool) { + this.setState({ + reportShow: Bool + }) + } let data = JSON.parse(option.data) let { reportData } = this.state reportData.curDate = option.date + reportData.curDate = option.report data.GearData.map(item => { if (item.name == '额头') { reportData.shuifenLevel.head = item.forehead @@ -92,7 +99,7 @@ class MoistureTestReport extends Component { } render() { - let { name, imgUrl, reportData, reportData1, isClock, xinde, imglist, id, show, modeId, echartsData, showEcharts } = this.state + let { name, imgUrl, reportData, reportData1, reportShow, isClock, xinde, imglist, id, show, modeId, echartsData, showEcharts } = this.state const getStatusData = (level) => { var bgCssData = { @@ -265,7 +272,10 @@ class MoistureTestReport extends Component { 促渗档位推荐 - 前往护理 + {reportShow ? ( + 前往护理 + ) : null} + @@ -295,13 +305,16 @@ class MoistureTestReport extends Component { - - 继续护理 - - 主页 - + {reportShow ? ( + + 继续护理 + + 主页 + + - + ) : null} + ); diff --git a/src/recoding/pages/recording/recording.tsx b/src/recoding/pages/recording/recording.tsx index 8fe8c05..6bb017a 100644 --- a/src/recoding/pages/recording/recording.tsx +++ b/src/recoding/pages/recording/recording.tsx @@ -403,18 +403,13 @@ export default class Recording extends Component { gears.push(level); }); echartsData = { - gears, - eDate, - }; - setStorageSync("moistureEachtsData", JSON.stringify(echartsData)); + gears, eDate + } + 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}&echartsData=${JSON.stringify(echartsData)}&report=${report }`); - go( - `/recoding/pages/moisture_test_report/moisture_test_report?data=${ - allData.nursingData - }&date=${allData.createTime}&modeId=${allData.modeId}&id=${ - allData.instrumentId - }&echartsData=${JSON.stringify(echartsData)}` - ); + } // 打开其他类型 @@ -738,7 +733,7 @@ export default class Recording extends Component { {clockStatistics.map((item) => ( - + {item.year}年{item.month}月