合并冲突

src/moduleIOT/pages/iotCarePlan/WL200.tsx

@@ -11,7 +11,8 @@ import React, {
   useRef,
 } from "react";
 
-// import Echarts from "./components/Echart/index";
+import Echarts from "./components/Echart/index";
+import EchartFace from "./components/Echart_face/index";
 import {
   Block,
   View,
@@ -2036,6 +2037,11 @@ 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,15 +2266,13 @@ class IotCarePlanWL200 extends Component<any, any> {
                     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>
@@ -2336,7 +2340,8 @@ class IotCarePlanWL200 extends Component<any, any> {
               />
             )}
 
-            {/* <Echarts></Echarts> */}
+            <Echarts></Echarts>
+            <EchartFace></EchartFace>
           </View>
 
           <Footer

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}

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,17 @@ 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%" }}
+        style={{ width: "630rpx", height: "260rpx" }}
+        />
+       
+      {/* <View className="box">
         <Echarts
           echarts={echarts}
           option={option}
@@ -363,7 +373,7 @@ const seriesData = [
           style={{ width: "630rpx", height: "240rpx" }}
         />
         
-      </View>
+      </View> */}
 
       
     </Block>