护理报告提交

src/moduleIOT/pages/iotCarePlan/FR200.tsx

@@ -1563,6 +1563,7 @@ class IotCarePlanFR200 extends Component<any, any> {
     // 水分测试需要特殊处理
     // 水分测试准备 水分测试工作 水分测试启动
     if (ActiveModeItem.modeType === "moistureTest") {
+      let that =this
       sendParams.testStatus = "standby"; // 切换为准备
       let waterStepList = this.state.waterStepList;
       let waterStepIndex = this.state.waterStepIndex;
@@ -1574,16 +1575,16 @@ class IotCarePlanFR200 extends Component<any, any> {
 
           timerIdSuccess = setTimeout(function () {
             waterStepList[waterStepIndex].finish = true;
-            this.setState({
+            that.setState({
               waterStepList,
             });
           }, 2000);
-          this.setState({
+          that.setState({
             waterStepList,
             timerIdSuccess,
           });
         }, 3000);
-        this.setState({
+        that.setState({
           isRuningTest: 2,
           timerIdSchedule,
         });
@@ -2203,18 +2204,16 @@ class IotCarePlanFR200 extends Component<any, any> {
         "headLiftingPro",
       ].includes(nursingData.workMode)
     ) {
-      let obj = {
+      // let obj = {
-        modeName: nursingData.modeName,
+      //   modeName: nursingData.modeName,
-        data: nursingData,
+      //   data: nursingData,
-      };
+      // };
       let report = true;
       go(
         "/recoding/pages/face_report_one/face_report_one?id=" +
           id +
           "&report=" +
-          report +
+          report 
-          "&obj=" +
-          JSON.stringify(obj)
       );
     } else if ("moistureTest" === nursingData.workMode) {
       console.log("水分测试");

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

@@ -42,15 +42,9 @@ function Index({
         default:
              
       } 
-    //   const chartRef = useRef(null);
+  
-    //   console.log(chartRef,'chartRefchartRef');
-      
-    //   let chartInstance = echarts.init(chartRef.current);
     const echartsRef = useRef<EchartsHandle>(null);
-    // const echartsRef = useRef<  null>(null);
+   
-    // let echartsRef:any = React.createRef();;
-    // console.log(chartRef,'echartsRefechartsRef',chartInstance);
-    
     function generateColorArray(startColor, endColor, steps) {
         var startRGB = hexToRgb(startColor);
         var endRGB = hexToRgb(endColor);
@@ -91,13 +85,13 @@ const colors = generateColorArray(startColor, endColor, steps);
 // const xList = [...new Array(type).fill(0).map((item, key) => key)];
 let seriesData:any =[]
 seriesData = EchartsData?.data?.groupedAa
-const xList = [...new Array(37).fill(0).map((item, key) => key)];
+const xList = [...new Array(type).fill(0).map((item, key) => key)];
 // const seriesData = [
 //     ...xList.map((item) => {
 //         return Math.random() * 80;
 //     }),
 // ];
-let [option, setOption] = useState<EChartOption>({
+const option: EChartOption = {
     grid: {
       // 让图表占满容器
       top: "10rpx",
@@ -178,40 +172,8 @@ let [option, setOption] = useState<EChartOption>({
                 },
             },
         ],
-    })
+    }
-    useEffect(() =>{
+   
-        setOption({...option,
-            
-            series:[
-
-            {
-                barCategoryGap: '0%',
-                data: [11,22,33,44,55,55],
-                type: "bar",
-                // barWidth: 15,
-                gapWidth: "0%",
-                itemStyle: {
-                    normal: {
-                        color: function (params) {
-                            var value = params.data;
-                            return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                                {
-                                    offset: 0,
-                                    color: colors[parseInt(value)], // 红色
-                                },
-                                {
-                                    offset: 1,
-                                    color: colors[0], // 黄色
-                                },
-                            ]);;
-                        },
-                    },
-                },
-            },
-        ]})
-        console.log(option,'optionoption',xList);
-        
-    },[EchartsData])
  // 基于 EchartsData 生成 ECharts 配置
 //  const option: EChartOption ={
 //     grid: {
@@ -295,22 +257,7 @@ let [option, setOption] = useState<EChartOption>({
 //             },
 //         ],
 //     };
-// const chartOptions = useMemo(() => {
+
-    
-//         console.log(option,'optionoptionoption');
-        
-//     return option;
-//   }, [EchartsData]);
-   
- 
-    
-//      // 使用 useMemo 来记住创建的 ECharts 实例
-//   const chartRef = useMemo(() => {
-   
-   
-//     return option;
-//   }, []); // 空数组意味着 chartRef 仅在组件挂载时创建一次
- 
 
     return (
         <Block>

src/recoding/pages/face_report_one/face_report_one.tsx

@@ -82,16 +82,16 @@ export default class Index extends Component<any, any> {
       data["nursingId"] = ids;
     }
     let res = await InstrumentInfo.apiNursingLog.getStatisticsFace(data);
-    // 获取echarts数据 这个是获取接口更新echarts页面
+    // // 获取echarts数据 这个是获取接口更新echarts页面
-    let res2 = await InstrumentInfo.apiNursingLog.getStatiCDE(ids);
+    // let res2 = await InstrumentInfo.apiNursingLog.getStatiCDE(ids);
-    let  nursingData=JSON.parse(res2.data.data.nursingData)
+    // let  nursingData=JSON.parse(res2.data.data.nursingData)
-    let obj ={
+    // let obj ={
-      modeName:res2.data.data.modeName,
+    //   modeName:res2.data.data.modeName,
-      data:nursingData
+    //   data:nursingData
-    }
+    // }
-    this.init({
+    // this.init({
-      obj:JSON.stringify(obj)
+    //   obj:JSON.stringify(obj)
-    })
+    // })
     if (res.data.code === 200) {
       this.setState({ statistics: res.data.data });
     }
@@ -286,7 +286,7 @@ export default class Index extends Component<any, any> {
         reportShow: Bool
       })
     }
-    // this.init(options)
+    this.init(options)
     this.getRouteId();
     // this.getClockStatistics()
   }
@@ -322,9 +322,6 @@ console.log(obj,'obj111111111111111');
       ...obj.data
     }
     this.setState({recordData,modeImage,EchartsData:{...obj}})
-    
-    
-    
   }
   componentDidShow() { }
 

src/recoding/pages/recording/recording.tsx

@@ -316,19 +316,25 @@ export default class Recording extends Component<any, any> {
   }
   // 打开第一种类型
   One = async (item) => {
+    let ids =Number(item.id)
+ // 获取echarts数据 这个是获取接口更新echarts页面
+ let res2 = await InstrumentInfo.apiNursingLog.getStatiCDE(ids);
+ let  nursingData=JSON.parse(res2.data.data.nursingData)
 
+ nursingData.groupedAa.push(50)
+ let obj ={
+   modeName:res2.data.data.modeName,
+   data:nursingData
+ }
+ 
     let report = false;
-    // let nursingData = JSON.parse(item.nursingData)
+  
-    // let obj = {
-    //   modeName: item.modeName,
-    //   data: nursingData
-    // }
-    // console.log("打开第一种类型", item, obj);
     go(
       "/recoding/pages/face_report_one/face_report_one?id=" +
         item.id +
         "&report=" +
-        report
+        report+ "&obj=" +
+        JSON.stringify(obj)
     );
   };
   // 打开第二种类型