diff --git a/src/app.vue b/src/app.vue index 6cbe7bb..0737226 100644 --- a/src/app.vue +++ b/src/app.vue @@ -28,10 +28,10 @@ let timer: any = null // 进度条定时器 */ onBeforeMount(async () => { startProgress() // 启动进度条 - // 环境数据轮询(每2秒获取一次) + // 环境数据轮询(每10秒获取一次) setInterval(async () => { await readH2o2Data() - }, 3000) + }, 10 * 1000) }) /** diff --git a/src/components/formula/FormulaConfig.vue b/src/components/formula/FormulaConfig.vue index ef4664b..ee91c51 100644 --- a/src/components/formula/FormulaConfig.vue +++ b/src/components/formula/FormulaConfig.vue @@ -424,15 +424,15 @@ const openKeyboardType = (labelName: string) => {
- - 确定 - 恢复默认值 取消 + + 确定 +
diff --git a/src/components/formula/FormulaTable.vue b/src/components/formula/FormulaTable.vue index fd44d77..d854cb8 100644 --- a/src/components/formula/FormulaTable.vue +++ b/src/components/formula/FormulaTable.vue @@ -17,7 +17,10 @@ onMounted(() => { }) watchEffect(() => { - recipes.value = formulaStore.formulaList as Formula.FormulaItem[] + recipes.value = formulaStore.formulaList + if (formulaStore.formulaList) { + selectedIndex.value = formulaStore.formulaList.length - 1 + } }) const initFormulaList = () => { @@ -31,6 +34,7 @@ const initFormulaList = () => { const selectRecipe = (item: Formula.FormulaItem, index: number) => { selectedIndex.value = selectedIndex.value === index ? null : index + console.log('selectedIndex--', selectedIndex) item = convertValuesToInt(item) as Formula.FormulaItem formulaStore.updateSelectedFormulaData(item) } diff --git a/src/components/home/HomeSetting.vue b/src/components/home/HomeSetting.vue index 23bac3d..2d73a6e 100644 --- a/src/components/home/HomeSetting.vue +++ b/src/components/home/HomeSetting.vue @@ -261,7 +261,7 @@ const settingWidth = computed(() => { { - +
@@ -326,7 +326,14 @@ const settingWidth = computed(() => { } } } + ::v-deep .el-dialog__body { + padding: 0 0 !important; + border: 1px solid red !important; + } + .config { + border: 1px solid red; + } .config-btn{ - margin-top: -3rem + margin-top: -4rem } diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 6ac8d3f..02982ec 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -135,7 +135,7 @@ const nowLiquid = computed(() => { .home-grid-container { display: grid; grid-template-columns: repeat(3, 1fr); - gap: 0.5rem; + gap: 1rem; } .home-merged-cell { grid-column: 1 / 2; @@ -145,7 +145,7 @@ const nowLiquid = computed(() => { display: grid; grid-template-columns: repeat(2, 1fr); grid-template-rows: repeat(2, auto); - gap:1.5rem; + gap:1rem; .card { text-align: center; height: 40.5vh; diff --git a/src/views/liquid/index.vue b/src/views/liquid/index.vue index 4412bdd..64b781b 100644 --- a/src/views/liquid/index.vue +++ b/src/views/liquid/index.vue @@ -182,7 +182,7 @@ const onStopDrainLiquid = async () => { type="primary" :button-text="`${liquidTotoal}g`" bg-color="#2892F3" - border-radius="0" + border-radius="0 5px 5px 0" text-color="#ffffff" height="4rem" text-size="24px" diff --git a/src/views/setting/index.vue b/src/views/setting/index.vue index 2228d2e..c4167e1 100644 --- a/src/views/setting/index.vue +++ b/src/views/setting/index.vue @@ -67,7 +67,7 @@ const selectItem = (menuCode: string) => { .setting-right{ grid-column: 2 / 4; box-shadow: 0px 1px 5px 0px rgba(9, 39, 62, 0.15); - background: $gradient-color; + background: #ffffff; } } .menu-container { diff --git a/vite.config.ts b/vite.config.ts index 94624cd..9f04f91 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -23,7 +23,7 @@ export default defineConfig(({ mode }) => { }, build: { sourcemap: false, - outDir: `dist-v${packageJson.version}`, + outDir: `dist`, rollupOptions: { output: { manualChunks(id) {