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

fix:消息优化

This commit is contained in:
wenyann 2021-04-21 16:00:18 +08:00 committed by 刘瑞斌
parent 92cc2c8a0c
commit ae7e57bc4a
8 changed files with 91 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/resources/mail/ApiFailedNotification.html
View File

@ -12,10 +12,12 @@
</div>
<div style="margin-left: 100px">
<p>您所执行的 ${testName} 接口测试运行失败<br/>
请点击下面链接进入测试报告页面【接口定义暂无报告路径】<br/>
【旧版接口测试报告路径】</p>
<p>${testName} 接口测试运行失败<br/>
<p>执行人:${executor}</p>
<p>执行环境:${executionEnvironment}</p>
<p>执行时间:${executionTime}</p>
请点击下面链接进入测试报告页面【接口定义暂无报告路径】<br/>
【旧版接口测试报告路径】</p>
<a href="${url}/#/${type}/report/view/${id}">${url}/#/${type}/report/view/${id}</a>
<p>【新版接口测试报告路径】</p>
<a href="${url}/#/api/automation/report/view/${id}">${url}/#/api/automation/report/view/${id}</a>

9
backend/src/main/resources/mail/ApiSuccessfulNotification.html
View File

@ -10,9 +10,12 @@
<p style="margin-left: 60px">您好:
</div>
<div style="margin-left: 100px">
<p>您所执行的 ${testName} 接口测试运行成功<br/>
请点击下面链接进入测试报告页面【接口定义暂无报告路径】<br/>
【旧版接口测试报告路径】</p>
<p>${testName} 接口测试运行成功<br/>
<p>执行人:${executor}</p>
<p>执行环境:${executionEnvironment}</p>
<p>执行时间:${executionTime}</p>
请点击下面链接进入测试报告页面【接口定义暂无报告路径】<br/>
【旧版接口测试报告路径】</p>
<a href="${url}/#/${type}/report/view/${id}">${url}/#/${type}/report/view/${id}</a>
<p>【新版接口测试报告路径】</p>
<a href="${url}/#/api/automation/report/view/${id}">${url}/#/api/automation/report/view/${id}</a>

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

@ -277,6 +277,7 @@ export default {
</script>
<style scoped>
.el-row {
margin-bottom: 10px;
}
@ -284,4 +285,18 @@ export default {
.el-button {
margin-left: 10px;
}
/deep/ .el-select .el-input.is-disabled .el-input__inner {
background-color: #F5F7FA;
border-color: #E4E7ED;
color: #0a0a0a;
cursor: not-allowed;
}
/deep/ .el-input.is-disabled .el-input__inner {
background-color: #F5F7FA;
border-color: #E4E7ED;
color: #0a0a0a;
cursor: not-allowed;
}
</style>

17
frontend/src/business/components/settings/organization/components/JenkinsNotification.vue
View File

@ -170,7 +170,8 @@ export default {
' <p style="margin-left: 60px">您好:\n' +
' </div>\n' +
' <div style="margin-left: 100px">\n' +
' <p>${executor}所执行的 ${testName} 接口测试运行失败<br/>\n' +
' <p>${testName} 接口测试运行失败/成功<br/>\n' +
' <p>执行人:${executor}</p>' +
' <p>执行环境:${executionEnvironment}</p>' +
' <p>执行时间:${executionTime}</p>' +
' 请点击下面链接进入测试报告页面</p>\n' +
@ -307,4 +308,18 @@ export default {
.el-button {
margin-left: 10px;
}
/deep/ .el-select .el-input.is-disabled .el-input__inner {
background-color: #F5F7FA;
border-color: #E4E7ED;
color: #0a0a0a;
cursor: not-allowed;
}
/deep/ .el-input.is-disabled .el-input__inner {
background-color: #F5F7FA;
border-color: #E4E7ED;
color: #0a0a0a;
cursor: not-allowed;
}
</style>

17
frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
View File

@ -171,7 +171,8 @@ export default {
' <p style="margin-left: 60px">您好:\n' +
' </div>\n' +
' <div style="margin-left: 100px">\n' +
' <p>${executor}所执行的 ${testName} 接口测试运行失败<br/>\n' +
' <p>${testName} 接口测试运行失败/成功<br/>\n' +
' <p>执行人:${executor}</p>' +
' <p>执行环境:${executionEnvironment}</p>' +
' <p>执行时间:${executionTime}</p>' +
' 请点击下面链接进入测试报告页面</p>\n' +
@ -307,5 +308,19 @@ export default {
.el-row {
margin-bottom: 10px;
}
/deep/ .el-select .el-input.is-disabled .el-input__inner {
background-color: #F5F7FA;
border-color: #E4E7ED;
color: #0a0a0a;
cursor: not-allowed;
}
/deep/ .el-input.is-disabled .el-input__inner {
background-color: #F5F7FA;
border-color: #E4E7ED;
color: #0a0a0a;
cursor: not-allowed;
}
</style>

14
frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue
View File

@ -316,4 +316,18 @@ export default {
.el-button {
margin-left: 10px;
}
/deep/ .el-select .el-input.is-disabled .el-input__inner {
background-color: #F5F7FA;
border-color: #E4E7ED;
color: #0a0a0a;
cursor: not-allowed;
}
/deep/ .el-input.is-disabled .el-input__inner {
background-color: #F5F7FA;
border-color: #E4E7ED;
color: #0a0a0a;
cursor: not-allowed;
}
</style>

14
frontend/src/business/components/settings/organization/components/TestReviewNotification.vue
View File

@ -322,4 +322,18 @@ export default {
.el-button {
margin-left: 10px;
}
/deep/ .el-select .el-input.is-disabled .el-input__inner {
background-color: #F5F7FA;
border-color: #E4E7ED;
color: #0a0a0a;
cursor: not-allowed;
}
/deep/ .el-input.is-disabled .el-input__inner {
background-color: #F5F7FA;
border-color: #E4E7ED;
color: #0a0a0a;
cursor: not-allowed;
}
</style>

5
frontend/src/business/components/track/case/components/TestCaseEdit.vue
View File

@ -543,12 +543,15 @@ export default {
if (this.projectId) {
param.projectId = this.projectId;
}
if (this.type === 'copy') {
param.num = "";
}
param.name = param.name.trim();
if (this.form.tags instanceof Array) {
this.form.tags = JSON.stringify(this.form.tags);
}
param.testId = JSON.stringify(this.form.selected)
param.testId = JSON.stringify(this.form.selected);
param.tags = this.form.tags;
param.type = 'functional';
buildCustomFields(this.form, param, this.testCaseTemplate);