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/map/mapManagement.jsp | 98 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 94 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/hxzk/map/mapManagement.jsp b/src/main/webapp/hxzk/map/mapManagement.jsp
index f090938..2872f95 100644
--- a/src/main/webapp/hxzk/map/mapManagement.jsp
+++ b/src/main/webapp/hxzk/map/mapManagement.jsp
@@ -240,6 +240,22 @@
name="pixelY_a" required="required" />
</div>
</div>
+ <div class="form-group row mb-4">
+ <label for="colFormLabelSm"
+ class="col-sm-4 col-form-label col-form-label-sm">缁忓害:</label>
+ <div class="col-sm-8">
+ <input class="form-control" type="text" id="baoliu3"
+ name="baoliu3" required="required" />
+ </div>
+ </div>
+ <div class="form-group row mb-4">
+ <label for="colFormLabelSm"
+ class="col-sm-4 col-form-label col-form-label-sm">绾害:</label>
+ <div class="col-sm-8">
+ <input class="form-control" type="text" id="baoliu4"
+ name="baoliu4" required="required" />
+ </div>
+ </div>
<div class="modal-footer"
style="margin-top: 10%; margin-left: 10%; float: left;">
<button type="submit" class="btn btn-primary" id="zengjia">淇濆瓨</button>
@@ -349,6 +365,24 @@
name="pixelY_m" required="required" />
</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="baoliu3m"
+ name="baoliu3" required="required" />
+ </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="baoliu4m"
+ name="baoliu4" required="required" />
+ </div>
+ </div>
<input class="form-control" type="hidden" id="mapId" name="mapId" />
<div class="modal-footer"
style="margin-top: 10%; margin-left: 10%; float: left;">
@@ -420,6 +454,8 @@
<th>Y0鍧愭爣</th>
<th>X鍍忕礌</th>
<th>Y鍍忕礌</th>
+ <th>缁忓害</th>
+ <th>绾害</th>
<th>鏃堕棿</th>
</tr>
</thead>
@@ -443,6 +479,8 @@
<td class="noTemp">${list.y0_width}</td>
<td class="noTemp">${list.x_Pixel}</td>
<td class="noTemp">${list.y_Pixel}</td>
+ <td class="noTemp">${list.baoliu3}</td>
+ <td class="noTemp">${list.baoliu4}</td>
<td class="noTemp">${list.addTime}</td>
</tr>
</c:forEach>
@@ -475,6 +513,7 @@
String alertq = (String) session.getAttribute("alertq");
String deleteall = (String) session.getAttribute("deleteall");
String username = (String) session.getAttribute("username");
+ String fenceq = (String) session.getAttribute("fenceq");
if (username == null || username.equals("")) {
request.getRequestDispatcher("/hxzk/login.jsp").forward(request, response);
return;
@@ -485,18 +524,51 @@
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%>">
+ <input type="hidden" name="fenceq" id="fenceq" value="<%=fenceq%>">
<!-- END MAIN CONTAINER -->
<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");
@@ -504,6 +576,8 @@
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
//console.log(superuser)
if (superuser == "璁垮") {
$("#addButton").attr("disabled", "true");
@@ -523,7 +597,10 @@
if (deleteall == "鍚�") {
$("#deleteAllButton").attr("disabled", "true");
}
- });
+ if (fenceq == "鍚�") {
+ $("#addButton").attr("disabled", "true");
+ }
+ };
$('.header-page').load('/hxzkoa/hxzk/top.html');
$('.login-page').load('/hxzkoa/hxzk/head.html');
$(".toExcel").click(function() {
@@ -599,6 +676,10 @@
+ "</td><td>"
+ data.dataList[k].y_Pixel
+ "</td><td>"
+ + data.dataList[k].baoliu3
+ + "</td><td>"
+ + data.dataList[k].baoliu4
+ + "</td><td>"
+ formatDate(data.dataList[k].addTime)
+ "</td></tr>";
}
@@ -670,6 +751,10 @@
+ "</td><td>"
+ data.dataList[k].y_Pixel
+ "</td><td>"
+ + data.dataList[k].baoliu3
+ + "</td><td>"
+ + data.dataList[k].baoliu4
+ + "</td><td>"
+ formatDate(data.dataList[k].addTime)
+ "</td></tr>";
}
@@ -812,6 +897,8 @@
$("#y0_m").val(tr.children[7].innerHTML);
$("#pixelX_m").val(tr.children[8].innerHTML);
$("#pixelY_m").val(tr.children[9].innerHTML);
+ $("#baoliu3m").val(tr.children[10].innerHTML);
+ $("#baoliu4m").val(tr.children[11].innerHTML);
return false;
}
@@ -829,6 +916,8 @@
$("#y0_m").val(tr.children[7].innerHTML);
$("#pixelX_m").val(tr.children[8].innerHTML);
$("#pixelY_m").val(tr.children[9].innerHTML);
+ $("#baoliu3m").val(tr.children[10].innerHTML);
+ $("#baoliu4m").val(tr.children[11].innerHTML);
return false;
}
@@ -851,6 +940,7 @@
});
$(".getPixel").click(function() {
var input = document.getElementById("file_a");
+ console.log(input)
if (input.files) {
//璇诲彇鍥剧墖鏁版嵁
var f = input.files[0];
--
Gitblit v1.10.0