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

修改消息提示

This commit is contained in:
shiziyuan9527 2020-04-24 17:56:17 +08:00
parent 0bf42358e7
commit dcef65f719
8 changed files with 27 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/business/components/performance/test/components/PerformanceBasicConfig.vue
View File

@ -193,10 +193,7 @@
oldJmxNum = this.fileList.filter(f => f.name.toLowerCase().endsWith(".jmx")).length;
}
if (newJmxNum + oldJmxNum !== 1) {
this.$message({
message: this.$t('load_test.jmx_is_null'),
type: 'error'
});
this.$error(this.$t('load_test.jmx_is_null'));
return false;
}
return true;

5
frontend/src/business/components/project/MsProject.vue
View File

@ -107,10 +107,7 @@
create() {
let workspaceId = this.currentUser.lastWorkspaceId;
if (!workspaceId) {
this.$message({
type: 'warning',
message: this.$t('project.please_choose_workspace')
})
this.$warning(this.$t('project.please_choose_workspace'));
return false;
}
this.title = this.$t('project.create');

15
frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
View File

@ -345,17 +345,11 @@
type: 'warning'
}).then(() => {
this.result = this.$get('/user/ws/member/delete/' + this.currentWorkspaceRow.id + '/' + row.id, () => {
this.$message({
type: 'success',
message: this.$t('commons.delete_success')
});
this.$success(this.$t('commons.delete_success'));
this.cellClick(this.currentWorkspaceRow);
});
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('commons.delete_cancel')
});
this.$info(this.$t('commons.delete_cancel'));
});
},
updateOrgMember() {
@ -368,10 +362,7 @@
workspaceId: this.currentWorkspaceRow.id
}
this.result = this.$post("/workspace/member/update", param, () => {
this.$message({
type: 'success',
message: this.$t('commons.modify_success')
});
this.$success(this.$t('commons.modify_success'));
this.updateMemberVisible = false;
this.cellClick(this.currentWorkspaceRow);
});

5
frontend/src/business/components/settings/personal/PersonSetting.vue
View File

