diff --git a/frontend/src/api/modules/project-management/taskCenter.ts b/frontend/src/api/modules/project-management/taskCenter.ts index 2d3f318920..eb4ab4d3e1 100644 --- a/frontend/src/api/modules/project-management/taskCenter.ts +++ b/frontend/src/api/modules/project-management/taskCenter.ts @@ -23,9 +23,9 @@ import { scheduleOrgCenterListUrl, scheduleProCenterListUrl, scheduleSysCenterListUrl, - stopRealOrdApiUrl, - stopRealProjectApiUrl, - stopRealSysApiUrl, + stopRealOrdApiUrl, stopRealOrgPlanUrl, + stopRealProjectApiUrl, stopRealProjectPlanUrl, + stopRealSysApiUrl, stopRealSysPlanUrl, systemRealTotal, systemScheduleTotal, taskOrgPlanRealCenterListUrl, @@ -209,4 +209,28 @@ export function getRealProPlanList(data: TableQueryParams) { return MSR.post>({ url: taskProPlanRealCenterListUrl, data }); } +export function stopRealSysPlan(id: string) { + return MSR.get({ url: `${stopRealSysPlanUrl}/${id}` }); +} + +export function stopRealOrgPlan(id: string) { + return MSR.get({ url: `${stopRealOrgPlanUrl}/${id}` }); +} + +export function stopRealProPlan(id: string) { + return MSR.get({ url: `${stopRealProjectPlanUrl}/${id}` }); +} + +export function batchStopRealSysPlan(data: TableQueryParams) { + return MSR.post({ url: `${stopRealSysPlanUrl}`, data }); +} + +export function batchStopRealOrgPlan(data: TableQueryParams) { + return MSR.post({ url: `${stopRealOrgPlanUrl}`, data }); +} + +export function batchStopRealProPlan(data: TableQueryParams) { + return MSR.post({ url: `${stopRealProjectPlanUrl}`, data }); +} + export default {}; diff --git a/frontend/src/api/requrls/project-management/taskCenter.ts b/frontend/src/api/requrls/project-management/taskCenter.ts index 889fcfc870..f3dac07429 100644 --- a/frontend/src/api/requrls/project-management/taskCenter.ts +++ b/frontend/src/api/requrls/project-management/taskCenter.ts @@ -80,3 +80,7 @@ export const projectRealTotal = '/task/center/project/real/total'; export const taskSysPlanRealCenterListUrl = '/task/center/plan/system/real-time/page'; export const taskOrgPlanRealCenterListUrl = '/task/center/plan/org/real-time/page'; export const taskProPlanRealCenterListUrl = '/task/center/plan/project/real-time/page'; + +export const stopRealSysPlanUrl = '/task/center/plan/project/stop'; +export const stopRealOrgPlanUrl = '/task/center/plan/org/stop'; +export const stopRealProjectPlanUrl = '/task/center/plan/project/stop'; diff --git a/frontend/src/views/project-management/taskCenter/component/apiCase.vue b/frontend/src/views/project-management/taskCenter/component/apiCase.vue index 625726ffa3..9b57e7abc9 100644 --- a/frontend/src/views/project-management/taskCenter/component/apiCase.vue +++ b/frontend/src/views/project-management/taskCenter/component/apiCase.vue @@ -398,36 +398,6 @@ showSelectAll: true, } ); - const triggerModeApiCase = ref([]); - const triggerModeApiScenario = ref([]); - - const triggerModeFiltersMap = ref>({ - API_CASE: triggerModeApiCase.value, - API_SCENARIO: triggerModeApiScenario.value, - }); - - const statusFilterApiCase = ref([]); - const statusFilterApiScenario = ref([]); - - const statusFiltersMap = ref>({ - API_CASE: statusFilterApiCase.value, - API_SCENARIO: statusFilterApiScenario.value, - }); - - const orgApiCaseFilter = ref([]); - const orgApiScenarioFilter = ref([]); - - const orgFiltersMap = ref>({ - API_CASE: orgApiCaseFilter.value, - API_SCENARIO: orgApiScenarioFilter.value, - }); - - const projectApiCaseFilter = ref([]); - const projectApiScenarioFilter = ref([]); - const projectFiltersMap = ref>({ - API_CASE: projectApiCaseFilter.value, - API_SCENARIO: projectApiScenarioFilter.value, - }); function initData() { setLoadListParams({ @@ -478,10 +448,7 @@ 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], + ...propsRes.value.filter, }, }, }); diff --git a/frontend/src/views/project-management/taskCenter/component/testPlan.vue b/frontend/src/views/project-management/taskCenter/component/testPlan.vue index cc99907a35..53c638cd9c 100644 --- a/frontend/src/views/project-management/taskCenter/component/testPlan.vue +++ b/frontend/src/views/project-management/taskCenter/component/testPlan.vue @@ -95,7 +95,7 @@ ['RUNNING', 'RERUNNING'].includes(record.execStatus) && hasAnyPermission(permissionsMap[props.group].stop) " class="!mr-0" - @click="stop()" + @click="stop(record)" >{{ t('project.taskCenter.stop') }} @@ -105,6 +105,7 @@