From fd80cd75de579505b2adc294b3cbf7796e2fe1fa Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期四, 20 十二月 2018 13:54:31 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 64 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index 5d6da13..da1ff02 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -212,19 +212,19 @@
</td>
</tr>
<tr>
- <td>鍗曚綋鏁伴噺</td>
+ <td>*鍗曚綋鏁伴噺</td>
<td>
<input type="text" id="MonCount" data-mini="true" />
</td>
</tr>
<tr>
- <td>鏍囩О瀹归噺(AH)</td>
+ <td>*鏍囩О瀹归噺(AH)</td>
<td>
<input type="text" id="MonCapStd" data-mini="true" />
</td>
</tr>
<tr>
- <td>鏍囩О鍗曚綋鐢靛帇(V)</td>
+ <td>*鏍囩О鍗曚綋鐢靛帇(V)</td>
<td>
<input type="text" id="MonVolStd" data-mini="true" />
</td>
@@ -248,7 +248,7 @@
</td>
</tr>
<tr>
- <td>璐熻浇鐢垫祦(A)</td>
+ <td>*璐熻浇鐢垫祦(A)</td>
<td>
<input type="text" id="Load_curr" data-mini="true" />
</td>
@@ -272,7 +272,7 @@
</td>
</tr>
<tr>
- <td>鐢垫睜鍨嬪彿</td>
+ <td>*鐢垫睜鍨嬪彿</td>
<td>
<input type="text" id="BattModel" data-mini="true" />
</td>
@@ -290,7 +290,7 @@
</td>
</tr>
<tr>
- <td>瀹夎浜哄憳</td>
+ <td>*瀹夎浜哄憳</td>
<td>
<input type="text" id="install_user" data-mini="true" />
</td>
@@ -350,7 +350,7 @@
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
- creatgroupid();
+ creatgroupid();//濡傛灉妫�娴嬩负NEW ,鍒欐墽琛屾坊鍔營D锛屽鏋滀负淇敼锛屽垯鎵ц涓烘嬁鍒癐D
installstartdata(temp);
});
@@ -592,9 +592,15 @@
<script type="text/javascript">
$(function(){
$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
- $("#sure").click(function(){
- creatgroupid();//鎻愪氦涔嬪墠鍐嶆楠岃瘉锛屽垱寤篒D
- addBatt(); //鎻愪氦
+ $("#sure").click(function(){
+ if(nullOrn()){
+ //if(tem[35]=="new"){
+ creatgroupid();//鎻愪氦涔嬪墠鍐嶆楠岃瘉锛屽垱寤篒D
+ addBattnew(); //鎻愪氦
+ //}else{editBatt();
+ //}
+ }else{
+ } //楠岃瘉閲嶈椤规槸鍚︿负绌猴紝涓虹┖鍒欐彁绀猴紱
//function backpage(){window.location.href="ele-param1.html";}
// setTimeout(backpage,500);
});
@@ -603,7 +609,17 @@
});
});
- function addBatt(){
+ function nullOrn(){
+ if($("#BattFloatCurrent").val()&&$("#MonCount").val()&&$("#MonCapStd").val()){
+ return true;
+ }else{
+ alert("*椤逛负蹇呭～椤癸紝涓嶈兘涓虹┖锛岃閲嶆柊杈撳叆");
+ return false;
+ }
+
+ }
+
+ function addBattnew(){//鏂板缓鐢垫睜缁勶紝娣诲姞鍒扮敵璇�
var temp = JSON.stringify(getUpdateArr());
console.info(temp);
$.ajax({
@@ -625,7 +641,31 @@
}
});
}
-
+
+ //淇敼鐢垫睜缁勶紝娣诲姞鍒癇ATTINF
+ function editParm(){
+ var parm = getUpdateArr();
+ $.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