Browse Source

fix: 时间首次延迟; 预设输入校验

master
guoapeng 2 months ago
parent
commit
3690eca3b8
  1. 1
      src/components/common/Countdown.vue
  2. 2
      src/components/craft/AddCraft/index.vue
  3. 10
      src/components/home/ExecuteCraft/index.vue
  4. 1
      src/hooks/useServerTime.ts

1
src/components/common/Countdown.vue

@ -87,6 +87,7 @@ watch(
const secondsNum = Math.floor((newVal % (1000 * 60)) / 1000)
seconds.value = secondsNum.toString().padStart(2, '0')
},
{ immediate: true },
)
</script>

2
src/components/craft/AddCraft/index.vue

@ -134,7 +134,7 @@ const addStep = (data: any) => {
<el-row :gutter="30">
<el-col :span="10">
<el-form-item label="预设名称" prop="name">
<el-input v-model.number="form.name" type="number" placeholder="请输入预设名称" />
<el-input v-model="form.name" placeholder="请输入预设名称" />
</el-form-item>
<el-form-item label="步骤列表">
<div class="button-content">

10
src/components/home/ExecuteCraft/index.vue

@ -88,6 +88,13 @@ const getOres = async () => {
const res = await getOreList()
oreList.value = res.list
}
const selectVisible = ref(false)
const checkChange = () => {
selectedColumns.value = Array.from({ length: 5 }).fill(selectVisible.value)
form.value.columns = selectedColumns.value.map((item, index) => index + 1).filter(item => selectedColumns.value[item - 1])
formRef.value.validateField('columns')
}
</script>
<template>
@ -99,6 +106,9 @@ const getOres = async () => {
</el-tag>
</el-form-item>
<el-form-item label="选择试管" prop="columns">
<el-checkbox v-model="selectVisible" style="margin-right: 10px" @change="checkChange">
全选
</el-checkbox>
<div class="tube-item">
<div
v-for="item in 5"

1
src/hooks/useServerTime.ts

@ -12,6 +12,7 @@ export function useServerTime() {
onMounted(async () => {
try {
serverTime.value = await getTime()
currentTime.value = formatDateTime(undefined, new Date(serverTime.value))
clientFetchTime.value = Date.now()
let num = 0
interval = window.setInterval(async () => {

Loading…
Cancel
Save