From c673a0b9ffe1f1239f596dfd88c0a76c735b3d43 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.106>
Date: 星期五, 28 十二月 2018 09:24:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$1.class | 0
gx_tieta/WebRoot/mobil/batt-edit2.html | 43 +---
gx_tieta/WebRoot/mobil/ele-param2.html | 6
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$3.class | 0
gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html | 45 +---
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_setparamService.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$2.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$1.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.class | 0
gx_tieta/WebRoot/mobil/batt-approved1.html | 276 ++++++++++++------------------
gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java | 35 +++
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction.class | 0
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java | 71 +++++++
gx_tieta/WebRoot/mobil/batt-approve-index.html | 2
gx_tieta/WebRoot/mobil/control.html | 2
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java | 8
16 files changed, 247 insertions(+), 241 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$1.class
index d52f77b..f399baa 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction.class
index b5199a9..e1f7a19 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$1.class
index 24b7858..885c880 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$2.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$2.class
index f75e7c0..5071331 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$2.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$2.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$3.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$3.class
index 6a7be8c..dfba59d 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$3.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$3.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.class
index 4bb228b..9da1cb0 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_setparamService.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_setparamService.class
index 1aa6359..bf70b9b 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_setparamService.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_setparamService.class
Binary files differ
diff --git a/gx_tieta/WebRoot/mobil/batt-approve-index.html b/gx_tieta/WebRoot/mobil/batt-approve-index.html
index 90e652a..fa21748 100644
--- a/gx_tieta/WebRoot/mobil/batt-approve-index.html
+++ b/gx_tieta/WebRoot/mobil/batt-approve-index.html
@@ -209,7 +209,7 @@
console.info(arr);
//applyendyanshou(arr);//鐢宠楠屾敹鏂规硶銆�
var json=window.JSON.stringify(arr);
- setCookie("eleparm",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ setCookie("eleparm1",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
return arr;
}
diff --git a/gx_tieta/WebRoot/mobil/batt-approved1.html b/gx_tieta/WebRoot/mobil/batt-approved1.html
index 7a18bac..e62f748 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved1.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved1.html
@@ -57,13 +57,9 @@
<!-- 澶撮儴鍐呭 -->
<div data-role="header" data-position="fixed">
- <a href="batt-unapproved-index.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
+ <a href="batt-approve-index.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
<h1>宸插鎵归�氳繃鏈烘埧璇︽儏</h1>
- <fieldset data-role="controlgroup" class="ptr0" >
-
-
-
-
+ <fieldset data-role="controlgroup" class="ptr0" >
</fieldset>
</div>
@@ -72,30 +68,6 @@
<!-- <div class="set-option"> -->
<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>
@@ -117,64 +89,65 @@
<tr>
<td>鏈烘埧鍚嶇О</td>
<td>
- <input type="text" id="homeName" data-mini="true">
-
+ <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" />
-
-
+
<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="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>
<td>
- <input type="text" id="Load_curr" data-mini="true" />
+ <input type="text" id="Load_curr" class="unable" data-mini="true" />
</td>
- </tr>
-
- <input type="hidden" id="DisCurrMax" data-mini="true" />
-
-
+ </tr>
+ <input type="hidden" id="DisCurrMax" class="unable" data-mini="true" />
+
<tr>
<td>鍩虹珯鐢佃瘽鍙风爜</td>
<td>
- <input type="text" id="station_phone" data-mini="true" />
+ <input type="text" id="station_phone" class="unable" data-mini="true" />
</td>
</tr>
@@ -185,28 +158,28 @@
<tr>
<td>*瀹夎浜哄憳</td>
<td>
- <input type="text" id="install_user" data-mini="true" />
+ <input type="text" id="install_user" class="unable" data-mini="true" />
</td>
</tr>
<tr>
<td>*閫氳璁℃暟</td>
<td>
- <input type="text" id="tongxunnumber" data-mini="true" />
+ <input type="text" id="tongxunnumber" class="unable" data-mini="true" />
</td>
</tr>
<tr>
<td>*涓㈠寘鐜�</td>
<td>
- <input type="text" id="diubaonumber" data-mini="true" />
+ <input type="text" id="diubaonumber" class="unable" data-mini="true" />
</td>
</tr>
<tr>
<td>*鏄惁楠屾敹</td>
<td>
- <input type="text" id="check_en" data-mini="true" />
+ <input type="text" id="check_en" class="unable" data-mini="true" />
</td>
</tr>
</tbody>
@@ -247,10 +220,25 @@
<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="" 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="delete" data-role="button">瀹炴椂鏁版嵁</a></li>
</ul>
</div>
- </div>
+ </div>
+ <div data-role="popup" id="yourPopup" class="ui-content" data-overlay-theme="b">
+ <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
+ <h1>閫夋嫨鏌ョ湅鐢垫睜缁�</h1>
+ <fieldset data-role="controlgroup" >
+ <select id="newbattnum" data-mini="true">
+ <option value="1">鐢垫睜缁�1</option>
+
+ </select>
+ </fieldset>
+
+ <div data-role="controlgroup" data-type="horizontal" class="mt6">
+ <a href="" id="sure" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check pl5" >纭畾</a>
+ <a href="" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete pl5" >鍙栨秷</a>
+ </div>
+ </div>
<div data-role="popup" id="yourPopup" class="ui-content" data-overlay-theme="b">
<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
<a href="" data-rel="back" id="sure" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >鎻愪氦</a>
@@ -265,7 +253,7 @@
<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
function creatAllView(num){
- var allString=''
+ var allString=''
,i=0;
if(num>4){return false}
for(i=0;i<num;i++){
@@ -274,40 +262,41 @@
return $("#battdata").html(allString);
}
- $("#applyyanshou").on('click',function(){
-
- })
-
- $("#shishishuju").on('click',function(){
-
- })
-
- function creatBattView(index){
+ function battnumber(){
+ var selected=''
+ for(var i=1;i<=temp.length;i++){
+ selected+= '<option '+'value='+i+'>'+"鐢垫睜缁�"+i+'</option>';
+ }
+ 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+'>'
- ,battBrand=selectedIndex(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'
- ,battType='<tr>'+'<td>'+'鐢垫睜鍨嬪彿'+'</td>'+'<td>'+'<input type="text" '+'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+'>'
- ,battNumOpt=selectedNum(index)+'</select>'+'</fieldset>'+'</td>'+'</tr>'
+ '<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>'+'<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"'+'>'+creatMonCapOpt(index)+'</select>'
- +'</fieldset>'+'</td>'+'</tr>'
- ,battIndex='<tr>'+'<input type="hidden" '+'id='+'battindex'+index+' data-mini="true"'+'value='+count+' />'+'</tr>'
- ,battName='<tr>'+'<input type="hidden" '+'id='+'battname'+index+' data-mini="true"'+'value='+'鐢垫睜缁�'+count+' />'+'</tr>'+'</tbody>'+'</table>'+'</div>';
- return battTitle+battBrand+battType+battNum+battNumOpt+MonVolStd+nomCap+battIndex+battName;
+ //,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+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>';
}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>';
}
}
-
function selectedIndex(index){
var selected='',
i=0;
@@ -321,10 +310,20 @@
}
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(arrdata);
+ var json = JSON.stringify(arrdata);
+ setCookie("batt",json);
+ window.location.href="control.html";
+ }
// 鐐瑰嚮鐢宠楠屾敹鏄剧ず闈㈡澘
$("#applyyanshou").on('click',function(){
console.info(temp);
@@ -367,9 +366,10 @@
var moncount = 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 () {
@@ -378,51 +378,6 @@
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;
- }
function applyendyanshou(arr){ //鐢宠楠屾敹
var temp = JSON.stringify(arr);
@@ -458,11 +413,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;
@@ -480,7 +431,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;
@@ -516,9 +467,11 @@
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());
}
}
@@ -630,22 +583,13 @@
<script type="text/javascript">
$(function(){
$(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
- $(function(){
-
- })
- $("#sure").click(function(){
- if(nullOrn()){
- editBatt();
- }else{
- } //楠岃瘉閲嶈椤规槸鍚︿负绌猴紝涓虹┖鍒欐彁绀猴紱
- //function backpage(){window.location.href="ele-param1.html";}
- // setTimeout(backpage,500);
+ $("#sure").click(function(){
+ console.info($('#newbattnum').val());
+ setcookieCreat($('#newbattnum').val());
+ //window.location.href="control.html";
+ });
});
- $("#cancel").click(function(){
- window.location.href="ele-param2.html";
- });
- });
-
+
function nullOrn(){
return true;
@@ -754,10 +698,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;
@@ -782,8 +723,7 @@
for(var i=0;i<index;i++){
var s='#MonVolStd'+i;
$(s).val(12);
- }
-
+ }
}
/* 鎿嶄綔鎴愬姛
diff --git a/gx_tieta/WebRoot/mobil/batt-edit2.html b/gx_tieta/WebRoot/mobil/batt-edit2.html
index 6b9a40e..686e3ad 100644
--- a/gx_tieta/WebRoot/mobil/batt-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-edit2.html
@@ -78,30 +78,14 @@
<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>
+ <input type="hidden" type="text" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/>
+
+ <input type="hidden" type="text" id="FBSDeviceId" class="unable" data-mini="true" />
+
+ <input type="hidden" type="text" id="FbsDeviceIp" class="unable" data-mini="true" />
+
+ <input type="hidden" type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" />
+
<td>鐪�</td>
<td>
<input type="text" id="mainteArea" class="unable" data-mini="true" onfocus="this.blur()"/>
@@ -434,8 +418,9 @@
}
function prefixInteger(num, length) {
- return (num/Math.pow(3,length)).toFixed(length).substr(2);
+ return (Array(length).join('0') + num).slice(-length);
}
+
function creatBa(a){
var battnum=4-a,
opstring='';
@@ -471,8 +456,7 @@
document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;
document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent;
//document.getElementById("MonCount").value = data.MonCount;
- //document.getElementById("MonCapStd").value = data.MonCapStd;
-
+ //document.getElementById("MonCapStd").value = data.MonCapStd;
document.getElementById("MonResStd").value = data.MonResStd;
document.getElementById("MonSerStd").value = data.MonSerStd;
document.getElementById("MonVolLowToAvg").value = data.MonVolLowToAvg;
@@ -590,10 +574,7 @@
});
function nullOrn(){
-
- return true;
-
-
+ return true;
}
function editBatt(){//
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
index a588c3b..eaf47e7 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-conf-temp1.html
@@ -58,30 +58,15 @@
<!-- <div class="set-option"> -->
<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" />
- </td>
- </tr>
- <tr>
- <td>FBS璁惧IP(閲嶈)</td>
- <td>
- <input type="text" id="FbsDeviceIp" class="unable" data-mini="true" />
- </td>
- </tr>
- <tr>
- <td>鐢垫睜缁処D</td>
- <td>
- <input type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" />
- </td>
- </tr>
+
+ <input type="hidden" type="text" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/>
+
+ <input type="hidden" type="text" id="FBSDeviceId" class="unable" data-mini="true" />
+
+ <input type="hidden" type="text" id="FbsDeviceIp" class="unable" data-mini="true" />
+
+ <input type="hidden" type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" />
+
<tr>
<td>*鐪�</td>
<td>
@@ -104,7 +89,7 @@
<tr>
<td>*鍖哄幙</td>
<td>
- <select id="county" data-mini="true">
+ <select id="county" data-mini="true">
<option value="">鍏ㄩ儴</option>
</select>
</td>
@@ -478,8 +463,10 @@
console.info(dev_id);
if(ptn.test(dev_id)) {
var value = Number(RegExp.$1);
- // console.log(value);
+ console.info(value);
+ console.info(Math.floor(value/256));
var intNum = prefixInteger(Math.floor(value/256), 3);
+ console.info(intNum);
var resNum = prefixInteger(value%256, 3);
ip = '127.000.'+intNum+'.'+resNum;
}else {
@@ -510,10 +497,12 @@
$('#MonCount').change(function(){
setFloatAndoutLine();
})*/
- function prefixInteger(num, length) {
+ /* function prefixInteger(num, length) {
return (num/Math.pow(3,length)).toFixed(length).substr(2);
+ }*/
+ function prefixInteger(num, length) {
+ return (Array(length).join('0') + num).slice(-length);
}
-
//瀵煎叆琛ㄦ牸榛樿鏁版嵁
function installstartdata(temp){
var data = {
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index 89a59c9..f7861fb 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -66,7 +66,7 @@
var batt = JSON.parse(temp);
console.info(batt);
if(batt.install_user||batt.install_user==0){
- window.location.href="batt-approved.html";
+ window.location.href="batt-approve-index.html";
}else{
window.location.href="testdata.html";
}
diff --git a/gx_tieta/WebRoot/mobil/ele-param2.html b/gx_tieta/WebRoot/mobil/ele-param2.html
index 36f1b16..16c3da1 100644
--- a/gx_tieta/WebRoot/mobil/ele-param2.html
+++ b/gx_tieta/WebRoot/mobil/ele-param2.html
@@ -203,14 +203,12 @@
<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
<h1>閫夋嫨鏂板缓鐢垫睜缁勪釜鏁�</h1>
<fieldset data-role="controlgroup" >
-
-
+
<select id="newbattnum" data-mini="true">
<option value="1">鏂板缓1涓數姹犵粍</option>
<option value="2">鏂板缓2涓數姹犵粍</option>
</select>
-
-
+
</fieldset>
<div data-role="controlgroup" data-type="horizontal" class="mt6">
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
index 2e556c3..e9efda0 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
@@ -49,6 +49,14 @@
result = tojson(model);
return SUCCESS;
}
+ //鎵归噺璁剧疆鏀剧數鍙傛暟
+ public String updatePro() {
+ List<Fbs9100_setparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_setparam>>(){}.getType());
+ Fbs9100_setparam fbs = getGson().fromJson(json, Fbs9100_setparam.class);
+ ServiceModel model = service.updatePro(list);
+ result = tojson(model);
+ return SUCCESS;
+ }
//鐐瑰嚮寮瑰嚭妗嗙殑璁惧畾鎸夐挳,淇敼ld6娴嬭瘯鍙傛暟
public String updateld6Param(){
Fbs9100_setparam fbs = getGson().fromJson(json, Fbs9100_setparam.class);
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
index 641d630..93c686a 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
@@ -9,15 +9,19 @@
import sun.security.jca.GetInstance;
import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.BattinfGroupFactory;
import com.fgkj.dao.CallBack;
import com.fgkj.dao.DAOHelper;
import com.fgkj.dao.FBS9100_ComBase;
+import com.fgkj.dao.UinfDaoFactory;
import com.fgkj.db.DBUtil;
import com.fgkj.db.IDatabaseName;
import com.fgkj.dto.BattInf;
+import com.fgkj.dto.User_log;
import com.fgkj.dto.ram.FBS9100;
import com.fgkj.dto.ram.Fbs9100_setparam;
import com.fgkj.dto.ram.Fbs9100_state;
+import com.fgkj.services.User_logService;
public class Fbs9100_setparamImpl implements BaseDAO,CallBack{
@@ -80,14 +84,27 @@
}
//鎵归噺璁剧疆鏀剧數鍙傛暟
public boolean updatePro(Object obj) {
- Fbs9100_setparam fs=(Fbs9100_setparam) obj;
- String sql="update db_ram_db.tb_Fbs9100_setparam set testCmd=?,HourRate=?," +
- "DisCurr=?,DisCap=?,DisTime=?,groupVol_Low=?,monomerVol_Low=?,monomerLowCount=?,battGroupNum=?," +
- "onlineVolLowAction=?,dCVolHighLimit=?,chargeCurrSet=?,MonomerTmp_High=? where dev_id=?";
- Boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{
- fs.getTestCmd(),fs.getHourRate(),fs.getDisCurr(),fs.getDisCap(),fs.getDisTime(),
- fs.getGroupVol_Low(),fs.getMonomerVol_Low(),fs.getMonomerLowCount(),fs.getBattGroupNum(),fs.getOnlineLowAction(),
- fs.getDCVolHighLimit(),fs.getChargeCurrSet(),fs.getMonomerTmp_High(),fs.getDev_id()});
+ List<Fbs9100_setparam> list=(List<Fbs9100_setparam>) obj;
+ ArrayList sql_str=new ArrayList();
+ List<User_log> listU=new ArrayList<User_log>();//瀛樻斁user_log
+ if(list!=null&&list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ Fbs9100_setparam fs=list.get(i);
+ String sql="update db_ram_db.tb_Fbs9100_setparam set op_cmd="+fs.getOp_cmd()+",testCmd="+fs.getTestCmd()+",HourRate="+fs.getHourRate()+"," +
+ "DisCurr="+fs.getDisCurr()+",DisCap="+fs.getDisCap()+",DisTime="+fs.getDisTime()+",groupVol_Low="+fs.getGroupVol_Low()+",monomerVol_Low="+fs.getMonomerVol_Low()+","
+ + "monomerLowCount="+fs.getMonomerLowCount()+",battGroupNum="+fs.getBattGroupNum()+"," +
+ "onlineVolLowAction="+fs.getOnlineLowAction()+",dCVolHighLimit="+fs.getDCVolHighLimit()+",chargeCurrSet="+fs.getChargeCurrSet()+",MonomerTmp_High="+fs.getMonomerTmp_High()+" where dev_id="+fs.getDev_id();
+ sql_str.add(sql);
+ {
+ String msg="淇敼"+fs.getDev_id()+"鏈烘埧鏀剧數鍙傛暟";
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
+ listU.add(ulog);
+ }
+ }
+ }
+
+ Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+ (new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
return bl;
}
//淇敼鏀剧數鍙傛暟琛ㄤ腑ld6
@@ -305,6 +322,44 @@
}
return res_exe;
}
+ //鎵归噺璁剧疆鎴愬姛鍚庤鍙栧懡浠ょ殑ACK
+ public boolean getCmdAck(int cmd,int dev_id) {
+ int m_cmd = cmd;
+ int m_cmd_ack = cmd;
+ switch(m_cmd) {
+ case FBS9100_ComBase.CMD_Start: m_cmd_ack = FBS9100_ComBase.CMD_StartAck; break;
+ case FBS9100_ComBase.CMD_Stop: m_cmd_ack = FBS9100_ComBase.CMD_StopAck; break;
+ case FBS9100_ComBase.CMD_SetDischargeParm: m_cmd_ack = FBS9100_ComBase.CMD_SetDischargeParmAck; break;
+ case FBS9100_ComBase.CMD_GetDischargeParm: m_cmd_ack = FBS9100_ComBase.CMD_GetDischargeParmAck; break;
+ case FBS9100_ComBase.CMd_SetIp_Tem: m_cmd_ack = FBS9100_ComBase.CMd_SetIpAck; break;
+ case FBS9100_ComBase.CMd_SetIp_Per: m_cmd_ack = FBS9100_ComBase.CMd_SetIpAck; break;
+ case FBS9100_ComBase.CMD_ResetSystem: m_cmd_ack = FBS9100_ComBase.CMD_ResetSystemAck; break;
+ case FBS9100_ComBase.CMD_READGPRS_BTS_TASK_INF: m_cmd_ack = FBS9100_ComBase.CMD_READGPRS_BTS_TASK_INFACK; break;
+ default: return false;
+ }
+ String sql = "SELECT op_cmd FROM db_ram_db.tb_fbs9100_setparam "+
+ " WHERE dev_id="+dev_id;
+ Connection conn=DBUtil.getConn();
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ boolean res_exe=false;
+ try {
+ ps = conn.prepareStatement(sql);
+ rs=ps.executeQuery();
+ if(rs.next())
+ {
+ if(rs.getInt("op_cmd") == m_cmd_ack)
+ {
+ res_exe = true;
+ }
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ DBUtil.close(rs, ps, conn);
+ return res_exe;
+ }
//鏍规嵁dev_id鏌ヨ寮瑰嚭妗嗕腑鐨勬暟鎹�
public List serchbyDev_id(Object obj) {
Fbs9100_setparam fsparam=(Fbs9100_setparam) obj;
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
index a181cc3..11fa11d 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
@@ -1,5 +1,6 @@
package com.fgkj.services.ram;
+import java.util.Calendar;
import java.util.List;
import com.fgkj.dao.BaseDAO;
@@ -82,6 +83,40 @@
}
return model;
}
+ //鎵归噺璁剧疆鏀剧數鍙傛暟
+ public ServiceModel updatePro(Object obj) {
+ boolean bl=((Fbs9100_setparamImpl)dao).updatePro(obj);
+ if(bl) {
+ List<Fbs9100_setparam> list=(List<Fbs9100_setparam>) obj;
+ Calendar c = Calendar.getInstance();
+ //鐜板湪鐨勬椂闂�(鍗曚綅锛氭绉�)
+ long now_time = c.getTimeInMillis();
+ long time=0;
+ int success=0;
+ do {
+ for (int i = 0; i < list.size(); i++) {
+ Fbs9100_setparam fs=list.get(i);
+ if(fs.getNum()==0) {
+ boolean b=((Fbs9100_setparamImpl)dao).getCmdAck(fs.getOp_cmd(), fs.getDev_id());
+ if(b) {
+ success+=1;
+ fs.setNum(1);
+ }
+ }
+ }
+ long moment_time = c.getTimeInMillis();
+ time=moment_time=now_time;
+ }while(time<=5);
+ model.setData(list);
+ model.setCode(1);
+ model.setSum(success);
+ model.setMsg("淇敼鎴愬姛!");
+ }else {
+ model.setCode(0);
+ model.setMsg("淇敼澶辫触!");
+ }
+ return model;
+ }
//鐐瑰嚮寮瑰嚭妗嗙殑璁惧畾鎸夐挳,淇敼ld6娴嬭瘯鍙傛暟
public ServiceModel updateld6Param(Object obj){
Fbs9100_setparam fsparam=(Fbs9100_setparam) obj;
--
Gitblit v1.9.1