From 553787171f45867fd5ad8e62e535d7f9a70b39ad Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Wed, 5 Mar 2025 19:48:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E5=90=8E=E6=A3=80=E6=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/debug/index.vue | 123 ++++++++++++++++++++++++----------------------
 1 file changed, 65 insertions(+), 58 deletions(-)

diff --git a/src/views/debug/index.vue b/src/views/debug/index.vue
index feea625..f4a05a6 100644
--- a/src/views/debug/index.vue
+++ b/src/views/debug/index.vue
@@ -8,40 +8,42 @@
 		</div>
 		<div v-if="activeName == 'debug'">
 			<div class="debug_axis">
-				<div class="axis">
-					<div class="w-[3rem]">X轴：</div>
-					<input
-						v-model="machineryForm.X"
-						type="number"
-						class="border-none outline-none h-[34px] bg-[#E8ECF7] text-primary font-medium rounded-md text-lg text-center w-[80px]" />
-					<div class="w-[3rem]">毫米</div>
+				<div class="axis pl-[2rem] pt-[0.5rem]">
 					<div class="flex">
-						<el-button type="primary" @click="onMoveMachinery('X')">移动</el-button>
-						<el-button type="primary" @click="onStopRotate('X')">停止</el-button>
+						<div class="w-[3rem]">X轴：</div>
+						<input
+							v-model="machineryForm.X"
+							type="number"
+							class="border-none outline-none h-[34px] bg-[#E8ECF7] text-primary font-medium rounded-md text-lg text-center w-[80px]" />
+						<div class="w-[3rem]">毫米</div>
+						<div class="flex">
+							<el-button type="primary" @click="onMoveMachinery('X')">移动</el-button>
+							<el-button class="ml-[1rem]" type="primary" @click="onStopRotate('X')">停止</el-button>
+						</div>
 					</div>
-				</div>
-				<div class="axis">
-					<div class="w-[4rem]">Y轴：</div>
-					<input
-						v-model="machineryForm.Y"
-						type="number"
-						class="border-none outline-none h-[34px] bg-[#E8ECF7] text-primary font-medium rounded-md text-lg text-center w-[80px]" />
-					<div class="w-[2.5rem]">毫米</div>
-					<div class="flex">
-						<el-button type="primary" @click="onMoveMachinery('Y')">移动</el-button>
-						<el-button type="primary" @click="onStopRotate('Y')">停止</el-button>
+					<div class="axis  ml-[3rem]">
+						<div class="w-[3rem]">Y轴：</div>
+						<input
+							v-model="machineryForm.Y"
+							type="number"
+							class="border-none outline-none h-[34px] bg-[#E8ECF7] text-primary font-medium rounded-md text-lg text-center w-[80px]" />
+						<div class="w-[2.5rem]">毫米</div>
+						<div class="flex">
+							<el-button type="primary" @click="onMoveMachinery('Y')">移动</el-button>
+							<el-button class="ml-[1rem]" type="primary" @click="onStopRotate('Y')">停止</el-button>
+						</div>
 					</div>
 				</div>
-				<div class="axis">
+				<div class="axis pl-[2rem] pt-[8px]">
 					<div class="w-[3rem]">Z轴：</div>
 					<input
 						v-model="machineryForm.Z"
 						type="number"
 						class="border-none outline-none h-[34px] bg-[#E8ECF7] text-primary font-medium rounded-md text-lg text-center w-[80px]" />
-					<div class="w-[2.5rem]">毫米</div>
+					<div class="w-[3rem]">毫米</div>
 					<div class="flex">
 						<el-button type="primary" @click="onMoveMachinery('Z')">移动</el-button>
-						<el-button type="primary" @click="onStopRotate('Z')">停止</el-button>
+						<el-button class="ml-[1rem]" type="primary" @click="onStopRotate('Z')">停止</el-button>
 					</div>
 				</div>
 			</div>
@@ -50,8 +52,8 @@
 				<div class="debug_left">
 					<div class="">
 						<el-row>
-							<el-col :span="6" class="text-right">指定电机转速</el-col>
-							<el-col :span="20" class="ml-[5rem]">
+							<el-col :span="6" >电机转速</el-col>
+							<el-col :span="14">
 								<el-radio-group v-model="rotateForm.axis">
 									<el-radio value="X">X</el-radio>
 									<el-radio value="Y">Y</el-radio>
@@ -65,31 +67,31 @@
 											placeholder=""
 											class="border-none outline-none h-[34px] bg-[#E8ECF7] text-primary font-medium rounded-md text-lg text-center w-[100px]" />毫米/秒
 									</div>
-									<div class="ml-[20px]">
-										<el-button type="primary" @click="onRotate">确定</el-button>
-									</div>
 								</div>
 							</el-col>
+							<el-col :span="2">
+								<el-button type="primary" @click="onRotate">确定</el-button>
+							</el-col>
 						</el-row>
 						<el-divider />
 						<el-row>
