From 741d66c00c593d4f14cd6731d3e4af6ee5c191ac Mon Sep 17 00:00:00 2001
From: 15832144755 <67030627+15832144755@users.noreply.github.com>
Date: 星期五, 23 七月 2021 10:51:51 +0800
Subject: [PATCH] 7.23
---
src/main/webapp/hxzk/fence/jiankongManagement.jsp | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 158 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/hxzk/fence/jiankongManagement.jsp b/src/main/webapp/hxzk/fence/jiankongManagement.jsp
index 2a98668..a99f0b7 100644
--- a/src/main/webapp/hxzk/fence/jiankongManagement.jsp
+++ b/src/main/webapp/hxzk/fence/jiankongManagement.jsp
@@ -105,7 +105,7 @@
<form action="form_action.asp" method="get">
<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>
+ style="font-size:12px;">鍖哄煙鍚嶇О:</label>
<div class="col-sm-10">
<input class="form-control" type="hidden" id="fencename" />
<select class="form-control form-control-lg" id="bumen_m"
@@ -131,7 +131,41 @@
<input class="form-control" type="text" id="tongdaoid" />
</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;">X鍧愭爣:</label>
+ <div class="col-sm-10">
+ <input class="form-control" type="text" id="posx" />
+ </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;">Y鍧愭爣:</label>
+ <div class="col-sm-10">
+ <input class="form-control" type="text" id="posy" />
+ </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;">Z鍧愭爣:</label>
+ <div class="col-sm-10">
+ <input class="form-control" type="text" id="posz" />
+ </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="floor" />
+ </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="name" />
+ </div>
+ </div>
<div class="modal-footer" style="margin-top:10%; margin-left:10%;float:left;">
<button type="button" class="btn btn-primary add">淇濆瓨</button>
<a>
@@ -164,7 +198,7 @@
<form action="form_action.asp" method="get">
<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>
+ style="font-size:12px;">鍖哄煙鍚嶇О:</label>
<div class="col-sm-10">
<input class="form-control" type="hidden" id="fencenameg" />
<select class="form-control form-control-lg" id="bumen_mg"
@@ -190,7 +224,41 @@
<input class="form-control" type="text" id="tongdaoidg" />
</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;">X鍧愭爣:</label>
+ <div class="col-sm-10">
+ <input class="form-control" type="text" id="posxg" />
+ </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;">Y鍧愭爣:</label>
+ <div class="col-sm-10">
+ <input class="form-control" type="text" id="posyg" />
+ </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;">Z鍧愭爣:</label>
+ <div class="col-sm-10">
+ <input class="form-control" type="text" id="poszg" />
+ </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="floorg" />
+ </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="nameg" />
+ </div>
+ </div>
<div class="modal-footer" style="margin-top:10%; margin-left:10%;float:left;">
<button type="button" class="btn btn-primary modify">淇濆瓨</button>
<a>
@@ -298,9 +366,14 @@
<tr align="center">
<th class="noExl">閫夋嫨</th>
<th>ID</th>
- <th>鍥存爮鍚嶇О</th>
+ <th>鍖哄煙鍚嶇О</th>
<th>璁惧缂栧彿</th>
<th>閫氶亾缂栧彿</th>
+ <th>X鍧愭爣</th>
+ <th>Y鍧愭爣</th>
+ <th>Z鍧愭爣</th>
+ <th>妤煎眰</th>
+ <th>鍚嶇О</th>
<th>娣诲姞鏃堕棿</th>
</tr>
</thead>
@@ -316,6 +389,11 @@
<td>${list.fencename}</td>
<td>${list.shebeiid}</td>
<td>${list.tongdaoid}</td>
+ <td>${list.posx}</td>
+ <td>${list.posy}</td>
+ <td>${list.posz}</td>
+ <td>${list.floor}</td>
+ <td>${list.name}</td>
<td>${list.addtime}</td>
</tr>
</c:forEach>
@@ -402,10 +480,15 @@
var fencename = $('#bumen_m option:selected').val();
var shebeiid = $("#shebeiid").val();
var tongdaoid = $("#tongdaoid").val();
+ var posx = $("#posx").val();
+ var posy = $("#posy").val();
+ var posz = $("#posz").val();
+ var floor = $("#floor").val();
+ var name = $("#name").val();
var reg2 = new RegExp("^[0-9][0-9]*$");
var sid = reg2.test(shebeiid);
var tid = reg2.test(tongdaoid);
- if (fencename == "" || shebeiid == "" || tongdaoid == "") {
+ if (fencename == "" || shebeiid == "" || tongdaoid == "" || posx == "" || posy == "" || posz == "" || floor == "" || name == "") {
swal('杈撳叆鏈夎', '杈撳叆涓嶈兘涓虹┖锛�', 'error'); return;
}
if ((!sid && shebeiid != "") || (!tid && tongdaoid != "")) {
@@ -419,7 +502,12 @@
data: {
fencename: fencename,
shebeiid: shebeiid,
- tongdaoid: tongdaoid
+ tongdaoid: tongdaoid,
+ posx: posx,
+ posy: posy,
+ posz: posz,
+ floor: floor,
+ name: name,
},
dataType: "json"
});
@@ -445,6 +533,11 @@
$("#bumen_mg").val(tr.children[2].innerHTML);
$("#shebeiidg").val(tr.children[3].innerHTML);
$("#tongdaoidg").val(tr.children[4].innerHTML);
+ $("#posxg").val(tr.children[5].innerHTML);
+ $("#posyg").val(tr.children[6].innerHTML);
+ $("#poszg").val(tr.children[7].innerHTML);
+ $("#floorg").val(tr.children[8].innerHTML);
+ $("#nameg").val(tr.children[9].innerHTML);
return false;
}
}
@@ -459,6 +552,11 @@
$("#bumen_mg").val(tr.children[2].innerHTML);
$("#shebeiidg").val(tr.children[3].innerHTML);
$("#tongdaoidg").val(tr.children[4].innerHTML);
+ $("#posxg").val(tr.children[5].innerHTML);
+ $("#posyg").val(tr.children[6].innerHTML);
+ $("#poszg").val(tr.children[7].innerHTML);
+ $("#floorg").val(tr.children[8].innerHTML);
+ $("#nameg").val(tr.children[9].innerHTML);
return false;
}
}
@@ -473,6 +571,11 @@
var fencename = $('#bumen_mg option:selected').val();
var shebeiid = $("#shebeiidg").val();
var tongdaoid = $("#tongdaoidg").val();
+ var posx = $("#posxg").val();
+ var posy = $("#posyg").val();
+ var posz = $("#poszg").val();
+ var floor = $("#floorg").val();
+ var name = $("#nameg").val();
for (var k in obj) {
if (obj[k].checked) {
checkVal.push(obj[k].id);
@@ -487,6 +590,11 @@
fencename: fencename,
shebeiid: shebeiid,
tongdaoid: tongdaoid,
+ posx: posx,
+ posy: posy,
+ posz: posz,
+ floor: floor,
+ name: name,
},
dataType: "json"
});
@@ -591,7 +699,7 @@
$.ajax({
async: false, //鍚屾鐨�
type: "POST",
- url: "/hxzkoa/shipinManagement_search.do",
+ url: "/hxzkoa/shipinManagement_ssearch.do",
data: {
input: input
},
@@ -622,6 +730,48 @@
}
});
});
+ // $(".namess").click(function () {
+ // var input = $("#names").val();
+ // if (input == "") {
+ // swal('杈撳叆鏈夎', '杈撳叆涓嶈兘涓虹┖锛�', 'error'); return;
+ // }
+ // if (isNaN(input)) {
+ // //swal('杈撳叆鏈夎','璇疯緭鍏ユ暟瀛楋紒','error');return;
+ // }
+ // $.ajax({
+ // async: false, //鍚屾鐨�
+ // type: "POST",
+ // url: "/hxzkoa/shipinManagement_cesearch.do",
+ // data: {
+ // input: input
+ // },
+ // dataType: "json",
+ // success: function (data) {
+ // //鎼滅储瀹屾垚鍚庡埛鏂伴〉闈�,鍙樉绀烘煡鍒扮殑閮ㄥ垎
+ // var str = "";
+ // for (var k in data.dataList) {
+ // str += "<tr align=\"center\" class=\"d\"><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;\"></label></td><td>"+data.dataList[k].id+"</td><td>"+data.dataList[k].fencename+"</td><td>"+data.dataList[k].shebeiid+"</td><td>"+data.dataList[k].tongdaoid+"</td><td>"+data.dataList[k].addtime+"</td></tr>"
+ // }
+ // $("#nr").html(str);
+ // if (!data.pageList.length == 0) {
+ // str = "";
+ // str += "<li><a href=\"javascript:page('pre');\">涓婁竴椤�</a></li>";
+ // for (var k = 0; k < data.pageList.length; k++) {
+ // str += "<li id=\"page_" + data.pageList[k] + "\"><a href=\"javascript:page('" + data.pageList[k] + "');\">" + data.pageList[k] + "</a></li>";
+ // }
+ // str += "<li><a href=\"javascript:page('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');
+ // }
+ // });
+ // });
// 瀵煎嚭琛ㄦ牸
// $(".toAllExcel").click(function () {
// window.location.href = '/hxzkoa/anchorManagement_export.do';
--
Gitblit v1.10.0