1.增加hibernate会话绑定配置,修复new thread中数据库操作的session过期的问题
2.修复告警信息页面懒加载后显示异常的问题 3.任务列表中不显示非本机任务
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
|
||||
<%@include file="/common/taglib.jsp"%>
|
||||
|
||||
<%
|
||||
String path = request.getContextPath();
|
||||
String basePath = request.getScheme() + "://"
|
||||
@@ -8,7 +7,6 @@
|
||||
+ path + "/";
|
||||
request.setAttribute("vEnter","\n");
|
||||
%>
|
||||
</script>
|
||||
<c:set var="index" value="${1}" />
|
||||
<c:choose>
|
||||
<c:when test="${fn:length(detecWarningList) > 0}">
|
||||
@@ -92,7 +90,6 @@ $(function(){
|
||||
$(".popover").remove();
|
||||
var x = event.clientX;//鼠标位置
|
||||
var y = event.clientY;
|
||||
//alert(tx + "," + ty + "," + x + "," + y);
|
||||
if (y < ty/2) {
|
||||
var placement = "bottom";
|
||||
} else {
|
||||
|
||||
@@ -555,6 +555,7 @@
|
||||
<c:set var="tdClass" value="color_3" />
|
||||
<c:set var="tdClassR" value="color_6" />
|
||||
</c:if>
|
||||
<c:if test="${missionstatetable.missionState ne -1}">
|
||||
<tr>
|
||||
<td class="${tdClass }" nowrap="nowrap" >
|
||||
<input type="hidden" id="yxbz${missionstatetable.missionId }" name="yxbz${missionstatetable.missionId }" value="${missionstatetable.missionState}" />
|
||||
@@ -634,6 +635,7 @@
|
||||
<td class="${tdClass }" nowrap="nowrap">${missionstatetable.userIdName}</td>
|
||||
<td class="${tdClassR }" nowrap="nowrap"><fmt:formatDate value="${missionstatetable.createTime}" type="both" /></td>
|
||||
</tr>
|
||||
</c:if>
|
||||
<c:set var="index" value="${index + 1}" />
|
||||
</c:forEach>
|
||||
</c:when>
|
||||
|
||||
Reference in New Issue
Block a user