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 f91a4aa..e78f5c9 100644 --- a/src/recoding/pages/face_report_one/face_report_one.tsx +++ b/src/recoding/pages/face_report_one/face_report_one.tsx @@ -212,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) => { @@ -257,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); 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 656070f..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,7 +22,7 @@ class MoistureTestReport extends Component { this.state = { name: "重新登录", imgUrl: '', - reportShow:true, + reportShow: true, reportData: { curDate: '', shuifenLevel: { @@ -60,7 +60,7 @@ class MoistureTestReport extends Component { onLoad(option) { console.log(option); let Bool = JSON.parse(option?.report) - if(!Bool){ + if (!Bool) { this.setState({ reportShow: Bool }) @@ -99,7 +99,7 @@ class MoistureTestReport extends Component { } render() { - let { name, imgUrl, reportData, reportData1, reportShow,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 = { @@ -272,7 +272,10 @@ class MoistureTestReport extends Component { 促渗档位推荐 - 前往护理 + {reportShow ? ( + 前往护理 + ) : null} + @@ -303,15 +306,15 @@ class MoistureTestReport extends Component { {reportShow ? ( - - 继续护理 - - 主页 - - - + + 继续护理 + + 主页 + + + ) : null} - + ); diff --git a/src/recoding/pages/recording/recording.tsx b/src/recoding/pages/recording/recording.tsx index 9768892..9d39d6a 100644 --- a/src/recoding/pages/recording/recording.tsx +++ b/src/recoding/pages/recording/recording.tsx @@ -322,7 +322,7 @@ export default class Recording extends Component { modeName: res2.data.data.modeName, data: nursingData, }; - let report = false; + let report = true; go( "/recoding/pages/face_report_one/face_report_one?id=" + @@ -336,7 +336,7 @@ export default class Recording extends Component { // 打开第二种类型 two = async (item) => { console.log("打开第二种类型", item); - let report = false; + let report = true; go( "/recoding/pages/face_report/face_report?id=" + item.id + @@ -724,7 +724,7 @@ export default class Recording extends Component { {clockStatistics.map((item) => ( - + {item.year}年{item.month}月