Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj

src/app.config.ts

@@ -83,7 +83,6 @@ export default defineAppConfig({
       root: "recoding",
       pages: [
         "pages/recording/recording",
-        "pages/face_report/face_report",
         "pages/face_report_one/face_report_one",
         "pages/moisture_test_report/moisture_test_report",
        

src/moduleIOT/pages/iotCarePlan/FR200.less

@@ -1,13 +1,49 @@
 @import url(./WL200.less);
-.text {
-  // writing-mode: vertical-lr;
-  //   text-orientation: upright;
-  //   white-space: nowrap;
-  //   font-size: 18px;
-  //   font-weight: bold;
-  //   background-color: #c2e5f3;
-  //   color: #fff;
-  //   width: 100%;
+
+.fr200-iot-device {
+  width: 690rpx;
+  height: 150rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  .device-time {
+    font-size: 26rpx;
+    color: #000;
+    font-weight: 400;
+    .time {
+      font-size: 30rpx;
+      font-weight: 800;
+    }
+  }
+  .line {
+    width: 1rpx;
+    height: 50rpx;
+    background: #dddddd;
+    margin-left: 34rpx;
+    margin-right: 34rpx;
+  }
+  .gear {
+    margin-left: 10rpx;
+    font-size: 30rpx;
+    font-weight: 800;
+    color: #000;
+  }
+  .electricity-box {
+    display: flex;
+    flex-direction: column;
+    .item {
+      display: flex;
+      align-items: center;
+      justify-content: left;
+      height: 50rpx;
+      .label {
+        // width: 154rpx;
+        font-size: 26rpx;
+        color: #000;
+        margin-right: 14rpx;
+      }
+    }
+  }
 }
 .show {
   display: none;

src/moduleIOT/pages/iotCarePlan/components/ElectricityView/Electricity.tsx

@@ -0,0 +1,61 @@
+import Taro from "@tarojs/taro";
+import classnames from "classnames";
+import { Block, View, Image, Text } from "@tarojs/components";
+import { useState, useEffect } from "react";
+// import "./index.less";
+
+interface Props {
+  Electricity: any;
+  DeviceConnectStatus: any;
+}
+function Index({ Electricity, DeviceConnectStatus }: Props) {
+  return (
+    <Block>
+      <View className="electricity-box">
+        {DeviceConnectStatus === 1 && (
+          <Block>
+            <View className="item">
+              <View className="label">电量：</View>
+              <View className="value flex aitems">
+                {Electricity >= 4 && (
+                  <Block>
+                    <View className="v1 battery_icon"></View>
+                    <View className="v1 battery_icon"></View>
+                    <View className="v1 battery_icon"></View>
+                    <View className="v1 battery_icon"></View>
+                  </Block>
+                )}
+                {Electricity === 3 && (
+                  <Block>
+                    <View className="v1 battery_icon"></View>
+                    <View className="v1 battery_icon"></View>
+                    <View className="v1 battery_icon"></View>
+                    <View className="v2 battery_icon"></View>
+                  </Block>
+                )}
+                {Electricity === 2 && (
+                  <Block>
+                    <View className="v1 battery_icon"></View>
+                    <View className="v1 battery_icon"></View>
+                    <View className="v2 battery_icon"></View>
+                    <View className="v2 battery_icon"></View>
+                  </Block>
+                )}
+                {Electricity <= 1 && (
+                  <Block>
+                    <View className="v3 battery_icon"></View>
+                    <View className="v2 battery_icon"></View>
+                    <View className="v2 battery_icon"></View>
+                    <View className="v2 battery_icon"></View>
+                  </Block>
+                )}
+              </View>
+            </View>
+          </Block>
+        )}
+      </View>
+    </Block>
+  );
+}
+
+export default Index;