From c341252195ecd63899e2ceb6679df9f5b8b3faa0 Mon Sep 17 00:00:00 2001
From: qsj <731458905@qq.com>
Date: Mon, 18 Mar 2024 09:20:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?echarts=E5=9B=BE=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Echart_face/index.tsx            | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/moduleIOT/pages/iotCarePlan/components/Echart_face/index.tsx b/src/moduleIOT/pages/iotCarePlan/components/Echart_face/index.tsx
index 1147913..95b65ef 100644
--- a/src/moduleIOT/pages/iotCarePlan/components/Echart_face/index.tsx
+++ b/src/moduleIOT/pages/iotCarePlan/components/Echart_face/index.tsx
@@ -79,8 +79,8 @@ const seriesData = [
    const option: EChartOption ={
     grid: {
       // 让图表占满容器
-      top: "0rpx",
-      left: "28rpx",
+      top: "10rpx",
+      left: "35rpx",
       right: "28rpx",
       bottom: "17rpx",
     },
@@ -353,7 +353,16 @@ const seriesData = [
   let arr =[2,3,4,5,6,7]
   return (
     <Block>
-      <View className="box">
+         <Echarts
+          echarts={echarts}
+          option={option}
+          ref={echartsRef}
+          // isPage={false}
+          // style自定义设置echarts宽高
+          style={{ width: "100%", height: "100%" }}
+        />
+       
+      {/* <View className="box">
         <Echarts
           echarts={echarts}
           option={option}
@@ -363,7 +372,7 @@ const seriesData = [
           style={{ width: "630rpx", height: "240rpx" }}
         />
         
-      </View>
+      </View> */}
 
       
     </Block>

From 2cb4156bc1c0fe92478ec3b157739832f73bf6ed Mon Sep 17 00:00:00 2001
From: qsj <731458905@qq.com>
Date: Mon, 18 Mar 2024 11:21:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E5=9B=BE=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=B1=82=E7=BA=A7=E8=BF=87=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/moduleIOT/pages/iotCarePlan/WL200.tsx       | 17 +++++++++++------
 .../iotCarePlan/components/Echart/index.tsx     |  2 ++
 .../components/Echart_face/index.tsx            |  3 ++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/moduleIOT/pages/iotCarePlan/WL200.tsx b/src/moduleIOT/pages/iotCarePlan/WL200.tsx
index 0a74b90..380a28f 100644
--- a/src/moduleIOT/pages/iotCarePlan/WL200.tsx
+++ b/src/moduleIOT/pages/iotCarePlan/WL200.tsx
@@ -12,6 +12,7 @@ import React, {
 } from "react";
 
 import Echarts from "./components/Echart/index";
+import EchartFace from "./components/Echart_face/index";
 import {
   Block,
   View,
@@ -2036,6 +2037,12 @@ class IotCarePlanWL200 extends Component<any, any> {
     isMuted = !isMuted
     this.setState({ isMuted })
   }
+  GetVideosTime=(event)=>{
+    let videoRef = Taro.createVideoContext('myVideo',this)
+    // videoRef.currentTime
+    console.log('获取播放时间',event.detail.currentTime);
+    
+  }
   onPlay = (e) => {
     console.log('出发', e);
 
@@ -2260,17 +2267,14 @@ class IotCarePlanWL200 extends Component<any, any> {
                     className='video-or-image'
                     src={ActiveModeItem.modeVideo}
                     loop
-
                     id="myVideo"
-
-                    // ref={videoRef}
                     onPlay={this.onPlay}
                     muted={isMuted}
+                    onTimeUpdate={this.GetVideosTime}
                   />
                 )}
-                <button onClick={this.handleClicksound}>音频播放/音频暂停</button>
-
-
+                <button onClick={this.GetVideosTime}>获取视频时长</button>
+                {/* <button onClick={this.handleClicksound}>音频播放/音频暂停</button> */}
                 {/* <button onClick={this.handleClickVideo}>播放/暂停</button> */}
                 {isShowNurse && (
                   <Block>
@@ -2339,6 +2343,7 @@ class IotCarePlanWL200 extends Component<any, any> {
             )}
 
             <Echarts></Echarts>
+            <EchartFace></EchartFace>
           </View>
 
           <Footer
diff --git a/src/moduleIOT/pages/iotCarePlan/components/Echart/index.tsx b/src/moduleIOT/pages/iotCarePlan/components/Echart/index.tsx
index 414a36f..9e7579c 100644
--- a/src/moduleIOT/pages/iotCarePlan/components/Echart/index.tsx
+++ b/src/moduleIOT/pages/iotCarePlan/components/Echart/index.tsx
@@ -47,6 +47,7 @@ function Index() {
   };
   const echartsRef = useRef<EchartsHandle>(null);
   const option: EChartOption = {
+    
     grid: {
       // 让图表占满容器
       top: "28rpx",
@@ -289,6 +290,7 @@ function Index() {
     <Block>
       <View className='box'>
         <Echarts
+        force-use-old-canvas="false"
           echarts={echarts}
           option={option}
           ref={echartsRef}
diff --git a/src/moduleIOT/pages/iotCarePlan/components/Echart_face/index.tsx b/src/moduleIOT/pages/iotCarePlan/components/Echart_face/index.tsx
index 95b65ef..8ca270a 100644
--- a/src/moduleIOT/pages/iotCarePlan/components/Echart_face/index.tsx
+++ b/src/moduleIOT/pages/iotCarePlan/components/Echart_face/index.tsx
@@ -359,7 +359,8 @@ const seriesData = [
           ref={echartsRef}
           // isPage={false}
           // style自定义设置echarts宽高
-          style={{ width: "100%", height: "100%" }}
+        //   style={{ width: "100%", height: "100%" }}
+        style={{ width: "630rpx", height: "260rpx" }}
         />
        
       {/* <View className="box">