From b2f21d080425b0ab6e5e6170914ca2c615e5d185 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 02 一月 2019 10:22:00 +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 | 185 +++++++++++++++++++++------------------------
1 files changed, 86 insertions(+), 99 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index a52b1a0..2ac7815 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()"/>
@@ -116,6 +92,25 @@
<input type="text" id="homeName" class="unable" data-mini="true">
</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" />
@@ -150,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>
@@ -225,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>
@@ -269,26 +264,32 @@
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);
}
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='';
@@ -317,8 +318,10 @@
var arr = temp;
function setcookieCreat(i){
- var index=Math.ceil(i-1);
- arrdata = temp[index].binf;
+ console.info(temp);
+ console.info(i)
+ //var index=Math.ceil(i-1);
+ arrdata = temp[i].binf;
//console.info(index);
//console.info(temp);
console.info(arrdata);
@@ -378,53 +381,14 @@
//setTimes($("#startTestrecord"),'2000-01-01');
//setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
- installstartdata(temp);
- });
-
- 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;
- }
+ installstartdata(temp);
+ diubao();
+ timeer = window.setTimeout(function() {
+ diubao();
+ }, 4000); //涓㈠寘鐜囷紝閫氫俊璁℃暟锛�4绉掑埛鏂�1娆°��
+ //4绉掑埛鏂颁竴娆￠〉闈�
+ });
function applyendyanshou(arr){ //鐢宠楠屾敹
var temp = JSON.stringify(arr);
@@ -444,7 +408,7 @@
});
}
- // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊� //
+ // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊� //
function setFloatAndoutLine(index) {
var monvolstd = "#MonVolStd"+index;
var MonCount = "#MonCount" +index;
@@ -460,11 +424,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;
@@ -482,7 +442,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;
@@ -504,8 +464,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];
@@ -518,15 +477,24 @@
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 diubao(){
+ if(temp.length>0){
+ data=temp[0].binf;
+ document.getElementById("tongxunnumber").value = getCookienumber(data.StationId);
+ document.getElementById("diubaonumber").value = getCookiediubao(data.StationId);
+ }
+ }
function getCookienumber(id){//杈撳叆ID锛岃繑鍥為�氳璁℃暟銆傛暟鎹粠缂撳瓨鑾峰彇銆�
- //var a = getnumber();
+ var a = getnumber();
//console.info(a);
if(getCookie("numberget")){
var number = getCookie("numberget");
@@ -542,6 +510,25 @@
}
return 0;
}
+ 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){
+ console.info(data.data);
+ var json =JSON.stringify(data.data);
+ setCookie("numberget",json);
+ //return data.data;
+ }
+ }
+ });
+ }
+
function getCookiediubao(id){ //涓㈠寘鐜�
if(getCookie("numberget")){
var number = getCookie("numberget");
--
Gitblit v1.9.1