From 97db75238a96a75f41bafd469548c2a84ba37080 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期五, 28 九月 2018 14:31:04 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/dischargeplan.jsp | 257 ++++-------
gx_tieta/WebRoot/eleHistoryWarn.jsp | 4
gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java | 3
gx_tieta/WebRoot/elegroup.jsp | 313 ++++++++++---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 19
gx_tieta/src/com/fgkj/services/BattTest_ResService.java | 9
gx_tieta/WebRoot/ele-param.jsp | 2
gx_tieta/WebRoot/equip-charge-param.jsp | 2
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 7
gx_tieta/WebRoot/equipHistWarn1.jsp | 164 +++----
gx_tieta/WebRoot/equipment.jsp | 2
gx_tieta/WebRoot/elestatus.jsp | 4
gx_tieta/WebRoot/endure.jsp | 2
gx_tieta/WebRoot/batt-attention.jsp | 4
gx_tieta/WebRoot/dataManage.jsp | 5
gx_tieta/WebRoot/ele_statistics.jsp | 4
gx_tieta/WebRoot/elewarn.jsp | 4
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java | 4
gx_tieta/WebRoot/eleAnalyse.jsp | 4
gx_tieta/WebRoot/index.jsp | 114 ++++
gx_tieta/WebRoot/dischargetest.jsp | 4
gx_tieta/WebRoot/eleMonomer.jsp | 4
gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java | 10
gx_tieta/WebRoot/eleWarnPrmSet.jsp | 190 +++++---
gx_tieta/WebRoot/taskplan.jsp | 4
gx_tieta/src/com/fgkj/dto/Dev_param.java | 27 +
gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java | 12
gx_tieta/WebRoot/control.jsp | 5
gx_tieta/WebRoot/eleAssess.jsp | 4
gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java | 16
gx_tieta/WebRoot/equipWarn1.jsp | 100 +++-
gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java | 3
32 files changed, 820 insertions(+), 486 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-attention.jsp b/gx_tieta/WebRoot/batt-attention.jsp
index 6201b94..a559668 100644
--- a/gx_tieta/WebRoot/batt-attention.jsp
+++ b/gx_tieta/WebRoot/batt-attention.jsp
@@ -417,7 +417,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
@@ -441,7 +441,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 0c733b9..6d70783 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -3976,11 +3976,10 @@
// 鏈烘埧->鐢垫睜缁�
treeView.ele.on('click', '.home', function() {
var home = $(this).data('attr');
- console.log(home);
var tmp = {
StationName1: home.StationName1,
StationName2: home.StationName2,
- StationName3: home.StationName3,
+ StationName: home.StationName,
StationId: home.StationId
};
fourth(treeView, $(this).parent(), tmp);
@@ -3994,7 +3993,7 @@
BattGroupId = eleGroup.BattGroupId;
// 瀵笲TS9611鍋氱壒娈婄殑澶勭悊
var batt = getBatt();
- console.info(batt);
+ //console.info(batt);
$('#eleCircleBtn').removeClass('hide');
if(regEquipType(batt.FBSDeviceId, globalPattern.BTSSreen)) {
var isAct = $('#eleCircleBtn').hasClass('action');
diff --git a/gx_tieta/WebRoot/dataManage.jsp b/gx_tieta/WebRoot/dataManage.jsp
index 4c32f73..708cdd1 100644
--- a/gx_tieta/WebRoot/dataManage.jsp
+++ b/gx_tieta/WebRoot/dataManage.jsp
@@ -688,7 +688,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
@@ -712,7 +712,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
@@ -742,6 +742,7 @@
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
createOptions($select, optsList, true);
+ $select.find('option:selected').eq(0).val(0);
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
diff --git a/gx_tieta/WebRoot/dischargeplan.jsp b/gx_tieta/WebRoot/dischargeplan.jsp
index ec7ed63..5bfa3ad 100644
--- a/gx_tieta/WebRoot/dischargeplan.jsp
+++ b/gx_tieta/WebRoot/dischargeplan.jsp
@@ -40,7 +40,8 @@
<!-- 缁存姢鍖轰俊鎭� -->
<table>
<tr class="fWeight">
- <td><s:text name="Maintenance_area"/></td> <!-- 缁存姢鍖� -->
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
<td><s:text name="Computer_site"/></td> <!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td><s:text name="Battery"/></td> <!-- 钃勭數姹犵粍 -->
<td><s:text name="Test"/><s:text name="Status"/></td> <!-- 娴嬭瘯鐘舵�� -->
@@ -49,9 +50,10 @@
</tr>
<tr>
<td>
- <select id="station_name1" name="station_name1">
-
- </select>
+ <select id="station_name1" name="station_name1"></select>
+ </td>
+ <td>
+ <select id="city" name="station_name2"></select>
</td>
<td>
<select id="station_name" name="station_name">
@@ -616,6 +618,7 @@
$('#start-discharge-end-date').val(new Date().format('yyyy-MM-dd'));
$('#end-discharge-end-date').val(new Date().format('yyyy-MM-dd'));
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
$(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
@@ -639,196 +642,134 @@
}else{
$("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
}
- findStationNamebyStationname1();
+ findCity();
});
});
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+ function findCity() {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ var $select = $("#city");
+ if(rs.code == 1) {
+ var _data= rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ optsList.push(tmp);
+ }
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else {
+ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
+ findCity();
+ });
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
findStationNamebyStationname1();
});
- var isNewload = true;
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val()
};
- var stationid = getQueryString("stationId");
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ var rs = JSON.parse(data.result);
+ if(rs.code==1){
+ var _data = rs.data;
var $select = $("#station_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
- if(stationid!=undefined && stationid == data.data[i-1].StationId && isNewload){
- $option.attr("selected",true);
- }
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}else{
- $("#station_name").text('').html('<option>鏆傛棤绠＄悊鐨勬満鎴跨珯鐐�</option>');
+ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
findserchByBattGroupNamebystationname();
});
}
+ // 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
$('#station_name').change(function(){
findserchByBattGroupNamebystationname();
});
- //鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
+ //鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
function findserchByBattGroupNamebystationname(){
- var user = {
- UNote:$("#station_name1 option:selected").val(),
- UName:$("#station_name option:selected").val()
+ var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ StationName: $("#station_name").val(),
+ StationId: stationid
};
-
- //var station_name1=$("#station_name1 option:selected").val();
- //var station_name=$("#station_name option:selected").val();
- $.post("User_battgroup_baojigroup_battgroupAction!serchBattgroupidInGroup","json="+JSON.stringify(user),function(data){
+ $.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
data=data.result;
//console.info(data);
data=eval("("+data+")");
//console.info(data);
if(data.code==1 && data.data.length>0){
var $select = $("#battgroup_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i!=0){
- $option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
- $option.attr("value",data.data[i-1].BattGroupId);
- $option.attr("stationname",data.data[i-1].StationName);
- }else{
- $option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>锛�");
- $option.attr("value", "0");
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<data.data.length;i++){
+ var _data = data.data[i];
+ var _attr = {
+ stationname: _data.StationName,
+ dev_id: _data.FBSDeviceId,
+ batt_num: _data.GroupIndexInFBSDevice+1
+ };
+ var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>";
+ var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr);
+ optsList.push(tmp);
}
- var dischargestate = (parseInt(getQueryString("discharge-state")));
- if(dischargestate >= 0 && isNewload){
- $('#discharge-state option[value = "'+dischargestate+'"]').attr('selected','selected');
- isNewload = false;
- }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ $select.find('option').eq(0).val(0);
searchDischarge();
}else{
- $("#battgroup_name").text('').html('<option>鏆傛棤绠＄悊鐨勮搫鐢垫睜缁�</option>');
+ $("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
});
}
-
- /* $(document).ready(function(){
- //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("BattInfAction_serchByStation",null,function(data){
- data=data.result;
- data=eval("("+data+")");
- //console.info(data);
- if(data.code==1 && data.data.length>0){
- var $select=$("#station_name1");
- $select.text("");
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1].StationName1);
- $option.attr("value",data.data[i-1].StationName1);
- }
- $select.append($option);
- }
- }
- findStationNamebyStationname1();
- });
-
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
- $('#station_name1').change(function(){
- findStationNamebyStationname1();
- });
-
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var stationid = getQueryString("stationId");
- var selectvalue=$("#station_name1 option:selected").val();
- //alert(selectvalue);
- $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
- var $select = $("#station_name");
- $select.text("");
- for(var i=0;i<data.data.length;i++){
- $option=$("<option></option>");
- //if(i==0){
- // $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
- // $option.attr("value", "");
- //}else{
- $option.text(data.data[i].StationName);
- $option.attr("value",data.data[i].StationName);
- if(stationid!=undefined && stationid == data.data[i].StationId){
- $option.attr("selected",true);
- }
- //}
- $select.append($option);
- }
- findserchByBattGroupNamebystationname();
- }
- });
- }
- });
-
- $("#station_name").change(function(){
- findserchByBattGroupNamebystationname();
- });
-
- //鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
- var station_name1=$("#station_name1 option:selected").val();
- var station_name=$("#station_name option:selected").val();
-
- $.post("BattInfAction_serchByBattGroupName","bif.StationName1="+station_name1+"&bif.StationName="+station_name,function(data){
- data=data.result;
- //console.info(data);
- data=eval("("+data+")");
- //console.info(data.data);
- if(data.code==1 && data.data.length>0){
- var $select = $("#battgroup_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i!=0){
- $option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
- $option.attr("value",data.data[i-1].BattGroupId);
- }else{
- $option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�");
- $option.attr("value", "0");
- }
- $select.append($option);
- }
- var dischargestate = (parseInt(getQueryString("discharge-state")));
- if(dischargestate >= 0){
- $('#discharge-state option[value = "'+dischargestate+'"]').attr('selected','selected');
- searchDischarge();
- }
- }
- });
- } */
-
+
$('#export_table').click(function(){
//console.info($('#tbHead .tbFixed thead th').length);
exprotTable($('#tbHead table thead th'),$('#tbHead table tbody td'),$('#export_excel'),$('#table_th_arr'),$('#table_td_arr'));
@@ -848,8 +789,7 @@
}
eleTh_Text.attr('value',ArrTh);
eleTd_Text.attr('value',ArrTd);
- //console.info(ArrTh);
- //console.info(ArrTd);
+
eleform.submit();
}
@@ -857,6 +797,7 @@
var temp = {
binf:{
StationName:$('#station_name').val(),
+ StationName2:$('#city').val(),
StationName1:$('#station_name1').val(),
BattGroupId:$('#battgroup_name').val(),
},
diff --git a/gx_tieta/WebRoot/dischargetest.jsp b/gx_tieta/WebRoot/dischargetest.jsp
index 86e3428..10f87bd 100644
--- a/gx_tieta/WebRoot/dischargetest.jsp
+++ b/gx_tieta/WebRoot/dischargetest.jsp
@@ -1217,7 +1217,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
@@ -1241,7 +1241,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/ele-param.jsp b/gx_tieta/WebRoot/ele-param.jsp
index 9250770..555548b 100644
--- a/gx_tieta/WebRoot/ele-param.jsp
+++ b/gx_tieta/WebRoot/ele-param.jsp
@@ -672,7 +672,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
diff --git a/gx_tieta/WebRoot/eleAnalyse.jsp b/gx_tieta/WebRoot/eleAnalyse.jsp
index 7e99583..29e5c4d 100644
--- a/gx_tieta/WebRoot/eleAnalyse.jsp
+++ b/gx_tieta/WebRoot/eleAnalyse.jsp
@@ -396,7 +396,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
@@ -421,7 +421,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/eleAssess.jsp b/gx_tieta/WebRoot/eleAssess.jsp
index f0fc993..b5b35a4 100644
--- a/gx_tieta/WebRoot/eleAssess.jsp
+++ b/gx_tieta/WebRoot/eleAssess.jsp
@@ -657,7 +657,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
@@ -682,7 +682,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/eleHistoryWarn.jsp b/gx_tieta/WebRoot/eleHistoryWarn.jsp
index e7b7f1a..c07690e 100644
--- a/gx_tieta/WebRoot/eleHistoryWarn.jsp
+++ b/gx_tieta/WebRoot/eleHistoryWarn.jsp
@@ -517,7 +517,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
@@ -542,7 +542,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/eleMonomer.jsp b/gx_tieta/WebRoot/eleMonomer.jsp
index 1038da6..21478ba 100644
--- a/gx_tieta/WebRoot/eleMonomer.jsp
+++ b/gx_tieta/WebRoot/eleMonomer.jsp
@@ -712,7 +712,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
@@ -737,7 +737,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/eleWarnPrmSet.jsp b/gx_tieta/WebRoot/eleWarnPrmSet.jsp
index f5a9833..ed610d4 100644
--- a/gx_tieta/WebRoot/eleWarnPrmSet.jsp
+++ b/gx_tieta/WebRoot/eleWarnPrmSet.jsp
@@ -34,12 +34,22 @@
<table>
<thead>
<tr>
+ <th>鐪�</th> <!-- 鐪� -->
+ <th>甯�</th> <!-- 甯� -->
<th><s:text name="Equipment"/></th> <!-- 璁惧 -->
<th><s:text name="Alarm_name"/></th> <!-- 鍛婅鍚嶇О -->
</tr>
</thead>
<tbody>
<tr>
+ <td>
+ <select id="station_name1"> <!-- 鐪� -->
+ </select>
+ </td>
+ <td>
+ <select id="city"> <!-- 甯� -->
+ </select>
+ </td>
<td>
<select id="equipment-name">
<option value="">鍏ㄩ儴</option> <!-- 璁惧 -->
@@ -323,86 +333,133 @@
$('#serchid').click(function(){
searchEquipmentName();
- });
-
-
- /* $.post("Dev_paramAction!serchAllDevId",null,function(data){
- //console.info("sfewf");
- data=data.result;
- data=eval("("+data+")");
- console.info(data);
- if(data.code==1 && data.data.length>0){
-
- var $select = $("#equipment-name");
- $select.text('');
- for(i=0;i<data.data.length;i++){
- $option=$("<option></option>");
- $option.html(data.data[i].note);
- $option.attr("value", data.data[i].dev_id);
- $select.append($option);
- }
-
- //console.info("sfwfaf");
- //console.info(arr);
- //$select.append(arr);
- }
- findWarmName();
- }); */
+ });
-
- findStationNamebyStationname1();
- var isNewload = true;
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var user = {
- UNote:""
- };
- var stationid = getQueryString("stationId");
- //var selectvalue=$("#station_name1 option:selected").val();
- //alert(selectvalue);
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationByStationName1","json="+JSON.stringify(user),function(data){
- console.info(data);
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ $(document).ready(function(){
+ //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
+ $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
data=eval("("+data+")");
+ //console.info(data);
if(data.code==1 && data.data.length>0){
- var $select = $("#equipment-name");
+ var $select = $("#station_name1");
$select.text('');
- for(var i=0;i<data.data.length;i++){
- var $option=$("<option></option>");
- $option.text(data.data[i].StationName);
- $option.attr("value",data.data[i].FBSDeviceId);
- if(stationid!=undefined && stationid == data.data[i].StationId && isNewload){
- $option.attr("selected",true);
- isNewload = false;
- }
-
+ for(var i=0;i<=data.data.length;i++){
+ $option=$("<option></option>");
+ if(i==0){
+ $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
+ $option.attr("value", "");
+ }else{
+ $option.text(data.data[i-1]);
+ $option.attr("value",data.data[i-1]);
+ }
$select.append($option);
}
}else{
- $("#station_name").text('').html('<option>鏆傛棤绠＄悊鐨勬満鎴跨珯鐐�</option>');
+ $("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
+ }
+ findCity();
+ });
+ });
+
+ // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+ function findCity() {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ var $select = $("#city");
+ if(rs.code == 1) {
+ var _data= rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ optsList.push(tmp);
+ }
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else {
+ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
+ $('#station_name1').change(function(){
+ findCity();
+ });
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
+ findStationNamebyStationname1();
+ });
+
+ // 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
+ $('#equipment-name').change(function(){
+ findWarmName();
+ });
+
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
+ function findStationNamebyStationname1(){
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val()
+ };
+ //var selectvalue=$("#station_name1 option:selected").val();
+ //alert(selectvalue);
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ var rs = JSON.parse(data.result);
+ if(rs.code==1){
+ var _data = rs.data;
+ var $select = $("#equipment-name");
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId,
+ StationName: __data.StationName
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.FBSDeviceId, __data, _attr);
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList);
+ }else{
+ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
findWarmName();
});
}
-
+ // 鑾峰彇鍛婅鍙傛暟
function findWarmName(){
var dev_id = $("#equipment-name option:selected").val();
- //console.info(dev_id);
- var warmId ={ "dev_id":dev_id
+ var warmId ={
+ "dev_id":dev_id
};
- //console.info(warmId);
- //console.info("aa");
$.post("Dev_paramAction!serchByInfo","json="+JSON.stringify(warmId),function(data){
data=data.result;
data=eval("("+data+")");
- console.info(data);
+ //console.info(data);
if(data.code==1 && data.data.length>0){
var $select = $("#alarm-name");
$select.text('');
for(i=0;i<data.data.length;i++){
- //console.info(data.data[i]);
- //console.info(getParmName(data.data[i]));
$option =$("<option></option>");
if(i==0){
$option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
@@ -413,11 +470,9 @@
}
$select.append($option);
- //console.info($option);
}
- //console.info("123");
- //console.info($("#equipment-name option:selected").val());
-
+
+ searchEquipmentName();
}
});
}
@@ -430,20 +485,23 @@
all_almlist = new Array();
var dev_id = $("#equipment-name option:selected").val();
var alm_id = $("#alarm-name option:selected").val();
- //console.info(dev_id);
- //console.info("1234");
- var warmId ={ "dev_id":dev_id,
- "alm_id":alm_id
+ var warmId ={
+ stationName1:$("#station_name1").val(),
+ stationName2:$("#city").val(),
+ stationName: $("#equipment-name").find('option:selected').attr('stationname'),
+ "dev_id":dev_id,
+ "alm_id":alm_id
};
+ //console.log(warmId);
$.post("Dev_paramAction!serchByCondition","json="+JSON.stringify(warmId),function(data){
//console.info(JSON.stringify(warmId));
var data=data.result;
var data=eval("("+data+")");
all_almlist = data.data;
+ //console.info(data);
if(data.code==1&&data.data.length>0){
var arr = new Array();
data=data.data;
- console.info(data);
for(i=0;i<data.length;i++){
arr.push(data[i].note); //璁惧
arr.push(getParmName(data[i].alm_id)); //鍛婅鍚嶇О
diff --git a/gx_tieta/WebRoot/ele_statistics.jsp b/gx_tieta/WebRoot/ele_statistics.jsp
index 0bd219c..7e7fcb1 100644
--- a/gx_tieta/WebRoot/ele_statistics.jsp
+++ b/gx_tieta/WebRoot/ele_statistics.jsp
@@ -634,7 +634,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
@@ -658,7 +658,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/elegroup.jsp b/gx_tieta/WebRoot/elegroup.jsp
index f2b48db..b5ea1df 100644
--- a/gx_tieta/WebRoot/elegroup.jsp
+++ b/gx_tieta/WebRoot/elegroup.jsp
@@ -35,14 +35,18 @@
<!-- 缁存姢鍖轰俊鎭� -->
<table>
<tr class="fWeight">
- <td><s:text name="Maintenance_area"/></td> <!-- 缁存姢鍖� -->
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
<td><s:text name="Computer_site"/></td> <!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td><s:text name="Battery"/></td> <!-- 钃勭數姹犵粍 -->
</tr>
<tr>
<td>
<select id="station_name1" name="">
-
+ </select>
+ </td>
+ <td>
+ <select id="city" name="">
</select>
</td>
<td>
@@ -109,8 +113,10 @@
<!-- 鍙抽敭琛ㄦ牸鑿滃崟 -->
<div id="tb-right-menu">
<a href="javascript:;" class="apply"><s:text name="Apply"/></a> <!-- 搴旂敤 -->
- <a href="javascript:;" class="add-batt"><s:text name="Add_single_batt_group"/></a> <!-- 娣诲姞鍗曚釜鐢垫睜缁� -->
+ <a href="javascript:;" class="add-province">娣诲姞鍏ㄧ渷鏈烘埧</a> <!-- 娣诲姞鍏ㄧ渷鏈烘埧 -->
+ <a href="javascript:;" class="add-city">娣诲姞鍏ㄥ競鏈烘埧</a> <!-- 娣诲姞鍏ㄥ競鏈烘埧 -->
<a href="javascript:;" class="add-station"><s:text name="Add_all_Chartere_room_batt_group"/></a> <!-- 娣诲姞鏁翠釜鏈烘埧鐢垫睜缁� -->
+ <a href="javascript:;" class="add-batt"><s:text name="Add_single_batt_group"/></a> <!-- 娣诲姞鍗曚釜鐢垫睜缁� -->
<!--<a href="javascript:;" class="add-weihuqu"><s:text name="Add_maintenance_area_batt_group"/></a> 娣诲姞鏁翠釜缁存姢鍖虹數姹犵粍 -->
<div class="a-con">
<a href="javascript:;" class="all-pitch"><s:text name="All_selected"/></a> <!-- 鍏ㄩ儴閫変腑 -->
@@ -875,93 +881,160 @@
});
}
}
-
- $(document).ready(function(){
+
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ $(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("BattInfAction_serchByStation",null,function(data){
+ $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
data=eval("("+data+")");
//console.info(data);
if(data.code==1 && data.data.length>0){
- var Ostation_name1=document.getElementById("station_name1");
- Ostation_name1.innerHTML="";
+ var $select = $("#station_name1");
+ $select.text('');
for(var i=0;i<=data.data.length;i++){
- option=createEle("option");
+ $option=$("<option></option>");
if(i==0){
- option.innerHTML="<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)"; /* 鍏ㄩ儴 鍏� 绉� */
- option.setAttribute("value", "");
+ $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
+ $option.attr("value", "");
}else{
- option.innerHTML=data.data[i-1].StationName1;
- option.setAttribute("value",data.data[i-1].StationName1);
+ $option.text(data.data[i-1]);
+ $option.attr("value",data.data[i-1]);
}
- Ostation_name1.appendChild(option);
- }
+ $select.append($option);
+ }
+ }else{
+ $("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
}
- findStationNamebyStationname1();
- });
-
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
- $('#station_name1').change(function(){
- findStationNamebyStationname1()
+ findCity();
});
});
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
+ // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+ function findCity() {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ var $select = $("#city");
+ if(rs.code == 1) {
+ var _data= rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ optsList.push(tmp);
+ }
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else {
+ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
+ $('#station_name1').change(function(){
+ findCity();
+ });
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
+ findStationNamebyStationname1();
+ });
+
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
function findStationNamebyStationname1(){
- var selectvalue=$("#station_name1 option:selected").val();
- $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
- var Ostttion_name = document.getElementById("station_name");
- Ostttion_name.innerHTML="";
- for(var i=0;i<=data.data.length;i++){
- option=createEle("option");
- if(i==0){
- option.innerHTML="<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)";
- option.setAttribute("value", "");
- }else{
- option.innerHTML=data.data[i-1].StationName;
- option.setAttribute("value",data.data[i-1].StationName);
- }
- Ostttion_name.appendChild(option);
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val()
+ };
+ //var selectvalue=$("#station_name1 option:selected").val();
+ //alert(selectvalue);
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ var rs = JSON.parse(data.result);
+ if(rs.code==1){
+ var _data = rs.data;
+ var $select = $("#station_name");
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else{
+ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
- findserchByBattGroupNamebystationname();
- });
- $('#station_name').change(function(){
findserchByBattGroupNamebystationname();
});
}
- //鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
+ // 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
+ $('#station_name').change(function(){
+ findserchByBattGroupNamebystationname();
+ });
+
+ //鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
function findserchByBattGroupNamebystationname(){
- var station_name1=$("#station_name1 option:selected").val();
- var station_name=$("#station_name option:selected").val();
+ var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ StationName: $("#station_name").val(),
+ StationId: stationid
+ };
+
+ //var station_name1=$("#station_name1 option:selected").val();
+ //var station_name=$("#station_name option:selected").val();
- $.post("BattInfAction_serchByBattGroupName","bif.StationName1="+station_name1+"&bif.StationName="+station_name,function(data){
+ $.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
data=data.result;
+ //console.info(data);
data=eval("("+data+")");
- //console.info(data.data);
+ //console.info(data);
if(data.code==1 && data.data.length>0){
-
- var Obattgroup_name = document.getElementById("battgroup_name");
- Obattgroup_name.innerHTML="";
-
- for(var i=0;i<=data.data.length;i++){
- option=createEle("option");
- if(i!=0){
- option.innerHTML=data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>";
- option.setAttribute("value",data.data[i-1].BattGroupId);
- }else{
- option.innerHTML="<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)";
- option.setAttribute("value", "0");
- }
- Obattgroup_name.appendChild(option);
+ var $select = $("#battgroup_name");
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<data.data.length;i++){
+ var _data = data.data[i];
+ var _attr = {
+ stationname: _data.StationName,
+ dev_id: _data.FBSDeviceId,
+ batt_num: _data.GroupIndexInFBSDevice+1
+ };
+ var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>";
+ var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ $select.find('option').eq(0).val(0);
+ }else{
+ $("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
});
- }
+ }
//榧犳爣鍙抽敭鐐瑰嚮
$('#tbroom').on('mousedown','table tr',function(e){
@@ -1251,15 +1324,100 @@
showAllTd(bigEleGroupTxt,bigEleGroupVal);
}
+
+ // 娣诲姞鏁翠釜鐪佺殑鏈烘埧
+ $('#tb-right-menu .add-province').click(function() {
+ //鑾峰彇鍖呮満鎴垮悕绉板拰鏂板鐢垫睜缁勫悕绉�
+ var myRoom=new Array();
+ var myRoomVal=new Array();
+ var singleELeGroup=new Array();
+ var singleEleVal=new Array();
+ var province=$('#station_name1').attr('value');
+ if(province.length>0 && $('#lbottom .li-con li.b8cfe5').text().length>0){
+ var binf=new Object();
+ binf={
+ BattGroupId: 0, // 鐢垫睜缁刬d
+ StationName: '', // 鏈烘埧鍚嶇О
+ StationName2: '', // 甯�
+ StationName1: province, // 鐪�
+ };
+ var json=window.JSON.stringify(binf);
+ $.post('BattInfAction!serchBatt','result='+json,function(data){
+ var model=eval("("+data.result+")");
+ //console.info(model);
+ if(model.code==1 && model.data.length>0){
+ //var stationid=0;
+ for(var i=0;i<model.data.length;i++){
+ var batt=model.data[i];
+ //console.info(batt);
+ myRoom.push(batt.StationName);
+ myRoomVal.push(batt.StationId);
+ singleELeGroup.push(batt.StationName);
+ singleELeGroup.push(batt.BattGroupName);
+ singleEleVal.push(batt.StationId);
+ singleEleVal.push(batt.BattGroupId);
+ }
+ //console.info(singleELeGroup);
+ addRedLi(myRoom,myRoomVal,singleELeGroup,singleEleVal);
+ }
+ });
+ }else{
+ alert('璇烽�夋嫨鐪�!'); //璇峰厛閫夋嫨鐪�
+ }
+ });
+
+ // 娣诲姞鏁翠釜甯傜殑鏈烘埧
+ $('#tb-right-menu .add-city').click(function() {
+ //鑾峰彇鍖呮満鎴垮悕绉板拰鏂板鐢垫睜缁勫悕绉�
+ var myRoom=new Array();
+ var myRoomVal=new Array();
+ var singleELeGroup=new Array();
+ var singleEleVal=new Array();
+ var city = $('#city').attr('value');
+ if(city.length>0 && $('#lbottom .li-con li.b8cfe5').text().length>0){
+ var binf=new Object();
+ binf={
+ BattGroupId: 0, // 鐢垫睜缁刬d
+ StationName: '', // 鏈烘埧鍚嶇О
+ StationName2: city, // 甯�
+ StationName1: '', // 鐪�
+ };
+ //console.log(binf);
+ var json=window.JSON.stringify(binf);
+ $.post('BattInfAction!serchBatt','result='+json,function(data){
+ var model=eval("("+data.result+")");
+ console.info(model);
+ if(model.code==1 && model.data.length>0){
+ //var stationid=0;
+ for(var i=0;i<model.data.length;i++){
+ var batt=model.data[i];
+ //console.info(batt);
+ myRoom.push(batt.StationName);
+ myRoomVal.push(batt.StationId);
+ singleELeGroup.push(batt.StationName);
+ singleELeGroup.push(batt.BattGroupName);
+ singleEleVal.push(batt.StationId);
+ singleEleVal.push(batt.BattGroupId);
+ }
+ //console.info(singleELeGroup);
+ addRedLi(myRoom,myRoomVal,singleELeGroup,singleEleVal);
+ }
+ });
+ }else{
+ alert('璇烽�夋嫨甯�!'); //璇峰厛閫夋嫨甯�
+ }
+ });
+
//娣诲姞鍗曚釜鐢垫睜缁�
$('#tb-right-menu .add-batt').click(function(){
var battgrouid= $('#battgroup_name').attr('value');
if(battgrouid!=0 && $('#lbottom .li-con li.b8cfe5').text().length>0){
var binf=new Object();
binf={
- BattGroupId:battgrouid,
- StationName:'',
- StationName1:'',
+ BattGroupId: battgrouid, // 鐢垫睜缁刬d
+ StationName: '', // 鏈烘埧鍚嶇О
+ StationName2: '', // 甯�
+ StationName1: '', // 鐪�
};
var json=window.JSON.stringify(binf);
$.post('BattInfAction!serchBatt','result='+json,function(data){
@@ -1296,9 +1454,10 @@
if(stationname.length>0 && $('#lbottom .li-con li.b8cfe5').text().length>0){
var binf=new Object();
binf={
- BattGroupId:0,
- StationName:stationname,
- StationName1:'',
+ BattGroupId: 0, // 鐢垫睜缁刬d
+ StationName: stationname, // 鏈烘埧鍚嶇О
+ StationName2: '', // 甯�
+ StationName1: '', // 鐪�
};
var json=window.JSON.stringify(binf);
$.post('BattInfAction!serchBatt','result='+json,function(data){
@@ -1456,13 +1615,14 @@
}
}
}
- console.info(oldArrVal);
+ //console.info(oldArrVal);
}
//鏄剧ず鎵�鏈夌殑鍗曞厓鏍�
function showAllTd(bigArrTxt,bigArrVal){
+ var tmp = battstationList[0]?battstationList[0]:[];
//鍒涘缓琛ㄦ牸
- createTablenew($('#tbroom'),ArrTh,battstationList[0]);
+ createTablenew($('#tbroom'),ArrTh,tmp);
//console.info(ArrTd);
for(var i=1;i<battstationList.length;i++)
{
@@ -1493,11 +1653,16 @@
// 璁╁鍣ㄥ唴鐨勮〃鏍煎搴︿竴鑷�
$('#rtop table').width(tbRoomWidth-20);
getbattStationlength();
+ //console.info(bigArrTxt);
+ if(bigArrTxt.length != 0) {
+ // 璁惧琛ㄦ牸婊氬姩鍒伴《閮�
+ scrollBottom($('#tbroom'), $('#tbroom table'));
+ // 鏈烘埧鍒楄〃婊氬姩鍒伴《閮�
+ scrollBottom($('#ltop .li-con'), $('#ltop .li-con ul'));
+ }else {
+ alert('娣诲姞鐨勫唴瀹瑰凡瀛樺湪锛�');
+ }
- // 璁惧琛ㄦ牸婊氬姩鍒伴《閮�
- scrollBottom($('#tbroom'), $('#tbroom table'));
- // 鏈烘埧鍒楄〃婊氬姩鍒伴《閮�
- scrollBottom($('#ltop .li-con'), $('#ltop .li-con ul'));
}
//娣诲姞琛ㄦ牸鐨勪竴琛�
diff --git a/gx_tieta/WebRoot/elestatus.jsp b/gx_tieta/WebRoot/elestatus.jsp
index 882da69..6e114a0 100644
--- a/gx_tieta/WebRoot/elestatus.jsp
+++ b/gx_tieta/WebRoot/elestatus.jsp
@@ -430,7 +430,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
@@ -455,7 +455,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/elewarn.jsp b/gx_tieta/WebRoot/elewarn.jsp
index 4285093..2c1aa56 100644
--- a/gx_tieta/WebRoot/elewarn.jsp
+++ b/gx_tieta/WebRoot/elewarn.jsp
@@ -649,7 +649,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
@@ -674,7 +674,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/WebRoot/endure.jsp b/gx_tieta/WebRoot/endure.jsp
index bf3f9d1..2c7e2e8 100644
--- a/gx_tieta/WebRoot/endure.jsp
+++ b/gx_tieta/WebRoot/endure.jsp
@@ -376,7 +376,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
diff --git a/gx_tieta/WebRoot/equip-charge-param.jsp b/gx_tieta/WebRoot/equip-charge-param.jsp
index 28bbe8a..a2192f4 100644
--- a/gx_tieta/WebRoot/equip-charge-param.jsp
+++ b/gx_tieta/WebRoot/equip-charge-param.jsp
@@ -444,7 +444,7 @@
var __data = _data[i];
var _attr = {
'stataion_name1': __data.StationName1,
- 'stataion_name': __data.StationName3,
+ 'stataion_name': __data.StationName,
'dev_name': __data.FBSDeviceName
};
var tmp = getOptionsData(__data.StationName3, __data.FBSDeviceId, __data, _attr);
diff --git a/gx_tieta/WebRoot/equipHistWarn1.jsp b/gx_tieta/WebRoot/equipHistWarn1.jsp
index 10be0cc..d1f260e 100644
--- a/gx_tieta/WebRoot/equipHistWarn1.jsp
+++ b/gx_tieta/WebRoot/equipHistWarn1.jsp
@@ -89,13 +89,18 @@
<!-- 缁存姢鍖轰俊鎭� -->
<table>
<tr class="fWeight">
- <td><s:text name="Maintenance_area"/></td> <!-- 缁存姢鍖� -->
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
<td><s:text name="Computer_name"/></td> <!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td colspan="2"><s:text name="Alarm_start_time"/></td> <!-- 鍛婅寮�濮嬫椂闂存 -->
</tr>
<tr>
<td>
<select id="station_name1" name="station_name1">
+ </select>
+ </td>
+ <td>
+ <select id="city" name="station_name2">
</select>
</td>
<td>
@@ -523,7 +528,8 @@
});
}
- $(document).ready(function(){
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ $(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -546,118 +552,99 @@
}else{
$("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
}
- findStationNamebyStationname1();
+ findCity();
});
});
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+ function findCity() {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ var $select = $("#city");
+ if(rs.code == 1) {
+ var _data= rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ optsList.push(tmp);
+ }
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else {
+ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
+ findCity();
+ });
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
findStationNamebyStationname1();
});
- var isNewload = true;
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val()
};
- var stationid = getQueryString("stationId");
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ var rs = JSON.parse(data.result);
+ if(rs.code==1){
+ var _data = rs.data;
var $select = $("#station_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
- if(stationid!=undefined && stationid == data.data[i-1].StationId && isNewload){
- $option.attr("selected",true);
- isNewload = false;
- }
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}else{
- $("#station_name").text('').html('<option>鏆傛棤绠＄悊鐨勬満鎴跨珯鐐�</option>');
+ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
seachDevHisAlarm();
});
}
-
- /* //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("BattInfAction_serchByStation",null,function(data){
- data=data.result;
- data=eval("("+data+")");
- //console.info(data);
- if(data.code==1 && data.data.length>0){
- var $select=$("#station_name1");
- $select.text("");
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1].StationName1);
- $option.attr("value",data.data[i-1].StationName1);
- }
- $select.append($option);
- }
- }
- findStationNamebyStationname1();
- });
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
- $('#station_name1').change(function(){
- findStationNamebyStationname1();
+ // 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
+ $('#station_name').change(function(){
+ seachDevHisAlarm();
});
-
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var stationid = getQueryString("stationId");
- var selectvalue=$("#station_name1 option:selected").val();
- //alert(selectvalue);
- $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
- var $select = $("#station_name");
- $select.text("");
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1].StationName);
- $option.attr("value",data.data[i-1].StationName);
- if(stationid !=undefined && stationid == data.data[i-1].StationName){
- $option.attr("selected",true);
- }
- }
- $select.append($option);
- }
- seachDevHisAlarm();
- }
- });
- } */
//鏋勯�犳煡璇㈡潯浠�
function createSearchParam(){
var temp = {
binf:{
StationName:$('#station_name').val(), //鏈烘埧鍚�
- StationName1:$('#station_name1').val(), //缁存姢鍖�
+ StationName2:$('#city').val(), // 甯�
+ StationName1:$('#station_name1').val(), // 鐪�
BattProductDate:$('#starttime').val()+" 00:00:00",
BattProductDate1:$('#endtime').val()+" 23:59:59",
},
@@ -666,6 +653,7 @@
pageCurr:Page.pageCurr, //褰撳墠椤�
}
};
+ console.log(temp);
return temp;
}
diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp
index 262b7fa..24490ce 100644
--- a/gx_tieta/WebRoot/equipWarn1.jsp
+++ b/gx_tieta/WebRoot/equipWarn1.jsp
@@ -90,13 +90,18 @@
<!-- 缁存姢鍖轰俊鎭� -->
<table>
<tr class="fWeight">
- <td><s:text name="Maintenance_area"/></td> <!-- 缁存姢鍖� -->
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
<td><s:text name="Computer_name"/></td> <!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td><s:text name="Alarm"/><s:text name="Type"/></td> <!-- 鍛婅绫诲瀷 -->
</tr>
<tr>
<td>
<select id="station_name1" name="station_name1">
+ </select>
+ </td>
+ <td>
+ <select id="city" name="station_name2">
</select>
</td>
<td>
@@ -561,6 +566,7 @@
function createSearchParam(){
var temp = {
stationName1:$('#station_name1').val(),
+ stationName2:$('#city').val(),
stationName:$('#station_name').val(),
alm_type:$('#alarm_type').val(),
page:{
@@ -568,6 +574,7 @@
pageCurr:Page.pageCurr, //褰撳墠椤�
}
};
+ console.log(temp);
return temp;
}
@@ -868,6 +875,7 @@
return undefined;
}
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
$(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
@@ -891,48 +899,82 @@
}else{
$("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
}
- findStationNamebyStationname1();
+ findCity();
});
});
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+ function findCity() {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ var $select = $("#city");
+ if(rs.code == 1) {
+ var _data= rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ optsList.push(tmp);
+ }
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else {
+ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
+ findCity();
+ });
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
findStationNamebyStationname1();
});
- var isNewload = true;
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val()
};
- var stationid = getQueryString("stationId");
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ var rs = JSON.parse(data.result);
+ if(rs.code==1){
+ var _data = rs.data;
var $select = $("#station_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
- if(stationid!=undefined && stationid == data.data[i-1].StationId && isNewload){
- $option.attr("selected",true);
- isNewload = false;
- }
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}else{
- $("#station_name").text('').html('<option>鏆傛棤绠＄悊鐨勬満鎴跨珯鐐�</option>');
+ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
searchDevAlarm();
});
diff --git a/gx_tieta/WebRoot/equipment.jsp b/gx_tieta/WebRoot/equipment.jsp
index cd153cb..000e8ef 100644
--- a/gx_tieta/WebRoot/equipment.jsp
+++ b/gx_tieta/WebRoot/equipment.jsp
@@ -930,7 +930,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 99c41b4..27666f9 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -597,7 +597,6 @@
flushFourPie(); //鏇存柊鍥涚楗肩姸鍥�
});
-
// 璁剧疆鍙抽敭鑿滃崟
var menu = new BMap.ContextMenu();
var txtMenuItem = [
@@ -632,17 +631,7 @@
enparams:[e]
});
}
- },
- /* {
- text: '鏈烘埧瀹氫綅',
- callback: function(e) {
- panel.setPanelLayout();
- panel.showPanel();
- $('#map .panel-mask').bind('click', function() {
- panel.hidePanel();
- });
- }
- } */
+ }
];
//console.info(getPermit('taskchange_edit_permit', permits)+"*******");
if(getPermit('batt_map_edit_permit', permits)) {
@@ -1594,6 +1583,7 @@
function createMapDot(map, dotList) {
// 娓呯┖瑕嗙洊鐗╁拰瀵瑰簲鐨刴k鐐�
mkList = [];
+
// 閬嶅巻鏌ヨ鍐呭鐢熸垚瀵瑰簲鐨勫浘鏍�
for(var i = 0; i < dotList.length; i++) {
var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[0].msg), new BMap.Size(36, 30)); // 璁剧疆鍥剧墖
@@ -1624,6 +1614,9 @@
map.addOverlay(mk);
}
}
+
+
+
//
@@ -1966,10 +1959,86 @@
}
}
- searchStation();
+ // 璁剧疆椤甸潰涓殑鍙鍖哄煙鍥炬爣
+ ;(function($, window, document, gl, undefined) {
+ // 璁剧疆鍛藉悕绌洪棿
+ gl.namespace('BMap');
+ // 鏍规嵁鍙鑼冨洿鏄剧ず鍧愭爣鐐�
+ var dots = [];
+ var currMarkers = {};
+ // 鏌ヨ褰撳墠鑼冨洿鍐呭鐨勫浘鏍�
+ function queryInRect(map, callback) {
+ var cp = map.getBounds(); // 杩斿洖map鍙鍖哄煙锛屼互鍦扮悊鍧愭爣琛ㄧず
+ var sw = cp.getSouthWest(); // 杩斿洖鐭╁舰鍖哄煙鐨勮タ鍗楄
+ var ne = cp.getNorthEast(); // 杩斿洖鐭╁舰鍖哄煙鐨勪笢鍖楄
+ //var zoom = map.getZoom(); //褰撳墠缂╂斁绾у埆
+ //console.log(dots);
+ var mapDots = getDotsList(sw, ne);
+ callback(map, mapDots);
+ }
+
+ // 鑾峰彇dots鐨勯泦鍚�
+ function getDotsList(sw, ne) {
+ var rs = [];
+ swlng=sw.lng,
+ swlat=sw.lat,
+ nelng=ne.lng,
+ nelat=ne.lat;
+
+ var maxLng = sw.lng>ne.lng?sw.lng:ne.lng;
+ var minLng = sw.lng<ne.lng?sw.lng:ne.lng;
+
+ var maxLat = sw.lat>ne.lat?sw.lat:ne.lat;
+ var minLat = sw.lat<ne.lat?sw.lat:ne.lat;
+
+ for(var i=0; i<dots.length; i++) {
+ var dot = dots[i];
+ var lat = dot.lat;
+ var lng = dot.lng;
+ var sId = dot.binformation.StationId;
+ var isExist = checkMarker(sId);
+
+ // 鏈娣诲姞杩�
+ if(!isExist) {
+ // 鍒ゆ柇缁忕含搴︽槸鍚﹀瓨鍦ㄨ鍖哄煙
+ if(lng<maxLng && lng>minLng && lat<maxLat && lat>minLat) {
+ currMarkers['markers'+sId] = sId;
+ rs.push(dot);
+ }
+ }
+ }
+ return rs;
+ }
+
+
+ // 妫�娴嬪綋鍓嶇偣鏄惁宸茬粡琚坊鍔犺繃
+ function checkMarker(id) {
+ var flag = false;
+ // 閬嶅巻宸茬粡娣诲姞鐨勭偣杩斿洖鏄惁宸茬粡琚坊鍔犺繃
+ Object.keys(currMarkers).forEach(function(key) {
+ if(currMarkers[key] == id) {
+ flag = true;
+ }
+ });
+
+ return flag;
+ }
+
+ // 璁剧疆dots闆嗗悎鐨勫��
+ function setDots(data) {
+ dots = data;
+ }
+ // 灏嗗彉閲忕粦瀹氬埌鍛藉悕绌洪棿涓�
+ gl.BMap.setDots = setDots;
+
+ // 灏嗗嚱鏁扮粦瀹氬埌鍛藉悕绌洪棿涓�
+ gl.BMap.queryInRect = queryInRect;
+ })(jQuery, window, document, GLOBAL);
+
+ searchStation(true);
var allStation;
//鏌ヨ鏈烘埧
- function searchStation(){
+ function searchStation(setRect){
var temp = createSearchParam();
var json = JSON.stringify(temp);
commonDot = new Array();
@@ -1980,7 +2049,7 @@
type: "post",
//url: "BattMap_informationAction!searchAll",
url: "BattMap_informationAction!searchUserManageStation",
- async:true,
+ async: true,
dataType:'text',
data:"json="+json,
success: function(data){
@@ -1989,7 +2058,7 @@
console.log(list.length);
allStation = new Array();
if(list!=undefined && list.length>0){
- for(var i=0;i<10;i++){
+ for(var i=0;i<list.length;i++){
var tmp = {
binformation:list[i].data,
alarm_num:list[i].code, //鍛婅鏁扮洰
@@ -1999,10 +2068,17 @@
};
allStation.push(analyzeData(tmp));
}
- //console.info(allStation);
- createMapDot(map, allStation);
+ // 鏄剧ず鍖哄煙鐨勫浘鏍�
+ GLOBAL.BMap.setDots(allStation);
+ GLOBAL.BMap.queryInRect(map,createMapDot);
+ // 鏄惁璁剧疆鎷栧埌鍜岀缉鏀�
+ if(setRect) {
+ map.addEventListener("moveend", GLOBAL.BMap.queryInRect.bind({},map, createMapDot)); // 鎷栧姩
+ map.addEventListener("zoomend", GLOBAL.BMap.queryInRect.bind({},map, createMapDot)); // 缂╂斁
+ }
- //setTimeout(searchStation, 4000);
+ //createMapDot(map, allStation);
+
}
}
});
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 2c36469..b15bc4f 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -301,13 +301,12 @@
success: function(data){
var rs = JSON.parse(data.result);
treeView.delProgress(container);
- console.info(rs);
if(rs.code == 1) {
var _data= rs.data;
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFolder(__data.StationName3, 'home', __data);
+ var tmp = treeView.getFolder(__data.StationName, 'home', __data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
@@ -329,7 +328,7 @@
var tmp = {
StationName1: data.StationName1,
StationName2: data.StationName2,
- StationName3: data.StationName3,
+ StationName: data.StationName,
StationId: data.StationId
};
fourth(treeView, container, tmp, true);
@@ -357,7 +356,7 @@
var formatData = [];
for(var i=0; i<_data.length;i++) {
var __data = _data[i];
- var tmp = treeView.getFile(__data.StationName3, 'home', '',__data);
+ var tmp = treeView.getFile(__data.StationName, 'home', '',__data);
formatData.push(tmp);
}
treeView.treeView(container, formatData);
diff --git a/gx_tieta/WebRoot/taskplan.jsp b/gx_tieta/WebRoot/taskplan.jsp
index e378ba5..11f9adb 100644
--- a/gx_tieta/WebRoot/taskplan.jsp
+++ b/gx_tieta/WebRoot/taskplan.jsp
@@ -546,7 +546,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
@@ -571,7 +571,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
- StationName3: $("#station_name").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java
index ada8223..74da16d 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattDischarge_planImpl.java
@@ -304,7 +304,7 @@
" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
" and db_user.tb_user_inf.uid=? " +
- " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ?)";
+ " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?)";
baseSql+=userSql;
String endSql="order by tb_battdischarge_plan.discharge_starttime desc ";
@@ -320,6 +320,7 @@
uinf.getUId(),
"%"+binf.getStationName1()+"%",
"%"+binf.getStationName()+"%",
+ "%"+binf.getStationName2()+"%",
(bmd.getPage().getPageCurr() - 1)* bmd.getPage().getPageSize(),
bmd.getPage().getPageSize()
}, new CallBack() {
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index c30fcd1..855d1e8 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -354,6 +354,14 @@
}else{
baseSql+=station1SqlF;
}
+ //鐢ㄤ簬缁存姢鍖�
+ String station2SqlT=" and stationname2!=? ";//鍏ㄩ儴
+ String station2SqlF=" and stationname2=? ";
+ if(binf.getStationName2().equals("")){
+ baseSql+=station2SqlT;
+ }else{
+ baseSql+=station2SqlF;
+ }
//鐢ㄤ簬鏈烘埧绔欑偣
String stationSqlT=" and stationname!=? ";//鍏ㄩ儴
String stationSqlF=" and stationname=? ";
@@ -373,7 +381,7 @@
String endSql=" order by stationid ";
sql=baseSql+endSql;
//System.out.println(sql);
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationName1(),binf.getStationName(),binf.getBattGroupId()}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationName1(),binf.getStationName2(),binf.getStationName(),binf.getBattGroupId()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -3304,12 +3312,12 @@
//鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧,num涓瓨鏀緐id)
public List serchStationName3(Object obj){
BattInf binf=(BattInf) obj;
- String sql="select DISTINCT StationName1,StationName2,StationName3,stationid,fbsdeviceid,FBSDeviceName " +
+ String sql="select DISTINCT StationName,StationName1,StationName2,StationName3,stationid,fbsdeviceid,FBSDeviceName " +
" FROM db_battinf.tb_battinf " +
" where StationId in(" +
" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
" ) and StationName1 like ? and StationName2 like ? " +
- " ORDER BY CONVERT( StationName3 USING gbk ) COLLATE gbk_chinese_ci ASC ";
+ " ORDER BY CONVERT( StationName USING gbk ) COLLATE gbk_chinese_ci ASC ";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"},new CallBack() {
public List getResults(ResultSet rs) {
@@ -3317,6 +3325,7 @@
try {
while(rs.next()){
BattInf batt = new BattInf();
+ batt.setStationName(rs.getString("stationName"));
batt.setStationName1(rs.getString("stationName1"));
batt.setStationName2(rs.getString("stationName2"));
batt.setStationName3(rs.getString("stationName3"));
@@ -3340,7 +3349,7 @@
public List serchBattByStation(Object obj){
BattInf binf=(BattInf) obj;
String sql="select DISTINCT StationName,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice " +
- "from db_battinf.tb_battinf where StationName1 like ? and StationName2 like ? and StationName3 like ? ";
+ "from db_battinf.tb_battinf where StationName1 like ? and StationName2 like ? and StationName like ? ";
//鏈烘埧id
String idSqlT=" and Stationid like ? ";
sql+=idSqlT;
@@ -3352,7 +3361,7 @@
//鎺掑簭
String orderSql=" ORDER BY StationName1,battgroupId ";
//System.out.println(sql);
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%","%"+binf.getStationId()+"%",binf.getNum()},new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName()+"%","%"+binf.getStationId()+"%",binf.getNum()},new CallBack() {
public List getResults(ResultSet rs) {
List list = new ArrayList();
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
index 60276ab..9f25065 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
@@ -329,6 +329,14 @@
}else{
baseSql+=stationSqlF;
}
+ //鐢ㄤ簬鏈烘埧绔欑偣
+ String stationSql2T=" and stationname2!=? ";//鍏ㄩ儴
+ String stationSql2F=" and stationname2=? ";
+ if(ddata.getStationName2().equals("")){
+ baseSql+=stationSql2T;
+ }else{
+ baseSql+=stationSql2F;
+ }
//鐢ㄤ簬鏁呴殰浜嬩欢
String almTypeT=" and alm_type!=? ";//鍏ㄩ儴
String almTypeF=" and alm_type=? ";
@@ -350,7 +358,7 @@
//鍒嗛〉
String limitSql=" LIMIT ?,? ";
sql=baseSql+endSql+limitSql;
- List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{ddata.getStationName1(),ddata.getStationName(),ddata.getAlm_type(),uinf.getUId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
+ List<Batt_devalarm_data> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{ddata.getStationName1(),ddata.getStationName(),ddata.getStationName2(),ddata.getAlm_type(),uinf.getUId(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
index 8529319..2750b01 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_data_historyImpl.java
@@ -69,7 +69,7 @@
String baseSql=" SELECT SQL_CALC_FOUND_ROWS tb_devalarm_data_history.num,record_id,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time," +
" alm_is_confirmed,alm_confirmed_time,alm_cleared_type, " +
" DISTINCTbinf.stationName,DISTINCTbinf.FbsDeviceName " +
- " FROM db_alarm.tb_devalarm_data_history,(SELECT DISTINCT db_battinf.tb_battinf.FbsDeviceId,db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName from db_battinf.tb_battinf where db_battinf.tb_battinf.StationName LIKE ? AND db_battinf.tb_battinf.StationName1 LIKE ? ) as DISTINCTbinf " +
+ " FROM db_alarm.tb_devalarm_data_history,(SELECT DISTINCT db_battinf.tb_battinf.FbsDeviceId,db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName from db_battinf.tb_battinf where db_battinf.tb_battinf.StationName LIKE ? AND db_battinf.tb_battinf.StationName1 LIKE ? AND db_battinf.tb_battinf.StationName2 LIKE ?) as DISTINCTbinf " +
" WHERE tb_devalarm_data_history.dev_id=DISTINCTbinf.FbsDeviceId " +
" AND alm_start_time>=? and alm_start_time<=? ";
@@ -92,7 +92,7 @@
sql=baseSql+endSql+limitSql;
- List<Batt_devalarm_data_history> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
+ List<Batt_devalarm_data_history> list=DAOHelper.executeQueryLimit(sql, conn,new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%",binf.getBattProductDate(),binf.getBattProductDate1()
,uinf.getUId(),(page.getPageCurr() - 1)*page.getPageSize()
,page.getPageSize()}, new CallBack() {
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java
index 674ea82..f3d80d9 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java
@@ -110,7 +110,7 @@
" where alm_id in(?,?,?,?,?,?) and alm_signal_id%2 in(?,?) " +
" and alm_level in(?,?,?,?) " +
" and alm_start_time>=? and alm_start_time<=? " +
- " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? ";
+ " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? ";
/*//鐢ㄤ簬瀹炴椂鍛婅
String almSqlT="and alm_cleared_type=? ";
//鍘嗗彶鍛婅
@@ -169,6 +169,7 @@
adata_H.getAlm_start_time1(),
"%"+binf.getStationName1()+"%",
"%"+binf.getStationName()+"%",
+ "%"+binf.getStationName2()+"%",
//adata_H.getAlm_cleared_type(),
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java
index aefaf23..581d18d 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Dev_paramImpl.java
@@ -115,7 +115,8 @@
" alm_low_level,alm_high_en,alm_low_en," +
" db_battinf.tb_battinf.stationname " +
" from db_param.tb_dev_param,db_battinf.tb_battinf " +
- " where db_param.tb_dev_param.dev_id=db_battinf.tb_battinf.FBSDeviceId " ;
+ " where db_param.tb_dev_param.dev_id=db_battinf.tb_battinf.FBSDeviceId " +
+ " and db_battinf.tb_battinf.StationName1 like ? and db_battinf.tb_battinf.StationName2 like ? and db_battinf.tb_battinf.StationName like ? " ;
//璁惧id鏉′欢
String devSqlT=" and dev_id=? ";
String devSqlF=" and dev_id!=? ";
@@ -135,7 +136,7 @@
String endSql=" order by db_param.tb_dev_param.num asc ";
//鏈�缁堢殑SQl
sql=baseSql+endSql;
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{dparam.getDev_id(),dparam.getAlm_id()}, new CallBack() {
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{"%"+dparam.getStationName1()+"%","%"+dparam.getStationName2()+"%","%"+dparam.getStationName()+"%",dparam.getDev_id(),dparam.getAlm_id()}, new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -261,4 +262,15 @@
});
return list;
}
+ public static void main(String[] args) {
+ Dev_paramImpl impl=new Dev_paramImpl();
+ Dev_param dparam=new Dev_param();
+ dparam.setDev_id(618500001);
+ dparam.setAlm_id(0);
+ dparam.setStationName("鍩庡競-鍖哄幙-姝︽眽婧愭殺瀹為獙瀹�-61850璁惧");
+ dparam.setStationName1("");
+ dparam.setStationName2("");
+ List list=impl.serchByCondition(dparam);
+ System.out.println(list.size());
+ }
}
diff --git a/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java b/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java
index 1bb7032..8653a09 100644
--- a/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java
+++ b/gx_tieta/src/com/fgkj/dto/Batt_devalarm_data.java
@@ -22,6 +22,7 @@
private String dev_name;//璁惧鍚嶇О
private String stationName;//鏈烘埧鍚嶇О
private String stationName1;//缁存姢鍖哄悕绉�
+ private String stationName2;//甯傜骇
private String stationId;//鏈烘埧id
private Page page;//鍒嗛〉
private User_inf uinf;
@@ -149,6 +150,12 @@
public void setStationName1(String stationName1) {
this.stationName1 = stationName1;
}
+ public String getStationName2() {
+ return stationName2;
+ }
+ public void setStationName2(String stationName2) {
+ this.stationName2 = stationName2;
+ }
@Override
public String toString() {
return "Batt_devalarm_data [num=" + num + ", record_id=" + record_id
@@ -160,8 +167,9 @@
+ alm_confirmed_time + ", alm_cleared_type=" + alm_cleared_type
+ ", usr_id=" + usr_id + ", note=" + note + ", dev_name="
+ dev_name + ", stationName=" + stationName + ", stationName1="
- + stationName1 + ", stationId=" + stationId + ", page=" + page
- + ", uinf=" + uinf + "]";
+ + stationName1 + ", stationName2=" + stationName2
+ + ", stationId=" + stationId + ", page=" + page + ", uinf="
+ + uinf + "]";
}
diff --git a/gx_tieta/src/com/fgkj/dto/Dev_param.java b/gx_tieta/src/com/fgkj/dto/Dev_param.java
index c028e97..d1970fe 100644
--- a/gx_tieta/src/com/fgkj/dto/Dev_param.java
+++ b/gx_tieta/src/com/fgkj/dto/Dev_param.java
@@ -13,6 +13,10 @@
private Integer alm_low_level;
private Integer alm_high_en;
private Integer alm_low_en;
+
+ private String stationName;
+ private String stationName1;
+ private String stationName2;
private String note;
public Integer getNum() {
@@ -82,6 +86,24 @@
public void setNote(String note) {
this.note = note;
}
+ public String getStationName() {
+ return stationName;
+ }
+ public void setStationName(String stationName) {
+ this.stationName = stationName;
+ }
+ public String getStationName1() {
+ return stationName1;
+ }
+ public void setStationName1(String stationName1) {
+ this.stationName1 = stationName1;
+ }
+ public String getStationName2() {
+ return stationName2;
+ }
+ public void setStationName2(String stationName2) {
+ this.stationName2 = stationName2;
+ }
@Override
public String toString() {
return "Dev_param [num=" + num + ", dev_id=" + dev_id + ", alm_id="
@@ -89,8 +111,11 @@
+ alm_high_coe + ", alm_low_coe=" + alm_low_coe
+ ", alm_high_level=" + alm_high_level + ", alm_low_level="
+ alm_low_level + ", alm_high_en=" + alm_high_en
- + ", alm_low_en=" + alm_low_en + ", note=" + note + "]";
+ + ", alm_low_en=" + alm_low_en + ", stationName=" + stationName
+ + ", stationName1=" + stationName1 + ", stationName2="
+ + stationName2 + ", note=" + note + "]";
}
+
}
diff --git a/gx_tieta/src/com/fgkj/services/BattTest_ResService.java b/gx_tieta/src/com/fgkj/services/BattTest_ResService.java
index 5eafc68..894039c 100644
--- a/gx_tieta/src/com/fgkj/services/BattTest_ResService.java
+++ b/gx_tieta/src/com/fgkj/services/BattTest_ResService.java
@@ -224,6 +224,7 @@
BattInf binf=new BattInf();
binf.setStationName("");
binf.setStationName1("");
+ binf.setStationName2("");
binf.setBattGroupId(0);
binf.setBattGroupName1("");
binf.setBattProducer("");
@@ -240,13 +241,13 @@
mainf.setMaint_done_time1(ActionUtil.getSimpDate(date2));
Batttestdata_inf tdata=new Batttestdata_inf();
- tdata.setTest_type(0);
+ tdata.setTest_type(2);
tdata.setTest_starttype(0);
tdata.setRecord_time(ActionUtil.getSimpDate(date1));
tdata.setRecord_time1(ActionUtil.getSimpDate(date2));
User_inf uinf=new User_inf();
- uinf.setUId(0);
+ uinf.setUId(1002);
Page p = new Page();
p.setPageCurr(1);
@@ -258,7 +259,7 @@
bmd.setTdata(tdata);
bmd.setMainf(mainf);
bmd.setUinf(uinf);
- bservice.serchByCondition(bmd);
-
+ List list=bservice.serchByCondition(bmd);
+ System.out.println(list.size());
}
}
--
Gitblit v1.9.1