From 83154e82ff44c7af4c99f206cec18a9b693e1304 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@192.168.10.18>
Date: 星期三, 12 十二月 2018 17:18:10 +0800
Subject: [PATCH] 122
---
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html | 154 ++++++++++++++++++++++-----------------------------
1 files changed, 67 insertions(+), 87 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
index d63de8e..68a38e6 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit.html
@@ -51,14 +51,18 @@
return selected;
}
var temp = getCookie("eleparm");
+ var tempindex = getCookie("eleparmindex");
//console.info(temp);
temp=JSON.parse(temp);
+ tempindex = JSON.parse(tempindex);
console.info(temp);
console.info(temp[30]);
console.info(temp[33]);
+ console.info(tempindex);
+
var suoyin = temp[33];
- $(function(){creatAllView(4)});
+ $(function(){creatAllView(tempindex.length)});
</script>
<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
<style type="text/css">
@@ -180,12 +184,6 @@
</td>
</tr>
<tr>
- <td>FBS鐢垫睜绱㈠紩(0-3)</td>
- <td>
- <input type="text" id="GroupIndexInFBSDevice" data-mini="true" />
- </td>
- </tr>
- <tr>
<td>鐢垫睜缁処D</td>
<td>
<input type="text" readonly unselectable="on" value="123" id="BattGroupId" class="uncheck" data-mini="true" />
@@ -197,12 +195,7 @@
<input type="text" readonly unselectable="on" value="123" id="BattGroupNum" class="uncheck" data-mini="true" />
</td>
</tr>
- <tr>
- <td>鐢垫睜缁勫悕绉�</td>
- <td>
- <input type="text" id="BattGroupName" data-mini="true" />
- </td>
- </tr>
+
<tr>
<td>娴厖鐢靛帇闃�鍊�(V)</td>
<td>
@@ -355,10 +348,10 @@
document.getElementById("FbsDeviceIp_YM").value = temp[9];
document.getElementById("FbsDeviceIp_WG").value = temp[10];
document.getElementById("FBSDeviceName").value = temp[11];
- document.getElementById("GroupIndexInFBSDevice").value = temp[12];
+ //document.getElementById("GroupIndexInFBSDevice").value = temp[12];
document.getElementById("BattGroupId").value = temp[13];
document.getElementById("BattGroupNum").value = temp[14];
- document.getElementById("BattGroupName").value = temp[15];
+ //document.getElementById("BattGroupName").value = temp[15];
document.getElementById("FloatVolLevel").value = temp[16];
document.getElementById("OfflineVolLevel").value = temp[17];
document.getElementById("BattFloatCurrent").value = temp[18];
@@ -378,51 +371,62 @@
setTimes($("#startTestrecord"),temp[30]);
setTimes($("#endTestrecord"),temp[31]);
document.getElementById("install_user").value = temp[32];
+ for(var i=0;i<tempindex.length;i++){
+ battname = "#battname"+i;
+ $(battname).val(tempindex[i]);
+ }
}
-
- // 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍骞惰繑鍥� 鍗曚釜淇敼锛屾墜鏈烘柟寮忎笉淇敼澶氫釜鐢垫睜缁�
- function getUpdateArr(){
+ // 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍淇敼
+ function getUpdateArr(){
var arr = new Array();
- var obj = new Object();
- obj.StationId = $("#StationId").val(); // 鏈烘埧缂栧彿
- obj.StationName = ($("#station_name1").val()+"-"+$("#city").val()+"-"+$("#StationName3").val()+"-"+$("#StationName4").val()); // 鎷兼帴鏈烘埧鍚嶇О
- obj.StationName1 = $("#station_name1").val(); // 鐪�
- obj.StationName2 = $("#city").val(); // 甯�
- obj.StationName5 = $("#county").val(); // 鍖�/鍘�
- obj.StationName3 = $("#StationName3").val(); // 鏈烘埧鍚嶇О
- obj.StationName4 = $("#StationName4").val(); // 璁惧鍚嶇О
- obj.StationIp = $("#StationIp").val(); //鏈烘埧ip
- obj.FBSDeviceId = $("#FBSDeviceId").val(); //璁惧id
- obj.FbsDeviceIp = $("#FbsDeviceIp").val(); //璁惧ip
- obj.FbsDeviceIp_YM = $("#FbsDeviceIp_YM").val(); // 璁惧鎺╃爜
- obj.FbsDeviceIp_WG = $("#FbsDeviceIp_WG").val(); // 缃戝叧
- obj.FBSDeviceName = $("#FBSDeviceName").val(); //璁惧鍚嶇О
- obj.GroupIndexInFBSDevice = $("#GroupIndexInFBSDevice").val(); //fbs璁惧绱㈠紩
- obj.BattGroupId = $("#BattGroupId").val(); //鐢垫睜缁刬d
- obj.BattGroupNum = $("#BattGroupNum").val(); //鏈烘埧鍐呯數姹犵粍缂栧彿
- obj.BattGroupName = $("#BattGroupName").val(); //鐢垫睜缁勫悕绉�
- obj.FloatVolLevel = $("#FloatVolLevel").val(); //娴厖鐢靛帇闃�鍊�
- obj.OfflineVolLevel = $("#OfflineVolLevel").val(); //绂荤嚎鐢靛帇闃�鍊�
- obj.BattFloatCurrent = $("#BattFloatCurrent").val(); //娴厖鐢垫祦闃�鍊�
- obj.MonCount = $("#MonCount").val(); //鍗曚綋鏁伴噺
- obj.MonCapStd = $("#MonCapStd").val(); //鏍囩О瀹归噺
- obj.MonVolStd = $("#MonVolStd").val(); //鏍囩О鐢靛帇
- obj.MonResStd = $("#MonResStd").val(); //鏍囩О鍐呴樆
- obj.MonSerStd = $("#MonSerStd").val(); //鏍囩О鐢靛
- obj.MonVolLowToAvg = $("#MonVolLowToAvg").val(); //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
-
-
- obj.Load_curr = $("#Load_curr").val(); //璐熻浇鐢垫祦
- obj.DisCurrMax = $("#DisCurrMax").val(); //鏈�澶ф牳瀹圭數娴�
- obj.station_phone = $("#station_phone").val(); //鍩虹珯鍙风爜
-
- obj.BattProducer = $("#BattProducer").val(); //鐢垫睜鍝佺墝
- obj.BattModel = $("#BattModel").val(); //鐢垫睜鍨嬪彿
- obj.BattProductDate = $("#startTestrecord").val(); //鐢垫睜鐢熶骇鏃ユ湡
- obj.BattInUseDate = $("#endTestrecord").val(); //鐢垫睜浣跨敤鏃ユ湡
- obj.install_user = $("#install_user").val(); //瀹夎浜哄憳
- arr.push(obj);
+ for(var i=0;i<tempindex.length;i++){
+ var battString = "#battname"+i;
+ var index = String(i);
+ console.info(battString);
+ var obj = {
+ //apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),
+ binf:{
+ StationId : $("#StationId").val(), // 鏈烘埧缂栧彿
+ StationName : ($("#station_name1").val()+"-"+$("#city").val()+"-"+$("#StationName3").val()+"-"+$("#StationName4").val()), // 鎷兼帴鏈烘埧鍚嶇О
+ StationName1 : $("#station_name1").val(), // 鐪�
+ StationName2 : $("#city").val(), // 甯�
+ StationName5 : $("#county").val(), // 鍖�/鍘�
+ StationName3 : $("#StationName3").val(), // 鏈烘埧鍚嶇О
+ StationName4 : $("#StationName4").val(), // 璁惧鍚嶇О
+ StationIp : $("#StationIp").val(), //鏈烘埧ip
+ FBSDeviceId : $("#FBSDeviceId").val(), //璁惧id
+ FbsDeviceIp : $("#FbsDeviceIp").val(), //璁惧ip
+ FbsDeviceIp_YM : $("#FbsDeviceIp_YM").val(), // 璁惧鎺╃爜
+ FbsDeviceIp_WG : $("#FbsDeviceIp_WG").val(), // 缃戝叧
+ FBSDeviceName : $("#FBSDeviceName").val(), //璁惧鍚嶇О
+ GroupIndexInFBSDevice : i, //fbs璁惧绱㈠紩
+ BattGroupId : $("#BattGroupId").val(), //鐢垫睜缁刬d
+ BattGroupNum : $("#BattGroupNum").val(), //鏈烘埧鍐呯數姹犵粍缂栧彿
+ BattGroupName : $(battString).val(),
+ FloatVolLevel : $("#FloatVolLevel").val(), //娴厖鐢靛帇闃�鍊�
+ OfflineVolLevel : $("#OfflineVolLevel").val(), //绂荤嚎鐢靛帇闃�鍊�
+ BattFloatCurrent : $("#BattFloatCurrent").val(), //娴厖鐢垫祦闃�鍊�
+ MonCount : $("#MonCount").val(), //鍗曚綋鏁伴噺
+ MonCapStd : $("#MonCapStd").val(), //鏍囩О瀹归噺
+ MonVolStd : $("#MonVolStd").val(), //鏍囩О鐢靛帇
+ MonResStd : $("#MonResStd").val(), //鏍囩О鍐呴樆
+ MonSerStd : $("#MonSerStd").val(), //鏍囩О鐢靛
+ MonVolLowToAvg : $("#MonVolLowToAvg").val(), //鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�
+
+ Load_curr : $("#Load_curr").val(), //璐熻浇鐢垫祦
+ DisCurrMax : $("#DisCurrMax").val(), //鏈�澶ф牳瀹圭數娴�
+ station_phone : $("#station_phone").val(), //鍩虹珯鍙风爜
+
+ BattProducer : $("#BattProducer").val(), //鐢垫睜鍝佺墝
+ BattModel : $("#BattModel").val(), //鐢垫睜鍨嬪彿
+ BattProductDate : $("#startTestrecord").val()+" 00:00:00", //鐢垫睜鐢熶骇鏃ユ湡
+ BattInUseDate : $("#endTestrecord").val()+" 00:00:00", //鐢垫睜浣跨敤鏃ユ湡
+ install_user : $("#install_user").val(), //瀹夎浜哄憳
+ }
+ }
+ arr.push(obj);
+ }
console.info(arr);
return arr;
}
@@ -432,23 +436,21 @@
$(function(){
$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
$("#sure").click(function(){
- if(temp[33]&&temp[33]=="new"){
- addBatt();
- }else{
- editParm();
- }
- function backpage(){window.location.href="ele-param1.html";}
+ editParm();
+ /* function backpage(){window.location.href="ele-param1.html";}
setTimeout(backpage,500);
});
$("#cancel").click(function(){
window.location.href="ele-param1.html";
+ */
});
});
function editParm(){
var parm = getUpdateArr();
+ console.info(parm);
$.ajax({
type: "post",
- url: "BattInfAction!update",
+ url: "Battinf_applyAction!updatePro",
async:true,
dataType:'text',
data:"json="+JSON.stringify(parm),
@@ -467,29 +469,7 @@
}
});
}
- function addBatt(){
- var parm = getUpdateArr();
- $.ajax({
- type: "post",
- url: "BattInfAction!add",
- async:true,
- dataType:'text',
- data:"json="+JSON.stringify(parm),
- success: function(data){
- data = eval('('+data+')');
- var model = eval('('+data.result+')');
- //console.info(model);
- if(model.code ==1){
- alert("娣诲姞鐢垫睜缁勬垚鍔�!");
- }else{
- alert("娣诲姞鐢垫睜缁勫け璐�!");
- }
- },
- error:function(){
- alert("娣诲姞鐢垫睜缁勫彂鐢熼敊璇�!");
- }
- });
- }
+
--
Gitblit v1.9.1