From 6eafd8864265aed0fba686a1d77ce04687311d63 Mon Sep 17 00:00:00 2001
From: shangguanyanfei <shangguan@zdjizhi.com>
Date: Wed, 19 Jun 2019 17:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1-=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E8=8F=9C=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/dashboard/commonNew.jsp     | 90 ++++++++++++++-----
 1 file changed, 69 insertions(+), 21 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp b/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
index b9cb08a18..e227979c2 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/commonNew.jsp
@@ -137,7 +137,7 @@
 						</select>
                 	</div>
 				</div>
-				<div id="area_detail" class="pull-left" style="display: none;">
+				<%-- <div id="area_detail" class="pull-left" style="display: none;">
 					<div class="input-group">
 						<div class="input-group-btn">
 							<span class="selectpicker form-control" ><spring:message code="area_id"/></span>
@@ -148,8 +148,8 @@
 							<option value="almaty">Almaty</option>
 						</select>
 		               </div>
-				</div>
-				<div id="operator_detail" class="pull-left" style="display: none;">
+				</div> --%>
+				<%-- <div id="operator_detail" class="pull-left" style="display: none;">
 					<div class="input-group">
 						<div class="input-group-btn">
 							<span class="selectpicker form-control" ><spring:message code="isp"/></span>
@@ -161,36 +161,36 @@
 							</c:forEach>
 						</select>
 		            </div>
-				</div>
+				</div> --%>
 			</div>
 			<div class="col-md-12" style="padding-top: 3px;">
 			<div class="form-group">
                	<div class="control-label col-md-3 form-control" style="width: max-content;">
 					<spring:message code="time_granularity" />
 				</div>
-               	<div class="pull-left" style="margin-left: 10px;">
+               	<div class="pull-left" style="margin-left: 5px;">
 					<div class="mt-radio-inline" style="height: 34px">
-						 <label class="mt-radio">
+						 <label class="mt-radio" style="width: 70px;">
 					 	 	<input type="radio" class="timeSize" name="time" value="1" checked/> 
 					 	 		5<spring:message code="minute" />
 						 	<span></span>
 					 	 </label>
-					 	 <label class="mt-radio">
+					 	 <label class="mt-radio" style="width: 50px;">
 					 	 	<input type="radio" class="timeSize" name="time" value="2"/> 
 					 	 	<spring:message code="hour" />
 						 	<span></span>
 					 	 </label>
-					 	 <label class="mt-radio">
+					 	 <label class="mt-radio" style="width: 50px;">
 					 	 	<input type="radio" class="timeSize" name="time" value="3"/> 
 					 	 	<spring:message code="day" />
 						 	<span></span>
 					 	 </label>
-					 	 <label class="mt-radio">
+					 	 <label class="mt-radio" style="width: 70px;">
 					 	 	<input type="radio" class="timeSize" name="time" value="4"/> 
 					 	 	<spring:message code="month" />
 						 	<span></span>
 					 	 </label>
-					 	 <label class="mt-radio">
+					 	 <label class="mt-radio" style="width: 50px;">
 					 	 	<input type="radio" class="timeSize" name="time" value="5"/> 
 					 	 	<spring:message code="year" />
 						 	<span></span>
@@ -205,7 +205,7 @@
 						</div> 
 							<!-- <input name="beginDate" id="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
 										value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false)"/> -->
-							  <input name="beginDate" id="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+							  <input name="beginDate" id="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" style="width: 175px !important;"
 										value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/> 
 					</div>
 				</div>
@@ -216,7 +216,7 @@
 						</div> 
 							<!-- <input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
 										value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false)"/> -->
-							  <input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate input-medium"
+							  <input name="endDate" id="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate " style="width: 175px !important;"
 										value="" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')"/> 
 					</div>
 				</div>
@@ -282,6 +282,31 @@
 	   </div> --%>
 		
 		<div class="col-md-12" style="padding-top: 3px;">
+			<div id="area_detail" class="pull-left" style="display: none;">
+					<div class="input-group">
+						<div class="input-group-btn">
+							<span class="selectpicker form-control" ><spring:message code="area_id"/></span>
+		                </div>
+		                <select id="area_select" name="area" class="selectpicker select2 input-small">
+		                	<option value="" ><spring:message code="select"/></option>
+		                	<option value="astana">Astana</option>
+							<option value="almaty">Almaty</option>
+						</select>
+		               </div>
+				</div>
+			<div id="operator_detail" class="pull-left" style="display: none;">
+					<div class="input-group">
+						<div class="input-group-btn">
+							<span class="selectpicker form-control" ><spring:message code="isp"/></span>
+		                </div>
+		                <select id="operator_select" name="operator" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 2" multiple max-width="100px" data-live-search="true" data-live-search-placeholder="search">
+		                     <option value=""><spring:message code="select"/></option> 
+		                    <c:forEach items="${fns:getIspDicList('ispCode')}" var="dict" >
+								<option value="${dict.ispKeyCode}"><spring:message code="${dict.ispKeyName}"></spring:message></option>
+							</c:forEach>
+						</select>
+		            </div>
+			</div>
 			 <div id="chart_detail" class="pull-left" style="display: none;">
 					<div class="input-group">
 						<div class="input-group-btn">
