From 99cdfc9d3973bd92eba901c5eec8384933140372 Mon Sep 17 00:00:00 2001
From: rongweikang <1174906669@qq.com>
Date: Fri, 15 Mar 2024 17:31:17 +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

---
 src/moduleIOT/pages/iotCarePlan/WL200.tsx | 110 ++++++-------
 src/pages/index/index.tsx                 | 179 +++++++++++-----------
 2 files changed, 144 insertions(+), 145 deletions(-)

diff --git a/src/moduleIOT/pages/iotCarePlan/WL200.tsx b/src/moduleIOT/pages/iotCarePlan/WL200.tsx
index 0dd73b3..dffae3b 100644
--- a/src/moduleIOT/pages/iotCarePlan/WL200.tsx
+++ b/src/moduleIOT/pages/iotCarePlan/WL200.tsx
@@ -10,10 +10,10 @@ import React, {
   useState,
 } from "react";
 
-// import Echarts from "./components/Echart/index";
+import Echarts from "./components/Echart/index";
 import {
   Block,
-  View,
+  View, 
   Text,
   Image,
   Video,
@@ -235,9 +235,9 @@ class IotCarePlanWL200 extends Component<any, any> {
     this.getWL200NursingHistory();
     this.initData();
   }
-  componentDidMount() {}
+  componentDidMount() { }
 
-  componentWillUnmount() {}
+  componentWillUnmount() { }
 
   componentDidShow() {
     console.log("页面显示了");
@@ -568,7 +568,7 @@ class IotCarePlanWL200 extends Component<any, any> {
         this.onNursingTap();
         // 倒计时弹窗: 倒计时完成后，自动开始，并判断弹窗
         let downNum = CountDownTime[this.state.ActiveModeItem.modeType] || 3;
-        this.showCountdownFun(downNum, () => {});
+        this.showCountdownFun(downNum, () => { });
       }, 500);
 
       return;
@@ -600,7 +600,7 @@ class IotCarePlanWL200 extends Component<any, any> {
   };
 
   // 绘制能量图
-  drawProwerPicture() {}
+  drawProwerPicture() { }
 
   /** 切换光照 */
   onSwitchChange = async () => {
@@ -1365,7 +1365,7 @@ class IotCarePlanWL200 extends Component<any, any> {
     // 仅在切换模式的时候，弹窗倒计时.
     if (type === "switch") {
       let downNum = CountDownTime[ActiveModeItem.modeType] || 3;
-      this.showCountdownFun(downNum, () => {}); // 倒计时弹窗
+      this.showCountdownFun(downNum, () => { }); // 倒计时弹窗
     }
 
     // 开始执行护理
@@ -2075,8 +2075,8 @@ class IotCarePlanWL200 extends Component<any, any> {
           <PopupInstrumentUploadTips
             isShow={isFirstTipShow}
             zIndex={10020}
-            myClassName="level-up"
-            title="打卡介绍"
+            myClassName='level-up'
+            title='打卡介绍'
             data={nurseInfo}
             close={this.onTipShowClose}
             confirm={this.onTipShowClose}
@@ -2088,11 +2088,11 @@ class IotCarePlanWL200 extends Component<any, any> {
             isLarge
             isClose
             isShow={isEndCarePlan}
-            title="提示"
-            content="是否结束护理"
-            textAlgin="center"
-            cancelButtonText="取消"
-            confirmButtonText="确定"
+            title='提示'
+            content='是否结束护理'
+            textAlgin='center'
+            cancelButtonText='取消'
+            confirmButtonText='确定'
             close={this.cancelEndBtn}
             confirm={this.confirmEndBtn}
           />
@@ -2100,7 +2100,7 @@ class IotCarePlanWL200 extends Component<any, any> {
             isLarge
             isClose
             isShow={isSwitchActiveMode}
-            title="护理模式切换"
+            title='护理模式切换'
             content={
               <ModeListView
                 ModeID={ModeID}
@@ -2113,9 +2113,9 @@ class IotCarePlanWL200 extends Component<any, any> {
                 onEmitShowAll={this.openModeSwitch}
               />
             }
-            textAlgin="center"
-            cancelButtonText="取消"
-            confirmButtonText="确定"
+            textAlgin='center'
+            cancelButtonText='取消'
+            confirmButtonText='确定'
             close={this.cancelModeSwitchBtn}
             confirm={this.confirmModeSwitchBtn}
           />
@@ -2125,7 +2125,7 @@ class IotCarePlanWL200 extends Component<any, any> {
               isShow={isShowStepTips}
               isLarge
               isFirstEntry={false}
-              confirmButtonText="知道了"
+              confirmButtonText='知道了'
               data={ActiveModeItem.openSourceData}
               close={this.closeStepTips}
             />
@@ -2134,10 +2134,10 @@ class IotCarePlanWL200 extends Component<any, any> {
           <PopupAlert
             isShow={isNotEnoughTime}
             isClose
-            title="提示"
-            content="您的本次护理时间不足，请重新护理"
-            confirmButtonText="确认"
-            textAlgin="center"
+            title='提示'
+            content='您的本次护理时间不足，请重新护理'
+            confirmButtonText='确认'
+            textAlgin='center'
             close={this.closeNotEnoughTime}
             confirm={this.closeNotEnoughTime}
           />
@@ -2146,11 +2146,11 @@ class IotCarePlanWL200 extends Component<any, any> {
             isShow={isShowErrorTipsText}
             isClose
             zIndex={10020}
-            myClassName="level-up"
-            title="提示"
+            myClassName='level-up'
+            title='提示'
             content={errorTipsText}
-            confirmButtonText="知道了"
-            textAlgin="center"
+            confirmButtonText='知道了'
+            textAlgin='center'
             close={this.closeErrorTipsText}
             confirm={this.closeErrorTipsText}
           />
@@ -2159,17 +2159,17 @@ class IotCarePlanWL200 extends Component<any, any> {
             isShow={isShowTipsSave}
             isClose
             zIndex={10020}
-            myClassName="level-up"
-            title="提示"
+            myClassName='level-up'
+            title='提示'
             content={
               <Block>
                 <View>当前模式已护理部分时间</View>
                 <View>是否保存护理记录</View>
               </Block>
             }
-            cancelButtonText="取消"
-            confirmButtonText="确认"
-            textAlgin="center"
+            cancelButtonText='取消'
+            confirmButtonText='确认'
+            textAlgin='center'
             close={this.closeTipsSave}
             cancel={this.cancelTipsSave}
             confirm={this.confirmTipsSave}
@@ -2178,11 +2178,11 @@ class IotCarePlanWL200 extends Component<any, any> {
           <PopupStatus
             isShow={isShowNursingSuccess}
             isClose
-            title="您已结束本次护理"
-            type="success"
-            content="正在上传护理记录……"
-            confirmButtonText="知道了"
-            textAlgin="center"
+            title='您已结束本次护理'
+            type='success'
+            content='正在上传护理记录……'
+            confirmButtonText='知道了'
+            textAlgin='center'
             close={() => {
               /*不需要做处理*/
             }}
@@ -2193,28 +2193,28 @@ class IotCarePlanWL200 extends Component<any, any> {
               deviceInfo={currentDevice}
               close={this.connectionClose}
               isDisconnect={!isConnectionBlutoot}
-              offlineChange={() => {}}
+              offlineChange={() => { }}
               pairingChange={this.pairingChange}
-              upgradeFun={() => {}}
+              upgradeFun={() => { }}
             />
           )}
 
           <Popup
             show={isShowHistoryMsg}
-            className="custom-popup"
+            className='custom-popup'
             overlay={false}
           >
-            <View className="sync-history-msg">正在同步护理记录...</View>
+            <View className='sync-history-msg'>正在同步护理记录...</View>
           </Popup>
         </View>
 
         <View>
-          <View className="iot-main">
-            <View className="banner-box">
+          <View className='iot-main'>
+            <View className='banner-box'>
               <View>
                 {!isShowNurse && (
                   <Video
-                    className="video-or-image"
+                    className='video-or-image'
                     src={ActiveModeItem.modeVideo}
                     loop
                   />
@@ -2224,12 +2224,12 @@ class IotCarePlanWL200 extends Component<any, any> {
                   <Block>
                     {isStopNurse ? (
                       <Image
-                        className="video-or-image"
+                        className='video-or-image'
                         src={currentServiceData.stopSource}
                       />
                     ) : (
                       <Image
-                        className="video-or-image"
+                        className='video-or-image'
                         src={currentServiceData.startSource}
                       />
                     )}
@@ -2237,25 +2237,25 @@ class IotCarePlanWL200 extends Component<any, any> {
                 )}
                 {errorTips && (
                   <Block>
-                    <View className="msg-tips">
+                    <View className='msg-tips'>
                       <Image
-                        className="msg-tips-img"
+                        className='msg-tips-img'
                         src={require("@/img/tips.png")}
                       />
-                      <View className="msg-tips-content">{errorTips}</View>
+                      <View className='msg-tips-content'>{errorTips}</View>
                     </View>
                   </Block>
                 )}
               </View>
 
-              <View className="iot-device">
-                <View className="item">
-                  <Text className="device-time">
+              <View className='iot-device'>
+                <View className='item'>
+                  <Text className='device-time'>
                     护理时间：
-                    <Text className="time">{currentTime}</Text>
+                    <Text className='time'>{currentTime}</Text>
                   </Text>
                 </View>
-                <View className="line" />
+                <View className='line' />
                 <ElectricityView
                   Electricity={Electricity}
                   matrixElectricity={matrixElectricity}
@@ -2285,7 +2285,7 @@ class IotCarePlanWL200 extends Component<any, any> {
               />
             )}
 
-            {/* <Echarts></Echarts> */}
+            <Echarts></Echarts>
           </View>
 
           <Footer
diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx
index ebd2ef9..54fcc5e 100644
--- a/src/pages/index/index.tsx
+++ b/src/pages/index/index.tsx
@@ -164,11 +164,11 @@ class Index extends Component<any, any> {
     }
   }
 
-  componentDidMount() {}
+  componentDidMount() { }
 
   componentWillUnmount() {
     // 页面卸载监听
-    Taro.offAppHide((res) => {});
+    Taro.offAppHide((res) => { });
     this.$instance = null;
   }
 
@@ -261,7 +261,7 @@ class Index extends Component<any, any> {
           this.isSancQrcodeEnter();
         }
       },
-      fail: () => {},
+      fail: () => { },
       complete: () => {
         // 授权完成运行页面初始化
       },
@@ -420,6 +420,7 @@ class Index extends Component<any, any> {
   };
 
   GetSiteAddTag = async (id) => {
+    go("/pages/moisture_test_report/moisture_test_report")
     let res = await GetSiteAddTag(id);
     if (res.data.code === 200) {
       console.log("点击自动上报，不需要逻辑处理");
@@ -519,7 +520,7 @@ class Index extends Component<any, any> {
     this.setState({ isShowSiteSwiper: false });
   };
 
-  bannerSwiperchange() {}
+  bannerSwiperchange() { }
 
   gobanner(item) {
     // 跳转类型：0无跳转、1跳转内部链接、3跳转外部链接、4跳转小程序、5导向视频号、6导向视频号直播间',
@@ -907,13 +908,11 @@ class Index extends Component<any, any> {
    */
   pairingChange = (e) => {
     console.log("===epairingChange===》", e);
-
     if (this.state.connectInstrument.model === "FR200") {
       go("/moduleIOT/pages/iotCarePlan/FR200"); // 画页面直接跳转
     } else {
       go("/moduleIOT/pages/iotCarePlan/WL200"); // 画页面直接跳转
     }
-
     this.connectionClose();
   };
 
@@ -1108,7 +1107,7 @@ class Index extends Component<any, any> {
         <View catchMove>
           <PopupAlert
             isShow={isCommonError}
-            title="提示"
+            title='提示'
             content={
               <Block>
                 {commonErrorText.map((item) => {
@@ -1116,60 +1115,60 @@ class Index extends Component<any, any> {
                 })}
               </Block>
             }
-            confirmButtonText="知道了"
-            textAlgin="center"
+            confirmButtonText='知道了'
+            textAlgin='center'
             close={this.onCommonErrorFun}
             confirm={this.onCommonErrorFun}
           />
           <PopupConfirm
             isShow={isShowReConnectDeviceRecordWL200}
             isClose
-            title="提示"
+            title='提示'
             zIndex={10020}
-            myClassName="level-up"
+            myClassName='level-up'
             content={
               <Block>
                 <View>检测到您上一次护理的记录未生成，</View>
                 <View>是否重新读取</View>
               </Block>
             }
-            cancelButtonText="取消"
-            confirmButtonText="连接设备"
-            textAlgin="center"
+            cancelButtonText='取消'
+            confirmButtonText='连接设备'
+            textAlgin='center'
             close={this.closeReConnectDeviceRecordWL200}
             confirm={this.confirmReConnectDeviceRecordWL200}
           />
           <PopupAlert
             isShow={isBindingError}
-            title="提示"
+            title='提示'
             content={
               <Block>
                 <View>序列号信息仍在更新，请联系微信小助理</View>
                 <View>协助您绑定仪器</View>
               </Block>
             }
-            confirmButtonText="知道了"
-            textAlgin="center"
+            confirmButtonText='知道了'
+            textAlgin='center'
             close={this.onBindErrorClose}
             confirm={this.onBindErrorConfirm}
           />
           <PopupAlert
             isShow={isNotRegister}
             isClose
-            title="提示"
-            content="暂未授权注册，请点击注册"
-            confirmButtonText="确定"
-            textAlgin="center"
-            type="1"
+            title='提示'
+            content='暂未授权注册，请点击注册'
+            confirmButtonText='确定'
+            textAlgin='center'
+            type='1'
             close={this.closeAlert}
             confirm={this.closeAlert}
           />
           <PopupAlert
             isShow={isDev}
-            title="提示"
-            content="页面正在开发中"
-            confirmButtonText="确定"
-            textAlgin="center"
+            title='提示'
+            content='页面正在开发中'
+            confirmButtonText='确定'
+            textAlgin='center'
             close={this.closeDev}
             confirm={this.closeDev}
           />
@@ -1188,54 +1187,54 @@ class Index extends Component<any, any> {
           />
           <PopupAlert
             isShow={isBindingError}
-            title="提示"
+            title='提示'
             content={
               <Block>
                 <View>序列号信息仍在更新，请联系微信小助理</View>
                 <View>协助您绑定仪器</View>
               </Block>
             }
-            confirmButtonText="知道了"
-            textAlgin="center"
+            confirmButtonText='知道了'
+            textAlgin='center'
             close={this.onBindErrorClose}
             confirm={this.onBindErrorConfirm}
           />
           <PopupAlert
             isShow={isBeforeBindingError}
-            title="提示"
+            title='提示'
             content={
               BeforeBindingErrorText || "您选择的仪器有误，请重新确认选择"
             }
-            confirmButtonText="知道了"
-            textAlgin="center"
+            confirmButtonText='知道了'
+            textAlgin='center'
             close={this.onBeforeBindClose}
             confirm={this.onBeforeBindConfirm}
           />
 
           <PopupAlert
             isShow={isBindingError203}
-            title="提示"
-            content="序列码已被别人绑定，请联系微信助手"
-            confirmButtonText="知道了"
-            textAlgin="center"
+            title='提示'
+            content='序列码已被别人绑定，请联系微信助手'
+            confirmButtonText='知道了'
+            textAlgin='center'
             close={this.onBindErrorClose203}
             confirm={this.onBindErrorConfirm203}
           ></PopupAlert>
 
           <PopupAlert
             isShow={showEquipment}
-            title="提示"
+            title='提示'
             content={
               <Block>
-                <View className="mb10">
+                <View className='mb10'>
                   仪器：{instrumentInfo.instrumentName}
                 </View>
-                <View className="mb10">序列号：{instrumentInfo.serial}</View>
-                <View className="mb10">您需要完成注册登录才能进行一起绑定</View>
+                <View className='mb10'>序列号：{instrumentInfo.serial}</View>
+                <View className='mb10'>您需要完成注册登录才能进行一起绑定</View>
               </Block>
             }
-            confirmButtonText="知道了"
-            textAlgin="center"
+            confirmButtonText='知道了'
+            textAlgin='center'
             close={this.onUnloginClose.bind(this)}
             confirm={this.onUnloginConfirm.bind(this)}
           ></PopupAlert>
@@ -1243,9 +1242,9 @@ class Index extends Component<any, any> {
           <PopupSiteSwiper
             isShow={isShowSiteSwiper}
             siteData={sitePopupList}
-            size="middle"
-            confirmButtonText="确定"
-            textAlgin="center"
+            size='middle'
+            confirmButtonText='确定'
+            textAlgin='center'
             close={this.closeSiteSwiper}
             confirm={this.closeSiteSwiper}
           />
@@ -1265,15 +1264,15 @@ class Index extends Component<any, any> {
             isLarge
             isClose
             isShow={isShowUpdateVersionTip}
-            title="提示"
+            title='提示'
             content={
               <Block>
                 <View>检测到设备有升级请求</View>
                 <View>是否进行升级？</View>
               </Block>
             }
-            textAlgin="center"
-            confirmButtonText="确定"
+            textAlgin='center'
+            confirmButtonText='确定'
             close={this.cancelUpdateVersionTip}
             confirm={this.confirmUpdateVersionTip}
           />
@@ -1286,16 +1285,16 @@ class Index extends Component<any, any> {
           )}
           <PopupAlert
             isShow={isShowVersionUpgradFinish}
-            title="升级内容公告"
+            title='升级内容公告'
             content={
               <Block>
-                <View className="nodes">
+                <View className='nodes'>
                   <RichText nodes={versionUpgradFinishNodes} />
                 </View>
               </Block>
             }
-            confirmButtonText="知道了"
-            textAlgin="left"
+            confirmButtonText='知道了'
+            textAlgin='left'
             isClose
             close={this.onVersionUpgradFinish}
             confirm={this.onVersionUpgradFinish}
@@ -1307,29 +1306,29 @@ class Index extends Component<any, any> {
           leftSlot={
             <Block>
               <View
-                className="message"
+                className='message'
                 onClick={this.gourl}
-                data-url="/pages/message/message"
+                data-url='/pages/message/message'
               >
                 <Image
-                  className="message-img"
+                  className='message-img'
                   src={require("../../img/index/message.png")}
-                  mode="aspectFill"
+                  mode='aspectFill'
                 />
-                {messagecount ? <View className="tip" /> : ""}
+                {messagecount ? <View className='tip' /> : ""}
               </View>
             </Block>
           }
         />
-        <View className="index">
-          <View className="date-title" onClick={this.toNursingRecords}>
-            <Text className="text">护理记录</Text>
+        <View className='index'>
+          <View className='date-title' onClick={this.toNursingRecords}>
+            <Text className='text'>护理记录</Text>
             <Image
               src={require("../../img/index/right.png")}
-              style="width: 20rpx;height: 20rpx;"
+              style='width: 20rpx;height: 20rpx;'
             />
           </View>
-          <View className="bg-while">
+          <View className='bg-while'>
             <AtCalendar
               hideArrow
               isSwiper={false}
@@ -1341,40 +1340,40 @@ class Index extends Component<any, any> {
             />
           </View>
         </View>
-        <View className="infobox5">
+        <View className='infobox5'>
           {instrumentList.length > 0 && (
             <Block>
-              <View className="nurse_plan_box flex  aitems sb">
-                <View className="title">前往护理</View>
+              <View className='nurse_plan_box flex  aitems sb'>
+                <View className='title'>前往护理</View>
                 <View
-                  className="txt_box flex jcenter aitems"
-                  data-url="/pages/instrument/instrument"
+                  className='txt_box flex jcenter aitems'
+                  data-url='/pages/instrument/instrument'
                   onClick={this.gourl}
                 >
                   <Image
-                    className="right_icon"
+                    className='right_icon'
                     src={require("../../img/black-add.png")}
-                    mode="aspectFill"
+                    mode='aspectFill'
                   />
-                  <View className="txt">添加新设备</View>
+                  <View className='txt'>添加新设备</View>
                 </View>
               </View>
 
-              <View style="overflow-x: auto;">
-                <View className="device_list flex">
+              <View style='overflow-x: auto;'>
+                <View className='device_list flex'>
                   {instrumentList.map((item, index) => {
                     return (
                       <View
                         key={"instrumentList" + index}
-                        className="device_item"
+                        className='device_item'
                         onClick={this.goNursing.bind(this, item)}
                       >
                         <Image
-                          className="banner_img"
+                          className='banner_img'
                           src={item.banner}
-                          mode="aspectFill"
+                          mode='aspectFill'
                         />
-                        <View className="device_name ellipsis1">
+                        <View className='device_name ellipsis1'>
                           {item.name}
                         </View>
                       </View>
@@ -1386,28 +1385,28 @@ class Index extends Component<any, any> {
           )}
           {instrumentList.length === 0 && (
             <Block>
-              <View className="nurse_plan_box flex aitems sb">
-                <View className="title">前往护理</View>
+              <View className='nurse_plan_box flex aitems sb'>
+                <View className='title'>前往护理</View>
               </View>
-              <View className="add_device flex jcenter aitems bg-while">
-                <View className="add_device_btn">
-                  <View className="txt_box flex jcenter aitems">
+              <View className='add_device flex jcenter aitems bg-while'>
+                <View className='add_device_btn'>
+                  <View className='txt_box flex jcenter aitems'>
                     <View
-                      className="at-icon at-icon-add"
-                      style="color: #fff;font-size: 30rpx;"
+                      className='at-icon at-icon-add'
+                      style='color: #fff;font-size: 30rpx;'
                     ></View>
-                    <View className="txt" onClick={this.addNewDevice}>
+                    <View className='txt' onClick={this.addNewDevice}>
                       添加新设备
                     </View>
                   </View>
                 </View>
-                <View className="tips">您暂时还没有绑定任何设备</View>
+                <View className='tips'>您暂时还没有绑定任何设备</View>
               </View>
             </Block>
           )}
         </View>
 
-        <View className="infobox3">
+        <View className='infobox3'>
           <Swiper
             autoplay
             onAnimationFinish={this.bannerSwiperchange.bind(this)}
@@ -1419,15 +1418,15 @@ class Index extends Component<any, any> {
                   key={"banner_" + index}
                   onClick={this.gobanner.bind(this, item)}
                 >
-                  <Image style="width:100%;height:100%" src={item.fileUrl} />
+                  <Image style='width:100%;height:100%' src={item.fileUrl} />
                 </SwiperItem>
               );
             })}
           </Swiper>
         </View>
-        <View style="height:200rpx"></View>
-        <Popup show={show} className="custom-popup" overlay={false}>
-          <View className="popBox">你已绑定所有设备</View>
+        <View style='height:200rpx'></View>
+        <Popup show={show} className='custom-popup' overlay={false}>
+          <View className='popBox'>你已绑定所有设备</View>
         </Popup>
       </Block>
     );