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/eleWarnPrmSet.jsp | 190 +++++++++++++++++++++++++++++++----------------
1 files changed, 124 insertions(+), 66 deletions(-)
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)); //鍛婅鍚嶇О
--
Gitblit v1.9.1