From 52cffc4ab8e9787a6f233295502c7c9788dddae1 Mon Sep 17 00:00:00 2001
From: fxl <473369119@qq.com>
Date: 星期二, 07 三月 2023 10:45:17 +0800
Subject: [PATCH] 3.7

---
 src/main/webapp/hxzk/label/labelManagement.jsp |  308 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 262 insertions(+), 46 deletions(-)

diff --git a/src/main/webapp/hxzk/label/labelManagement.jsp b/src/main/webapp/hxzk/label/labelManagement.jsp
index e93c3cd..6f845d6 100644
--- a/src/main/webapp/hxzk/label/labelManagement.jsp
+++ b/src/main/webapp/hxzk/label/labelManagement.jsp
@@ -158,6 +158,25 @@
 										<div class="form-group row  mb-4">
 											<label for="colFormLabelSm"
 												class="col-sm-2 col-form-label col-form-label-sm"
+												style="font-size: 12px;">鏍囩绫诲瀷:</label>
+											<div class="col-sm-10">
+												<select class="form-control form-control-lg" id="type"
+													style="font-size: 15px;">
+													<option value="绯荤粺榛樿">绯荤粺榛樿</option>
+													<option value="铻嶅悎缁堢">铻嶅悎缁堢</option>
+													<option value="蹇冪巼甯﹀睆">蹇冪巼甯﹀睆</option>
+													<option value="杞﹁浇甯﹀睆">杞﹁浇甯﹀睆</option>
+													<option value="杞﹁浇鏃犲睆">杞﹁浇鏃犲睆</option>
+													<option value="鐗╄祫鏍囩">鐗╄祫鏍囩</option>
+													<option value="宸ョ墝鏍囩">宸ョ墝鏍囩</option>
+													<option value="瀹夊叏甯芥爣绛�">瀹夊叏甯芥爣绛�</option>
+													<option value="URT+CO">URT+CO</option>
+												</select>
+											</div>
+										</div>
+										<div class="form-group row  mb-4">
+											<label for="colFormLabelSm"
+												class="col-sm-2 col-form-label col-form-label-sm"
 												style="font-size: 12px;">浣╂埓楂樺害:</label>
 											<div class="col-sm-10">
 												<input class="form-control" type="text" id="gaodu_a" />
@@ -177,12 +196,14 @@
 												style="font-size: 12px;">瀹氫綅棰戠巼:</label>
 											<div class="col-sm-10">
 												<select class="form-control form-control-lg" id="pinglv_a">
-													<option value="1">1</option>
+													<option value="0.1">0.1</option>
+													<option value="1" selected>1</option>
 													<option value="2">2</option>
 													<option value="5">5</option>
 													<option value="10">10</option>
 													<option value="20">20</option>
 												</select>
+												<!-- <input class="form-control" type="text" id="pinglv_a" /> -->
 											</div>
 										</div>
 										<div class="modal-footer"
@@ -237,6 +258,25 @@
 										<div class="form-group row  mb-4">
 											<label for="colFormLabelSm"
 												class="col-sm-2 col-form-label col-form-label-sm"
+												style="font-size: 12px;">鏍囩绫诲瀷:</label>
+											<div class="col-sm-10">
+												<select class="form-control form-control-lg" id="typeg"
+													style="font-size: 15px;">
+													<option value="绯荤粺榛樿">绯荤粺榛樿</option>
+													<option value="铻嶅悎缁堢">铻嶅悎缁堢</option>
+													<option value="蹇冪巼甯﹀睆">蹇冪巼甯﹀睆</option>
+													<option value="杞﹁浇甯﹀睆">杞﹁浇甯﹀睆</option>
+													<option value="杞﹁浇鏃犲睆">杞﹁浇鏃犲睆</option>
+													<option value="鐗╄祫鏍囩">鐗╄祫鏍囩</option>
+													<option value="宸ョ墝鏍囩">宸ョ墝鏍囩</option>
+													<option value="瀹夊叏甯芥爣绛�">瀹夊叏甯芥爣绛�</option>
+													<option value="URT+CO">URT+CO</option>
+												</select>
+											</div>
+										</div>
+										<div class="form-group row  mb-4">
+											<label for="colFormLabelSm"
+												class="col-sm-2 col-form-label col-form-label-sm"
 												style="font-size: 12px;">浣╂埓楂樺害:</label>
 											<div class="col-sm-10">
 												<input class="form-control" type="text" id="gaodu_m" />
