From cdd5fe1813e63adcddd61581cb886b9d154e5a3c Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.31.211>
Date: 星期三, 16 一月 2019 19:19:38 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-approved1.html | 203 +++++++++++++++++++++++++-------------------------
1 files changed, 101 insertions(+), 102 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index 294304e..6d44d6a 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -89,7 +89,7 @@
<tr>
<td>鏈烘埧鍚嶇О</td>
<td>
- <input type="text" id="homeName" class="unable" data-mini="true">
+ <textarea id="homeName" class="unable" data-mini="true"></textarea>
</td>
</tr>
<tr>
@@ -112,29 +112,29 @@
</tr>
- <input type="hidden" id="StationName4" data-mini="true" />
-
- <input type="hidden" id="StationIp" data-mini="true" />
-
- <input type="hidden" id="FbsDeviceIp_YM" class="unable" data-mini="true" value="456"/>
-
- <input type="hidden" id="FbsDeviceIp_WG" class="unable" data-mini="true" value="456"/>
-
- <input type="hidden" id="FBSDeviceName" data-mini="true" />
-
- <input type="hidden" readonly unselectable="on" value="123" id="BattGroupNum" class="unable" class="uncheck" data-mini="true" />
-
- <input type="hidden" id="FloatVolLevel" data-mini="true" />
-
- <input type="hidden" id="OfflineVolLevel" class="unable" data-mini="true" />
+ <input type="hidden" id="StationName4" data-mini="true" />
+
+ <input type="hidden" id="StationIp" data-mini="true" />
+
+ <input type="hidden" id="FbsDeviceIp_YM" class="unable" data-mini="true" value="456"/>
- <input type="hidden" id="BattFloatCurrent" class="unable" data-mini="true" />
+ <input type="hidden" id="FbsDeviceIp_WG" class="unable" data-mini="true" value="456"/>
+
+ <input type="hidden" id="FBSDeviceName" data-mini="true" />
+
+ <input type="hidden" readonly unselectable="on" value="123" id="BattGroupNum" class="unable" class="uncheck" data-mini="true" />
- <input type="hidden" id="MonResStd" data-mini="true" />
-
- <input type="hidden" id="MonSerStd" data-mini="true" />
-
- <input type="hidden" id="MonVolLowToAvg" data-mini="true" />
+ <input type="hidden" id="FloatVolLevel" data-mini="true" />
+
+ <input type="hidden" id="OfflineVolLevel" class="unable" data-mini="true" />
+
+ <input type="hidden" id="BattFloatCurrent" class="unable" data-mini="true" />
+
+ <input type="hidden" id="MonResStd" data-mini="true" />
+
+ <input type="hidden" id="MonSerStd" data-mini="true" />
+
+ <input type="hidden" id="MonVolLowToAvg" data-mini="true" />
<tr>
<td>*璐熻浇鐢垫祦(A)</td>
@@ -162,19 +162,7 @@
</td>
</tr>
- <tr>
- <td>*閫氳璁℃暟</td>
- <td>
- <input type="text" id="tongxunnumber" class="unable" data-mini="true" />
- </td>
- </tr>
-
- <tr>
- <td>*涓㈠寘鐜�</td>
- <td>
- <input type="text" id="diubaonumber" class="unable" data-mini="true" />
- </td>
- </tr>
+
<tr>
<td>*鏄惁楠屾敹</td>
@@ -267,7 +255,7 @@
console.info(temp);
if(temp.length>0){
for(var i=0;i<temp.length;i++){
- selected+= '<option '+'value='+temp[i].binf.BattGroupName+'>'+temp[i].binf.BattGroupName+'</option>';
+ selected+= '<option '+'value='+i+'>'+temp[i].binf.BattGroupName+'</option>';
}
return $('#newbattnum').html(selected);
}
@@ -292,11 +280,11 @@
return battTitle+battBrand+battType+battNum+MonVolStd+nomCap+battIndex+battName;
}
function selectedNum(index){
- var selected='';
+ var selected='';
if(temp[index].binf.MonCount==4){
- return selected='<option '+'value='+4+' selected=selected' +'>'+'4 涓�'+'</option>'+'<option '+'value='+24 +'>'+'24涓�'+'</option>';
+ return selected='<option '+'value='+4+' selected=selected' +'>'+'4 涓�'+'</option>'+'<option '+'value='+24 +'>'+'24涓�'+'</option>';
}else{
- return selected='<option '+'value='+24+' selected=selected' +'>'+'24 涓�'+'</option>'+'<option '+'value='+4 +'>'+'4涓�'+'</option>';
+ return selected='<option '+'value='+24+' selected=selected' +'>'+'24 涓�'+'</option>'+'<option '+'value='+4 +'>'+'4涓�'+'</option>';
}
}
@@ -318,10 +306,10 @@
var arr = temp;
function setcookieCreat(i){
- var index=Math.ceil(i-1);
- arrdata = temp[index].binf;
- //console.info(index);
- //console.info(temp);
+ console.info(temp);
+ console.info(i)
+ //var index=Math.ceil(i-1);
+ arrdata = temp[i].binf;
console.info(arrdata);
var json = JSON.stringify(arrdata);
setCookie("batt",json);
@@ -336,7 +324,7 @@
}
// 瀛樺偍鎵�鏈夌殑鏁版嵁
- $('#homeInfoIframeAll').data('allData', temp);
+ $('#homeInfoIframeAll').data('allData', temp);
var _data = temp[0];
var _temp = {
homeId: _data.binf.StationId
@@ -347,7 +335,7 @@
}
// 瀛樺偍闇�瑕佺殑homeInfo淇℃伅
- $('#homeInfoIframe').data('homeInfo', _temp);
+ $('#homeInfoIframe').data('homeInfo', _temp);
iframePopup = layer.open({
type: 2
@@ -357,6 +345,12 @@
,full: true
,anim: 4
,content: 'iframe/homeinfo1.html'
+ ,success: function() {
+ $('div[data-role=page]').hide();
+ }
+ ,end: function() {
+ $('div[data-role=page]').show();
+ }
});
layer.full(iframePopup);
})
@@ -367,8 +361,8 @@
console.info(tempgroupid);//鐢垫睜缁� ID 鏁扮粍锛岋紙鑻ユ坊鍔狅紝鍒欓渶瑕佹柊寤猴級;
var addbattnum = temp.length;//娣诲姞鐢垫睜缁勬暟鐩鏁�
var moncount = 0;
- var fuchongfazhi = [0,0,0,0];
- var lixiandianyafazhi = [0,0,0,0];
+ //var fuchongfazhi = [0,0,0,0];
+ //var lixiandianyafazhi = [0,0,0,0];
battnumber();
$(function(){
creatAllView(temp.length).trigger('create');
@@ -377,14 +371,47 @@
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
- //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
-
- timeer = window.setTimeout(function() {
- installstartdata(temp);
- }, 4000);
- //4绉掑埛鏂颁竴娆￠〉闈�
+ //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
+ installstartdata(temp);//瀵煎叆鍒濆椤甸潰鍊�
+ //getnewnumber(temp[0].binf.FBSDeviceId);
+ updateinstalldata();
});
+ var timeer = '';
+
+ function updateinstalldata(){
+ console.info(temp);
+ // 娓呴櫎璁℃椂鍣�
+ clearInterval(updateinstalldata.timer);
+ var data=temp[0].binf.StationId;
+ var _data ={ binf:{
+ StationId:data
+ }
+ }
+ data=JSON.stringify(_data);
+ //console.info(data);
+ $.ajax({ //鐢宠楠屾敹
+ type: 'post',
+ async: true,
+ url: 'Battinf_applyAction!serchById',
+ data: "json="+data,
+ dataType: 'json',
+ success:function(data) {
+ data = JSON.parse(data.result);
+ console.info(data);
+ if(data.code==1&&data.data.length>0){
+ data = data.data;
+ //console.info(data[0].check_en);
+ document.getElementById("check_en").value = yanshou(data[0].check_en);
+ }
+
+ // 鏇存柊鍐呭
+ updateinstalldata.timer = setTimeout(function() {
+ updateinstalldata();
+ }, 4000);
+ }
+ });
+ }
function applyendyanshou(arr){ //鐢宠楠屾敹
var temp = JSON.stringify(arr);
$.ajax({ //鐢宠楠屾敹
@@ -459,8 +486,7 @@
//setTimes($("#startTestrecord"),data.productDate);
//setTimes($("#endTestrecord"),data.useDate);
document.getElementById("install_user").value = data.install_user;
- document.getElementById("tongxunnumber").value = getCookienumber(data.StationId);
- document.getElementById("diubaonumber").value = getCookiediubao(data.StationId)
+
for(var i=0;i<temp.length;i++){
data=temp[i];
@@ -482,60 +508,40 @@
}
}
- function getCookienumber(id){//杈撳叆ID锛岃繑鍥為�氳璁℃暟銆傛暟鎹粠缂撳瓨鑾峰彇銆�
- var a = getnumber();
- //console.info(a);
- if(getCookie("numberget")){
- var number = getCookie("numberget");
- number = JSON.parse(number);
- console.info(number);
- if(number[0]){
- for(var i =0; i<number.length;i++){
- if(id == number[i].dev_id){
- return number[i].dev_commcount;
- }
- }
- }
- }
- return 0;
- }
- function getnumber(){ //鍚戣幏鍙栨墍鏈夐�氳璁℃暟骞跺瓨鍏ョ紦瀛�
- $.ajax({
+
+ function getnewnumber(id){//涓㈠寘鐜囷紝閫氳璁℃暟
+ $.ajax({
type: 'post',
async: true,
url: 'Battinf_applyAction!devCommNum',
data: null,
dataType: 'json',
success:function(data) {
+ console.info(data);
data = JSON.parse(data.result);
if(data.code==1){
console.info(data.data);
- var json =JSON.stringify(data.data);
- setCookie("numberget",json);
- //return data.data;
+ data=data.data;
+ console.info(data[0]);
+ for(var i=0;i<data.length;i++){
+ console.info(data[i].dev_id);
+ console.info(id)
+ if(data[i].dev_id==id){
+ console.info(id);
+ document.getElementById("tongxunnumber").value = data[i].dev_commcount;
+ var errorCount = data[i].dev_errcommcount;
+ var allCount = data[i].dev_commcount+errorCount;
+ var parcent = (allCount==0?0:errorCount/allCount*100);
+ console.info(parcent);
+ document.getElementById("diubaonumber").value = parcent;
+ }
+ }
}
}
});
}
- function getCookiediubao(id){ //涓㈠寘鐜�
- if(getCookie("numberget")){
- var number = getCookie("numberget");
- number = JSON.parse(number);
- console.info(number);
- if(number[0]){
- for(var i =0; i<number.length;i++){
- if(id == number[i].dev_id){
- var errorCount = number[i].dev_errcommcount;
- var allCount = number[i].dev_commcount+errorCount;
- var parcent = (allCount==0?0:errCount/allCount*100)
- return parcent;
- }
- }
- }
- }
- return 0;
- }
+
// 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍骞惰繑鍥� 鍗曚釜淇敼锛屾墜鏈烘柟寮忎笉淇敼澶氫釜鐢垫睜缁�
function getUpdateArr(){
mon=$('#MonVolStd').val();
@@ -615,13 +621,6 @@
});
});
- function nullOrn(){
-
- return true;
-
-
- }
-
function editBatt(){//
console.info(getUpdateArr());
var temp = JSON.stringify(getUpdateArr());
--
Gitblit v1.9.1