@ -113,10 +113,7 @@
this.$refs[updateUserForm].validate(valide => {
if (valide) {
this.result = this.$post(this.updatePath, this.form,response => {
this.$message({
type: 'success',
message: this.$t('commons.modify_success')
});
this.$success(this.$t('commons.modify_success'));
localStorage.setItem(TokenKey, JSON.stringify(response.data));
this.updateVisible = false;
this.initTableData();

35
frontend/src/business/components/settings/system/Organization.vue
View File

@ -319,17 +319,11 @@
type: 'warning'
}).then(() => {
this.result = this.$get(this.deletePath + row.id, () => {
this.$message({
type: 'success',
message: this.$t('commons.delete_success')
});
this.$success(this.$t('commons.delete_success'));
this.initTableData()
});
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('commons.delete_cancel')
});
this.$info(this.$t('commons.delete_cancel'));
});
},
delMember(row) {
@ -339,27 +333,18 @@
type: 'warning'
}).then(() => {
this.result = this.$get('/user/special/org/member/delete/' + this.currentRow.id + '/' + row.id, () => {
this.$message({
type: 'success',
message: this.$t('commons.delete_success')
});
this.$success(this.$t('commons.delete_success'))
this.cellClick(this.currentRow);
});
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('commons.delete_cancel')
});
this.$info(this.$t('commons.delete_cancel'));
});
},
createOrganization(createOrganizationForm) {
this.$refs[createOrganizationForm].validate(valide => {
if (valide) {
this.result = this.$post(this.createPath, this.form, () => {
this.$message({
type: 'success',
message: this.$t('commons.save_success')
});
this.$success(this.$t('commons.save_success'));
this.initTableData();
this.createVisible = false;
});
@ -372,10 +357,7 @@
this.$refs[udpateOrganizationForm].validate(valide => {
if (valide) {
this.result = this.$post(this.updatePath, this.form, () => {
this.$message({
type: 'success',
message: this.$t('commons.modify_success')
});
this.$success(this.$t('commons.modify_success'))
this.updateVisible = false;
this.initTableData();
});
@ -442,10 +424,7 @@
organizationId: this.currentRow.id
}
this.result = this.$post("/organization/member/update", param, () => {
this.$message({
type: 'success',
message: this.$t('commons.modify_success')
});
this.$success(this.$t('commons.modify_success'))
this.updateMemberVisible = false;
this.cellClick(this.currentRow);
});

20
frontend/src/business/components/settings/system/SystemWorkspace.vue
View File

@ -296,10 +296,7 @@
this.$refs[updateForm].validate(valide => {
if (valide) {
this.result = this.$post("/workspace/special/update", this.form, () => {
this.$message({
type: 'success',
message: this.$t('commons.modify_success')
});
this.$success(this.$t('commons.modify_success'));
this.updateVisible = false;
this.list();
});
@ -388,17 +385,11 @@
type: 'warning'
}).then(() => {
this.result = this.$get('/user/special/ws/member/delete/' + this.currentWorkspaceRow.id + '/' + row.id, () => {
this.$message({
type: 'success',
message: this.$t('commons.delete_success')
});
this.$success(this.$t('commons.delete_success'));
this.cellClick(this.currentWorkspaceRow);
});
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('commons.delete_cancel')
});
this.$info(this.$t('commons.delete_cancel'));
});
},
updateOrgMember() {
@ -411,10 +402,7 @@
workspaceId: this.currentWorkspaceRow.id
}
this.result = this.$post("/workspace/member/update", param, () => {
this.$message({
type: 'success',
message: this.$t('commons.modify_success')
});
this.$success(this.$t('commons.modify_success'));
this.updateMemberVisible = false;
this.cellClick(this.currentWorkspaceRow);
});

30
frontend/src/business/components/settings/system/TestResourcePool.vue
View File

@ -280,10 +280,7 @@
if (this.infoList.length > 1) {
this.infoList.splice(index, 1)
} else {
this.$message({
type: 'warning',
message: this.$t('test_resource_pool.cannot_remove_all_node')
});
this.$warning(this.$t('test_resource_pool.cannot_remove_all_node'))
}
},
validateResourceInfo() {
@ -341,15 +338,9 @@
this.result = this.$get(`/testresourcepool/delete/${row.id}`).then(() => {
this.initTableData();
});
this.$message({
type: 'success',
message: this.$t('commons.delete_success')
});
this.$success(this.$t('commons.delete_success'));
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('commons.delete_cancel')
});
this.$info(this.$t('commons.delete_cancel'));
});
},
createTestResourcePool(createTestResourcePoolForm) {
@ -370,10 +361,7 @@
this.initTableData());
});
} else {
this.$message({
type: 'warning',
message: vri.msg
});
this.$warning(vri.msg);
return false;
}
@ -413,10 +401,7 @@
self.loading = false);
});
} else {
this.$message({
type: 'warning',
message: vri.msg
});
this.$warning(vri.msg);
return false;
}
} else {
@ -429,10 +414,7 @@
},
changeSwitch(row) {
this.result = this.$post('/testresourcepool/update', row).then(() => {
this.$message({
type: 'success',
message: this.$t('test_resource_pool.status_change_success')
});
this.$success(this.$t('test_resource_pool.status_change_success'));
})
}
}

20
frontend/src/business/components/settings/workspace/WorkspaceMember.vue
View File

@ -185,16 +185,10 @@
this.initTableData();
this.loading = false;
});
this.$message({
type: 'success',
message: this.$t('commons.delete_success')
});
this.$success(this.$t('commons.delete_success'));
}).catch(() => {
this.loading = false;
this.$message({
type: 'info',
message: this.$t('commons.delete_cancel')
});
this.$info(this.$t('commons.delete_cancel'));
});
},
edit(row) {
@ -217,10 +211,7 @@
workspaceId: this.currentUser().lastWorkspaceId
}
this.result = this.$post("/workspace/member/update", param, () => {
this.$message({
type: 'success',
message: this.$t('commons.modify_success')
});
this.$success(this.$t('commons.modify_success'));
this.updateVisible = false;
this.initTableData();
});
@ -233,10 +224,7 @@
};
let wsId = this.currentUser().lastWorkspaceId;
if (typeof wsId == "undefined" || wsId == null || wsId == "") {
this.$message({
message: '请先选择工作空间！',
type: 'warning'
});
this.$warning("请先选择工作空间!");
return false;
}
this.$post('/user/org/member/list/all', param, response => {