-							<el-col :span="6" class="text-right"> 电压控制器： </el-col>
-							<el-col :span="6" class="ml-[20px]">
+							<el-col :span="6.5"> 电压控制器： </el-col>
+							<el-col :span="6" >
 								<input
 									v-model="voltageValue"
 									placeholder="0~5000v"
 									type="number"
 									class="border-none outline-none h-[34px] bg-[#E8ECF7] text-primary font-medium rounded-md text-lg text-center w-[100px]" />
 							</el-col>
-							<el-col :span="8">
+							<el-col :span="10" class="ml-[12px]">
 								<el-button type="primary" @click="onTurnOnHighVoltage">开启</el-button>
-								<el-button @click="onTurnOffHighVoltage">关闭</el-button>
+								<el-button  @click="onTurnOffHighVoltage">关闭</el-button>
 							</el-col>
 						</el-row>
 						<el-divider />
 						<el-row class="mt-[10px]">
-							<el-col :span="4" class="text-right"> 注射泵： </el-col>
-							<el-col :span="20">
+							<el-col :span="6" class="text-right"> 注射泵： </el-col>
+							<el-col :span="18">
 								<div class="ml-[20px]">
 									<input
 										v-model="syringeForm.rotationSpeed"
@@ -121,14 +123,14 @@
 								<input
 									placeholder="湿度"
 									type="number"
+									v-model="humidity"
 									class="border-none outline-none h-[34px] bg-[#E8ECF7] text-primary font-medium rounded-md text-lg text-center w-[100px]" />
 								<div class="flex mt-[10px]">
-									<el-button type="primary">开始除湿</el-button>
-									<el-button type="primary">结束除湿</el-button>
+									<el-button type="primary" @click="onStartDehumidify">开始除湿</el-button>
+									<el-button type="primary" @click="onStopDehumidify">结束除湿</el-button>
 								</div>
 							</el-col>
 						</el-row>
-						<el-divider />
 					</div>
 				</div>
 				<div class="debug_right">
@@ -325,10 +327,11 @@ import {
 	turnOffLightPanel,
 	turnOnLightPanel,
 	stopWash,
-	stopDehumidify,
 	setMotorSpeed,
   type WashType,
-  startWash
+  startWash,
+	startDehumidify,
+	stopDehumidify,
 } from "@/services/globalCmd/globalCmd";
 import type { BaseResponse } from "@/services/httpRequest";
 import type { WorkType } from '../../services/globalCmd/cmdTypes';
@@ -347,7 +350,7 @@ const workForm = ref<WorkType>({
 	matrixFlowVelocity: 1,
 	voltage: 1,
 	needPower: false,
-	height: 6,
+	height: 15,
 	movementSpeed: 10,
 	position: [],
 });
@@ -421,12 +424,6 @@ const onControlValve = (type: ControlNitrogen, open: boolean) => {
 	});
 };
 
-const onStopDehumidify = () => {
-	stopDehumidify().then((res) => {
-		success(res);
-	});
-};
-
 function onStartWash(type: WashType) {
 	startWash({ type }).then(res => {
 		if (res.success) {
@@ -533,6 +530,21 @@ function onTurnOffLightPanel() {
 	});
 }
 
+//开始除湿
+const humidity = ref(0)
+function onStartDehumidify(){
+	startDehumidify({ humidity: humidity.value! }).then(res=>{
+		success(res);
+	})
+}
+
+//停止除湿
+function onStopDehumidify(){
+	stopDehumidify().then((res) => {
+		success(res);
+	});
+}
+
 
 function success(data:BaseResponse) {
 	if (data && data.msg == "ok") {
@@ -550,13 +562,11 @@ div {
 	background: linear-gradient(90deg, #0657c0 24%, #096ae0 101%);
 }
 .debug_axis {
-	height: 3rem;
+	height: 6rem;
 	background: #fbfbfb;
 	margin-left: 3.5rem;
 	margin-right: 3.5rem;
 	border-radius: 6px;
-	display: flex;
-	align-items: center;
 
 	.axis {
 		display: flex;
@@ -569,20 +579,17 @@ div {
 	display: flex;
 	align-items: center;
 	margin-left: 4rem;
-	margin-top: 2rem;
+	margin-top: 0.5rem;
 	.debug_left {
-		width: 42vw;
-		height: 18.75rem;
 		background: #fbfbfb;
-		height: 70vh;
 		padding: 2rem;
 	}
 	.debug_right {
-		width: 42vw;
-		height: 70vh;
-		background: #fbfbfb;
-		margin-left: 2rem;
-		padding: 2rem;
+		width: 47vw;
+    background: #fbfbfb;
+    margin-left: 2rem;
+    padding: 2rem;
+    margin-top: -1rem;
 	}
 }
 </style>