diff --git a/src/layouts/default.vue b/src/layouts/default.vue
index 8e819cf..5d1fa9f 100644
--- a/src/layouts/default.vue
+++ b/src/layouts/default.vue
@@ -1,6 +1,6 @@
@@ -57,12 +51,22 @@ const isCheck = ref(false)
{{ currentTime }}
-
-
+
+
{{ systemStore.systemUser.username }}
-
+
+
+
+
+
![]()
+
退出登录
+
+
+
+
+
@@ -105,7 +109,6 @@ const isCheck = ref(false)
-
diff --git a/src/stores/systemStore.ts b/src/stores/systemStore.ts
index ce2b476..669baf6 100644
--- a/src/stores/systemStore.ts
+++ b/src/stores/systemStore.ts
@@ -1,3 +1,6 @@
+import router from '@/router'
+import { logout } from 'apis/login'
+import { delToken } from 'libs/token'
import { defineStore } from 'pinia'
export const useSystemStore = defineStore('system', {
@@ -81,6 +84,7 @@ export const useSystemStore = defineStore('system', {
trayUp: 1,
trayStatus: 1,
heating: false,
+ fanOpen: false,
capExist: false,
temperature: 0,
targetTemperature: 0,
@@ -90,6 +94,7 @@ export const useSystemStore = defineStore('system', {
trayUp: 1,
trayStatus: 1,
heating: false,
+ fanOpen: false,
capExist: false,
temperature: 100,
targetTemperature: 0,
@@ -99,6 +104,7 @@ export const useSystemStore = defineStore('system', {
trayUp: 0,
trayStatus: 0,
heating: true,
+ fanOpen: true,
capExist: false,
temperature: 130,
targetTemperature: 0,
@@ -108,6 +114,7 @@ export const useSystemStore = defineStore('system', {
trayUp: 1,
trayStatus: 1,
heating: false,
+ fanOpen: false,
capExist: false,
temperature: 0,
targetTemperature: 0,
@@ -117,6 +124,7 @@ export const useSystemStore = defineStore('system', {
trayUp: 1,
trayStatus: 1,
heating: false,
+ fanOpen: false,
capExist: false,
temperature: 0,
targetTemperature: 0,
@@ -126,6 +134,7 @@ export const useSystemStore = defineStore('system', {
trayUp: 1,
trayStatus: 0,
heating: false,
+ fanOpen: false,
capExist: false,
temperature: 0,
targetTemperature: 0,
@@ -218,6 +227,12 @@ export const useSystemStore = defineStore('system', {
pushSystemList(text: any) {
this.systemList.push(text)
},
+ logout() {
+ logout().then(() => {
+ delToken()
+ router.push('/login').then(() => {})
+ })
+ },
},
persist: false,
})
diff --git a/src/types/debug.d.ts b/src/types/debug.d.ts
index d6b7709..8f41266 100644
--- a/src/types/debug.d.ts
+++ b/src/types/debug.d.ts
@@ -53,6 +53,7 @@ declare namespace Debug {
xDimVelocity: number | undefined
times: number | undefined
direction: 'forward' | 'backward'
+ position: number | undefined
}
interface YMotorData {
@@ -60,6 +61,7 @@ declare namespace Debug {
yDimVelocity: number | undefined
times: number | undefined
direction: 'forward' | 'backward'
+ position: number | undefined
}
interface ZMotorData {
@@ -67,6 +69,7 @@ declare namespace Debug {
zDimVelocity: number | undefined
times: number | undefined
direction: 'forward' | 'backward'
+ position: number | undefined
}
interface JawData {
diff --git a/src/types/system.d.ts b/src/types/system.d.ts
index 3b87679..19ebdab 100644
--- a/src/types/system.d.ts
+++ b/src/types/system.d.ts
@@ -53,6 +53,7 @@ declare namespace System {
trayUp: 0 | 1
trayStatus: 0 | 1
heating: boolean
+ fanOpen: boolean
capExist: boolean
temperature: number
targetTemperature: number
diff --git a/src/views/container/liquidItem.vue b/src/views/container/liquidItem.vue
index a6c7145..8f87bef 100644
--- a/src/views/container/liquidItem.vue
+++ b/src/views/container/liquidItem.vue
@@ -117,14 +117,14 @@ const onSubmitSolution = () => {
-
+
+
+
+
+
+
+
+
@@ -687,17 +725,19 @@ const debug_stop_all_motor = async () => {
-
+
mm
-
+
移动
- 停止
+
+ 停止
+
@@ -740,17 +780,19 @@ const debug_stop_all_motor = async () => {
-
+
mm
-
+
移动
- 停止
+
+ 停止
+
@@ -786,10 +828,10 @@ const debug_stop_all_motor = async () => {
-
+
执行
-
+
停止
@@ -837,13 +879,13 @@ const debug_stop_all_motor = async () => {
-
+
开始
-
+
停止
-
+
回原点
@@ -889,10 +931,10 @@ const debug_stop_all_motor = async () => {
-
+
启动
-
+
停止
@@ -909,13 +951,13 @@ const debug_stop_all_motor = async () => {
-
+
开始
-
+
停止
-
+
回原点
@@ -968,17 +1010,63 @@ const debug_stop_all_motor = async () => {
-
+
开门
-
+
关门
-
+
停止
+
+
+
+
+
+
+
+
+
+ rpm/min
+
+
+
+
+
+
+ mm
+
+
+
+
+
+ 抬升
+
+
+ 下降
+
+
+
+ 停止
+
+
+ 回原点
+
+
+ 提升一个拍子高度
+
+
+ 下降一个拍子高度
+
+
+
+
+
@@ -1005,10 +1093,15 @@ const debug_stop_all_motor = async () => {
托盘移至加热区
-
拆卸拍子
+
+ 机械臂移至拍子位
+
+
+ 机械臂移至托盘位
+
@@ -1063,10 +1156,10 @@ const debug_stop_all_motor = async () => {
-
+
开始加热
-
+
停止加热
@@ -1091,18 +1184,18 @@ const debug_stop_all_motor = async () => {
-
+
启动制冷
-
+
停止制冷
-
+
启动循环
-
+
停止循环
@@ -1119,60 +1212,14 @@ const debug_stop_all_motor = async () => {
风扇
-
+
打开风扇
-
+
关闭风扇
-
-
-
-
-
-
-
-
-
- rpm/min
-
-
-
-
-
-
- mm
-
-
-
-
-
- 抬升
-
-
- 下降
-
-
-
- 停止
-
-
- 回原点
-
-
- 提升一个拍子高度
-
-
- 下降一个拍子高度
-
-
-
-
-
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index e16d6d2..8cdbc18 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -260,6 +260,48 @@ const heat_stop = async () => {
await homeStore.sendControl(params)
}
+const fan_start = async () => {
+ const selectedHeatAreas = homeStore.heatAreaList.filter(item => item.selected)
+ if (!selectedHeatAreas.length || selectedHeatAreas.length > 1) {
+ FtMessage.warning('请选择一个加热区')
+ return
+ }
+ if (systemStore.systemStatus.heatModule.find(item => item.moduleCode === selectedHeatAreas[0].value)?.fanOpen) {
+ FtMessage.warning('已经在散热了')
+ return
+ }
+ currentCommandId = Date.now().toString()
+ const params = {
+ commandId: currentCommandId,
+ command: 'fan_start',
+ params: {
+ heatId: selectedHeatAreas[0].value,
+ },
+ }
+ await homeStore.sendControl(params)
+}
+
+const fan_stop = async () => {
+ const selectedHeatAreas = homeStore.heatAreaList.filter(item => item.selected)
+ if (!selectedHeatAreas.length || selectedHeatAreas.length > 1) {
+ FtMessage.warning('请选择一个加热区')
+ return
+ }
+ if (!systemStore.systemStatus.heatModule.find(item => item.moduleCode === selectedHeatAreas[0].value)?.fanOpen) {
+ FtMessage.warning('加热区未散热')
+ return
+ }
+ currentCommandId = Date.now().toString()
+ const params = {
+ commandId: currentCommandId,
+ command: 'fan_stop',
+ params: {
+ heatId: selectedHeatAreas[0].value,
+ },
+ }
+ await homeStore.sendControl(params)
+}
+
const tray_up = async () => {
const selectedHeatAreas = homeStore.heatAreaList.filter(item => item.selected)
if (!selectedHeatAreas.length || selectedHeatAreas.length > 1) {
@@ -447,6 +489,18 @@ const take_photo = async () => {
+
+ 开始散热
+
+
+
+
+ 停止散热
+
+
+
+
+
抬起托盘