fix(接口测试): 修复任务中心页面筛选项目报错的缺陷
--bug=1039442 --user=王孝刚 【系统/组织任务中心】实时任务列表-所属组织下拉筛选&实时任务列表-所属项目下拉筛选报服务器错误 https://www.tapd.cn/55049933/s/1498184
This commit is contained in:
parent
9b496fffcd
commit
22e76da348
|
@ -142,7 +142,7 @@
|
||||||
and api_report.update_user in
|
and api_report.update_user in
|
||||||
<include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
|
<include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
|
||||||
</when>
|
</when>
|
||||||
<when test="key=='projectIds">
|
<when test="key=='projectIds'">
|
||||||
and api_report.project_id in
|
and api_report.project_id in
|
||||||
<foreach collection="values" item="value" separator="," open="(" close=")">
|
<foreach collection="values" item="value" separator="," open="(" close=")">
|
||||||
#{value}
|
#{value}
|
||||||
|
|
|
@ -268,7 +268,7 @@
|
||||||
and api_scenario_report.update_user in
|
and api_scenario_report.update_user in
|
||||||
<include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
|
<include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
|
||||||
</when>
|
</when>
|
||||||
<when test="key=='projectIds">
|
<when test="key=='projectIds'">
|
||||||
and api_scenario_report.project_id in
|
and api_scenario_report.project_id in
|
||||||
<foreach collection="values" item="value" separator="," open="(" close=")">
|
<foreach collection="values" item="value" separator="," open="(" close=")">
|
||||||
#{value}
|
#{value}
|
||||||
|
|
|
@ -68,7 +68,7 @@
|
||||||
and task.resource_type in
|
and task.resource_type in
|
||||||
<include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
|
<include refid="io.metersphere.system.mapper.BaseMapper.filterInWrapper"/>
|
||||||
</when>
|
</when>
|
||||||
<when test="key=='projectIds">
|
<when test="key=='projectIds'">
|
||||||
and task.project_id in
|
and task.project_id in
|
||||||
<foreach collection="values" item="value" separator="," open="(" close=")">
|
<foreach collection="values" item="value" separator="," open="(" close=")">
|
||||||
#{value}
|
#{value}
|
||||||
|
|
|
@ -495,8 +495,18 @@
|
||||||
try {
|
try {
|
||||||
const { selectIds, selectAll } = batchParams.value;
|
const { selectIds, selectAll } = batchParams.value;
|
||||||
await loadRealMap.value[props.group].batchStop({
|
await loadRealMap.value[props.group].batchStop({
|
||||||
|
moduleType: props.moduleType,
|
||||||
selectIds: selectAll ? [] : selectIds,
|
selectIds: selectAll ? [] : selectIds,
|
||||||
selectAll,
|
selectAll,
|
||||||
|
condition: {
|
||||||
|
keyword: keyword.value,
|
||||||
|
filter: {
|
||||||
|
status: statusFiltersMap.value[props.moduleType],
|
||||||
|
triggerMode: triggerModeFiltersMap.value[props.moduleType],
|
||||||
|
organizationIds: orgFiltersMap.value[props.moduleType],
|
||||||
|
projectIds: projectFiltersMap.value[props.moduleType],
|
||||||
|
},
|
||||||
|
},
|
||||||
});
|
});
|
||||||
resetSelector();
|
resetSelector();
|
||||||
Message.success(t('project.taskCenter.stopSuccess'));
|
Message.success(t('project.taskCenter.stopSuccess'));
|
||||||
|
@ -511,7 +521,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleTableBatch(event: BatchActionParams, params: BatchActionQueryParams) {
|
function handleTableBatch(event: BatchActionParams, params: BatchActionQueryParams) {
|
||||||
batchParams.value = { ...params, selectIds: params?.selectedIds || [], condition: {} };
|
batchParams.value = { ...params, selectIds: params?.selectedIds || [], condition: params?.condition || {} };
|
||||||
if (event.eventTag === 'batchStop') {
|
if (event.eventTag === 'batchStop') {
|
||||||
batchStopRealTask();
|
batchStopRealTask();
|
||||||
}
|
}
|
||||||
|
|
|
@ -375,8 +375,10 @@
|
||||||
setLoadListParams({
|
setLoadListParams({
|
||||||
keyword: keyword.value,
|
keyword: keyword.value,
|
||||||
scheduleTagType: props.moduleType,
|
scheduleTagType: props.moduleType,
|
||||||
|
filter: {
|
||||||
organizationIds: orgFiltersMap.value[props.moduleType],
|
organizationIds: orgFiltersMap.value[props.moduleType],
|
||||||
projectIds: projectFiltersMap.value[props.moduleType],
|
projectIds: projectFiltersMap.value[props.moduleType],
|
||||||
|
},
|
||||||
});
|
});
|
||||||
loadList();
|
loadList();
|
||||||
}
|
}
|
||||||
|
@ -501,6 +503,13 @@
|
||||||
selectAll,
|
selectAll,
|
||||||
scheduleTagType: props.moduleType,
|
scheduleTagType: props.moduleType,
|
||||||
excludeIds,
|
excludeIds,
|
||||||
|
condition: {
|
||||||
|
keyword: keyword.value,
|
||||||
|
filter: {
|
||||||
|
organizationIds: orgFiltersMap.value[props.moduleType],
|
||||||
|
projectIds: projectFiltersMap.value[props.moduleType],
|
||||||
|
},
|
||||||
|
},
|
||||||
});
|
});
|
||||||
resetSelector();
|
resetSelector();
|
||||||
Message.success(t('project.taskCenter.enableSuccess'));
|
Message.success(t('project.taskCenter.enableSuccess'));
|
||||||
|
@ -531,6 +540,13 @@
|
||||||
selectIds: selectAll ? [] : selectIds,
|
selectIds: selectAll ? [] : selectIds,
|
||||||
selectAll,
|
selectAll,
|
||||||
scheduleTagType: props.moduleType,
|
scheduleTagType: props.moduleType,
|
||||||
|
condition: {
|
||||||
|
keyword: keyword.value,
|
||||||
|
filter: {
|
||||||
|
organizationIds: orgFiltersMap.value[props.moduleType],
|
||||||
|
projectIds: projectFiltersMap.value[props.moduleType],
|
||||||
|
},
|
||||||
|
},
|
||||||
});
|
});
|
||||||
resetSelector();
|
resetSelector();
|
||||||
Message.success(t('project.taskCenter.disableSuccess'));
|
Message.success(t('project.taskCenter.disableSuccess'));
|
||||||
|
|
Loading…
Reference in New Issue