@@ -256,12 +296,14 @@
 												style="font-size: 12px;">瀹氫綅棰戠巼:</label>
 											<div class="col-sm-10">
 												<select class="form-control form-control-lg" id="pinglv_m">
+													<option value="0.1">0.1</option>
 													<option value="1">1</option>
 													<option value="2">2</option>
 													<option value="5">5</option>
 													<option value="10">10</option>
 													<option value="20">20</option>
 												</select>
+												<!-- <input class="form-control" type="text" id="pinglv_m" /> -->
 											</div>
 										</div>
 										<div class="modal-footer"
@@ -337,12 +379,14 @@
 												style="font-size: 12px;">瀹氫綅棰戠巼:</label>
 											<div class="col-sm-10">
 												<select class="form-control form-control-lg" id="pinglv_ma">
+													<option value="0.1">0.1</option>
 													<option value="1">1</option>
 													<option value="2">2</option>
 													<option value="5">5</option>
 													<option value="10">10</option>
 													<option value="20">20</option>
 												</select>
+												<!-- <input class="form-control" type="text" id="pinglv_ma" /> -->
 											</div>
 										</div>
 										<div class="modal-footer"
@@ -423,8 +467,9 @@
 											<select class="form-control form-control-lg" id="tagId_ms"
 												style="float: left; width: 60%;">
 												<option value="ALL">鎵�鏈夋爣绛�</option>
-												<option value="1048">1048</option>
-												<option value="1099">1099</option>
+												<c:forEach items="${labelManagementListaa}" var="label">
+													<option value="${label.tag_id}">${label.tag_id}</option>
+												</c:forEach>
 											</select>
 										</div>
 									</div>
@@ -488,12 +533,15 @@
 
 											<select class="form-control form-control-lg" id="pinglv_ms"
 												style="float: left; width: 40%;">
+												<option value="0.1">0.1</option>
 												<option value="1">1</option>
 												<option value="2">2</option>
 												<option value="5">5</option>
 												<option value="10">10</option>
 												<option value="20">20</option>
 											</select>
+											<!-- <input class="form-control" type="text" id="pinglv_ms"
+												style="float: left; width: 40%;" /> -->
 											<button type="button" class="btn btn-primary"
 												style="float: left; margin-left: 5px;"
 												onclick="sendTag('5')">淇敼棰戠巼</button>
@@ -587,31 +635,73 @@
 																</svg></span>
 														</div>
 														<input type="text" id="search_input" class="form-control"
-															placeholder="璇疯緭鍏ユ爣绛綢D" aria-label="Username"
+															placeholder="璇疯緭鍏ョ紪鍙锋垨濮撳悕" aria-label="Username"
 															aria-describedby="basic-addon1">
 													</div>
