From 51051e6bfb5e21169830799d9f7bf965b7fe926a Mon Sep 17 00:00:00 2001
From: blak-kong <546598185@qq.com>
Date: Wed, 27 Mar 2024 21:16:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A8=AA=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/moduleIOT/pages/iotCarePlan/FR200.tsx | 37 ++++++++---------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/moduleIOT/pages/iotCarePlan/FR200.tsx b/src/moduleIOT/pages/iotCarePlan/FR200.tsx
index a9d7c8b..2612a0f 100644
--- a/src/moduleIOT/pages/iotCarePlan/FR200.tsx
+++ b/src/moduleIOT/pages/iotCarePlan/FR200.tsx
@@ -99,6 +99,7 @@ class IotCarePlanFR200 extends Component<any, any> {
   constructor(props) {
     super(props);
     this.state = {
+      isFullScreen: true,
       textshow: false,
       textscreen: "portrait",
       name: "FR200",
@@ -390,7 +391,6 @@ class IotCarePlanFR200 extends Component<any, any> {
   ];
 
   async onLoad(option) {
-    // await closeBLEConnection(this.props.bluetoothInfo.deviceId);
     console.log(option, "跳转过来的数据");
     if (option.modeId) {
       this.setState({ activeModeID: option.modeId });
@@ -2392,12 +2392,14 @@ class IotCarePlanFR200 extends Component<any, any> {
 
     return (
       <Block>
-        <Navbar
-          titleSlot={title}
-          isBack
-          isCustomBack
-          customBack={this.customBack}
-        />
+        {isFullScreen && (
+          <Navbar
+            titleSlot={title}
+            isBack
+            isCustomBack
+            customBack={this.customBack}
+          />
+        )}
 
         <View>
           <View catchMove>
@@ -2612,7 +2614,9 @@ class IotCarePlanFR200 extends Component<any, any> {
                 />
               )}
               <button onClick={this.updata.bind(this)}>模拟数据更新 </button>
-              {/* <button onClick={this.updata.bind(this)}>添加数据 </button> */}
+              <View className={classnames({ show: showEcharts })}>
+                <Echarts series={series} full={this.full.bind(this)}></Echarts>
+              </View>
 
               {(ActiveModeItem?.modeType === "maskPenetration" ||
                 ActiveModeItem?.modeType === "essence") &&
@@ -2646,23 +2650,6 @@ class IotCarePlanFR200 extends Component<any, any> {
             )}
           </View>
         </View>
-
-        {/*        
-          <View>
-            <button onClick={this.updata.bind(this)}>模拟数据更新 </button>
-
-            <EchartsFullScean
-              series={series}
-              full={this.full}
-            ></EchartsFullScean>
-          </View> */}
-
-        <View
-          className={classnames({ show: showEcharts })}
-          style="margin-top:200px"
-        >
-          <Echarts series={series} full={this.full.bind(this)}></Echarts>
-        </View>
       </Block>
     );
   }