From 17d0439e3ff5343c52050fc21b56a0974ac86840 Mon Sep 17 00:00:00 2001
From: rongweikang <1174906669@qq.com>
Date: Tue, 19 Mar 2024 20:06:54 +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/components/calendar/controller/index.tsx  | 30 +++++++++----------
 .../pages/instrumentClickinUpload/index.less  |  2 +-
 .../pages/instrumentClickinUpload/index.tsx   |  2 +-
 src/recoding/pages/recording/recording.tsx    | 23 +++++++-------
 4 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/components/calendar/controller/index.tsx b/src/components/calendar/controller/index.tsx
index 308b1d3..b89783d 100644
--- a/src/components/calendar/controller/index.tsx
+++ b/src/components/calendar/controller/index.tsx
@@ -91,7 +91,7 @@ export default class AtCalendarController extends React.Component<any, any> {
 
     return (
       <Block>
-        <View className="at-calendar__controller controller flex-justify-sb">
+        <View className='at-calendar__controller controller flex-justify-sb'>
           {hideArrow ? null : (
             <View
               className={classnames(
@@ -103,9 +103,9 @@ export default class AtCalendarController extends React.Component<any, any> {
               onClick={this.props.onPreMonth.bind(this, isMinMonth)}
             />
           )}
-          <View className="calendar-top-date-btn">
+          <View className='calendar-top-date-btn'>
             <View
-              style="display: flex;align-items: center;"
+              style='display: flex;align-items: center;'
               onClick={this.openDate}
             >
               {/* <Text className="controller__info"></Text> */}
@@ -113,10 +113,10 @@ export default class AtCalendarController extends React.Component<any, any> {
               <Text style={{ fontSize: "32rpx", fontWeight: "600" }}>
                 {dayjsDate.format("YYYY.MM.DD")}
               </Text>
-              <View style="margin-left: 34rpx;">
+              <View style='margin-left: 34rpx;'>
                 <Image
                   src={require("../img/calendar.png")}
-                  style="width:28rpx;height:28rpx;"
+                  style='width:28rpx;height:28rpx;'
                 />
               </View>
             </View>
@@ -127,33 +127,33 @@ export default class AtCalendarController extends React.Component<any, any> {
 
         <Popup
           show={showDatePicker}
-          position="bottom"
+          position='bottom'
           // close-icon="/img/fr200/close.png"
           round
           onClick={this.onClickStop}
           // onClose={this.onPopupClose}
         >
-          <View className="toolbar">
-            <View className="toolbar_title">
+          <View className='toolbar'>
+            <View className='toolbar_title'>
               <Text>选择日期</Text>
               <View
-                style="margin-left: 20rpx;color:#666;font-size: 34rpx"
-                className="at-icon at-icon-close popup-date-close"
+                style='margin-left: 20rpx;color:#666;font-size: 34rpx'
+                className='at-icon at-icon-close popup-date-close'
                 onClick={this.onPopupClose}
               ></View>
             </View>
-            <View className="select_box">
-              <View className="text">已选择日期</View>
-              <View className="date">{currentDate}</View>
+            <View className='select_box'>
+              <View className='text'>已选择日期</View>
+              <View className='date'>{currentDate}</View>
             </View>
           </View>
           <DatetimePicker
-            type="date"
+            type='date'
             value={curDate}
             maxDate={maxDate}
             onInput={_.throttle(this.onInput.bind(this), 500)}
           />
-          <View className="btn_confirm" onClick={this.onSelectDate}>
+          <View className='btn_confirm' onClick={this.onSelectDate}>
             确定
           </View>
         </Popup>
diff --git a/src/instrument/pages/instrumentClickinUpload/index.less b/src/instrument/pages/instrumentClickinUpload/index.less
index 90237a7..f5a3f96 100644
--- a/src/instrument/pages/instrumentClickinUpload/index.less
+++ b/src/instrument/pages/instrumentClickinUpload/index.less
@@ -193,7 +193,7 @@ page {
     background: #fff;
     flex-direction: column;
     height: 100%;
-    border-radius: 20rpx;
+    border-radius: 30rpx;
     overflow: hidden;
     box-shadow: -2rpx 0 12rpx 0.5rpx rgba(129, 129, 129, 0.05);
     margin-right: 23rpx;
diff --git a/src/instrument/pages/instrumentClickinUpload/index.tsx b/src/instrument/pages/instrumentClickinUpload/index.tsx
index 005c239..1cd9ba3 100644
--- a/src/instrument/pages/instrumentClickinUpload/index.tsx
+++ b/src/instrument/pages/instrumentClickinUpload/index.tsx
@@ -479,7 +479,7 @@ export default class InstrumentClickInUpload extends Component<any, any> {
                     onClick={this.handleChooseImage}
                   >
                     <Image
-                      src={require("@/img/fr200/add-Image.png")}
+                      src={require("@/img/fr200/add-image.png")}
                       mode='aspectFill'
                     ></Image>
                   </View>
diff --git a/src/recoding/pages/recording/recording.tsx b/src/recoding/pages/recording/recording.tsx
index 246bb8c..3da46f5 100644
--- a/src/recoding/pages/recording/recording.tsx
+++ b/src/recoding/pages/recording/recording.tsx
@@ -64,9 +64,9 @@ export default class Recording extends Component<any, any> {
     };
   }
 
-  componentDidMount() {}
+  componentDidMount() { }
 
-  componentWillUnmount() {}
+  componentWillUnmount() { }
   // 格式化时间
   getTime(time) {
     const hour = time.slice(0, 2);
@@ -269,11 +269,11 @@ export default class Recording extends Component<any, any> {
     this.DayTime();
   }
 
-  componentDidShow() {}
+  componentDidShow() { }
 
-  componentDidHide() {}
+  componentDidHide() { }
 
-  async initData() {}
+  async initData() { }
   // 选择年份
   onChangeYear(event) {
     this.setState({ year: event.detail.value });
@@ -290,7 +290,6 @@ export default class Recording extends Component<any, any> {
   //  跳转到护理报告
   toReport(id, recordId, item) {
     console.log(item, "查看类型", item.jumpType);
-    item.jumpType = 1;
     switch (item.jumpType) {
       case 1:
         this.One(item);
@@ -313,11 +312,11 @@ export default class Recording extends Component<any, any> {
     let report = false;
     go(
       "/recoding/pages/face_report_one/face_report_one?id=" +
-        item.id +
-        "&recordId=" +
-        item.recordId +
-        "&report=" +
-        report
+      item.id +
+      "&recordId=" +
+      item.recordId +
+      "&report=" +
+      report
     );
   };
   // 打开第二种类型
@@ -326,7 +325,7 @@ export default class Recording extends Component<any, any> {
   };
   // 打开第三种类型
   three = async (item) => {
-    go("/recoding/pages/moisture_test_report/moisture_test_report");
+    go(`/recoding/pages/moisture_test_report/moisture_test_report?data=${item.nursingData}&date=${item.createTime}`);
   };
   // 打开其他类型
   AllDevice = async (item) => {