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/charge-test.jsp | 56 ++++++++------
gx_tieta/WebRoot/mobil/batt-approved.html | 62 +++++++++++++--
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 64 +++++++++++++---
3 files changed, 138 insertions(+), 44 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 3407383..2f55d26 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -1666,25 +1666,30 @@
var oChargeThrInfor=document.getElementById("charge_thr_infor");
var batteststopDataList = new Array();
//鏍规嵁鎸囧畾鐨勬祴璇曟暟鎹煡璇㈢粨鏉熸椂鐨勬寚瀹氱數姹犵粍鐨勬暟鎹�
- function findtestdatastop(record_count){
+ function findtestdatastop(record_count){
+ Monnum_list = new Array(); //鍒濆鍖栫數姹犵紪鍙锋暟缁�
+ Monvol_list = new Array(); //鍒濆鍖栫數姹犵數鍘嬫暟缁�
+ checkArray = new Array();
+ var arr = new Array();
+ var batt = getBattinfById();
+ //console.info(batt);
+ for(var i=0;i<batt.MonCount;i++){
+ Monnum_list[i]="#"+(i+1);
+ Monvol_list[i]= (0).toFixed(3);
+ checkArray.push(1);
+ arr[i] = (0).toFixed(3);
+ }
$ajax("post","BatttestdatastopAction_findByInfo","btds.BattGroupId="+BattGroupId+"&btds.test_record_count="+record_count, function(data){
data=eval("("+data+")");
data=data.result;
data=eval("("+data+")");
+ //console.info(data);
if(data.code==1){
data=data.data;
- batteststopDataList = data;
-
- var batt = getBattinfById();
+ batteststopDataList = data;
//console.info(batt);
var moncount = batt.MonCount;
-
- Monnum_list = new Array(); //鍒濆鍖栫數姹犵紪鍙锋暟缁�
- Monvol_list = new Array(); //鍒濆鍖栫數姹犵數鍘嬫暟缁�
- checkArray = new Array();
- var arr = new Array();
- for(var i=0;i<moncount;i++){
-
+ for(var i=0;i<moncount;i++){
Monnum_list[i]="#"+(i+1);
if(data[i] != undefined){
Monvol_list[i]=data[i].mon_vol.toFixed(3);
@@ -1692,21 +1697,20 @@
Monvol_list[i]= (0).toFixed(3);
}
arr[i]=Monvol_list[i];
- checkArray.push(1);
}
//console.info(arr);
//console.info(arrTh[li_index]);
$('#charge_thr_th').find('tr th').eq(1).text(arrTh[li_index]);
//updataSecCol($('#charge_thr_th'), arrTh[li_index], arr);
- createBattVoltable(arr);
//reflushBattStatus(data[0]);
}else{
var obj = getBattinfById();
for(var i = 1;i<=obj.MonCount;i++){
- Monnum_list.push("#"+i);
+ Monnum_list[i-1] = "#"+i;
}
}
+ createBattVoltable(arr);
});
@@ -2025,7 +2029,8 @@
//console.info(batt);
for(var i=0;i<list.length;i++){
index = (list[i].mon_num/10).toFixed(0)-1;
- Monnum_list[index]="#"+(index+1);
+ //Monnum_list[index]="#"+(index+1);
+ console.info(index);
//percentage_list[index]=list[i].conn_res.toFixed(1);
monres_list[index]=list[i].mon_res.toFixed(3);
montmp_list[index]=list[i].mon_tmp.toFixed(1);
@@ -2226,22 +2231,24 @@
batt_test_evary_record = new Array(); //璁板綍褰撳墠娴嬭瘯璁板綍鐨勬瘡绗旂殑缁勭娴嬭瘯鍊�
batt_tmp_data = new Array();
//console.info(AllTestData);
-
- if(AllTestData!=undefined){
+ var batt = getBattinfById();
+ if(AllTestData!=undefined && AllTestData.length>0){
if(Monnum_list != undefined && Monnum_list.length>0){
AllData=new Array();
//console.info(Monnum_list);
- for(var i=0;i<Monnum_list.length;i++){
+ for(var i=0;i<batt.MonCount;i++){
batt_test_voldata[i] = new Array();
batt_test_tmpdata[i] = new Array();
}
max=Number.NEGATIVE_INFINITY; //鏃犵┓灏忓��
min=Number.POSITIVE_INFINITY; //鏃犵┓澶у��
var test_record_num = 0;
- //console.info(AllTestData.length);
var batt_index = -1;
+ //console.info(Monnum_list);
//console.info("***************");
+
+ var start_record_num = AllTestData[0].record_num;
BattGroupVol[0] = new Array();
BattGroupVol[1] = new Array();
for(var i=0;i<AllTestData.length;i++){
@@ -2255,16 +2262,17 @@
batt_test_data[++batt_index] = new Array();
test_record_num = AllTestData[i].record_num;
- if(test_record_num > 1){
+ if(test_record_num > start_record_num){
batt_test_data[batt_index]=batt_test_data[batt_index-1].slice(0);
setArrayvalue(batt_test_voldata,batt_index);
setArrayvalue(batt_test_tmpdata,batt_index);
}else{
+ //绗竴绗斿厖鏀剧數鏁版嵁
var batt = getBattinfById();
for(var k =0;k<batt.MonCount;k++){
- batt_test_data[batt_index][k] = 0;
- batt_test_voldata[k][batt_index] = 0;
- batt_test_tmpdata[k][batt_index] = 0;
+ batt_test_data[0][k] = 0;
+ batt_test_voldata[k][0] = 0;
+ batt_test_tmpdata[k][0] = 0;
}
}
}
@@ -2293,7 +2301,7 @@
var title=getTitle(Monvol_list,"Voltage");
reflushBattStatus(AllTestData[AllTestData.length-1]);
- var batt = getBattinfById();
+
//console.info(Monvol_list);
var tempmin = Math.floor(getMinFromArr(Monvol_list)*0.9);
//var tempmax = (batt.MonVolStd*1.25).toFixed(3);
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index ddb2acf..b6f878d 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -123,7 +123,7 @@
</div>
</div>
-
+ <input style="visibility:hidden" id="getnumber" type="text" name="customer_area_id" >
</div>
</div>
</body>
@@ -167,11 +167,43 @@
createTbl(tbl, arrTh, dataArr);
$(document).ready(function(){
setPage();
-
- Page.pageCurr=1;
- searchBattLife();
+ getnumber();
+ Page.pageCurr=1;
+ searchBattLife();
+ //console.info($("#getnumber").val());
});
+ function getnumber(){ //鍚戣幏鍙栨墍鏈夐�氳璁℃暟骞跺瓨鍏ョ紦瀛�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'Battinf_applyAction!devCommNum',
+ data: null,
+ dataType: 'json',
+ success:function(data) {
+ data = JSON.parse(data.result);
+ if(data.code==1){
+ var json =JSON.stringify(data.data);
+ setCookie("numberget",json);
+ }
+ }
+ });
+ }
+ function getCookienumber(id){//杈撳叆ID锛岃繑鍥為�氳璁℃暟銆傛暟鎹粠缂撳瓨鑾峰彇銆�
+ //id = 0;
+ var number = getCookie("numberget");
+ number = JSON.parse(number);
+ //console.info(number);
+ if(number[0].dev_id){
+ //console.info(number);
+ for(var i =0; i<number.length;i++){
+ if(id == number[i].dev_id){
+ return number[i].dev_commcount;
+ }
+ }
+ }
+ return 0;
+ }
function getcreatArr(){
obj = {
@@ -182,12 +214,22 @@
}
return obj;
}
+
+ function yanshou(check_en){
+ if(check_en==0){
+ return "鏈獙鏀�";
+ }else{
+ return "宸查獙鏀�";
+ }
+ }
// 鏌ヨ鍐呭
function searchBattLife(){
var temp = JSON.stringify(getcreatArr());
- console.info(temp);
+ //console.info(temp);
arrTd = new Array();
+ getnumber();
var index = 0;
+ getCookienumber();
$.ajax({
type: 'post',
async: true,
@@ -233,12 +275,16 @@
arrTd[index++] = data[i].binf.BattProductDate.substr(0,10);
arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);
arrTd[index++] = data[i].binf.install_user;
- //arrTd[index++] = "";
- arrTd[index++]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>';
+ arrTd[index++] = getCookienumber(data[i].binf.FBSDeviceId);
+ arrTd[index++] = yanshou(data[i].check_en);
+ arrTd[index++]='<a onclick="getButIndex(this)" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>鐢垫睜缁勫疄鏃舵暟鎹�</a>';
}
}
console.info(arrTd);
- createTbl(tblCon, arrTh, arrTd);
+ createTbl(tblCon, arrTh, arrTd);
+ timeer = window.setTimeout(function() {
+ searchBattLife();
+ }, 5000);
}
});
}
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