From 77306f6f921408167a165ff65115799ff76a6137 Mon Sep 17 00:00:00 2001
From: lgq <1015864684@qq.com>
Date: 星期二, 08 七月 2025 18:12:07 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/~lgq/IGD5300-package
---
local/www/detail-mj.html | 148 +++++++++++++++++++------------------------------
1 files changed, 57 insertions(+), 91 deletions(-)
diff --git a/local/www/detail-mj.html b/local/www/detail-mj.html
index 2a24808..cdf3dac 100644
--- a/local/www/detail-mj.html
+++ b/local/www/detail-mj.html
@@ -12,14 +12,14 @@
</head>
<body class="pdgxq-body">
-<div class="i-container">
+<div class="i-container div-body">
<div class="jmkt-main">
<div class="layui-fluid">
<div class="pdgxq-m1 layui-row layui-col-space20">
<div class="layui-col-lg5 layui-col-md5">
- <div class="pdgxq-m1-left pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-left pdgxq-m1-box">
<div class="pdgxq-H">
<h3><i></i>璁惧鍩烘湰淇℃伅</h3>
</div>
@@ -45,18 +45,18 @@
<div class="layui-col-lg7 layui-col-md7">
- <div class="pdgxq-m1-right pdgxq-m1-box" style="height: 730px">
+ <div class="pdgxq-m1-right pdgxq-m1-box" style="">
<div class="pdgxq-H">
<h3><i></i>寮�闂ㄨ褰�</h3>
- <div id="open" class="jmkt-tit-more" onclick="sendAction();">
- <button type="button" class="layui-btn layui-btn-normal pop-complete-btn"
- style="background-color: #46b8da;color: #ffffff;">寮�闂�</button>
- </div>
+<!-- <div id="open" class="jmkt-tit-more" onclick="sendAction();">-->
+<!-- <button type="button" class="layui-btn layui-btn-normal pop-complete-btn"-->
+<!-- style="background-color: #46b8da;color: #ffffff;">寮�闂�</button>-->
+<!-- </div>-->
</div>
- <div class="pdgxq-group clearfix" style="">
+ <div class="pdgxq-group clearfix">
<div class="pdgxq-group-item jmkt-chuli">
- <span id="warnState">鍏抽棬</span>鍛婅鐘舵��
+ <span id="warnState">鏃�</span>璀﹀憡鐘舵��
</div>
<div class="pdgxq-group-item jmkt-yichuli">
<span id="conState">姝ｅ父</span>閫氳鐘舵��
@@ -116,8 +116,6 @@
</div><!--pdgxq-m1 end-->
</div>
-
-
</div> <!--i-container end-->
@@ -147,21 +145,21 @@
$("#deviceName").html(device.name);
$("#deviceVld").html(device.vld==0?'婵�娲�':'鍋滅敤');
queryRecord(deviceId);
- setInterval(function () {
- // queryRecord(deviceId);
- queryData(deviceId);
- },5000);
+ //setInterval(function () {
+ // queryRecord(deviceId);
+ // // queryData(deviceId);
+ //},5000);
}
- function queryData(deviceId) {
+ function queryData(deviceId,device) {
console.log("======闂ㄧ椤甸潰-鏌ヨ瀹炴椂======");
var data = {id: deviceId};
$.post("./cgi-bin/detail/query-data", JSON.stringify(data), function (data, status) {
if ("success" == status) {
console.log('---------鑾峰彇鍒扮殑璁惧瀹炴椂鏁版嵁-----' + data);
- renderInfo(data);
+ renderInfo(data,device);
} else {
console.log("鏁版嵁鏌ヨ鍑洪敊锛岃閲嶆柊鎿嶄綔锛�");
window.parent.notify("鏁版嵁鏌ヨ鍑洪敊锛岃閲嶆柊鎿嶄綔锛�");
@@ -170,20 +168,25 @@
};
//寮�濮嬫覆鏌撳疄鏃舵暟鎹�
- function renderInfo(deviceData) {
+ function renderInfo(deviceData, device) {
+ console.log("--------娓叉煋瀹炴椂鏁版嵁-------闂ㄧid="+device.id);
+ console.log(deviceData);
+ //璁惧鍩烘湰淇℃伅
+ $("#deviceName").html(device.name);
+ $("#deviceVld").html(device.vld==0?'婵�娲�':'鍋滅敤');
+
//鐩戞帶灞炴�у疄鏃舵暟鎹覆鏌�
var list = deviceData.value;
if(list !=null && list.length>0){
$.each(list,function(index,item) {
//閫氳鐘舵��
if (item.passcode == 1) {
- $("#conState").html(item.value == 0 ? "姝ｅ父" : "閫氳寮傚父");
- $("#warnState").html(item.value == 0 ? "姝ｅ父" : "閫氳寮傚父");
+ $("#conState").html(item.value == 0 ? "姝ｅ父" : "寮傚父");
}
- // //闂ㄧ鐘舵��
- // if (item.passcode == 4) {
- // $("#warnState").html(item.value == 0 ? "鍏抽棬" : "寮�闂�");
- // }
+ //璀﹀憡鐘舵��
+ if (item.passcode == 2) {
+ $("#warnState").html(item.value == 0 ? "鏃�" : "鎶ヨ");
+ }
});
}
@@ -206,15 +209,6 @@
function queryRecord(id) {
console.log("--------鏌ョ湅闂ㄧ鍘嗗彶璁板綍-------闂ㄧid="+id);
var param = {"id": id};
- // $.post("./cgi-bin/record-his/query", JSON.stringify(param), function (data, status) {
- // if ("success" == status) {
- // //娓叉煋鍘嗗彶鏁版嵁鍒楄〃
- // renderRecordInfo(data);
- // }else {
- // window.parent.notify("闂ㄧ鏁版嵁鏌ヨ鍑洪敊锛岃閲嶆柊鎿嶄綔锛�");
- // }
- // }, "json");
-
$.post("./cgi-bin/record-his/query-by-id", JSON.stringify(param), function (data, status) {
if ("success" == status) {
//娓叉煋鍘嗗彶鏁版嵁鍒楄〃
@@ -226,74 +220,46 @@
}
//寮�濮嬫覆鏌�
function renderRecordInfo(dataList) {
- var li = dataList;
- console.log(li);
- console.log(li.length);
+ console.log(dataList);
+
//闂ㄧ鍘嗗彶鏁版嵁娓叉煋
var html="";
- if(li != null && li.length > 0){
+ if(dataList !=null && dataList.length>0){
var list;
- $.each(li,function(index,item){
- if(item.value){
- list = eval(item.value);
- if(list !=null && list.length>0) {
- var tag1 = ''; //鍗″彿/濮撳悕
- var tag2 = ''; //闂ㄥ彿
- var tag3 = ''; //寮�闂ㄧ被鍨�
- var tag4 = ''; //寮�闂ㄦ椂闂�
- for (var i = 0; i < list.length; i++) {
- var cur = list[i];
- if (cur.passcode == 3) {
- tag2 = cur.value + '鍙烽棬-';
- }
- if (cur.passcode == 5) {
- tag1 = cur.value;
- }
- if (cur.passcode == 6) {
- tag3 = cur.value;
- }
- if (cur.passcode == 7) {
- // tag4 = cur.value.substring(0, 4) + "-" +
- // cur.value.substring(4, 6) + "-" +
- // cur.value.substring(6, 8) + " " +
- // cur.value.substring(8, 10) + ":" +
- // cur.value.substring(10, 12) + ":" +
- // cur.value.substring(12, 14);
- tag4 = cur.value;
- }
+ $.each(dataList,function(index,item){
+ list = eval(item.value);
+ if(list !=null && list.length>0){
+ var tag1 = ''; //鍗″彿/濮撳悕
+ var tag2 = ''; //闂ㄥ彿
+ var tag3 = ''; //寮�闂ㄧ被鍨�
+ var tag4 = ''; //寮�闂ㄦ椂闂�
+ $.each(list,function(index,item){
+ if(item.passcode == 3){
+ tag2 = item.value + '鍙烽棬-';
}
-
- html += "<tr><td>" + tag1 + "</td><td>" + tag2 + tag3 + "</td><td>" + tag4 + "</td></tr>";
- }
+ if(item.passcode == 5){
+ tag1 = item.value;
+ }
+ if(item.passcode == 6){
+ tag3 = item.value;
+ }
+ if(item.passcode == 7){
+ tag4 = item.value.substring(0,4) + "-" +
+ item.value.substring(4,6) + "-" +
+ item.value.substring(6,8) + " " +
+ item.value.substring(8,10) + ":" +
+ item.value.substring(10,12)+ ":" +
+ item.value.substring(12,14);
+ }
+ });
+ html += "<tr><td>"+ tag1 +"</td><td>" + tag2 + tag3 + "</td><td>" + tag4 + "</td></tr>";
}
-
});
}else {
- // html += "<tr><td colspan='3'>鏆傛棤鏁版嵁</td></tr>";
+ html += "<tr><td colspan='3'>鏆傛棤鏁版嵁</td></tr>";
}
$("#listData").html(html);
}
-
-
-
- function sendAction() {
- if (confirm('鏄惁杩涜寮�闂ㄦ搷浣滐紵')){
- var param = {"id": deviceId,"passcode":8,"value":1};
- console.log("======寮�闂ㄦ搷浣滃懡浠ゅ彂閫�======");
- // console.log(JSON.stringify(param));
- // $.post("./cgi-bin/action/open-door", JSON.stringify(param), function (data, status) {
- //
- // }, "json");
- $.ajaxSettings.async = false;
- $.post("./cgi-bin/file/action-control", JSON.stringify(param), function (data, status) {
-
- }, "json");
- window.parent.notify("鍛戒护鍙戦�佹垚鍔燂紒");
- }
- return false;
- }
-
-
</script>
</body>
--
Gitblit v1.9.3