From a83b4c20d7014718bad1f62ceaa85f74cdf43dd6 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Mon, 24 Mar 2025 13:56:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=20grid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                           |  2 +-
 src/views/graphite/components/HeatPosition.vue | 35 +++++++++++++-------------
 src/views/graphite/index.vue                   |  5 ++--
 vite.config.ts                                 |  4 +--
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.env b/.env
index e51db6e..49450f7 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
-VITE_API_HOST=192.168.1.125
+VITE_API_HOST=localhost
 VITE_API_PORT=8080
 VITE_WS_PATH=/ws
\ No newline at end of file
diff --git a/src/views/graphite/components/HeatPosition.vue b/src/views/graphite/components/HeatPosition.vue
index c15d238..72a2070 100644
--- a/src/views/graphite/components/HeatPosition.vue
+++ b/src/views/graphite/components/HeatPosition.vue
@@ -13,16 +13,17 @@
     </section>
 
 		<section class="heat_pos" :style="`background:${trayInfo?.id ? '' : ''}`">
-
-			<div
-				v-for="(tube, index) in trayInfo.tubeList || tubeList"
-				:key="index"
-				class="inner-circle"
-				@click.stop="onHandleTube(tube, index)"
-				:style="{ background: tube.backgroudColor || 'rgb(212, 212, 212)' }"></div>
+			<div class="heat_pos_tube">
+				<div
+					v-for="(tube, index) in trayInfo.tubeList || tubeList"
+					:key="index"
+					class="inner-circle"
+					@click.stop="onHandleTube(tube, index)"
+					:style="{ background: tube.backgroudColor || 'rgb(212, 212, 212)' }">
+				</div>
+			</div>
 			
-
-      <div class="heat_footer">
+      <div class="heat_footer mt-[5px]">
         <div class="heat_temperature" @click="setTemperature">
           <template v-if="trayInfo?.id">
             <div class="target_temp">目标温度: {{ trayInfo.temperature }}℃</div>
@@ -42,7 +43,6 @@
 				class="craft_executing_modal"
 				v-if="trayInfo.craftInfo?.id"
 				:style="{ background: !trayInfo.executing_craft ? '#FFDFC2' : '#8BFFBF' }">
-				<!--trayInfo.executing_craft 已选择工艺未执行-->
 				<div class="loading">
 					<img v-if="trayInfo.executing_craft" :src="ExecutingSvg" />
 					<img v-else :src="ReadySvg" />
@@ -223,18 +223,21 @@ const onHandleSelectedCraft = (craftData: any) => {
 .heat_pos {
 	width: 10.375rem;
 	height: 10.375rem;
-	display: flex;
-	justify-content: center;
 	flex-wrap: wrap;
 	margin-left: 5px;
-	gap: 0.625rem;
 	flex-direction: row;
 	border: 2px solid #7592a8;
-	padding-top: 0.5rem;
 	border-radius: 0.5rem;
   position: relative;
+	.heat_pos_tube{
+		display: grid;
+    gap: 5px;
+    grid-template-columns: repeat(4, 1fr);
+    grid-template-rows: repeat(4, 1fr);
+	}
 }
 .inner-circle {
+	margin:5px;
 	border-radius: 50%;
 	width: 1.625rem;
 	height: 1.625rem;
@@ -242,8 +245,6 @@ const onHandleSelectedCraft = (craftData: any) => {
 }
 .heat_footer {
   position: absolute;
-	margin-top: 10.5rem;
-	margin-left: 5px;
 	.heat_temperature {
 		height: 1.625rem;
 		width: 10rem;
@@ -275,7 +276,7 @@ const onHandleSelectedCraft = (craftData: any) => {
 }
 
 .heat_footer_choose{
-  padding-top:3.2rem;
+  padding-top:2rem;
   padding-left: 5rem;
 }
 
diff --git a/src/views/graphite/index.vue b/src/views/graphite/index.vue
index 411ba7c..ccafd7b 100644
--- a/src/views/graphite/index.vue
+++ b/src/views/graphite/index.vue
@@ -831,11 +831,10 @@ const onSendCmd = (command: OperationCmd, params: any) => {
 .heat_area {
 	background: #ffffff;
 	border-radius: 20px;
-
-	column-gap: 8px;
+	column-gap: .5rem;
 	row-gap: 10px;
 	padding: 1.5rem 0.5rem;
-	min-width: 600px;
+	min-width: 37.5rem;
 	flex: 1 1 auto;
 	display: grid;
 	grid-template-columns: repeat(3, 1fr);
diff --git a/vite.config.ts b/vite.config.ts
index 49c13f7..6b7e6d2 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -18,8 +18,8 @@ export default defineConfig({
 		port: 5174,
 		proxy: {
 			"/api": {
-				target: "http://192.168.1.125:8080",
-				// target: "http://localhost:8080",
+				// target: "http://192.168.1.118:8080",
+				target: "http://localhost:8080",
 				changeOrigin: true,
 				// rewrite: (path) => path.replace(/^\/api/, ''),
 			},