From 57344eb33c330b854ba132e12319949c9f93d36f Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 26 九月 2018 18:06:40 +0800
Subject: [PATCH] 电池测试省-市-机房-电池组联动
---
gx_tieta/WebRoot/control.jsp | 4 +
gx_tieta/WebRoot/charge-test.jsp | 3
gx_tieta/WebRoot/js/createTab.js | 35 ++++++++
gx_tieta/WebRoot/dischargetest.jsp | 169 +++++++++++++++++++++++++++---------------
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 3
5 files changed, 153 insertions(+), 61 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 5b6373a..465ee8e 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -4646,6 +4646,9 @@
treeView.ele.on('click', '.home', function() {
var home = $(this).data('attr');
var tmp = {
+ StationName1: home.StationName1,
+ StationName2: home.StationName2,
+ StationName3: home.StationName3,
StationId: home.StationId
};
fourth(treeView, $(this).parent(), tmp);
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 2371c9b..0c733b9 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -3976,7 +3976,11 @@
// 鏈烘埧->鐢垫睜缁�
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,
StationId: home.StationId
};
fourth(treeView, $(this).parent(), tmp);
diff --git a/gx_tieta/WebRoot/dischargetest.jsp b/gx_tieta/WebRoot/dischargetest.jsp
index 5ec1420..ef9044d 100644
--- a/gx_tieta/WebRoot/dischargetest.jsp
+++ b/gx_tieta/WebRoot/dischargetest.jsp
@@ -84,7 +84,8 @@
<table>
<thead>
<tr>
- <th><s:text name="Maintenance_area"/><!-- 缁存姢鍖� --></th>
+ <th>鐪�</th>
+ <th>甯�<!-- 缁存姢鍖� --></th>
<th><s:text name="Computer_site"/><!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� --></th>
<th><s:text name="Battery_name"/><!-- 钃勭數姹犵粍鍚嶇О --></th>
</tr>
@@ -93,6 +94,10 @@
<tr>
<td>
<select id="station_name1">
+ </select>
+ </td>
+ <td>
+ <select id="city">
</select>
</td>
<td>
@@ -164,31 +169,31 @@
<th><s:text name="Discharging"/><s:text name="Hourly_rate"/><!-- 鏀剧數灏忔椂鐜� --></th>
</tr>
<tr>
- <td><input id="discurr" type="text" value="25"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
- <td><input id="hourrate" type="text" value="20"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
+ <td><input id="discurr" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
+ <td><input id="hourrate" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
</tr>
<tr>
<th><s:text name="Discharging"/><s:text name="Capacity"/><!-- 鏀剧數瀹归噺 -->锛�0~90000AH锛�</th>
<th><s:text name="Discharging"/><s:text name="Time_long"/><!-- 鏀剧數鏃堕暱 -->锛�0~5940<s:text name="Minutes"/>锛�</th>
</tr>
<tr>
- <td><input id="discap" type="text" value="250"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
- <td><input id="distime" type="text" value="600"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
+ <td><input id="discap" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
+ <td><input id="distime" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
</tr>
<tr>
<th><s:text name="Monomer"/><s:text name="Lower_limit"/><s:text name="Threshold"/><!-- 鍗曚綋涓嬮檺闃�鍊� -->锛�0~20V锛�</th>
<th><s:text name="Group_of_end"/><s:text name="Lower_limit"/><s:text name="Threshold"/><!-- 缁勭涓嬮檺闃�鍊� -->锛�0~60V锛�</th>
</tr>
<tr>
- <td><input id="MonomerVol_low" type="text" value="1.804"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
- <td><input id="GroupVol_low" type="text" value="46.0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
+ <td><input id="MonomerVol_low" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
+ <td><input id="GroupVol_low" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
</tr>
<tr>
<th><s:text name="Monomer"/><s:text name="Lower_limit"/><s:text name="Amount"/><!-- 鍗曚綋涓嬮檺鏁伴噺 --></th>
<th><s:text name="On-line_voltage"/><s:text name="Low"/><s:text name="Dispose"/><!-- 鍦ㄧ嚎鐢靛帇浣庡鐞� --></th>
</tr>
<tr>
- <td><input id="MonomerlowCount" type="text" value="1"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
+ <td><input id="MonomerlowCount" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
<td>
<select id="OnlineVolLowAction">
<option value="0"><s:text name="Stop"/><s:text name="Test"/><!-- 鍋滄娴嬭瘯 --></option>
@@ -1124,61 +1129,99 @@
$(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
+ $.post("BattInfAction!serchAllStation",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.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);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<data.data.length;i++){
+ var _data = data.data[i];
+ var tmp = getOptionsData(_data.StationName1, _data.StationName1, _data);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}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(){
- findStationNamebyStationname1();
+ findCity();
});
+ //褰撳競鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
+ findStationNamebyStationname1();
+ });
//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val()
};
//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]);
- }
- $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.StationName3, __data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
@@ -1192,36 +1235,41 @@
//鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
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(),
+ StationName3: $("#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);
- $option.attr("dev_id",data.data[i-1].FBSDeviceId);
- $option.attr("batt_num",(data.data[i-1].GroupIndexInFBSDevice+1));
- }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);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
@@ -1919,7 +1967,6 @@
var ld9alarm_arr = ['鏃�','鎵嬪姩鍋滄','鍗曚綋涓嬮檺鍒�','鍏呯數瀹屾垚鍋滄','娴嬭瘯瀹屾垚鍋滄','杩滅▼鍋滄','鍦ㄧ嚎鐢靛帇浣�', '娓╁害寮傚父楂�', '鐢垫祦寮傚父'];
function flushTable(obj){
- console.info(obj);
$('#main .tbl-body tbody tr').each(function(i){
var dev_id = $(this).find('td').eq(2).text();
if(dev_id == obj.binf.FBSDeviceId){
diff --git a/gx_tieta/WebRoot/js/createTab.js b/gx_tieta/WebRoot/js/createTab.js
index 2d0d437..df97770 100644
--- a/gx_tieta/WebRoot/js/createTab.js
+++ b/gx_tieta/WebRoot/js/createTab.js
@@ -394,6 +394,41 @@
}
ele.append(__select);
}
+
+// 鍦ㄤ笅鎷夊垪琛ㄤ腑鐢熸垚option
+function createOptions(ele, optList, all) {
+ // 娓呯┖ele
+ ele.text("");
+ // 鏍规嵁all鍒ゆ柇鏄惁鏈夊叏閮ㄧ殑閫夐」
+ if(all) {
+ var _option = $('<option value="">鍏ㄩ儴锛堝叡'+optList.length+'绉嶏級</option>');
+ ele.append(_option);
+ }
+
+ // 鏍规嵁optList鐨勫�肩敓鎴愬唴瀹�
+ for(var i=0; i<optList.length; i++) {
+ var _data = optList[i];
+ var _option = $('<option value="'+_data.val+'">'+_data.txt+'</option>');
+ _option.data('attr', _data.data);
+
+ Object.keys(_data.attr).forEach(function(key) {
+ _option.attr(key, _data.attr[key]);
+ });
+
+ ele.append(_option);
+ }
+}
+
+// 鑾峰彇鐢熸垚涓嬫媺鍒楄〃鐨勬暟鎹�
+function getOptionsData(txt, val, data, attr) {
+ var _tmp = {};
+ _tmp.txt = txt;
+ _tmp.val = val;
+ _tmp.attr = attr || {};
+ _tmp.data = data || {};
+ return _tmp;
+}
+
/*
鍒涘缓琛ㄦ牸
@param jquery瀵硅薄 eleHead 琛ㄦ牸澶撮儴瀹瑰櫒
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 6da7376..2c36469 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -327,6 +327,9 @@
// 灞曞紑涓夌骇瀵艰埅
function thirdSpread(treeView, container, data) {
var tmp = {
+ StationName1: data.StationName1,
+ StationName2: data.StationName2,
+ StationName3: data.StationName3,
StationId: data.StationId
};
fourth(treeView, container, tmp, true);
--
Gitblit v1.9.1