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/realTimePower.jsp | 68 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/hxzk/label/realTimePower.jsp b/src/main/webapp/hxzk/label/realTimePower.jsp
index 4881a15..298bf3b 100644
--- a/src/main/webapp/hxzk/label/realTimePower.jsp
+++ b/src/main/webapp/hxzk/label/realTimePower.jsp
@@ -164,7 +164,7 @@
<line x1="21" y1="21" x2="16.65" y2="16.65"></line></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>
@@ -192,7 +192,16 @@
<td>${list.name}</td>
<td>${list.tagid}</td>
<td>${list.hz}</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.time}</td>
<td><div class="progress br-30">
<div
@@ -230,20 +239,53 @@
return;
}
%>
+ <input type="hidden" name="xianusera" id="xianusera" value="<%=username%>">
<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' });
+ };
},
});
+ document.getElementById("xianuser").innerHTML=document.getElementById("xianusera").value
$("#page_1").addClass("active");
- });
+ };
$('.header-page').load('/hxzkoa/hxzk/top.html');
$('.login-page').load('/hxzkoa/hxzk/head.html');
// 鍒锋柊鍔熻兘
@@ -276,6 +318,11 @@
//console.log(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+"%"
+ }
str += "<tr align=\"center\"><td>"
+ data.dataList[k].p_name
+ "</td><td>"
@@ -284,7 +331,7 @@
+ data.dataList[k].pinglv
+ "</td><td>"
+ data.dataList[k].power
- + "%</td><td>"
+ + "</td><td>"
+ data.dataList[k].time
+ "</td><td><div class=\"progress br-30\"><div class=\"progress-bar bg-primary progress-bar-striped progress-bar-animated\" role=\"progressbar\" style=\"width:"
+ data.dataList[k].power
@@ -332,6 +379,11 @@
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+"%"
+ }
str += "<tr align=\"center\"><td>"
+ data.dataList[k].name
+ "</td><td>"
@@ -340,7 +392,7 @@
+ data.dataList[k].hz
+ "</td><td>"
+ data.dataList[k].power
- + "%</td><td>"
+ + "</td><td>"
+ data.dataList[k].time
+ "</td><td><div class=\"progress br-30\"><div class=\"progress-bar bg-primary progress-bar-striped progress-bar-animated\" role=\"progressbar\" style=\"width:"
+ data.dataList[k].power
--
Gitblit v1.10.0