From 3516f02277035cdc7ff137422709b16efe97ca4a Mon Sep 17 00:00:00 2001
From: 15832144755 <67030627+15832144755@users.noreply.github.com>
Date: 星期五, 27 八月 2021 11:27:21 +0800
Subject: [PATCH] 8.27

---
 src/main/webapp/hxzk/GPS/historicalgpsLocation.jsp |   60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/hxzk/GPS/historicalgpsLocation.jsp b/src/main/webapp/hxzk/GPS/historicalgpsLocation.jsp
index 8047d41..dc61253 100644
--- a/src/main/webapp/hxzk/GPS/historicalgpsLocation.jsp
+++ b/src/main/webapp/hxzk/GPS/historicalgpsLocation.jsp
@@ -7,7 +7,7 @@
 				<meta charset="utf-8">
 				<meta http-equiv="X-UA-Compatible" content="IE=edge">
 				<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, shrink-to-fit=no">
-				<title></title>
+				<title>鍘嗗彶鏁版嵁</title>
 				<link href="/hxzkoa/hxzk/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
 				<link href="/hxzkoa/hxzk/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 				<link href="/hxzkoa/hxzk/assets/css/components/custom-modal.css" rel="stylesheet" type="text/css" />
@@ -124,21 +124,24 @@
 													<button style="float:left;margin-left:10px;" type="button"
 														class="btn btn-secondary deleteAll"
 														id="deleteAllButton">鍏ㄩ儴鍒犻櫎</button>
-													<div style="width:120px;float:left;margin-left:10px;">
+													<div style="width:80px;float:left;margin-left:10px;">
 														<input type="text" id="begin"
-															class="form-control form-control-sm"
-															style="font-size:12px;" placeholder="璇疯緭鍏ュ紑濮嬫椂闂�"/>
+															class="form-control form-control-sm" style="font-size:12px;"
+															placeholder="寮�濮嬫椂闂�" />
 													</div>
-													<div style="width:120px;float:left;margin-left:10px;">
+													<div style="width:80px;float:left;margin-left:10px;">
 														<input type="text" id="end" class="form-control form-control-sm"
-															style="font-size:12px;" placeholder="璇疯緭鍏ョ粨鏉熸椂闂�"/>
+															style="font-size:12px;" placeholder="缁撴潫鏃堕棿" />
 													</div>
-													<div style="width:100px;float:left;margin-left:10px;">
-														<input type="text" id="tagida" class="form-control form-control-sm"
-															style="font-size:12px;" placeholder="璇疯緭鍏ユ爣绛緄d"/>
+													<div style="width:60px;float:left;margin-left:10px;">
+														<input type="text" id="tagida"
+															class="form-control form-control-sm" style="font-size:12px;"
+															placeholder="鏍囩id" />
 													</div>
 													<button style="float:left;margin-left:10px;" type="button"
-														class="btn btn-secondary toAllExcel">瀵煎嚭琛ㄦ牸</button>
+														class="btn btn-secondary toAllExcel">瀵煎嚭Excel</button>
+													<button style="float:left;margin-left:10px;" type="button"
+														class="btn btn-secondary toAlltxt">瀵煎嚭txt</button>
 
 													<label for="perPage"
 														class="col-sm-2 col-form-label col-form-label-sm"
@@ -214,6 +217,13 @@
 					</div>
 					<!--  END CONTENT PART  -->
 				</div>
+				<%
+				String username=(String)session.getAttribute("username");
+				if(username==null || username.equals("")){
+				request.getRequestDispatcher("/hxzk/login.jsp").forward(request,response);
+				return;
+				}
+				%>
 				<!-- END MAIN CONTAINER -->
 				<script>
 					//鎵ц涓�涓猯aydate瀹炰緥
@@ -230,7 +240,7 @@
 							}
 						}
 					});
-	
+
 					//鎵ц涓�涓猯aydate瀹炰緥
 					laydate.render({
 						elem: '#end' //鎸囧畾鍏冪礌'
@@ -243,14 +253,14 @@
 									document.getElementById("begin").value = "";
 								}
 							}
-	
+
 						}
 					});
 				</script>
 				<script>
 					// 椤甸潰鍒濆鍖�
 					$(document).ready(function () {
-						App.init(); $.ajax({ async: false, type: "POST", url: "/hxzkoa/getSysSetting_list.do", data: {}, dataType: "json", success: function (data) { title = data[0].title; document.title = title; }, });
+						App.init(); $.ajax({ async: false, type: "POST", url: "/hxzkoa/getSysSetting_list.do", data: {}, dataType: "json", success: function (data) { /* title = data[0].title; document.title = title;  */}, });
 						$("#page_1").addClass("active");
 					});
 					// 鍔犺浇head澶嶇敤椤甸潰
@@ -397,13 +407,35 @@
 							}
 						})
 					});
+					$(".toAlltxt").click(function () {
+						var dateaa = $("#dateList").val();
+						window.location.href = "/hxzkoa/totxt.do?date=" + dateaa;
+						// swal({
+						// 	title: "Exported!",
+						// 	text: "瀵煎嚭鎴愬姛锛�",
+						// 	type: "success",
+						// 	showCancelButton: false,
+						// 	showConfirmButton: false,
+						// 	buttons: false
+						// })
+						// setTimeout("window.location.reload()", 1000);
+						/* $.ajax({
+							async: false,
+							type: 'POST',
+							url: "/hxzkoa/totxt.do",
+							dataType: 'json',
+							success: function(data){
+								console.log(data)
+							}
+						}) */
+					})
 					// 瀵煎嚭琛ㄦ牸
 					$(".toAllExcel").click(function () {
 						var tag = document.getElementById("tagida").value;
 						var begin = document.getElementById("begin").value;
 						var end = document.getElementById("end").value;
 						var datea = $("#dateList").val();
-						window.location.href = "/hxzkoa/historicalgpsLocation_export.do?tagid="+tag+"&begintime="+begin+"&endtime="+end+"&date="+datea;
+						window.location.href = "/hxzkoa/historicalgpsLocation_export.do?tagid=" + tag + "&begintime=" + begin + "&endtime=" + end + "&date=" + datea;
 						// $.ajax({
 						// 	async: false,
 						// 	type: "POST",

--
Gitblit v1.10.0