From 50e355f5da5c366c81a92cfdbce95b3c7ffdc1ae Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期五, 12 五月 2023 17:33:34 +0800 Subject: [PATCH] 能耗管理 --- igds-app/js/admin/es-detail.js | 150 ++++++++++ igds-app/js/admin/security-patrol.js | 97 +++--- igds-app/es-read-meter.html | 28 - igds-app/js/admin/warn-list.js | 92 ++--- igds-app/js/admin/inout-out-handle-list.js | 155 +++++----- igds-app/js/admin/inout-in-handle-list.js | 42 +- igds-app/es-manager.html | 4 igds-app/es-real-electric.html | 20 igds-app/js/admin/es-read-meter.js | 115 ++++++++ igds-app/js/admin/inout-out-handle.js | 1 igds-app/security-manager.html | 3 igds-app/es-detail.html | 41 +- igds-app/js/admin/es-real-electric.js | 91 ++++++ 13 files changed, 570 insertions(+), 269 deletions(-) diff --git a/igds-app/es-detail.html b/igds-app/es-detail.html index d16d294..6817155 100644 --- a/igds-app/es-detail.html +++ b/igds-app/es-detail.html @@ -22,11 +22,11 @@ </header> <div class="mui-content"> <div class="g-date_box m-energy-date"> - <div class="inpbox" onclick="chooseDate();"> - <input id="date" type="text" value="2022-04-15" readonly class="inp inp1" /> + <div class="inpbox" onclick="chooseDate('start');"> + <input id="start" type="text" value="2022-04-15" readonly class="inp inp1" /> </div> - <div class="inpbox" onclick="chooseDate();"> - <input id="date" type="text" value="" readonly class="inp" placeholder="璇烽�夋嫨鎴鏃堕棿" /> + <div class="inpbox" onclick="chooseDate('end');"> + <input id="end" type="text" value="" readonly class="inp" placeholder="璇烽�夋嫨鎴鏃堕棿" /> </div> </div> <div class="g-sobox"> @@ -36,14 +36,14 @@ <img src="images/icons/g-i33.png" alt=""> </div> <div class="inpbox"> - <input type="search" class="mui-input-clear" placeholder="璇疯緭鍏ヨ溅鐗屼俊鎭绱�" value=""> + <input id="search" type="search" class="mui-input-clear" placeholder="璇疯緭鍏ヤ粨搴撶紪鍙锋绱�" value=""> </div> - <button type="button" class="mui-btn">鏌ヨ</button> + <button type="button" class="mui-btn">鏌ヨ</button> </div> </form> </div> <div class="mui-scroll-wrapper nhxq"> - <div class="g-in-sl"> + <div class="g-in-sl" id="recordList"> <div class="wp"> <div class="m-ck-cont"> <div class="g-titck1"> @@ -105,34 +105,23 @@ </ul> </div> </div> - </div> + + </div> </div> </div> </body> <script src="./js/mui.min.js"></script> <script src="./js/mui.picker.min.js"></script> + <script src="./js/jquery.js"></script> + <script src="./js/admin/es-detail.js"></script> <script type="text/javascript" charset="utf-8"> mui.init(); - function chooseDate() { - var dtpicker = new mui.DtPicker({ - type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡 - // beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈� - // endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡 - - }) - dtpicker.show(function(e) { - document.getElementById("date").value = e.value - }) - } - - mui('.mui-scroll-wrapper').scroll({ - indicators: false, //鏄惁鏄剧ず婊氬姩鏉� - deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁� - bounce: false, //鏄惁鍚敤鍥炲脊 - deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006 - }); + mui.plusReady(function(){ + //鏁版嵁鍒濆鍖� + init(); + }) </script> </html> diff --git a/igds-app/es-manager.html b/igds-app/es-manager.html index 6d68c1a..65ac7a4 100644 --- a/igds-app/es-manager.html +++ b/igds-app/es-manager.html @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" /> - <title>缁煎悎绮儏</title> + <title>鑳借�楃鐞�</title> <!-- MUI鏍峰紡 --> <link rel="stylesheet" href="./css/mui.min.css" /> <!-- 鍏叡css --> @@ -12,7 +12,7 @@ <body class="g-bg" style="background-image: url(images/m-bg2.png);"> <header id="header" class="mui-bar mui-bar-nav m-pagetit"> <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a> - <h1 class="mui-title">缁煎悎绮儏</h1> + <h1 class="mui-title">鑳借�楃鐞�</h1> </header> <div class="mui-content"> <div class="mui-scroll-wrapper g-src_box"> diff --git a/igds-app/es-read-meter.html b/igds-app/es-read-meter.html index f62446e..0813beb 100644 --- a/igds-app/es-read-meter.html +++ b/igds-app/es-read-meter.html @@ -22,17 +22,17 @@ </header> <div class="mui-content"> <div class="g-date_box"> - <span class="day prev">鍓嶄竴澶�</span> + <span class="day prev" onclick="addAndReduceDay(-1)">鍓嶄竴澶�</span> <div class="inpbox" onclick="chooseDate();"> <input id="date" type="text" value="2022-04-15" readonly class="inp" /> </div> - <span class="day next">鍚庝竴澶�</span> + <span class="day next" onclick="addAndReduceDay(1)">鍚庝竴澶�</span> </div> <div class="mui-scroll-wrapper es-top"> <div class="g-in-sl"> <div class=""> - <div class="m-pow-dist"> + <div class="m-pow-dist" id="recordList"> <div class="m-ck-cont"> <div class="g-titck1"> 涓�鍙蜂粨搴� <span class="right">鏇存柊鏃堕棿: 2021-01-01 12:00</span> @@ -195,27 +195,13 @@ <script src="js/lib.js"></script> <script src="js/mui.min.js"></script> <script src="js/mui.picker.min.js"></script> + <script src="js/admin/es-read-meter.js"></script> <script type="text/javascript" charset="utf-8"> mui.init(); - function chooseDate() { - var dtpicker = new mui.DtPicker({ - type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡 - // beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈� - // endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡 - - }) - dtpicker.show(function(e) { - document.getElementById("date").value = e.value - }) - } - - mui('.mui-scroll-wrapper').scroll({ - indicators: false, //鏄惁鏄剧ず婊氬姩鏉� - deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁� - bounce: false, //鏄惁鍚敤鍥炲脊 - deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006 - }); + mui.plusReady(function(){ + init(); + }) </script> diff --git a/igds-app/es-real-electric.html b/igds-app/es-real-electric.html index 1056709..eab5fd1 100644 --- a/igds-app/es-real-electric.html +++ b/igds-app/es-real-electric.html @@ -22,7 +22,7 @@ <div class="mui-scroll-wrapper g-src_box"> <div class="g-in-sl"> <div class="m-pow-dist"> - <ul class="ul-listpd1"> + <ul class="ul-listpd1" id="recordList"> <li> <div class="con"> <div class="tit"> @@ -34,7 +34,6 @@ </div> <div class="inner"> <div class="info">鏈�杩戜竴灏忔椂鐢ㄨ兘: <span>10.0</span>KW-h</div> - <div class="txt"> <div class="num">100 <span> V</span></div> <div class="desc">A鐩哥數鍘�</div> @@ -151,19 +150,14 @@ </div> </body> <script src="js/mui.min.js"></script> + <script src="./js/jquery.js"></script> + <script src="js/admin/es-real-electric.js"></script> <script type="text/javascript" charset="utf-8"> mui.init(); - var slider = mui(".mui-slider"); - slider.slider({ - interval: 3000 - }); - - mui('.mui-scroll-wrapper').scroll({ - indicators: false, //鏄惁鏄剧ず婊氬姩鏉� - deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁� - bounce: false, //鏄惁鍚敤鍥炲脊 - deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006 - }); + mui.plusReady(function(){ + //鏁版嵁鍒濆鍖� + init(); + }) </script> </html> \ No newline at end of file diff --git a/igds-app/js/admin/es-detail.js b/igds-app/js/admin/es-detail.js new file mode 100644 index 0000000..4ddac47 --- /dev/null +++ b/igds-app/js/admin/es-detail.js @@ -0,0 +1,150 @@ +var url = null; +var startTime; +var endTime = ""; +var esDetailList; +var data = { + "interfaceId": "5503", + "outId": "10503", + "reqDateTime": new Date(), + "tokenAuth": "", + "data": { + "deptId": "", + "depotId": "", + "startTime": "", + "endTime": "" + } +}; + +function init() { + var user = JSON.parse(localStorage.getItem('user')); + var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId')); + url = user.url + "/api-phone/v35/gateway"; + data.tokenAuth = user.tokenAuth; + data.data.deptId = selectDeptId; + startTime = getDate(new Date()); + + document.getElementById("start").value = startTime; + getEsDetailList(); +} + +function getDate(date) { + var year = date.getFullYear(); + var month, day; + month = date.getMonth() + 1; + if (month > 0 && month <= 9) { + month = "0" + month; + } + day = date.getDate() + if (day > 0 && day <= 9) { + day = "0" + day + } + return year + "-" + month + "-" + day +} + +function chooseDate(tag) { + var dtpicker = new mui.DtPicker({ + type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡 + // beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈� + // endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡 + }) + if (tag == 'start') { + dtpicker.show(function(e) { + startTime = e.value + document.getElementById("start").value = e.value + }) + } else { + dtpicker.show(function(e) { + endTime = e.value; + document.getElementById("end").value = e.value + }) + } +} + +function getEsDetailList() { + data.data.startTime = startTime + data.data.endTime = endTime + mui.ajax(url, { + type: "POST", + dataType: "json", + crossDomain: true, + contentType: "application/json;charset=utf-8", + data: JSON.stringify(data), + success: function(result) { + if (result.code == "0000") { + esDetailList = result.data; + renderData(); + } else { + renderData(); + mui.toast(result.msg); + console.log("else", JSON.stringify(result)) + } + }, + error: function() { + mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div") + } + }) + // esDetailList = [ + // { + // "depotId": "16", + // "depotName": "鍊艰瘽鍚勫厓", + // "startEs": "31", + // "endEs": "56", + // "epSum": "13", + // "eqSum": "37", + // "esSum": "25" + // }, + // { + // "depotId": "2", + // "depotName": "鍒掔偣鐜嬫暟闃�", + // "startEs": "55", + // "endEs": "47", + // "epSum": "46", + // "eqSum": "42", + // "esSum": "59" + // }, + // { + // "depotId": "34", + // "depotName": "鍜屽鏂滑", + // "startEs": "78", + // "endEs": "24", + // "epSum": "37", + // "eqSum": "73", + // "esSum": "83" + // } + // ] +} + +mui('.mui-content').on("tap", ".g-sobox div button", function() { + data.data.depotId = document.getElementById("search").value + getEsDetailList() +}) + +//娓叉煋椤甸潰 +function renderData() { + var html = ''; + if (esDetailList && esDetailList.length > 0) { + $.each(esDetailList, function(index, item) { + 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>' + 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>' + 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>' + html += '<li><div class="con"><div class="num">' + item.eqSum + ' <span>KWh</span></div><div class="desc">鏃犲姛鐢佃兘</div></div></li>' + html += '<li><div class="con"><div class="num">' + item.esSum + ' <span>KWh</span></div><div class="desc">鎬荤數鑳�</div></div></li>' + html += '</ul></div></div></div>' + }) + } else { + html += + '<div class="wp"><div class="m-ck-cont"><div style="text-align: center;font-size: 20px;color:#dd524d;">鏆傛棤鑳借�楄鎯呬俊鎭�</div></div></div>'; + } + $("#recordList").html(html); +} + +mui('.mui-scroll-wrapper').scroll({ + indicators: false, //鏄惁鏄剧ず婊氬姩鏉� + deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁� + bounce: false, //鏄惁鍚敤鍥炲脊 + deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006 +}); \ No newline at end of file diff --git a/igds-app/js/admin/es-read-meter.js b/igds-app/js/admin/es-read-meter.js new file mode 100644 index 0000000..ad44464 --- /dev/null +++ b/igds-app/js/admin/es-read-meter.js @@ -0,0 +1,115 @@ +var dateTime; +var meterList; +var url; +var data = { + "interfaceId": "5502", + "outId": "10502", + "reqDateTime": new Date(), + "tokenAuth": "", + "data": { + "deptId": "", + "dataTime": "" + } +}; + +function init() { + var user = JSON.parse(localStorage.getItem('user')); + var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId')); + url = user.url + "/api-phone/v35/gateway"; + data.tokenAuth = user.tokenAuth; + data.data.deptId = selectDeptId; + dateTime = getDate(new Date()); + document.getElementById("date").value = dateTime; + getMeterList(); +} + +function getDate(date) { + var year = date.getFullYear(); + var month, day; + month = date.getMonth() + 1; + if (month > 0 && month <= 9) { + month = "0" + month; + } + day = date.getDate() + if (day > 0 && day <= 9) { + day = "0" + day + } + return year + "-" + month + "-" + day +} + +function chooseDate() { + var dtpicker = new mui.DtPicker({ + type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡 + // beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈� + // endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡 + + }) + dtpicker.show(function(e) { + dateTime = e.value; + document.getElementById("date").value = e.value + getMeterList(); + }) +} + +function addAndReduceDay(tag) { + var date = new Date(dateTime); + date = date.setDate(date.getDate() + tag); + date = new Date(date); + dateTime = getDate(date); + document.getElementById("date").value = dateTime + getMeterList(); + +} + +// +function getMeterList() { + // + data.data.dataTime = dateTime + mui.ajax(url, { + type: "POST", + dataType: "json", + crossDomain: true, + contentType: "application/json;charset=utf-8", + data: JSON.stringify(data), + success: function(result) { + if (result.code == "0000") { + meterList = result.data; + renderData(); + } else { + renderData(); + mui.toast(result.msg); + console.log(JSON.stringify(result)) + } + }, + error: function() { + mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div") + } + }) +} +//娓叉煋椤甸潰 +function renderData() { + var html = '' + if (meterList && meterList.length > 0) { + $.each(meterList, function(index, item) { + html += '<div class="m-ck-cont"><div class="g-titck1">' + item.depotName + ' <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 + ' <span>KWh</span></div>'; + html += '<div class="desc">鎬荤數鑳�</div></div></li>' + html += '</ul></div></div>'; + }) + } else { + html += + '<div class="m-ck-cont"><div style="text-align: center;font-size: 20px;color:#dd524d;">鏆傛棤杩滅▼鎶勮〃淇℃伅</div></div>'; + } + // $("#recordList").html(html); +} + +mui('.mui-scroll-wrapper').scroll({ + indicators: false, //鏄惁鏄剧ず婊氬姩鏉� + deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁� + bounce: false, //鏄惁鍚敤鍥炲脊 + deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006 +}); \ No newline at end of file diff --git a/igds-app/js/admin/es-real-electric.js b/igds-app/js/admin/es-real-electric.js new file mode 100644 index 0000000..561c668 --- /dev/null +++ b/igds-app/js/admin/es-real-electric.js @@ -0,0 +1,91 @@ +var url; +var electricList; +var data = { + "interfaceId": "5501", + "outId": "10501", + "reqDateTime": new Date(), + "tokenAuth": "", + "data": { + "deptId": "" + } +}; + +function init() { + var user = JSON.parse(localStorage.getItem('user')); + var selectDeptId = JSON.parse(localStorage.getItem('selectDeptId')); + url = user.url + "/api-phone/v35/gateway"; + data.tokenAuth = user.tokenAuth; + data.data.deptId = selectDeptId; + getElectric(); +} +function getElectric() { + mui.ajax(url, { + type: "POST", + dataType: "json", + crossDomain: true, + contentType: "application/json;charset=utf-8", + data: JSON.stringify(data), + success: function(result) { + if (result.code == "0000") { + electricList = result.data; + renderData(); + } else { + renderData(); + mui.toast(result.msg); + console.log(JSON.stringify(result)) + } + }, + error: function() { + mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div") + } + }) +} +//娓叉煋椤甸潰 +function renderData() { + var html = ''; + if (electricList && electricList.length > 0) { + $.each(electricList, function(index, item) { + html += '<li><div class="con"><div class="tit"><div class="t1">'; + if (index % 3 == 0) { + html += '<span class="bg" style="background-image: url(images/d1.png);"></span>'; + } + if (index % 3 == 1) { + html += '<span class="bg" style="background-image: url(images/d2.png);"></span>' + } + if (index % 3 == 2) { + html += '<span class="bg" style="background-image: url(images/d3.png);"></span>' + } + html += '<span>' + item.depotName + '</span></div><span class="time">' + item.updateTime + + '</span></div>'; + html += '<div class="inner"><div class="info">鏈�杩戜竴灏忔椂鐢ㄨ兘: <span>10.0</span>KW-h</div>'; + html += '<div class="txt"><div class="num">' + item.ua + + ' <span> V</span></div><div class="desc">A鐩哥數鍘�</div></div>'; + html += '<div class="txt"><div class="num">' + item.ub + + ' <span> V</span></div><div class="desc">B鐩哥數鍘�</div></div>'; + html += '<div class="txt"><div class="num">' + item.uc + + ' <span> V</span></div><div class="desc">B鐩哥數鍘�</div></div>'; + html += '<div class="txt"><div class="num">' + item.ia + + ' <span> V</span></div><div class="desc">A鐩哥數娴�</div></div>'; + html += '<div class="txt"><div class="num">' + item.ib + + ' <span> V</span></div><div class="desc">B鐩哥數娴�</div></div>'; + html += '<div class="txt"><div class="num">' + item.ic + + ' <span> V</span></div><div class="desc">C鐩哥數娴�</div></div>'; + html += '</div></div></li>' + }) + } else { + html += + '<li><div class="con myfancy" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤瀹炴椂閰嶇數淇℃伅</div></li>'; + } + $("#recordList").html(html); +} +var slider = mui(".mui-slider"); +slider.slider({ + interval: 3000 +}); + +mui('.mui-scroll-wrapper').scroll({ + indicators: false, //鏄惁鏄剧ず婊氬姩鏉� + deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁� + bounce: false, //鏄惁鍚敤鍥炲脊 + deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006 +}); \ No newline at end of file diff --git a/igds-app/js/admin/inout-in-handle-list.js b/igds-app/js/admin/inout-in-handle-list.js index d63cb19..ffbe204 100644 --- a/igds-app/js/admin/inout-in-handle-list.js +++ b/igds-app/js/admin/inout-in-handle-list.js @@ -119,29 +119,25 @@ //娓叉煋椤甸潰 function renderData() { var html = ''; - if(inHandleData){ - if (inHandleData && inHandleData.length > 0) { - $.each(inHandleData, function(index, item) { - html += '<li><div class="con"><div class="top">'; - html += '<div class="info">杞︾墝鍙�: <b>' + (item.plateNum == null ? "" : item.plateNum) +'</b></div>'; - html += '<a href="" id = "' + item.id + '" plateNum = "' + item.plateNum + '" depotName = "' + item.depotName + '" storeKeeperName = "' + (item.storeKeeperName == "" || item - .storeKeeperName == "" ? '--' : item.storeKeeperName) + '" class="link">鍊间粨<span class="mui-icon mui-icon-arrowright"></span></a>'; - html += '</div><div class="box">'; - html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i19.png);">'; - html += '<div class="h3">' + (item.depotName == null ? "" : item.depotName) + '</div>'; - html += '<div class="bot">鐩爣浠撳簱</div></div></div>'; - html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i20.png);">'; - html += '<div class="h3">' + (item.foodVarietyName == null ? "" : item.foodVarietyName) + '</div>'; - html += '<div class="bot">绮鍝佺</div></div></div>'; - html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i21.png);">'; - html += '<div class="h3">' + (item.foodLevelName == null ? "" : item.foodLevelName) + '</div>'; - html += '<div class="bot">绮绛夌骇</div></div></div>'; - html += '</div></div></li>'; - }) - } else { - html += '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 18px;">鏆傛棤鍏ュ簱寰呭�间粨淇℃伅</div></div></li>'; - } - }else{ + if (inHandleData && inHandleData.length > 0) { + $.each(inHandleData, function(index, item) { + html += '<li><div class="con"><div class="top">'; + html += '<div class="info">杞︾墝鍙�: <b>' + (item.plateNum == null ? "" : item.plateNum) +'</b></div>'; + html += '<a href="" id = "' + item.id + '" plateNum = "' + item.plateNum + '" depotName = "' + item.depotName + '" storeKeeperName = "' + (item.storeKeeperName == "" || item + .storeKeeperName == "" ? '--' : item.storeKeeperName) + '" class="link">鍊间粨<span class="mui-icon mui-icon-arrowright"></span></a>'; + html += '</div><div class="box">'; + html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i19.png);">'; + html += '<div class="h3">' + (item.depotName == null ? "" : item.depotName) + '</div>'; + html += '<div class="bot">鐩爣浠撳簱</div></div></div>'; + html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i20.png);">'; + html += '<div class="h3">' + (item.foodVarietyName == null ? "" : item.foodVarietyName) + '</div>'; + html += '<div class="bot">绮鍝佺</div></div></div>'; + html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i21.png);">'; + html += '<div class="h3">' + (item.foodLevelName == null ? "" : item.foodLevelName) + '</div>'; + html += '<div class="bot">绮绛夌骇</div></div></div>'; + html += '</div></div></li>'; + }) + } else { html += '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 18px;">鏆傛棤鍏ュ簱寰呭�间粨淇℃伅</div></div></li>'; } $("#handleList").html(html); diff --git a/igds-app/js/admin/inout-out-handle-list.js b/igds-app/js/admin/inout-out-handle-list.js index d62554d..696200d 100644 --- a/igds-app/js/admin/inout-out-handle-list.js +++ b/igds-app/js/admin/inout-out-handle-list.js @@ -49,101 +49,97 @@ success: function(result) { if (result.code == "0000") { outHandleData = result.data; - console.log("if",JSON.stringify(result)) + console.log("if", JSON.stringify(result)) renderData(); } else { renderData(); mui.toast(result.msg); - console.log("else",JSON.stringify(result)) + console.log("else", JSON.stringify(result)) } }, error: function() { mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div") } }) - outHandleData = [{ - "id": "44", - "plateNum": "97", - "deHandle": "ut", - "depotId": "16", - "depotName": "闈掑紶鍒楀仛鎬�", - "foodVariety": "magna pariatur laboris sunt dolor", - "foodVarietyName": "鎻愭竻闄�", - "foodLevel": "fugiat", - "foodLevelName": "搴斿彂鐑洓姘戞槸濮�", - "storeKeeperName": "" - }, - { - "id": "62", - "plateNum": "71", - "deHandle": "dolore ut non", - "depotId": "79", - "depotName": "澧炶薄瀹氱珛鏍�", - "foodVariety": "Lorem est", - "foodVarietyName": "甯傛潯缇ゆ眰琚洟涓�", - "foodLevel": "ex labore", - "foodLevelName": "鎸佸湪鍐欑О鎯呭苟", - "storeKeeperName": "2" - }, - { - "id": "96", - "plateNum": "61", - "deHandle": "nulla magna ut proident cillum", - "depotId": "42", - "depotName": "鏉″叏浠�", - "foodVariety": "aliquip", - "foodVarietyName": "杩炲紑闃跺姩闄呭共", - "foodLevel": "in id sunt", - "foodLevelName": "娌$疆瀹氫娇鏂�", - "storeKeeperName": "3" - }, - { - "id": "61", - "plateNum": "17", - "deHandle": "commodo", - "depotId": "80", - "depotName": "灞曡蹇伀鍏ㄩ", - "foodVariety": "voluptate eu Lorem", - "foodVarietyName": "浠栬竟娲炬柉閲嶇", - "foodLevel": "dolor", - "foodLevelName": "瑁呯涓�", - "storeKeeperName": "4" - } - ] + outHandleData = [] + // outHandleData = [{ + // "id": "44", + // "plateNum": "97", + // "deHandle": "ut", + // "depotId": "16", + // "depotName": "闈掑紶鍒楀仛鎬�", + // "foodVariety": "magna pariatur laboris sunt dolor", + // "foodVarietyName": "鎻愭竻闄�", + // "foodLevel": "fugiat", + // "foodLevelName": "搴斿彂鐑洓姘戞槸濮�", + // "storeKeeperName": "" + // }, + // { + // "id": "62", + // "plateNum": "71", + // "deHandle": "dolore ut non", + // "depotId": "79", + // "depotName": "澧炶薄瀹氱珛鏍�", + // "foodVariety": "Lorem est", + // "foodVarietyName": "甯傛潯缇ゆ眰琚洟涓�", + // "foodLevel": "ex labore", + // "foodLevelName": "鎸佸湪鍐欑О鎯呭苟", + // "storeKeeperName": "2" + // }, + // { + // "id": "96", + // "plateNum": "61", + // "deHandle": "nulla magna ut proident cillum", + // "depotId": "42", + // "depotName": "鏉″叏浠�", + // "foodVariety": "aliquip", + // "foodVarietyName": "杩炲紑闃跺姩闄呭共", + // "foodLevel": "in id sunt", + // "foodLevelName": "娌$疆瀹氫娇鏂�", + // "storeKeeperName": "3" + // }, + // { + // "id": "61", + // "plateNum": "17", + // "deHandle": "commodo", + // "depotId": "80", + // "depotName": "灞曡蹇伀鍏ㄩ", + // "foodVariety": "voluptate eu Lorem", + // "foodVarietyName": "浠栬竟娲炬柉閲嶇", + // "foodLevel": "dolor", + // "foodLevelName": "瑁呯涓�", + // "storeKeeperName": "4" + // } + // ] renderData(); } //娓叉煋椤甸潰 function renderData() { var html = ''; - if (outHandleData) { - if (outHandleData && outHandleData.length > 0) { - $.each(outHandleData, function(index, item) { - html += '<li><div class="con"><div class="top">'; - html += '<div class="info">杞︾墝鍙�: <b>' + (item.plateNum == null ? "" : item.plateNum) + '</b></div>'; - html += '<a href="" id = "' + item.id + '" plateNum = "' + item.plateNum + '" depotName = "' + - item.depotName + '" storeKeeperName = "' + (item.storeKeeperName == "" || item - .storeKeeperName == "" ? '--' : item.storeKeeperName) + '" class="link">鍊间粨<span class="mui-icon mui-icon-arrowright"></span></a>'; - html += '</div><div class="box">'; - html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i19.png);">'; - html += '<div class="h3">' + (item.depotName == null ? "" : item.depotName) + '</div>'; - html += '<div class="bot">鐩爣浠撳簱</div></div></div>'; - html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i20.png);">'; - html += '<div class="h3">' + (item.foodVarietyName == null ? "" : item.foodVarietyName) + '</div>'; - html += '<div class="bot">绮鍝佺</div></div></div>'; - html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i21.png);">'; - html += '<div class="h3">' + (item.foodLevelName == null ? "" : item.foodLevelName) + '</div>'; - html += '<div class="bot">绮绛夌骇</div></div></div>'; - html += '</div></div></li>'; - }) - } else { - html += - '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 16px;">鏆傛棤鍏ュ簱寰呭�间粨淇℃伅</div></div></li>'; - } + if (outHandleData && outHandleData.length > 0) { + $.each(outHandleData, function(index, item) { + html += '<li><div class="con"><div class="top">'; + html += '<div class="info">杞︾墝鍙�: <b>' + (item.plateNum == null ? "" : item.plateNum) + '</b></div>'; + html += '<a href="" id = "' + item.id + '" plateNum = "' + item.plateNum + '" depotName = "' + item.depotName + '" storeKeeperName = "' + + (item.storeKeeperName == "" || item.storeKeeperName == "" ? '--' : item.storeKeeperName) + '" class="link">鍊间粨<span class="mui-icon mui-icon-arrowright"></span></a>'; + html += '</div><div class="box">'; + html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i19.png);">'; + html += '<div class="h3">' + (item.depotName == null ? "" : item.depotName) + '</div>'; + html += '<div class="bot">鐩爣浠撳簱</div></div></div>'; + html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i20.png);">'; + html += '<div class="h3">' + (item.foodVarietyName == null ? "" : item.foodVarietyName) + '</div>'; + html += '<div class="bot">绮鍝佺</div></div></div>'; + html += '<div class="item"><div class="conbox" style="background-image: url(images/icons/g-i21.png);">'; + html += '<div class="h3">' + (item.foodLevelName == null ? "" : item.foodLevelName) + '</div>'; + html += '<div class="bot">绮绛夌骇</div></div></div>'; + html += '</div></div></li>'; + }) } else { html += '<li><div class="con"><div style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 16px;">鏆傛棤鍏ュ簱寰呭�间粨淇℃伅</div></div></li>'; } + $("#handleList").html(html); } @@ -153,20 +149,19 @@ var depotName = this.getAttribute("depotName") var plateNum = this.getAttribute("plateNum") var storeKeeperName = this.getAttribute("storeKeeperName") - + var picker = new mui.PopPicker(); picker.setData([{ value: "photo", text: "鐜板満鍊间粨" - + }, { value: "snap", text: "杩滅▼鍊间粨" }]) - picker.pickers[0].setSelectedValue('photo'); picker.show(function(SelectedItem) { console.log(JSON.stringify(SelectedItem)); - if(SelectedItem.value == 'photo'){ + if (SelectedItem.value == 'photo') { mui.openWindow({ url: "inout-out-handle.html", id: "inout-out-handle", @@ -179,7 +174,7 @@ } } }) - }else{ + } else { mui.openWindow({ url: "inout-out-handle.html", id: "inout-out-handle", diff --git a/igds-app/js/admin/inout-out-handle.js b/igds-app/js/admin/inout-out-handle.js index e72585c..838c9db 100644 --- a/igds-app/js/admin/inout-out-handle.js +++ b/igds-app/js/admin/inout-out-handle.js @@ -52,7 +52,6 @@ $("#plateNum").html(depotData.plateNum); $("#depotName").html(depotData.depotName); $("#storeKeeperName").html(depotData.storeKeeperName); - } function toHandle(tag) { diff --git a/igds-app/js/admin/security-patrol.js b/igds-app/js/admin/security-patrol.js index 1b662e5..bf2dc53 100644 --- a/igds-app/js/admin/security-patrol.js +++ b/igds-app/js/admin/security-patrol.js @@ -1,11 +1,5 @@ var url = null; var uploadUrl = null; -var PatrolData = null; -var ImgFile = null; -var dateTime; -var longitude = null; //鐧惧害鍦板浘(BD-09)缁忓害 -var latitude = null; //鐧惧害鍦板浘(BD-09)绾害 -//鐢靛瓙宸℃洿璁板綍 var data = { "interfaceId": "5601", "outId": "10601", @@ -16,6 +10,13 @@ "dataTime": "", } }; +var PatrolList = null; +var ImgFile = null; +var dateTime; +var longitude = null; //鐧惧害鍦板浘(BD-09)缁忓害 +var latitude = null; //鐧惧害鍦板浘(BD-09)绾害 +//鐢靛瓙宸℃洿璁板綍 + //鐢靛瓙宸℃洿鎵撳崱 var data1 = { "interfaceId": "5602", @@ -51,7 +52,7 @@ data.data.deptId = selectDeptId; data2.data.deptId = selectDeptId; dateTime = getDate(new Date()) - $('#date').val(dateTime) + document.getElementById("date").value = dateTime; //鑾峰彇宸℃洿璁板綍 getPatrolList() @@ -78,7 +79,7 @@ date = date.setDate(date.getDate() + tag); date = new Date(date); dateTime = getDate(date); - $('#date').val(dateTime); + document.getElementById("date").value = dateTime; //鑾峰彇宸℃洿璁板綍 getPatrolList() } @@ -91,12 +92,13 @@ // endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡 }) dtpicker.show(function(e) { + dateTime = e.value; document.getElementById("date").value = e.value + getPatrolList(); }) } //鑾峰彇宸℃洿璁板綍 function getPatrolList() { - PatrolData = null; //璧嬪�煎弬鏁扮殑鏃ユ湡 data.data.dataTime = dateTime; mui.ajax(url, { @@ -107,7 +109,7 @@ data: JSON.stringify(data), success: function(result) { if (result.code == "0000") { - PatrolData = result.data; + PatrolList = result.data; renderPatrol(); } else { renderPatrol(); @@ -120,51 +122,44 @@ } }) - PatrolData = { - "data": [{ - "id": "57", - "userName": "绋嬪", - "longitude": "34.585", - "latitude": "114.235", - "createTime": "1976-03-03 16:41:41" - }, - { - "id": "1", - "userName": "鍐啗", - "longitude": "34.585", - "latitude": "114.235", - "createTime": "1981-01-06 17:40:24" - }, - { - "id": "99", - "userName": "榛庢磱", - "longitude": "114.235", - "latitude": "34.585", - "createTime": "1991-04-04 23:06:09" - } - ] - } + PatrolList = [{ + "id": "57", + "userName": "绋嬪", + "longitude": "34.585", + "latitude": "114.235", + "createTime": "1976-03-03 16:41:41" + }, + { + "id": "1", + "userName": "鍐啗", + "longitude": "34.585", + "latitude": "114.235", + "createTime": "1981-01-06 17:40:24" + }, + { + "id": "99", + "userName": "榛庢磱", + "longitude": "114.235", + "latitude": "34.585", + "createTime": "1991-04-04 23:06:09" + } + ] + } function renderPatrol() { var html = ''; - if (PatrolData) { - var PatrolList = PatrolData.data; - if (PatrolList && PatrolList.length > 0) { - $.each(PatrolList, function(index, item) { - html += '<li><div class="item"><div class="top">' - html += '<div class="date">' + item.createTime + '</div><div class="r-btn" id = "' + item.id + - '">鏌ョ湅鐓х墖</div></div>'; - html += '<div class="cards"><div class="cd"><div class="con user">' - html += '<div class="tit">鎵撳崱浜�</div><div class="txt">' + item.userName + '</div></div></div>'; - html += '<div class="cd"><div class="con loc"><div class="tit">鍧愭爣</div>' - html += '<div class="txt">' + item.longitude + ', ' + item.latitude + - '</div></div></div></div></div></li>' - }) - } else { - html += - '<li><div class="item" style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 18px;">鏆傛棤宸℃洿淇℃伅</div></li>'; - } + if (PatrolList && PatrolList.length > 0) { + $.each(PatrolList, function(index, item) { + html += '<li><div class="item"><div class="top">' + html += '<div class="date">' + item.createTime + '</div><div class="r-btn" id = "' + item.id + + '">鏌ョ湅鐓х墖</div></div>'; + html += '<div class="cards"><div class="cd"><div class="con user">' + html += '<div class="tit">鎵撳崱浜�</div><div class="txt">' + item.userName + '</div></div></div>'; + html += '<div class="cd"><div class="con loc"><div class="tit">鍧愭爣</div>' + html += '<div class="txt">' + item.longitude + ', ' + item.latitude + + '</div></div></div></div></div></li>' + }) } else { html += '<li><div class="item" style="text-align: center;font-size: 20px;color:#dd524d;padding-top: 18px;">鏆傛棤宸℃洿淇℃伅</div></li>'; diff --git a/igds-app/js/admin/warn-list.js b/igds-app/js/admin/warn-list.js index fcc2d10..8c7519c 100644 --- a/igds-app/js/admin/warn-list.js +++ b/igds-app/js/admin/warn-list.js @@ -1,6 +1,6 @@ var url = null; var dateTime; -var warnData = null; +var warnList = null; var data = { "interfaceId": "5801", "tokenAuth": "", @@ -34,7 +34,7 @@ url = user.url + "/api-phone/v35/gateway"; dateTime = getDate(new Date()) - $('#date').val(dateTime) + document.getElementById("date").value = dateTime //鑾峰彇璀﹀憡璁板綍 getWarnList(); @@ -56,8 +56,8 @@ data: JSON.stringify(data), success: function(result) { if (result.code == "0000") { - warnData = result.data; - console.log(warnData) + warnList = result.data; + console.log(warnList) renderWarn(); } else { renderWarn(); @@ -149,13 +149,11 @@ //鍔犲噺澶╂暟 function addAndReduceMonth(tag) { - var date = new Date(dateTime); - date = date.setDate(date.getDate() + tag); date = new Date(date); dateTime = getDate(date); - $('#date').val(dateTime) + document.getElementById("date").value = dateTime //鑾峰彇璀﹀憡璁板綍 getWarnList(); } @@ -167,63 +165,55 @@ // endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡 }) dtpicker.show(function(e) { + dateTime = e.value; document.getElementById("date").value = e.value + getWarnList(); }) } - - - //娓叉煋椤甸潰 function renderWarn() { var html = ''; - if (warnData) { - var warnList = warnData.data; - if (warnList && warnList.length > 0) { - $.each(warnList, function(index, item) { - html += '<li><div class="con myfancy" onclick="openPop(\'' + item.id + '\',\'' + (item.remark == - null ? "" : item.remark) + '\',\'' + item.status + '\')">'; - if (item.status == '10') { - html += '<span class="type">鏈鐞�</span>'; - } - if (item.status == '20') { - html += '<span class="type k">澶勭悊寤惰繜</span>'; - } - if (item.status == '30') { - html += '<span class="type k">宸插鐞�</span>'; - } - if (item.status == '40') { - html += '<span class="type k">蹇界暐</span>'; - } - html += '<div class="tit">璀﹀憡鍚嶇О: <span>' + item.name + '</span></div>'; - html += '<div class="txt">'; - html += '<div class="box"><div class="group c"><div class="desc">' + item.type + - '</div><div class="ort">璀﹀憡绫诲瀷</div></div></div>'; - 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') { - html += - '<div class="box"><div class="group level-2"><div class="desc">楂樼骇</div><div class="ort">璀﹀憡绾у埆</div></div></div></div>'; - } - if (item.level == '2') { - html += - '<div class="box"><div class="group level-1"><div class="desc">涓骇</div><div class="ort">璀﹀憡绾у埆</div></div></div></div>'; - } + if (warnList && warnList.length > 0) { + $.each(warnList, function(index, item) { + html += '<li><div class="con myfancy" onclick="openPop(\'' + item.id + '\',\'' + (item.remark == + null ? "" : item.remark) + '\',\'' + item.status + '\')">'; + if (item.status == '10') { + html += '<span class="type">鏈鐞�</span>'; + } + if (item.status == '20') { + html += '<span class="type k">澶勭悊寤惰繜</span>'; + } + if (item.status == '30') { + html += '<span class="type k">宸插鐞�</span>'; + } + if (item.status == '40') { + html += '<span class="type k">蹇界暐</span>'; + } + html += '<div class="tit">璀﹀憡鍚嶇О: <span>' + item.name + '</span></div>'; + html += '<div class="txt">'; + html += '<div class="box"><div class="group c"><div class="desc">' + item.type + + '</div><div class="ort">璀﹀憡绫诲瀷</div></div></div>'; + 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') { + html += + '<div class="box"><div class="group level-2"><div class="desc">楂樼骇</div><div class="ort">璀﹀憡绾у埆</div></div></div></div>'; + } + if (item.level == '2') { + html += + '<div class="box"><div class="group level-1"><div class="desc">涓骇</div><div class="ort">璀﹀憡绾у埆</div></div></div></div>'; + } - html += '<div class="tit coation">璀﹀憡鍐呭: <span>' + item.info + '</span></div>'; - html += '<div class="time">' + item.time + '</div></div></li>'; - }) - } else { - html += - '<li><div class="con myfancy" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤璀﹀憡淇℃伅</div></li>'; - } + html += '<div class="tit coation">璀﹀憡鍐呭: <span>' + item.info + '</span></div>'; + html += '<div class="time">' + item.time + '</div></div></li>'; + }) } else { html += '<li><div class="con myfancy" style="text-align: center;font-size: 20px;color:#dd524d">鏆傛棤璀﹀憡淇℃伅</div></li>'; } $("#recordList").html(html); - } diff --git a/igds-app/security-manager.html b/igds-app/security-manager.html index 17fe59d..8aeab86 100644 --- a/igds-app/security-manager.html +++ b/igds-app/security-manager.html @@ -29,7 +29,8 @@ </a> </li> <li> - <a id="depot-list" class="con" style="background-image: url(images/icons/a-bg2.png);"> + <!-- id="depot-list" --> + <a class="con" style="background-image: url(images/icons/a-bg2.png);"> <div class="tit">闂ㄧ绠$悊</div> <div class="icon"> <img src="images/icons/a-i2.png" alt=""> -- Gitblit v1.9.3