From 4f20ad52b8d4ab206e3458e488d3950eb2bfb5a3 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 07 六月 2023 16:35:55 +0800
Subject: [PATCH] 细节调整
---
igds-app/js/admin/es-detail.js | 20 +-
igds-app/js/admin/inout-real.js | 2
igds-app/js/admin/security-patrol.js | 9
igds-app/js/admin/work-apply.js | 105 ++++++++-
igds-app/js/admin/work-record.js | 9
igds-app/js/admin/warn-list.js | 7
igds-app/css/admin/security-patrol.css | 2
igds-app/css/admin/work-apply.css | 175 +++++++++++++---
igds-app/security-patrol.html | 3
igds-app/work-apply.html | 27 ++
igds-app/security-video.html | 3
igds-app/work-audit.html | 4
igds-app/warn-list.html | 12
igds-app/js/admin/inout-in-record.js | 56 ++--
igds-app/js/admin/es-read-meter.js | 108 ++++++----
igds-app/js/admin/inout-out-record.js | 6
igds-app/js/admin/security-video.js | 2
igds-app/js/admin/grain-history.js | 25 +
igds-app/js/admin/work-audit.js | 5
igds-app/work-record.html | 3
igds-app/js/admin/es-real-electric.js | 12
21 files changed, 413 insertions(+), 182 deletions(-)
diff --git a/igds-app/css/admin/security-patrol.css b/igds-app/css/admin/security-patrol.css
index aaae868..53f56ba 100644
--- a/igds-app/css/admin/security-patrol.css
+++ b/igds-app/css/admin/security-patrol.css
@@ -80,7 +80,7 @@
position: relative;
font-size: 15px;
color: #fff;
- margin: 15px 0 10px 0;
+ margin: 15px 0 5px 0;
}
.ul-cardb1 .tit::before{
content: "";
diff --git a/igds-app/css/admin/work-apply.css b/igds-app/css/admin/work-apply.css
index cacb731..752f66a 100644
--- a/igds-app/css/admin/work-apply.css
+++ b/igds-app/css/admin/work-apply.css
@@ -1,40 +1,143 @@
-.m-gd .group{
- background-color: #fff;
- border-radius: 10px;
- box-shadow: 0 0 4px rgba(0,64,40,.1);
- padding: 20px 15px;
- margin-bottom: 15px;
- overflow: hidden;
- font-size: 16px;
- color: #000;
+.m-gd .group {
+ background-color: #fff;
+ border-radius: 10px;
+ box-shadow: 0 0 4px rgba(0, 64, 40, .1);
+ padding: 20px 15px;
+ margin-bottom: 15px;
+ overflow: hidden;
+ font-size: 16px;
+ color: #000;
}
-.m-gd .l{
- min-width: 80px;
- margin-right: 10px;
+
+.m-gd .l {
+ min-width: 80px;
+ margin-right: 10px;
}
-.m-gd .r{
- float: none;
- width: auto;
- text-align: right;
- overflow: hidden;
- padding-right: 16px;
- background: url(../../images/a2.png) no-repeat right center;
- background-size: 6px;
+
+.m-gd .r {
+ float: none;
+ width: auto;
+ text-align: right;
+ overflow: hidden;
+ padding-right: 16px;
+ background: url(../../images/a2.png) no-repeat right center;
+ background-size: 6px;
}
-.m-gd .placeholder{
- color: #c3c3c3;
+
+.m-gd .placeholder {
+ color: #c3c3c3;
}
-.m-gd .submit{
- display: block;
- width: 77%;
- text-align: center;
- background: linear-gradient(90deg,#178255,#379a71);
- font-size: 18px;
- color: #fff;
- border-radius: 22px;
- height: 44px;
- line-height: 44px;
- border: none;
- padding: 0;
- margin: 30px auto 0;
- }
\ No newline at end of file
+
+.m-gd .submit {
+ display: block;
+ width: 77%;
+ text-align: center;
+ background: linear-gradient(90deg, #178255, #379a71);
+ font-size: 18px;
+ color: #fff;
+ border-radius: 22px;
+ height: 44px;
+ line-height: 44px;
+ border: none;
+ padding: 0;
+ margin: 30px auto 0;
+}
+
+.m-pop-caution {
+ padding: 15px 15px 25px;
+}
+
+.m-pop-caution .btns {
+ display: block;
+ text-align: center;
+}
+
+.m-pop-caution .btns button {
+ margin: 0 6px;
+}
+
+.m-pop-caution .h3 {
+ text-align: left;
+ font-size: 16px;
+}
+
+.m-pop-caution .h3 span {
+ color: #ff2323;
+
+}
+
+.m-pop-caution textarea {
+ background-color: #f5f6f7;
+ border-radius: 10px;
+ margin-bottom: 15px;
+ border: none;
+ min-height: 100px;
+
+}
+
+.m-pop-caution .mui-input-row {
+ margin-bottom: 25px;
+}
+
+.m-server {
+ width: 300px;
+ background-color: #fff;
+ border-radius: 10px;
+ overflow: hidden;
+ padding: 28px 25px 30px;
+}
+
+.m-server .h3 {
+ text-align: center;
+ font-size: 18px;
+ font-weight: bold;
+ color: #000;
+ margin-bottom: 18px;
+}
+
+
+.m-server .mui-input-row {
+ background-color: #f5f6f7;
+ border-radius: 10px;
+ margin-bottom: 15px;
+ padding: 4px 0;
+}
+
+.m-server .mui-input-row label {
+ font-size: 16px;
+ font-weight: bold;
+ width: 27%;
+ padding-right: 0;
+}
+
+.m-server .mui-input-row input {
+ font-size: 16px;
+ color: #000;
+ width: 73%;
+}
+
+.m-server .btns {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 25px;
+}
+
+.m-server .mui-btn {
+ width: 110px;
+ border-radius: 20px;
+ font-size: 15px;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ border: none;
+}
+
+.m-server .mui-btn.cancel {
+ color: #888888;
+ background-color: #eeeeee;
+}
+
+.m-server .mui-btn.confirm {
+ color: #fff;
+ background: linear-gradient(90deg, #52b88f, #64c388);
+}
\ No newline at end of file
diff --git a/igds-app/js/admin/es-detail.js b/igds-app/js/admin/es-detail.js
index de8bc24..6e6525b 100644
--- a/igds-app/js/admin/es-detail.js
+++ b/igds-app/js/admin/es-detail.js
@@ -143,29 +143,29 @@
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>'
+ ' <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>'
+ ' <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>'
+ ' <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>'
+ ' <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>'
+ ' <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 class="g-titck1">鏆傛棤鑳借�楄鎯呬俊鎭�</div>'
html += '<div class="m-energy1"><div class="inner"><div class="con con1">'
- html += '<div class="num"><div class="l"></div><span>KWh</span></div><div class="desc">璧峰鑳借��</div></div></div>'
+ html += '<div class="num"><div class="l"></div>0<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><span>KWh</span></div><div class="desc">鎴鑳借��</div></div></div></div>'
+ html += '<div class="num"><div class="l"></div>0<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"><span>KWh</span></div><div class="desc">鏈夊姛鐢佃兘</div></div></li>'
- html += '<li><div class="con"><div class="num"><span>KWh</span></div><div class="desc">鏃犲姛鐢佃兘</div></div></li>'
- html += '<li><div class="con"><div class="num"><span>KWh</span></div><div class="desc">鎬荤數鑳�</div></div></li>'
+ html += '<li><div class="con"><div class="num">0<span> KWh</span></div><div class="desc">鏈夊姛鐢佃兘</div></div></li>'
+ html += '<li><div class="con"><div class="num">0<span> KWh</span></div><div class="desc">鏃犲姛鐢佃兘</div></div></li>'
+ html += '<li><div class="con"><div class="num">0<span> KWh</span></div><div class="desc">鎬荤數鑳�</div></div></li>'
html += '</ul></div></div></div>'
}
diff --git a/igds-app/js/admin/es-read-meter.js b/igds-app/js/admin/es-read-meter.js
index b14cd7b..c18a400 100644
--- a/igds-app/js/admin/es-read-meter.js
+++ b/igds-app/js/admin/es-read-meter.js
@@ -43,12 +43,15 @@
type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈�
// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡
-
+ value:dateTime
})
+ var time = dateTime;
dtpicker.show(function(e) {
dateTime = e.value;
document.getElementById("date").value = e.value
- getMeterList();
+ if(time != dateTime){
+ getMeterList();
+ }
})
}
//鍔犲噺鏃ユ湡锛堝ぉ鏁帮級
@@ -86,47 +89,49 @@
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": ""
- }
- ]
+ // 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": ""
+ // }
+ // ]
+
+
}
//娓叉煋椤甸潰
function renderData() {
@@ -137,16 +142,23 @@
' <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>'
+ ' <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 += '<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>'
html += '</ul></div></div>';
})
} else {
- html +=
- '<div class="m-ck-cont"><div style="text-align: center;font-size: 20px;color:#dd524d;">鏆傛棤杩滅▼鎶勮〃淇℃伅</div></div>';
+ html += '<div class="m-ck-cont"><div class="g-titck1">鏆傛棤淇℃伅 <span class="right">鏇存柊鏃堕棿: 2023-01-01 00:00:00</span></div>';
+ html += '<div class="m-energy2"><ul class="ul-txtliste1"><li><div class="con">';
+ html += '<div class="num">0<span> KWh</span></div><div class="desc">鏈夊姛鐢佃兘</div></div></li>';
+ html += '<li><div class="con"><div class="num">0<span> KWh</span></div>'
+ html += '<div class="desc">鏃犲姛鐢佃兘</div></div></li>';
+ html += '<li><div class="con"><div class="num">0<span> KWh</span></div>';
+ html += '<div class="desc">鎬荤數鑳�</div></div></li>'
+ html += '</ul></div></div>';
+
}
$("#recordList").html(html);
}
diff --git a/igds-app/js/admin/es-real-electric.js b/igds-app/js/admin/es-real-electric.js
index aaf0ff1..41098cb 100644
--- a/igds-app/js/admin/es-real-electric.js
+++ b/igds-app/js/admin/es-real-electric.js
@@ -139,12 +139,12 @@
html += '<span class="bg" style="background-image: url(images/d1.png);"></span>';
html += '<span>鏆傛棤閰嶇數鏁版嵁</span></div></div>';
html += '<div class="inner"><div class="info">鏇存柊鏃堕棿: <span style="font-size:15px"></span></div>';
- html += '<div class="txt"><div class="num"><span> V</span></div><div class="desc">A鐩哥數鍘�</div></div>';
- html += '<div class="txt"><div class="num"><span> V</span></div><div class="desc">B鐩哥數鍘�</div></div>';
- html += '<div class="txt"><div class="num"><span> V</span></div><div class="desc">B鐩哥數鍘�</div></div>';
- html += '<div class="txt"><div class="num"><span> V</span></div><div class="desc">A鐩哥數娴�</div></div>';
- html += '<div class="txt"><div class="num"><span> V</span></div><div class="desc">B鐩哥數娴�</div></div>';
- html += '<div class="txt"><div class="num"><span> V</span></div><div class="desc">C鐩哥數娴�</div></div>';
+ html += '<div class="txt"><div class="num">0<span> V</span></div><div class="desc">A鐩哥數鍘�</div></div>';
+ html += '<div class="txt"><div class="num">0<span> V</span></div><div class="desc">B鐩哥數鍘�</div></div>';
+ html += '<div class="txt"><div class="num">0<span> V</span></div><div class="desc">B鐩哥數鍘�</div></div>';
+ html += '<div class="txt"><div class="num">0<span> V</span></div><div class="desc">A鐩哥數娴�</div></div>';
+ html += '<div class="txt"><div class="num">0<span> V</span></div><div class="desc">B鐩哥數娴�</div></div>';
+ html += '<div class="txt"><div class="num">0<span> V</span></div><div class="desc">C鐩哥數娴�</div></div>';
html += '</div></div></li>'
}
$("#recordList").html(html);
diff --git a/igds-app/js/admin/grain-history.js b/igds-app/js/admin/grain-history.js
index da2958b..a0866d0 100644
--- a/igds-app/js/admin/grain-history.js
+++ b/igds-app/js/admin/grain-history.js
@@ -50,6 +50,7 @@
$("#depot").val(depotName);
//鑾峰彇浠撳簱鍒楄〃
getDepotList();
+ getHistoryList();
}
//鏌ヨ鍘嗗彶鏁版嵁
@@ -171,23 +172,29 @@
date = new Date(date);
dateTime = getDate(date);
$("#dateTime").val(dateTime);
+ getHistoryList()
}
//閫夋嫨鏃ユ湡
function chooseDate() {
var dtpicker = new mui.DtPicker({
type: "month", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
+ value: dateTime
})
+ var time = dateTime
dtpicker.show(function(e) {
dateTime = e.value;
$("#dateTime").val(dateTime);
})
+ if(time != dateTime){
+ getHistoryList()
+ }
}
//閫夋嫨浠撳簱
function chooseDepot() {
var groupPicker = new mui.PopPicker();
-
+ console.log(JSON.stringify(depotData))
groupPicker.setData(depotData);
groupPicker.show(function(items) {
@@ -210,6 +217,7 @@
success: function(result) {
if (result.code == "0000") {
depotList = result.data;
+ // console.log(JSON.stringify(depotList))
renderDepotData();
} else {
mui.toast("娌℃湁浠撳簱淇℃伅锛�");
@@ -223,17 +231,18 @@
//娓叉煋浠撳簱閫夋嫨鏁版嵁
function renderDepotData() {
- depotData = [];
+ var fenl = {};
$.each(depotList, function(index, item) {
- depotData.push({
- value: item.depotId,
- text: item.depotName
- });
+ fenl = {
+ value: item.id,
+ text: item.name,
+ }
+ depotData.push(fenl);
})
}
mui('.mui-scroll-wrapper').scroll({
- indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
+ indicators: true, //鏄惁鏄剧ず婊氬姩鏉�
deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
bounce: false, //鏄惁鍚敤鍥炲脊
deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
@@ -252,4 +261,4 @@
}
})
}
-});
+});
\ No newline at end of file
diff --git a/igds-app/js/admin/inout-in-record.js b/igds-app/js/admin/inout-in-record.js
index afe6967..582ed31 100644
--- a/igds-app/js/admin/inout-in-record.js
+++ b/igds-app/js/admin/inout-in-record.js
@@ -48,7 +48,6 @@
inRecordData = result.data;
renderData();
} else {
-
renderData();
mui.toast(result.msg);
console.log(JSON.stringify(result))
@@ -58,30 +57,31 @@
mui.alert("绯荤粺绻佸繖,璇烽噸璇曪紒", "鎻愮ず", ["纭畾"], function() {}, "div")
}
})
- inRecordData = {
- "sum": "55",
- "listInout": [{
- "id": "98",
- "plateNum": "39",
- "depotId": "83",
- "depotName": "鑳藉闄呮硶楂樼瓑",
- "foodVariety": "quis Ut",
- "foodVarietyName": "琚緳娴庢潵",
- "recordWeight": "25",
- "completeTime": "1971-10-20 14:45:38"
- },
- {
- "id": "37",
- "plateNum": "50",
- "depotId": "16",
- "depotName": "鍑嗘皯闈掑叡宸�",
- "foodVariety": "aliquip eiusmod laborum nulla",
- "foodVarietyName": "鍙疯蛋鏍瑰舰",
- "recordWeight": "30",
- "completeTime": "1971-04-09 06:42:06"
- }
- ],
- }
+ // inRecordData = {
+ // "sum": "55",
+ // "listInout": [{
+ // "id": "98",
+ // "plateNum": "39",
+ // "depotId": "83",
+ // "depotName": "鑳藉闄呮硶楂樼瓑",
+ // "foodVariety": "quis Ut",
+ // "foodVarietyName": "琚緳娴庢潵",
+ // "recordWeight": "25",
+ // "completeTime": "1971-10-20 14:45:38"
+ // },
+ // {
+ // "id": "37",
+ // "plateNum": "50",
+ // "depotId": "16",
+ // "depotName": "鍑嗘皯闈掑叡宸�",
+ // "foodVariety": "aliquip eiusmod laborum nulla",
+ // "foodVarietyName": "鍙疯蛋鏍瑰舰",
+ // "recordWeight": "30",
+ // "completeTime": "1971-04-09 06:42:06"
+ // }
+ // ],
+ // }
+
}
@@ -139,12 +139,14 @@
type: "date" ,//璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
value: dateTime
})
+ var time = dateTime
dtpicker.show(function(e) {
dateTime = e.value;
$("#dateTime").val(dateTime);
+ if(time != dateTime){
+ getInRecordList();
+ }
})
-
- getInRecordList();
}
//榛樿鑾峰彇褰撳墠鏃ユ湡(yyyy-MM-dd)
diff --git a/igds-app/js/admin/inout-out-record.js b/igds-app/js/admin/inout-out-record.js
index 7431834..cb81c3d 100644
--- a/igds-app/js/admin/inout-out-record.js
+++ b/igds-app/js/admin/inout-out-record.js
@@ -135,12 +135,14 @@
type: "date" ,//璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
value: dateTime
})
+ var time = dateTime
dtpicker.show(function(e) {
dateTime = e.value;
$("#dateTime").val(dateTime);
+ if(time != dateTime){
+ getOutRecordList();
+ }
})
-
- getOutRecordList();
}
//榛樿鑾峰彇褰撳墠鏃ユ湡(yyyy-MM-dd)
diff --git a/igds-app/js/admin/inout-real.js b/igds-app/js/admin/inout-real.js
index a041212..2d41e34 100644
--- a/igds-app/js/admin/inout-real.js
+++ b/igds-app/js/admin/inout-real.js
@@ -91,7 +91,7 @@
$("#outSumNum").html("0");
$("#outCompleteNum").html("0");
$("#perOutComplete").html("0");
- $("#time").html("鏇存柊鏃堕棿锛�" + recordData.time);
+ $("#time").html("鏇存柊鏃堕棿锛�2023-01-01 00:00:00");
html += '<div class="id" style="text-align: center;">鏆傛棤瀹炴椂淇℃伅</div>';
}
$("#listInout").html(html);
diff --git a/igds-app/js/admin/security-patrol.js b/igds-app/js/admin/security-patrol.js
index 7b656bf..74e9424 100644
--- a/igds-app/js/admin/security-patrol.js
+++ b/igds-app/js/admin/security-patrol.js
@@ -52,7 +52,6 @@
data1.data.deptId = selectDeptId;
dateTime = getDate(new Date())
document.getElementById("date").value = dateTime;
- console.log(JSON.stringify(data.data),"鐢靛瓙宸℃洿璁板綍","security-patrol")
//鑾峰彇宸℃洿璁板綍
getPatrolList()
@@ -92,16 +91,20 @@
// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡
value: dateTime
})
+ var time = dateTime;
dtpicker.show(function(e) {
dateTime = e.value;
document.getElementById("date").value = e.value
- getPatrolList();
+ if(time != dateTime){
+ getPatrolList();
+ }
})
}
//鑾峰彇宸℃洿璁板綍
function getPatrolList() {
//璧嬪�煎弬鏁扮殑鏃ユ湡
data.data.dataTime = dateTime;
+ console.log(JSON.stringify(data.data),"鐢靛瓙宸℃洿璁板綍","security-patrol")
mui.ajax(url, {
type: "POST",
dataType: "json",
@@ -168,7 +171,7 @@
}
mui('.mui-scroll-wrapper').scroll({
- indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
+ indicators: true, //鏄惁鏄剧ず婊氬姩鏉�
deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
bounce: false, //鏄惁鍚敤鍥炲脊
deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
diff --git a/igds-app/js/admin/security-video.js b/igds-app/js/admin/security-video.js
index 98d34ab..f854281 100644
--- a/igds-app/js/admin/security-video.js
+++ b/igds-app/js/admin/security-video.js
@@ -111,7 +111,7 @@
item.name + ' (鏋満)</div></div>';
}else if (item.type == '02') {
- html += '<div class="left"><div class="icon"><img src="images/icons/g-i13.png" alt=""></div><div class="name">' +
+ html += '<div class="left"><div class="icon"><img src="images/icons/g-i13.png" alt=""></div><div class="name">' +
item.name + ' (鐞冩満)</div></div>';
}
diff --git a/igds-app/js/admin/warn-list.js b/igds-app/js/admin/warn-list.js
index c157ce3..98850b7 100644
--- a/igds-app/js/admin/warn-list.js
+++ b/igds-app/js/admin/warn-list.js
@@ -161,10 +161,13 @@
// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡
value: dateTime
})
+ var time = dateTime
dtpicker.show(function(e) {
dateTime = e.value;
document.getElementById("date").value = e.value
- getWarnList();
+ if(time != dateTime){
+ getWarnList();
+ }
})
}
@@ -270,7 +273,7 @@
//婊戝姩
mui('.mui-scroll-wrapper').scroll({
- indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
+ indicators: true, //鏄惁鏄剧ず婊氬姩鏉�
deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
bounce: false, //鏄惁鍚敤鍥炲脊
deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
diff --git a/igds-app/js/admin/work-apply.js b/igds-app/js/admin/work-apply.js
index bf9b1a8..ae12d9e 100644
--- a/igds-app/js/admin/work-apply.js
+++ b/igds-app/js/admin/work-apply.js
@@ -1,7 +1,12 @@
var url = null;
var depotData;
+var typeData;
+var startTime = '';
+var endTime = '';
var name = ''
+var info = '';
var listPicker2 = [];
+var listPicker1 = [];
var list = [{
value: 'ywj',
text: '钁ｄ簨闀� 鍙舵枃娲�'
@@ -44,21 +49,13 @@
"type": "",
"startTime": "",
"endTime": "",
+ "info": ""
}
-};
-//鑾峰彇搴撳尯鍒楄〃
-var data1 = {
- "interfaceId": "5002",
- "outId": "10002",
- "reqDateTime": new Date(),
- "tokenAuth": "",
- "data": {}
};
//鑾峰彇浠撳簱鍒楄〃
var data2 = {
"interfaceId": "5102",
- "sign": "10102",
"outId": "10102",
"reqDateTime": new Date(),
"tokenAuth": "",
@@ -67,46 +64,61 @@
}
};
+//鑾峰彇涓氬姟绫诲瀷
+var data1 = {
+ "interfaceId": "6101",
+ "outId": "11101",
+ "reqDateTime": new Date(),
+ "tokenAuth": "",
+ "data": {
+
+ }
+};
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;
+ data1.tokenAuth = user.tokenAuth;
data2.tokenAuth = user.tokenAuth;
data2.data.deptId = selectDeptId;
+
depotList();
+ typeList();
}
-
+//寮�濮嬫椂闂�
function chooseDate() {
var dtpicker = new mui.DtPicker({
// type: "hour", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
type: "datetime",
// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈�
// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡
-
+ value: startTime
})
dtpicker.show(function(e) {
var date_el = document.getElementById("date1-val")
date_el.innerText = e.value
- data.data.startTime = e.value;
+ startTime = e.value
+ data.data.startTime = startTime;
jQuery(date_el).prev().hide()
})
}
-
+//
function chooseDate1() {
var dtpicker = new mui.DtPicker({
// type: "hour", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡
type: "datetime",
// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈�
// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡
- value: dateTime
+ value:endTime
})
dtpicker.show(function(e) {
var date_el = document.getElementById("date2-val")
date_el.innerText = e.value
- data.data.endTime = e.value
+ endTime = e.value
+ data.data.endTime = endTime
jQuery(date_el).prev().hide()
})
}
@@ -159,7 +171,28 @@
}
})
}
-
+function typeList() {
+ //鑾峰彇浠撳簱鍒楄〃
+ mui.ajax(url, {
+ type: "POST",
+ dataType: "json",
+ crossDomain: true,
+ contentType: "application/json;charset=utf-8",
+ data: JSON.stringify(data1),
+ success: function(result) {
+ if (result.code == "0000") {
+ typeData = result.data
+ conversionType(typeData);
+ // console.log(JSON.stringify(result))
+ } else {
+ mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
+ }
+ },
+ error: function() {
+ mui.alert('绯荤粺绻佸繖,璇烽噸鏂扮櫥褰曞皾璇曪紒', '鎻愮ず', ["纭畾"], function() {}, "div");
+ }
+ })
+}
function conversion(data) {
var fenl = {}
$.each(data, function(index, item) {
@@ -170,7 +203,16 @@
listPicker2.push(fenl)
})
}
-
+function conversionType(data){
+ var fenl = {}
+ $.each(data, function(index, item) {
+ fenl = {
+ value: item.name,
+ text: item.id,
+ }
+ listPicker1.push(fenl)
+ })
+}
function refresh(){
var html = '';
html += '<div class="m-gd"><div class="group"><div class="l">涓氬姟绫诲瀷:</div><div class="r">'
@@ -185,17 +227,23 @@
html += '<div class="group"><div class="l">鏈夋晥缁撴潫鏃堕棿:</div><div class="r">';
html += '<div class="val" id="date2" onclick="chooseDate1();"><div class="placeholder">璇烽�夋嫨</div>';
html += '<div class="real-val" id="date2-val"></div></div></div></div>';
+ html += '<div class="group"><div class="l">宸ュ崟鍐呭:</div><div class="r">'
+ html += '<div class="gdnr" id="gdnr" "><div class="placeholder">璇烽�夋嫨</div>'
+ html += '<div class="real-val" id="gdnr-val"></div></div></div></div>'
html += '<div type="submit" class="submit">鎻愪氦</div></div>';
$("#refresh").html(html);
data.data.depotId = '';
data.data.type = ''
data.data.startTime = ''
data.data.endTime = ''
+ info = ''
+ data.data.info = info
}
//鎻愪氦
mui(".mui-scroll").on("tap", ".wp form .submit", function() {
+ data.data.info = info;
workApply();
// window.location.reload();
window.setTimeout(function() {
@@ -228,7 +276,7 @@
showUserPickerButton.addEventListener('tap', function(event) {
var userResult = doc.getElementById('ywlx-val');
var userPicker = new $.PopPicker();
- userPicker.setData(list);
+ userPicker.setData(listPicker1);
userPicker.show(function(items) {
// userResult.innerText = JSON.stringify(items[0]);
console.log(JSON.stringify(items))
@@ -257,4 +305,23 @@
});
}, false);
});
-})(mui, document);
\ No newline at end of file
+})(mui, document);
+
+//鎵撳紑寮圭獥
+mui(".mui-scroll").on("tap", ".wp form .gdnr", function() {
+ document.getElementById("textareaPop").value = info;
+ $("#m-pop").css('display', 'flex');
+})
+
+//鍏抽棴寮圭獥
+function closePop() {
+ $("#m-pop").css('display', 'none');
+}
+//寮圭獥纭畾鎸夐挳
+mui(".mui-content").on("tap", ".m-pop .inner .confirm", function() {
+ info = document.getElementById("textareaPop").value;
+ if(info){
+ document.getElementById("gdnr").innerText = info
+ }
+ closePop();
+})
\ No newline at end of file
diff --git a/igds-app/js/admin/work-audit.js b/igds-app/js/admin/work-audit.js
index 16a56ff..8449f91 100644
--- a/igds-app/js/admin/work-audit.js
+++ b/igds-app/js/admin/work-audit.js
@@ -121,8 +121,7 @@
'<div class="box"><ul class="gd-list"><li><a href="" class="con" style="background-image: url(images/icons/a-bg12.png);">';
html += '<div class="tit">涓氬姟绫诲瀷:</div><div class="name">' + item.type + '</div></a></li>';
html += '<li><a href="" class="con" style="background-image: url(images/icons/a-bg13.png);">';
- html += '<div class="tit">鍏宠仈浠撳簱:</div><div class="name">' + (item.depotName == null ? "--" : item
- .depotName) + '</div></a></li></ul>';
+ html += '<div class="tit">鍏宠仈浠撳簱:</div><div class="name">' + (item.depotName == null ? "--" : item.depotName) + '</div></a></li></ul>';
html += '<div class="time">鏈夋晥鏈�: ' + item.startTime + '鑷�' + item.endTime + ' </div>';
html += '<div class="btns"><a href="" id = "' + item.id +
'" class="btn refuse">鎷掔粷</a><a href="" id = "' + item.id + '" class="btn adopt">閫氳繃</a></div>';
@@ -190,7 +189,7 @@
}
mui('.mui-scroll-wrapper').scroll({
- indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
+ indicators: true, //鏄惁鏄剧ず婊氬姩鏉�
deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
bounce: false, //鏄惁鍚敤鍥炲脊
deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
diff --git a/igds-app/js/admin/work-record.js b/igds-app/js/admin/work-record.js
index fa8e1f2..762ec98 100644
--- a/igds-app/js/admin/work-record.js
+++ b/igds-app/js/admin/work-record.js
@@ -35,7 +35,7 @@
renderRecordList();
} else {
renderRecordList();
- mui.alert(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
+ mui.toast(result.msg, '鎻愮ず', ["纭畾"], function() {}, "div");
}
},
error: function() {
@@ -92,6 +92,8 @@
"depotName": "浜虹瀹冨啗棰�"
}
]
+
+
}
function renderRecordList() {
@@ -109,8 +111,7 @@
html += '<li><a href="" class="con"style="background-image: url(images/icons/a-bg12.png);">';
html += '<div class="tit">涓氬姟绫诲瀷:</div><div class="name">' + item.type + '</div></a></li>';
html += '<li><a href="" class="con"style="background-image: url(images/icons/a-bg13.png);">';
- html += '<div class="tit">鍏宠仈浠撳簱:</div><div class="name">' + (item.depotName == null ? "--" : item
- .depotName) + '</div></a></li></ul>';
+ html += '<div class="tit">鍏宠仈浠撳簱:</div><div class="name">' + (item.depotName == null ? "--" : item.depotName) + '</div></a></li></ul>';
html += '<div class="time"><p>鏈夋晥寮�濮嬫椂闂�: <span>' + item.startTime + '</span></p><p>鏈夋晥缁撴潫鏃堕棿: <span>' +
item.endTime + '</span></p></div>';
})
@@ -136,7 +137,7 @@
}
mui('.mui-scroll-wrapper').scroll({
- indicators: false, //鏄惁鏄剧ず婊氬姩鏉�
+ indicators: true, //鏄惁鏄剧ず婊氬姩鏉�
deceleration: 0.0006, //闃诲凹绯绘暟,绯绘暟瓒婂皬婊戝姩瓒婄伒鏁�
bounce: false, //鏄惁鍚敤鍥炲脊
deceleration: 0.0005 //flick 鍑忛�熺郴鏁帮紝绯绘暟瓒婂ぇ锛屾粴鍔ㄩ�熷害瓒婃參锛屾粴鍔ㄨ窛绂昏秺灏忥紝榛樿鍊�0.0006
diff --git a/igds-app/security-patrol.html b/igds-app/security-patrol.html
index 5530f01..837be78 100644
--- a/igds-app/security-patrol.html
+++ b/igds-app/security-patrol.html
@@ -29,7 +29,7 @@
<div class="mui-scroll-wrapper index-dzxg">
<div class="mui-scroll">
<ul class="ul-cardb1" id="recordList">
- <li>
+ <!-- <li>
<div class="item">
<div class="top">
<div class="date">2022-03-10 11:00</div>
@@ -139,6 +139,7 @@
</div>
</div>
</li>
+ -->
</ul>
</div>
</div>
diff --git a/igds-app/security-video.html b/igds-app/security-video.html
index 4be086f..184cfc5 100644
--- a/igds-app/security-video.html
+++ b/igds-app/security-video.html
@@ -29,7 +29,7 @@
class="video" webkit-playsinline="true" playsinline="true" controls></video>
</div>
<ul class="ul-locb1" id="recordList">
- <li>
+ <!-- <li>
<a onclick="getVideo(1,1)" class="con" style="background-image: url(images/icons/g-i15.png);">
<div class="left">
<div class="icon">
@@ -128,6 +128,7 @@
<div class="right"><span class="mui-icon mui-icon-forward"></span></div>
</a>
</li>
+ -->
</ul>
</div>
</div>
diff --git a/igds-app/warn-list.html b/igds-app/warn-list.html
index ba04b00..8b655e8 100644
--- a/igds-app/warn-list.html
+++ b/igds-app/warn-list.html
@@ -33,7 +33,7 @@
<div class="m-pow-dist">
<div class="m-caution-mana">
<ul class="ul-listmana ul-listcaut1" id="recordList">
- <li>
+ <!-- <li>
<div class="con myfancy" onclick="openPop('11')">
<span class="type">鏈鐞�</span>
<div class="tit">
@@ -133,7 +133,7 @@
</div>
</li>
-->
- </ul>
+ </ul>
</div>
</div>
@@ -151,13 +151,14 @@
</div>
</form>
<div class="btns" id="handleWarn">
- <div type="button" class="mui-btn cancel" onclick="handleWarn('1')">蹇界暐</div>
+ <div type="button" class="mui-btn cancel" onclick="handleWarn('1')">蹇界暐</div>
<div type="button" class="mui-btn confirm" onclick="handleWarn('2')">澶勭悊</div>
</div>
</div>
- <div class="close" onclick="closePop()"><span class="mui-icon mui-icon-close"></span></div>
+ <div class="close"><span class="mui-icon mui-icon-close" onclick="closePop()"></span></div>
</div>
</div>
+ </div>
</body>
<script src="./js/mui.min.js"></script>
<script src="./js/mui.picker.min.js"></script>
@@ -166,11 +167,10 @@
<script type="text/javascript" charset="utf-8">
//mui鍒濆鍖�
mui.init();
-
+
mui.plusReady(function() {
//鏁版嵁鍒濆鍖�
init();
})
-
</script>
</html>
\ No newline at end of file
diff --git a/igds-app/work-apply.html b/igds-app/work-apply.html
index cf547ae..9b0f46b 100644
--- a/igds-app/work-apply.html
+++ b/igds-app/work-apply.html
@@ -65,6 +65,15 @@
</div>
</div>
</div>
+ <div class="group">
+ <div class="l">宸ュ崟鍐呭:</div>
+ <div class="r">
+ <div class="gdnr" id="gdnr" ">
+ <div class="placeholder">璇峰～鍐�</div>
+ <div class="real-val" id="gdnr-val"></div>
+ </div>
+ </div>
+ </div>
<!-- <input type="submit" value="鎻愪氦" class="submit"/> -->
<div type="submit" class="submit">鎻愪氦</div>
@@ -74,6 +83,24 @@
</div>
</div>
</div>
+ <!-- 缂栬緫璇存槑 -->
+ <div id="m-pop" class="m-pop">
+ <div class="pop-bg"></div>
+ <div class="inner">
+ <div class="m-server m-pop-caution">
+ <div class="h3"><span class="red">*</span> 宸ュ崟鍐呭</div>
+ <form class="">
+ <div class="mui-input-row">
+ <textarea id="textareaPop" rows="" cols="" placeholder="璇疯緭鍏ヨ鏄�"></textarea>
+ </div>
+ </form>
+ <div class="btns">
+ <div type="button" class="mui-btn confirm" ">纭畾</div>
+ </div>
+ </div>
+ <div class="close"><span class="mui-icon mui-icon-close" onclick="closePop()"></span></div>
+ </div>
+ </div>
</div>
</body>
<script src="./js/mui.min.js"></script>
diff --git a/igds-app/work-audit.html b/igds-app/work-audit.html
index 7bc9e9a..69a89e7 100644
--- a/igds-app/work-audit.html
+++ b/igds-app/work-audit.html
@@ -23,7 +23,7 @@
<div class="mui-scroll">
<div class="wp">
<ul class="ul-gdsh" id="handleList">
- <li>
+ <!-- <li>
<div class="con">
<div class="top">
<div class="left">
@@ -147,8 +147,8 @@
</div>
</div>
</li>
+ -->
</ul>
-
</div>
</div>
</div>
diff --git a/igds-app/work-record.html b/igds-app/work-record.html
index 83fe109..bedac53 100644
--- a/igds-app/work-record.html
+++ b/igds-app/work-record.html
@@ -22,7 +22,7 @@
<div class="mui-scroll">
<div class="wp">
<ul class="ul-sqjl" id="handleList">
- <li>
+ <!-- <li>
<div class="con conInfo" info="111">
<span class="status">
<img src="images/icons/g-i28.png" alt="">
@@ -110,6 +110,7 @@
</div>
</div>
</li>
+ -->
</ul>
</div>
--
Gitblit v1.9.3