GuoAnPeng
/
matrix-spray-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

基质列表分页错误和新增验证

master
王梦远 2 weeks ago
parent
3a5e0a9c03
commit
90efb5c9b3
2 changed files with 203 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 126
      src/components/martixCraft/Edit/index.vue
  2. 106
      src/components/spray/sprayParams/index.vue

126
src/components/martixCraft/Edit/index.vue
View File

@ -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 = () => {
<el-form ref="formRef" label-width="120" :model="form" :rules="rules">
<el-row>
<el-col :span="12">
<el-form-item label="工艺名称" prop="name">
<el-form-item
label="工艺名称" prop="name"
>
<el-input v-model="form.name" placeholder="" />
</el-form-item>
</el-col>
@ -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 = () => {
<el-form-item
label="氮气气压"
:prop="`times.${index}.gasPressure`"
: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 > 100) {
callback(new Error('氮气气压需在0-100之间'));
}
else {
callback();
}
} },
]"
>
<el-input v-model="item.gasPressure" type="number" />
<el-input
v-model="item.gasPressure" min="0.1"
max="100" type="number"
/>
<span class="unit-text">Mpa</span>
</el-form-item>
<el-form-item
label="基质流速"
:prop="`times.${index}.volume`"
: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 > 60) {
callback(new Error('基质流速需在0-60之间'));
}
else {
callback();
}
} },
]"
>
<el-input v-model="item.volume" type="number" />
<span class="unit-text">uL/min</span>
@ -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 = () => {
<el-form-item
label="移动速度"
:prop="`times.${index}.movingSpeed`"
: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 < 1 || value > 100) {
callback(new Error('移动速度需在1-100之间'));
}
else {
callback();
}
} },
]"
>
<el-input v-model="item.movingSpeed" type="number" />
<span class="unit-text">mm/s</span>
@ -327,7 +382,20 @@ const touchendHandle = () => {
<el-form-item
label="间距"
:prop="`times.${index}.spacing`"
: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 > 100) {
callback(new Error('间距需在0-100之间'));
}
else {
callback();
}
} },
]"
>
<el-input v-model="item.spacing" type="number" />
<span class="unit-text">mm</span>
@ -335,7 +403,20 @@ const touchendHandle = () => {
<el-form-item
label="等待时间"
:prop="`times.${index}.delay`"
: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 > 1200) {
callback(new Error('等待时间需在0-1200之间'));
}
else {
callback();
}
} },
]"
>
<el-input v-model="item.delay" type="number" />
<span class="unit-text">s</span>
@ -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();
}
} },
]"
>
<el-input v-model="item.gridDelay" type="number" />
<span class="unit-text">s</span>

106
src/components/spray/sprayParams/index.vue
View File

@ -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 = () => {
<el-form-item
label="氮气气压"
:prop="`times.${index}.gasPressure`"
: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 > 100) {
callback(new Error('氮气气压需在0-100之间'));
}
else {
callback();
}
} },
]"
>
<el-input v-model="item.gasPressure" type="number" />
<span class="unit-text">Mpa</span>
@ -323,7 +338,20 @@ const touchendHandle = () => {
<el-form-item
label="基质流速"
:prop="`times.${index}.volume`"
: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 > 60) {
callback(new Error('基质流速需在0-60之间'));
}
else {
callback();
}
} },
]"
>
<el-input v-model="item.volume" type="number" />
<span class="unit-text">uL/min</span>
@ -363,7 +391,20 @@ const touchendHandle = () => {
<el-form-item
label="移动速度"
:prop="`times.${index}.movingSpeed`"
: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 < 1 || value > 100) {
callback(new Error('移动速度需在1-100之间'));
}
else {
callback();
}
} },
]"
>
<el-input v-model="item.movingSpeed" type="number" />
<span class="unit-text">mm/s</span>
@ -371,7 +412,20 @@ const touchendHandle = () => {
<el-form-item
label="间距"
:prop="`times.${index}.spacing`"
: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 > 100) {
callback(new Error('间距需在0-100之间'));
}
else {
callback();
}
} },
]"
>
<el-input v-model="item.spacing" type="number" />
<span class="unit-text">mm</span>
@ -379,7 +433,20 @@ const touchendHandle = () => {
<el-form-item
label="等待时间"
:prop="`times.${index}.delay`"
: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 > 1200) {
callback(new Error('等待时间需在0-1200之间'));
}
else {
callback();
}
} },
]"
>
<el-input v-model="item.delay" type="number" />
<span class="unit-text">s</span>
@ -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();
}
} },
]"
>
<el-input v-model="item.gridDelay" type="number" />
<span class="unit-text">s</span>

Write Preview
Loading…
Cancel
Save