From d104187257de13e87d5abef082a94443c7c0da1f Mon Sep 17 00:00:00 2001
From: zhangjiming <zhangjiming@costrip.cn>
Date: Mon, 3 Mar 2025 22:07:49 +0800
Subject: [PATCH] =?UTF-8?q?home=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BAmeasure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.tsx                    | 11 ++---------
 src/components/Footer.tsx      |  2 +-
 src/index.css                  | 12 ++++++++++++
 src/index.tsx                  |  4 ++--
 src/pages/home/Home.scss       |  3 ---
 src/pages/home/Home.tsx        |  9 ---------
 src/pages/measure/Measure.scss |  3 +++
 src/pages/measure/Measure.tsx  |  9 +++++++++
 8 files changed, 29 insertions(+), 24 deletions(-)
 delete mode 100644 src/pages/home/Home.scss
 delete mode 100644 src/pages/home/Home.tsx
 create mode 100644 src/pages/measure/Measure.scss
 create mode 100644 src/pages/measure/Measure.tsx

diff --git a/src/App.tsx b/src/App.tsx
index bc30088..a256a72 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -15,14 +15,6 @@ function App() {
 		padding: 0,
 	};
 
-	const contentStyle: React.CSSProperties = {
-		textAlign: "center",
-		minHeight: 120,
-		lineHeight: "120px",
-		color: "#fff",
-		backgroundColor: "#0958d9",
-	};
-
 	const footerStyle: React.CSSProperties = {
 		height: 64,
 		padding: 0,
@@ -31,6 +23,7 @@ function App() {
 	const layoutStyle = {
 		overflow: "hidden",
 	};
+  
 	return (
 		<div className="">
 			<Layout style={layoutStyle}>
@@ -41,7 +34,7 @@ function App() {
 					<Header style={headerStyle}>
 						<AppHeader />
 					</Header>
-					<Content style={contentStyle}>
+					<Content>
 						<Outlet />
 					</Content>
 					<Footer style={footerStyle}>
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index 353c4b7..03e3d35 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -3,7 +3,7 @@ export default function Footer() {
 	return (
 		<div className="bg-[--bgColor] h-full flex items-center text-base relative">
 			<p className="text-[#c8c8c8] absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2">北京强研飞拓科技有限公司</p>
-			<section className="ml-auto mr-8 flex items-center ">
+			<section className="ml-auto mr-8 flex items-center text-text">
 				<Time />
 			</section>
 		</div>
diff --git a/src/index.css b/src/index.css
index 54d47f6..bf9596a 100644
--- a/src/index.css
+++ b/src/index.css
@@ -19,4 +19,16 @@ code {
 :root {
 	--primaryColor: #3e63cb;
 	--bgColor: #f6f7fb;
+  --headerHeight: 64px;
+  --footerHeight: 64px;
+  --sideWidth: 200px;
+  --rightPadding: 40px;
 }
+
+@layer utilities {
+	.main-page {
+		height: calc(100vh - var(--headerHeight) - var(--footerHeight));
+		width: calc(100vw - var(--sideWidth));
+		background-color: var(--bgColor);
+	}
+}
\ No newline at end of file
diff --git a/src/index.tsx b/src/index.tsx
index a46276d..a7add34 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -3,7 +3,7 @@ import ReactDOM from "react-dom/client";
 import "./index.css";
 import { createBrowserRouter, RouterProvider } from "react-router-dom";
 import Login from "./pages/login/Login";
-import Home from "./pages/home/Home";
+import Measure from "./pages/measure/Measure";
 import App from "./App";
 import reportWebVitals from "./reportWebVitals";
 
@@ -14,7 +14,7 @@ const router = createBrowserRouter([
 		children: [
 			{
 				path: "home",
-				element: <Home />,
+				element: <Measure />,
 			},
 		],
 	},
diff --git a/src/pages/home/Home.scss b/src/pages/home/Home.scss
deleted file mode 100644
index 4ee680e..0000000
--- a/src/pages/home/Home.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.home {
-    color: red;
-}
\ No newline at end of file
diff --git a/src/pages/home/Home.tsx b/src/pages/home/Home.tsx
deleted file mode 100644
index 9eb977f..0000000
--- a/src/pages/home/Home.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import "./Home.scss";
-
-export default function Home() {
-	return (
-		<>
-			<div className="home">HOME</div>
-		</>
-	);
-}
diff --git a/src/pages/measure/Measure.scss b/src/pages/measure/Measure.scss
new file mode 100644
index 0000000..4ee680e
--- /dev/null
+++ b/src/pages/measure/Measure.scss
@@ -0,0 +1,3 @@
+.home {
+    color: red;
+}
\ No newline at end of file
diff --git a/src/pages/measure/Measure.tsx b/src/pages/measure/Measure.tsx
new file mode 100644
index 0000000..ac94bf3
--- /dev/null
+++ b/src/pages/measure/Measure.tsx
@@ -0,0 +1,9 @@
+import "./Measure.scss";
+
+export default function Measure() {
+	return (
+		<div className="main-page">
+			<main className="bg-white rounded-xl h-full ml-4 mr-6"></main>
+		</div>
+	);
+}