~zhitong.yu/bs/version.git

			@@ -144,7 +144,7 @@
			</svg></span>
			</div>
			<input type="text" id="search_input" class="form-control"
			placeholder="请输入标签ID" aria-label="Username"
			placeholder="请输入设备编号" aria-label="Username"
			aria-describedby="basic-addon1">
			</div>
			<button style="float: left; margin-left: 10px;" type="button"
			@@ -166,7 +166,7 @@
			<div style="width: 70px; float: left; margin-left: 10px;">
			<input type="text" id="tagida"
			class="form-control form-control-sm"
			style="font-size: 12px;" placeholder="标签id" />
			style="font-size: 12px;" placeholder="姓名" />
			</div>
			<button style="float: left; margin-left: 10px;" type="button"
			class="btn btn-secondary toAllExcel">导出Excel</button>
			@@ -203,6 +203,11 @@
			<th>UTC时间</th>
			<th>纬度</th>
			<th>经度</th>
			<th>状态</th>
			<th>精度因子</th>
			<th>卫星颗数</th>
			<th>差分时间</th>
			<th>海拔高度</th>
			<th>设备id</th>
			<th>设备电量</th>
			<th>添加时间</th>
			@@ -221,6 +226,11 @@
			<td>${list.gps_utc_time}</td>
			<td>${list.gps_weidu}</td>
			<td>${list.gsp_jingdu}</td>
			<td>${list.gps_state}</td>
			<td>${list.gps_hdop}</td>
			<td>${list.gps_num}</td>
			<td>${list.gps_chafen_time}</td>
			<td>${list.gps_haiba_gao}</td>
			<td>${list.tagid}</td>
			<td>${list.gps_power}</td>
			<td>${list.addtime}</td>
			@@ -247,8 +257,16 @@
			</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; } %>
			<% String superuser=(String) session.getAttribute("superuser"); String deleteq=(String)
			session.getAttribute("deleteq"); String alertq=(String) session.getAttribute("alertq"); String
			deleteall=(String) session.getAttribute("deleteall"); String username=(String)
			session.getAttribute("username"); if (username==null \|\| username.equals("")) {
			request.getRequestDispatcher("/hxzk/login.jsp").forward(request, response); return; } %>
			<input type="hidden" name="superuser" id="superuser" value="<%=superuser%>"> <input type="hidden"
			name="deleteq" id="deleteq" value="<%=deleteq%>"> <input type="hidden" name="alertq" id="alertq"
			value="<%=alertq%>"> <input type="hidden" name="deleteall" id="deleteall"
			value="<%=deleteall%>">
			<input type="hidden" name="xianusera" id="xianusera" value="<%=username%>">
			<!-- END MAIN CONTAINER -->
			<script>
			//执行一个laydate实例
			@@ -286,19 +304,74 @@
			</script>
			<script>
			// 页面初始化
			$(document).ready(function () {
			window.onload = function () {
			App.init();
			$.ajax({
			async: false,
			type: "POST",
			url: "/hxzkoa/getSysSetting_list.do",
			url: "/hxzkoa/getSysSetting_list2.do",
			data: {},
			dataType: "json",
			success: function (data) { /* title = data[0].title; document.title = title; */
			success: function (data) {
			/* title = data[0].title; document.title = title; */
			if (data.dataList2[0].label == 0) {
			$("#labela").css({ 'display': 'none' });
			};
			if (data.dataList2[0].achor == 0) {
			$("#anchora").css({ 'display': 'none' });
			};
			if (data.dataList2[0].gps == 0) {
			$("#gpsa").css({ 'display': 'none' });
			};
			if (data.dataList2[0].fence == 0) {
			$("#fencea").css({ 'display': 'none' });
			};
			if (data.dataList2[0].warning == 0) {
			$("#warninga").css({ 'display': 'none' });
			};
			if (data.dataList2[0].history == 0) {
			$("#historya").css({ 'display': 'none' });
			};
			if (data.dataList2[0].attendance == 0) {
			$("#attendancea").css({ 'display': 'none' });
			};
			if (data.dataList2[0].basiclnfo == 0) {
			$("#basiclnfoa").css({ 'display': 'none' });
			};
			if (data.dataList2[0].video == 0) {
			$("#videoa").css({ 'display': 'none' });
			};
			if (data.dataList2[0].gas == 0) {
			$("#gasa").css({ 'display': 'none' });
			};
			},
			});
			$("#page_1").addClass("active");
			});
			var superuser = document.getElementById("superuser").value;
			var deleteq = document.getElementById("deleteq").value;
			var alertq = document.getElementById("alertq").value;
			var deleteall = document.getElementById("deleteall").value;
			document.getElementById("xianuser").innerHTML = document.getElementById("xianusera").value
			//console.log(superuser)
			if (superuser == "访客") {
			$("#addButton").attr("disabled", "true");
			$("#deleteButton").attr("disabled", "true");
			$("#modifyButton").attr("disabled", "true");
			$("#deleteAllButton").attr("disabled", "true");
			$("#modifyAllButton").attr("disabled", "true");
			$("#importButton").attr("disabled", "true");
			}
			if (deleteq == "否") {
			$("#deleteButton").attr("disabled", "true");
			}
			if (alertq == "否") {
			$("#modifyButton").attr("disabled", "true");
			$("#modifyAllButton").attr("disabled", "true");
			}
			if (deleteall == "否") {
			$("#deleteAllButton").attr("disabled", "true");
			}
			};
			// 加载head复用页面
			$('.header-page').load('/hxzkoa/hxzk/top.html');
			$('.login-page').load('/hxzkoa/hxzk/head.html');
			@@ -342,6 +415,16 @@
			+ "</td><td>"
			+ data.dataList[k].gsp_jingdu
			+ "</td><td>"
			+ data.dataList[k].gps_state
			+ "</td><td>"
			+ data.dataList[k].gps_hdop
			+ "</td><td>"
			+ data.dataList[k].gps_num
			+ "</td><td>"
			+ data.dataList[k].gps_chafen_time
			+ "</td><td>"
			+ data.dataList[k].gps_haiba_gao
			+ "</td><td>"
			+ data.dataList[k].tagid
			+ "</td><td>"
			+ data.dataList[k].gps_power
			@@ -352,15 +435,16 @@
			$("#nr").html(str);
			if (!data.pageList.length == 0) {
			str = "";
			str += "<li><a href=\"javascript:page('pre');\">上一页</a></li>";
			str += "<li><a href=\"javascript:page2('pre');\">上一页</a></li>";
			for (var k = 0; k < data.pageList.length; k++) {
			str += "<li id=\"page_" + data.pageList[k] + "\"><a href=\"javascript:page('"
			str += "<li id=\"page_" + data.pageList[k] + "\"><a href=\"javascript:page2('"
			+ data.pageList[k]
			+ "');\">"
			+ data.pageList[k]
			+ "</a></li>";
			}
			str += "<li><a href=\"javascript:page('next');\">下一页</a></li>";
			str += "<li><a href=\"javascript:page2('next');\">下一页</a></li>";
			console.log(str)
			$("#pageListId").html(str);
			}
			$("#pageListId>li.active")
			@@ -549,6 +633,16 @@
			+ "</td><td>"
			+ data.dataList[k].gsp_jingdu
			+ "</td><td>"
			+ data.dataList[k].gps_state
			+ "</td><td>"
			+ data.dataList[k].gps_hdop
			+ "</td><td>"
			+ data.dataList[k].gps_num
			+ "</td><td>"
			+ data.dataList[k].gps_chafen_time
			+ "</td><td>"
			+ data.dataList[k].gps_haiba_gao
			+ "</td><td>"
			+ data.dataList[k].tagid
			+ "</td><td>"
			+ data.dataList[k].gps_power
			@@ -567,7 +661,6 @@
			+ data.pageList[k] + "</a></li>";
			}
			str += "<li><a href=\"javascript:page('next');\">下一页</a></li>";
			console.log(str)
			$("#pageListId").html(str);
			}
			$("#pageListId>li.active").removeClass("active");
			@@ -579,6 +672,73 @@
			}
			});
			}
			// 分页跳转2
			function page2(page) {
			var curPage = $("#curPage").val();
			var date = $("#dateList").val();
			var input = $("#search_input").val();
			$.ajax({
			async: false, //同步的
			type: "POST",
			url: "/hxzkoa/historicalgpsLocation_search2.do",
			data: {
			page: page,
			curPage: curPage,
			date: date,
			input: input
			},
			dataType: "json",
			success: function (data) {
			var str = "";
			for (var k in data.dataList) {
			str += "<tr align=\"center\"><td class=\"noExl custom-control custom-checkbox\"><input type=\"checkbox\" class=\"custom-control-input\" id=" + data.dataList[k].id + " name=\"selectIds\"><label class=\"custom-control-label\" for=" + data.dataList[k].id + " style=\"position:raletive;left:20px;bottom:5px;\"></label></td><td>"
			+ data.dataList[k].id
			+ "</td><td>"
			+ data.dataList[k].gps_utc_time
			+ "</td><td>"
			+ data.dataList[k].gps_weidu
			+ "</td><td>"
			+ data.dataList[k].gsp_jingdu
			+ "</td><td>"
			+ data.dataList[k].gps_state
			+ "</td><td>"
			+ data.dataList[k].gps_hdop
			+ "</td><td>"
			+ data.dataList[k].gps_num
			+ "</td><td>"
			+ data.dataList[k].gps_chafen_time
			+ "</td><td>"
			+ data.dataList[k].gps_haiba_gao
			+ "</td><td>"
			+ data.dataList[k].tagid
			+ "</td><td>"
			+ data.dataList[k].gps_power
			+ "</td><td>"
			+ data.dataList[k].addtime
			+ "</td></tr>";
			}
			$("#nr").html(str);
			if (!data.pageList.length == 0) {
			str = "";
			str += "<li><a href=\"javascript:page2('pre');\">上一页</a></li>";
			for (var k = 0; k < data.pageList.length; k++) {
			str += "<li id=\"page_" + data.pageList[k] + "\"><a href=\"javascript:page2('"
			+ data.pageList[k]
			+ "');\">"
			+ data.pageList[k] + "</a></li>";
			}
			str += "<li><a href=\"javascript:page2('next');\">下一页</a></li>";
			$("#pageListId").html(str);
			}
			$("#pageListId>li.active").removeClass("active");
			$("#page_" + data.curPage).addClass("active");
			$("#curPage").val(data.curPage);
			},
			error: function () {
			//console.log('error');
			}
			});
			}
			$(".table tbody").on('click', 'tr', function (e) {
			//console.log(e.target.type)
			if (e.target.type != 'checkbox') {