From 647db8fb9eb74cc4145d53976582c539c5aa6f18 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui>
Date: Thu, 31 Jan 2019 15:20:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=BD=91=E5=85=83=E6=8C=89=E6=9C=80=E8=BF=91=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4=E6=9F=A5=E8=AF=A2=E6=97=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nis/nms/web/actions/detection/DetectionWarningAction.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nis/nms/web/actions/detection/DetectionWarningAction.java b/src/nis/nms/web/actions/detection/DetectionWarningAction.java
index 9574043..93dbaa5 100644
--- a/src/nis/nms/web/actions/detection/DetectionWarningAction.java
+++ b/src/nis/nms/web/actions/detection/DetectionWarningAction.java
@@ -499,7 +499,7 @@ public class DetectionWarningAction extends BaseAction {
 				+ "       diw.PERFORMACE_DATA      performacedate,\n" + "       nt.ipn                   ipn\n"
 				+ "  from (select seq_id, detection_set_info_id, max(data_check_time) dct\n"
 				+ "          from detection_info_warning\n" + "         where valid = 1\n"
-				+ "           and data_check_time >= (sysdate - 2/24)\n"
+				+ (dct == null || "".equals(dct)? "           and data_check_time >= (sysdate - 2/24)\n":"           and data_check_time >= to_date('" + dct + "','yyyy-mm-dd')\n")
 				+ "         group by seq_id, detection_set_info_id) dnew\n" + "  left join detection_info_warning diw\n"
 				+ "    on dnew.seq_id = diw.seq_id\n"
 				+ "   and dnew.detection_set_info_id = diw.detection_set_info_id\n"

From b29885d8eb43989cf0391694c163c9461f0b2a15 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui>
Date: Thu, 31 Jan 2019 15:43:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?main=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebRoot/main.jsp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/WebRoot/main.jsp b/WebRoot/main.jsp
index 6ff43b0..bcc58c5 100644
--- a/WebRoot/main.jsp
+++ b/WebRoot/main.jsp
@@ -424,13 +424,15 @@ html, body {
 .nav a span{
 	margin-left: 40px;
 }
-
+#leftNodes {
+	width:250px;
+}
 .middle_tab{
-	left: 210px;
+	left: 250px;
 }
 
 .middle_right{
-	left : 215px;
+	left : 255px;
 }
 
 
@@ -477,10 +479,10 @@ html, body {
                 <li><a href="<c:url value='/login!systemSelect.do?SytemChange=yes'/>">i18n_main.text.systemSelect_n81i&nbsp;&nbsp;|</a></li>
                 <%-- <li><a href="<c:url value='/main.jsp?i18n_lang=zh_CN'/>">简体中文&nbsp;&nbsp;|</a></li> 
                 <li><a href="<c:url value='/main.jsp?i18n_lang=en_US'/>">ENGLISH&nbsp;&nbsp;|</a></li> --%>
-                <li <%=!"ALL".equals(systemname)?"style='display:none'":"" %>>
+                <%-- <li <%=!"ALL".equals(systemname)?"style='display:none'":"" %>>
                 	<!-- <a href="<c:url value="/authentication/identificat.do?action=toTargetSys"/>">To Grafana &nbsp;&nbsp;|</a> -->
                 	<a href="<c:url value='/authentication/identificat.do?action=toTargetSys'/>" id="toTarget" target='_blank'>To Grafana &nbsp;&nbsp;|<a/>
-                </li>
+                </li> --%>
                 <li>
                 	<span>
                 		<select id="languageChange">
@@ -564,7 +566,7 @@ html, body {
 			<table>
 				<tr valign="buttom" id="titles">
 						<td width="100%" height="18" background="<c:url value='/images/main_58.png'/>">
-							<div align="center" style="width: 210px;background-color: #a81e32">
+							<div align="center" style="width: 250px;background-color: #a81e32">
 								<span id="show" class="STYLE1" 
 									style="color: rgb(242, 229, 229);cursor:pointer; font-weight: bold;width: 100%">▽i18n_main.text.show1_n81i▽</span>
 							</div>