临时提交

src/moduleIOT/pages/iotCarePlan/FR200.less

@@ -1,5 +1,14 @@
 @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%;
+}
 .show {
   display: none;
 }

src/moduleIOT/pages/iotCarePlan/FR200.tsx

@@ -650,32 +650,41 @@ class IotCarePlanFR200 extends Component<any, any> {
     });
     // return;
     let { currentDevice, ActiveModeItem } = this.state;
-    let params = {};
-    let nursingData = {
-      nursingData: JSON.stringify({
-        GearData: [...stepList],
-      }),
-    };
+    let params:any = {};
+    
+    // let nursingData = JSON.stringify({
+    //   GearData: [...stepList],
+    // });
     params = {
       instrumentId: currentDevice.id,
       instrumentName: currentDevice.name,
       modeId: ActiveModeItem.id,
       modeName: ActiveModeItem.modeName,
       nursingTime: s_to_hms(this.elapsedTime),
+      nursingData: JSON.stringify({
+        GearData: [...stepList],
+      })
     };
-    params = { ...params, ...nursingData };
+    
+    // params = { ...params, ...nursingData };
     let res: any = await InstrumentInfo.apiNursingLog.addLog(
-      JSON.stringify(params)
+      JSON.stringify(
+        params
+      )
     );
-    setTimeout(() => {
+    setTimeout(async() => {
       this.setState({
         isShowNursingSuccess: false,
       });
-      go(
-        `/recoding/pages/moisture_test_report/moisture_test_report?data=${nursingData}&date=${s_to_hms(
-          this.elapsedTime
-        )}&modeId=${ActiveModeItem.id}`
-      );
+      let time = await s_to_hms(
+        this.elapsedTime
+      )
+      console.log(time,ActiveModeItem.id,currentDevice.id,'查看数据',this.elapsedTime);
+      
+      // go(
+      //   `/recoding/pages/moisture_test_report/moisture_test_report?data=${params.nursingData}&date=${time}&modeId=${ActiveModeItem.id}`
+      // );
+      go(`/recoding/pages/moisture_test_report/moisture_test_report?data=${params.nursingData}&date=${time}&modeId=${ActiveModeItem.id}&id=${currentDevice.id}`);
     }, 2000);
   };
 
@@ -2458,7 +2467,10 @@ class IotCarePlanFR200 extends Component<any, any> {
             <button onClick={this.updata.bind(this)} >添加数据 </button>
 
 
-            <View className={classnames({ 'show': showEcharts })}><Echarts data={echartsData} ></Echarts></View>
+            {/* <View className={classnames({ 'show': showEcharts })}> */}
+            <View className='text'>
+              <Echarts data={echartsData} ></Echarts>
+              </View>
             {/* {(ActiveModeItem.modeType === "face" ||
               ActiveModeItem.modeType === "eyes") && <Echarts></Echarts>} */}
 

src/moduleIOT/pages/iotCarePlan/components/Echart/index.less

@@ -7,6 +7,16 @@
   padding: 35rpx 25rpx 25rpx 35rpx;
   box-sizing: border-box;
   position: relative;
+
+
+  // writing-mode: vertical-lr;
+  // text-orientation: upright;
+  // white-space: nowrap;
+  // font-size: 18px;
+  // font-weight: bold;
+  // background-color: #c2e5f3;
+  // color: #fff;
+  // width: 100%;
 }
 
 .fullscreen {

src/moduleIOT/pages/iotCarePlan/components/Echart/index.tsx

@@ -21,6 +21,7 @@ function Index({ data }: Props) {
     animation: false,
     grid: {
       // 让图表占满容器
+      // containLabel: true,
       top: "28rpx",
       left: "18rpx",
       right: "28rpx",