From e86a5fda9ee2ffd9e0aee97e768b299ca70fdc73 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 07 三月 2024 11:21:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/deviceRole.vue | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/deviceRole.vue b/admin/src/views/business/deviceRole.vue
index 13129b7..776c49d 100644
--- a/admin/src/views/business/deviceRole.vue
+++ b/admin/src/views/business/deviceRole.vue
@@ -86,7 +86,7 @@
module: '闂ㄧ瑙掕壊',
api: '/business/deviceRole',
'field.id': 'id',
- 'field.main': 'id'
+ 'field.main': 'name'
})
this.search()
},
@@ -100,8 +100,10 @@
edit (row) {
if (row.doorIds) {
row.radio = 1
- row.doorIds = row.doorIds.split(',')
- row.doorIds = row.doorIds.map(item => Number(item))
+ if (typeof row.doorIds !== 'object') {
+ row.doorIds = row.doorIds.split(',')
+ row.doorIds = row.doorIds.map(item => Number(item))
+ }
} else {
row.radio = 0
row.doorIds = []
--
Gitblit v1.9.3