-													<button type="button" class="btn btn-secondary reset">鍒锋柊</button>
-													<button type="button" class="btn btn-secondary" data-toggle="modal"
-														data-target=".addNew" id="addButton">鏂板</button>
-													<button type="button" class="btn btn-secondary initModify"
-														data-toggle="modal" data-target=".modifyNew"
-														id="modifyButton">淇敼</button>
-													<button type="button" class="btn btn-secondary delete"
-														id="deleteButton">鍒犻櫎</button>
-													<button type="button" class="btn btn-secondary deleteAll"
-														id="deleteAllButton">鍏ㄩ儴鍒犻櫎</button>
-													<button type="button" class="btn btn-secondary" data-toggle="modal"
-														data-target=".modifyAllNew" id="modifyAllButton">鍏ㄩ儴淇敼</button>
-													<!-- 											<input type="file" class="btn btn-secondary" id="importXls" style="width:15%;"> -->
-													<!-- 											<button type="button" class="btn btn-secondary importXls" id="importButton">瀵煎叆鏍囩</button> -->
-													<button type="button" class="btn btn-secondary" data-toggle="modal"
-														data-target=".importLable" id="importButton">瀵煎叆鏍囩</button>
-													<button type="button"
-														class="btn btn-secondary toAllExcel">瀵煎嚭琛ㄦ牸</button>
-													<button type="button"
-														class="btn btn-secondary toExcel">涓嬭浇妯℃澘</button>
-													<button type="button" class="btn btn-secondary moreSettingInit"
-														data-toggle="modal" data-target=".moreSetting">鏇村璁剧疆</button>
+													<div style="width: 100px; float: left; margin-right: 10px;">
+														<select class="form-control form-control-lg" id="shaileixing"
+															style="font-size: 15px;" onchange="shaicha()">
+															<option value="鍏ㄩ儴">鎵�鏈夌被鍨�</option>
+															<!--<c:forEach items="${leixing}" var="list">
+																<option value="${list}">${list}</option>
+															</c:forEach>-->
+															<option value="浜哄憳鏍囩">浜哄憳鏍囩</option>
+															<option value="杞﹁締鏍囩">杞﹁締鏍囩</option>
+															<option value="鐗╄祫鏍囩">鐗╄祫鏍囩</option>
+														</select>
+													</div>
+													<div style="width: 100px; float: left; margin-right: 10px;">
+														<select class="form-control form-control-lg" id="shaibumen"
+															style="font-size: 15px;" onchange="shaicha()">
+															<option value="鍏ㄩ儴">鎵�鏈夐儴闂�</option>
+															<c:forEach items="${bumen}" var="list">
+																<option value="${list}">${list}</option>
+															</c:forEach>
+														</select>
+													</div>
+													<div style="float: left;">
+														<button type="button"
+															class="btn btn-secondary reset">鍒锋柊</button>
+														<button type="button" class="btn btn-secondary"
+															data-toggle="modal" data-target=".addNew"
+															id="addButton">鏂板</button>
+														<button type="button" class="btn btn-secondary initModify"
+															data-toggle="modal" data-target=".modifyNew"
+															id="modifyButton">淇敼</button>
+														<button type="button" class="btn btn-secondary delete"
+															id="deleteButton">鍒犻櫎</button>
+														<button type="button" class="btn btn-secondary deleteAll"
+															id="deleteAllButton">鍏ㄩ儴鍒犻櫎</button>
+														<button type="button" class="btn btn-secondary"
+															data-toggle="modal" data-target=".modifyAllNew"
+															id="modifyAllButton">鍏ㄩ儴淇敼</button>
+														<!-- 											<input type="file" class="btn btn-secondary" id="importXls" style="width:15%;"> -->
+														<!-- 											<button type="button" class="btn btn-secondary importXls" id="importButton">瀵煎叆鏍囩</button> -->
+														<button type="button" class="btn btn-secondary"
+															data-toggle="modal" data-target=".importLable"
+															id="importButton">瀵煎叆鏍囩</button>
+														<button type="button"
+															class="btn btn-secondary toAllExcel">瀵煎嚭琛ㄦ牸</button>
+														<button type="button"
+															class="btn btn-secondary toExcel">涓嬭浇妯℃澘</button>
+														<button type="button" class="btn btn-secondary moreSettingInit"
+															data-toggle="modal" data-target=".moreSetting">鏇村璁剧疆</button>
+													</div>
+													<div style="float: left;margin-left: 20px;width: 200px;">
+														<div style="width: 50%;float: left;">
+															<span style="color: #bfc9d4;height: 40%;">浜哄憳鏍囩:${tongji[0]} 涓�</span>
+														</div>
+														<div style="width: 50%;float: left;">
+															<span style="color: #bfc9d4;height: 40%;">杞﹁浇鏍囩:${tongji[1]} 涓�</span>
+														</div>
+														<br>
+														<div style="width: 50%;float: left;">
+															<span style="color: #bfc9d4;height: 40%;">鐗╄祫鏍囩:${tongji[2]} 涓�</span>
+														</div>
+														<div style="width: 50%;float: left;">
+															<span style="color: #bfc9d4;height: 40%;">鏈粦瀹�:${tongji[3]} 涓�</span>
+														</div>
+													</div>
 												</div>
 												<thead>
 													<tr align="center">
@@ -624,6 +714,7 @@
 														<th>閫熷害闄愬埗cm/s</th>
 														<th>瀹氫綅棰戠巼锛圚Z锛�</th>
 														<th>鐗堟湰</th>
+														<th>绫诲瀷</th>
 														<th>娣诲姞鏃堕棿</th>
 													</tr>
 												</thead>
@@ -650,11 +741,22 @@
 															</td>
 															<td>${list.tag_id}</td>
 															<td>${list.state}</td>
