From e148e5c48cceafe164c3ca72bbabc82fa8a4b9e9 Mon Sep 17 00:00:00 2001
From: qsj <731458905@qq.com>
Date: Mon, 25 Mar 2024 16:07:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/moduleIOT/pages/iotCarePlan/FR200.tsx     | 10 +++----
 .../pages/face_report/face_report.less        |  4 +++
 .../pages/face_report_one/face_report_one.tsx |  6 ++--
 .../moisture_test_report.tsx                  | 28 +++++++++++++------
 src/recoding/pages/recording/recording.tsx    |  4 +--
 5 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/moduleIOT/pages/iotCarePlan/FR200.tsx b/src/moduleIOT/pages/iotCarePlan/FR200.tsx
index 8c804e2..c5ae3d8 100644
--- a/src/moduleIOT/pages/iotCarePlan/FR200.tsx
+++ b/src/moduleIOT/pages/iotCarePlan/FR200.tsx
@@ -747,12 +747,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 }`
     );
   }
 
@@ -2669,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">
@@ -2714,8 +2714,8 @@ class IotCarePlanFR200 extends Component<any, any> {
                 onModeLockOpen={this.onModeLockOpen}
               />
             )}
-            <button onClick={this.look.bind(this)}>显示echarts </button>
-            <button onClick={this.updata.bind(this)}>添加数据 </button>
+            {/* <button onClick={this.look.bind(this)}>显示echarts </button>
+            <button onClick={this.updata.bind(this)}>添加数据 </button> */}
 
             <View className={classnames({ show: showEcharts })}>
               <Echarts data={echartsData}></Echarts>
diff --git a/src/recoding/pages/face_report/face_report.less b/src/recoding/pages/face_report/face_report.less
index 1eb5e22..e181a9d 100644
--- a/src/recoding/pages/face_report/face_report.less
+++ b/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;
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 e68d682..f91a4aa 100644
--- a/src/recoding/pages/face_report_one/face_report_one.tsx
+++ b/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'
 
 
 /** 自定义组件 **/
@@ -348,11 +347,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 +383,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>
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 617950a..656070f 100644
--- a/src/recoding/pages/moisture_test_report/moisture_test_report.tsx
+++ b/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 = {
@@ -295,13 +302,16 @@ class MoistureTestReport extends Component<any, any> {
           </View>
         </View>
 
-        <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}>
-            <View className='txt'>主页</View>
-            <Image src='@/img/fr200/right.png' mode='aspectFill'></Image>
-          </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}>
+           <View className='txt'>主页</View>
+           <Image src='@/img/fr200/right.png' mode='aspectFill'></Image>
+         </View>
+       </View>
+        ) : null}
+         
 
       </Block >
     );
diff --git a/src/recoding/pages/recording/recording.tsx b/src/recoding/pages/recording/recording.tsx
index 6c49b82..8e1b9be 100644
--- a/src/recoding/pages/recording/recording.tsx
+++ b/src/recoding/pages/recording/recording.tsx
@@ -388,8 +388,8 @@ export default class Recording extends Component<any, any> {
       gears, eDate
     }
     setStorageSync('moistureEachtsData', JSON.stringify(echartsData))
-
-    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)}`);
+    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 }`);
 
   }