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

Merge branch 'master' of https://github.com/metersphere/metersphere

This commit is contained in:
fit2-zhao 2021-03-09 17:07:13 +08:00
parent cc5175ef6c 24e74882bb
commit 8fe8ff48ad
6 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/resources/db/migration/V78__v1.8_release.sql
View File

@ -33,7 +33,7 @@ alter table swagger_url_project
-- add_test_case
alter table test_case
add demand_id varchar(50) null;
add demand_id varchar(120) null;
alter table test_case
add demand_name varchar(999) null;

8
frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue
View File

@ -231,14 +231,6 @@ export default {
let data = response.data;
this.total = data.itemCount;
this.tableData = data.listObject;
for (let i = 0; i < this.tableData.length; i++) {
let path = "/test/plan/project";
this.$post(path, {planId: this.tableData[i].id}, res => {
let arr = res.data;
let projectIds = arr.map(data => data.id);
this.$set(this.tableData[i], "projectIds", projectIds);
})
}
});
},
buildPagePath(path) {

11
frontend/src/business/components/common/model/JsonData.js
View File

@ -63,11 +63,16 @@ export const Api_Case_List = [
export const Api_Scenario_List = [
{id: 'num', label: "ID"},
{id: 'name', label: i18n.t('test_track.case.name')},
{id: 'priority', label: i18n.t('test_track.case.priority')},
{id: 'path', label: i18n.t('api_test.definition.api_path')},
{id: 'level', label: i18n.t('api_test.automation.case_level')},
{id: 'status', label: i18n.t('test_track.plan.plan_status')},
{id: 'tags', label: i18n.t('commons.tag')},
{id: 'createUser', label: '创建人'},
{id: 'userId', label: i18n.t('api_test.automation.creator')},
{id: 'updateTime', label: i18n.t('api_test.definition.api_last_time')},
{id: 'stepTotal', label: i18n.t('api_test.automation.step')},
{id: 'lastResult', label: i18n.t('api_test.automation.last_result')},
{id: 'passRate', label: i18n.t('api_test.automation.passing_rate')},
]
//测试评审-测试用例
export const Test_Case_Review_Case_List = [

2
frontend/src/business/components/track/plan/components/TestPlanEdit.vue
View File

@ -134,7 +134,6 @@ export default {
plannedStartTime: '',
plannedEndTime: ''
},
dbProjectIds: [],
rules: {
name: [
{required: true, message: this.$t('test_track.plan.input_plan_name'), trigger: 'blur'},
@ -160,7 +159,6 @@ export default {
let tmp = {};
Object.assign(tmp, testPlan);
Object.assign(this.form, tmp);
this.dbProjectIds = JSON.parse(JSON.stringify(this.form.projectIds));
}
listenGoBack(this.close);
this.dialogFormVisible = true;

8
frontend/src/business/components/track/plan/components/TestPlanList.vue
View File

@ -279,14 +279,6 @@ export default {
let data = response.data;
this.total = data.itemCount;
this.tableData = data.listObject;
for (let i = 0; i < this.tableData.length; i++) {
let path = "/test/plan/project";
this.$post(path, {planId: this.tableData[i].id}, res => {
let arr = res.data;
let projectIds = arr.filter(d => d.id !== this.tableData[i].projectId).map(data => data.id);
this.$set(this.tableData[i], "projectIds", projectIds);
})
}
});
},
buildPagePath(path) {

3
frontend/src/login/Login.vue
View File

@ -187,7 +187,7 @@ export default {
<style scoped>
.container {
width: 1440px;
width: 1200px;
height: 810px;
margin: calc((100vh - 810px) / 2) auto 0;
background-color: #FFFFFF;
@ -294,6 +294,7 @@ body {
color: #2B415C;
-webkit-font-smoothing: antialiased;
margin: 0;
height: auto;
}
.form .el-input > .el-input__inner {