-															<td>${list.power}</td>
+															<%-- <td>${list.power}</td> --%>
+															<td>
+															<c:choose>
+                                                			<c:when test="${list.power == -1}">
+                                           				    鏈煡
+                                             			 	</c:when>
+                                            			    <c:otherwise>
+                                                		    ${list.power}%
+                                                		    </c:otherwise>
+                                                		    </c:choose>
+														    </td>
 															<td>${list.gaodu}</td>
 															<td>${list.sudu}</td>
 															<td>${list.pinglv}</td>
 															<td>${list.version}</td>
+															<td>${list.type}</td>
 															<td>${list.addtime}</td>
 														</tr>
 													</c:forEach>
@@ -681,22 +783,65 @@
 					<% 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("")) {
+						session.getAttribute("username"); String fenceq=(String) session.getAttribute("fenceq"); 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%>">
+							id="deleteall" value="<%=deleteall%>"><input type="hidden" name="xianusera" id="xianusera" value="<%=username%>">
+							<input type="hidden" name="fenceq" id="fenceq" value="<%=fenceq%>">
 						<!-- END MAIN CONTAINER -->
 						<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;  */ }, });
+							window.onload = function () {
+								App.init();
+								$.ajax({
+									async: false,
+									type: "POST",
+									url: "/hxzkoa/getSysSetting_list2.do",
+									data: {},
+									dataType: "json",
+									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;
+								var fenceq = document.getElementById("fenceq").value;
+								document.getElementById("xianuser").innerHTML=document.getElementById("xianusera").value
 								if (superuser == "璁垮") {
 									$("#addButton").attr("disabled", "true");
 									$("#deleteButton").attr("disabled", "true");
@@ -715,9 +860,13 @@
 								if (deleteall == "鍚�") {
 									$("#deleteAllButton").attr("disabled", "true");
 								}
-							});
+								if (fenceq == "鍚�") {
+									$("#addButton").attr("disabled", "true");
+								}
+							}
 							// 鍔犺浇head澶嶇敤椤甸潰
-							$('.header-page').load('/hxzkoa/hxzk/top.html'); $('.login-page').load('/hxzkoa/hxzk/head.html');
+							$('.header-page').load('/hxzkoa/hxzk/top.html');
+							$('.login-page').load('/hxzkoa/hxzk/head.html');
 							// 鍒锋柊鍔熻兘
 							$(".reset").click(function () {
 								setTimeout("window.location.reload()", 1000);
@@ -749,7 +898,15 @@
 								var state = $("#state_a").val();
 								var gaodu = $("#gaodu_a").val();
 								var sudu = $("#sudu_a").val();
-								var pinglv = $('#pinglv_a option:selected').val();
+								// var pinglv = $('#pinglv_a option:selected').val();
+								var pinglv = $('#pinglv_a').val();
+								var type = $("#type").val();
+								if (pinglv == "") {
+									pinglv = 1
+								}
+								// if (pinglv < 0.1 || pinglv > 20) {
+								// 	swal('杈撳叆鏈夎', '棰戠巼蹇呴』鍦�0.1-20涔嬮棿锛�', 'error'); return;
+								// }
 								if (gaodu != "" && isNaN(gaodu)) {
 									swal('杈撳叆鏈夎', '楂樺害涓烘暟瀛楋紒', 'error'); return;
 								} else if (String(gaodu).indexOf(".") > -1) {
@@ -775,7 +932,8 @@
 										state: state,
 										gaodu: gaodu,
 										sudu: sudu,
-										pinglv: pinglv
+										pinglv: pinglv,
+										type: type
 									},
 									dataType: "json"
 								});
@@ -803,9 +961,9 @@
 											$("#gaodu_m").val(tr.children[5].innerHTML);
 											$("#sudu_m").val(tr.children[6].innerHTML);
 											$("#pinglv_m").val(tr.children[7].innerHTML);
+											$("#typeg").val(tr.children[9].innerHTML);
 											return false;
 										}
-
 									}
 								);
 								if (!state) {
@@ -820,9 +978,9 @@
 												$("#gaodu_m").val(tr.children[5].innerHTML);
 												$("#sudu_m").val(tr.children[6].innerHTML);
 												$("#pinglv_m").val(tr.children[7].innerHTML);
+												$("#typeg").val(tr.children[9].innerHTML);
 												return false;
 											}
-
 										}
 									);
 									alert("璇烽�変腑涓�鏉℃暟鎹繘琛屼慨鏀�,褰撳墠榛樿绗竴鏉★紒");
@@ -834,7 +992,11 @@
 								var state = $("#state_m").val();
 								var gaodu = $("#gaodu_m").val();
 								var sudu = $("#sudu_m").val();
