diff --git a/src/assets/icon_info.svg b/src/assets/icon_info.svg new file mode 100644 index 0000000..1557e75 --- /dev/null +++ b/src/assets/icon_info.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/SprayParam.vue b/src/components/SprayParam.vue index 5d880d1..612a201 100644 --- a/src/components/SprayParam.vue +++ b/src/components/SprayParam.vue @@ -65,15 +65,16 @@ diff --git a/src/services/globalCmd/cmdTypes.ts b/src/services/globalCmd/cmdTypes.ts index 60be61e..9b36621 100644 --- a/src/services/globalCmd/cmdTypes.ts +++ b/src/services/globalCmd/cmdTypes.ts @@ -17,6 +17,7 @@ type PositionType = { y1: number; x2: number; y2: number; + index: number; }; export type WorkType = { @@ -32,6 +33,31 @@ export type WorkType = { position: PositionType[]; }; +export function checkSprayParamValid(p: Partial): [boolean, string] { + if (typeof p.height !== "number") { + return [false, "请输入正确的z轴高度"]; + } + if (typeof p.nitrogenAirPressure !== "number") { + return [false, "请输入正确的氮气气压"]; + } + if (typeof p.nitrogenFlowVelocity !== "number") { + return [false, "请输入正确的氮气流速"]; + } + if (typeof p.matrixFlowVelocity !== "number") { + return [false, "请输入正确的基质流速"]; + } + if (typeof p.voltage !== "number") { + return [false, "请输入正确的喷嘴电压"]; + } + if (typeof p.movementSpeed !== "number") { + return [false, "请输入正确的移动速度"]; + } + if (typeof p.space !== "number") { + return [false, "请输入正确的行间距"]; + } + return [true, ""]; +} + export type MachineryType = { axis: string; position: string | number; diff --git a/src/services/globalCmd/globalCmd.ts b/src/services/globalCmd/globalCmd.ts index d266238..ddb52a1 100644 --- a/src/services/globalCmd/globalCmd.ts +++ b/src/services/globalCmd/globalCmd.ts @@ -65,7 +65,7 @@ export function rotate(params: any) { return httpRequest>({ url: "/api/cmd/rotate", params, method: "POST" }); } -type SprayParam = { +export type SprayParam = { matrixId: number; matrixCraftId: number; } & WorkType; diff --git a/src/views/SprayView.vue b/src/views/SprayView.vue index 1b25475..04d9823 100644 --- a/src/views/SprayView.vue +++ b/src/views/SprayView.vue @@ -2,11 +2,42 @@
-

喷涂路线

- icon - icon +
+
+ 选择基质 + + + +
+
+ 工艺 + + + +
+ + + + +
@@ -71,60 +102,13 @@
-
- - - - - - -
+