From b4b5054b63c714268878f2f2a2b175fd69b3d8a5 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 28 九月 2018 11:46:50 +0800
Subject: [PATCH] 包机组管理修改
---
gx_tieta/WebRoot/elegroup.jsp | 300 ++++++++++++++++++++++++++++++++++++++-----------
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 4
2 files changed, 232 insertions(+), 72 deletions(-)
diff --git a/gx_tieta/WebRoot/elegroup.jsp b/gx_tieta/WebRoot/elegroup.jsp
index f2b48db..bed6642 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++)
{
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index c1666c3..855d1e8 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -355,8 +355,8 @@
baseSql+=station1SqlF;
}
//鐢ㄤ簬缁存姢鍖�
- String station2SqlT=" stationname2!=? ";//鍏ㄩ儴
- String station2SqlF=" stationname2=? ";
+ String station2SqlT=" and stationname2!=? ";//鍏ㄩ儴
+ String station2SqlF=" and stationname2=? ";
if(binf.getStationName2().equals("")){
baseSql+=station2SqlT;
}else{
--
Gitblit v1.9.1