朱兆平 / vue_cli · 提交

转到一个项目

作者 王勇
提交 5ca83788f2cca22829a07c94f1b710d3092b34ed 1 个父辈 754443ab

修改了配置的添加规则

内嵌 并排对比
正在显示 1 个修改的文件 包含 22 行增加 和 30 行删除
@@ -126,19 +126,19 @@ @@ -126,19 +126,19 @@
126 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -30px" align="center" 126 <el-form :inline="true" label-width="120px" status-icon style="margin-top: -30px" align="center"
127 :model="umb_addForm" :rules="umb_addFormRules" ref="umb_addFormRef"> 127 :model="umb_addForm" :rules="umb_addFormRules" ref="umb_addFormRef">
128 128
129 -<!-- <el-form-item label="用户名称：" prop="userIds">-->  
130 -<!-- <el-select v-model="umb_addForm.userIds" prefix-icon="el-icon-search" clearable-->  
131 -<!-- @change="umb_userInfo_addChange"-->  
132 -<!-- style="width:400px" size="medium" filterable multiple-->  
133 -<!-- placeholder="请选择用户">-->  
134 -<!-- <el-option-->  
135 -<!-- v-for="item in (umb_config.userInfoList)"-->  
136 -<!-- :key="item.id"-->  
137 -<!-- :label="item.username"-->  
138 -<!-- :value="item.id">-->  
139 -<!-- </el-option>-->  
140 -<!-- </el-select>-->  
141 -<!-- </el-form-item>--> 129 + <!-- <el-form-item label="用户名称：" prop="userIds">-->
  130 + <!-- <el-select v-model="umb_addForm.userIds" prefix-icon="el-icon-search" clearable-->
  131 + <!-- @change="umb_userInfo_addChange"-->
  132 + <!-- style="width:400px" size="medium" filterable multiple-->
  133 + <!-- placeholder="请选择用户">-->
  134 + <!-- <el-option-->
  135 + <!-- v-for="item in (umb_config.userInfoList)"-->
  136 + <!-- :key="item.id"-->
  137 + <!-- :label="item.username"-->
  138 + <!-- :value="item.id">-->
  139 + <!-- </el-option>-->
  140 + <!-- </el-select>-->
  141 + <!-- </el-form-item>-->
142 142
143 <el-form-item label="用户名称：" prop="usernames"> 143 <el-form-item label="用户名称：" prop="usernames">
144 <el-select v-model="umb_addForm.usernames" prefix-icon="el-icon-search" clearable 144 <el-select v-model="umb_addForm.usernames" prefix-icon="el-icon-search" clearable
@@ -164,6 +164,7 @@ @@ -164,6 +164,7 @@
164 <el-form-item label="服务器名称：" prop="serverId"> 164 <el-form-item label="服务器名称：" prop="serverId">
165 <el-select v-model="umb_addForm.serverId" prefix-icon="el-icon-search" clearable 165 <el-select v-model="umb_addForm.serverId" prefix-icon="el-icon-search" clearable
166 style="width:400px" size="medium" filterable 166 style="width:400px" size="medium" filterable
  167 + :disabled="umb_addForm.usernames.length===0"
