From a4248c2a427bfc4ddf32de243c600a1fcdca7d90 Mon Sep 17 00:00:00 2001 From: LiLongLong <13717757313@163.com> Date: Thu, 17 Apr 2025 12:47:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E9=87=8F=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- .gitignore | 1 + package.json | 2 +- src/App.tsx | 7 +++++-- src/home.tsx | 7 +++++++ src/pages/measure/components/Detail.tsx | 6 +++++- src/pages/measure/components/MeasureAction.tsx | 23 +++++++++++++++++++---- src/pages/measure/components/MeasureDetail.tsx | 10 ++++++++-- src/services/measure/analysis.ts | 12 ++++++++---- 9 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 src/home.tsx diff --git a/.env b/.env index fbd905e..434f67d 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ -REACT_APP_WS_URL=127.1.1.0:8080/ws +REACT_APP_WS_URL=192.168.1.200:8080/ws PORT= 3000 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 4d29575..b6ae733 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ npm-debug.log* yarn-debug.log* yarn-error.log* +*.zip diff --git a/package.json b/package.json index 15bb757..e875d3b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "outline", "version": "0.1.0", "private": true, - "proxy": "http://127.1.1.0:8080", + "proxy": "http://192.168.1.200:8080", "dependencies": { "@ant-design/icons": "^6.0.0", "@babel/core": "^7.16.0", diff --git a/src/App.tsx b/src/App.tsx index 4315bf8..0eaa4dc 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from "react"; import "./App.scss"; -import { Outlet, useNavigate } from "react-router"; +import { Outlet, useNavigate, useLocation } from "react-router"; import { Layout, ConfigProvider, message} from "antd"; import { default as AppHeader } from "./components/Header"; import { default as AppFooter } from "./components/Footer"; @@ -17,13 +17,15 @@ import SyncData from "./components/syncData"; import { sysSet } from "./services/user/system"; import { updateSystemAccountState, updateSystemAllState, updateSystemOrgState } from "./store/system/systemSlice"; import { system } from "./types"; +import Home from "./home"; const { Header, Footer, Sider, Content } = Layout; function App() { const dispatch = useAppDispatch(); const navigate = useNavigate(); - + const location = useLocation(); + const isRootRoute = location.pathname === '/'; useEffect(() => { //连接websocket const wsClient = createWebSocket(sharedWsUrl); @@ -139,6 +141,7 @@ function App() { + {/* {isRootRoute && } */}