diff --git a/src/recoding/pages/recording/recording.tsx b/src/recoding/pages/recording/recording.tsx
index f880aa3..5cd93cc 100644
--- a/src/recoding/pages/recording/recording.tsx
+++ b/src/recoding/pages/recording/recording.tsx
@@ -357,13 +357,7 @@ 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 (
@@ -381,11 +375,8 @@ export default class Recording extends Component<any, any> {
         }
       }
     }
-<<<<<<< HEAD
     let gears: any = [];
     let eDate: any = [];
-    console.log(echartsData, "echartsDataechartsData");
-
     echartsData.map((item) => {
       const result = item.createTime.split(" ")[0].substring(5);
       eDate.push(result);
@@ -397,22 +388,6 @@ 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,