From 9561cc6e4e436b9804db576d699334e897c5c557 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期四, 01 十一月 2018 15:20:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/eleWarnPrmSet.jsp | 105 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 88 insertions(+), 17 deletions(-)
diff --git a/gx_tieta/WebRoot/eleWarnPrmSet.jsp b/gx_tieta/WebRoot/eleWarnPrmSet.jsp
index ed610d4..19169d3 100644
--- a/gx_tieta/WebRoot/eleWarnPrmSet.jsp
+++ b/gx_tieta/WebRoot/eleWarnPrmSet.jsp
@@ -17,6 +17,7 @@
<!-- <link rel="stylesheet" type="text/css" href="css/eleWarnPrm.css" /> -->
<link rel="stylesheet" type="text/css" href="css/query.css" />
<link rel="stylesheet" type="text/css" href="css/popup-tbl.css" />
+<link href="src/css/layui.css" type="text/css" rel="stylesheet">
</head>
<body>
<!--澶撮儴鍐呭寮�濮�-->
@@ -36,6 +37,7 @@
<tr>
<th>鐪�</th> <!-- 鐪� -->
<th>甯�</th> <!-- 甯� -->
+ <th>鍖�/鍘�</th> <!-- 鍖�/鍘� -->
<th><s:text name="Equipment"/></th> <!-- 璁惧 -->
<th><s:text name="Alarm_name"/></th> <!-- 鍛婅鍚嶇О -->
</tr>
@@ -43,12 +45,13 @@
<tbody>
<tr>
<td>
- <select id="station_name1"> <!-- 鐪� -->
- </select>
+ <select id="station_name1"></select>
</td>
<td>
- <select id="city"> <!-- 甯� -->
- </select>
+ <select id="city"></select>
+ </td>
+ <td>
+ <select id="county"></select>
</td>
<td>
<select id="equipment-name">
@@ -151,6 +154,7 @@
<script type="text/javascript" src="js/createTab.js"></script>
<script type="text/javascript" src="js/popup.js"></script>
<script type="text/javascript" src="js/rightmenu.js"></script>
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -336,7 +340,9 @@
});
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -364,10 +370,14 @@
});
// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -392,32 +402,89 @@
}else {
$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
}
- findStationNamebyStationname1();
+ findCounty();
}
});
}
+ // 鏌ヨ鍖�/鍘�
+ function findCounty(isLoad) {
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ // 鏌ヨ鍖哄幙
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: "BattInfAction!serchStationName5",
+ data: "json="+JSON.stringify(tmp),
+ success:function(data) {
+ var rs = JSON.parse(data.result);
+ var $select = $("#county");
+ if(rs.code==1){
+ var _data = rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else{
+ $select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
- findCity();
+ findCity(true);
});
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
- findStationNamebyStationname1();
+ findCounty(true);
+ });
+
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
+ findStationNamebyStationname1(true);
});
// 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
$('#equipment-name').change(function(){
- findWarmName();
+ findWarmName(true);
+ });
+
+ // 鍛婅鍚嶇О淇敼
+ $('#alarm-name').change(function(){
+ searchEquipmentName();
});
//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
+ function findStationNamebyStationname1(isLoad){
var tmp = {
StationName1:$("#station_name1").val(),
- StationName2:$("#city").val()
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -447,11 +514,15 @@
}
// 鑾峰彇鍛婅鍙傛暟
- function findWarmName(){
+ function findWarmName(isLoad){
var dev_id = $("#equipment-name option:selected").val();
var warmId ={
"dev_id":dev_id
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
$.post("Dev_paramAction!serchByInfo","json="+JSON.stringify(warmId),function(data){
data=data.result;
data=eval("("+data+")");
@@ -471,15 +542,13 @@
}
$select.append($option);
}
-
+ layer.close(filterLoad);
searchEquipmentName();
}
});
}
- $(function(){
-
- });
+
var all_almlist;
function searchEquipmentName(){
all_almlist = new Array();
@@ -488,13 +557,15 @@
var warmId ={
stationName1:$("#station_name1").val(),
stationName2:$("#city").val(),
+ stationName5:$("#county").val(),
stationName: $("#equipment-name").find('option:selected').attr('stationname'),
"dev_id":dev_id,
"alm_id":alm_id
};
+ var load = layer.load(1);
//console.log(warmId);
$.post("Dev_paramAction!serchByCondition","json="+JSON.stringify(warmId),function(data){
- //console.info(JSON.stringify(warmId));
+ layer.close(load);
var data=data.result;
var data=eval("("+data+")");
all_almlist = data.data;
--
Gitblit v1.9.1