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 @@
- 当前设备:{{ workStatusDescMap[statusStore.workStatus] }}
+ 设备状态:{{ workStatusDescMap[statusStore.workStatus] }}
+
+
@@ -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 @@
- 电机回原点
-
+ 电机回原点
+
X
Y
@@ -61,13 +61,13 @@
- 回原点
+ 回原点:
- 电机转速
-
+ 电机转速:
+
X
Y
@@ -122,8 +122,8 @@
-->
方向:
- 后退
- 前进
+ 后退
+ 前进
开始
停止
@@ -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]" /> -->
- 开启照明灯
+ 开启照明灯
关闭照明灯
@@ -354,7 +354,7 @@ const activeName = ref("debug");
const voltageValue = ref();
const syringeForm = ref({
rotationSpeed: 1,
- direction: "1",
+ direction: 1,
});
const workForm = ref({
routeType: 1,
@@ -479,7 +479,7 @@ const onTurnOnSyringePump = () => {
const params = {
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;