@@ -756,7 +781,7 @@ function initTimeSize(){
 			beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',5,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy')");
 			endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',5,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy')");
 		} 
-	$(".beginDate").children("div").after(beginTimeObj);setEndTimeByFormat
+	$(".beginDate").children("div").after(beginTimeObj);
 	$(".endDate").children("div").after(endTimeObj);
 	
 	//$("#beginDate").change();
@@ -783,10 +808,10 @@ function initTimeSize(){
 function  selectTimeSize(){
 	$(".timeSize").on("change",function(){
 		var size = $(this).val();
-		var beginTimeObj = $("#beginDate").clone();
+		 var beginTimeObj = $("#beginDate").clone();
 		var endTimeObj = $("#endDate").clone();
 		$("#beginDate").remove();
-		$("#endDate").remove();
+		$("#endDate").remove(); 
 		
 		/*  if(size == 1){ // 5分钟
 			beginTimeObj.attr("onchange","setStartTime('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false,true)");
@@ -804,7 +829,7 @@ function  selectTimeSize(){
 			beginTimeObj.attr("onchange","setStartTime('#beginDate','#endDate',24,'m','yyyy-MM-dd hh:mm:ss',false,'year')");
 			endTimeObj.attr("onchange","setEndTime('#beginDate','#endDate',24,'m','yyyy-MM-dd hh:mm:ss',false,'year')");
 		}  */
-		  if(size == 1){ // 5分钟
+		   if(size == 1){ // 5分钟
 				beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
 				endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
 			}else if(size == 2){ // 小时
@@ -820,11 +845,11 @@ function  selectTimeSize(){
 				beginTimeObj.attr("onchange","setStartTimeByFormats('#beginDate','#endDate',5,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy')");
 				endTimeObj.attr("onchange","setEndTimeByFormats('#beginDate','#endDate',5,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy')");
 			} 
-		$(".beginDate").children("div").after(beginTimeObj);setEndTimeByFormat
-		$(".endDate").children("div").after(endTimeObj);
+		$(".beginDate").children("div").after(beginTimeObj);
+		$(".endDate").children("div").after(endTimeObj); 
 		
 		//$("#beginDate").change();
-		$("#endDate").change();
+		 $("#endDate").change(); 
 		
 		 /* if(size == 1){ // 5分钟
 			$("#beginDate").attr("onchange","setStartTime('#beginDate','#endDate',1,'h','yyyy-MM-dd hh:mm:ss',false)");
@@ -842,7 +867,7 @@ function  selectTimeSize(){
 			$("#beginDate").attr("onchange","setStartTime('#beginDate','#endDate',24,'m','yyyy-MM-dd hh:mm:ss',false)");
 			$("#endDate").attr("onchange","setEndTime('#beginDate','#endDate',24,'m','yyyy-MM-dd hh:mm:ss',false)");
 		}  */
-		 if(size == 1){ // 5分钟
+		  if(size == 1){ // 5分钟
 			$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
 			$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',1,'m','yyyy-MM-dd hh:mm:ss',false,'yyyy-MM-dd hh:mm')");
 		}else if(size == 2){ // 小时
@@ -857,7 +882,30 @@ function  selectTimeSize(){
 		}else if(size == 5){ // 年
 			$("#beginDate").attr("onchange","setStartTimeByFormats('#beginDate','#endDate',5,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy')");
 			$("#endDate").attr("onchange","setEndTimeByFormats('#beginDate','#endDate',5,'y','yyyy-MM-dd hh:mm:ss',false,'yyyy')");
-		} 
+		}  
+		
+		  var newdate=new  Date();
+			if(size == 1){ // 5分钟
+				newdate.setHours(newdate.getHours()-1);
+				$("#beginDate").val(dateFtt('yyyy-MM-dd hh:mm',newdate)+":00");
+				$("#endDate").val(dateFtt('yyyy-MM-dd hh:mm',new Date())+":00");
+			}else if(size == 2){ // 小时
+				newdate.setDate(newdate.getDate()-1);
+				$("#beginDate").val(dateFtt('yyyy-MM-dd hh',newdate)+":00:00");
+				$("#endDate").val(dateFtt('yyyy-MM-dd hh',new Date())+":00:00");
+			}else if(size == 3){ // 天
+				newdate.setDate(newdate.getDate()-30);
+				$("#beginDate").val(dateFtt('yyyy-MM-dd',newdate)+" 00:00:00");
+				$("#endDate").val(dateFtt('yyyy-MM-dd',new Date())+" 00:00:00");
+			}else if(size == 4){ // 月
+				newdate.setFullYear(newdate.getFullYear()-1);
+				$("#beginDate").val(dateFtt('yyyy-MM',newdate)+"-01 00:00:00");
+				$("#endDate").val(dateFtt('yyyy-MM',new Date())+"-01 00:00:00");
+			}else if(size == 5){ // 年
+				newdate.setFullYear(newdate.getFullYear()-5);
+				$("#beginDate").val(dateFtt('yyyy',newdate)+"-01-01 00:00:00");
+				$("#endDate").val(dateFtt('yyyy',new Date())+"-01-01 00:00:00");
+			} 
 	});
 }