From 8950b527f88b682913c4c05a5e1cdd8f18e7d468 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 25 十二月 2018 15:18:15 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 125 +++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 31 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index 437d6c9..9f027bb 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -57,6 +57,7 @@
console.info(temp);
console.info(temp[30]);
console.info(temp[33]);
+ console.info(temp[34]);
var suoyin = temp[33];
$(function(){creatAllView(suoyin)});
@@ -99,7 +100,7 @@
<!-- 澶撮儴鍐呭 -->
<div data-role="header" data-position="fixed">
- <a href="ele-param1.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
+ <a href="ele-param2.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
<h1>鐢垫睜缁勭敵璇峰畨瑁�</h1>
</div>
@@ -350,7 +351,13 @@
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
- creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D
+ console.info()
+ if(temp[34]!="edit")
+ {
+ //console.warn("sssss")
+ creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D
+ }else{
+ }
installstartdata(temp);
});
@@ -421,7 +428,7 @@
//瀵煎叆琛ㄦ牸榛樿鏁版嵁
function installstartdata(temp){
- creatgroupid();
+
var data = {
StationId: '4011100'
,StationName1: '骞胯タ鐪�'
@@ -458,7 +465,8 @@
,install_user: '鍛靛懙'
};
console.info(data.StationId);
- if(temp.length>0){
+ if(temp[34]!="edit"){
+ creatgroupid();
document.getElementById("StationId").value = data.StationId;
// document.getElementById("station_name1").value = data.StationName1;
// document.getElementById("city").value = data.StationName2; //甯�
@@ -502,7 +510,7 @@
document.getElementById("StationName3").value = temp[4]; //鏈烘埧鍚嶇О
document.getElementById("StationName4").value = temp[5]; //璁惧鍚嶇О
document.getElementById("StationIp").value = temp[6]; //璁惧IP
- //document.getElementById("FBSDeviceId").value = dev_id;
+ document.getElementById("FBSDeviceId").value = temp[7];
document.getElementById("FbsDeviceIp").value = temp[8];
document.getElementById("FbsDeviceIp_YM").value = temp[9];
document.getElementById("FbsDeviceIp_WG").value = temp[10];
@@ -588,21 +596,74 @@
return arr;
}
+ function getUpdateArredit(){
+ var arr = new Array();
+ for(var i=0;i<suoyin;i++){
+ var battString = "#battname"+i;
+ var index = String(i);
+ console.info(battString);
+ var obj = {
+ 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;
+ }
</script>
<script type="text/javascript">
$(function(){
$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
$("#sure").click(function(){
if(nullOrn()){
- creatgroupid();//鎻愪氦涔嬪墠鍐嶆楠岃瘉锛屽垱寤篒D
- addBattnew(); //鎻愪氦
+ if(temp[34]!="edit"){
+ creatgroupid();//鎻愪氦涔嬪墠鍐嶆楠岃瘉锛屽垱寤篒D
+ addBattnew(); //鎻愪氦
+ }else{
+ addBattnew();
+ }
}else{
} //楠岃瘉閲嶈椤规槸鍚︿负绌猴紝涓虹┖鍒欐彁绀猴紱
//function backpage(){window.location.href="ele-param1.html";}
// setTimeout(backpage,500);
});
$("#cancel").click(function(){
- window.location.href="ele-param1.html";
+ window.location.href="ele-param2.html";
});
});
@@ -639,29 +700,31 @@
});
}
- function addBatt(){//淇敼鐢垫睜缁勶紝娣诲姞鍒癇ATTINF
- 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("娣诲姞鐢垫睜缁勫彂鐢熼敊璇�!");
- }
- });
- }
+ //淇敼鐢垫睜缁勶紝娣诲姞鍒癇ATTINF
+ function editBatt(){
+ var parm = getUpdateArredit();
+ console.info(parm);
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!update",
+ 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("淇敼鐢垫睜缁勫け璐�!");
+ }
+ });
+ }
/* 鎿嶄綔鎴愬姛
$('#changeSuc').popup('open');
鎿嶄綔澶辫触
--
Gitblit v1.9.1