From 642b8fd4100f4d88f8b7ec0efc16bd366bcb0011 Mon Sep 17 00:00:00 2001 From: rongweikang <1174906669@qq.com> Date: Fri, 22 Mar 2024 14:18:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.config.ts | 2 +- src/moduleIOT/pages/iotCarePlan/WL200.tsx | 2 +- .../pages/face_report/face_report.config.js | 0 .../pages/face_report/face_report.less | 0 .../pages/face_report/face_report.tsx | 18 +++++++++--------- src/recoding/pages/recording/recording.tsx | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) rename src/{ => recoding}/pages/face_report/face_report.config.js (100%) rename src/{ => recoding}/pages/face_report/face_report.less (100%) rename src/{ => recoding}/pages/face_report/face_report.tsx (96%) diff --git a/src/app.config.ts b/src/app.config.ts index 67a4efb..25015c7 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -20,7 +20,6 @@ export default defineAppConfig({ "pages/integral_list/integral_list", "pages/webViewPage/webViewPage", "pages/template/template", - "pages/face_report/face_report", "pages/face_report_AllDevice/face_report_AllDevice", "pages/connection_help/connection_help", "pages/errorpage/errorpage", @@ -86,6 +85,7 @@ export default defineAppConfig({ "pages/recording/recording", "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/WL200.tsx b/src/moduleIOT/pages/iotCarePlan/WL200.tsx index 7a641bb..e9f56c2 100644 --- a/src/moduleIOT/pages/iotCarePlan/WL200.tsx +++ b/src/moduleIOT/pages/iotCarePlan/WL200.tsx @@ -1928,7 +1928,7 @@ class IotCarePlanWL200 extends Component { goFaceReport = () => { // 跳转前置空定时器，防止重复提交 if (currentTimeTimer) clearInterval(currentTimeTimer); - go("/pages/face_report/face_report?id=" + this.state.currentDevice.id); + go("/recording/pages/face_report/face_report?id=" + this.state.currentDevice.id); }; // 完成配对 diff --git a/src/pages/face_report/face_report.config.js b/src/recoding/pages/face_report/face_report.config.js similarity index 100% rename from src/pages/face_report/face_report.config.js rename to src/recoding/pages/face_report/face_report.config.js diff --git a/src/pages/face_report/face_report.less b/src/recoding/pages/face_report/face_report.less similarity index 100% rename from src/pages/face_report/face_report.less rename to src/recoding/pages/face_report/face_report.less diff --git a/src/pages/face_report/face_report.tsx b/src/recoding/pages/face_report/face_report.tsx similarity index 96% rename from src/pages/face_report/face_report.tsx rename to src/recoding/pages/face_report/face_report.tsx index f1aadbd..fc75668 100644 --- a/src/pages/face_report/face_report.tsx +++ b/src/recoding/pages/face_report/face_report.tsx @@ -2,17 +2,17 @@ import Taro from "@tarojs/taro"; import classnames from "classnames"; import { Component, PropsWithChildren, useEffect, useState } from "react"; import { Progress } from "@antmjs/vantui"; -import { showModal } from "../../utils/traoAPI"; +import { showModal } from "../../../utils/traoAPI"; import { Tab, Tabs, Dialog, Popup } from "@antmjs/vantui"; import { Block, View, Text, Image, Input, Button, Textarea, } from "@tarojs/components"; -import { date, getdates, previewImage } from "../../utils/util"; +import { date, getdates, previewImage } from "../../../utils/util"; /** 自定义组件 **/ -import Navbar from "../../components/navbar/navbar"; -import PopupAlert from "../../components/popup/popup-alert"; -import { InstrumentInfo } from "../../utils/Interface"; +import Navbar from "../../../components/navbar/navbar"; +import PopupAlert from "../../../components/popup/popup-alert"; +import { InstrumentInfo } from "../../../utils/Interface"; /** 自定义组件 **/ import "./face_report.less"; @@ -402,7 +402,7 @@ delImg(i) { 跳过 @@ -412,7 +412,7 @@ delImg(i) { @@ -432,7 +432,7 @@ delImg(i) { @@ -445,7 +445,7 @@ delImg(i) { > diff --git a/src/recoding/pages/recording/recording.tsx b/src/recoding/pages/recording/recording.tsx index e89a1bb..ebe3396 100644 --- a/src/recoding/pages/recording/recording.tsx +++ b/src/recoding/pages/recording/recording.tsx @@ -311,7 +311,7 @@ export default class Recording extends Component { } // let report =false - // go("/pages/face_report/face_report?id=" + id + "&recordId=" + recordId+ "&report=" + report ); + // go("/recording/pages/face_report/face_report?id=" + id + "&recordId=" + recordId+ "&report=" + report ); } // 打开第一种类型 One = async (item) => { From 2d213c6a0520aa77dfb116fa237a7d0a1022fd08 Mon Sep 17 00:00:00 2001 From: rongweikang <1174906669@qq.com> Date: Fri, 22 Mar 2024 14:28:31 +0800 Subject: [PATCH 2/2] =?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/moduleIOT/pages/iotCarePlan/FR200.tsx | 2 +- .../moisture_test_report.tsx | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/moduleIOT/pages/iotCarePlan/FR200.tsx b/src/moduleIOT/pages/iotCarePlan/FR200.tsx index 91d3685..7006d22 100644 --- a/src/moduleIOT/pages/iotCarePlan/FR200.tsx +++ b/src/moduleIOT/pages/iotCarePlan/FR200.tsx @@ -1980,7 +1980,7 @@ class IotCarePlanFR200 extends Component { } else if ("moistureTest" === nursingData.workMode) { console.log("水分测试"); } else { - go("/pages/face_report/face_report?id=" + this.state.currentDevice.id); + go("/recording/pages/face_report/face_report?id=" + this.state.currentDevice.id); } }; diff --git a/src/recoding/pages/moisture_test_report/moisture_test_report.tsx b/src/recoding/pages/moisture_test_report/moisture_test_report.tsx index 9b95f9a..bae9395 100644 --- a/src/recoding/pages/moisture_test_report/moisture_test_report.tsx +++ b/src/recoding/pages/moisture_test_report/moisture_test_report.tsx @@ -35,7 +35,6 @@ class MoistureTestReport extends Component { rightFace: 0 } }, - instrumentId: 0, isClock: false, xinde: '', imglist: [], @@ -55,7 +54,11 @@ class MoistureTestReport extends Component { componentDidHide() { } onLoad(option) { + console.log(option.data); + let data = JSON.parse(option.data) + console.log(data); + let { reportData } = this.state reportData.curDate = option.date data.GearData.map(item => { @@ -74,14 +77,15 @@ class MoistureTestReport extends Component { reportData.shuifenGear.rightFace = gear } }) - this.setState({ reportData, modeId: option.modeId, instrumentId: option.id }); - this.moistureTest() + + this.setState({ reportData, modeId: option.modeId }); + this.moistureTest(option.id, reportData.curDate) } async initData() { } - async moistureTest() { + async moistureTest(id, curDate) { let data = { - queryDate: this.state.reportData.curDate, - instrumentId: this.state.instrumentId + queryDate: curDate, + instrumentId: id } let res = await InstrumentInfo.fr200.moistureTest(data); @@ -95,7 +99,7 @@ class MoistureTestReport extends Component { } render() { - let { name, imgUrl, reportData, reportData1, isClock, xinde, imglist, id, show, modeId, instrumentId } = this.state + let { name, imgUrl, reportData, reportData1, isClock, xinde, imglist, id, show, modeId } = this.state const getStatusData = (level) => { var bgCssData = {