From ceefa6d0085d2ebe1d4b208cb20fe53958e0bbc1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 27 九月 2018 15:30:52 +0800
Subject: [PATCH] 设备实时告警
---
gx_tieta/WebRoot/equipWarn1.jsp | 99 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 70 insertions(+), 29 deletions(-)
diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp
index 262b7fa..95012b7 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:{
@@ -868,6 +874,7 @@
return undefined;
}
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
$(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
@@ -891,48 +898,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.StationName3, __data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}else{
- $("#station_name").text('').html('<option>鏆傛棤绠＄悊鐨勬満鎴跨珯鐐�</option>');
+ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
searchDevAlarm();
});
--
Gitblit v1.9.1