From d760bcb09f1d1b373ffd417d322bc91a08c63b21 Mon Sep 17 00:00:00 2001
From: shimai <shimai@example.com>
Date: Mon, 09 Mar 2026 17:23:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/~chengmw/cloud-melody-front into test/shimai.huang/260309
---
web-app/src/contexts/CaseDataContext.jsx | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/web-app/src/contexts/CaseDataContext.jsx b/web-app/src/contexts/CaseDataContext.jsx
index 80382a9..7a26b74 100644
--- a/web-app/src/contexts/CaseDataContext.jsx
+++ b/web-app/src/contexts/CaseDataContext.jsx
@@ -52,7 +52,16 @@
if (!stored) return false;
const jobs = JSON.parse(stored);
- const activeStatuses = ['Scheduling', 'Executing', 'Paused', 'Drafted'];
+ const activeStatuses = [
+ 'Scheduling',
+ 'Executing',
+ 'Paused',
+ 'Drafted',
+ 'InProgress',
+ 'Calling',
+ 'Ringing',
+ 'Answered'
+ ];
// 过滤出活跃状态的任务
const activeJobs = jobs.filter(job => activeStatuses.includes(job.callStatus));
@@ -104,6 +113,10 @@
});
// 处理响应
+ console.log('triggerOutboundCall API 响应:', response);
+ console.log('response.data:', response?.data);
+ console.log('response.data 是数组:', Array.isArray(response?.data));
+
if (response?.data && Array.isArray(response.data)) {
const successJobs = [];
const failedJobs = [];
@@ -119,7 +132,7 @@
caseId: String(caseId), // 添加 caseId 字段用于轮询
perClassName: item.perClassName || '', // 添加人员类型名称
trueName: item.trueName || '', // 添加真实姓名
- startTime: item.createdTime || item.start_time,
+ startTime: item.createTime || item.createdTime || item.start_time,
pollStartTime: Date.now(),
retryCount: 0
});
@@ -137,8 +150,16 @@
// 存储成功的任务到 localStorage
if (successJobs.length > 0) {
- localStorage.setItem(OUTBOUND_JOBS_KEY, JSON.stringify(successJobs));
- console.log('存储外呼任务成功，数量:', successJobs.length);
+ // 读取现有的成功任务，合并而不是覆盖
+ const existingJobs = JSON.parse(localStorage.getItem(OUTBOUND_JOBS_KEY) || '[]');
+ // 按 jobId 去重，新任务优先
+ const existingJobIds = new Set(successJobs.map(job => job.jobId));
+ const filteredExistingJobs = existingJobs.filter(job => !existingJobIds.has(job.jobId));
+ const mergedJobs = [...successJobs, ...filteredExistingJobs];
+
+ localStorage.setItem(OUTBOUND_JOBS_KEY, JSON.stringify(mergedJobs));
+ console.log('存储外呼任务成功，新增:', successJobs.length, '总数:', mergedJobs.length);
+ console.log('存储的任务:', JSON.stringify(mergedJobs, null, 2));
// 外呼成功后，清除对应的失败记录
const storedFailedJobs = JSON.parse(localStorage.getItem(`${OUTBOUND_JOBS_KEY}_failed`) || '[]');
@@ -150,6 +171,12 @@
localStorage.setItem(`${OUTBOUND_JOBS_KEY}_failed`, JSON.stringify(remainingFailedJobs));
console.log('外呼成功后清除失败记录，清除数量:', storedFailedJobs.length - remainingFailedJobs.length);
}
+
+ // 延迟触发自定义事件，确保监听器已经设置好
+ setTimeout(() => {
+ console.log('触发 outbound-jobs-updated 事件');
+ window.dispatchEvent(new CustomEvent('outbound-jobs-updated'));
+ }, 300);
}
// 存储失败的任务到 localStorage（用于气泡显示）
@@ -179,6 +206,9 @@
localStorage.setItem(`${OUTBOUND_JOBS_KEY}_failed`, JSON.stringify(cleanedFailedJobs));
console.log('存储外呼失败任务，数量:', cleanedFailedJobs.length);
+
+ // 触发自定义事件通知 OutboundCallWidget 组件刷新
+ window.dispatchEvent(new CustomEvent('outbound-jobs-updated'));
}
// 提示失败的任务
@@ -255,20 +285,38 @@
console.log('Loading case data with params:', params);
+ if (!params.caseId) {
+ setError('caseId缺失');
+ setLoading(false);
+ return;
+ }
+
+ try {
+ await OutboundBotAPIService.syncStatusByCase({ caseId: params.caseId });
+ } catch (syncError) {
+ console.error('同步外呼状态失败:', syncError);
+ }
+ try {
+ await OutboundBotAPIService.backfillConversationByCase({ caseId: params.caseId });
+ } catch (backfillError) {
+ console.error('回补通话记录失败:', backfillError);
+ }
+
// 调用API获取数据
const response = await ProcessAPIService.getCaseProcessInfo(
params.caseId,
{
caseTypeFirst: params.caseTypeFirst,
- platform_code: params.platform_code
+ platform_code: params.platform_code,
+ authorization: params.auth_token
}
);
// 提取timeline数据
const timelineData = response.timeline || response.data?.timeline || response;
- // 提取nodes数据（确保为数组）
- const nodesData = response.nodes || response.data?.nodes || [];
+ // 提取nodes数据（确保为数组），兼容 nodeList 和 nodes 两种字段名
+ const nodesData = response.data?.nodeList || response.data?.nodes || response.nodes || [];
console.log('API Response:', response);
console.log('Extracted nodesData:', nodesData);
--
Gitblit v1.8.0