merge:合并

src/moduleIOT/pages/iotCarePlan/FR200.tsx

@@ -916,34 +916,32 @@ class IotCarePlanFR200 extends Component<any, any> {
             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,
                   });
@@ -951,11 +949,9 @@ class IotCarePlanFR200 extends Component<any, any> {
               } 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({
@@ -1599,8 +1595,40 @@ class IotCarePlanFR200 extends Component<any, any> {
     });
   };
 
+  executePromises = async () => {
+    let waterStepList = this.state.waterStepList;
+    let waterStepIndex = this.state.waterStepIndex;
+    let that =this
+    await new Promise<void>((resolve) => {
+      setTimeout(() => {
+        waterStepList[waterStepIndex].schedule = 100;
+            that.setState({
+              
+              waterStepList,
+            });
+        
+        resolve();
+      }, 3000);
+    }).then(() => {
+      return new Promise<void>((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 ||
@@ -1626,30 +1654,16 @@ class IotCarePlanFR200 extends Component<any, any> {
     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);
       }
@@ -2106,12 +2120,7 @@ class IotCarePlanFR200 extends Component<any, any> {
 
       return nursingData;
     }
-    return {
-      nursingData: JSON.stringify({
-        workMode: nowFR200NursingHistory.workMode,
-      }),
-      showFace: true,
-    };
+    return { nursingData: JSON.stringify({ workMode: nowFR200NursingHistory.workMode, }), showFace: true }
   };
 
   // 计算挡位
@@ -2660,7 +2669,7 @@ class IotCarePlanFR200 extends Component<any, any> {
                   showFullscreenBtn={false}
                   onLoadedMetaData={this.GetVideosTime}
                 />
-
+                <button onClick={this.executePromises}>点击按钮</button>
                 {errorTips && (
                   <Block>
                     <View className="msg-tips">

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;

src/recoding/pages/face_report_one/face_report_one.tsx

@@ -211,8 +211,7 @@ export default class Index extends Component<any, any> {
     };
     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<any, any> {
   init(options){
 
     let obj =JSON.parse(options.obj)
-console.log(obj,'obj111111111111111');
 
     let recordData =this.state.recordData
     let modeImage =this.state.modeImage

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;
 }

src/recoding/pages/recording/recording.tsx

@@ -357,9 +357,13 @@ export default class Recording extends Component<any, any> {
       instrumentId: allData.instrumentId,
     };
     let res = await InstrumentInfo.fr200.moistureTest(data);
+<<<<<<< HEAD
     console.log(res, "查看返回数据");
 
     let echartsData = res.data.rows;
+=======
+    let echartsData = res.data.rows
+>>>>>>> e0ab75bf023ef77e66013692d9b9e57f5e9315cc
     for (let i = 0; i < echartsData.length; i++) {
       for (let j = i + 1; j < echartsData.length; j++) {
         if (
@@ -377,6 +381,7 @@ export default class Recording extends Component<any, any> {
         }
       }
     }
+<<<<<<< HEAD
     let gears: any = [];
     let eDate: any = [];
     console.log(echartsData, "echartsDataechartsData");
@@ -392,6 +397,22 @@ export default class Recording extends Component<any, any> {
       level = Math.floor(level / 3);
       gears.push(level);
     });
+=======
+    let gears: any = []
+    let eDate: any = []
+    echartsData.map(item => {
+
+      const result = item.createTime.split(' ')[0].substring(5);
+      eDate.push(result)
+      item.nursingData = JSON.parse(item.nursingData)
+      let level: any = 0
+      item.nursingData?.GearData?.map(gear => {
+        level = level + gear.forehead
+      })
+      level = Math.floor(level / 3)
+      gears.push(level)
+    })
+>>>>>>> e0ab75bf023ef77e66013692d9b9e57f5e9315cc
     echartsData = {
       gears,
       eDate,