Browse Source

添加推入、推出玻片及其状态

master
zhangjiming 5 months ago
parent
commit
599afc6fdc
  1. 45
      src/components/FooterBar.vue
  2. 7
      src/services/globalCmd/globalCmd.ts
  3. 12
      src/services/wsTypes.ts

45
src/components/FooterBar.vue

@ -9,7 +9,15 @@
<span>当前设备{{ workStatusDescMap[statusStore.workStatus] }}</span> <span>当前设备{{ workStatusDescMap[statusStore.workStatus] }}</span>
<!-- <span>当前温度18</span> --> <!-- <span>当前温度18</span> -->
</section> </section>
<Time class="ml-auto text-lg"></Time>
<button
:disabled="!statusStore.equipmentStatus.yAxisMovementEnded"
class="ml-auto btn-light px-8 py-1 text-lg"
@click="onPushTrayClick">
{{ pushBtnText }}
</button>
<!-- <Time class="ml-auto text-lg"></Time> -->
<!-- <section v-if="route.path === '/home'" class="ml-auto h-[--footerHeight] flex items-center"> <!-- <section v-if="route.path === '/home'" class="ml-auto h-[--footerHeight] flex items-center">
<div class="btn-light px-5 py-2 mr-5"> <div class="btn-light px-5 py-2 mr-5">
<img src="@/assets/wash.svg" alt="wash" /> <img src="@/assets/wash.svg" alt="wash" />
@ -31,10 +39,45 @@ import { useRoute, useRouter } from "vue-router";
import Time from "./Time.vue"; import Time from "./Time.vue";
import { useEquipmentStatusStore } from "@/stores/equipmentStatus"; import { useEquipmentStatusStore } from "@/stores/equipmentStatus";
import { workStatusDescMap } from "@/services/wsTypes"; import { workStatusDescMap } from "@/services/wsTypes";
import { computed } from "vue";
import { pushInTray, pushOutTray } from "@/services/globalCmd/globalCmd";
import { ElMessage } from "element-plus";
const route = useRoute(); const route = useRoute();
const router = useRouter(); const router = useRouter();
const statusStore = useEquipmentStatusStore(); const statusStore = useEquipmentStatusStore();
const pushBtnText = computed(() => {
if (isTrayInside.value) {
return "推出玻片";
} else if (isTrayOutside.value) {
return "推入玻片";
} else {
return "正在操作";
}
});
const isTrayOutside = computed(() => {
return statusStore.equipmentStatus.yAxisMovementEnded && statusStore.equipmentStatus.yAxisLimited;
});
const isTrayInside = computed(() => {
return statusStore.equipmentStatus.yAxisMovementEnded && statusStore.equipmentStatus.yAxisAtOrigin;
});
function onPushTrayClick() {
if (isTrayOutside.value) {
pushInTray({}).then(res => {
if (res.success) {
} else {
ElMessage.error(res.msg);
}
});
} else if (isTrayInside.value) {
pushOutTray({}).then(res => {
if (res.success) {
} else {
ElMessage.error(res.msg);
}
});
}
}
function onMenuBtnClick() { function onMenuBtnClick() {
if (route.path !== "/") { if (route.path !== "/") {
router.back(); router.back();

7
src/services/globalCmd/globalCmd.ts

@ -61,6 +61,13 @@ export function stopWork() {
return httpRequest<BaseResponse<string>>({ url: "/api/cmd/stopWork", method: "POST" }); return httpRequest<BaseResponse<string>>({ url: "/api/cmd/stopWork", method: "POST" });
} }
export function pushOutTray(params: Record<string, any>) {
return httpRequest<BaseResponse<string>>({ url: "/api/cmd/trayOut", params, method: "POST" });
}
export function pushInTray(params: Record<string, any>) {
return httpRequest<BaseResponse<string>>({ url: "/api/cmd/trayIn", params, method: "POST" });
}
export function rotate(params: any) { export function rotate(params: any) {
return httpRequest<BaseResponse<string>>({ url: "/api/cmd/rotate", params, method: "POST" }); return httpRequest<BaseResponse<string>>({ url: "/api/cmd/rotate", params, method: "POST" });
} }

12
src/services/wsTypes.ts

@ -86,22 +86,22 @@ export const defaultStatus: EquipmentStatusType = {
//X轴电机状态 //X轴电机状态
xAxisPosition: 0, //电机位置 xAxisPosition: 0, //电机位置
xAxisSpeed: 0, //电机速度 xAxisSpeed: 0, //电机速度
xAxisMovementEnded: false,
xAxisAtOrigin: false,
xAxisMovementEnded: true,
xAxisAtOrigin: true,
xAxisLimited: false, xAxisLimited: false,
//Y轴电机状态 //Y轴电机状态
yAxisPosition: 0, yAxisPosition: 0,
yAxisSpeed: 0, yAxisSpeed: 0,
yAxisMovementEnded: false,
yAxisAtOrigin: false,
yAxisMovementEnded: true,
yAxisAtOrigin: true,
yAxisLimited: false, yAxisLimited: false,
//Z轴电机状态 //Z轴电机状态
zAxisPosition: 0, zAxisPosition: 0,
zAxisSpeed: 0, zAxisSpeed: 0,
zAxisMovementEnded: false,
zAxisAtOrigin: false,
zAxisMovementEnded: true,
zAxisAtOrigin: true,
zAxisLimited: false, zAxisLimited: false,
//三通阀状态 //三通阀状态

Loading…
Cancel
Save