diff --git a/src/components/check/index.vue b/src/components/check/index.vue index 4caf4a3..e65bd94 100644 --- a/src/components/check/index.vue +++ b/src/components/check/index.vue @@ -42,6 +42,11 @@ const statusMap: Record> = { value: '', type: 'door', }, + shakeOrigin: { + name: '摇匀电机', + value: '', + type: 'shake', + }, gantryXOrigin: { name: '机械臂x轴', value: 'x', @@ -154,6 +159,9 @@ const resetOrign = (item: SelfStatus) => { if (item.type === 'door') { door_origin() } + if (item.type === 'shake') { + shake_origin() + } else if (item.value === 'x' || item.value === 'y' || item.value === 'z') { gantry_origin(item.value) } @@ -168,6 +176,17 @@ const resetOrign = (item: SelfStatus) => { } } +const shake_origin = async () => { + currentCommandId = Date.now().toString() + + const params = { + commandId: currentCommandId, + command: `shake_origin`, + params: {}, + } + await homeStore.sendControl(params) +} + const door_origin = async () => { currentCommandId = Date.now().toString() diff --git a/src/components/container/Item/index.vue b/src/components/container/Item/index.vue new file mode 100644 index 0000000..55ae8b4 --- /dev/null +++ b/src/components/container/Item/index.vue @@ -0,0 +1,194 @@ + + + + + diff --git a/src/components/home/FillSolution/index.vue b/src/components/home/FillSolution/index.vue new file mode 100644 index 0000000..51c6679 --- /dev/null +++ b/src/components/home/FillSolution/index.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/src/libs/utils.ts b/src/libs/utils.ts index d830a63..0a1b67b 100644 --- a/src/libs/utils.ts +++ b/src/libs/utils.ts @@ -52,6 +52,7 @@ export const cmdNameMap = { tray_lifting_origin: '加热区托盘电机回原点', door_origin: '门电机回原点', filled_solution: '预充管路', + shake_origin: '摇匀电机回原点', } export const generateColors = (count: number): string[] => { diff --git a/src/types/container.d.ts b/src/types/container.d.ts index 8bfad8b..3119a97 100644 --- a/src/types/container.d.ts +++ b/src/types/container.d.ts @@ -8,6 +8,7 @@ declare namespace Container { pumpId: string capacityTotal: string | number capacityUsed: string | number + filled: string | number solutionName?: string } } diff --git a/src/views/container/index.vue b/src/views/container/index.vue index 11e6010..b399ac6 100644 --- a/src/views/container/index.vue +++ b/src/views/container/index.vue @@ -50,7 +50,7 @@ const queryContainerList = () => {
{ diff --git a/src/views/container/liquidItem.vue b/src/views/container/liquidItem.vue index 8f4f452..a6c7145 100644 --- a/src/views/container/liquidItem.vue +++ b/src/views/container/liquidItem.vue @@ -1,7 +1,7 @@