Browse Source

fix:设置取消初始化; 版本连接符修改

master
guoapeng 6 days ago
parent
commit
6cb1cffebb
  1. 2
      src/components/formula/SettingFormulaConfig.vue
  2. 8
      src/components/setting/Device.vue

2
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()

8
src/components/setting/Device.vue

@ -32,14 +32,14 @@ const deviceType = computed(() => __DEVICE_TYPE__)
<div class="device-ul">
<div>IP地址{{ deviceInfo.ip }}</div>
</div>
<div class="device-ul">
<div>初始化状态{{ deviceInfo.deviceTypeInited ? '已初始化' : '未初始化' }}</div>
</div>
<!-- <div class="device-ul"> -->
<!-- <div>初始化状态{{ deviceInfo.deviceTypeInited ? '已初始化' : '未初始化' }}</div> -->
<!-- </div> -->
<!-- <div class="device-ul"> -->
<!-- <div>设备屏幕尺寸{{ screenWidth }} x {{ screenHeight }}</div> -->
<!-- </div> -->
<div class="device-ul">
<div>版本信息{{ `${deviceInfo.appVersion}-${webVersion}` }}</div>
<div>版本信息{{ `${deviceInfo.appVersion} / ${webVersion}` }}</div>
</div>
</div>
</template>

Loading…
Cancel
Save