From 0e684fe9e105167c5980b26f045221411200a2f2 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 09 一月 2019 10:37:29 +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 | 344 ++++++++++++++++++++++++++------------------------------
1 files changed, 159 insertions(+), 185 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index d765458..66cf1d5 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -27,17 +27,17 @@
white-space: nowrap;
}
.uncheck{
- background-color: #dddddd38!important;
- color: #bdbdbdc4!important;
+ background-color: #ddd!important;
+ color: #000!important;
}
.ui-btn-icon-right {
padding-right: 8.5em;
}
.hbg{
- background-color:#ddd9;
+ background-color:#ddd;
}
#battdata {
- background-color:#dddddd54
+ background-color:#eee;
}
.ui-select .ui-btn select{
width:77%;
@@ -69,30 +69,6 @@
<table class="layout-set">
<tbody>
<tr>
- <td>鏈烘埧缂栧彿</td>
- <td>
- <input type="text" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/>
- </td>
- </tr>
- <tr>
- <td>FBS璁惧ID(閲嶈)</td>
- <td>
- <input type="text" id="FBSDeviceId" class="unable" data-mini="true" onfocus="this.blur()"/>
- </td>
- </tr>
- <tr>
- <td>FBS璁惧IP(閲嶈)</td>
- <td>
- <input type="text" id="FbsDeviceIp" class="unable" data-mini="true" onfocus="this.blur()" />
- </td>
- </tr>
- <tr>
- <td>鐢垫睜缁処D</td>
- <td>
- <input type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" onfocus="this.blur()" />
- </td>
- </tr>
- <tr>
<td>鐪�</td>
<td>
<input type="text" id="mainteArea" class="unable" data-mini="true" onfocus="this.blur()"/>
@@ -113,29 +89,52 @@
<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>
+ <td>鏈烘埧缂栧彿</td>
+ <td>
+ <input type="text" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/>
+ </td>
+ </tr>
+ <tr>
+ <td>FBS璁惧ID(閲嶈)</td>
+ <td>
+ <input type="text" id="FBSDeviceId" class="unable" data-mini="true" onfocus="this.blur()"/>
+ </td>
+ </tr>
+ <tr>
+ <td>FBS璁惧IP(閲嶈)</td>
+ <td>
+ <input type="text" id="FbsDeviceIp" class="unable" data-mini="true" onfocus="this.blur()" />
</td>
</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>
@@ -146,7 +145,7 @@
<input type="hidden" id="DisCurrMax" class="unable" data-mini="true" />
<tr>
- <td>鍩虹珯鐢佃瘽鍙风爜</td>
+ <td>*鍩虹珯鐢佃瘽鍙风爜</td>
<td>
<input type="text" id="station_phone" class="unable" data-mini="true" />
</td>
@@ -221,7 +220,7 @@
<div data-role="navbar">
<ul>
<li><a href="" id="applyyanshou"class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">鐢宠楠屾敹</a></li>
- <li><a href="#yourPopup" id="shishishuju" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="delete" data-role="button">瀹炴椂鏁版嵁</a></li>
+ <li><a href="#yourPopup" id="shishishuju" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="star" data-role="button">瀹炴椂鏁版嵁</a></li>
</ul>
</div>
</div>
@@ -265,40 +264,39 @@
function battnumber(){
var selected=''
- for(var i=1;i<=temp.length;i++){
- selected+= '<option '+'value='+i+'>'+"鐢垫睜缁�"+i+'</option>';
+ console.info(temp);
+ if(temp.length>0){
+ for(var i=0;i<temp.length;i++){
+ selected+= '<option '+'value='+i+'>'+temp[i].binf.BattGroupName+'</option>';
+ }
+ return $('#newbattnum').html(selected);
}
- return $('#newbattnum').html(selected);
}
-
- /* $("#sure").on('click',function(){
- console.info($('#newbattnum').val());
- setcookieCreat($('#newbattnum').val());
- window.location.href="batt-infor-conf-temp1.html";
- });*/
-
+
function creatBattView(index){
var count=index+1
- ,battTitle='<div>'+'<h1 class="hbg">'+'鐢垫睜缁�'+count+'</h1>'+
- '<table class="layout-set">'+'<tbody>'+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal" >'+'<select '+'id='+'battproducer'+index+' class="unable" '+'>'
- ,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'
+ ,battTitle='<div>'+'<h1 class="hbg">'+temp[index].binf.BattGroupName+'</h1>'+
+ '<table class="layout-set">'+'<tbody>'/*+'<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal" >'+'<select '+'id='+'battproducer'+index+' class="unable" '+'>'
+ ,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'*/
+ ,battBrand='<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'battproducer'+index+' data-mini="true"'+'value='+'鐢垫睜鍝佺墝'+count+' />'+'</td>'+'</tr>'
,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'batttype'+index+' data-mini="true"'+'value='+'鐢垫睜鍨嬪彿'+count+' />'+'</td>'+'</tr>'
- ,battNum='<tr>'+'<td>'+'*鍗曚綋鏁伴噺'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal">'+'<select '+ 'id='+'MonCount'+index+' class="unable" '+'>'
- ,battNumOpt=selectedNum(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'
+ ,battNum='<tr>'+'<td>'+'*鍗曚綋鏁伴噺'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'MonCount'+index+' data-mini="true"'+'value='+'鍗曚綋鏁伴噺'+count+' />'+'</td>'+'</tr>'
+ //,battNum='<tr>'+'<td>'+'*鍗曚綋鏁伴噺'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" data-type="horizontal">'+'<select '+ 'id='+'MonCount'+index+' class="unable" '+'>'
+ //,battNumOpt=selectedNum(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'
,MonVolStd='<tr>'+'<td>'+'*鏍囩О鍗曚綋鐢靛帇(V)'+'</td>'+'<td>'+'<input type="text" '+'id='+'MonVolStd'+index+' data-mini="true"'+' class="unable" '+'/>'+'</td>'+'</tr>'
- ,nomCap='<tr>'+'<td>'+'*鏍囩О瀹归噺(AH)'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" >'+'<select '+'id='+'MonCapStd'+index+' data-mini="true"'+' class="unable" '+'>'+creatMonCapOpt(index)+'</select>'
- +'</fieldset>'+'</td>'+'</tr>'
+ //,nomCap='<tr>'+'<td>'+'*鏍囩О瀹归噺(AH)'+'</td>'+'<td>'+'<fieldset data-role="controlgroup" >'+'<select '+'id='+'MonCapStd'+index+' data-mini="true"'+' class="unable" '+'>'+creatMonCapOpt(index)+'</select>'
+ // +'</fieldset>'+'</td>'+'</tr>'
+ ,nomCap='<tr>'+'<td>'+'*鏍囩О瀹归噺'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'MonCapStd'+index+' data-mini="true"'+'value='+'鏍囩О瀹归噺'+count+' />'+'</td>'+'</tr>'
,battIndex='<tr>'+'<input type="hidden" '+'id='+'battindex'+index+' data-mini="true"'+'value='+count+' class="unable" '+' />'+'</tr>'
,battName='<tr>'+'<input type="hidden" '+'id='+'battname'+index+' data-mini="true"'+'value='+'鐢垫睜缁�'+count+' class="unable" '+' />'+'</tr>'+'</tbody>'+'</table>'+'</div>';
- return battTitle+battBrand+battType+battNum+battNumOpt+MonVolStd+nomCap+battIndex+battName;
+ 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>';
}
}
@@ -315,18 +313,18 @@
}
return selected;
}
- var temp = getCookie("eleparm");
+ var temp = getCookie("eleparm1");
temp=JSON.parse(temp);
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("eleparm",json);
+ setCookie("batt",json);
window.location.href="control.html";
}
// 鐐瑰嚮鐢宠楠屾敹鏄剧ず闈㈡澘
@@ -338,7 +336,7 @@
}
// 瀛樺偍鎵�鏈夌殑鏁版嵁
- $('#homeInfoIframeAll').data('allData', temp);
+ $('#homeInfoIframeAll').data('allData', temp);
var _data = temp[0];
var _temp = {
homeId: _data.binf.StationId
@@ -349,7 +347,7 @@
}
// 瀛樺偍闇�瑕佺殑homeInfo淇℃伅
- $('#homeInfoIframe').data('homeInfo', _temp);
+ $('#homeInfoIframe').data('homeInfo', _temp);
iframePopup = layer.open({
type: 2
@@ -369,66 +367,57 @@
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');
- setMonVolStd(temp.length);
+ creatAllView(temp.length).trigger('create');
+ setMonVolStd(temp.length);
});
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
- //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
-
- installstartdata(temp);
+ //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
+ installstartdata(temp);//瀵煎叆鍒濆椤甸潰鍊�
+ getnewnumber(temp[0].binf.FBSDeviceId);
+ updateinstalldata();
});
+ var timeer = '';
- function creatgroupid(){
- var dev_id ='';
- $.ajax({
- type: 'post'
- ,async: true
- ,url: 'BattInfAction!searchmaxdev_id'
- ,data: null
- ,dataType: 'json'
- ,success:function(res) {
- console.info(res);
- var data = JSON.parse(res.result);
- console.info(data);
- if(data.length!=0){
- data = data.data;
- dev_id = data;
- //console.info(dev_id);
- document.getElementById("FBSDeviceId").value = dev_id;
- var ip = getDevIp(dev_id);
- //console.info(ip);
- document.getElementById("FbsDeviceIp").value = ip;
- }else{
- alert("groupid鐢熸垚澶辫触");
- }
- }
-
- });
- }
- // 鏍规嵁璁惧id璁＄畻璁惧ip
- function getDevIp(dev_id) {
- var ptn = /^91([0-9]{7})$/;
- var ip = '';
- console.info(dev_id);
- if(ptn.test(dev_id)) {
- var value = Number(RegExp.$1);
- // console.log(value);
- var intNum = prefixInteger(Math.floor(value/256), 3);
- var resNum = prefixInteger(value%256, 3);
- ip = '127.000.'+intNum+'.'+resNum;
- }else {
- ip = '璁惧ID鏍煎紡涓嶆纭�';
- }
- console.info(ip);
- return ip;
- }
+ 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({ //鐢宠楠屾敹
@@ -447,7 +436,7 @@
});
}
- // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊� //
+ // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊� //
function setFloatAndoutLine(index) {
var monvolstd = "#MonVolStd"+index;
var MonCount = "#MonCount" +index;
@@ -463,11 +452,7 @@
console.info(vol);
}
-
- function prefixInteger(num, length) {
- return (num/Math.pow(3,length)).toFixed(length).substr(2);
- }
-
+
//瀵煎叆琛ㄦ牸榛樿鏁版嵁
function installstartdata(temp){
data=temp[0].binf;
@@ -485,7 +470,7 @@
document.getElementById("FbsDeviceIp_WG").value = data.FbsDeviceIp_WG;
document.getElementById("FBSDeviceName").value = data.FBSDeviceName;
//document.getElementById("GroupIndexInFBSDevice").value = temp[12];
- document.getElementById("BattGroupId").value = data.BattGroupId;
+ //document.getElementById("BattGroupId").value = data.BattGroupId;
document.getElementById("BattGroupNum").value = data.BattGroupNum;
//document.getElementById("BattGroupName").value = temp[15];
document.getElementById("FloatVolLevel").value = data.FloatVolLevel;
@@ -507,8 +492,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];
@@ -521,48 +505,49 @@
var battModel = "#batttype"+i;
var battproducer = "#battproducer"+i
//var battproducer ="#battproducer"+i;
+ console.info(data);
$(battString).val(data.binf.BattGroupName);
$(battModel).val(data.binf.BattModel);
$(battproducer).val(data.binf.BattProducer);
+ $('#MonCount'+i).val(data.binf.MonCount)
console.info($(battproducer).val());
}
}
- 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 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);
+ 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();
@@ -638,17 +623,10 @@
$("#sure").click(function(){
console.info($('#newbattnum').val());
setcookieCreat($('#newbattnum').val());
- window.location.href="batt-infor-conf-temp1.html";
+ //window.location.href="control.html";
});
});
- function nullOrn(){
-
- return true;
-
-
- }
-
function editBatt(){//
console.info(getUpdateArr());
var temp = JSON.stringify(getUpdateArr());
@@ -750,10 +728,7 @@
k=i*50;
//optionStr+='<option'+' value='+k+'>'+k+'</option>';
- optionStr+='<option'+' value='+k+'>'+k+'</option>';
-
-
-
+ optionStr+='<option'+' value='+k+'>'+k+'</option>';
}
allString=optionStr+'<option'+' selected=selected '+' value='+1000+'>'+1000+'</option>'
return allString;
@@ -778,8 +753,7 @@
for(var i=0;i<index;i++){
var s='#MonVolStd'+i;
$(s).val(12);
- }
-
+ }
}
/* 鎿嶄綔鎴愬姛
--
Gitblit v1.9.1