From 041822f2ddd85f72de867a6ff4545298dcb50578 Mon Sep 17 00:00:00 2001 From: qsj <731458905@qq.com> Date: Mon, 25 Mar 2024 11:45:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/moduleIOT/pages/iotCarePlan/FR200.tsx | 90 +++++++++++-------- .../iotCarePlan/components/Footer/FR200.less | 6 +- .../pages/face_report_one/face_report_one.tsx | 4 +- src/recoding/pages/recording/recording.less | 6 +- src/recoding/pages/recording/recording.tsx | 6 +- 5 files changed, 59 insertions(+), 53 deletions(-) diff --git a/src/moduleIOT/pages/iotCarePlan/FR200.tsx b/src/moduleIOT/pages/iotCarePlan/FR200.tsx index e4c839a..978f4b4 100644 --- a/src/moduleIOT/pages/iotCarePlan/FR200.tsx +++ b/src/moduleIOT/pages/iotCarePlan/FR200.tsx @@ -718,8 +718,6 @@ class IotCarePlanFR200 extends Component { let gears: any = [] let eDate: any = [] echartsData?.map(item => { - console.log(item,'查看数据'); - const result = item.createTime.split(' ')[0].substring(5); eDate.push(result) item.nursingData = JSON.parse(item.nursingData) @@ -901,34 +899,32 @@ class IotCarePlanFR200 extends Component { if (jsonStatus.workMode === "moistureTest") { if ("success" === jsonStatus.testStatus) { let waterStepList = this.state.waterStepList; + // 到达第几个step let waterStepIndex = this.state.waterStepIndex; - let timerIdSuccess = this.state.timerIdSuccess; - let timerIdSchedule = this.state.timerIdSchedule; - + + // 代表5秒以后最后拿到的结果 if (waterStepList[waterStepIndex].finish) { + // 获取等级 waterStepList[waterStepIndex].forehead = jsonStatus.waterLevel; + // 检测完成 if (waterStepIndex === 2) { this.setState({ isRuningTest: 4, }); } else { + // 启动检测 this.setState({ isRuningTest: 1, }); } - - clearTimeout(timerIdSuccess); - clearTimeout(timerIdSchedule); - console.log("成功拿到", jsonStatus, waterStepIndex); + // 一共有3条数据 let num = waterStepIndex; if (waterStepIndex < 2) { num = waterStepIndex + 1; this.waterTestNext(num) } this.setState({ - timerIdSuccess: null, - timerIdSchedule: null, waterStepIndex: num, waterStepList, }); @@ -936,11 +932,9 @@ class IotCarePlanFR200 extends Component { } else { let waterStepList = this.state.waterStepList; let waterStepIndex = this.state.waterStepIndex; - let timerIdSuccess = this.state.timerIdSuccess; - let timerIdSchedule = this.state.timerIdSchedule; + // 5秒后获取的结果 if (waterStepList[waterStepIndex].finish) { - clearTimeout(timerIdSuccess); - clearTimeout(timerIdSchedule); + // 获取失败后，把进度条清理0 waterStepList[waterStepIndex].schedule = 0; waterStepList[waterStepIndex].finish = false; this.setState({ @@ -1584,8 +1578,40 @@ class IotCarePlanFR200 extends Component { }); }; + executePromises = async () => { + let waterStepList = this.state.waterStepList; + let waterStepIndex = this.state.waterStepIndex; + let that =this + await new Promise((resolve) => { + setTimeout(() => { + waterStepList[waterStepIndex].schedule = 100; + that.setState({ + + waterStepList, + }); + + resolve(); + }, 3000); + }).then(() => { + return new Promise((resolve) => { + setTimeout(() => { + waterStepList[waterStepIndex].finish = true; + that.setState({ + waterStepList, + }); + resolve(); + }, 2000); + }); + }); + + + }; + + + + // 检测并控制工作状态 - handleWorkStatus = (isBtnClick: boolean, workStatus) => { + handleWorkStatus = async (isBtnClick: boolean, workStatus) => { const { DeviceConnectStatus, ActiveModeItem } = this.state; let newWorkStatus = workStatus || @@ -1611,30 +1637,16 @@ class IotCarePlanFR200 extends Component { if (ActiveModeItem.modeType === "moistureTest") { let that = this sendParams.testStatus = "standby"; // 切换为准备 - let waterStepList = this.state.waterStepList; - let waterStepIndex = this.state.waterStepIndex; - let timerIdSchedule = this.state.timerIdSchedule; - let timerIdSuccess = this.state.timerIdSuccess; - if (isBtnClick) { - timerIdSchedule = setTimeout(function () { - waterStepList[waterStepIndex].schedule = 100; + + // 3秒定时器，逻辑3秒把进度条弄成100，再加2秒获取最后结果 - timerIdSuccess = setTimeout(function () { - waterStepList[waterStepIndex].finish = true; - that.setState({ - waterStepList, - }); - }, 2000); - that.setState({ - waterStepList, - timerIdSuccess, - }); - }, 3000); + if (isBtnClick) { that.setState({ isRuningTest: 2, - timerIdSchedule, + }); - // 水分测试启动 + this.executePromises() + sendParams.testStatus = "start"; // 点击开始再开始 console.log("点击开始", isBtnClick); } @@ -2089,7 +2101,7 @@ class IotCarePlanFR200 extends Component { return nursingData; } - return { nursingData: JSON.stringify({ workMode: nowFR200NursingHistory.workMode, }),showFace:true } + return { nursingData: JSON.stringify({ workMode: nowFR200NursingHistory.workMode, }), showFace: true } }; // 计算挡位 @@ -2127,7 +2139,7 @@ class IotCarePlanFR200 extends Component { } let res1: any = await this.todoPromise(); if (!res1?.showFace) { - + params = { ...params, ...res1 }; } console.log(res1, "查看返回数据"); @@ -2634,7 +2646,7 @@ class IotCarePlanFR200 extends Component { showFullscreenBtn={false} onLoadedMetaData={this.GetVideosTime} /> - + {errorTips && ( diff --git a/src/moduleIOT/pages/iotCarePlan/components/Footer/FR200.less b/src/moduleIOT/pages/iotCarePlan/components/Footer/FR200.less index c36adf7..9aca7ce 100644 --- a/src/moduleIOT/pages/iotCarePlan/components/Footer/FR200.less +++ b/src/moduleIOT/pages/iotCarePlan/components/Footer/FR200.less @@ -11,12 +11,12 @@ // padding-bottom: env(safe-area-inset-bottom); box-sizing: border-box; .btn { - width: 690rpx; - height: 90rpx; + width: 695rpx; + height: 75rpx; background: #000; border-radius: 45rpx; color: #fff; - line-height: 90rpx; + line-height: 75rpx; text-align: center; margin: 21rpx 49rpx 42rpx 30rpx; font-size: 32rpx; 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 ea715d3..e68d682 100644 --- a/src/recoding/pages/face_report_one/face_report_one.tsx +++ b/src/recoding/pages/face_report_one/face_report_one.tsx @@ -211,8 +211,7 @@ export default class Index extends Component { }; let res = await InstrumentInfo.apiClock.getList(data); if (res.data.code === 200) { - console.log(this.state.clockStatistics, 88888); - + this.state.clockStatistics.map((item) => { if (item.id === id) { item.detail = res.data.data; @@ -293,7 +292,6 @@ export default class Index extends Component { init(options){ let obj =JSON.parse(options.obj) -console.log(obj,'obj111111111111111'); let recordData =this.state.recordData let modeImage =this.state.modeImage diff --git a/src/recoding/pages/recording/recording.less b/src/recoding/pages/recording/recording.less index d8bed42..af889b9 100644 --- a/src/recoding/pages/recording/recording.less +++ b/src/recoding/pages/recording/recording.less @@ -480,13 +480,13 @@ page { } .btn { - width: 540rpx; - height: 90rpx; + width: 695rpx; + height: 75rpx; background: #000000; border-radius: 45rpx; color: #fff; text-align: center; - line-height: 90rpx; + line-height: 75rpx; font-weight: bold; font-size: 32rpx; } diff --git a/src/recoding/pages/recording/recording.tsx b/src/recoding/pages/recording/recording.tsx index f3c6f1a..6c49b82 100644 --- a/src/recoding/pages/recording/recording.tsx +++ b/src/recoding/pages/recording/recording.tsx @@ -357,8 +357,6 @@ export default class Recording extends Component { instrumentId: allData.instrumentId } let res = await InstrumentInfo.fr200.moistureTest(data); - console.log(res,'查看返回数据'); - let echartsData = res.data.rows for (let i = 0; i < echartsData.length; i++) { for (let j = i + 1; j < echartsData.length; j++) { @@ -374,10 +372,8 @@ export default class Recording extends Component { } let gears: any = [] let eDate: any = [] - console.log(echartsData,'echartsDataechartsData'); - echartsData.map(item => { - + const result = item.createTime.split(' ')[0].substring(5); eDate.push(result) item.nursingData = JSON.parse(item.nursingData)