merge 合并代码

src/moduleIOT/pages/iotCarePlan/FR200.tsx

@@ -748,12 +748,12 @@ class IotCarePlanFR200 extends Component<any, any> {
       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<any, any> {
                   showFullscreenBtn={false}
                   onLoadedMetaData={this.GetVideosTime}
                 />
-                {/* <Button onClick={this.executePromises}>点击按钮</Button> */}
+
                 {errorTips && (
                   <Block>
                     <View className="msg-tips">

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;

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 {
+// .content {
-  display: flex;
+//   display: flex;
-  flex-flow: column;
+//   flex-flow: column;
-  justify-content: space-between;
+//   justify-content: space-between;
-  background-color: #f8f8f8;
+//   background-color: #f8f8f8;
-  border-radius: 30rpx;
+//   border-radius: 30rpx;
-  padding: 21rpx;
+//   padding: 21rpx;
-  border-radius: 20rpx;
+//   border-radius: 20rpx;
-    width: 457rpx;
+//     width: 457rpx;
-    height: 195rpx;
+//     height: 195rpx;
  
-}
+// }
 
 .content_top{
     height: 140rpx;

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<any, any> {
     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<any, any> {
     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);
+    let res1 = await InstrumentInfo.apiClock.getLatestClockRecord();
-    // console.log(recordId);
+  
+    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<any, any> {
             <View className='statistic_title'>{statistics.nursingTime}</View>
             <View className='statistic_desc'>本月护理时间</View>
           </View>
-          {/* </block> */}
+        
         </View>
         <View className='main m-x-30'>
           <View className='products_item' style='border: none'>
-
             <View className='products_middle flex'>
               <View className='left'>
                 <Image
@@ -385,7 +399,7 @@ export default class Index extends Component<any, any> {
           <View className='main_title'>能量等级图谱-{recordData.modeName}</View>
           <View className='eacharts'>
           <EchartsForm EchartsData={EchartsData}></EchartsForm>
-          {/* <Echarts1></Echarts1> */}
+        
           </View>
 
         </View>

src/recoding/pages/moisture_test_report/moisture_test_report.tsx

@@ -22,6 +22,7 @@ class MoistureTestReport extends Component<any, any> {
     this.state = {
       name: "重新登录",
       imgUrl: '',
+      reportShow: true,
       reportData: {
         curDate: '',
         shuifenLevel: {
@@ -58,10 +59,16 @@ class MoistureTestReport extends Component<any, any> {
 
   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<any, any> {
   }
 
   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<any, any> {
           <View className='gear_recommend'>
             <View className='gear_header flex aitems sb'>
               <View className='gear_title common_title'>促渗档位推荐</View>
+              {reportShow ? (
                 <View className='gear_btn'>前往护理</View>
+              ) : null}
+
             </View>
             <View className='gear_content flex aitems sb'>
               <View className='left_content'>
@@ -295,6 +305,7 @@ class MoistureTestReport extends Component<any, any> {
           </View>
         </View>
 
+        {reportShow ? (
           <View className='go_clock_in flex sb aitems' >
             <View className='go_clock_btn' onClick={this.toNursing.bind(this)}>继续护理</View>
             <View className='jump_box flex aitems' onClick={this.toIndex}>
@@ -302,6 +313,8 @@ class MoistureTestReport extends Component<any, any> {
               <Image src='@/img/fr200/right.png' mode='aspectFill'></Image>
             </View>
           </View>
+        ) : null}
+
 
       </Block >
     );

src/recoding/pages/recording/recording.tsx

@@ -403,18 +403,13 @@ export default class Recording extends Component<any, any> {
       gears.push(level);
     });
     echartsData = {
-      gears,
+      gears, eDate
-      eDate,
+    }
-    };
+    setStorageSync('moistureEachtsData', JSON.stringify(echartsData))
-    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<any, any> {
                 {clockStatistics.map((item) => (
                   <View className="month_statistics" key={item.id}>
                     <View className="flex aitems sb">
-                      <View className="time">
+                      <View className="month_item_date">
                         {item.year}年{item.month}月
                       </View>
                       <View