From 0b27b9263ce721844d124ec4541a83b0f6db6c13 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 19 六月 2023 10:46:26 +0800
Subject: [PATCH] 电子巡更
---
igds-app/js/admin/es-detail.js | 10
igds-app/js/admin/device-verb.js | 449 ++++++++++++++++++++-----------------
igds-app/js/admin/security-patrol.js | 6
igds-app/device-temp.html | 3
igds-app/js/admin/device-n2.js | 12
igds-app/js/admin/es-read-meter.js | 56 ----
igds-app/js/admin/warn-list.js | 50 ---
igds-app/device-n2.html | 5
igds-app/js/admin/device-temp.js | 11
igds-app/js/admin/grain-history.js | 8
igds-app/device-verb.html | 3
igds-app/js/admin/es-real-electric.js | 62 -----
12 files changed, 293 insertions(+), 382 deletions(-)
diff --git a/igds-app/device-n2.html b/igds-app/device-n2.html
index 7e2015c..801afd0 100644
--- a/igds-app/device-n2.html
+++ b/igds-app/device-n2.html
@@ -18,8 +18,8 @@
</header>
<div class="mui-content">
<div class="mui-scroll-wrapper g-src_box">
- <div class="m-mana">
- <div class="m-tf" id="recordList">
+ <div class="m-mana" id="recordList">
+ <!-- <div class="m-tf" >
<div class="g-tittf1">浠撳簱姝ｉ潰</div>
<ul class="ul-listmana1 ullisttf1">
<li>
@@ -129,6 +129,7 @@
</li>
</ul>
</div>
+ -->
</div>
</div>
</div>
diff --git a/igds-app/device-temp.html b/igds-app/device-temp.html
index 5d15259..fae0fc9 100644
--- a/igds-app/device-temp.html
+++ b/igds-app/device-temp.html
@@ -22,7 +22,7 @@
<div class="mui-content">
<div class="mui-scroll-wrapper g-src_box">
<div class="m-mana" id="recordList">
- <div class="m-tf">
+ <!-- <div class="m-tf">
<div class="g-tittf1">浠撳簱姝ｉ潰</div>
<ul class="ul-listmana1 ullisttf1">
<li>
@@ -93,6 +93,7 @@
</li>
</ul>
</div>
+ -->
</div>
</div>
</div>
diff --git a/igds-app/device-verb.html b/igds-app/device-verb.html
index 3884dba..6f85bcc 100644
--- a/igds-app/device-verb.html
+++ b/igds-app/device-verb.html
@@ -19,7 +19,7 @@
<div class="mui-content">
<div class="mui-scroll-wrapper g-src_box">
<div class="m-mana" id="recordList">
- <div class="m-tf">
+ <!-- <div class="m-tf">
<div class="g-tittf1">浠撳簱姝ｉ潰</div>
<ul class="ul-listmana1 ullisttf1">
<li>
@@ -89,6 +89,7 @@
</li>
</ul>
</div>
+ -->
</div>
</div>
</div>
diff --git a/igds-app/js/admin/device-n2.js b/igds-app/js/admin/device-n2.js
index ea1a78f..4f84b24 100644
--- a/igds-app/js/admin/device-n2.js
+++ b/igds-app/js/admin/device-n2.js
@@ -42,6 +42,7 @@
data1.data.depotId = self.depotId
// depotType = self.depotType
// depotName = self.depotName
+ getDeviceList();
}
@@ -56,8 +57,10 @@
success: function(result) {
if (result.code == "0000") {
deviceData = result.data;
+ renderDevice();
} else {
mui.toast(result.msg);
+ renderDevice();
}
},
error: function() {
@@ -92,6 +95,7 @@
//娓叉煋椤甸潰
function renderDevice() {
+ console.log(JSON.stringify(deviceData))
var html = '';
if (deviceData) {
var deviceList = deviceData.listDevice
@@ -188,12 +192,14 @@
html += '</ul></div>'
}
} else {
- html += '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d>鏆傛棤鏁版嵁</div>';
+ html += '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤鏁版嵁</div></div>';
}
} else {
- html += '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d>鏆傛棤鏁版嵁</div>';
+ html += '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤鏁版嵁</div></div>';
+ // html += '<div>1111</div>'
}
- // $("#recordList").html(html);
+ console.log(html)
+ $("#recordList").html(html);
}
//鐢电闃�鎿嶄綔
diff --git a/igds-app/js/admin/device-temp.js b/igds-app/js/admin/device-temp.js
index 2afbb76..de8011a 100644
--- a/igds-app/js/admin/device-temp.js
+++ b/igds-app/js/admin/device-temp.js
@@ -48,6 +48,7 @@
data1.data.depotId = self.depotId
// depotType = self.depotType
// depotName = self.depotName
+ getDeviceList();
}
//鑾峰彇璁惧鍒楄〃锛堢┖璋冿級
@@ -61,8 +62,10 @@
success: function(result) {
if (result.code == "0000") {
deviceData = result.data;
+ renderDevice();
} else {
mui.toast(result.msg);
+ renderDevice();
}
},
error: function() {
@@ -192,14 +195,12 @@
html += '</ul></div>'
}
} else {
- html +=
- '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d>鏆傛棤鏁版嵁</div>';
+ html += '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤鏁版嵁</div></div>';
}
} else {
- html +=
- '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d>鏆傛棤鏁版嵁</div>';
+html += '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤鏁版嵁</div></div>';
}
- // $("#recordList").html(html);
+ $("#recordList").html(html);
}
var slider = mui(".mui-slider");
diff --git a/igds-app/js/admin/device-verb.js b/igds-app/js/admin/device-verb.js
index 56aa61f..093e821 100644
--- a/igds-app/js/admin/device-verb.js
+++ b/igds-app/js/admin/device-verb.js
@@ -10,7 +10,7 @@
"serId": "",
"location": "",
"type": "",
- "status":""
+ "status": ""
}
//璁惧鎺у埗
var data = {
@@ -61,6 +61,7 @@
depotId = self.depotId
// depotType = self.depotType
// depotName = self.depotName
+ getDeviceList();
}
//鑾峰彇璁惧鍒楄〃锛堥�氶锛�
@@ -74,8 +75,10 @@
success: function(result) {
if (result.code == "0000") {
deviceData = result.data;
+ renderDevice();
} else {
mui.toast(result.msg);
+ renderDevice();
}
},
error: function() {
@@ -101,213 +104,247 @@
rightList.push(item)
}
})
+
+ if (frontList && frontList.length > 0) { //浠撳簱姝ｉ潰
+ html += '<div class="m-tf"><div class="g-tittf1">浠撳簱姝ｉ潰</div><ul class="ul-listmana1 ullisttf1">';
+ $.each(frontList, function(index, item) {
+ if (item.type == '01') { //椋庣獥
+ html += '<li><div class="con myfancy chuangkou" status="' + item.status +
+ '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front" type="01">';
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e3.png);">' + item
+ .name +
+ '</div>'
+ html += '</div></li>'
+ } else if (item.type == '02') { //杞存祦椋庢満
+ html += '<li><div class="con myfancy zhouliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front">';
+ html += '<div class="pic"><img src="images/d8.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e4.png);">' + item
+ .name +
+ '</div>'
+ html += '</div></li>'
+ } else if (item.type == '04') { //鐜祦椋庢満
+ html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front">';
+ html += '<div class="pic"><img src="images/d7.png"></div>'
+ html += '<div class="info out" style="background-image: url(images/e5.png);"> ' + item
+ .name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0B') { //閫氶鍙�
+ html += '<li><div class="con myfancy chuangkou" status="' + item.status +
+ '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front" type="0B">';
+ html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
+ html += '<div class="info out" ' + item.name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0C') { //娣锋祦椋庢満
+ html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front">';
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
+ html += '<div class="info full" style="background-image: url(images/e6.png);">' + item
+ .name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0D') { //鍔犲帇椋庢満
+ html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="front">';
+ html += '<div class="pic pic1"><img src="images/d9.png"></div>'
+ html += '<div class="info full" style="background-image: url(images/e7.png);">' + item
+ .name + '</div>'
+ html += '</div></li>'
+ }
+ })
+ html += '</ul></div>'
+ } else if (backList && backList.length > 0) { //浠撳簱鍙嶉潰
+ html += '<div class="m-tf"><div class="g-tittf1">浠撳簱鍙嶉潰</div><ul class="ul-listmana1 ullisttf1">';
+ $.each(backList, function(index, item) {
+ if (item.type == '01') { //椋庣獥
+ html += '<li><div class="con myfancy chuangkou" status="' + item.status +
+ '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="back" type="01">';
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e3.png);">' + item
+ .name +
+ '</div>'
+ html += '</div></li>'
+ } else if (item.type == '02') { //杞存祦椋庢満
+ html += '<li><div class="con myfancy zhouliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="back">';
+ html += '<div class="pic"><img src="images/d8.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e4.png);">' + item
+ .name +
+ '</div>'
+ html += '</div></li>'
+ } else if (item.type == '04') { //鐜祦椋庢満
+ html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="back">';
+ html += '<div class="pic"><img src="images/d7.png"></div>'
+ html += '<div class="info out" style="background-image: url(images/e5.png);"> ' + item
+ .name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0B') { //閫氶鍙�
+ html += '<li><div class="con myfancy chuangkou" status="' + item.status +
+ '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="back" type="0B">';
+ html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
+ html += '<div class="info out" ' + item.name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0C') { //娣锋祦椋庢満
+ html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="back">';
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
+ html += '<div class="info full" style="background-image: url(images/e6.png);">' + item
+ .name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0D') { //鍔犲帇椋庢満
+ html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="back">';
+ html += '<div class="pic pic1"><img src="images/d9.png"></div>'
+ html += '<div class="info full" style="background-image: url(images/e7.png);">' + item
+ .name + '</div>'
+ html += '</div></li>'
+ }
+ })
+ html += '</ul></div>'
+ } else if (leftList && leftList.length > 0) { //浠撳簱宸︿晶闈�
+ html += '<div class="m-tf"><div class="g-tittf1">浠撳簱宸︿晶闈�</div><ul class="ul-listmana1 ullisttf1">';
+ $.each(leftList, function(index, item) {
+ if (item.type == '01') { //椋庣獥
+ html += '<li><div class="con myfancy chuangkou" status="' + item.status +
+ '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="left" type="01">';
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e3.png);">' + item
+ .name +
+ '</div>'
+ html += '</div></li>'
+ } else if (item.type == '02') { //杞存祦椋庢満
+ html += '<li><div class="con myfancy zhouliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="left">';
+ html += '<div class="pic"><img src="images/d8.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e4.png);">' + item
+ .name +
+ '</div>'
+ html += '</div></li>'
+ } else if (item.type == '04') { //鐜祦椋庢満
+ html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="left">';
+ html += '<div class="pic"><img src="images/d7.png"></div>'
+ html += '<div class="info out" style="background-image: url(images/e5.png);"> ' + item
+ .name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0B') { //閫氶鍙�
+ html += '<li><div class="con myfancy chuangkou" status="' + item.status +
+ '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="left" type="0B">';
+ html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
+ html += '<div class="info out" ' + item.name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0C') { //娣锋祦椋庢満
+ html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="left">';
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
+ html += '<div class="info full" style="background-image: url(images/e6.png);">' + item
+ .name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0D') { //鍔犲帇椋庢満
+ html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="left">';
+ html += '<div class="pic pic1"><img src="images/d9.png"></div>'
+ html += '<div class="info full" style="background-image: url(images/e7.png);">' + item
+ .name + '</div>'
+ html += '</div></li>'
+ }
+ })
+ html += '</ul></div>'
+ } else if (rightList && rightList.length > 0) { //浠撳簱鍙充晶闈�
+ html += '<div class="m-tf"><div class="g-tittf1">浠撳簱鍙充晶闈�</div><ul class="ul-listmana1 ullisttf1">';
+ $.each(rightList, function(index, item) {
+ if (item.type == '01') { //椋庣獥
+ html += '<li><div class="con myfancy chuangkou" status="' + item.status +
+ '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="right" type="01">';
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e3.png);">' + item
+ .name +
+ '</div>'
+ html += '</div></li>'
+ } else if (item.type == '02') { //杞存祦椋庢満
+ html += '<li><div class="con myfancy zhouliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="right">';
+ html += '<div class="pic"><img src="images/d8.png"></div>'
+ html += '<div class="info in" style="background-image: url(images/e4.png);">' + item
+ .name +
+ '</div>'
+ html += '</div></li>'
+ } else if (item.type == '04') { //鐜祦椋庢満
+ html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="right">';
+ html += '<div class="pic"><img src="images/d7.png"></div>'
+ html += '<div class="info out" style="background-image: url(images/e5.png);"> ' + item
+ .name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0B') { //閫氶鍙�
+ html += '<li><div class="con myfancy chuangkou" status="' + item.status +
+ '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="right" type="0B">';
+ html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
+ html += '<div class="info out" ' + item.name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0C') { //娣锋祦椋庢満
+ html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="right">';
+ html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
+ html += '<div class="info full" style="background-image: url(images/e6.png);">' + item
+ .name + '</div>'
+ html += '</div></li>'
+ } else if (item.type == '0D') { //鍔犲帇椋庢満
+ html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
+ item.passCode + '" serId="' + item.serId + '"name="' + item.name +
+ '" location="right">';
+ html += '<div class="pic pic1"><img src="images/d9.png"></div>'
+ html += '<div class="info full" style="background-image: url(images/e7.png);">' + item
+ .name + '</div>'
+ html += '</div></li>'
+ }
+ })
+ html += '</ul></div>'
+ }
+
+ } else {
+ html +=
+ '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤鏁版嵁</div></div>';
}
- if (frontList && frontList.length > 0) { //浠撳簱姝ｉ潰
- html += '<div class="m-tf"><div class="g-tittf1">浠撳簱姝ｉ潰</div><ul class="ul-listmana1 ullisttf1">';
- $.each(frontList, function(index, item) {
- if (item.type == '01') { //椋庣獥
- html += '<li><div class="con myfancy chuangkou" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="front" type="01">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e3.png);">' + item.name +
- '</div>'
- html += '</div></li>'
- } else if (item.type == '02') { //杞存祦椋庢満
- html += '<li><div class="con myfancy zhouliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="front">';
- html += '<div class="pic"><img src="images/d8.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e4.png);">' + item.name +
- '</div>'
- html += '</div></li>'
- } else if (item.type == '04') { //鐜祦椋庢満
- html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="front">';
- html += '<div class="pic"><img src="images/d7.png"></div>'
- html += '<div class="info out" style="background-image: url(images/e5.png);"> ' + item
- .name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0B') { //閫氶鍙�
- html += '<li><div class="con myfancy chuangkou" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="front" type="0B">';
- html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
- html += '<div class="info out" ' + item.name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0C') { //娣锋祦椋庢満
- html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="front">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e6.png);">' + item
- .name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0D') { //鍔犲帇椋庢満
- html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="front">';
- html += '<div class="pic pic1"><img src="images/d9.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e7.png);">' + item
- .name + '</div>'
- html += '</div></li>'
- }
- })
- html += '</ul></div>'
- } else if (backList && backList.length > 0) { //浠撳簱鍙嶉潰
- html += '<div class="m-tf"><div class="g-tittf1">浠撳簱鍙嶉潰</div><ul class="ul-listmana1 ullisttf1">';
- $.each(backList, function(index, item) {
- if (item.type == '01') { //椋庣獥
- html += '<li><div class="con myfancy chuangkou" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="back" type="01">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e3.png);">' + item.name +
- '</div>'
- html += '</div></li>'
- } else if (item.type == '02') { //杞存祦椋庢満
- html += '<li><div class="con myfancy zhouliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name + '" location="back">';
- html += '<div class="pic"><img src="images/d8.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e4.png);">' + item.name +
- '</div>'
- html += '</div></li>'
- } else if (item.type == '04') { //鐜祦椋庢満
- html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name + '" location="back">';
- html += '<div class="pic"><img src="images/d7.png"></div>'
- html += '<div class="info out" style="background-image: url(images/e5.png);"> ' + item
- .name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0B') { //閫氶鍙�
- html += '<li><div class="con myfancy chuangkou" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="back" type="0B">';
- html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
- html += '<div class="info out" ' + item.name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0C') { //娣锋祦椋庢満
- html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name + '" location="back">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e6.png);">' + item
- .name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0D') { //鍔犲帇椋庢満
- html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name + '" location="back">';
- html += '<div class="pic pic1"><img src="images/d9.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e7.png);">' + item
- .name + '</div>'
- html += '</div></li>'
- }
- })
- html += '</ul></div>'
- } else if (leftList && leftList.length > 0) { //浠撳簱宸︿晶闈�
- html += '<div class="m-tf"><div class="g-tittf1">浠撳簱宸︿晶闈�</div><ul class="ul-listmana1 ullisttf1">';
- $.each(leftList, function(index, item) {
- if (item.type == '01') { //椋庣獥
- html += '<li><div class="con myfancy chuangkou" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="left" type="01">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e3.png);">' + item.name +
- '</div>'
- html += '</div></li>'
- } else if (item.type == '02') { //杞存祦椋庢満
- html += '<li><div class="con myfancy zhouliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name + '" location="left">';
- html += '<div class="pic"><img src="images/d8.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e4.png);">' + item.name +
- '</div>'
- html += '</div></li>'
- } else if (item.type == '04') { //鐜祦椋庢満
- html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name + '" location="left">';
- html += '<div class="pic"><img src="images/d7.png"></div>'
- html += '<div class="info out" style="background-image: url(images/e5.png);"> ' + item
- .name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0B') { //閫氶鍙�
- html += '<li><div class="con myfancy chuangkou" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="left" type="0B">';
- html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
- html += '<div class="info out" ' + item.name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0C') { //娣锋祦椋庢満
- html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name + '" location="left">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e6.png);">' + item
- .name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0D') { //鍔犲帇椋庢満
- html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name + '" location="left">';
- html += '<div class="pic pic1"><img src="images/d9.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e7.png);">' + item
- .name + '</div>'
- html += '</div></li>'
- }
- })
- html += '</ul></div>'
- } else if (rightList && rightList.length > 0) { //浠撳簱鍙充晶闈�
- html += '<div class="m-tf"><div class="g-tittf1">浠撳簱鍙充晶闈�</div><ul class="ul-listmana1 ullisttf1">';
- $.each(rightList, function(index, item) {
- if (item.type == '01') { //椋庣獥
- html += '<li><div class="con myfancy chuangkou" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="right" type="01">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e3.png);">' + item.name +
- '</div>'
- html += '</div></li>'
- } else if (item.type == '02') { //杞存祦椋庢満
- html += '<li><div class="con myfancy zhouliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="right">';
- html += '<div class="pic"><img src="images/d8.png"></div>'
- html += '<div class="info in" style="background-image: url(images/e4.png);">' + item.name +
- '</div>'
- html += '</div></li>'
- } else if (item.type == '04') { //鐜祦椋庢満
- html += '<li><div class="con myfancy huanliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="right">';
- html += '<div class="pic"><img src="images/d7.png"></div>'
- html += '<div class="info out" style="background-image: url(images/e5.png);"> ' + item
- .name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0B') { //閫氶鍙�
- html += '<li><div class="con myfancy chuangkou" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="right" type="0B">';
- html += '<div class="pic"><img src="images/device-status/STATUS_0B_OPEN.png"></div>'
- html += '<div class="info out" ' + item.name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0C') { //娣锋祦椋庢満
- html += '<li><div class="con myfancy hunliu" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="right">';
- html += '<div class="pic"><img src="images/device-status/STATUS_01_OPEN.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e6.png);">' + item
- .name + '</div>'
- html += '</div></li>'
- } else if (item.type == '0D') { //鍔犲帇椋庢満
- html += '<li><div class="con myfancy jiaya" status="' + item.status + '" passCode="' +
- item.passCode + '" serId="' + item.serId + '"name="' + item.name +
- '" location="right">';
- html += '<div class="pic pic1"><img src="images/d9.png"></div>'
- html += '<div class="info full" style="background-image: url(images/e7.png);">' + item
- .name + '</div>'
- html += '</div></li>'
- }
- })
- html += '</ul></div>'
- }
+ } else {
+ html +=
+ '<div class="m-tf"><div class="g-tittf1" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤鏁版嵁</div></div>';
}
+ $("#recordList").html(html);
+
}
//璁惧鎿嶄綔璇锋眰
diff --git a/igds-app/js/admin/es-detail.js b/igds-app/js/admin/es-detail.js
index 6e6525b..45bce06 100644
--- a/igds-app/js/admin/es-detail.js
+++ b/igds-app/js/admin/es-detail.js
@@ -143,17 +143,17 @@
html += '<div class="wp"><div class="m-ck-cont"><div class="g-titck1">' + item.depotName + '</div>'
html += '<div class="m-energy1"><div class="inner"><div class="con con1">'
html += '<div class="num"><div class="l"></div>' + item.startEs +
- ' <span> KWh</span></div><div class="desc">璧峰鑳借��</div></div></div>'
+ ' </div><div class="desc">璧峰鑳借��(KWh)</div></div></div>'
html += '<div class="inner"><div class="con con2">'
html += '<div class="num"><div class="l"></div>' + item.endEs +
- ' <span> KWh</span></div><div class="desc">鎴鑳借��</div></div></div></div>'
+ '</div><div class="desc">鎴鑳借��(KWh)</div></div></div></div>'
html += '<div class="m-energy2"><div class="tit">鑳借�楃粺璁′俊鎭�</div><ul class="ul-txtliste1">'
html += '<li><div class="con"><div class="num">' + item.epSum +
- ' <span> KWh</span></div><div class="desc">鏈夊姛鐢佃兘</div></div></li>'
+ '</div><div class="desc">鏈夊姛鐢佃兘(KWh)</div></div></li>'
html += '<li><div class="con"><div class="num">' + item.eqSum +
- ' <span> KWh</span></div><div class="desc">鏃犲姛鐢佃兘</div></div></li>'
+ '</div><div class="desc">鏃犲姛鐢佃兘(KWh)</div></div></li>'
html += '<li><div class="con"><div class="num">' + item.esSum +
- ' <span> KWh</span></div><div class="desc">鎬荤數鑳�</div></div></li>'
+ '</div><div class="desc">鎬荤數鑳�(KWh)</div></div></li>'
html += '</ul></div></div></div>'
})
} else {
diff --git a/igds-app/js/admin/es-read-meter.js b/igds-app/js/admin/es-read-meter.js
index df41b38..4d3dde2 100644
--- a/igds-app/js/admin/es-read-meter.js
+++ b/igds-app/js/admin/es-read-meter.js
@@ -8,7 +8,7 @@
"tokenAuth": "",
"data": {
"deptId": "",
- "dataTime": ""
+ "dateTime": ""
}
};
@@ -68,7 +68,7 @@
//娓叉煋椤甸潰
function getMeterList() {
//璧嬪�煎弬鏁扮殑鏃ユ湡
- data.data.dataTime = dateTime
+ data.data.dateTime = dateTime
mui.ajax(url, {
type: "POST",
dataType: "json",
@@ -89,48 +89,6 @@
mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
}
})
- // meterList = [{
- // "depotId": "40",
- // "depotName": "閲屾秷绗鍔�",
- // "epSum": 36,
- // "eqSum": 51,
- // "updateTime": "2004-04-04 17:19:14",
- // "esSum": 13
- // },
- // {
- // "depotId": "84",
- // "depotName": "鐭宠�佹潈鍙�",
- // "epSum": 48,
- // "eqSum": 57,
- // "updateTime": "1973-05-07 03:38:11",
- // "esSum": 7
- // },
- // {
- // "depotId": "39",
- // "depotName": "鍐冲惉鍐涚粡鏍�",
- // "epSum": 36,
- // "eqSum": 3,
- // "updateTime": "2003-09-19 06:57:50",
- // "esSum": 72
- // },
- // {
- // "depotId": "77",
- // "depotName": "闄粈鏈熺敱淇�",
- // "epSum": 44,
- // "eqSum": 59,
- // "updateTime": "1984-02-29 20:11:43",
- // "esSum": 92
- // },
- // {
- // "depotId": "21",
- // "depotName": "鎶ュ�欒仈鏈�",
- // "epSum": 40,
- // "eqSum": 15,
- // "updateTime": "2016-03-20 19:38:43",
- // "esSum": ""
- // }
- // ]
-
}
//娓叉煋椤甸潰
@@ -142,11 +100,11 @@
' <span class="right">鏇存柊鏃堕棿: ' + item.updateTime + '</span></div>';
html += '<div class="m-energy2"><ul class="ul-txtliste1"><li><div class="con">';
html += '<div class="num">' + item.epSum +
- ' <span> KWh</span></div><div class="desc">鏈夊姛鐢佃兘</div></div></li>';
- html += '<li><div class="con"><div class="num">' + item.eqSum + '<span> KWh</span></div>'
- html += '<div class="desc">鏃犲姛鐢佃兘</div></div></li>';
- html += '<li><div class="con"><div class="num">' + (item.esSum == null || item.esSum == "" ? "--" : item.esSum) + ' <span> KWh</span></div>';
- html += '<div class="desc">鎬荤數鑳�</div></div></li>'
+ '</div><div class="desc">鏈夊姛鐢佃兘(KWh)</div></div></li>';
+ html += '<li><div class="con"><div class="num">' + item.eqSum + '</div>'
+ html += '<div class="desc">鏃犲姛鐢佃兘(KWh)</div></div></li>';
+ html += '<li><div class="con"><div class="num">' + (item.esSum == null || item.esSum == "" ? "--" : item.esSum) + '</div>';
+ html += '<div class="desc">鎬荤數鑳�(KWh)</div></div></li>'
html += '</ul></div></div>';
})
} else {
diff --git a/igds-app/js/admin/es-real-electric.js b/igds-app/js/admin/es-real-electric.js
index 93b3a57..ed3f907 100644
--- a/igds-app/js/admin/es-real-electric.js
+++ b/igds-app/js/admin/es-real-electric.js
@@ -49,6 +49,7 @@
if (result.code == "0000") {
electricList = result.data;
renderData();
+ // console.log(JSON.stringify(result.data))
} else {
renderData();
mui.toast(result.msg);
@@ -59,67 +60,6 @@
mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
}
})
- // electricList = [{
- // "depotId": "18",
- // "depotName": "鍋氫竴鍑犲姞",
- // "depotType": "02",
- // "ua": 97,
- // "ub": 43,
- // "uc": 81,
- // "ia": 85,
- // "ib": 76,
- // "ic": 43,
- // "updateTime": "1982-03-19 23:26:43"
- // },
- // {
- // "depotId": "35",
- // "depotName": "灞傝兘姣旂淮",
- // "depotType": "01",
- // "ua": 71,
- // "ub": 60,
- // "uc": 45,
- // "ia": 22,
- // "ib": 42,
- // "ic": 12,
- // "updateTime": "1980-11-10 20:35:36"
- // },
- // {
- // "depotId": "61",
- // "depotName": "浠庡懆闃剁孩",
- // "depotType": "02",
- // "ua": 88,
- // "ub": 94,
- // "uc": 77,
- // "ia": 33,
- // "ib": 83,
- // "ic": 67,
- // "updateTime": "1972-03-23 06:15:44"
- // },
- // {
- // "depotId": "31",
- // "depotName": "鐏簲鍐垫柉",
- // "depotType": "03",
- // "ua": 76,
- // "ub": 76,
- // "uc": 68,
- // "ia": 80,
- // "ib": 54,
- // "ic": 2,
- // "updateTime": "2010-02-02 15:07:12"
- // },
- // {
- // "depotId": "20",
- // "depotName": "璇濈編涔︾潃鍏�",
- // "depotType": "01",
- // "ua": 96,
- // "ub": 5,
- // "uc": 83,
- // "ia": 74,
- // "ib": 49,
- // "ic": 37,
- // "updateTime": "2007-11-02 05:03:29"
- // }
- // ]
}
//娓叉煋椤甸潰
diff --git a/igds-app/js/admin/grain-history.js b/igds-app/js/admin/grain-history.js
index 2fb09c5..475606d 100644
--- a/igds-app/js/admin/grain-history.js
+++ b/igds-app/js/admin/grain-history.js
@@ -185,10 +185,10 @@
dtpicker.show(function(e) {
dateTime = e.value;
$("#dateTime").val(dateTime);
- })
- if(time != dateTime){
- getHistoryList()
- }
+ if(time != dateTime){
+ getHistoryList()
+ }
+ })
}
//閫夋嫨浠撳簱
diff --git a/igds-app/js/admin/security-patrol.js b/igds-app/js/admin/security-patrol.js
index ebe1fac..6aaafff 100644
--- a/igds-app/js/admin/security-patrol.js
+++ b/igds-app/js/admin/security-patrol.js
@@ -13,7 +13,7 @@
"tokenAuth": "",
"data": {
"deptId": "",
- "dataTime": "",
+ "dateTime": "",
}
};
//鐢靛瓙宸℃洿鎵撳崱
@@ -27,6 +27,7 @@
"latitude": "",
"longitude": "",
"imgName": "",
+ "userName":""
}
};
//宸℃洿鐓х墖鏌ョ湅
@@ -47,6 +48,7 @@
uploadUrl = user.url + "/api-phone/v35/upload-img"
data.tokenAuth = user.tokenAuth;
data1.tokenAuth = user.tokenAuth;
+ data1.data.userName = user.cname;
data2.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
data1.data.deptId = selectDeptId;
@@ -103,7 +105,7 @@
//鑾峰彇宸℃洿璁板綍
function getPatrolList() {
//璧嬪�煎弬鏁扮殑鏃ユ湡
- data.data.dataTime = dateTime;
+ data.data.dateTime = dateTime;
console.log(JSON.stringify(data.data), "鐢靛瓙宸℃洿璁板綍", "security-patrol")
mui.ajax(url, {
type: "POST",
diff --git a/igds-app/js/admin/warn-list.js b/igds-app/js/admin/warn-list.js
index 7ebf6e3..34116fa 100644
--- a/igds-app/js/admin/warn-list.js
+++ b/igds-app/js/admin/warn-list.js
@@ -19,7 +19,8 @@
"data": {
"id": "",
"status": "",
- "remark": ""
+ "remark": "",
+ "completeUser":""
}
};
@@ -31,6 +32,7 @@
data.tokenAuth = user.tokenAuth;
dataPop.tokenAuth = user.tokenAuth;
data.data.deptId = selectDeptId;
+ dataPop.data.completeUser = user.cname
url = user.url + "/api-phone/v35/gateway";
dateTime = getDate(new Date())
@@ -57,7 +59,6 @@
success: function(result) {
if (result.code == "0000") {
warnList = result.data;
- console.log(warnList)
renderWarn();
} else {
renderWarn();
@@ -69,45 +70,6 @@
mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
}
})
- // warnList = [{
- // "id": "88",
- // "name": "鎷夌洰浜涜皟",
- // "type": "nostrud",
- // "eventType": "cillumreprehenderitest",
- // "level": "1",
- // "status": "40",
- // "time": "2006-11-01 14:01:36",
- // "info": "dolor",
- // "depotId": "6",
- // "depotName": "",
- // "remark": "00000"
- // },
- // {
- // "id": "56",
- // "name": "娉曢兘璞″彨涓庡眬",
- // "type": "cillumreprehenderitUt",
- // "eventType": "in",
- // "level": "2",
- // "status": "20",
- // "time": "1981-02-18 22:28:23",
- // "info": "deserunt Excepteur aliqua veniam commodo",
- // "depotId": "28",
- // "depotName": "榫欑敤鏀圭礌",
- // "remark": "1111"
- // }, {
- // "id": "72",
- // "name": "鍗庢灄涔濆埆",
- // "type": "exdeseruntcillumeu",
- // "eventType": "aliqua sint dolor aute",
- // "level": "1",
- // "status": "10",
- // "time": "1978-07-23 12:17:27",
- // "info": "deserunt nostrud id tempor",
- // "depotId": "70",
- // "depotName": "鍘垮織閫夊彧",
- // "remark": ""
- // }
- // ]
}
@@ -192,11 +154,11 @@
html += '<div class="box"><div class="group c1"><div class="desc">' + (item.depotName == null ||
item.depotName == "" ? "--" : item.depotName) +
'</div><div class="ort">浠撳簱鍚嶇О</div></div></div>';
- if (item.level == '1') {
+ if (item.level == '01') {
html +=
'<div class="box"><div class="group level-2"><div class="desc">楂樼骇</div><div class="ort">璀﹀憡绾у埆</div></div></div></div>';
}
- if (item.level == '2') {
+ if (item.level == '02') {
html +=
'<div class="box"><div class="group level-1"><div class="desc">涓骇</div><div class="ort">璀﹀憡绾у埆</div></div></div></div>';
}
@@ -271,9 +233,11 @@
success: function(result) {
if (result.code == "0000") {
mui.toast(result.msg);
+ getWarnList();
// console.log(JSON.stringify(result))
} else {
mui.toast(result.msg);
+ getWarnList();
// console.log(JSON.stringify(result))
}
},
--
Gitblit v1.9.3