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}` }}