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

fix: ml==>mL;

master
guoanpeng 2 months ago
parent
12c49ff39c
commit
baaca514c2
11 changed files with 82 additions and 71 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. 8
      src/components/container/Item/index.vue
  2. 24
      src/components/craft/AddCraft/index.vue
  3. 16
      src/components/craft/TransferRight.vue
  4. 4
      src/components/home/AddLiquid/index.vue
  5. 24
      src/components/home/CheckCraft/index.vue
  6. 2
      src/components/home/ExtractLiquid/index.vue
  7. 6
      src/components/home/SetTemperature/index.vue
  8. 13
      src/components/home/StartClean/index.vue
  9. 4
      src/components/user/Edit/index.vue
  10. 28
      src/views/debug/index.vue
  11. 24
      src/views/pointDebug/index.vue

8
src/components/container/Item/index.vue
View File

@ -38,7 +38,7 @@ const solutionStyle = computed(() => {
})
const onInputBlur = async () => {
if (solutionInfo.value.capacityUsed > solutionInfo.value.capacityTotal) {
FtMessage.error(`容器容量不能超过${solutionInfo.value.capacityTotal}ml`)
FtMessage.error(`容器容量不能超过${solutionInfo.value.capacityTotal}mL`)
solutionInfo.value.capacityUsed = 5000
return
}
@ -123,13 +123,13 @@ const onSubmitSolution = () => {
</div>
<div class="footer">
<div class="footer-content">
<span>{{ solutionInfo.capacityTotal }}ml</span>
<span>{{ solutionInfo.capacityTotal }}mL</span>
</div>
<div class="footer-edit">
<span>已使用</span>
<el-input v-model.number="solutionInfo.capacityUsed" type="number" @blur="onInputBlur">
<el-input v-model="solutionInfo.capacityUsed" type="number" @blur="onInputBlur">
<template #append>
ml
mL
</template>
</el-input>
</div>

24
src/components/craft/AddCraft/index.vue
View File

@ -73,10 +73,10 @@ const okHandle = async () => {
step.params.description += `针头高度${step.params.height}mm, 加${step.params.volume}ml水清洗${step.params.cycle}次`
break
case 'addThin':
step.params.description += `添加稀硝酸 ${step.params.volume}ml`
step.params.description += `添加稀硝酸 ${step.params.volume}mL`
break
case 'addThick':
step.params.description += `添加浓硝酸 ${step.params.volume}ml`
step.params.description += `添加浓硝酸 ${step.params.volume}mL`
break
case 'reduceLiquid':
step.params.description += `针头高度${step.params.height}mm抽取液体`
@ -195,42 +195,42 @@ const addStep = (data: any) => {
<div v-for="(item, index) in form.stepList" :key="index" class="step-item">
<el-form-item :label="`${index + 1}: ${item.name}`">
<template v-if="item.method === 'clean'">
<el-input v-model.number="item.params.height" type="number" size="small" placeholder="请输入高度">
<el-input v-model="item.params.height" type="number" size="small" placeholder="请输入高度">
<template #append>
mm
</template>
</el-input>
<el-input
v-model.number="item.params.volume"
v-model="item.params.volume"
style="width: 100px"
type="number"
size="small"
placeholder="请输入加水量"
>
<template #append>
ml
mL
</template>
</el-input>
<el-input v-model.number="item.params.cycle" type="number" size="small" placeholder="请输入次数">
<el-input v-model="item.params.cycle" type="number" size="small" placeholder="请输入次数">
<template #append>
次
</template>
</el-input>
</template>
<template v-else-if="['addThin', 'addThick'].includes(item.method)">
<el-input v-model.number="item.params.volume" type="number" size="small" placeholder="请输入容量">
<el-input v-model="item.params.volume" type="number" size="small" placeholder="请输入容量">
<template #append>
ml
mL
</template>
</el-input>
<el-input v-if="item.method === 'addThick'" v-model.number="item.params.height" type="number" size="small" placeholder="请输入高度">
<el-input v-if="item.method === 'addThick'" v-model="item.params.height" type="number" size="small" placeholder="请输入高度">
<template #append>
mm
</template>
</el-input>
</template>
<template v-else-if="item.method === 'reduceLiquid'">
<el-input v-model.number="item.params.height" type="number" size="small" placeholder="请输入高度">
<el-input v-model="item.params.height" type="number" size="small" placeholder="请输入高度">
<template #append>
mm
</template>
@ -238,7 +238,7 @@ const addStep = (data: any) => {
</template>
<template v-else-if="item.method === 'preHeat'">
<el-input
v-model.number="item.params.temperature"
v-model="item.params.temperature"
type="number"
size="small"
placeholder="请输入温度"
@ -249,7 +249,7 @@ const addStep = (data: any) => {
</el-input>
</template>
<template v-else-if="['heat', 'dry', 'anneal'].includes(item.method)">
<el-input v-model.number="item.params.temperature" type="number" :max="item.method === 'anneal' ? 400 : 200" size="small" placeholder="加热温度">
<el-input v-model="item.params.temperature" type="number" :max="item.method === 'anneal' ? 400 : 200" size="small" placeholder="加热温度">
<template #append>
℃
</template>

16
src/components/craft/TransferRight.vue
View File

@ -78,8 +78,8 @@ const queryContainerList = () => {
<el-option v-for="item in containerLiquiedList" :key="item.id" :label="item.solutionName" :value="item.id" />
</el-select>
<div>
<el-input v-model.number="liquidItem.volume" size="small" style="width: 100px" :disabled="type === 'showlog'" />
<span class="ml-2">ml</span>
<el-input v-model="liquidItem.volume" size="small" style="width: 100px" :disabled="type === 'showlog'" />
<span class="mL-2">mL</span>
</div>
</div>
</div>
@ -87,18 +87,18 @@ const queryContainerList = () => {
<section v-if="stepInfo.method === 'shaking' || stepInfo.method === 'delay'" class="right-shaking">
<div class="flex items-center right-base">
<el-input v-model.number="stepInfo.params.second" style="width: 100px" size="small" class="right-base" :disabled="type === 'showlog'" />
<span class="ml-2">秒</span>
<el-input v-model="stepInfo.params.second" style="width: 100px" size="small" class="right-base" :disabled="type === 'showlog'" />
<span class="mL-2">秒</span>
</div>
</section>
<section v-if="stepInfo.method === 'startHeating'" class="right-shaking">
<div class="flex items-center right-base">
加热温度：<el-input v-model.number="stepInfo.params.temperature" style="width: 100px" size="small" :disabled="type === 'showlog'" />
<span class="ml-2">°C</span>
加热温度：<el-input v-model="stepInfo.params.temperature" style="width: 100px" size="small" :disabled="type === 'showlog'" />
<span class="mL-2">°C</span>
</div>
<div class="flex items-center right-base">
加热时间：<el-input v-model.number="stepInfo.params.second" style="width: 100px" size="small" :disabled="type === 'showlog'" />
<span class="ml-2">秒</span>
加热时间：<el-input v-model="stepInfo.params.second" style="width: 100px" size="small" :disabled="type === 'showlog'" />
<span class="mL-2">秒</span>
</div>
</section>
</template>

4
src/components/home/AddLiquid/index.vue
View File

@ -135,9 +135,9 @@ const mousedownHandle = async (index: number) => {
</el-select>
</el-form-item>
<el-form-item label="容量" prop="volume">
<el-input v-model.number="form.volume" type="number" placeholder="请输入容量">
<el-input v-model="form.volume" type="number" placeholder="请输入容量">
<template #append>
ml
mL
</template>
</el-input>
</el-form-item>

24
src/components/home/CheckCraft/index.vue
View File

@ -163,10 +163,10 @@ const resumeCraftHandle = async () => {
step.params.description += `针头高度${step.params.height}mm, 加${step.params.volume}ml水清洗${step.params.cycle}次`
break
case 'addThin':
step.params.description += `添加稀硝酸 ${step.params.volume}ml`
step.params.description += `添加稀硝酸 ${step.params.volume}mL`
break
case 'addThick':
step.params.description += `添加浓硝酸 ${step.params.volume}ml`
step.params.description += `添加浓硝酸 ${step.params.volume}mL`
break
case 'reduceLiquid':
step.params.description += `针头高度${step.params.height}mm抽取液体`
@ -303,42 +303,42 @@ const mousedownHandle = async (index: number) => {
</template>
<template v-else>
<template v-if="item.method === 'clean'">
<el-input v-model.number="item.params.height" type="number" size="small" placeholder="请输入高度">
<el-input v-model="item.params.height" type="number" size="small" placeholder="请输入高度">
<template #append>
mm
</template>
</el-input>
<el-input
v-model.number="item.params.volume"
v-model="item.params.volume"
style="width: 100px"
type="number"
size="small"
placeholder="请输入加水量"
>
<template #append>
ml
mL
</template>
</el-input>
<el-input v-model.number="item.params.cycle" type="number" size="small" placeholder="请输入次数">
<el-input v-model="item.params.cycle" type="number" size="small" placeholder="请输入次数">
<template #append>
次
</template>
</el-input>
</template>
<template v-else-if="['addThin', 'addThick'].includes(item.method)">
<el-input v-model.number="item.params.volume" type="number" size="small" placeholder="请输入容量">
<el-input v-model="item.params.volume" type="number" size="small" placeholder="请输入容量">
<template #append>
ml
mL
</template>
</el-input>
<el-input v-if="item.method === 'addThick'" v-model.number="item.params.height" type="number" size="small" placeholder="请输入高度">
<el-input v-if="item.method === 'addThick'" v-model="item.params.height" type="number" size="small" placeholder="请输入高度">
<template #append>
mm
</template>
</el-input>
</template>
<template v-else-if="item.method === 'reduceLiquid'">
<el-input v-model.number="item.params.height" type="number" size="small" placeholder="请输入高度">
<el-input v-model="item.params.height" type="number" size="small" placeholder="请输入高度">
<template #append>
mm
</template>
@ -346,7 +346,7 @@ const mousedownHandle = async (index: number) => {
</template>
<template v-else-if="item.method === 'preHeat'">
<el-input
v-model.number="item.params.temperature"
v-model="item.params.temperature"
type="number"
size="small"
placeholder="请输入温度"
@ -357,7 +357,7 @@ const mousedownHandle = async (index: number) => {
</el-input>
</template>
<template v-else-if="['heat', 'dry', 'anneal'].includes(item.method)">
<el-input v-model.number="item.params.temperature" type="number" :max="item.method === 'anneal' ? 400 : 200" size="small" placeholder="加热温度">
<el-input v-model="item.params.temperature" type="number" :max="item.method === 'anneal' ? 400 : 200" size="small" placeholder="加热温度">
<template #append>
℃
</template>

2
src/components/home/ExtractLiquid/index.vue
View File

@ -130,7 +130,7 @@ const mousedownHandle = async (index: number) => {
</div>
</el-form-item>
<el-form-item label="针头下降高度" prop="height">
<el-input v-model.number="form.height" type="number" placeholder="请输入高度">
<el-input v-model="form.height" type="number" placeholder="请输入高度">
<template #append>
mm
</template>

6
src/components/home/SetTemperature/index.vue
View File

@ -86,21 +86,21 @@ const cancel = () => {
<el-tag>{{ data?.label }}</el-tag>
</el-form-item>
<el-form-item label="加热温度" prop="heatTemperature">
<el-input v-model.number="form.heatTemperature" type="number" placeholder="请输入加热温度">
<el-input v-model="form.heatTemperature" type="number" placeholder="请输入加热温度">
<template #append>
℃
</template>
</el-input>
</el-form-item>
<el-form-item label="烘干温度" prop="dryTemperature">
<el-input v-model.number="form.dryTemperature" type="number" placeholder="请输入烘干温度">
<el-input v-model="form.dryTemperature" type="number" placeholder="请输入烘干温度">
<template #append>
℃
</template>
</el-input>
</el-form-item>
<el-form-item label="退火温度" prop="annealTemperature">
<el-input v-model.number="form.annealTemperature" type="number" placeholder="请输入退火温度">
<el-input v-model="form.annealTemperature" type="number" placeholder="请输入退火温度">
<template #append>
℃
</template>

13
src/components/home/StartClean/index.vue
View File

@ -10,6 +10,7 @@ const form = ref({
cycle: undefined,
columns: [],
height: undefined,
volume: undefined,
})
const formRef = ref()
@ -32,6 +33,9 @@ const rules = {
height: [
{ required: true, trigger: 'blur', message: '请输入针头高度' },
],
volume: [
{ required: true, trigger: 'blur', message: '请输入加水量' },
],
}
const okHandle = async () => {
@ -115,12 +119,19 @@ const mousedownHandle = async (index: number) => {
</el-form-item>
<el-form-item label="针头高度" prop="height">
<el-input v-model.number="form.height" type="number" placeholder="请输入针头高度">
<el-input v-model="form.height" type="number" placeholder="请输入针头高度">
<template #append>
mm
</template>
</el-input>
</el-form-item>
<el-form-item label="加水量" prop="volume">
<el-input v-model="form.volume" type="number" placeholder="请输入加水量">
<template #append>
mL
</template>
</el-input>
</el-form-item>
</el-form>
</FtDialog>
</template>

4
src/components/user/Edit/index.vue
View File

@ -108,10 +108,10 @@ const cancel = () => {
<el-input v-model="form.nickname" maxlength="10" show-word-limit :disabled="data.id && form.fixedUser === 'ENABLE'" placeholder="请输入用户名" />
</el-form-item>
<el-form-item v-if="useSystemStore().systemStatus.currentUser?.fixedUser === 'ENABLE'" label="密码" prop="password">
<el-input v-model.number="form.password" maxlength="6" show-word-limit show-password type="password" placeholder="请输入密码" />
<el-input v-model="form.password" maxlength="6" show-word-limit show-password type="password" placeholder="请输入密码" />
</el-form-item>
<el-form-item v-if="useSystemStore().systemStatus.currentUser?.fixedUser === 'ENABLE'" label="再次输入密码" prop="passwordAgain">
<el-input v-model.number="form.passwordAgain" maxlength="6" show-word-limit show-password type="password" placeholder="请输入密码" />
<el-input v-model="form.passwordAgain" maxlength="6" show-word-limit show-password type="password" placeholder="请输入密码" />
</el-form-item>
</el-form>
</FtDialog>

28
src/views/debug/index.vue
View File

@ -80,21 +80,21 @@ const commandHandle = async (command: string, params?: unknown) => {
<div class="card-box">
<el-form>
<el-form-item label="距离">
<el-input v-model.number="debugStore.formData.transferModule.xMotorData.relative.distance" type="number" placeholder="请输入距离">
<el-input v-model="debugStore.formData.transferModule.xMotorData.relative.distance" type="number" placeholder="请输入距离">
<template #append>
mm
</template>
</el-input>
</el-form-item>
<el-form-item label="速度">
<el-input v-model.number="debugStore.formData.transferModule.xMotorData.relative.speed" type="number" placeholder="请输入速度">
<el-input v-model="debugStore.formData.transferModule.xMotorData.relative.speed" type="number" placeholder="请输入速度">
<template #append>
rpm/min
</template>
</el-input>
</el-form-item>
<el-form-item label="循环">
<el-input v-model.number="debugStore.formData.transferModule.xMotorData.relative.times" type="number" placeholder="请输入次数">
<el-input v-model="debugStore.formData.transferModule.xMotorData.relative.times" type="number" placeholder="请输入次数">
<template #append>
次
</template>
@ -126,21 +126,21 @@ const commandHandle = async (command: string, params?: unknown) => {
<div class="card-box">
<el-form>
<el-form-item label="距离">
<el-input v-model.number="debugStore.formData.transferModule.zMotorData.relative.distance" type="number" placeholder="请输入距离">
<el-input v-model="debugStore.formData.transferModule.zMotorData.relative.distance" type="number" placeholder="请输入距离">
<template #append>
mm
</template>
</el-input>
</el-form-item>
<el-form-item label="速度">
<el-input v-model.number="debugStore.formData.transferModule.zMotorData.relative.speed" type="number" placeholder="请输入速度">
<el-input v-model="debugStore.formData.transferModule.zMotorData.relative.speed" type="number" placeholder="请输入速度">
<template #append>
rpm/min
</template>
</el-input>
</el-form-item>
<el-form-item label="循环">
<el-input v-model.number="debugStore.formData.transferModule.zMotorData.relative.times" type="number" placeholder="请输入次数">
<el-input v-model="debugStore.formData.transferModule.zMotorData.relative.times" type="number" placeholder="请输入次数">
<template #append>
次
</template>
@ -181,21 +181,21 @@ const commandHandle = async (command: string, params?: unknown) => {
<div class="card-box">
<el-form>
<el-form-item label="距离">
<el-input v-model.number="debugStore.formData.liquidModule.liquidMotor.relative.distance" type="number" placeholder="请输入距离">
<el-input v-model="debugStore.formData.liquidModule.liquidMotor.relative.distance" type="number" placeholder="请输入距离">
<template #append>
mm
</template>
</el-input>
</el-form-item>
<el-form-item label="速度">
<el-input v-model.number="debugStore.formData.liquidModule.liquidMotor.relative.speed" type="number" placeholder="请输入速度">
<el-input v-model="debugStore.formData.liquidModule.liquidMotor.relative.speed" type="number" placeholder="请输入速度">
<template #append>
rpm/min
</template>
</el-input>
</el-form-item>
<el-form-item label="循环">
<el-input v-model.number="debugStore.formData.liquidModule.liquidMotor.relative.times" type="number" placeholder="请输入次数">
<el-input v-model="debugStore.formData.liquidModule.liquidMotor.relative.times" type="number" placeholder="请输入次数">
<template #append>
次
</template>
@ -247,7 +247,7 @@ const commandHandle = async (command: string, params?: unknown) => {
<div class="card-box">
<el-form>
<el-form-item label="速度">
<el-input v-model.number="debugStore.formData.liquidModule.liquidPump.speed" type="number" placeholder="请输入速度">
<el-input v-model="debugStore.formData.liquidModule.liquidPump.speed" type="number" placeholder="请输入速度">
<template #append>
rpm/min
</template>
@ -266,9 +266,9 @@ const commandHandle = async (command: string, params?: unknown) => {
</ft-button>
</el-form-item>
<el-form-item label="容量">
<el-input v-model.number="debugStore.formData.liquidModule.liquidPump.speed" type="number" placeholder="请输入容量">
<el-input v-model="debugStore.formData.liquidModule.liquidPump.speed" type="number" placeholder="请输入容量">
<template #append>
ml
mL
</template>
</el-input>
</el-form-item>
@ -303,7 +303,7 @@ const commandHandle = async (command: string, params?: unknown) => {
<div class="card-box">
<el-form>
<el-form-item label="温度">
<el-input v-model.number="debugStore.formData.heatArea.temperature" type="number" placeholder="请输入温度">
<el-input v-model="debugStore.formData.heatArea.temperature" type="number" placeholder="请输入温度">
<template #append>
℃
</template>
@ -338,7 +338,7 @@ const commandHandle = async (command: string, params?: unknown) => {
<div class="card-box">
<el-form>
<el-form-item label="速度">
<el-input v-model.number="debugStore.formData.door.speed" type="number" placeholder="请输入速度">
<el-input v-model="debugStore.formData.door.speed" type="number" placeholder="请输入速度">
<template #append>
rpm/min
</template>

24
src/views/pointDebug/index.vue
View File

@ -80,14 +80,14 @@ const commandHandle = async (command: string, params?: unknown) => {
<div class="card-box">
<el-form>
<el-form-item label="距离">
<el-input v-model.number="debugStore.formData.transferModule.xMotorData.relative.distance" type="number" placeholder="请输入距离">
<el-input v-model="debugStore.formData.transferModule.xMotorData.relative.distance" type="number" placeholder="请输入距离">
<template #append>
mm
</template>
</el-input>
</el-form-item>
<el-form-item label="速度">
<el-input v-model.number="debugStore.formData.transferModule.xMotorData.relative.speed" type="number" placeholder="请输入速度">
<el-input v-model="debugStore.formData.transferModule.xMotorData.relative.speed" type="number" placeholder="请输入速度">
<template #append>
rpm/min
</template>
@ -108,14 +108,14 @@ const commandHandle = async (command: string, params?: unknown) => {
</FtButton>
</el-form-item>
<el-form-item label="坐标">
<el-input v-model.number="debugStore.formData.transferModule.xMotorData.absolutely.position" type="number" placeholder="请输入坐标">
<el-input v-model="debugStore.formData.transferModule.xMotorData.absolutely.position" type="number" placeholder="请输入坐标">
<template #append>
mm
</template>
</el-input>
</el-form-item>
<el-form-item label="速度">
<el-input v-model.number="debugStore.formData.transferModule.xMotorData.absolutely.speed" type="number" placeholder="请输入速度">
<el-input v-model="debugStore.formData.transferModule.xMotorData.absolutely.speed" type="number" placeholder="请输入速度">
<template #append>
rpm/min
</template>
@ -143,14 +143,14 @@ const commandHandle = async (command: string, params?: unknown) => {
<div class="card-box">
<el-form>
<el-form-item label="距离">
<el-input v-model.number="debugStore.formData.transferModule.zMotorData.relative.distance" type="number" placeholder="请输入距离">
<el-input v-model="debugStore.formData.transferModule.zMotorData.relative.distance" type="number" placeholder="请输入距离">
<template #append>
mm
</template>
</el-input>
</el-form-item>
<el-form-item label="速度">
<el-input v-model.number="debugStore.formData.transferModule.zMotorData.relative.speed" type="number" placeholder="请输入速度">
<el-input v-model="debugStore.formData.transferModule.zMotorData.relative.speed" type="number" placeholder="请输入速度">
<template #append>
rpm/min
</template>
@ -171,14 +171,14 @@ const commandHandle = async (command: string, params?: unknown) => {
</FtButton>
</el-form-item>
<el-form-item label="坐标">
<el-input v-model.number="debugStore.formData.transferModule.zMotorData.absolutely.position" type="number" placeholder="请输入坐标">
<el-input v-model="debugStore.formData.transferModule.zMotorData.absolutely.position" type="number" placeholder="请输入坐标">
<template #append>
mm
</template>
</el-input>
</el-form-item>
<el-form-item label="速度">
<el-input v-model.number="debugStore.formData.transferModule.zMotorData.absolutely.speed" type="number" placeholder="请输入速度">
<el-input v-model="debugStore.formData.transferModule.zMotorData.absolutely.speed" type="number" placeholder="请输入速度">
<template #append>
rpm/min
</template>
@ -206,14 +206,14 @@ const commandHandle = async (command: string, params?: unknown) => {
<div class="card-box">
<el-form>
<el-form-item label="距离">
<el-input v-model.number="debugStore.formData.liquidModule.liquidMotor.relative.distance" type="number" placeholder="请输入距离">
<el-input v-model="debugStore.formData.liquidModule.liquidMotor.relative.distance" type="number" placeholder="请输入距离">
<template #append>
mm
</template>
</el-input>
</el-form-item>
<el-form-item label="速度">
<el-input v-model.number="debugStore.formData.liquidModule.liquidMotor.relative.speed" type="number" placeholder="请输入速度">
<el-input v-model="debugStore.formData.liquidModule.liquidMotor.relative.speed" type="number" placeholder="请输入速度">
<template #append>
rpm/min
</template>
@ -234,14 +234,14 @@ const commandHandle = async (command: string, params?: unknown) => {
</FtButton>
</el-form-item>
<el-form-item label="坐标">
<el-input v-model.number="debugStore.formData.liquidModule.liquidMotor.absolutely.position" type="number" placeholder="请输入坐标">
<el-input v-model="debugStore.formData.liquidModule.liquidMotor.absolutely.position" type="number" placeholder="请输入坐标">
<template #append>
mm
</template>
</el-input>
</el-form-item>
<el-form-item label="速度">
<el-input v-model.number="debugStore.formData.liquidModule.liquidMotor.absolutely.speed" type="number" placeholder="请输入速度">
<el-input v-model="debugStore.formData.liquidModule.liquidMotor.absolutely.speed" type="number" placeholder="请输入速度">
<template #append>
rpm/min
</template>

Write Preview
Loading…
Cancel
Save