diff --git a/src/components/martixCraft/Edit/index.vue b/src/components/martixCraft/Edit/index.vue index 8847ef8..dbf95b5 100644 --- a/src/components/martixCraft/Edit/index.vue +++ b/src/components/martixCraft/Edit/index.vue @@ -78,7 +78,13 @@ const form = ref({ const rules = { matrixId: [{ required: true, message: '请选择基质', trigger: 'change' }], - name: [{ required: true, message: '请输入工艺名称', trigger: 'blur' }], + name: [{ required: true, message: '请输入工艺名称', trigger: 'blur' }, { + type: 'number', + min: 1, + max: 20, + message: '1-20个字符', + trigger: ['blur', 'change'], + }], } const formRef = ref() @@ -196,7 +202,9 @@ const touchendHandle = () => { - + @@ -254,13 +262,15 @@ const touchendHandle = () => { if (!value) { callback(new Error('请输入z轴高度')); } - else - if (value < 15) { - callback(new Error('最小安全高度为15mm')); - } - else { - callback(); - } + else if (value < 15) { + callback(new Error('最小安全高度为15mm')); + } + if (value > 80) { + callback(new Error('最大高度为80mm')); + } + else { + callback(); + } }, }, ]" @@ -271,15 +281,44 @@ const touchendHandle = () => { - + Mpa uL/min @@ -295,6 +334,9 @@ const touchendHandle = () => { if (item.highVoltage && !value) { callback(new Error('请输入电压')); } + else if (value < 0) { + callback(new Error('最小电压为0V')); + } else if (value > 6000) { callback(new Error('最大电压为6000V')); } @@ -319,7 +361,20 @@ const touchendHandle = () => { mm/s @@ -327,7 +382,20 @@ const touchendHandle = () => { mm @@ -335,7 +403,20 @@ const touchendHandle = () => { s @@ -344,7 +425,20 @@ const touchendHandle = () => { v-if="item.matrixPathType === 'grid'" label="中间等待时间" :prop="`times.${index}.gridDelay`" - :rules="[{ required: true, message: '请输入等待时间', trigger: 'blur' }]" + :rules="[{ required: true, + trigger: 'blur', + validator: (rule: any, value: any, callback: any) => { + if (!value && value !== 0) { + callback(new Error('请输入等待时间')); + } + else if (value < 0 || value > 120) { + callback(new Error('等待时间需在0-120之间')); + } + else { + callback(); + } + } }, + ]" > s diff --git a/src/components/spray/sprayParams/index.vue b/src/components/spray/sprayParams/index.vue index 010e2b0..c2752d4 100644 --- a/src/components/spray/sprayParams/index.vue +++ b/src/components/spray/sprayParams/index.vue @@ -298,13 +298,15 @@ const touchendHandle = () => { if (!value) { callback(new Error('请输入z轴高度')); } - else - if (value < 15) { - callback(new Error('最小安全高度为15mm')); - } - else { - callback(); - } + else if (value < 15) { + callback(new Error('最小安全高度为15mm')); + } + else if (value > 80) { + callback(new Error('最大高度为80mm')); + } + else { + callback(); + } }, }, ]" @@ -315,7 +317,20 @@ const touchendHandle = () => { Mpa @@ -323,7 +338,20 @@ const touchendHandle = () => { uL/min @@ -363,7 +391,20 @@ const touchendHandle = () => { mm/s @@ -371,7 +412,20 @@ const touchendHandle = () => { mm @@ -379,7 +433,20 @@ const touchendHandle = () => { s @@ -388,7 +455,20 @@ const touchendHandle = () => { v-if="item.matrixPathType === 'grid'" label="中间等待时间" :prop="`times.${index}.gridDelay`" - :rules="[{ required: true, message: '请输入等待时间', trigger: 'blur' }]" + :rules="[{ required: true, + trigger: 'blur', + validator: (rule: any, value: any, callback: any) => { + if (!value) { + callback(new Error('请输入等待时间')); + } + else if (value < 0 || value > 120) { + callback(new Error('等待时间需在0-120之间')); + } + else { + callback(); + } + } }, + ]" > s