test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Captain.B 2020-02-19 11:43:40 +08:00
parent 182d5b2450 fd0389c86f
commit f11b545fe7
2 changed files with 52 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
frontend/src/performance/components/settings/Organization.vue
View File

@ -133,15 +133,11 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$get(this.deletePath + row.id).then(response => {
if (response.data.success) {
this.$message({
type: 'success',
message: '删除成功!'
});
} else {
this.$message.error(response.message);
}
this.$get(this.deletePath + row.id,() => {
this.$message({
type: 'success',
message: '删除成功!'
});
this.initTableData()
});
}).catch(() => {
@ -154,18 +150,13 @@
createOrganization(createOrganizationForm) {
this.$refs[createOrganizationForm].validate( valide => {
if (valide) {
this.$post(this.createPath, this.form)
.then(response => {
if (response.data.success) {
this.$message({
type: 'success',
message: '添加成功!'
});
this.initTableData();
} else {
this.$message.error(response.message);
}
this.createVisible = false;
this.$post(this.createPath, this.form,() => {
this.$message({
type: 'success',
message: '添加成功!'
});
this.initTableData();
this.createVisible = false;
});
} else {
return false;
@ -175,19 +166,14 @@
updateOrganization(udpateOrganizationForm) {
this.$refs[udpateOrganizationForm].validate(valide => {
if (valide) {
this.$post(this.updatePath, this.form)
.then(response => {
if (response.data.success) {
this.$message({
type: 'success',
message: '修改成功!'
});
this.updateVisible = false;
} else {
this.$message.error(response.message);
}
this.initTableData();
self.loading = false;
this.$post(this.updatePath, this.form,() => {
this.$message({
type: 'success',
message: '修改成功!'
});
this.updateVisible = false;
this.initTableData();
self.loading = false;
});
} else {
return false;
@ -195,14 +181,10 @@
})
},
initTableData() {
this.$post(this.buildPagePath(this.queryPath)).then(response => {
if (response.data.success) {
let data = response.data.data;
this.total = data.itemCount;
this.tableData = data.listObject;
} else {
this.$message.error(response.message);
}
this.$post(this.buildPagePath(this.queryPath),{},response => {
let data = response.data;
this.total = data.itemCount;
this.tableData = data.listObject;
})
},
closeFunc() {

78
frontend/src/performance/components/settings/User.vue
View File

@ -180,16 +180,12 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$get(this.deletePath + row.id).then(response => {
if (response.data.success) {
this.$message({
type: 'success',
message: '删除成功!'
});
this.initTableData()
} else {
this.$message.error(response.message)
}
this.$get(this.deletePath + row.id, () => {
this.$message({
type: 'success',
message: '删除成功!'
});
this.initTableData();
});
}).catch(() => {
this.$message({
@ -201,18 +197,13 @@
createUser(createUserForm) {
this.$refs[createUserForm].validate(valide => {
if (valide) {
this.$post(this.createPath, this.form)
.then(response => {
if (response.data.success) {
this.$message({
type: 'success',
message: '添加成功!'
});
this.initTableData();
} else {
this.$message.error(response.message);
}
this.createVisible = false;
this.$post(this.createPath, this.form, () => {
this.$message({
type: 'success',
message: '添加成功!'
});
this.initTableData();
this.createVisible = false;
});
} else {
return false;
@ -222,19 +213,14 @@
updateUser(updateUserForm) {
this.$refs[updateUserForm].validate(valide => {
if (valide) {
this.$post(this.updatePath, this.form)
.then(response => {
if (response.data.success) {
this.$message({
type: 'success',
message: '修改成功!'
});
this.updateVisible = false;
} else {
this.$message.error(response.message);
}
this.initTableData();
self.loading = false;
this.$post(this.updatePath, this.form,() => {
this.$message({
type: 'success',
message: '修改成功!'
});
this.updateVisible = false;
this.initTableData();
self.loading = false;
});
} else {
return false;
@ -242,29 +228,21 @@
})
},
initTableData() {
this.$post(this.buildPagePath(this.queryPath)).then(response => {
if (response.data.success) {
let data = response.data.data;
this.$post(this.buildPagePath(this.queryPath),{},response => {
let data = response.data;
this.total = data.itemCount;
this.tableData = data.listObject;
} else {
this.$message.error(response.message);
}
})
},
closeFunc() {
this.form = {};
},
changeSwitch(row) {
this.$post(this.updatePath, row).then(response =>{
if (response.data.success) {
this.$message({
type: 'success',
message: '状态修改成功!'
});
} else {
this.$message.error(response.message);
}
this.$post(this.updatePath, row,() =>{
this.$message({
type: 'success',
message: '状态修改成功!'
});
})
},
buildPagePath(path) {