-								var pinglv = $('#pinglv_m option:selected').val();
+								var pinglv = $('#pinglv_m').val();
+								var type = $("#typeg").val();
+								// if (pinglv < 0.1 || pinglv > 20) {
+								// 	swal('杈撳叆鏈夎', '棰戠巼蹇呴』鍦�0.1-20涔嬮棿锛�', 'error'); return;
+								// }
 								if (isNaN(gaodu)) {
 									swal('杈撳叆鏈夎', '楂樺害涓烘暟瀛楋紒', 'error'); return;
 								}
@@ -856,7 +1018,8 @@
 										state: state,
 										gaodu: gaodu,
 										sudu: sudu,
-										pinglv: pinglv
+										pinglv: pinglv,
+										type: type
 									},
 									dataType: "json"
 								});
@@ -874,7 +1037,10 @@
 							$(".modifyAll").click(function () {
 								var gaodu = $("#gaodu_ma").val();
 								var sudu = $("#sudu_ma").val();
-								var pinglv = $('#pinglv_ma option:selected').val();
+								var pinglv = $('#pinglv_ma').val();
+								// if (pinglv < 0.1 || pinglv > 20) {
+								// 	swal('杈撳叆鏈夎', '棰戠巼蹇呴』鍦�0.1-20涔嬮棿锛�', 'error'); return;
+								// }
 								if (isNaN(gaodu)) {
 									swal('杈撳叆鏈夎', '楂樺害涓烘暟瀛楋紒', 'error'); return;
 								}
@@ -1014,10 +1180,15 @@
 										//鎼滅储瀹屾垚鍚庡埛鏂伴〉闈�,鍙樉绀烘煡鍒扮殑閮ㄥ垎
 										var str = "";
 										for (var k in data.dataList) {
-											if (data.dataList[k].status == '0') {
-												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\"><input type=\"hidden\" class=\"custom-control-input\" value=" + data.dataList[k].tag_id + " name=\"tagids\"><label class=\"custom-control-label\" for=" + data.dataList[k].id + " style=\"position:raletive;left:20px;bottom:5px;\"></label></td><td class=\"noExl\">" + "<img src=\"hxzk/image/icon/tagoff.png\"/>" + "</td><td>" + data.dataList[k].tag_id + "</td><td>" + data.dataList[k].state + "</td><td>" + data.dataList[k].power + "</td><td>" + data.dataList[k].gaodu + "</td><td>" + data.dataList[k].sudu + "</td><td>" + data.dataList[k].pinglv + "</td><td>" + data.dataList[k].version + "</td><td>" + data.dataList[k].addtime + "</td></tr>";
+											if(data.dataList[k].power == -1){
+												data.dataList[k].power = "鏈煡"
 											} else {
-												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\"><input type=\"hidden\" class=\"custom-control-input\" value=" + data.dataList[k].tag_id + " name=\"tagids\"><label class=\"custom-control-label\" for=" + data.dataList[k].id + " style=\"position:raletive;left:20px;bottom:5px;\"></label></td><td class=\"noExl\">" + "<img src=\"hxzk/image/icon/tagon.png\"/>" + "</td><td>" + data.dataList[k].tag_id + "</td><td>" + data.dataList[k].state + "</td><td>" + data.dataList[k].power + "</td><td>" + data.dataList[k].gaodu + "</td><td>" + data.dataList[k].sudu + "</td><td>" + data.dataList[k].pinglv + "</td><td>" + data.dataList[k].version + "</td><td>" + data.dataList[k].addtime + "</td></tr>";
+												data.dataList[k].power = data.dataList[k].power+"%"
+											}
+											if (data.dataList[k].status == '0') {
+												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\"><input type=\"hidden\" class=\"custom-control-input\" value=" + data.dataList[k].tag_id + " name=\"tagids\"><label class=\"custom-control-label\" for=" + data.dataList[k].id + " style=\"position:raletive;left:20px;bottom:5px;\"></label></td><td class=\"noExl\">" + "<img src=\"hxzk/image/icon/tagoff.png\"/>" + "</td><td>" + data.dataList[k].tag_id + "</td><td>" + data.dataList[k].state + "</td><td>" + data.dataList[k].power + "</td><td>" + data.dataList[k].gaodu + "</td><td>" + data.dataList[k].sudu + "</td><td>" + data.dataList[k].pinglv + "</td><td>" + data.dataList[k].version + "</td><td>" + data.dataList[k].type + "</td><td>" + data.dataList[k].addtime + "</td></tr>";
+											} else {
+												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\"><input type=\"hidden\" class=\"custom-control-input\" value=" + data.dataList[k].tag_id + " name=\"tagids\"><label class=\"custom-control-label\" for=" + data.dataList[k].id + " style=\"position:raletive;left:20px;bottom:5px;\"></label></td><td class=\"noExl\">" + "<img src=\"hxzk/image/icon/tagon.png\"/>" + "</td><td>" + data.dataList[k].tag_id + "</td><td>" + data.dataList[k].state + "</td><td>" + data.dataList[k].power + "</td><td>" + data.dataList[k].gaodu + "</td><td>" + data.dataList[k].sudu + "</td><td>" + data.dataList[k].pinglv + "</td><td>" + data.dataList[k].version + "</td><td>" + data.dataList[k].type + "</td><td>" + data.dataList[k].addtime + "</td></tr>";
 											}
 										}
 										$("#nr").html(str);
@@ -1127,6 +1298,9 @@
 								var gongfang = $("#gonglv_ms").val();
 								var zhendongT_ms = $("#zhendongT_ms").val();
 								var pinglv = $("#pinglv_ms").val();
+								// if (pinglv < 0.1 || pinglv > 20) {
+								// 	swal('杈撳叆鏈夎', '棰戠巼蹇呴』鍦�0.1-20涔嬮棿锛�', 'error'); return;
+								// }
 								var imu = $("#jiasu_ms").val();
 								var jignzhiT_ms = $("#jignzhiT_ms").val();
 								var dong_status = $("#zhendong_ms").val();
@@ -1217,6 +1391,9 @@
 								} else if (tag == '5') {
 									// 5.淇敼鏍囩鐨勯鐜�
 									hz = $("#pinglv_ms").val();
+									// if (hz < 0.1 || hz > 20) {
+									// 	swal('杈撳叆鏈夎', '棰戠巼蹇呴』鍦�0.1-20涔嬮棿锛�', 'error'); return;
+									// }
 									$.ajax({
 										async: false, //鍚屾鐨�
 										type: "POST",
@@ -1283,10 +1460,15 @@
 									success: function (data) {
 										var str = "";
 										for (var k in data.dataList) {
-											if (data.dataList[k].status == '0') {
-												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\"><input type=\"hidden\" class=\"custom-control-input\" value=" + data.dataList[k].tag_id + " name=\"tagids\"><label class=\"custom-control-label\" for=" + data.dataList[k].id + " style=\"position:raletive;left:20px;bottom:5px;\"></label></td><td class=\"noExl\">" + "<img src=\"hxzk/image/icon/tagoff.png\"/>" + "</td><td>" + data.dataList[k].tag_id + "</td><td>" + data.dataList[k].state + "</td><td>" + data.dataList[k].power + "</td><td>" + data.dataList[k].gaodu + "</td><td>" + data.dataList[k].sudu + "</td><td>" + data.dataList[k].pinglv + "</td><td>" + data.dataList[k].version + "</td><td>" + data.dataList[k].addtime + "</td></tr>";
+											if(data.dataList[k].power == -1){
+												data.dataList[k].power = "鏈煡"
 											} else {
-												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\"><input type=\"hidden\" class=\"custom-control-input\" value=" + data.dataList[k].tag_id + " name=\"tagids\"><label class=\"custom-control-label\" for=" + data.dataList[k].id + " style=\"position:raletive;left:20px;bottom:5px;\"></label></td><td class=\"noExl\">" + "<img src=\"hxzk/image/icon/tagon.png\"/>" + "</td><td>" + data.dataList[k].tag_id + "</td><td>" + data.dataList[k].state + "</td><td>" + data.dataList[k].power + "</td><td>" + data.dataList[k].gaodu + "</td><td>" + data.dataList[k].sudu + "</td><td>" + data.dataList[k].pinglv + "</td><td>" + data.dataList[k].version + "</td><td>" + data.dataList[k].addtime + "</td></tr>";
+												data.dataList[k].power = data.dataList[k].power+"%"
+											}
+											if (data.dataList[k].status == '0') {
+												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\"><input type=\"hidden\" class=\"custom-control-input\" value=" + data.dataList[k].tag_id + " name=\"tagids\"><label class=\"custom-control-label\" for=" + data.dataList[k].id + " style=\"position:raletive;left:20px;bottom:5px;\"></label></td><td class=\"noExl\">" + "<img src=\"hxzk/image/icon/tagoff.png\"/>" + "</td><td>" + data.dataList[k].tag_id + "</td><td>" + data.dataList[k].state + "</td><td>" + data.dataList[k].power + "</td><td>" + data.dataList[k].gaodu + "</td><td>" + data.dataList[k].sudu + "</td><td>" + data.dataList[k].pinglv + "</td><td>" + data.dataList[k].version + "</td><td>" + data.dataList[k].type + "</td><td>" + data.dataList[k].addtime + "</td></tr>";
+											} else {
+												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\"><input type=\"hidden\" class=\"custom-control-input\" value=" + data.dataList[k].tag_id + " name=\"tagids\"><label class=\"custom-control-label\" for=" + data.dataList[k].id + " style=\"position:raletive;left:20px;bottom:5px;\"></label></td><td class=\"noExl\">" + "<img src=\"hxzk/image/icon/tagon.png\"/>" + "</td><td>" + data.dataList[k].tag_id + "</td><td>" + data.dataList[k].state + "</td><td>" + data.dataList[k].power + "</td><td>" + data.dataList[k].gaodu + "</td><td>" + data.dataList[k].sudu + "</td><td>" + data.dataList[k].pinglv + "</td><td>" + data.dataList[k].version + "</td><td>" + data.dataList[k].type + "</td><td>" + data.dataList[k].addtime + "</td></tr>";
 											}
 										}
 										$("#nr").html(str);
@@ -1309,6 +1491,40 @@
 								});
 							}
 
+							function shaicha() {
+								var leixing = $("#shaileixing").val();
+								var bumen = $("#shaibumen").val();
+								if (leixing == '鍏ㄩ儴' && bumen == '鍏ㄩ儴') {
+									window.location.reload();
+								} else {
+									$.ajax({
+										url: 'shailabel.do',
+										type: 'POST',
+										dataType: 'JSON',
+										data: {
+											leixing: leixing,
+											bumen: bumen
+										},
+										success: function (data) {
+											var str = "";
+											for (var k in data.dataList) {
+												if(data.dataList[k].power == -1){
+													data.dataList[k].power = "鏈煡"
+												} else {
+													data.dataList[k].power = data.dataList[k].power+"%"
+												}
+												if (data.dataList[k].status == '0') {
+													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\"><input type=\"hidden\" class=\"custom-control-input\" value=" + data.dataList[k].tag_id + " name=\"tagids\"><label class=\"custom-control-label\" for=" + data.dataList[k].id + " style=\"position:raletive;left:20px;bottom:5px;\"></label></td><td class=\"noExl\">" + "<img src=\"hxzk/image/icon/tagoff.png\"/>" + "</td><td>" + data.dataList[k].tag_id + "</td><td>" + data.dataList[k].state + "</td><td>" + data.dataList[k].power + "</td><td>" + data.dataList[k].gaodu + "</td><td>" + data.dataList[k].sudu + "</td><td>" + data.dataList[k].pinglv + "</td><td>" + data.dataList[k].version + "</td><td>" + data.dataList[k].type + "</td><td>" + data.dataList[k].addtime + "</td></tr>";
+												} else {
+													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\"><input type=\"hidden\" class=\"custom-control-input\" value=" + data.dataList[k].tag_id + " name=\"tagids\"><label class=\"custom-control-label\" for=" + data.dataList[k].id + " style=\"position:raletive;left:20px;bottom:5px;\"></label></td><td class=\"noExl\">" + "<img src=\"hxzk/image/icon/tagon.png\"/>" + "</td><td>" + data.dataList[k].tag_id + "</td><td>" + data.dataList[k].state + "</td><td>" + data.dataList[k].power + "</td><td>" + data.dataList[k].gaodu + "</td><td>" + data.dataList[k].sudu + "</td><td>" + data.dataList[k].pinglv + "</td><td>" + data.dataList[k].version + "</td><td>" + data.dataList[k].type + "</td><td>" + data.dataList[k].addtime + "</td></tr>";
+												}
+											}
+											$("#nr").html(str);
+										}
+									})
+								}
+							}
+
 							$(".table tbody").on('click', 'tr', function (e) {
 								if (e.target.type != 'checkbox') {
 									if ($(this).find(":checkbox").prop("checked") == true) {

--
Gitblit v1.10.0