167 @change="umb_server_addChange" 168 @change="umb_server_addChange"
168 placeholder="请选择服务器"> 169 placeholder="请选择服务器">
169 <el-option 170 <el-option
@@ -179,7 +180,7 @@ @@ -179,7 +180,7 @@
179 <el-select v-model="umb_addForm.virtualHostId" prefix-icon="el-icon-search" clearable 180 <el-select v-model="umb_addForm.virtualHostId" prefix-icon="el-icon-search" clearable
180 style="width:400px" size="medium" filterable 181 style="width:400px" size="medium" filterable
181 @change="umb_virtualHost_addChange" 182 @change="umb_virtualHost_addChange"
182 - :disabled="umb_addForm.serverId==='' || umb_addForm.userIds.length===0" 183 + :disabled="umb_addForm.serverId==='' || umb_addForm.usernames.length===0"
183 placeholder="请选择虚拟主机"> 184 placeholder="请选择虚拟主机">
184 <el-option 185 <el-option
185 v-for="item in (umb_config.virtualHostList)" 186 v-for="item in (umb_config.virtualHostList)"
@@ -222,7 +223,7 @@ @@ -222,7 +223,7 @@
222 <el-form-item label="订阅者队列：" prop="queueIds"> 223 <el-form-item label="订阅者队列：" prop="queueIds">
223 <el-select v-model="umb_addForm.queueIds" prefix-icon="el-icon-search" clearable 224 <el-select v-model="umb_addForm.queueIds" prefix-icon="el-icon-search" clearable
224 style="width:400px" size="medium" filterable multiple 225 style="width:400px" size="medium" filterable multiple
225 - :disabled="umb_addForm.virtualHostId==='' || umb_addForm.userIds.length===0" 226 + :disabled="umb_addForm.virtualHostId==='' || umb_addForm.usernames.length===0"
226 placeholder="请选择订阅者队列"> 227 placeholder="请选择订阅者队列">
227 <el-option 228 <el-option
228 v-for="item in (umb_config.queueList)" 229 v-for="item in (umb_config.queueList)"
@@ -259,8 +260,7 @@ @@ -259,8 +260,7 @@
259 <el-form :inline="true" label-width="120px" status-icon style="margin-left: 30px" align="center" 260 <el-form :inline="true" label-width="120px" status-icon style="margin-left: 30px" align="center"
260 :model="umb_editForm" :rules="umb_editFormRules" ref="umb_editFormRef"> 261 :model="umb_editForm" :rules="umb_editFormRules" ref="umb_editFormRef">
261 <el-form-item label="用户名称：" prop="username"> 262 <el-form-item label="用户名称：" prop="username">
262 - <el-input v-model="umb_editForm.username" style="width:300px" size="small" clearable  
263 - disabled 263 + <el-input v-model="umb_editForm.username" style="width:300px" size="small" clearable disabled
264 placeholder="请输入用户名称"> 264 placeholder="请输入用户名称">
265 </el-input> 265 </el-input>
266 </el-form-item> 266 </el-form-item>
@@ -650,7 +650,7 @@ @@ -650,7 +650,7 @@
650 */ 650 */
651 umb_add() { 651 umb_add() {
652 this.umb_addForm.queueId = this.umb_addForm.queueIds.join(); 652 this.umb_addForm.queueId = this.umb_addForm.queueIds.join();
653 - this.umb_addForm.userId = this.umb_addForm.userIds.join(); 653 + this.umb_addForm.username = this.umb_addForm.usernames.join();
654 this.umb_addForm.exchangeId = this.umb_addForm.exchangeIds.join(); 654 this.umb_addForm.exchangeId = this.umb_addForm.exchangeIds.join();
655 this.umb_addForm.routingKeyId = this.umb_addForm.routingKeyIds.join(); 655 this.umb_addForm.routingKeyId = this.umb_addForm.routingKeyIds.join();
656 // 进行表单的预验证 656 // 进行表单的预验证
@@ -873,10 +873,9 @@ @@ -873,10 +873,9 @@
873 /** 873 /**
874 * 获取队列-列表 874 * 获取队列-列表
875 */ 875 */
876 - selectQueueList(virtualHostId, userId) { 876 + selectQueueList(virtualHostId) {
877 let params = { 877 let params = {
878 virtualHostId: virtualHostId, 878 virtualHostId: virtualHostId,
879 - userId: userId  
880 }; 879 };
881 getQueueList(params).then((response) => { 880 getQueueList(params).then((response) => {
882 let res = response.data; 881 let res = response.data;
@@ -917,26 +916,20 @@ @@ -917,26 +916,20 @@
917 }, 916 },
918 917
919 umb_userInfo_addChange(value) { 918 umb_userInfo_addChange(value) {
920 - console.log(value.join())  
921 - // 根据虚拟主机id和用户id来查询，队列集合  
922 - this.selectQueueList(this.umb_addForm.virtualHostId, value.join()); 919 +
923 }, 920 },
924 921
925 /** 922 /**
926 * 添加方法，虚拟主机ID值，改变 923 * 添加方法，虚拟主机ID值，改变
927 */ 924 */
928 umb_virtualHost_addChange(value) { 925 umb_virtualHost_addChange(value) {
929 - // 先将对应的交换机和队列的ID清空  
930 this.umb_addForm.exchangeId = undefined; 926 this.umb_addForm.exchangeId = undefined;
931 this.umb_addForm.queueId = undefined; 927 this.umb_addForm.queueId = undefined;
932 928
933 - // 根据虚拟主机ID，获取出对应的交换机和队列的列表  
934 this.selectExchangeList(value); 929 this.selectExchangeList(value);
935 -  
936 - // 根据用户id和虚拟主机id来查询，队列集合  
937 - let userId = this.umb_addForm.userIds.join();  
938 - this.selectQueueList(value, userId); 930 + this.selectQueueList(value);
939 }, 931 },
  932 +
940 /** 933 /**
941 * 添加方法，交换机ID值，改变 934 * 添加方法，交换机ID值，改变
942 */ 935 */
@@ -1005,7 +998,6 @@ @@ -1005,7 +998,6 @@
1005 getCloudUser() { 998 getCloudUser() {
1006 getUserList(this.user_cloud.queryInfo).then((response) => { 999 getUserList(this.user_cloud.queryInfo).then((response) => {
1007 this.user_cloud.cloudUserList = response.data.data.list; 1000 this.user_cloud.cloudUserList = response.data.data.list;
1008 - console.log(this.user_cloud.cloudUserList)  
1009 }).catch((error) => { 1001 }).catch((error) => {
1010 this.$message.error(error.toString()); 1002 this.$message.error(error.toString());
1011 }); 1003 });