LiLongLong
/
graphite_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

把类型定义到独立文件中

master
zhangjiming 5 months ago
parent
62402fe150
commit
7e1d2c4379
11 changed files with 282 additions and 299 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 142
      src/services/globalCmd/cmdTypes.ts
  2. 143
      src/services/globalCmd/globalCmd.ts
  3. 137
      src/services/socket.ts
  4. 28
      src/services/txn.ts
  5. 118
      src/services/wsTypes.ts
  6. 2
      src/stores/status.ts
  7. 1
      src/views/components/Footer.vue
  8. 2
      src/views/components/index.ts
  9. 3
      src/views/debug/debug.vue
  10. 3
      src/views/graphite/index.vue
  11. 2
      src/views/oreManage/components/StepItemEx.vue

142
src/services/globalCmd/cmdTypes.ts
View File

@ -0,0 +1,142 @@
type UpTrayStepStruct = {
method: "upTray";
// params: {
// heaterId: number;
// };
};
type DownTrayStepStruct = {
method: "downTray";
// params: {
// heaterId: number;
// };
};
export type TubeSolStruct = {
tubeNum: number;
addLiquidList: Array<{
solId: number;
volume: number;
}>;
};
type AddLiquidStepStruct = {
method: "addLiquid";
params: {
solId: number;
volume: number;
tubeSolList?: TubeSolStruct[];
};
};
type MoveToSolStepStruct = {
method: "moveToSol";
// params: {
// heaterId: number;
// };
};
type MoveToHeaterStepStruct = {
method: "moveToHeat";
// params: {
// heaterId: number;
// };
};
type ShakingStepStruct = {
method: "shaking";
params: {
second: number;
};
};
type StartHeatingStepStruct = {
method: "startHeating";
params: {
// heaterId: number;
temperature: number;
};
};
type StopHeatingStepStruct = {
method: "stopHeating";
// params: {
// heaterId: number;
// };
};
type TakePhotoStepStruct = {
method: "takePhoto";
};
type DelayStepStruct = {
method: "delay";
params: {
second: number;
};
};
export type StepStruct =
| UpTrayStepStruct
| DownTrayStepStruct
| AddLiquidStepStruct
| MoveToSolStepStruct
| MoveToHeaterStepStruct
| ShakingStepStruct
| StartHeatingStepStruct
| StopHeatingStepStruct
| TakePhotoStepStruct
| DelayStepStruct;
export type StepCmd = StepStruct["method"];
export const StepCmdDescMap: { [k in StepCmd]: string } = {
upTray: "抬起托盘",
downTray: "降下托盘",
addLiquid: "添加溶液",
moveToSol: "移至加液",
moveToHeat: "移至加热",
shaking: "摇匀",
startHeating: "开始加热",
stopHeating: "停止加热",
takePhoto: "拍照",
delay: "等待",
};
export const CmdDescMap: { [k in OperationCmd]: string } = {
upTray: "抬起托盘",
downTray: "降下托盘",
injectFluid: "注入溶液",
moveToActionArea: "移至操作区",
startShakeUp: "开始摇匀",
stopShakeUp: "结束摇匀",
startHeat: "开始加热",
stopHeat: "停止加热",
// keepHeat: "恒温",
takePhoto: "拍照",
// moveToUnusual: "移至异常区",
moveToHeatArea: "移至加热区",
takeOffCap: "取下拍子",
putBackCap: "装回拍子",
openClaw: "张开夹爪",
closeClaw: "收合夹爪",
moveMachineArm: "移动机械臂",
moveTube: "移动试管",
openDoor: "开门",
closeDoor: "关门",
};
export type OperationCmd =
| "upTray" // 抬起托盘
| "downTray" // 降下托盘
| "injectFluid" // 注入溶液
| "moveToActionArea" // 移至操作区
| "startShakeUp" // 开始摇匀
| "stopShakeUp" // 结束摇匀
| "startHeat" // 开始加热
| "stopHeat" // 停止加热
// | "keepHeat" // 恒温
| "takePhoto" // 拍照
// | "moveToUnusual" // 移至异常区
| "moveToHeatArea" // 移至加热区
| "takeOffCap" // 取下拍子
| "putBackCap" // 装回拍子
| "openClaw" // 张开夹爪
| "closeClaw" // 收合夹爪
| "moveMachineArm" // 移动机械臂
| "moveTube" // 移动试管
| "openDoor" //开门
| "closeDoor"; //关门

