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) => {