From 3589191eef974aae25d45f117596e18352f8f366 Mon Sep 17 00:00:00 2001 From: rongweikang <1174906669@qq.com> Date: Fri, 29 Mar 2024 13:51:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A3=B0=E9=9F=B3=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=B9=B6=E4=BF=AE=E6=94=B9ui=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/moduleIOT/pages/iotCarePlan/WL200.less | 24 ++-- src/moduleIOT/pages/iotCarePlan/WL200.tsx | 128 +++++++++++---------- 2 files changed, 78 insertions(+), 74 deletions(-) diff --git a/src/moduleIOT/pages/iotCarePlan/WL200.less b/src/moduleIOT/pages/iotCarePlan/WL200.less index 5b0d95d..c3385c4 100644 --- a/src/moduleIOT/pages/iotCarePlan/WL200.less +++ b/src/moduleIOT/pages/iotCarePlan/WL200.less @@ -10,33 +10,29 @@ height: 790rpx; background-color: #fff; border-radius: 30rpx; - .music-btn { - position: absolute; - top: 17rpx; - right: 17rpx; + .music { width: 54rpx; height: 54rpx; - background: #f8f8f8; + background: rgba(255, 255, 255, 0.6); border-radius: 50%; - z-index: 10; - display: flex; - justify-content: center; - align-items: center; - .music-btn_icon { - width: 54rpx; - height: 54rpx; + position: absolute; + right: 20rpx; + top: 20rpx; + image { + width: 100%; + height: 100%; } } .video-or-image { display: block; width: 690rpx; - height: 640rpx; + height: 690rpx; border-radius: 30rpx; animation-iteration-count: 1; // gif只播放一次 } .iot-device { width: 690rpx; - height: 150rpx; + height: 100rpx; display: flex; align-items: center; justify-content: center; diff --git a/src/moduleIOT/pages/iotCarePlan/WL200.tsx b/src/moduleIOT/pages/iotCarePlan/WL200.tsx index 32cc37f..86815d7 100644 --- a/src/moduleIOT/pages/iotCarePlan/WL200.tsx +++ b/src/moduleIOT/pages/iotCarePlan/WL200.tsx @@ -241,9 +241,9 @@ class IotCarePlanWL200 extends Component { this.getWL200NursingHistory(); this.initData(); } - componentDidMount() {} + componentDidMount() { } - componentWillUnmount() {} + componentWillUnmount() { } componentDidShow() { console.log("页面显示了"); @@ -588,7 +588,7 @@ class IotCarePlanWL200 extends Component { this.onNursingTap(); // 倒计时弹窗: 倒计时完成后,自动开始,并判断弹窗 let downNum = CountDownTime[this.state.ActiveModeItem.modeType] || 3; - this.showCountdownFun(downNum, () => {}); + this.showCountdownFun(downNum, () => { }); }, 500); return; @@ -620,7 +620,7 @@ class IotCarePlanWL200 extends Component { }; // 绘制能量图 - drawProwerPicture() {} + drawProwerPicture() { } /** 切换光照 */ onSwitchChange = async () => { @@ -1385,7 +1385,7 @@ class IotCarePlanWL200 extends Component { // 仅在切换模式的时候,弹窗倒计时. if (type === "switch") { let downNum = CountDownTime[ActiveModeItem.modeType] || 3; - this.showCountdownFun(downNum, () => {}); // 倒计时弹窗 + this.showCountdownFun(downNum, () => { }); // 倒计时弹窗 } // 开始执行护理 @@ -1935,7 +1935,7 @@ class IotCarePlanWL200 extends Component { if (currentTimeTimer) clearInterval(currentTimeTimer); go( "/recording/pages/face_report/face_report?id=" + - this.state.currentDevice.id + this.state.currentDevice.id ); }; @@ -2128,11 +2128,11 @@ class IotCarePlanWL200 extends Component { { { isLarge isClose isShow={isEndCarePlan} - title="提示" - content="是否结束护理" - textAlgin="center" - cancelButtonText="取消" - confirmButtonText="确定" + title='提示' + content='是否结束护理' + textAlgin='center' + cancelButtonText='取消' + confirmButtonText='确定' close={this.cancelEndBtn} confirm={this.confirmEndBtn} /> @@ -2165,7 +2165,7 @@ class IotCarePlanWL200 extends Component { isLarge isClose isShow={isSwitchActiveMode} - title="护理模式切换" + title='护理模式切换' content={ { onModeLockOpen={this.onModeLockOpen} /> } - textAlgin="center" - cancelButtonText="取消" - confirmButtonText="确定" + textAlgin='center' + cancelButtonText='取消' + confirmButtonText='确定' close={this.cancelModeSwitchBtn} confirm={this.confirmModeSwitchBtn} /> @@ -2191,7 +2191,7 @@ class IotCarePlanWL200 extends Component { isShow={isShowStepTips} isLarge isFirstEntry={false} - confirmButtonText="知道了" + confirmButtonText='知道了' data={ActiveModeItem.openSourceData} close={this.closeStepTips} /> @@ -2200,10 +2200,10 @@ class IotCarePlanWL200 extends Component { @@ -2212,11 +2212,11 @@ class IotCarePlanWL200 extends Component { 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} /> @@ -2225,17 +2225,17 @@ class IotCarePlanWL200 extends Component { isShow={isShowTipsSave} isClose zIndex={10020} - myClassName="level-up" - title="提示" + myClassName='level-up' + title='提示' content={ 当前模式已护理部分时间 是否保存护理记录 } - cancelButtonText="取消" - confirmButtonText="确认" - textAlgin="center" + cancelButtonText='取消' + confirmButtonText='确认' + textAlgin='center' close={this.closeTipsSave} cancel={this.cancelTipsSave} confirm={this.confirmTipsSave} @@ -2244,11 +2244,11 @@ class IotCarePlanWL200 extends Component { { /*不需要做处理*/ }} @@ -2259,31 +2259,31 @@ class IotCarePlanWL200 extends Component { deviceInfo={currentDevice} close={this.connectionClose} isDisconnect={!isConnectionBlutoot} - offlineChange={() => {}} + offlineChange={() => { }} pairingChange={this.pairingChange} - upgradeFun={() => {}} + upgradeFun={() => { }} /> )} - 正在同步护理记录... + 正在同步护理记录... - - + + {!isShowNurse && ( - - - - + + + + + + 护理时间: - {currentTime} + {currentTime} - +