From 6cb1cffebb534392ec38e2e7a805bc1e62e422ac Mon Sep 17 00:00:00 2001 From: guoapeng Date: Sat, 12 Jul 2025 21:00:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=BE=E7=BD=AE=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96;=20=E7=89=88=E6=9C=AC=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E7=AC=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/formula/SettingFormulaConfig.vue | 2 +- src/components/setting/Device.vue | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/formula/SettingFormulaConfig.vue b/src/components/formula/SettingFormulaConfig.vue index 14ef234..3aea0de 100644 --- a/src/components/formula/SettingFormulaConfig.vue +++ b/src/components/formula/SettingFormulaConfig.vue @@ -35,7 +35,7 @@ const formulaConfigList = ref(formulaStore.formulaConfigList) */ watchEffect(() => { formData.value = cloneDeep(formulaStore.defaultFormulaInfo) - formData.value = convertValuesToString(formData.value, 'name') + formData.value = convertValuesToString(formData.value || {}, 'name') // formData.value = convertValuesToInt(formData.value) }) const settingFormRef = ref() diff --git a/src/components/setting/Device.vue b/src/components/setting/Device.vue index e5cbb9d..40d6056 100644 --- a/src/components/setting/Device.vue +++ b/src/components/setting/Device.vue @@ -32,14 +32,14 @@ const deviceType = computed(() => __DEVICE_TYPE__)
IP地址：{{ deviceInfo.ip }}
-
-
初始化状态：{{ deviceInfo.deviceTypeInited ? '已初始化' : '未初始化' }}
-
+ + +
-
版本信息：{{ `${deviceInfo.appVersion}-${webVersion}` }}
+
版本信息：{{ `${deviceInfo.appVersion} / ${webVersion}` }}