From 5fb64bc55ce58c2ba2daffb6756b87935f26947d Mon Sep 17 00:00:00 2001
From: rongweikang <1174906669@qq.com>
Date: Mon, 18 Mar 2024 14:27:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iotCarePlan/components/Echart/index.less  |  5 +--
 .../iotCarePlan/components/Echart/index.tsx   | 40 ++-----------------
 .../moisture_test_report.less                 |  5 ++-
 .../moisture_test_report.tsx                  | 22 +++++-----
 4 files changed, 21 insertions(+), 51 deletions(-)

diff --git a/src/moduleIOT/pages/iotCarePlan/components/Echart/index.less b/src/moduleIOT/pages/iotCarePlan/components/Echart/index.less
index 516b404..ad4506d 100644
--- a/src/moduleIOT/pages/iotCarePlan/components/Echart/index.less
+++ b/src/moduleIOT/pages/iotCarePlan/components/Echart/index.less
@@ -1,13 +1,12 @@
 .box {
   width: 690rpx;
   height: 320rpx;
-  margin: 28rpx auto;
+  margin: 28rpx auto 150rpx;
   background-color: #fff;
   border-radius: 30rpx;
   padding: 35rpx 25rpx 25rpx 35rpx;
   box-sizing: border-box;
   position: relative;
-  z-index: 0;
 }
 .box_background {
   position: absolute;
@@ -40,7 +39,7 @@
     position: relative;
     height: 18rpx;
     .bottom_line {
-      border-bottom: 1rpx #ccc dashed;
+      // border-bottom: 1rpx #ccc dashed;
       width: 550rpx;
       margin-left: 20rpx;
       position: absolute;
diff --git a/src/moduleIOT/pages/iotCarePlan/components/Echart/index.tsx b/src/moduleIOT/pages/iotCarePlan/components/Echart/index.tsx
index 414a36f..20ac446 100644
--- a/src/moduleIOT/pages/iotCarePlan/components/Echart/index.tsx
+++ b/src/moduleIOT/pages/iotCarePlan/components/Echart/index.tsx
@@ -15,36 +15,6 @@ interface Props {
 }
 
 function Index() {
-  const stepIndex = 0;
-  const testIndex = 1;
-
-  const stepList = [
-    {
-      value: "Step1",
-      name: "额头",
-      finish: false,
-    },
-    {
-      value: "Step2",
-      name: "左脸颊",
-      finish: false,
-    },
-    {
-      value: "Step3",
-      name: "右脸颊",
-      finish: false,
-    },
-  ];
-
-  const gearLevel = {
-    currentGear: null,
-    //现在工作的档位
-    currentGearMode: "forehead",
-    //现在工作模式
-    forehead: 5,
-    leftCheek: 5,
-    rightCheek: 5,
-  };
   const echartsRef = useRef<EchartsHandle>(null);
   const option: EChartOption = {
     grid: {
@@ -54,10 +24,6 @@ function Index() {
       right: "28rpx",
       bottom: "17rpx",
     },
-    legend: {
-      show: false,
-      zlevel: -1,
-    },
     xAxis: {
       // name: '',
       // nameGap: 5,
@@ -100,7 +66,7 @@ function Index() {
       max: 8,
       splitNumber: 8,
       splitLine: {
-        show: false,
+        show: true,
         lineStyle: {
           color: "#cccccc",
           type: [4, 2],
@@ -294,7 +260,7 @@ function Index() {
           ref={echartsRef}
           // isPage={false}
           // style自定义设置echarts宽高
-          style={{ width: "630rpx", height: "260rpx" }}
+          style={{ width: "630rpx", height: "260rpx", zIndex: 1 }}
         />
         <View className='box_background'>
           <Image className='full' src={require("@/img/full-scran.png")}></Image>
@@ -302,7 +268,7 @@ function Index() {
           {level.map((item) => (
             <View className='line' key={item}>
               <View className='number'>{item}</View>
-              <View className='bottom_line'>8</View>
+              <View className='bottom_line'></View>
             </View>
           ))}
           <View className='line'>
diff --git a/src/pages/moisture_test_report/moisture_test_report.less b/src/pages/moisture_test_report/moisture_test_report.less
index 9ce13f2..a9d9092 100644
--- a/src/pages/moisture_test_report/moisture_test_report.less
+++ b/src/pages/moisture_test_report/moisture_test_report.less
@@ -7,8 +7,9 @@ page {
 }
 
 .moisture_test_report .time {
+    font-family: Poppins, Poppins;
     font-size: 36rpx;
-    font-weight: 500;
+    font-weight: 700;
     color: #000000;
     line-height: 1;
     padding: 38rpx 0;
@@ -245,7 +246,7 @@ page {
 
 .report_chart {
     width: 100%;
-    height: 500rpx;
+    height: 328rpx;
     background: #FFFFFF;
     border-radius: 30rpx;
     margin: 20rpx 0;
diff --git a/src/pages/moisture_test_report/moisture_test_report.tsx b/src/pages/moisture_test_report/moisture_test_report.tsx
index 67baec6..3cf766c 100644
--- a/src/pages/moisture_test_report/moisture_test_report.tsx
+++ b/src/pages/moisture_test_report/moisture_test_report.tsx
@@ -9,9 +9,8 @@ import Taro from "@tarojs/taro";
 import { connect } from "react-redux";
 import { setMobile } from "../../store/features/userInfo";
 /*** redux end ***/
-
-import { WCUserLogin } from "../../utils/Interface";
-
+import Navbar from "../../components/navbar/navbar";
+import Echarts from "./Echarts/index";
 import "./moisture_test_report.less";
 
 class MoistureTestReport extends Component<any, any> {
@@ -49,7 +48,7 @@ class MoistureTestReport extends Component<any, any> {
     };
   }
 
-  async onLoad() { }
+
   componentDidMount() { }
 
   componentWillUnmount() { }
@@ -58,6 +57,9 @@ class MoistureTestReport extends Component<any, any> {
 
   componentDidHide() { }
 
+  async onLoad() {
+
+  }
   async initData() { }
 
   getStatusData(level) {
@@ -121,16 +123,18 @@ class MoistureTestReport extends Component<any, any> {
   render() {
     let { name, imgUrl, reportData, bgCssData, isClock, xinde, imglist, id, show } = this.state
     return (
+
       <Block>
-        <View className='moisture_test_report'>
-          <View className='time'>{reportData.curDate || ''}</View>
 
+        <Navbar isBack titleSlot='水分测试报告'></Navbar>
+        <View className='moisture_test_report'>
+          <View className='time'>2023.6.23</View>
           <View className='report_data'>
-            <View className='forehead moisture_block flex' style='{util.getStatusData(reportData.shuifenLevel.head).bg}'>
+            <View className='forehead moisture_block flex' style={this.getStatusData(reportData.shuifenLevel.head).bg}>
               <Image className='moisture_img' src={`/img/fr200/${this.getStatusData(reportData.shuifenLevel.head)}.img}.png`} mode='aspectFill'></Image>
               <View className='pos_info'>
                 <View className='top'>额头</View>
-                {/* <View className='bottom'>{this.getStatusData(7).title}</View> */}
+                <View className='bottom'>{this.getStatusData(7).title}</View>
                 <View className='bottom'></View>
 
               </View>
@@ -217,7 +221,7 @@ class MoistureTestReport extends Component<any, any> {
           <View className='report_chart'>
             <View className='chart_title common_title'>肌肤整体</View>
             <View className='container'>
-              {/* <ec-canvas id='mychart' style='width: 100%;height: 100%' canvas-id='mychart-line' ec='{ ec }'></ec-canvas> */}
+              <Echarts></Echarts>
             </View>
           </View>