朱兆平 / vue_cli · 提交

转到一个项目

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

简单修改加载

内嵌 并排对比
正在显示 8 个修改的文件 包含 90 行增加 和 48 行删除
... ... @@ -105,7 +105,7 @@ export const insertUserInfo = params =>{return http.post(`${baseUrl}/user/insert
export const selectUserInfoList = params =>{return http.get(`${baseUrl}/user/list`, params);};
export const deleteUserInfo = params =>{return http.del(`${baseUrl}/user/delete`, params);};
export const deleteUserRelation = params =>{return http.del(`${baseUrl}/user/deleteRelation`, params);};
export const updatePassword = params =>{return http.put(`${baseUrl}/user/updatePassword`, params);};
// export const updatePassword = params =>{return http.put(`${baseUrl}/user/updatePassword`, params);};
// 批量删除用户
export const batchDeleteUser = params =>{return http.del(`${baseUrl}/user/batch_delete`, params);};
// 批量删除用户关系
... ...
... ... @@ -134,7 +134,7 @@ let routes = [
name: '消息控制中心',
iconCls: 'el-icon-message',
children: [
{path: '/userInfo', component: UserInfo, name: 'MQ用户管理'},
{path: '/userInfo', component: UserInfo, name: '用户关系管理'},
{path: '/server', component: Server, name: '服务器管理'},
{path: '/host', component: VirtualHost, name: '虚拟主机管理'},
{path: '/queue', component: Queue, name: '队列管理'},
... ...
... ... @@ -111,7 +111,6 @@
import rt from '../routes'
import {editPass, resetToken} from '../api/user';
import ElFormItem from "element-ui/packages/form/src/form-item";
import {updatePassword} from "../api/message_bus"
export default {
... ... @@ -261,19 +260,19 @@
submitEdit(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
const userInfo = {
username: this.sysUserName,
password: this.resetForm.renewpwd
}
// 修改MQ用户的密码
updatePassword(userInfo).then((response) => {
let res = response.data;
if (res.code !== '200') {
return this.$message.error(res.msg);
}
}).catch(error => {
this.$message.error(error.toString());
});
// const userInfo = {
// username: this.sysUserName,
// password: this.resetForm.renewpwd
// }
// // 修改MQ用户的密码
// updatePassword(userInfo).then((response) => {
// let res = response.data;
// if (res.code !== '200') {
// return this.$message.error(res.msg);
// }
// }).catch(error => {
// this.$message.error(error.toString());
// });
this.editForm.userId = this.sysUserId;
this.editForm.password = this.resetForm.renewpwd;
... ...
... ... @@ -101,7 +101,7 @@
<el-row :gutter="24">
<el-col :span="5">
<el-button type="danger" icon="el-icon-delete"
:loading="messageNote_loading.batchDelLoading"
:loading="messageNote_loading.listLoading"
:disabled="this.messageNote_page.selectList.length===0"
@click="messageNote_batchRemove">批量删除
</el-button>
... ... @@ -861,23 +861,23 @@
}
).then(() => {
// 开启加载
this.messageNote_loading.batchDelLoading = true;
this.messageNote_loading.listLoading = true;
let params = {ids: ids};
batchRemoveMessageNote(params).then(response => {
let res = response.data;
if (res.code !== '200') {
// 关闭加载
this.messageNote_loading.batchDelLoading = false;
this.messageNote_loading.listLoading = false;
return this.$message.error('批量删除消息收发记录，失败');
}
this.$message.success(res.msg);
// 关闭加载
this.messageNote_loading.batchDelLoading = false;
this.messageNote_loading.listLoading = false;
// 刷新列表
this.messageNote_getList();
}).catch(error => {
// 关闭加载
this.messageNote_loading.batchDelLoading = false;
this.messageNote_loading.listLoading = false;
this.$message.error(error.toString());
});
}).catch(() => {
... ...
... ... @@ -92,7 +92,7 @@
<el-row :gutter="24">
<el-col :span="5">
<el-button type="danger" icon="el-icon-delete"
:loading="queue_loading.batchDelLoading"
:loading="queue_loading.listLoading"
:disabled="this.queue_page.selectList.length===0"
@click="queue_batchRemove">批量删除
</el-button>
... ... @@ -674,23 +674,23 @@
}
).then(() => {
// 开启加载
this.queue_loading.batchDelLoading = true;
this.queue_loading.listLoading = true;
let params = {ids: ids};
batchRemoveBusQueue(params).then(response => {
let res = response.data;
if (res.code !== '200') {
// 关闭加载
this.queue_loading.batchDelLoading = false;
this.queue_loading.listLoading = false;
return this.$message.error(res.msg);
}
this.$message.success(res.msg);
// 关闭加载
this.queue_loading.batchDelLoading = false;
this.queue_loading.listLoading = false;
// 刷新列表
this.queue_getList();
}).catch(error => {
// 关闭加载
this.queue_loading.batchDelLoading = false;
this.queue_loading.listLoading = false;
this.$message.error(error.toString());
});
}).catch(() => {
... ...
... ... @@ -26,13 +26,54 @@
element-loading-text="获取服务器列表，拼命加载中">
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column type="index" align="center"></el-table-column>
<el-table-column type="expand">
<template slot-scope="props">
<el-form :inline="true" label-position="left" label-width="110px" align="left">
<el-row>
<el-col :span="6">
<el-form-item label="服务器名称:">
<el-tag type="success">{{props.row.serverName}}</el-tag>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="服务器地址:">
<el-tag type="success">{{props.row.serverIp}}</el-tag>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="服务器端口号:">
<el-tag type="success">{{props.row.serverPort}}</el-tag>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="客户端端口号:">
<el-tag type="success">{{props.row.clientPort}}</el-tag>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="超级用户名称:">
<el-tag type="success">{{props.row.superUsername}}</el-tag>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="相关描述:">
<el-tag type="success">{{props.row.description}}</el-tag>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
</el-table-column>
<el-table-column label="服务器名称" prop="serverName" align="center" width="180"></el-table-column>
<el-table-column label="服务器地址" prop="serverIp" align="center" width="200"></el-table-column>
<el-table-column label="服务器端口号" prop="serverPort" align="center" width="150"></el-table-column>
<el-table-column label="客户端端口号" prop="clientPort" align="center" width="150"></el-table-column>
<el-table-column label="超级用户名称" prop="superUsername" align="center"
width="150"></el-table-column>
<el-table-column label="相关描述" prop="description" align="center" width="300"></el-table-column>
<!-- <el-table-column label="超级用户名称" prop="superUsername" align="center" width="150"></el-table-column>-->
<!-- <el-table-column label="相关描述" prop="description" align="center" width="300"></el-table-column>-->
<el-table-column label="操作" width="300px" align="center" fixed="right">
<template slot-scope="scope">
<!-- 虚拟主机 -->
... ... @@ -62,6 +103,7 @@
<el-row :gutter="24">
<el-col :span="5">
<el-button type="danger" icon="el-icon-delete"
:loading="server_loading.listLoading"
:disabled="this.selectList.length===0"
@click="batchRemoveServer">批量删除
</el-button>
... ... @@ -557,20 +599,20 @@
}
).then(() => {
// 开启加载
this.server_loading.batchDelLoading = true;
this.server_loading.listLoading = true;
let params = {ids: ids};
batchRemoveBusServer(params).then(response => {
let res = response.data;
if (res.code !== '200') {
this.server_loading.batchDelLoading = false;
this.server_loading.listLoading = false;
return this.$message.error(res.msg);
}
this.$message.success(res.msg);
this.server_loading.batchDelLoading = false;
this.server_loading.listLoading = false;
// 刷新列表
this.getServerList();
}).catch(error => {
this.server_loading.batchDelLoading = false;
this.server_loading.listLoading = false;
this.$message.error(error.toString());
});
}).catch(() => {
... ... @@ -602,5 +644,4 @@
</script>
<style scoped>
</style>
... ...
... ... @@ -98,7 +98,7 @@
<div>
<el-dialog title="添加MQ用户信息"
:visible.sync="user_dialog.addDialog"
v-loading="user_loading.addLoading" element-loading-text="正在添加MQ用户，拼命加载中"
v-loading="user_loading.addLoading" element-loading-text="正在添加MQ用户信息，拼命加载中"
style="margin-top: -20px"
width="50%" text-align="center" @close="user_addDialogClosed">
<el-form :inline="true" label-width="145px" status-icon style="margin-top: -10px"
... ... @@ -109,15 +109,15 @@
</el-input>
</el-form-item>
<el-form-item label="用户密码：" prop="firstPassword">
<el-input type="password" v-model="user_addForm.firstPassword" style="width:270px"
size="small" clearable show-password placeholder="请输入用户密码"></el-input>
</el-form-item>
<!-- <el-form-item label="用户密码：" prop="firstPassword">-->
<!-- <el-input type="password" v-model="user_addForm.firstPassword" style="width:270px"-->
<!-- size="small" clearable show-password placeholder="请输入用户密码"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="重新输入密码：" prop="password">
<el-input type="password" v-model="user_addForm.password" style="width:270px"
size="small" clearable show-password placeholder="请重新输入密码"></el-input>
</el-form-item>
<!-- <el-form-item label="重新输入密码：" prop="password">-->
<!-- <el-input type="password" v-model="user_addForm.password" style="width:270px"-->
<!-- size="small" clearable show-password placeholder="请重新输入密码"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="真实姓名：" prop="realName">
<el-input v-model="user_addForm.realName" style="width:270px" size="small" clearable
placeholder="请输入真实姓名">
... ... @@ -333,10 +333,12 @@
{validator: validatePassword, trigger: ['blur', 'change']}
],
},
/**
* user,编辑表单，验证规则
*/
user_editFormRules: {},
/**
* 加载
*/
... ...
... ... @@ -209,7 +209,7 @@
<el-form-item label="路由键名称：" prop="routingKeyIds">
<el-select v-model="umb_addForm.routingKeyIds" prefix-icon="el-icon-search" clearable
style="width:400px" size="medium" filterable multiple
:disabled="umb_addForm.exchangeId===''"
:disabled="umb_addForm.exchangeIds===''"
placeholder="请选择路由键">
<el-option
v-for="item in (umb_config.routingKeyList)"
... ... @@ -923,9 +923,9 @@
* 添加方法，虚拟主机ID值，改变
*/
umb_virtualHost_addChange(value) {
this.umb_addForm.exchangeId = undefined;
this.umb_addForm.queueId = undefined;
this.umb_addForm.exchangeIds = undefined;
this.umb_addForm.queueIds = undefined;
this.umb_addForm.routingKeyIds = undefined;
this.selectExchangeList(value);
this.selectQueueList(value);
},
... ... @@ -935,7 +935,7 @@
*/
umb_exchange_addChange(value) {
// 先将对应的路由键的ID清空
this.umb_addForm.routingKeyId = undefined;
this.umb_addForm.routingKeyIds = undefined;
// 根据交换机ID，获取出对应的路由键的列表
this.selectRoutingKeyList(value.join());
},
... ...