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 2020-12-14 18:51:01 +08:00
parent 0d8bffb73f a76a5c3067
commit a8807ec2c6
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml
View File

@ -106,7 +106,7 @@
<select id="checkLoadTestOwner" resultType="int">
SELECT COUNT(1)
FROM load_test
LEFT JOIN project ON api_test.project_id = project.id
LEFT JOIN project ON load_test.project_id = project.id
<where>
<if test="testId != null">
and load_test.id = #{testId}

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

@ -16,7 +16,7 @@
border
:cell-style="rowClass"
:header-cell-style="headClass">
<el-table-column :label="$t('schedule.event')" prop="events" min-width="15%">
<el-table-column :label="$t('schedule.event')" prop="events" min-width="13%">
<template slot-scope="scope">
<el-select v-model="scope.row.event" size="mini"
:placeholder="$t('organization.message.select_events')"
@ -30,7 +30,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column :label="$t('schedule.receiver')" prop="userIds" min-width="20%">
<el-table-column :label="$t('schedule.receiver')" prop="userIds" min-width="18%">
<template v-slot:default="{row}">
<el-select v-model="row.userIds" filterable multiple size="mini"
:placeholder="$t('commons.please_select')" style="width: 100%;" :disabled="!row.isSet">
@ -64,7 +64,7 @@
:disabled="!scope.row.isSet||!scope.row.isReadOnly"></el-input>
</template>
</el-table-column>
<el-table-column :label="$t('commons.operating')" prop="result" min-width="20%">
<el-table-column :label="$t('commons.operating')" prop="result" min-width="25%">
<template v-slot:default="scope">
<el-button
type="success"
@ -214,11 +214,7 @@ export default {
}
},
addTask(data) {
let list = [];
list.push(data);
let param = {};
param.messageDetail = list;
this.result = this.$post("/notice/save/message/task", param, () => {
this.result = this.$post("/notice/save/message/task", data, () => {
this.initForm()
this.$success(this.$t('commons.save_success'));
})

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 29a8fc09602fde5708af06582ac972d98eb69836
Subproject commit 5835db186d17a3d305073e58affb4e88a71b32f0