143
src/services/globalCmd/globalCmd.ts
View File

@ -1,147 +1,6 @@
import httpRequest, { type BaseResponse } from "../httpRequest"; import httpRequest, { type BaseResponse } from "../httpRequest";
import { addTxnRecord } from "../txn"; import { addTxnRecord } from "../txn";
type UpTrayStepStruct = {
method: "upTray";
// params: {
// heaterId: number;
// };
};
type DownTrayStepStruct = {
method: "downTray";
// params: {
// heaterId: number;
// };
};
export type TubeSolStruct = {
tubeNum: number;
addLiquidList: Array<{
solId: number;
volume: number;
}>;
};
type AddLiquidStepStruct = {
method: "addLiquid";
params: {
solId: number;
volume: number;
tubeSolList?: TubeSolStruct[];
};
};
type MoveToSolStepStruct = {
method: "moveToSol";
// params: {
// heaterId: number;
// };
};
type MoveToHeaterStepStruct = {
method: "moveToHeat";
// params: {
// heaterId: number;
// };
};
type ShakingStepStruct = {
method: "shaking";
params: {
second: number;
};
};
type StartHeatingStepStruct = {
method: "startHeating";
params: {
// heaterId: number;
temperature: number;
};
};
type StopHeatingStepStruct = {
method: "stopHeating";
// params: {
// heaterId: number;
// };
};
type TakePhotoStepStruct = {
method: "takePhoto";
};
type DelayStepStruct = {
method: "delay";
params: {
second: number;
};
};
export type StepStruct =
| UpTrayStepStruct
| DownTrayStepStruct
| AddLiquidStepStruct
| MoveToSolStepStruct
| MoveToHeaterStepStruct
| ShakingStepStruct
| StartHeatingStepStruct
| StopHeatingStepStruct
| TakePhotoStepStruct
| DelayStepStruct;
export type StepCmd = StepStruct["method"];
export const StepCmdDescMap: { [k in StepCmd]: string } = {
upTray: "抬起托盘",
downTray: "降下托盘",
addLiquid: "添加溶液",
moveToSol: "移至加液",
moveToHeat: "移至加热",
shaking: "摇匀",
startHeating: "开始加热",
stopHeating: "停止加热",
takePhoto: "拍照",
delay: "等待",
};
export const CmdDescMap: { [k in OperationCmd]: string } = {
upTray: "抬起托盘",
downTray: "降下托盘",
injectFluid: "注入溶液",
moveToActionArea: "移至操作区",
startShakeUp: "开始摇匀",
stopShakeUp: "结束摇匀",
startHeat: "开始加热",
stopHeat: "停止加热",
// keepHeat: "恒温",
takePhoto: "拍照",
// moveToUnusual: "移至异常区",
moveToHeatArea: "移至加热区",
takeOffCap: "取下拍子",
putBackCap: "装回拍子",
openClaw: "张开夹爪",
closeClaw: "收合夹爪",
moveMachineArm: "移动机械臂",
moveTube: "移动试管",
openDoor: "开门",
closeDoor: "关门",
};
export type OperationCmd =
| "upTray" // 抬起托盘
| "downTray" // 降下托盘
| "injectFluid" // 注入溶液
| "moveToActionArea" // 移至操作区
| "startShakeUp" // 开始摇匀
| "stopShakeUp" // 结束摇匀
| "startHeat" // 开始加热
| "stopHeat" // 停止加热
// | "keepHeat" // 恒温
| "takePhoto" // 拍照
// | "moveToUnusual" // 移至异常区
| "moveToHeatArea" // 移至加热区
| "takeOffCap" // 取下拍子
| "putBackCap" // 装回拍子
| "openClaw" // 张开夹爪
| "closeClaw" // 收合夹爪
| "moveMachineArm" // 移动机械臂
| "moveTube" // 移动试管
| "openDoor" //开门
| "closeDoor"; //关门
import type { OperationCmd } from "./cmdTypes";
export function debugCmd(params: { command: OperationCmd; params: Record<string, any> }) { export function debugCmd(params: { command: OperationCmd; params: Record<string, any> }) {
const commandId = addTxnRecord({ ...params, category: "debug" }); const commandId = addTxnRecord({ ...params, category: "debug" });

137
src/services/socket.ts
View File

@ -1,140 +1,5 @@
import { Subject } from "rxjs"; import { Subject } from "rxjs";
import type { StepCmd } from "./globalCmd/globalCmd";
import type { Container } from "./sysConfig/sysConfig";
export type CmdSuccess = "D0000";
export type CmdFailure = "D1111";
export type CmdDatagram = {
type: "cmd"; // 指令
data: {
commandId: string;
// commandName: DebugCmd;
status: CmdSuccess | CmdFailure;
message: string;
success: boolean;
};
};
export type CraftDatagram = {
type: "crafts";
data: {
// 当前工艺执行状态，0 表示未执行，1 表示正在执行，2 表示暂停执行，3 表示停止执行 4:Error, 6: 完成。
status: 0 | 1 | 2 | 3 | 4 | 6;
// 当前正在执行的具体工艺方法
method: StepCmd;
// 当前正在执行的工艺步骤索引
methodIndex: number;
// 加热区 ID
heatId: number;
};
};
export type WarnDatagram = {
type: "warn"; // 报警
data: {
code: string;
msg: string;
module: string;
};
};
export type StatusDatagram = {
type: "status"; // 状态
data: {
emergencyStop: boolean; // 硬件急停信号，true 为急停触发，false 为正常运行
doorStatus: boolean; // 门的状态，false 表示关闭，true 表示开启
railArm: {
x: number;
y: number;
z: number;
joint1: number;
joint2: number;
distance: number; // 当前机械臂（轴 3）上下移动的距离
railDistance: number;
clawDistance: number;
clawStatus: boolean; // 夹爪状态，true 为张开,false 为闭合
isZeroPos: boolean; // 导轨是否在原点
isLimitPos: boolean; // 导轨是否在限位点
};
// 操作区（加液、摇匀、拍照）状态
liquidArea: {
liquidArm: {
x: number;
y: number;
z: number;
joint1: number;
joint2: number;
pump: Array<{
pumpId: number;
isPumping: boolean; // 是否正在加液，true正在加液
}>;
};
isShaking: boolean; // 是否正在摇匀
liquidTray: boolean; // 是否存在托盘
// 溶液容器状态
solutionBucket: Array<{
isEmpty: boolean; // 容器是否为空
isFull: boolean; // 容器是否已满
}>;
};
// 加液泵状态列表
// motors: Array<{
// pumpId: string;
// speed: number;
// position: number; // 电机实时位置
// isZeroPos: 0 | 1; // 电机是否在原点，0 表示不在原点，非 0 表示在原点
// isLimitPos: 0 | 1; // 电机是否在限位点，0 表示不在限位点，非 0 表示在限位点
// }>;
// heatingStatus: boolean;
// 加热区列表
heatArea: Array<{
// heaterId: string;
hardwareId: string;
trayStatus: 0 | 1 | 2; // 0为无托盘，1为有托盘，2为托盘抬起
isHeating: boolean; // 是否正在加热
capStatus: boolean; // 是否存在拍子
isSealed: boolean; // 拍子密封状态，true为已密封，false为未密封
temperature: number; // 当前温度
}>;
// 碱容器状态(废液桶)
alkaliBucket: {
isEmpty: boolean; // 容器是否为空
isFull: boolean; // 容器是否已满
};
// trayStatus: boolean[]; // 加热位托盘状态列表，true 为存在托盘，false 为无托盘
// capStatus: boolean[]; // 拍子状态列表，true 为存在拍子，false 为无拍子
// 酸液桶状态
// lyeTank: {
// isEmpty: boolean;
// isFull: boolean;
// };
// 废液桶状态
// wasteTank: {
// isEmpty: boolean;
// isFull: boolean;
// };
};
};
export type CraftState = {
type: "crafts";
data: {
heatId: string | number;
methodIndex: string | number;
status: string | number;
};
};
export type ContainerDatagram = {
type: "container";
data: {
containerList: Container[];
};
};
export type Datagram = CmdDatagram | WarnDatagram | StatusDatagram | CraftDatagram | ContainerDatagram;
export type DatagramType = Datagram["type"];
import type { Datagram } from "./wsTypes";
export type SocketState = "open" | "close" | "error"; export type SocketState = "open" | "close" | "error";

28
src/services/txn.ts
View File

@ -1,4 +1,4 @@
import type { OperationCmd } from "./globalCmd/globalCmd";
import type { OperationCmd } from "./globalCmd/cmdTypes";
let _lastTimestamp = 0; let _lastTimestamp = 0;
export function generateTxnNo() { export function generateTxnNo() {
@ -26,15 +26,15 @@ type TaskCmdRecord = {
category: "task"; category: "task";
command: OperationCmd; command: OperationCmd;
params: Record<string, any>; params: Record<string, any>;
}
};
type TaskCmdInjectFluidsRecord = { type TaskCmdInjectFluidsRecord = {
category: "task"; category: "task";
command: OperationCmd,
command: OperationCmd;
injectFluids: []; injectFluids: [];
}
};
type TxnRecord = DebugCmdRecord | TaskCmdRecord | TaskCmdInjectFluidsRecord
type TxnRecord = DebugCmdRecord | TaskCmdRecord | TaskCmdInjectFluidsRecord;
const txnCmdMap: Record<string, TxnRecord> = {}; const txnCmdMap: Record<string, TxnRecord> = {};
@ -44,7 +44,7 @@ export function addTxnRecord(val: TxnRecord) {
return txn; return txn;
} }
export function injectFluidsRecord(val: TaskCmdInjectFluidsRecord){
export function injectFluidsRecord(val: TaskCmdInjectFluidsRecord) {
const txn = generateTxnNo().toString(); const txn = generateTxnNo().toString();
txnCmdMap[txn] = val; txnCmdMap[txn] = val;
return txn; return txn;
@ -60,11 +60,11 @@ export function getTxnRecord(txn: string, category: TxnRecord["category"]) {
return undefined; return undefined;
} }
export function peekTxnRecord(txn: string, category: TxnRecord["category"]) {
const record = txnCmdMap[txn];
// 只有属于指定category时，才返回，且返回后删除记录，节约内存
if (record && record.category === category) {
return record;
}
return undefined;
}
// export function peekTxnRecord(txn: string, category: TxnRecord["category"]) {
// const record = txnCmdMap[txn];
// // 只有属于指定category时，才返回，且返回后删除记录，节约内存
// if (record && record.category === category) {
// return record;
// }
// return undefined;
// }

118
src/services/wsTypes.ts
View File

@ -0,0 +1,118 @@
import type { StepCmd } from "./globalCmd/cmdTypes";
export type CmdDatagram = {
type: "cmd"; // 指令
data: {
commandId: string;
// commandName: DebugCmd;
status: "D0000" | "D1111";
message: string;
success: boolean;
};
};
export type CraftDatagram = {
type: "crafts";
data: {
// 当前工艺执行状态，0 表示未执行，1 表示正在执行，2 表示暂停执行，3 表示停止执行 4:Error, 6: 完成。
status: 0 | 1 | 2 | 3 | 4 | 6;
// 当前正在执行的具体工艺方法
method: StepCmd;
// 当前正在执行的工艺步骤索引
methodIndex: number;
// 加热区 ID
heatId: number;
};
};
export type WarnDatagram = {
type: "warn"; // 报警
data: {
code: string;
msg: string;
module: string;
};
};
export type StatusDatagram = {
type: "status"; // 状态
data: {
emergencyStop: boolean; // 硬件急停信号，true 为急停触发，false 为正常运行
doorStatus: boolean; // 门的状态，false 表示关闭，true 表示开启
railArm: {
x: number;
y: number;
z: number;
joint1: number;
joint2: number;
distance: number; // 当前机械臂（轴 3）上下移动的距离
railDistance: number;
clawDistance: number;
clawStatus: boolean; // 夹爪状态，true 为张开,false 为闭合
isZeroPos: boolean; // 导轨是否在原点
isLimitPos: boolean; // 导轨是否在限位点
};
// 操作区（加液、摇匀、拍照）状态
liquidArea: {
liquidArm: {
x: number;
y: number;
z: number;
joint1: number;
joint2: number;
pump: Array<{
pumpId: number;
isPumping: boolean; // 是否正在加液，true正在加液
}>;
};
isShaking: boolean; // 是否正在摇匀
liquidTray: boolean; // 是否存在托盘
// 溶液容器状态
solutionBucket: Array<{
isEmpty: boolean; // 容器是否为空
isFull: boolean; // 容器是否已满
}>;
};
// 加热区列表
heatArea: Array<{
// heaterId: string;
hardwareId: string;
trayStatus: 0 | 1 | 2; // 0为无托盘，1为有托盘，2为托盘抬起
isHeating: boolean; // 是否正在加热
capStatus: boolean; // 是否存在拍子
isSealed: boolean; // 拍子密封状态，true为已密封，false为未密封
temperature: number; // 当前温度
}>;
// 碱容器状态(废液桶)
alkaliBucket: {
isEmpty: boolean; // 容器是否为空
isFull: boolean; // 容器是否已满
};
};
};
export type CraftState = {
type: "crafts";
data: {
heatId: string | number;
methodIndex: string | number;
status: string | number;
};
};
export type ContainerDatagram = {
type: "container";
data: {
containerList: Array<{
id: number;
type: 0 | 1; // 0:酸液 1:废液
solutionId: number;
pumpId: number;
capacityTotal: number;
capacityUsed: number;
}>;
};
};
export type Datagram = CmdDatagram | WarnDatagram | StatusDatagram | CraftDatagram | ContainerDatagram;

2
src/stores/status.ts
View File

@ -1,7 +1,7 @@
import { ref, computed } from "vue"; import { ref, computed } from "vue";
import { defineStore } from "pinia"; import { defineStore } from "pinia";
import * as R from "ramda"; import * as R from "ramda";
import type { StatusDatagram } from "@/services/socket";
import type { StatusDatagram } from "@/services/wsTypes";
import { BehaviorSubject, Subject } from "rxjs"; import { BehaviorSubject, Subject } from "rxjs";
const defaultStatus: StatusDatagram["data"] = { const defaultStatus: StatusDatagram["data"] = {

1
src/views/components/Footer.vue
View File

@ -34,7 +34,6 @@ import { ref, onMounted, onUnmounted, computed } from "vue";
import Liquid from "./Liquid.vue"; import Liquid from "./Liquid.vue";
import { onGoingStatusOb, setOnGoingStatus } from "@/stores/status"; import { onGoingStatusOb, setOnGoingStatus } from "@/stores/status";
import { createWebSocket, sharedWsUrl } from "@/services/socket"; import { createWebSocket, sharedWsUrl } from "@/services/socket";
import { peekTxnRecord } from "@/services/txn";
import { useSettingStore } from "@/stores/setting"; import { useSettingStore } from "@/stores/setting";
const settingStore = useSettingStore(); const settingStore = useSettingStore();

2
src/views/components/index.ts
View File

@ -1,2 +0,0 @@
import { default as Header } from './Header.vue'
import { default as Liquid } from './Liquid.vue'

3
src/views/debug/debug.vue
View File

@ -191,7 +191,7 @@
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { CmdDescMap, debugCmd, type OperationCmd } from "@/services/globalCmd/globalCmd";
import { CmdDescMap, type OperationCmd } from "@/services/globalCmd/cmdTypes";
import { createWebSocket, sharedWsUrl } from "@/services/socket"; import { createWebSocket, sharedWsUrl } from "@/services/socket";
import { updateConfig } from "@/services/sysConfig/sysConfig"; import { updateConfig } from "@/services/sysConfig/sysConfig";
import { useSettingStore } from "@/stores/setting"; import { useSettingStore } from "@/stores/setting";
@ -200,6 +200,7 @@ import { computed, onMounted, onUnmounted, ref } from "vue";
import { ElMessage } from "element-plus"; import { ElMessage } from "element-plus";
import { useStatusStore } from "@/stores/status"; import { useStatusStore } from "@/stores/status";
import { getTxnRecord } from "@/services/txn"; import { getTxnRecord } from "@/services/txn";
import { debugCmd } from "@/services/globalCmd/globalCmd";
const settingStore = useSettingStore(); const settingStore = useSettingStore();
const statusStore = useStatusStore(); const statusStore = useStatusStore();

3
src/views/graphite/index.vue
View File

@ -102,12 +102,13 @@ import CraftList from "@/views/graphite/components/CraftList.vue";
import { injectFluid } from "@/services/task/task"; import { injectFluid } from "@/services/task/task";
import { setOnGoingStatus, useStatusStore } from "@/stores/status"; import { setOnGoingStatus, useStatusStore } from "@/stores/status";
import { getIngTask, saveTaskName, stopTask } from "@/services/task/task"; import { getIngTask, saveTaskName, stopTask } from "@/services/task/task";
import { CmdDescMap, taskCmd, type OperationCmd } from "@/services/globalCmd/globalCmd";
import { CmdDescMap, type OperationCmd } from "@/services/globalCmd/cmdTypes";
import { craftStart, craftStop, craftPause } from "@/services/ore/oreManage"; import { craftStart, craftStop, craftPause } from "@/services/ore/oreManage";
import { getTxnRecord } from "@/services/txn"; import { getTxnRecord } from "@/services/txn";
import { useSettingStore } from "@/stores/setting"; import { useSettingStore } from "@/stores/setting";
import { useCraftStore } from "@/stores/craft"; import { useCraftStore } from "@/stores/craft";
import PhotoSvg from "@/assets/photo_icon.svg"; import PhotoSvg from "@/assets/photo_icon.svg";
import { taskCmd } from "@/services/globalCmd/globalCmd";
//设备的全局状态 //设备的全局状态
const statusStore = useStatusStore(); const statusStore = useStatusStore();
const craftStore = useCraftStore(); const craftStore = useCraftStore();

2
src/views/oreManage/components/StepItemEx.vue
View File

@ -65,7 +65,7 @@
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { StepCmdDescMap, type StepStruct } from "@/services/globalCmd/globalCmd";
import { StepCmdDescMap, type StepStruct } from "@/services/globalCmd/cmdTypes";
import { useSettingStore } from "@/stores/setting"; import { useSettingStore } from "@/stores/setting";
const settingStore = useSettingStore(); const settingStore = useSettingStore();

Write Preview
Loading…
Cancel
Save