Browse Source

状态栏取湿度

master
zhangjiming 5 months ago
parent
commit
d644f1bcae
  1. 4
      src/components/FooterBar.vue
  2. 6
      src/services/globalCmd/cmdTypes.ts
  3. 9
      src/views/PreSpray.vue

4
src/components/FooterBar.vue

@ -1,7 +1,7 @@
<template>
<header class="h-[--headerHeight] bg-primary flex items-center text-white px-[--borderWidth]">
<section class="bg-[#335AA5] px-4 py-2 rounded flex items-center gap-4">
<span>当前湿度18%RH</span>
<span>当前湿度{{ equipmentStore.equipmentStatus.humidity }}%RH</span>
<!-- <span>当前温度18</span> -->
</section>
<Time class="ml-auto text-lg"></Time>
@ -24,9 +24,11 @@
<script setup lang="ts">
import { useRoute, useRouter } from "vue-router";
import Time from "./Time.vue";
import { useEquipmentStatusStore } from "@/stores/equipmentStatus";
const route = useRoute();
const router = useRouter();
const equipmentStore = useEquipmentStatusStore();
function onMenuBtnClick() {
if (route.path !== "/") {

6
src/services/globalCmd/cmdTypes.ts

@ -90,7 +90,7 @@ export type EquipmentStatusType = {
};
export const defaultStatus: EquipmentStatusType = {
emergencyStop: false, //急停状态
emergencyStop: false, //急停状态
pause: false,
//X轴电机状态
@ -122,8 +122,8 @@ export const defaultStatus: EquipmentStatusType = {
// 温湿度传感器状态
temperature: 0,
humidity: 0,
humidity: 20,
//注射泵状态
syringePumpNormal: false,
}
};

9
src/views/PreSpray.vue

@ -83,7 +83,7 @@
</header>
</section> -->
<section class="flex items-center justify-end mt-6">
<button class="btn-dark px-8 py-2 text-lg">设置喷涂区域</button>
<button class="btn-dark px-8 py-2 text-lg" @click="onGoSpray">设置喷涂区域</button>
</section>
</div>
@ -112,8 +112,11 @@ function startDry() {
showDialog.value = true;
}
function onOk() {
showDialog.value = false;
router.push('/spray')
showDialog.value = false;
router.push("/spray");
}
function onGoSpray() {
router.push("/spray");
}
</script>
<style lang="scss" scoped></style>
Loading…
Cancel
Save