diff --git a/src/views/bus/Queue.vue b/src/views/bus/Queue.vue index 87d6ecb..180492f 100644 --- a/src/views/bus/Queue.vue +++ b/src/views/bus/Queue.vue @@ -322,6 +322,9 @@ username: [ {required: true, message: '请输入用户名称', trigger: ['blur', 'change']}, ], + consumerGroupName:[ + {required: true, message: '请输入消费者组名称', trigger: ['blur', 'change']}, + ] // // 所属虚拟机id // virtualHostId: [ // {required: true, message: '请选择所属虚拟机', trigger: ['blur', 'change']}, @@ -400,10 +403,10 @@ userList = userListInfo; if (userList.length>0){ let user = userList.pop(); - this.queue_addForm.username = user.username; - this.queue_addForm.queueName = user.username; - this.queue_addForm.userId = user.userId; - this.queue_addForm.consumerGroupName = user.username+"Group"; + this.queue_addForm.username = user.account; + this.queue_addForm.queueName = user.account; + this.queue_addForm.userId = user.id; + this.queue_addForm.consumerGroupName = user.account+"Group"; } }, /** diff --git a/src/views/bus/RouterManage.vue b/src/views/bus/RouterManage.vue index 5588cc4..881132f 100644 --- a/src/views/bus/RouterManage.vue +++ b/src/views/bus/RouterManage.vue @@ -281,8 +281,7 @@ }, rules: { sndr: [ - { required: true, message: '请输入账户名称', trigger: 'blur' }, - { min: 3, max: 10, message: '长度在 3 到 10 个字符', trigger: 'blur' } + { required: true, message: '请输入账户名称', trigger: 'blur' } ], btype: [ { required: true, message: '请输入消息大类', trigger: 'blur' } diff --git a/src/views/bus/dsly/user.vue b/src/views/bus/dsly/user.vue index 1a578be..3c8be72 100755 --- a/src/views/bus/dsly/user.vue +++ b/src/views/bus/dsly/user.vue @@ -50,7 +50,7 @@ <script> import util from '@/common/js/util' import NProgress from 'nprogress' - import {getUserList, removeUser, batchRemoveUser, editUser, addUser, setUserRole} from '@/views/bus/dsly/api/user'; + import {getUserList, removeUser, batchRemoveUser, editUser, addUser, setUserRole,getMockUserList} from '@/views/bus/dsly/api/user'; import {getList} from '@/api/role_api'; import moment from 'moment' import {getServerAndHostList, insertUserInfo} from "@/api/message_bus"; @@ -172,7 +172,7 @@ }; this.listLoading = true; getUserList(para).then((res) => { - let response = res.data; + let response = res.data.data; this.total = response.totalCount; this.users = response.data; this.listLoading = false;