From 584ae20b1eebbbeba3a9f0f7d18652e7a9928ea1 Mon Sep 17 00:00:00 2001
From: shimai <shimai@example.com>
Date: Thu, 12 Mar 2026 17:40:48 +0800
Subject: [PATCH] merge:合并
---
web-app/src/components/common/OutboundCallWidget.jsx | 155 +++++++++++++++++++++++----------------------------
1 files changed, 70 insertions(+), 85 deletions(-)
diff --git a/web-app/src/components/common/OutboundCallWidget.jsx b/web-app/src/components/common/OutboundCallWidget.jsx
index f189e73..0bfa279 100644
--- a/web-app/src/components/common/OutboundCallWidget.jsx
+++ b/web-app/src/components/common/OutboundCallWidget.jsx
@@ -28,11 +28,10 @@
*/
const OutboundCallWidget = ({ onSwitchTab, onRefreshData }) => {
const { caseData } = useCaseData();
- const [isVisible, setIsVisible] = useState(false); // 默认不显示，有任务时自动显示
+ const [isVisible, setIsVisible] = useState(false); // 默认隐藏
const [isMinimized, setIsMinimized] = useState(false); // 默认展开（非最小化）
const [calls, setCalls] = useState([]);
const isMountedRef = useRef(true);
- const fetchCallStatusRef = useRef(null); // 用于存储最新的 fetchCallStatus 函数引用
// 轮询间隔（毫秒）
const POLL_INTERVAL = 10000; // 10秒
@@ -40,7 +39,7 @@
// 最大重试次数
const MAX_RETRY_COUNT = 10;
- // 获取 caseIdg
+ // 获取 caseId
const caseId = caseData?.caseId || caseData?.case_id;
// 格式化通话时长
@@ -59,12 +58,11 @@
// 读取成功的任务
const storedSuccess = localStorage.getItem(OUTBOUND_JOBS_KEY);
const successJobs = storedSuccess ? JSON.parse(storedSuccess) : [];
- console.log('读取成功任务:', successJobs.length, successJobs);
// 读取失败的任务
const storedFailed = localStorage.getItem(`${OUTBOUND_JOBS_KEY}_failed`);
const failedJobs = storedFailed ? JSON.parse(storedFailed) : [];
- console.log('读取失败任务:', failedJobs.length, failedJobs);
+ console.log('读取失败任务:', failedJobs);
// 清理失败任务 - 按 errorCode 不同策略
const now = Date.now();
@@ -215,40 +213,22 @@
* 查询通话状态
*/
const fetchCallStatus = useCallback(async () => {
- console.log('fetchCallStatus 被调用');
-
// 从 localStorage 读取任务
const storedJobs = loadJobsFromStorage();
- console.log('从 localStorage 读取的所有任务:', storedJobs);
// 分离成功任务和失败任务
const successJobs = storedJobs.filter(job => !job.errorCode && isActiveStatus(job.callStatus));
const failedJobs = storedJobs.filter(job => job.errorCode > 0);
- console.log('成功任务数量:', successJobs.length, '失败任务数量:', failedJobs.length);
-
if (successJobs.length === 0) {
// 没有活跃任务，更新状态并返回
if (isMountedRef.current) {
setCalls([...failedJobs]);
- if (failedJobs.length > 0) {
+ if (failedJobs.length > 0 && !isVisible) {
setIsVisible(true);
}
}
return;
- }
-
- // 立即显示气泡（不等待 API 返回）
- console.log('isMountedRef.current:', isMountedRef.current);
- if (isMountedRef.current) {
- // 先合并当前的成功任务和失败任务，立即显示
- const immediateJobs = [...successJobs, ...failedJobs.filter(f => !successJobs.some(s => s.personId === f.personId))];
- console.log('准备设置 calls:', immediateJobs);
- setCalls(immediateJobs);
- setIsVisible(true);
- console.log('立即显示气泡，任务数:', immediateJobs.length, 'isVisible 设置为 true');
- } else {
- console.log('组件未挂载，跳过显示气泡');
}
// 收集需要更新到后端的任务（状态变化且原状态不是Scheduling）
@@ -340,32 +320,21 @@
// 保存到 localStorage
saveJobsToStorage(cleanedJobs);
- // 合并成功任务和失败任务，按 personId 去重（成功任务优先）
- const successPersonIds = new Set(cleanedJobs.map(job => job.personId));
- // 过滤掉已有成功任务的 personId 对应的失败任务
- const filteredFailedJobs = failedJobs.filter(job => !successPersonIds.has(job.personId));
- const allJobs = [...cleanedJobs, ...filteredFailedJobs];
+ // 合并成功任务和失败任务
+ const allJobs = [...cleanedJobs, ...failedJobs];
// 更新组件状态
if (isMountedRef.current) {
setCalls(allJobs);
- // 如果有任务，显示气泡（使用函数式更新避免依赖 isVisible）
- if (allJobs.length > 0) {
+ // 如果有任务，显示气泡
+ if (allJobs.length > 0 && !isVisible) {
setIsVisible(true);
}
}
- }, [triggerPageUpdate]);
-
- // 将最新的 fetchCallStatus 存储到 ref 中
- useEffect(() => {
- fetchCallStatusRef.current = fetchCallStatus;
- }, [fetchCallStatus]);
+ }, [isVisible, triggerPageUpdate]);
// 定时轮询通话状态
useEffect(() => {
- // 组件挂载时设置为 true
- isMountedRef.current = true;
-
// 初始加载
fetchCallStatus();
@@ -378,39 +347,6 @@
isMountedRef.current = false;
};
}, [fetchCallStatus]);
-
- // 监听 localStorage 变化，外呼成功后立即刷新
- useEffect(() => {
- const handleStorageChange = (e) => {
- // 监听外呼任务存储的变化
- if (e.key === OUTBOUND_JOBS_KEY || e.key === `${OUTBOUND_JOBS_KEY}_failed`) {
- console.log('localStorage 变化，刷新外呼状态');
- if (fetchCallStatusRef.current) {
- fetchCallStatusRef.current();
- }
- }
- };
-
- // 监听 storage 事件（跨标签页同步）
- window.addEventListener('storage', handleStorageChange);
-
- // 同页面内的 localStorage 变化需要手动触发
- // 创建自定义事件监听 - 使用 ref 避免依赖问题
- const handleCustomStorageChange = () => {
- console.log('同页面 localStorage 变化，刷新外呼状态');
- if (fetchCallStatusRef.current) {
- fetchCallStatusRef.current();
- }
- };
- window.addEventListener('outbound-jobs-updated', handleCustomStorageChange);
-
- console.log('事件监听器已设置: outbound-jobs-updated');
-
- return () => {
- window.removeEventListener('storage', handleStorageChange);
- window.removeEventListener('outbound-jobs-updated', handleCustomStorageChange);
- };
- }, []); // 空依赖数组，只在组件挂载时设置一次
// 关闭气泡
const handleClose = (e) => {
@@ -448,15 +384,6 @@
// 其他状态的任务正常显示
return true;
});
-
- // 添加调试日志
- console.log('渲染检查 - calls:', calls.length, 'activeCalls:', activeCalls.length, 'isVisible:', isVisible, 'isMinimized:', isMinimized);
-
- // 如果没有任务，不渲染任何内容
- if (activeCalls.length === 0) {
- console.log('无活跃任务，不渲染气泡');
- return null;
- }
// 如果最小化，显示AI客服图标
if (isMinimized) {
@@ -628,14 +555,14 @@
{call.errorCode > 0 ? (
// 失败任务显示
<span>
- {call.perClassName || '联系人'}
+ {call.perTypeName || '联系人'}
{call.trueName && `（${call.trueName}）`}：
{call.message}
</span>
) : (
- // 成功任务显示
+ // 成功任务显示 - 使用 perTypeName 字段（申请方当事人/被申请方当事人）
<span>
- 正在与{call.perClassName || '申请方'}（{call.trueName || call.personId}）电话沟通中...
+ 正在与{call.perTypeName || '申请方当事人'}（{call.trueName || call.personId}）电话沟通中...
</span>
)}
</div>
@@ -659,6 +586,64 @@
</div>
))}
+ {/* 无通话时的占位提示 */}
+ {activeCalls.length === 0 && isVisible && (
+ <div
+ style={{
+ background: 'linear-gradient(135deg, #1A6FB8 0%, #0d4a8a 100%)',
+ borderRadius: 12,
+ padding: '16px 20px',
+ color: 'white',
+ boxShadow: '0 4px 16px rgba(26, 111, 184, 0.3)',
+ position: 'relative',
+ minWidth: 280,
+ }}
+ >
+ {/* 关闭按钮 */}
+ <button
+ onClick={handleClose}
+ style={{
+ position: 'absolute',
+ top: 8,
+ right: 8,
+ width: 24,
+ height: 24,
+ borderRadius: '50%',
+ border: 'none',
+ background: 'rgba(255,255,255,0.2)',
+ color: 'white',
+ cursor: 'pointer',
+ display: 'flex',
+ alignItems: 'center',
+ justifyContent: 'center',
+ fontSize: 14,
+ }}
+ >
+ <i className="fas fa-times" />
+ </button>
+
+ <div style={{ display: 'flex', alignItems: 'center', gap: 10 }}>
+ <div
+ style={{
+ width: 36,
+ height: 36,
+ borderRadius: '50%',
+ background: 'rgba(255,255,255,0.2)',
+ display: 'flex',
+ alignItems: 'center',
+ justifyContent: 'center',
+ }}
+ >
+ <i className="fas fa-robot" style={{ fontSize: 18 }} />
+ </div>
+ <div>
+ <div style={{ fontSize: 16, fontWeight: 600 }}>智能外呼系统</div>
+ <div style={{ fontSize: 13, opacity: 0.85 }}>暂无进行中的通话</div>
+ </div>
+ </div>
+ </div>
+ )}
+
{/* CSS 动画 */}
<style>{`
@keyframes pulse {
--
Gitblit v1.8.0