From 32d56327d6f69373ada1c3447f542ec1a39282b1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 06 五月 2024 17:31:01 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/a6-device-management.vue | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 7e15685..813729c 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -350,7 +350,7 @@
</el-form-item>
<el-form-item label="褰撳墠鐘舵��:">
<el-select v-model="formData2.deviceStatus" placeholder="璇烽�夋嫨" size="small" style="width:100%">
- <el-option v-for="item in deviceStatusList" :key="item.value" :label="item.label" :value="item.value">
+ <el-option v-for="item in deviceStatusList" :key="item.id" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
@@ -552,6 +552,11 @@
category: "璁惧鐘舵��"
}).then(res => {
this.deviceStatusList = res.data
+ this.deviceStatusList.forEach(a=>{
+ if(!isNaN(a.value)){
+ a.value = parseInt(a.value)
+ }
+ })
this.componentData.tagField.deviceStatus.select = res.data
})
this.$axios.post(this.$api.enums.selectEnumByCategory, {
--
Gitblit v1.9.3