朱兆平 / vue_cli · 提交

转到一个项目

作者 王勇
提交 e65e185c9ed12e9dd7c76ec29e552eb3f8b3971c 1 个父辈 947b1645

简单修改加载

内嵌 并排对比
正在显示 8 个修改的文件 包含 90 行增加 和 48 行删除
@@ -105,7 +105,7 @@ export const insertUserInfo = params =>{return http.post(`${baseUrl}/user/insert @@ -105,7 +105,7 @@ export const insertUserInfo = params =>{return http.post(`${baseUrl}/user/insert
105 export const selectUserInfoList = params =>{return http.get(`${baseUrl}/user/list`, params);}; 105 export const selectUserInfoList = params =>{return http.get(`${baseUrl}/user/list`, params);};
106 export const deleteUserInfo = params =>{return http.del(`${baseUrl}/user/delete`, params);}; 106 export const deleteUserInfo = params =>{return http.del(`${baseUrl}/user/delete`, params);};
107 export const deleteUserRelation = params =>{return http.del(`${baseUrl}/user/deleteRelation`, params);}; 107 export const deleteUserRelation = params =>{return http.del(`${baseUrl}/user/deleteRelation`, params);};
108 -export const updatePassword = params =>{return http.put(`${baseUrl}/user/updatePassword`, params);}; 108 +// export const updatePassword = params =>{return http.put(`${baseUrl}/user/updatePassword`, params);};
109 // 批量删除用户 109 // 批量删除用户
110 export const batchDeleteUser = params =>{return http.del(`${baseUrl}/user/batch_delete`, params);}; 110 export const batchDeleteUser = params =>{return http.del(`${baseUrl}/user/batch_delete`, params);};
111 // 批量删除用户关系 111 // 批量删除用户关系
@@ -134,7 +134,7 @@ let routes = [ @@ -134,7 +134,7 @@ let routes = [
134 name: '消息控制中心', 134 name: '消息控制中心',
135 iconCls: 'el-icon-message', 135 iconCls: 'el-icon-message',
136 children: [ 136 children: [
137 - {path: '/userInfo', component: UserInfo, name: 'MQ用户管理'}, 137 + {path: '/userInfo', component: UserInfo, name: '用户关系管理'},
138 {path: '/server', component: Server, name: '服务器管理'}, 138 {path: '/server', component: Server, name: '服务器管理'},
139 {path: '/host', component: VirtualHost, name: '虚拟主机管理'}, 139 {path: '/host', component: VirtualHost, name: '虚拟主机管理'},
140 {path: '/queue', component: Queue, name: '队列管理'}, 140 {path: '/queue', component: Queue, name: '队列管理'},
@@ -111,7 +111,6 @@ @@ -111,7 +111,6 @@
111 import rt from '../routes' 111 import rt from '../routes'
112 import {editPass, resetToken} from '../api/user'; 112 import {editPass, resetToken} from '../api/user';
113 import ElFormItem from "element-ui/packages/form/src/form-item"; 113 import ElFormItem from "element-ui/packages/form/src/form-item";
114 - import {updatePassword} from "../api/message_bus"  
115 114
116 export default { 115 export default {
117 116
@@ -261,19 +260,19 @@ @@ -261,19 +260,19 @@
261 submitEdit(formName) { 260 submitEdit(formName) {
262 this.$refs[formName].validate((valid) => { 261 this.$refs[formName].validate((valid) => {
263 if (valid) { 262 if (valid) {
264 - const userInfo = {  
265 - username: this.sysUserName,  
266 - password: this.resetForm.renewpwd  
267 - }  
268 - // 修改MQ用户的密码  
269 - updatePassword(userInfo).then((response) => {  
270 - let res = response.data;  
271 - if (res.code !== '200') {  
272 - return this.$message.error(res.msg);  
273 - }  
274 - }).catch(error => {  
275 - this.$message.error(error.toString());  
276 - }); 263 + // const userInfo = {
  264 + // username: this.sysUserName,
  265 + // password: this.resetForm.renewpwd
  266 + // }
  267 + // // 修改MQ用户的密码
  268 + // updatePassword(userInfo).then((response) => {
  269 + // let res = response.data;
  270 + // if (res.code !== '200') {
  271 + // return this.$message.error(res.msg);
  272 + // }
  273 + // }).catch(error => {
  274 + // this.$message.error(error.toString());
  275 + // });
277 276
278 this.editForm.userId = this.sysUserId; 277 this.editForm.userId = this.sysUserId;
279 this.editForm.password = this.resetForm.renewpwd; 278 this.editForm.password = this.resetForm.renewpwd;
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 <el-row :gutter="24"> 101 <el-row :gutter="24">
102 <el-col :span="5"> 102 <el-col :span="5">
103 <el-button type="danger" icon="el-icon-delete" 103 <el-button type="danger" icon="el-icon-delete"
104 - :loading="messageNote_loading.batchDelLoading" 104 + :loading="messageNote_loading.listLoading"
105 :disabled="this.messageNote_page.selectList.length===0" 105 :disabled="this.messageNote_page.selectList.length===0"
106 @click="messageNote_batchRemove">批量删除 106 @click="messageNote_batchRemove">批量删除
107 </el-button> 107 </el-button>
@@ -861,23 +861,23 @@ @@ -861,23 +861,23 @@
861 } 861 }
862 ).then(() => { 862 ).then(() => {
863 // 开启加载 863 // 开启加载
864 - this.messageNote_loading.batchDelLoading = true; 864 + this.messageNote_loading.listLoading = true;
865 let params = {ids: ids}; 865 let params = {ids: ids};
866 batchRemoveMessageNote(params).then(response => { 866 batchRemoveMessageNote(params).then(response => {
867 let res = response.data; 867 let res = response.data;
868 if (res.code !== '200') { 868 if (res.code !== '200') {
869 // 关闭加载 869 // 关闭加载
870 - this.messageNote_loading.batchDelLoading = false; 870 + this.messageNote_loading.listLoading = false;
871 return this.$message.error('批量删除消息收发记录，失败'); 871 return this.$message.error('批量删除消息收发记录，失败');
872 } 872 }
873 this.$message.success(res.msg); 873 this.$message.success(res.msg);
874 // 关闭加载 874 // 关闭加载
875 - this.messageNote_loading.batchDelLoading = false; 875 + this.messageNote_loading.listLoading = false;
876 // 刷新列表 876 // 刷新列表
877 this.messageNote_getList(); 877 this.messageNote_getList();
878 }).catch(error => { 878 }).catch(error => {
879 // 关闭加载 879 // 关闭加载
880 - this.messageNote_loading.batchDelLoading = false; 880 + this.messageNote_loading.listLoading = false;
881 this.$message.error(error.toString()); 881 this.$message.error(error.toString());
882 }); 882 });
883 }).catch(() => { 883 }).catch(() => {
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 <el-row :gutter="24"> 92 <el-row :gutter="24">
93 <el-col :span="5"> 93 <el-col :span="5">
94 <el-button type="danger" icon="el-icon-delete" 94 <el-button type="danger" icon="el-icon-delete"
95 - :loading="queue_loading.batchDelLoading" 95 + :loading="queue_loading.listLoading"
96 :disabled="this.queue_page.selectList.length===0" 96 :disabled="this.queue_page.selectList.length===0"
97 @click="queue_batchRemove">批量删除 97 @click="queue_batchRemove">批量删除
98 </el-button> 98 </el-button>
@@ -674,23 +674,23 @@ @@ -674,23 +674,23 @@
674 } 674 }
675 ).then(() => { 675 ).then(() => {
676 // 开启加载 676 // 开启加载
677 - this.queue_loading.batchDelLoading = true; 677 + this.queue_loading.listLoading = true;
678 let params = {ids: ids}; 678 let params = {ids: ids};
679 batchRemoveBusQueue(params).then(response => { 679 batchRemoveBusQueue(params).then(response => {
680 let res = response.data; 680 let res = response.data;
681 if (res.code !== '200') { 681 if (res.code !== '200') {
682 // 关闭加载 682 // 关闭加载
683 - this.queue_loading.batchDelLoading = false; 683 + this.queue_loading.listLoading = false;
684 return this.$message.error(res.msg); 684 return this.$message.error(res.msg);
685 } 685 }
686 this.$message.success(res.msg); 686 this.$message.success(res.msg);
687 // 关闭加载 687 // 关闭加载
688 - this.queue_loading.batchDelLoading = false; 688 + this.queue_loading.listLoading = false;
689 // 刷新列表 689 // 刷新列表
690 this.queue_getList(); 690 this.queue_getList();
691 }).catch(error => { 691 }).catch(error => {
692 // 关闭加载 692 // 关闭加载
693 - this.queue_loading.batchDelLoading = false; 693 + this.queue_loading.listLoading = false;
694 this.$message.error(error.toString()); 694 this.$message.error(error.toString());
695 }); 695 });
696 }).catch(() => { 696 }).catch(() => {
@@ -26,13 +26,54 @@ @@ -26,13 +26,54 @@
26 element-loading-text="获取服务器列表，拼命加载中"> 26 element-loading-text="获取服务器列表，拼命加载中">
27 <el-table-column type="selection" width="55" align="center"></el-table-column> 27 <el-table-column type="selection" width="55" align="center"></el-table-column>
28 <el-table-column type="index" align="center"></el-table-column> 28 <el-table-column type="index" align="center"></el-table-column>
  29 + <el-table-column type="expand">
  30 + <template slot-scope="props">
  31 + <el-form :inline="true" label-position="left" label-width="110px" align="left">
  32 + <el-row>
  33 + <el-col :span="6">
  34 + <el-form-item label="服务器名称:">
  35 + <el-tag type="success">{{props.row.serverName}}</el-tag>
  36 + </el-form-item>
  37 + </el-col>
  38 + <el-col :span="6">
  39 + <el-form-item label="服务器地址:">
  40 + <el-tag type="success">{{props.row.serverIp}}</el-tag>
  41 + </el-form-item>
  42 + </el-col>
  43 + </el-row>
  44 + <el-row>
  45 + <el-col :span="6">
  46 + <el-form-item label="服务器端口号:">
  47 + <el-tag type="success">{{props.row.serverPort}}</el-tag>
  48 + </el-form-item>
  49 + </el-col>
  50 + <el-col :span="6">
  51 + <el-form-item label="客户端端口号:">
  52 + <el-tag type="success">{{props.row.clientPort}}</el-tag>
  53 + </el-form-item>
  54 + </el-col>
  55 + </el-row>
  56 + <el-row>
  57 + <el-col :span="6">
  58 + <el-form-item label="超级用户名称:">
  59 + <el-tag type="success">{{props.row.superUsername}}</el-tag>
  60 + </el-form-item>
  61 + </el-col>
  62 + <el-col :span="8">
  63 + <el-form-item label="相关描述:">
  64 + <el-tag type="success">{{props.row.description}}</el-tag>
  65 + </el-form-item>
  66 + </el-col>
  67 + </el-row>
  68 + </el-form>
  69 + </template>
  70 + </el-table-column>
29 <el-table-column label="服务器名称" prop="serverName" align="center" width="180"></el-table-column> 71 <el-table-column label="服务器名称" prop="serverName" align="center" width="180"></el-table-column>
30 <el-table-column label="服务器地址" prop="serverIp" align="center" width="200"></el-table-column> 72 <el-table-column label="服务器地址" prop="serverIp" align="center" width="200"></el-table-column>
31 <el-table-column label="服务器端口号" prop="serverPort" align="center" width="150"></el-table-column> 73 <el-table-column label="服务器端口号" prop="serverPort" align="center" width="150"></el-table-column>
32 <el-table-column label="客户端端口号" prop="clientPort" align="center" width="150"></el-table-column> 74 <el-table-column label="客户端端口号" prop="clientPort" align="center" width="150"></el-table-column>
33 - <el-table-column label="超级用户名称" prop="superUsername" align="center"  
34 - width="150"></el-table-column>  
35 - <el-table-column label="相关描述" prop="description" align="center" width="300"></el-table-column> 75 +<!-- <el-table-column label="超级用户名称" prop="superUsername" align="center" width="150"></el-table-column>-->
  76 +<!-- <el-table-column label="相关描述" prop="description" align="center" width="300"></el-table-column>-->
36 <el-table-column label="操作" width="300px" align="center" fixed="right"> 77 <el-table-column label="操作" width="300px" align="center" fixed="right">
37 <template slot-scope="scope"> 78 <template slot-scope="scope">
38 <!-- 虚拟主机 --> 79 <!-- 虚拟主机 -->
@@ -62,6 +103,7 @@ @@ -62,6 +103,7 @@
62 <el-row :gutter="24"> 103 <el-row :gutter="24">
63 <el-col :span="5"> 104 <el-col :span="5">
64 <el-button type="danger" icon="el-icon-delete" 105 <el-button type="danger" icon="el-icon-delete"
  106 + :loading="server_loading.listLoading"
65 :disabled="this.selectList.length===0" 107 :disabled="this.selectList.length===0"
66 @click="batchRemoveServer">批量删除 108 @click="batchRemoveServer">批量删除
67 </el-button> 109 </el-button>
@@ -557,20 +599,20 @@ @@ -557,20 +599,20 @@
557 } 599 }
558 ).then(() => { 600 ).then(() => {
559 // 开启加载 601 // 开启加载
560 - this.server_loading.batchDelLoading = true; 602 + this.server_loading.listLoading = true;
561 let params = {ids: ids}; 603 let params = {ids: ids};
562 batchRemoveBusServer(params).then(response => { 604 batchRemoveBusServer(params).then(response => {
563 let res = response.data; 605 let res = response.data;
564 if (res.code !== '200') { 606 if (res.code !== '200') {
565 - this.server_loading.batchDelLoading = false; 607 + this.server_loading.listLoading = false;
566 return this.$message.error(res.msg); 608 return this.$message.error(res.msg);
567 } 609 }
568 this.$message.success(res.msg); 610 this.$message.success(res.msg);
569 - this.server_loading.batchDelLoading = false; 611 + this.server_loading.listLoading = false;
570 // 刷新列表 612 // 刷新列表
571 this.getServerList(); 613 this.getServerList();
572 }).catch(error => { 614 }).catch(error => {
573 - this.server_loading.batchDelLoading = false; 615 + this.server_loading.listLoading = false;
574 this.$message.error(error.toString()); 616 this.$message.error(error.toString());
575 }); 617 });
576 }).catch(() => { 618 }).catch(() => {
@@ -602,5 +644,4 @@ @@ -602,5 +644,4 @@
602 </script> 644 </script>
603 645
604 <style scoped> 646 <style scoped>
605 -  
606 </style> 647 </style>
@@ -98,7 +98,7 @@ @@ -98,7 +98,7 @@
98 <div> 98 <div>
99 <el-dialog title="添加MQ用户信息" 99 <el-dialog title="添加MQ用户信息"
100 :visible.sync="user_dialog.addDialog" 100 :visible.sync="user_dialog.addDialog"
101 - v-loading="user_loading.addLoading" element-loading-text="正在添加MQ用户，拼命加载中" 101 + v-loading="user_loading.addLoading" element-loading-text="正在添加MQ用户信息，拼命加载中"
102 style="margin-top: -20px" 102 style="margin-top: -20px"
103 width="50%" text-align="center" @close="user_addDialogClosed"> 103 width="50%" text-align="center" @close="user_addDialogClosed">
104 <el-form :inline="true" label-width="145px" status-icon style="margin-top: -10px" 104 <el-form :inline="true" label-width="145px" status-icon style="margin-top: -10px"
@@ -109,15 +109,15 @@ @@ -109,15 +109,15 @@
109 </el-input> 109 </el-input>
110 </el-form-item> 110 </el-form-item>
111 111
112 - <el-form-item label="用户密码：" prop="firstPassword">  
113 - <el-input type="password" v-model="user_addForm.firstPassword" style="width:270px"  
114 - size="small" clearable show-password placeholder="请输入用户密码"></el-input>  
115 - </el-form-item> 112 +<!-- <el-form-item label="用户密码：" prop="firstPassword">-->
  113 +<!-- <el-input type="password" v-model="user_addForm.firstPassword" style="width:270px"-->
  114 +<!-- size="small" clearable show-password placeholder="请输入用户密码"></el-input>-->
  115 +<!-- </el-form-item>-->
116 116
117 - <el-form-item label="重新输入密码：" prop="password">  
118 - <el-input type="password" v-model="user_addForm.password" style="width:270px"  
119 - size="small" clearable show-password placeholder="请重新输入密码"></el-input>  
120 - </el-form-item> 117 +<!-- <el-form-item label="重新输入密码：" prop="password">-->
  118 +<!-- <el-input type="password" v-model="user_addForm.password" style="width:270px"-->
  119 +<!-- size="small" clearable show-password placeholder="请重新输入密码"></el-input>-->
  120 +<!-- </el-form-item>-->
121 <el-form-item label="真实姓名：" prop="realName"> 121 <el-form-item label="真实姓名：" prop="realName">
122 <el-input v-model="user_addForm.realName" style="width:270px" size="small" clearable 122 <el-input v-model="user_addForm.realName" style="width:270px" size="small" clearable
123 placeholder="请输入真实姓名"> 123 placeholder="请输入真实姓名">
@@ -333,10 +333,12 @@ @@ -333,10 +333,12 @@
333 {validator: validatePassword, trigger: ['blur', 'change']} 333 {validator: validatePassword, trigger: ['blur', 'change']}
334 ], 334 ],
335 }, 335 },
  336 +
336 /** 337 /**
337 * user,编辑表单，验证规则 338 * user,编辑表单，验证规则
338 */ 339 */
339 user_editFormRules: {}, 340 user_editFormRules: {},
  341 +
340 /** 342 /**
341 * 加载 343 * 加载
342 */ 344 */
@@ -209,7 +209,7 @@ @@ -209,7 +209,7 @@
209 <el-form-item label="路由键名称：" prop="routingKeyIds"> 209 <el-form-item label="路由键名称：" prop="routingKeyIds">
210 <el-select v-model="umb_addForm.routingKeyIds" prefix-icon="el-icon-search" clearable 210 <el-select v-model="umb_addForm.routingKeyIds" prefix-icon="el-icon-search" clearable
211 style="width:400px" size="medium" filterable multiple 211 style="width:400px" size="medium" filterable multiple
212 - :disabled="umb_addForm.exchangeId===''" 212 + :disabled="umb_addForm.exchangeIds===''"
213 placeholder="请选择路由键"> 213 placeholder="请选择路由键">
214 <el-option 214 <el-option
215 v-for="item in (umb_config.routingKeyList)" 215 v-for="item in (umb_config.routingKeyList)"
@@ -923,9 +923,9 @@ @@ -923,9 +923,9 @@
923 * 添加方法，虚拟主机ID值，改变 923 * 添加方法，虚拟主机ID值，改变
924 */ 924 */
925 umb_virtualHost_addChange(value) { 925 umb_virtualHost_addChange(value) {
926 - this.umb_addForm.exchangeId = undefined;  
927 - this.umb_addForm.queueId = undefined;  
928 - 926 + this.umb_addForm.exchangeIds = undefined;
  927 + this.umb_addForm.queueIds = undefined;
  928 + this.umb_addForm.routingKeyIds = undefined;
929 this.selectExchangeList(value); 929 this.selectExchangeList(value);
930 this.selectQueueList(value); 930 this.selectQueueList(value);
931 }, 931 },
@@ -935,7 +935,7 @@ @@ -935,7 +935,7 @@
935 */ 935 */
936 umb_exchange_addChange(value) { 936 umb_exchange_addChange(value) {
937 // 先将对应的路由键的ID清空 937 // 先将对应的路由键的ID清空
938 - this.umb_addForm.routingKeyId = undefined; 938 + this.umb_addForm.routingKeyIds = undefined;
939 // 根据交换机ID，获取出对应的路由键的列表 939 // 根据交换机ID，获取出对应的路由键的列表
940 this.selectRoutingKeyList(value.join()); 940 this.selectRoutingKeyList(value.join());
941 }, 941 },