diff --git a/src/assets/styles/variable.scss b/src/assets/styles/variable.scss index af9d7a7..1a72019 100644 --- a/src/assets/styles/variable.scss +++ b/src/assets/styles/variable.scss @@ -4,4 +4,4 @@ $danger-color: #DF1515; $warn-color: #EE8223; $info-color: #909399; $gradient-color: linear-gradient(185deg, rgb(175 216 255) -90%, #fff 24%); -$main-container-height: calc(100vh - 14vh) \ No newline at end of file +$main-container-height: calc(100vh - 17vh) \ No newline at end of file diff --git a/src/components/common/DatePicker/index.vue b/src/components/common/DatePicker/index.vue index 479e177..8ffbe94 100644 --- a/src/components/common/DatePicker/index.vue +++ b/src/components/common/DatePicker/index.vue @@ -22,7 +22,9 @@ const props = defineProps({ const emits = defineEmits(['update:modelValue', 'change']) const dateText = ref() -const hoursOptions = ref([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]) +const hoursOptions = ref(Array.from({ length: 24 }, (_, i) => i)) +const minuteOptions = ref(Array.from({ length: 60 }, (_, i) => i)) +const secondOptions = ref(Array.from({ length: 60 }, (_, i) => i)) // 初始化日期时间 const selectedDate = ref(null) const currentYear = ref(0) @@ -36,7 +38,6 @@ const selectedSecond = ref('00') // 格式化显示值 const displayValue = () => { - console.log('-----------------') if (!selectedDate.value) { return '' } @@ -183,7 +184,6 @@ const updateTime = () => { // 确认选择 const confirmSelection = () => { - console.log('selectedDate.value---', selectedDate.value) if (selectedDate.value) { const dateValue = formatDate(selectedDate.value, props.format) emits('update:modelValue', dateValue) @@ -351,13 +351,13 @@ onUnmounted(() => { : - + {{ i.toString().padStart(2, '0') }} : - + {{ i.toString().padStart(2, '0') }} @@ -516,7 +516,7 @@ $fontSize: 1.5rem; margin-right: 4px; /* 最大高度限制,溢出滚动 */ max-height: 3rem; - width: 6rem; + width: 8rem; border: none; } } @@ -530,6 +530,7 @@ select option { margin-right: 12px; font-size: $fontSize; color: #334155; + width: 5rem; } .select-option{ diff --git a/src/components/common/SoftKeyboard/index.vue b/src/components/common/SoftKeyboard/index.vue index 25966e5..2091c71 100644 --- a/src/components/common/SoftKeyboard/index.vue +++ b/src/components/common/SoftKeyboard/index.vue @@ -167,8 +167,8 @@ const handleTouchEnd = () => { :style="{ transform: `translate(${x}px, ${y}px)`, transition: isDragging ? 'none' : 'transform 0.3s ease', - width: keyboardType === 'number' ? '50vw' : '', - height: keyboardType === 'number' ? '45vh' : '50vh', + width: keyboardType === 'number' ? '50vw' : '66vw', + height: keyboardType === 'number' ? '46vh' : '46vh', }" >
@@ -195,7 +195,7 @@ const handleTouchEnd = () => { 'key-number': keyboardType === 'number', 'key-text': key !== ' ' && keyboardType === 'text', }" - :style="keyboardType === 'number' ? 'height: 10vh' : 'height:4rem'" + :style="keyboardType === 'number' ? 'height: 10vh' : 'height:3rem;'" @click="(e) => { e.stopPropagation() handleKeyPress(key) @@ -247,12 +247,16 @@ const handleTouchEnd = () => { .pinyin-container{ display: flex; width: 80%; - height: 4rem; + height: 3rem; + padding-left: 2rem; .pinyin-cn{ + color: #1890ff; + padding-left: 1rem; display: flex; width: 1rem; position: relative; gap:5px; + font-family: fangsong; .cn-name{ font-size: 2.5rem; } diff --git a/src/components/formula/FormulaConfig.vue b/src/components/formula/FormulaConfig.vue index ca8d320..bdbdd6c 100644 --- a/src/components/formula/FormulaConfig.vue +++ b/src/components/formula/FormulaConfig.vue @@ -188,7 +188,6 @@ const handleSubmit = () => { * 根据是否有formula_id决定是添加新配方还是编辑已有配方 */ const onSaveFormula = () => { - console.log('formData.value.formula_id---', formData.value.formula_id) if (formData.value.formula_id) { const formulaForm: Record = convertValuesToString(formData.value, 'name') onEditFormula(formulaForm.formula_id, formulaForm as Formula.FormulaItem) @@ -269,7 +268,8 @@ const onEditFormula = (formula_id: string, formulaForm: Formula.FormulaItem) => syncSendCmd(editParams).then(() => { FtMessage.success('操作成功') formulaStore.initFormulaList() - formData.value = formulaForm + // formData.value = formulaForm + formulaStore.updateSelectedFormulaData(formulaForm) }) } diff --git a/src/components/home/HomeLogLevel.vue b/src/components/home/HomeLogLevel.vue index 0873ee1..7b36751 100644 --- a/src/components/home/HomeLogLevel.vue +++ b/src/components/home/HomeLogLevel.vue @@ -70,7 +70,7 @@ $input-height: 3rem; font-family: Source Han Sans; font-size: 24px; .input{ - width: 15vw; + width: 14vw; height: $input-height } .input-log{ diff --git a/src/components/home/HomeOperation.vue b/src/components/home/HomeOperation.vue index 5c835d9..7b4b8b2 100644 --- a/src/components/home/HomeOperation.vue +++ b/src/components/home/HomeOperation.vue @@ -26,7 +26,7 @@ const systemStore = useSystemStore() const curStateRemainTimeS = ref('') // 当前状态剩余时间(字符串格式) const disinfectionState = ref(homeStore.disinfectionState) // 消毒状态 const btnStyle = { - width: '27vw', + width: '25vw', height: '7vh', textSize: '24px', borderRadius: '12px', diff --git a/src/components/home/HomeSetting.vue b/src/components/home/HomeSetting.vue index 9edc9ca..381aeb6 100644 --- a/src/components/home/HomeSetting.vue +++ b/src/components/home/HomeSetting.vue @@ -4,8 +4,6 @@ import { useFormulaStore } from '@/stores/formulaStore' import { useHomeStore } from '@/stores/homeStore' import { sendCmd, syncSendCmd } from 'apis/system' // import homeChart from 'assets/images/home/home-chart.svg' -import homeRunSvg from 'assets/images/home/home-run.svg' -import homeSettingSvg from 'assets/images/home/home-setting.svg' import BtButton from 'components/common/BTButton/index.vue' import CascadingSelectModal from 'components/common/CascadingSelectModal/index.vue' import Config from 'components/home/Config.vue' @@ -225,11 +223,7 @@ const onClose = () => { text-color="#1989fa" height="3rem" @click="onSetPressure" - > - - + />
{ text-color="#1989fa" :disabled="deviceState" @click="onShowChart" - > - - + />
{ text-color="#1989fa" height="3rem" @click="onDisinfectConfig" - > - - + /> { text-color="#1989fa" height="3rem" @click="onDisinfectConfig" - > - - + />
@@ -327,6 +309,7 @@ const onClose = () => { bottom: 0; margin: 0.5rem; gap: 5px; + width: 100%; .home-opt-flex{ display: grid; grid-template-columns: 1fr 1fr 1fr; diff --git a/src/components/home/config.vue b/src/components/home/config.vue index cc1f7f6..d46a36d 100644 --- a/src/components/home/config.vue +++ b/src/components/home/config.vue @@ -144,6 +144,7 @@ const onDefaultFormula = () => { diff --git a/src/components/setting/History.vue b/src/components/setting/History.vue index c4bb823..0799bc0 100644 --- a/src/components/setting/History.vue +++ b/src/components/setting/History.vue @@ -115,7 +115,7 @@ const onClose = () => { - +