diff --git a/manager-admin/src/main/java/com/hshh/evaluation/service/impl/CoreEvaluationServiceImpl.java b/manager-admin/src/main/java/com/hshh/evaluation/service/impl/CoreEvaluationServiceImpl.java index 9bc6a7d..5dae8fd 100644 --- a/manager-admin/src/main/java/com/hshh/evaluation/service/impl/CoreEvaluationServiceImpl.java +++ b/manager-admin/src/main/java/com/hshh/evaluation/service/impl/CoreEvaluationServiceImpl.java @@ -427,6 +427,9 @@ public class CoreEvaluationServiceImpl implements CoreEvaluationService { WsEvaluationServer.sendTips( "分批次结束评估" + originalList.size() + "条记录,耗时:" + diff + "秒", request.getRandomKey()); + //推送成功 + WsEvaluationServer.sendTips("success(" + request.getProjectId() + ")", + request.getRandomKey()); } private void saveResult(List resultList) { diff --git a/manager-admin/src/main/resources/templates/project/list.html b/manager-admin/src/main/resources/templates/project/list.html index ffbfbd0..166422f 100644 --- a/manager-admin/src/main/resources/templates/project/list.html +++ b/manager-admin/src/main/resources/templates/project/list.html @@ -255,9 +255,20 @@ appendLog("WS closed"); }, onMessage: (ev) => { - // ev 可能是字符串或事件对象(取决于 connectWs 封装) + // ev 这里直接是解析好的数据数据 + if(ev.indexOf("success")>0){ + //提取ev中的projectId + let result = ev.match(/\((\d+)\)/); + let num = result ? result[1] : null; // num = "1" + + _projectHistory(num) + + + }else{ + appendLog(ev); + } + - appendLog(ev); }, onError: (err) => { appendLog("WS error");