From 04279da2a0c9b6b39f0d2ef35f96591a70841046 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Thu, 6 Mar 2025 03:20:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=87=BA=E6=8E=A8=E5=87=BA?=
 =?UTF-8?q?=E6=89=98=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FooterBar.vue       | 19 ++++++++++++-------
 src/services/globalCmd/cmdTypes.ts |  2 +-
 src/views/debug/index.vue          | 22 +++++++++++-----------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/components/FooterBar.vue b/src/components/FooterBar.vue
index 4bcc55e..ec9da6b 100644
--- a/src/components/FooterBar.vue
+++ b/src/components/FooterBar.vue
@@ -6,14 +6,19 @@
 		</section>
 
 		<section class="bg-[#335AA5] ml-6 px-4 py-2 rounded flex items-center gap-4">
-			<span>当前设备：{{ workStatusDescMap[statusStore.workStatus] }}</span>
+			<span>设备状态：{{ workStatusDescMap[statusStore.workStatus] }}</span>
 			<!-- <span>当前温度：18℃</span> -->
 		</section>
+		<!--:disabled="!statusStore.equipmentStatus.yAxisMovementEnded"-->
 		<button
-			:disabled="!statusStore.equipmentStatus.yAxisMovementEnded"
 			class="ml-auto btn-light px-8 py-1 text-lg"
-			@click="onPushTrayClick">
-			{{ pushBtnText }}
+			@click="onPushTrayClick('into')">
+			推入托盘
+		</button>
+		<button
+			class="ml-[1rem] mr-[1rem] btn-light px-8 py-1 text-lg"
+			@click="onPushTrayClick('out')">
+			推出托盘
 		</button>
 
 		<!-- <Time class="ml-auto text-lg"></Time> -->
@@ -61,8 +66,8 @@ const isTrayOutside = computed(() => {
 const isTrayInside = computed(() => {
 	return statusStore.equipmentStatus.yAxisMovementEnded && statusStore.equipmentStatus.yAxisAtOrigin;
 });
-function onPushTrayClick() {
-	if (isTrayOutside.value) {
+function onPushTrayClick(type:string) {
+	if (type === 'into') {
 		pushInTray({}).then(res => {
 			if (res.success) {
 				ElMessage.success("正在推入");
@@ -70,7 +75,7 @@ function onPushTrayClick() {
 				ElMessage.error(res.msg);
 			}
 		});
-	} else if (isTrayInside.value) {
+	} else if (type === 'out') {
 		pushOutTray({}).then(res => {
 			if (res.success) {
 				ElMessage.success("正在推出");
diff --git a/src/services/globalCmd/cmdTypes.ts b/src/services/globalCmd/cmdTypes.ts
index 84f3aef..a74b1a6 100644
--- a/src/services/globalCmd/cmdTypes.ts
+++ b/src/services/globalCmd/cmdTypes.ts
@@ -8,7 +8,7 @@ export type ControlType = {
 
 export type SyringeParams = {
 	rotationSpeed: number;
-	direction: string;
+	direction: number;
 	// time: number;
 }
 export type SyringeType = {
diff --git a/src/views/debug/index.vue b/src/views/debug/index.vue
index ad3d2d6..dca6d29 100644
--- a/src/views/debug/index.vue
+++ b/src/views/debug/index.vue
@@ -52,8 +52,8 @@
 				<div class="debug_left">
 					<div>
 						<el-row>
-							<el-col :span="6" >电机回原点</el-col>
-							<el-col :span="14">
+							<el-col :span="6" class="text-right">电机回原点</el-col>
+							<el-col :span="14"  class="ml-[10px]">
 								<el-radio-group v-model="initForm.axis">
 									<el-radio value="X">X</el-radio>
 									<el-radio value="Y">Y</el-radio>
@@ -61,13 +61,13 @@
 								</el-radio-group>
 							</el-col>
 							<el-col :span="2">
-								<el-button type="primary" @click="onMotorMoveToHome">回原点</el-button>
+								<el-button type="primary" @click="onMotorMoveToHome">回原点:</el-button>
 							</el-col>
 						</el-row>
 
 						<el-row class="mt-[10px]">
-							<el-col :span="6" >电机转速</el-col>
-							<el-col :span="14">
+							<el-col :span="6" class="text-right">电机转速：</el-col>
+							<el-col :span="14" class="ml-[10px]">
 								<el-radio-group v-model="rotateForm.axis">
 									<el-radio value="X">X</el-radio>
 									<el-radio value="Y">Y</el-radio>
@@ -122,8 +122,8 @@
 								</div> -->
 								<div class="ml-[20px] mt-[10px]">
 									方向：
-									<el-radio v-model="syringeForm.direction" value="0">后退</el-radio>
-									<el-radio v-model="syringeForm.direction" value="1">前进</el-radio>
+									<el-radio v-model="syringeForm.direction" :value="0">后退</el-radio>
+									<el-radio v-model="syringeForm.direction" :value="1">前进</el-radio>
 									<br />
 									<el-button type="primary" @click="onTurnOnSyringePump">开始</el-button>
 									<el-button type="primary" class="ml-[20px]" @click="onTurnOffSyringePump">停止</el-button>
@@ -156,7 +156,7 @@
 									placeholder="亮度"
 									type="number"
 									class="border-none outline-none h-[34px] bg-[#E8ECF7] text-primary font-medium rounded-md text-lg text-center w-[100px]" /> -->
-              <el-button class="ml-[20px]" type="primary" @click="onTurnOnLightPanel">开启照明灯</el-button>
+              <el-button type="primary" @click="onTurnOnLightPanel">开启照明灯</el-button>
               <el-button @click="onTurnOffLightPanel">关闭照明灯</el-button>
             </div>
 					</div>
@@ -354,7 +354,7 @@ const activeName = ref("debug");
 const voltageValue = ref();
 const syringeForm = ref<SyringeParams>({
 	rotationSpeed: 1,
-	direction: "1",
+	direction: 1,
 });
 const workForm = ref<WorkType>({
 	routeType: 1,
@@ -479,7 +479,7 @@ const onTurnOnSyringePump = () => {
 	const params = <SyringeType>{
 		params: {
 			rotationSpeed: syringeForm.value.rotationSpeed,
-			// direction: syringeForm.value.direction,
+			direction: syringeForm.value.direction,
 			// time: syringeForm.value.time,
 		},
 	};
@@ -604,7 +604,7 @@ div {
 .debug_main {
 	display: flex;
 	align-items: center;
-	margin-left: 4rem;
+	margin-left: 3.5rem;
 	margin-top: 0.5rem;
 	.debug_left {
 		background: #fbfbfb;