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/components/business/OperaDeviceRoleWindow.vue | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/admin/src/components/business/OperaDeviceRoleWindow.vue b/admin/src/components/business/OperaDeviceRoleWindow.vue
index 4910ac9..7b425b1 100644
--- a/admin/src/components/business/OperaDeviceRoleWindow.vue
+++ b/admin/src/components/business/OperaDeviceRoleWindow.vue
@@ -2,6 +2,7 @@
<GlobalWindow
:title="title"
:visible.sync="visible"
+ width="50%"
:confirm-working="isWorking"
@confirm="confirm"
>
@@ -23,9 +24,15 @@
<el-radio :label="0">鍏ㄩ儴闂ㄧ</el-radio>
<el-radio :label="1">閮ㄥ垎闂ㄧ</el-radio>
</el-radio-group>
- <el-checkbox-group v-model="form.doorIds" v-if="form.radio === 1">
- <el-checkbox :label="item.id" v-for="(item, index) in device" :key="index">{{item.name}}</el-checkbox>
- </el-checkbox-group>
+ <el-transfer
+ v-if="form.radio === 1"
+ style="margin-top: 15px;"
+ :titles="['鏈�夐棬绂佺粍', '宸查�夐棬绂佺粍']"
+ filterable
+ filter-placeholder="璇疯緭鍏ラ棬绂佺粍鍚嶇О"
+ v-model="form.doorIds"
+ :data="device">
+ </el-transfer>
</el-form-item>
</el-form>
</GlobalWindow>
@@ -148,7 +155,13 @@
getLists () {
getList({})
.then(res => {
- this.device = res
+ this.device = res.map(item => {
+ return {
+ label: item.name,
+ key: item.id
+ }
+ })
+ console.log(this.device)
})
},
changeRadio (e) {
@@ -176,3 +189,9 @@
}
}
</script>
+
+<style>
+ .el-transfer-panel {
+ width: 350px;
+ }
+</style>
--
Gitblit v1.9.3