From 5d365bb029c60ae33eea994b379b16f4f4afdc15 Mon Sep 17 00:00:00 2001 From: qsj <731458905@qq.com> Date: Fri, 22 Mar 2024 16:39:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.config.ts | 2 +- src/moduleIOT/pages/iotCarePlan/FR200.tsx | 16 ++++++++-------- src/recoding/pages/face_report/face_report.tsx | 6 +++--- .../pages/face_report_one/face_report_one.tsx | 9 ++++++--- .../pages/moisture_test_report/Echarts/index.tsx | 2 +- src/recoding/pages/recording/recording.tsx | 4 +++- src/utils/Interface.js | 7 +++++++ 7 files changed, 29 insertions(+), 17 deletions(-) diff --git a/src/app.config.ts b/src/app.config.ts index 5b1441a..30bc10c 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -86,7 +86,7 @@ export default defineAppConfig({ "pages/face_report/face_report", "pages/face_report_one/face_report_one", "pages/moisture_test_report/moisture_test_report", - "pages/face_report/face_report", + ], }, { diff --git a/src/moduleIOT/pages/iotCarePlan/FR200.tsx b/src/moduleIOT/pages/iotCarePlan/FR200.tsx index e3b692e..2ac4833 100644 --- a/src/moduleIOT/pages/iotCarePlan/FR200.tsx +++ b/src/moduleIOT/pages/iotCarePlan/FR200.tsx @@ -676,15 +676,15 @@ class IotCarePlanFR200 extends Component { this.setState({ isShowNursingSuccess: false, }); - let time = await s_to_hms( - this.elapsedTime - ) - console.log(time,ActiveModeItem.id,currentDevice.id,'查看数据',this.elapsedTime); + let date = new Date(); + + let year = date.getFullYear(); + let month = (date.getMonth() + 1).toString().padStart(2, '0'); + let day = date.getDate().toString().padStart(2, '0'); - // 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}`); + let formattedDate = `${year}.${month}.${day}`; + + go(`/recoding/pages/moisture_test_report/moisture_test_report?data=${params.nursingData}&date=${formattedDate}&modeId=${ActiveModeItem.id}&id=${currentDevice.id}`); }, 2000); }; diff --git a/src/recoding/pages/face_report/face_report.tsx b/src/recoding/pages/face_report/face_report.tsx index 6f681a3..69cefe4 100644 --- a/src/recoding/pages/face_report/face_report.tsx +++ b/src/recoding/pages/face_report/face_report.tsx @@ -77,15 +77,15 @@ export default class Index extends Component { } async getRecord(id, instrumentId) { - console.log("id, instrumentId", id, instrumentId); + console.log("id, nursingLogId", id, instrumentId); let data = {}; if (id != null) { - data["instrumentId"] = instrumentId; + data["nursingLogId"] = id; } // 获取当前 let res1 = await InstrumentInfo.apiNursingLog.getRecordNow(id); // 获取历史记录列表 - let res = await InstrumentInfo.apiNursingLog.getRecord(data); + let res = await InstrumentInfo.apiNursingLog.getRecordNew(data); res1.data.data.nursingTime = this.getTime(res1.data.data.nursingTime); res1.data.data.createTime = getdates(res1.data.data.createTime).replace(/-/g, "."); diff --git a/src/recoding/pages/face_report_one/face_report_one.tsx b/src/recoding/pages/face_report_one/face_report_one.tsx index 4149524..6ba154e 100644 --- a/src/recoding/pages/face_report_one/face_report_one.tsx +++ b/src/recoding/pages/face_report_one/face_report_one.tsx @@ -75,12 +75,15 @@ export default class Index extends Component { } // 查询用户护理记录的当月统计信息 async getStatistics(id) { + + let ids = Number(id) let data = {}; - if (id != null) { - data["instrumentId"] = id; + if (ids != null) { + data["nursingId"] = ids; } let res = await InstrumentInfo.apiNursingLog.getStatisticsFace(data); - let res2 = await InstrumentInfo.apiNursingLog.getStatiCDE(id); + // 获取echarts数据 这个是获取接口更新echarts页面 + let res2 = await InstrumentInfo.apiNursingLog.getStatiCDE(ids); let nursingData=JSON.parse(res2.data.data.nursingData) let obj ={ modeName:res2.data.data.modeName, diff --git a/src/recoding/pages/moisture_test_report/Echarts/index.tsx b/src/recoding/pages/moisture_test_report/Echarts/index.tsx index 3b47257..ed36820 100644 --- a/src/recoding/pages/moisture_test_report/Echarts/index.tsx +++ b/src/recoding/pages/moisture_test_report/Echarts/index.tsx @@ -4,7 +4,7 @@ import { Block, View, Image, Text, Input } from "@tarojs/components"; import { Popup, Progress, Slider } from "@antmjs/vantui"; import { useRef } from "react"; import Echarts, { EChartOption, EchartsHandle } from "taro-react-echarts"; -import echarts from "@/utils/echarts.min.js"; +import echarts from "@/utils/echartsMin.js"; import "./index.less"; interface Props { diff --git a/src/recoding/pages/recording/recording.tsx b/src/recoding/pages/recording/recording.tsx index e9c71d7..a3b0803 100644 --- a/src/recoding/pages/recording/recording.tsx +++ b/src/recoding/pages/recording/recording.tsx @@ -299,7 +299,8 @@ export default class Recording extends Component { setStorageSync("instrument_detail", instrument); } }) - + console.log(item,'查看'); + if ([1, 2, 3, 4, 5].includes(item.jumpType)) { this.One(item); } else if (item.jumpType === 0) { @@ -344,6 +345,7 @@ export default class Recording extends Component { }; // 打开第三种类型 three = async (item) => { + go(`/recoding/pages/moisture_test_report/moisture_test_report?data=${item.nursingData}&date=${item.createTime}&modeId=${item.modeId}&id=${item.instrumentId}`); }; // 打开其他类型 diff --git a/src/utils/Interface.js b/src/utils/Interface.js index 5222a93..7914123 100644 --- a/src/utils/Interface.js +++ b/src/utils/Interface.js @@ -407,6 +407,13 @@ export const InstrumentInfo = { method: "get", }); }, + /**查询用户护理记录(新接口，查看历史记录)*/ + getRecordNew: (data) => { + return Ajax({ + url: "/nursingLog/record/fr200/other" + paramsToUrlQueryString(data), + method: "get", + }); + }, /**查询用户护理记录（当前）*/ getRecordNow: (data) => { return Ajax({