From 397dbf892f842c834af17a91c788c94fd96003f8 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 29 五月 2023 19:13:31 +0800
Subject: [PATCH] 问题修改

---
 igds-app/js/admin/es-detail.js |  115 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 67 insertions(+), 48 deletions(-)

diff --git a/igds-app/js/admin/es-detail.js b/igds-app/js/admin/es-detail.js
index 4ddac47..6cde7f7 100644
--- a/igds-app/js/admin/es-detail.js
+++ b/igds-app/js/admin/es-detail.js
@@ -22,7 +22,6 @@
 	data.tokenAuth = user.tokenAuth;
 	data.data.deptId = selectDeptId;
 	startTime = getDate(new Date());
-	
 	document.getElementById("start").value = startTime;
 	getEsDetailList();
 }
@@ -41,28 +40,44 @@
 	return year + "-" + month + "-" + day
 }
 
-function chooseDate(tag) {
+function chooseStartDate() {
 	var dtpicker = new mui.DtPicker({
 		type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡 
 		// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈� 
 		// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡 
+		value: startTime
 	})
-	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
-		})
-	}
+	var start = startTime;
+	dtpicker.show(function(e) {
+		startTime = e.value
+		document.getElementById("start").value = e.value
+		if (start != startTime) {
+			getEsDetailList();
+		}
+	})
+}
+
+function chooseEndDate() {
+	var dtpicker = new mui.DtPicker({
+		type: "date", //璁剧疆鏃ュ巻鍒濆瑙嗗浘妯″紡 
+		// beginDate: new Date(2015, 04, 25), //璁剧疆寮�濮嬫棩鏈� 
+		// endDate: new Date(2016, 04, 25), //璁剧疆缁撴潫鏃ユ湡 
+		value: endTime
+	})
+	var end = endTime;
+	dtpicker.show(function(e) {
+		endTime = e.value;
+		document.getElementById("end").value = e.value
+		if (end != endTime) {
+			getEsDetailList();
+		}
+	})
 }
 
 function getEsDetailList() {
 	data.data.startTime = startTime
 	data.data.endTime = endTime
+	console.log(JSON.stringify(data.data))
 	mui.ajax(url, {
 		type: "POST",
 		dataType: "json",
@@ -76,48 +91,47 @@
 			} 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"
- //        }
- //    ]
+	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() {
@@ -126,13 +140,18 @@
 		$.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="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="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 += '<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 {

--
Gitblit v1.9.3