From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期六, 19 一月 2019 09:16:08 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl$1.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_battgroup.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_comm_task.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl$1.class | 0
gx_tieta/src/global_zh_CN.properties | 5
gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties | 5
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl.class | 0
gx_tieta/WebRoot/mobil/voltageMbargraph.html | 8
gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java | 29 +-
gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java | 3
gx_tieta/WebRoot/mobil/index.html | 4
gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java | 7
gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java | 31 ++
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl.class | 0
gx_tieta/WebRoot/bts-comm-mon.jsp | 14
gx_tieta/WebRoot/mobil/control.html | 8
gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html | 494 ++++++++++++++++++++++++--------------------
17 files changed, 353 insertions(+), 255 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl$1.class
index 0a69d65..e2b07c4 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl.class
index 22bf55e..00f4733 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_battgroupImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl$1.class
index a8db2b6..832a54a 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl.class
index eac3588..b642f5f 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/App_bts_comm_taskImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_battgroup.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_battgroup.class
index 0e9dd0c..ca78fe5 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_battgroup.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_battgroup.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_comm_task.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_comm_task.class
index 108f3b7..9b62a11 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_comm_task.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dto/App_bts_comm_task.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
index 656ac19..128f98e 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
+++ b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
@@ -1124,4 +1124,7 @@
Batch_batt_param_set = \u6279\u91cf\u7535\u6c60\u53c2\u6570\u8bbe\u7f6e
################## sys-set-test.jsp ##############################
-Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e
\ No newline at end of file
+Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e
+
+################## bts-comm-mon.jsp #########################
+Batt_conn_info_query = \u7535\u6c60\u7ec4\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/bts-comm-mon.jsp b/gx_tieta/WebRoot/bts-comm-mon.jsp
index bfb5580..eb17c30 100644
--- a/gx_tieta/WebRoot/bts-comm-mon.jsp
+++ b/gx_tieta/WebRoot/bts-comm-mon.jsp
@@ -15,7 +15,7 @@
<meta http-equiv="expires" content="0">
<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
<meta http-equiv="description" content="This is my page">
- <title>鐢垫睜娉ㄥ唽淇℃伅鏌ヨ</title>
+ <title><s:text name="Batt_conn_info_query"/></title> <!-- 鐢垫睜缁勮繛鎺ヤ俊鎭煡璇� -->
<link rel="stylesheet" type="text/css" href="pages/css/base.css">
<link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
@@ -105,9 +105,12 @@
,cols: [[
{field: 'Staionanme', title: '鏈烘埧鍚嶇О', align: 'center', width: 450}
,{field:'dev_id', title:'璁惧id', align:'center', width: 260}
- ,{field:'battgroup_id', title:'鐢垫睜缁刬d', align:'center', width: 260}
- ,{field:'battgroup_index', title:'鐢垫睜缁勭储寮�', align:'center', width: 260}
- ,{field:'battgroup_mon_cnt', title:'鐢垫睜缁勫崟浣撲釜鏁�', align:'center', width: 260}
+ ,{field:'battgroup_id', title:'鐢垫睜缁刬d', align:'center', width: 200}
+ ,{field:'battgroup_index', title:'鐢垫睜缁勭储寮�', align:'center', width: 200}
+ ,{field:'battgroup_mon_cnt', title:'鐢垫睜缁勫崟浣撲釜鏁�', align:'center', width: 200}
+ ,{field:'battgroup_float_vol', title:'娴厖鐢靛帇', align:'center', width: 200}
+ ,{field:'battgroup_float_curr', title:'娴厖鐢垫祦', align:'center', width: 200}
+ ,{field:'battgroup_register_code', title:'娉ㄥ唽鐮�', align:'center', width: 200}
]]
,data:[]
@@ -151,6 +154,9 @@
_tmp.battgroup_id = _data.battgroup_id;
_tmp.battgroup_index = _data.battgroup_index;
_tmp.battgroup_mon_cnt = _data.battgroup_mon_cnt;
+ _tmp.battgroup_float_vol = _data.battgroup_float_vol;
+ _tmp.battgroup_float_curr = _data.battgroup_float_curr;
+ _tmp.battgroup_register_code = _data.battgroup_register_code;
arr_td.push(_tmp);
Page.setAll(_data.num);
diff --git a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
index 5bd23af..55c099b 100644
--- a/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
+++ b/gx_tieta/WebRoot/mobil/batt-infor-unapproved-edit2.html
@@ -47,6 +47,9 @@
right: 0;
margin:0!important;
}
+ #newbattnum-button{
+ padding: 1em 1.9em;
+ }
</style>
<link rel="stylesheet" href="css/fgpanel.css">
</head>
@@ -57,139 +60,125 @@
<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>
<h1>鏈鎵归�氳繃鏈烘埧璇︽儏</h1>
- <fieldset data-role="controlgroup" class="ptr0" >
- </fieldset>
+ <fieldset data-role="controlgroup" class="ptr0" >
+ <select id="newbattnum" data-mini="true">
+ <option value=0>鏂板缓鐢垫睜缁�</option>
+ </select>
+ </fieldset>
</div>
+
<!-- 涓讳綋鍐呭 -->
<div data-role="main">
<!-- <div class="set-option"> -->
- <table class="layout-set">
- <tbody>
- <input type="hidden" id="StationId" class="unable" data-mini="true" onfocus="this.blur()"/>
- <input type="hidden" readonly unselectable="on" value="123"class="unable" id="BattGroupId" class="uncheck" data-mini="true" onfocus="this.blur()" />
-
- <input type="hidden" id="FBSDeviceId" class="unable" data-mini="true" onfocus="this.blur()"/>
- <input type="hidden" id="FbsDeviceIp" class="unable" data-mini="true" onfocus="this.blur()"/>
-
- <tr>
- <td>鐪�</td>
- <td>
- <input type="text" id="mainteArea" class="unable" data-mini="true" onfocus="this.blur()"/>
- </td>
- </tr>
- <tr>
- <td>鍩庡競</td>
- <td>
- <input type="text" id="city" class="unable" data-mini="true" onfocus="this.blur()"/>
- </td>
- </tr>
- <tr>
- <td>鍖哄幙</td>
- <td>
- <input type="text" id="country" class="unable" data-mini="true" onfocus="this.blur()"/>
- </td>
- </tr>
- <tr>
- <td>鏈烘埧鍚嶇О</td>
- <td>
- <textarea id="homeName" class="unable" data-mini="true"></textarea>
- </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="FloatVolLevel0" data-mini="true" />
- <input type="hidden" id="OfflineVolLevel0" class="unable" data-mini="true" />
- <input type="hidden" id="FloatVolLevel1" data-mini="true" />
- <input type="hidden" id="OfflineVolLevel1" 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" class="unable" data-mini="true" />
- </td>
- </tr>
-
- <input type="hidden" id="DisCurrMax" class="unable" data-mini="true" />
-
-
- <tr>
- <td>鍩虹珯鐢佃瘽鍙风爜</td>
- <td>
- <input type="text" id="station_phone" class="unable" data-mini="true" />
- </td>
- </tr>
-
- <input id="startTestrecord" type="hidden" name="appDate" class="appDatefir" value="2000-01-01" />
-
- <input id="endTestrecord" type="hidden" name="appDate" class="appDatesec" value="2017-01-01" />
-
- <tr>
- <td>*瀹夎浜哄憳</td>
- <td>
- <input type="text" id="install_user" class="unable" data-mini="true" />
- </td>
- </tr>
- </tbody>
- </table>
- <!-- </div> -->
- <div id="battdata">
- <!-- <div>
- <h1 class="hbg">鐢垫睜缁�1</h1>
- <table class="layout-set">
- <tbody>
- <tr>
- <td>璁惧绱㈠紩</td>
- <td>
- <fieldset data-role="controlgroup" data-type="horizontal">
- <select>
- <option value="">0</option>
- <option value="mon">1</option>
- <option value="mon">2</option>
- <option value="mon">3</option>
-
- </select>
- </fieldset>
- </td>
- </tr>
- <tr>
- <td>鐢垫睜缁勫悕绉�</td>
- <td><input type="text" id="" data-mini="true" /></td>
- </tr>
- </tbody>
- </table>
- </div> -->
- </div>
-
+ <table class="layout-set">
+ <tbody>
+ <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="BattGroupId0" class="uncheck" data-mini="true" />
+
+ <input type="hidden" type="text" readonly unselectable="on" value="123"class="unable" id="BattGroupId1" class="uncheck" data-mini="true" />
+ <tr>
+ <td>鐪�</td>
+ <td>
+ <input type="text" id="mainteArea" class="unable" data-mini="true" onfocus="this.blur()"/>
+ </td>
+ </tr>
+ <tr>
+ <td>鍩庡競</td>
+ <td>
+ <input type="text" id="city" class="unable" data-mini="true" onfocus="this.blur()"/>
+ </td>
+ </tr>
+ <tr>
+ <td>鍖哄幙</td>
+ <td>
+ <input type="text" id="country" class="unable" data-mini="true" onfocus="this.blur()"/>
+ </td>
+ </tr>
+
+ <tr>
+ <td>鏈烘埧鍚嶇О</td>
+ <td>
+ <textarea id="homeName" class="unable" data-mini="true"></textarea>
+ </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="FloatVolLevel0" data-mini="true" />
+ <input type="hidden" id="OfflineVolLevel0" class="unable" data-mini="true" />
+ <input type="hidden" id="FloatVolLevel1" data-mini="true" />
+ <input type="hidden" id="OfflineVolLevel1" 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" />
+ <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="fuchongfazhi0" data-mini="true" />
+ <input type="hidden" id="fuchongfazhi1" data-mini="true" />
+ <input type="hidden" id="lixiandianyafazhi0" data-mini="true" />
+ <input type="hidden" id="lixiandianyafazhi1" data-mini="true" />
+
+ <tr>
+ <td>*璐熻浇鐢垫祦(A)</td>
+ <td>
+ <input type="text" id="Load_curr" data-mini="true" />
+ </td>
+ </tr>
+
+ <input type="hidden" id="DisCurrMax" class="unable" data-mini="true" />
+
+ <tr>
+ <td>鍩虹珯鐢佃瘽鍙风爜</td>
+ <td>
+ <input type="text" id="station_phone" data-mini="true" />
+ </td>
+ </tr>
+
+ <input id="startTestrecord" type="hidden" name="appDate" class="appDatefir" value="2000-01-01" />
+
+ <input id="endTestrecord" type="hidden" name="appDate" class="appDatesec" value="2017-01-01" />
+
+ <tr>
+ <td>*瀹夎浜哄憳</td>
+ <td>
+ <input type="text" id="install_user" data-mini="true" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <div id="battdata">
+ </div>
</div>
-
<div data-role="footer" data-position="fixed" data-theme="a">
<div data-role="navbar">
<ul>
<li><a href="batt-approve-index.html" target="_top" 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" data-rel="popup" id="deletemyPopup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="check" data-role="button">淇敼</a></li>
<li><a href="#myPopup" data-rel="popup" id="deletemyPopup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">鍒犻櫎</a></li>
</ul>
</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>
- <a href="" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete" >鏀惧純</a>
+ <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>
+ <a href="" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-delete" >鏀惧純</a>
</div>
<div data-role="popup" id="myPopup" 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="" id="delete" value="" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >纭畾鍒犻櫎</a>
- <a href="" id="" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-forbidden" data-icon="delete">鍙栨秷鍒犻櫎</a>
+ <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="" id="delete" value="" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-check" >纭畾鍒犻櫎</a>
+ <a href="" id="" class="ui-btn ui-corner-all ui-shadow ui-btn-icon-left ui-icon-forbidden" data-icon="delete">鍙栨秷鍒犻櫎</a>
</div>
</div>
@@ -200,20 +189,66 @@
function creatAllView(num){
var allString=''
,i=0;
- if(num>4){return false}
+ if(num>2){return false}
for(i=0;i<num;i++){
allString+=creatBattView(i);
}
return $("#battdata").html(allString);
}
- $("#delete").click(function(delindex){ //鍒犻櫎鐢垫睜缁�
+ $("#delete").click(function(delindex){ //鍒犻櫎鐢垫睜缁�
var delindex = $("#delete").val();
//console.info($("#delete").val());
//console.info(delindex);
battDeleteparm();
});
+ function creatBa(a){
+ var battnum=2-a,
+ opstring='';
+ if(a>2&&battnum<=0){return false;}
+ for(var i=0;i<=battnum;i++){
+
+ opstring+='<option value='+i+'>鏂板缓'+i+'涓數姹犵粍</option>';
+ }
+ console.warn(opstring+'ttt');
+ return $('#newbattnum').html(opstring);
+ }
+ $('#newbattnum').change(function(){
+ var numbattnum = parseInt($('#newbattnum').val());
+ var index =parseInt(temp.length);
+ addbattnum=Math.floor((numbattnum)+(temp.length));
+ console.warn(addbattnum);
+ creatAllView(addbattnum).trigger('create');
+ creatBattGroupId(addbattnum);
+ installstartdata(temp);
+ installaddnew();
+ setchangedMonVolStd(addbattnum);
+ $(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");
+ });
+ function creatBattGroupId(addbattnum){
+ $.ajax({type: "post",
+ url: "BattInfAction!searchMaxBattgroupId",
+ async:true,
+ dataType:'text',
+ data:null,
+ success: function(data){
+ data=JSON.parse(data);
+ data=data.result;
+ data =JSON.parse(data);
+ //console.info(data)
+ var groupid = data.data;
+ //console.info(groupid);
+ //tempgroupid.push(groupid);
+ console.info(tempgroupid);
+ for(var i=temp.length;i<addbattnum;i++){
+ $("#BattGroupId"+i).val(groupid++);
+ //tempgroupid.push(groupid++);
+ console.info(tempgroupid);
+ }
+ }
+ });
+ }
function battDeleteparm(){
var parm = getUpdateArr();
console.info(parm);
@@ -239,12 +274,12 @@
}
});
}
- function creatBattView(index){
+/* 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>'*/
- ,battBrand='<tr>'+'<td>'+'鐢垫睜鍝佺墝'+'</td>'+'<td>'+'<input type="text" '+' class="unable" '+'id='+'battproducer'+index+' data-mini="true"'+'value='+'鐢垫睜鍝佺墝'+count+' />'+'</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" '+'>'
@@ -256,26 +291,54 @@
,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 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>'
+ ,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;
+
+ }
function selectedNum(index){
var selected='';
- if(temp[index].binf.MonCount==4){
- return selected='<option '+'value='+4+' selected=selected' +'>'+'4 涓�'+'</option>'+'<option '+'value='+24 +'>'+'24涓�'+'</option>';
+ if(temp[index]){
+ 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>';
+ }
}else{
- return selected='<option '+'value='+24+' selected=selected' +'>'+'24 涓�'+'</option>'+'<option '+'value='+4 +'>'+'4涓�'+'</option>';
+ return selected='<option '+'value='+4+' selected=selected' +'>'+'4 涓�'+'</option>'+'<option '+'value='+24 +'>'+'24涓�'+'</option>';
}
}
function selectedIndex(index){
var selected='',
- i=0;
- var battproducer = ["鐞嗗＋","鍦ｉ槼","鍙岀櫥","SENRY","鍗楅兘","鐖遍粯鐢�","绉戝＋杈�","閾舵嘲","涓版棩","涓叴鑳芥淳","鍏夊畤",
- "鑹捐鏂崕杈�","闆勯煬","椋庡竼","鏂囬殕","涓北"];
- selected+= '<option '+'value='+temp[index].binf.BattProducer+'>'+temp[index].binf.BattProducer+'</option>';
- for(var i=0;i<battproducer.length;i++){
- if(temp[index].binf.BattProducer!=battproducer[i]){
- selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';
- }
+ i=0;
+ console.info(index);
+ var battproducer = getCookie("producer");
+ battproducer = JSON.parse(battproducer);
+ if(temp[index]){
+ selected+= '<option '+'value='+temp[index].binf.BattProducer+'>'+temp[index].binf.BattProducer+'</option>';
+ for(var i=0;i<battproducer.length;i++){
+ if(temp[index].binf.BattProducer!=battproducer[i]){
+ selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';
+ }
+ }
+ }else{
+ for(var i=1;i<battproducer.length;i++){
+ console.info(battproducer[i]);
+ selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';
+ }
}
return selected;
}
@@ -293,44 +356,19 @@
var fuchongfazhi = [0,0,0,0];
var lixiandianyafazhi = [0,0,0,0];
$(function(){
- creatAllView(temp.length).trigger('create');
- setMonVolStd(temp.length);
+ creatAllView(temp.length).trigger('create');
+ creatBa(temp.length).trigger('create');
+ setMonVolStd(addbattnum);
+ setchangedMonVolStd(addbattnum);
});
$(function () {
//setTimes($("#startTestrecord"),'2000-01-01');
- //setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
-
+ //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})$/;
@@ -350,30 +388,35 @@
}
// 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊� //
- function setFloatAndoutLine(index) {
+ function setFloatAndoutLine(index) {
+ console.info(index);
var monvolstd = "#MonVolStd"+index;
var MonCount = "#MonCount" +index;
var vol = $(monvolstd).val();
var monnum = $(MonCount).val();
+ console.info(monnum)
var chargeVol = (vol*1.117*monnum).toFixed(1); // 娴厖鐢靛帇闃�鍊�
var outlineVol = (vol*1.073*monnum).toFixed(1); // 绂荤嚎鐢靛帇闃�鍊�
- //$('#BattFloatCurrent').val(chargeVol); // 娴厖鐢靛帇闃�鍊�
- //$('#OfflineVolLevel').val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊�
- fuchongfazhi[index] = chargeVol;
- lixiandianyafazhi[index] = outlineVol;
+ $("#fuchongfazhi"+index).val(chargeVol); // 娴厖鐢靛帇闃�鍊�
+ $("#lixiandianyafazhi"+index).val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊�
console.info(vol);
}
-
+
+ function prefixInteger(num, length) {
+ return (Array(length).join('0') + num).slice(-length);
+ }
function prefixInteger(num, length) {
return (num/Math.pow(3,length)).toFixed(length).substr(2);
}
- //瀵煎叆琛ㄦ牸榛樿鏁版嵁
+ //瀵煎叆琛ㄦ牸榛樿鏁版嵁
function installstartdata(temp){
data=temp[0].binf;
setMonVolStd(temp.length);
+ //creatgroupid();
+ var ip = getDevIp(data.FBSDeviceId);
document.getElementById("StationId").value = data.StationId;
document.getElementById("mainteArea").value = data.StationName1;
document.getElementById("city").value = data.StationName2; //甯�
@@ -381,21 +424,21 @@
document.getElementById("homeName").value = data.StationName3; //鏈烘埧鍚嶇О
document.getElementById("StationName4").value = data.StationName4; //璁惧鍚嶇О
document.getElementById("StationIp").value = data.StationIp; //璁惧IP
- document.getElementById("FBSDeviceId").value = data.FBSDeviceId;
- document.getElementById("FbsDeviceIp").value = data.FbsDeviceIp;
+ document.getElementById("FBSDeviceId").value = data.FBSDeviceId;
+ document.getElementById("FbsDeviceIp").value = ip;
document.getElementById("FbsDeviceIp_YM").value = data.FbsDeviceIp_YM;
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("BattGroupNum").value = data.BattGroupNum;
//document.getElementById("BattGroupName").value = temp[15];
//document.getElementById("FloatVolLevel").value = data.FloatVolLevel;
//document.getElementById("OfflineVolLevel").value = data.OfflineVolLevel;
- document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent;
+ //document.getElementById("BattFloatCurrent").value = data.BattFloatCurrent;
+ document.getElementById("BattFloatCurrent").value = 5;
//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;
@@ -408,17 +451,18 @@
document.getElementById("endTestrecord").value = data.BattInUseDate;
//setTimes($("#startTestrecord"),data.productDate);
//setTimes($("#endTestrecord"),data.useDate);
- document.getElementById("install_user").value = data.install_user;
+ document.getElementById("install_user").value = data.install_user;
for(var i=0;i<temp.length;i++){
- data=temp[i].binf;
+ data=temp[i].binf;
+ console.info(data.BattGroupId);
+ document.getElementById("BattGroupId"+i).value = data.BattGroupId;
document.getElementById("MonCapStd"+i).value = data.MonCapStd;
document.getElementById("MonVolStd"+i).value = data.MonVolStd;
console.info(data.MonCount);
$("#MonCount"+i).find("option:selected").val(data.MonCount);
var battString = "#battname"+i;
var battModel = "#batttype"+i;
- var battproducer = "#battproducer"+i;
- $('#MonCount'+i).val(data.MonCount);
+ var battproducer = "#battproducer"+i
//var battproducer ="#battproducer"+i;
$(battString).val(data.BattGroupName);
$(battModel).val(data.BattModel);
@@ -427,28 +471,44 @@
}
}
- // 鏍煎紡鍖栨彁浜ゅ悗鍙颁俊鎭殑瀵硅薄鏁扮粍骞惰繑鍥� 鍗曚釜淇敼锛屾墜鏈烘柟寮忎笉淇敼澶氫釜鐢垫睜缁�
+ function installaddnew(){
+ document.getElementById("MonVolStd"+i).value = 12;
+ $("#battproducer"+i).val("");
+ }
+ function setchangedMonVolStd(suoyin){
+ for(var u=0;u<suoyin;u++){
+ var id='';
+ id='#MonCount'+u;
+ (function(u){
+ var vol='#MonVolStd'+u;
+ $(document).on("change", id, function () {
+ if($(this).find("option:selected").val()==4){$(vol).val(12);}
+ if($(this).find("option:selected").val()==24){$(vol).val(2);}
+ })
+ })(u)
+
+ }
+ }
+
function getUpdateArr(){
mon=$('#MonVolStd').val();
- //moncount = ;
+
var arr = new Array();
-
- for(var i=0;i<temp.length;i++){
+ console.info(addbattnum);
+ for(var i=0;i<addbattnum;i++){
+ console.info(i);
setFloatAndoutLine(i);
-
var battString = "#battname"+i;
var battModel = "#batttype"+i;
var battproducer ="#battproducer"+i;
- var nomCap = "#nomCap"+i;
- //var id = $('fieldset div div input[data-cacheval=\'true\']').val();
- //var inputVal = $(id).val();
+ var id = $('fieldset div div input[data-cacheval=\'true\']').val();
+ var inputVal = $(id).val();
//var input =$(four).option()
- //console.info(inputVal)
+ console.info(inputVal)
var index = String(i);
console.info(battString);
var obj = {
- //apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),
- num : temp[i].num,
+ apply_date : new Date().format("yyyy-MM-dd hh:mm:ss"),
binf:{
StationId : $("#StationId").val(), // 鏈烘埧缂栧彿
StationName : ($("#mainteArea").val()+"-"+$("#city").val()+"-"+$("#homeName").val()+"-"+$("#StationName4").val()), // 鎷兼帴鏈烘埧鍚嶇О
@@ -464,11 +524,11 @@
FbsDeviceIp_WG : $("#FbsDeviceIp_WG").val(), // 缃戝叧
FBSDeviceName : $("#FBSDeviceName").val(), //璁惧鍚嶇О
GroupIndexInFBSDevice : i, //fbs璁惧绱㈠紩
- BattGroupId : tempgroupid[i], //鐢垫睜缁刬d
+ BattGroupId : $("#BattGroupId"+i).val(), //鐢垫睜缁刬d
BattGroupNum : $("#BattGroupNum").val(), //鏈烘埧鍐呯數姹犵粍缂栧彿
BattGroupName : $(battString).val(),
- FloatVolLevel : fuchongfazhi[i], //娴厖鐢靛帇闃�鍊�
- OfflineVolLevel : lixiandianyafazhi[i], //绂荤嚎鐢靛帇闃�鍊�
+ FloatVolLevel : $("#fuchongfazhi"+i).val(), //娴厖鐢靛帇闃�鍊�
+ OfflineVolLevel : $("#lixiandianyafazhi"+i).val(), //绂荤嚎鐢靛帇闃�鍊�
BattFloatCurrent : $("#BattFloatCurrent").val(), //娴厖鐢垫祦闃�鍊�
MonCount :$("#MonCount"+i).val(), //鍗曚綋鏁伴噺
MonCapStd : $("#MonCapStd"+i).val(), //鏍囩О瀹归噺
@@ -481,7 +541,7 @@
DisCurrMax : $("#DisCurrMax").val(), //鏈�澶ф牳瀹圭數娴�
station_phone : $("#station_phone").val(), //鍩虹珯鍙风爜
- BattProducer : $("#battproducer"+i).val(), //鐢垫睜鍝佺墝
+ BattProducer : $("#battproducer"+i).find("option:selected").val(), //鐢垫睜鍝佺墝
BattModel : $(battModel).val(), //鐢垫睜鍨嬪彿
BattProductDate : $("#startTestrecord").val(), //鐢垫睜鐢熶骇鏃ユ湡
BattInUseDate : $("#endTestrecord").val(), //鐢垫睜浣跨敤鏃ユ湡
@@ -493,7 +553,6 @@
console.info(arr);
return arr;
}
-
</script>
<script type="text/javascript">
@@ -523,7 +582,7 @@
}
function editBatt(){//
- console.info(getUpdateArr());
+ creatBattGroupId(addbattnum);
var temp = JSON.stringify(getUpdateArr());
console.info(temp);
$.ajax({
@@ -553,9 +612,10 @@
- $('input:radio[name="battnum"]').click(function(){
+ /* $('input:radio[name="battnum"]').click(function(){
var $this=$(this)
, $mon=$('#MonVolStd') ;
+ // for(var i=0;i<addbattnum;i++)
if ($this.attr("checked")) {
銆�銆�銆�銆�銆�銆� if($this.val()==4){
$mon.val("12");
@@ -566,7 +626,7 @@
moncount = 24;
}
銆�銆�銆�銆�}
- });
+ }); */
/*function creatMonCapOpt(){
var k,optionStr='',allString;
@@ -584,12 +644,18 @@
i=0;
//console.info(temp[index.binf.MonCapStd]);
var battproducer = ["50","100","150","200","250","300","350","400","450","500","1000"];
- selected+= '<option '+'value='+temp[index].binf.MonCapStd+'>'+temp[index].binf.MonCapStd+'</option>';
- for(var i=0;i<battproducer.length;i++){
- if(temp[index].binf.MonCapStd!=battproducer[i]){
- selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';
- }
- }
+ if(temp[index]){
+ selected+= '<option '+'value='+temp[index].binf.MonCapStd+'>'+temp[index].binf.MonCapStd+'</option>';
+ for(var i=0;i<battproducer.length;i++){
+ if(temp[index].binf.MonCapStd!=battproducer[i]){
+ selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';
+ }
+ }
+ }else{
+ for(var i=0;i<battproducer.length;i++){
+ selected+= '<option '+'value='+battproducer[i]+'>'+battproducer[i]+'</option>';
+ }
+ }
return selected;
}
@@ -623,27 +689,15 @@
}*/
- function setMonVolStd(suoyin){
- for(var u=0;u<suoyin;u++){
- var id='';
- id='#MonCount'+u;
- (function(u){
- var vol='#MonVolStd'+u;
- $(document).on("change", id, function () {
- if($(this).find("option:selected").val()==4){$(vol).val(12);}
- if($(this).find("option:selected").val()==24){$(vol).val(2);}
- })
- })(u)
-
- }
- }
- function setMonVolStd(index){
+
+ function setMonVolStd(index){
for(var i=0;i<index;i++){
var s='#MonVolStd'+i;
$(s).val(12);
}
}
+
/* 鎿嶄綔鎴愬姛
$('#changeSuc').popup('open');
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index 911f6ce..18b7daa 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -311,7 +311,7 @@
var rs = JSON.parse(result.result);
console.info(rs);
var sdStatus = (rs.data == 0)?'姝ｅ父': '<span style="color: #FF0000">鏁呴殰</span>';
- arrtdjifangstate .push(sdStatus);
+ arrtdjifangstate.push(sdStatus);
//console.log(sdStatus);
// status.setText('sdCard', "SD鍗＄姸鎬侊細"+sdStatus);
arrTd1.push(sdStatus);
@@ -358,11 +358,7 @@
alert(msg.signal);
}
},error:function(e){
- var model = {
- code:0,
- data:e,
- msg:'閫氫俊澶辫触'
- };
+ alert("閫氳澶辫触");
}
});
}
diff --git a/gx_tieta/WebRoot/mobil/index.html b/gx_tieta/WebRoot/mobil/index.html
index ce165df..212df11 100644
--- a/gx_tieta/WebRoot/mobil/index.html
+++ b/gx_tieta/WebRoot/mobil/index.html
@@ -23,7 +23,7 @@
<a href="machineroomM.html" target="_top" data-i18n="main.index">娴嬭瘯鏁版嵁</a>
</li>
<li>
- <a href="ele-param2.html" target="_top" data-i18n="main.warningmanagement">鐢垫睜瀹夎鐢宠</a>
+ <a href="ele-param2.html" target="_top" data-i18n="main.warningmanagement">bts瀹夎鐢宠</a>
</li>
<li>
<a href="auditDetail.html" target="_top" data-i18n="main.warningmanagement">瀹℃壒璇︽儏</a>
@@ -48,7 +48,7 @@
<a href="map.html" target="_top" id="LocationCR" data-i18n="main.usermanagement">鏈烘埧瀹氫綅</a>
</li> -->
<li>
- <a href="checkAccept-index.html" id="check_Accept" target="_top" data-i18n="main.usermanagement">鎵瑰噯瀹℃壒鍙婇獙鏀�</a>
+ <a href="checkAccept-index.html" id="check_Accept" target="_top" data-i18n="main.usermanagement">bts瀹夎瀹℃壒鍜岄獙鏀�</a>
</li>
<!-- <li>
<a href="batt-home-info.html" target="_top" data-i18n="main.usermanagement">鏈烘埧淇℃伅</a>
diff --git a/gx_tieta/WebRoot/mobil/voltageMbargraph.html b/gx_tieta/WebRoot/mobil/voltageMbargraph.html
index 469aa14..91ec8b3 100644
--- a/gx_tieta/WebRoot/mobil/voltageMbargraph.html
+++ b/gx_tieta/WebRoot/mobil/voltageMbargraph.html
@@ -93,7 +93,13 @@
</div>
</div>
</div>
-
+ <div data-role="main" class="ui-content">
+ <div class="ui-grid-c">
+ <div class="ui-block-a">鏈�澶�<span class="max"> </span></div>
+ <div class="ui-block-b">鏈�灏�<span class="min"> </span></div>
+ <div class="ui-block-c">骞冲潎<span class="avg"> </span></div>
+ <div class="ui-block-d">绱姞鍜�<span class="leijiasum"> </span></div>
+ </div>
<script type="text/javascript" src="mobilJs/echarts.js"></script>
<script type="text/javascript">
/* $('#alwaysRight').tap(function(){
diff --git a/gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java b/gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java
index 412f992..bee2438 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/App_bts_battgroupImpl.java
@@ -54,7 +54,7 @@
Page page=binf.getPage();
Connection conn=DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
- String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,battgroup_id,battgroup_index,battgroup_mon_cnt " +
+ String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,battgroup_id,battgroup_index,battgroup_mon_cnt,battgroup_float_vol,battgroup_float_curr,battgroup_register_code " +
" ,stationName,stationName1,stationName2,stationName3,stationName5,StationId " +
" from db_app_sys.tb_app_bts_battgroup " +
" left outer join db_battinf.tb_battinf on db_app_sys.tb_app_bts_battgroup.dev_id=db_battinf.tb_battinf.fBSDeviceId " +
@@ -75,7 +75,7 @@
}else{
sql+=dev_idT;
}
- String orderSql=" order by dev_id limit ?,? ";
+ String orderSql=" order by dev_id,battgroup_index asc limit ?,? ";
sql+=orderSql;
//System.out.println(sql); //"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationId()+"%","%"+binf.getStationName5()+"%",binf.getNum()
List<App_bts_battgroup> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{binf.getFBSDeviceId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
@@ -89,6 +89,9 @@
abattgroup.setBattgroup_id(rs.getInt("battgroup_id"));
abattgroup.setBattgroup_index(rs.getInt("battgroup_index"));
abattgroup.setBattgroup_mon_cnt(rs.getInt("battgroup_mon_cnt"));
+ abattgroup.setBattgroup_float_vol(rs.getFloat("battgroup_float_vol"));
+ abattgroup.setBattgroup_float_curr(rs.getFloat("battgroup_float_curr"));
+ abattgroup.setBattgroup_register_code(rs.getString("battgroup_register_code"));
abattgroup.setStationId(rs.getString("stationId"));
abattgroup.setStationName(rs.getString("stationName"));
abattgroup.setStationName1(rs.getString("stationName1"));
diff --git a/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java b/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
index ef9d2fc..e9daa0e 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/App_bts_comm_taskImpl.java
@@ -49,7 +49,7 @@
Page page=binf.getPage();
Connection conn=DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
- String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,thread_id,battgroup_cnt,battgroup_id1,battgroup_index1,battgroup_id2,battgroup_index2,battgroup_id3,battgroup_index3,battgroup_id4,battgroup_index4,connet_time,dev_comm_runtime,break_type " +
+ String sql=" select SQL_CALC_FOUND_ROWS distinct dev_id,thread_id,dev_mcu_uid,battgroup_cnt,battgroup_id1,battgroup_index1,battgroup_id2,battgroup_index2,battgroup_id3,battgroup_index3,battgroup_id4,battgroup_index4,connet_time,dev_comm_runtime,break_type " +
" ,stationName,stationName1,stationName2,stationName3,stationName5,StationId " +
" from db_app_sys.tb_app_bts_comm_task " +
" left outer join db_battinf.tb_battinf on db_app_sys.tb_app_bts_comm_task.dev_id=db_battinf.tb_battinf.fBSDeviceId " +
@@ -83,6 +83,7 @@
atask.setDev_id(rs.getInt("dev_id"));
atask.setThread_id(rs.getInt("thread_id"));
atask.setBattgroup_cnt(rs.getInt("battgroup_cnt"));
+ atask.setDev_mcu_uid(rs.getString("dev_mcu_uid"));
atask.setBattgroup_id1(rs.getInt("battgroup_id1"));
atask.setBattgroup_index1(rs.getInt("battgroup_index1"));
atask.setBattgroup_id2(rs.getInt("battgroup_id2"));
diff --git a/gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java b/gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java
index 2dd9220..cf60cd8 100644
--- a/gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java
+++ b/gx_tieta/src/com/fgkj/dto/App_bts_battgroup.java
@@ -8,6 +8,9 @@
private int battgroup_id;
private int battgroup_index;
private int battgroup_mon_cnt;
+ private float battgroup_float_vol;
+ private float battgroup_float_curr;
+ private String battgroup_register_code;
private String stationName;
private String stationName1;
private String stationName2;
@@ -87,14 +90,34 @@
public void setNote(String note) {
this.note = note;
}
+ public float getBattgroup_float_vol() {
+ return battgroup_float_vol;
+ }
+ public void setBattgroup_float_vol(float battgroup_float_vol) {
+ this.battgroup_float_vol = battgroup_float_vol;
+ }
+ public float getBattgroup_float_curr() {
+ return battgroup_float_curr;
+ }
+ public void setBattgroup_float_curr(float battgroup_float_curr) {
+ this.battgroup_float_curr = battgroup_float_curr;
+ }
+ public String getBattgroup_register_code() {
+ return battgroup_register_code;
+ }
+ public void setBattgroup_register_code(String battgroup_register_code) {
+ this.battgroup_register_code = battgroup_register_code;
+ }
@Override
public String toString() {
return "App_bts_battgroup [num=" + num + ", dev_id=" + dev_id + ", battgroup_id=" + battgroup_id
- + ", battgroup_index=" + battgroup_index + ", battgroup_mon_cnt=" + battgroup_mon_cnt + ", stationName="
- + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName3="
- + stationName3 + ", stationName5=" + stationName5 + ", stationId=" + stationId + ", note=" + note + "]";
+ + ", battgroup_index=" + battgroup_index + ", battgroup_mon_cnt=" + battgroup_mon_cnt
+ + ", battgroup_float_vol=" + battgroup_float_vol + ", battgroup_float_curr=" + battgroup_float_curr
+ + ", battgroup_register_code=" + battgroup_register_code + ", stationName=" + stationName
+ + ", stationName1=" + stationName1 + ", stationName2=" + stationName2 + ", stationName3=" + stationName3
+ + ", stationName5=" + stationName5 + ", stationId=" + stationId + ", note=" + note + "]";
}
-
+
}
diff --git a/gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java b/gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java
index 70d3385..0ddee33 100644
--- a/gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java
+++ b/gx_tieta/src/com/fgkj/dto/App_bts_comm_task.java
@@ -7,6 +7,7 @@
private int num;
private int thread_id;
private int dev_id;
+ private String dev_mcu_uid;
private int battgroup_cnt;
private int battgroup_id1;
private int battgroup_index1;
@@ -158,24 +159,26 @@
public void setStationId(String stationId) {
this.stationId = stationId;
}
+ public String getDev_mcu_uid() {
+ return dev_mcu_uid;
+ }
+ public void setDev_mcu_uid(String dev_mcu_uid) {
+ this.dev_mcu_uid = dev_mcu_uid;
+ }
@Override
public String toString() {
- return "App_bts_comm_task [num=" + num + ", thread_id=" + thread_id
- + ", dev_id=" + dev_id + ", battgroup_cnt=" + battgroup_cnt
- + ", battgroup_id1=" + battgroup_id1 + ", battgroup_index1="
- + battgroup_index1 + ", battgroup_id2=" + battgroup_id2
- + ", battgroup_index2=" + battgroup_index2 + ", battgroup_id3="
- + battgroup_id3 + ", battgroup_index3=" + battgroup_index3
- + ", battgroup_id4=" + battgroup_id4 + ", battgroup_index4="
- + battgroup_index4 + ", connect_time=" + connet_time
- + ", dev_comm_runtime=" + dev_comm_runtime + ", break_type="
- + break_type + ", stationName=" + stationName
- + ", stationName1=" + stationName1 + ", stationName2="
- + stationName2 + ", stationName3=" + stationName3
- + ", stationName5=" + stationName5 + ", stationId=" + stationId
+ return "App_bts_comm_task [num=" + num + ", thread_id=" + thread_id + ", dev_id=" + dev_id + ", dev_mcu_uid="
+ + dev_mcu_uid + ", battgroup_cnt=" + battgroup_cnt + ", battgroup_id1=" + battgroup_id1
+ + ", battgroup_index1=" + battgroup_index1 + ", battgroup_id2=" + battgroup_id2 + ", battgroup_index2="
+ + battgroup_index2 + ", battgroup_id3=" + battgroup_id3 + ", battgroup_index3=" + battgroup_index3
+ + ", battgroup_id4=" + battgroup_id4 + ", battgroup_index4=" + battgroup_index4 + ", connet_time="
+ + connet_time + ", dev_comm_runtime=" + dev_comm_runtime + ", break_type=" + break_type
+ + ", stationName=" + stationName + ", stationName1=" + stationName1 + ", stationName2=" + stationName2
+ + ", stationName3=" + stationName3 + ", stationName5=" + stationName5 + ", stationId=" + stationId
+ ", note=" + note + "]";
}
+
}
diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index 656ac19..128f98e 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1124,4 +1124,7 @@
Batch_batt_param_set = \u6279\u91cf\u7535\u6c60\u53c2\u6570\u8bbe\u7f6e
################## sys-set-test.jsp ##############################
-Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e
\ No newline at end of file
+Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e
+
+################## bts-comm-mon.jsp #########################
+Batt_conn_info_query = \u7535\u6c60\u7ec4\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2
\ No newline at end of file
--
Gitblit v1.9.1