From 3cdf58d277e09e1a6fae1707870e3d832d892ca2 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 10 十二月 2018 16:06:33 +0800
Subject: [PATCH] 修改设备连接信息使用搜索文本框
---
gx_tieta/WebRoot/ele-param1.jsp | 2
gx_tieta/WebRoot/bts-comm-task.jsp | 327 ++++++------------------------------------------------
2 files changed, 39 insertions(+), 290 deletions(-)
diff --git a/gx_tieta/WebRoot/bts-comm-task.jsp b/gx_tieta/WebRoot/bts-comm-task.jsp
index dd3b569..2d4b6b5 100644
--- a/gx_tieta/WebRoot/bts-comm-task.jsp
+++ b/gx_tieta/WebRoot/bts-comm-task.jsp
@@ -39,70 +39,17 @@
<jsp:include page="nav.jsp" flush="true"/>
<!-- 涓讳綋鍐呭 -->
<div class="layui-page-container">
- <!-- 鏉′欢绛涢�� -->
- <div class="layui-page-filter">
- <div class="page-filter-header layui-page-filter-fweight"><s:text name="Dev_connect_info_query"/></div> <!-- 璁惧杩炴帴淇℃伅鏌ヨ -->
- <div class="page-filter-content">
- <table>
- <tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
- <td>鐪�</td> <!-- 鐪� -->
- <td>甯�</td> <!-- 甯� -->
- <td>鍖�/鍘�</td> <!-- 甯� -->
- <td><s:text name="Computer_name"/></td> <!-- 鏈烘埧鍚嶇О -->
- </tr>
- <tr>
- <td>
- <div class="layui-form" lay-filter="provinceFilter">
- <div class="layui-form-item">
- <div class="layui-input-block">
- <select name="province" id="province" lay-filter="province">
- <option value="">璇烽�夋嫨鐪�</option>
- </select>
- </div>
- </div>
- </div>
- </td>
- <td>
- <div class="layui-form" lay-filter="cityFilter">
- <div class="layui-form-item">
- <div class="layui-input-block">
- <select name="city" id="city" lay-filter="city">
- <option value="">璇烽�夋嫨甯�/鍖�</option>
- </select>
- </div>
- </div>
- </div>
- </td>
-
- <td>
- <div class="layui-form" lay-filter="countyFilter">
- <div class="layui-form-item">
- <div class="layui-input-block">
- <select name="county" id="county" lay-filter="county">
- <option value="">璇烽�夋嫨鍖�/鍘�</option>
- </select>
- </div>
- </div>
- </div>
- </td>
-
- <td>
- <div class="layui-form" lay-filter="homeFilter">
- <div class="layui-form-item">
- <div class="layui-input-block">
- <select name="home" id="home" lay-filter="home">
- <option value="">璇烽�夋嫨鏈烘埧</option>
- </select>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- </div>
- </div>
<!-- 椤甸潰涓婚鍐呭 -->
<div class="layui-page-content" style="position: relative;">
+ <div class="tbl-filter" lay-filter="tblFilter" style="position: absolute;z-index: 891;top: 8px; left: 15px">
+ <div class="layui-form layui-form-pane" lay-filter="tblFilter">
+ 璁惧ID锛�
+ <div class="layui-inline">
+ <input class="layui-input" name="id" id="devId" autocomplete="off">
+ </div>
+ <button class="layui-btn layui-btn-sm layui-btn-normal" id="searchById"><i class="fa fa-search"></i>鎼滅储</button>
+ </div>
+ </div>
<!-- 琛ㄦ牸鍐呭 -->
<table id="pageTbl" lay-filter="pageTbl"></table>
</div>
@@ -148,228 +95,12 @@
var form = layui.form; // 鑾峰彇琛ㄥ崟妯″潡
var layer = layui.layer; // 鑾峰彇寮瑰嚭妗嗘ā鍧�
var element = layui.element; // 鑾峰彇鍏冪礌鎿嶄綔妯″潡
-
- var isNewLoad = true;
- var pre_province = getQueryString('province');
- // 鏌ヨ鐪佷笅鎷夋
- searchProvince();
- // 鏌ヨ鐪�
- var filterLoad = layer.load();
- function searchProvince() {
- // 璇锋眰鍚庡彴鏌ヨ
- $.ajax({
- type:'post',
- async:true,
- url: 'User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup',
- data: null,
- dataType: 'json',
- success:function(result) {
- var rs = JSON.parse(result.result);
- var list = []; // option缁撴灉闆�
- var ele = $('#province'); // 鐩爣select
- if(rs.code == 1) {
- var data = rs.data;
- list.push(getLayuiSelect('璇烽�夋嫨鐪�/鐩磋緰甯�', '', {}, undefined));
- // 閬嶅巻鏌ヨ缁撴灉
- for(var i=0; i<data.length; i++) {
- var _data = data[i];
- var _tmp = getLayuiSelect(_data, _data, {}, {});
- if(pre_province == _data && isNewLoad){
- _tmp = getLayuiSelect(_data, _data, {}, {},true);
- }
- list.push(_tmp);
- }
- }else {
- list.push(getLayuiSelect('鏆傛棤鐪�/鐩磋緰甯�', '', {}, undefined));
- }
-
- // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
- createLayuiSelect(ele, list);
- form.render('select', 'provinceFilter');
-
- // 鏌ヨ甯�
- searchCity();
- }
- });
- }
-
- // 鍒囨崲鐪�-甯�
- form.on('select(province)', function(data) {
- // 鏌ヨ甯�
- searchCity(true);
- });
-
- // 鏌ヨ甯�
- function searchCity(isLoad) {
- // 鏋勯�犳煡璇㈡潯浠�
- var tmp = {
- StationName1: $("#province").val()
- };
- var pre_city = getQueryString('city');
-
- // 鏄惁娣诲姞绛夊緟
- if(isLoad) {
- filterLoad = layer.load();
- }
- // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
- $.ajax({
- type: 'post',
- async: true,
- url: 'BattInfAction!serchStationName2',
- dataType: 'json',
- data: "json = "+JSON.stringify(tmp),
- success: function(result) {
- var rs = JSON.parse(result.result);
- var list = []; // option缁撴灉闆�
- var ele = $('#city'); // 鐩爣select
- if(rs.code == 1) {
- var data = rs.data;
- list.push(getLayuiSelect('璇烽�夋嫨甯�/鍖�', '', {}, undefined));
- // 閬嶅巻鏌ヨ缁撴灉
- for(var i=0; i<data.length; i++) {
- var _data = data[i];
- var _tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data);
- if(pre_city == _data.StationName2 && isNewLoad){
- _tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data,true);
- }
- list.push(_tmp);
- }
- }else {
- list.push(getLayuiSelect('鏆傛棤甯�/鍖�', '', {}, undefined));
- }
-
- // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
- createLayuiSelect(ele, list);
- form.render('select', 'cityFilter');
-
- // 鏌ヨ鍖哄幙
- searchCounty();
- }
- });
- }
-
- // 鍒囨崲甯�-鍖哄幙
- form.on('select(city)', function(data) {
- // 鏌ヨ鍖哄幙
- searchCounty(true);
- });
-
-
- // 鏌ヨ鍖�/鍘�
- function searchCounty(isLoad) {
- // 鏋勯�犳煡璇㈡潯浠�
- var tmp = {
- StationName1: $("#province").val(),
- StationName2: $("#city").val()
- };
- // 鏄惁娣诲姞绛夊緟
- if(isLoad) {
- filterLoad = layer.load();
- }
- var pre_county = getQueryString('county');
- // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
- $.ajax({
- type: 'post',
- async: true,
- url: 'BattInfAction!serchStationName5',
- dataType: 'json',
- data: "json = "+JSON.stringify(tmp),
- success: function(result) {
- var rs = JSON.parse(result.result);
- //console.info(rs);
- var list = []; // option缁撴灉闆�
- var ele = $('#county'); // 鐩爣select
- if(rs.code == 1) {
- var data = rs.data;
- list.push(getLayuiSelect('璇烽�夋嫨鍖�/鍘�', '', {}, undefined));
- // 閬嶅巻鏌ヨ缁撴灉
- for(var i=0; i<data.length; i++) {
- var _data = data[i];
- var _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data);
- if(pre_county == _data.StationName5 && isNewLoad){
- _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data,true);
- }
- //console.info(_tmp);
- list.push(_tmp);
- }
- }else {
- list.push(getLayuiSelect('鏆傛棤鍖�/鍘�', '', {}, undefined));
- }
-
- // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
- createLayuiSelect(ele, list);
- form.render('select', 'countyFilter');
-
- // 鏌ヨ鏈烘埧
- searchHome();
- }
- });
- }
-
- // 鍒囨崲甯�-鍖哄幙
- form.on('select(county)', function(data) {
- // 鏌ヨ鍖哄幙
- searchHome(true);
- });
-
- // 鏌ヨ鏈烘埧
- function searchHome(isLoad) {
- // 鏋勯�犳煡璇㈡潯浠�
- var tmp = {
- StationName1:$("#province").val(),
- StationName2:$("#city").val(),
- StationName5:$("#county").val(),
- };
- var pre_home = getQueryString('home');
- var auto_seach = false;
- // 鏄惁娣诲姞绛夊緟
- if(isLoad) {
- filterLoad = layer.load();
- }
- // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
- $.ajax({
- type: 'post',
- async: true,
- url: 'BattInfAction!serchStationName3',
- dataType: 'json',
- data: "json = "+JSON.stringify(tmp),
- success: function(result) {
- var rs = JSON.parse(result.result);
- var list = []; // option缁撴灉闆�
- var ele = $('#home'); // 鐩爣select
- if(rs.code == 1) {
- var data = rs.data;
- list.push(getLayuiSelect('璇烽�夋嫨鏈烘埧', '', {StationId: '', dev_id: ''}, undefined));
- // 閬嶅巻鏌ヨ缁撴灉
- for(var i=0; i<data.length; i++) {
- var _data = data[i];
- var _attr = {
- StationId: _data.StationId,
- dev_id: _data.FBSDeviceId
- };
- var _tmp = getLayuiSelect(_data.StationName, _data.StationName3, _attr, _data);
- if(pre_home == _data.StationName && isNewLoad){
- _tmp = getLayuiSelect(_data.StationName, _data.StationName3, _attr, _data,true);
- auto_seach = true;
- }
- list.push(_tmp);
- }
- }else {
- list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
- }
- // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
- createLayuiSelect(ele, list);
- form.render('select', 'homeFilter');
- isNewLoad = false;
- layer.close(filterLoad);
- }
- });
- }
// 琛ㄦ牸妯″潡
var tOptions = {
elem: '#pageTbl'
- ,toolbar: false
+ ,toolbar: true
+ ,defaultToolbar: []
,cellMinWidth: 80
,cols: [[
{field: 'Staionanme', title: '鏈烘埧鍚嶇О', align: 'center', width: 450}
@@ -385,7 +116,7 @@
,data:[]
,limit: 1000
,page: false
- ,height: 'full-290'
+ ,height: 'full-190'
};
// 鐢熸垚琛ㄦ牸鏁版嵁
@@ -417,7 +148,8 @@
for(var i=0;i<model.data.length;i++){
var _data = model.data[i];
var _tmp = {};
- _tmp.Staionanme = _data.stationName;
+ // console.log(_data);
+ _tmp.Staionanme = _data.stationName?_data.stationName:'鈥斺��';
_tmp.dev_id = _data.dev_id;
_tmp.battgroup_id1 = _data.battgroup_id1;
_tmp.battgroup_id2 = _data.battgroup_id2;
@@ -460,16 +192,33 @@
// 鏋勯�犳煡璇㈡潯浠�
function createSearchParam() {
- var sid = $('#home').find('option:selected').attr('stationid')?$('#home').find('option:selected').attr('stationid'): 0;
var temp = {
- StationId: sid,
- StationName1:$('#province').attr('value'),
- StationName2:$('#city').attr('value'),
- StationName5:$('#county').attr('value'),
- page: Page.getPage(),
+ FBSDeviceId: 0
+ ,page: Page.getPage()
};
+ // console.log(temp);
return temp;
}
+
+ // 鐐瑰嚮涓婃柟鐨勮澶噄d鎼滅储
+ $('#searchById').click(function() {
+ var dev_id = $('#devId').val();
+
+ // 鍒ゆ柇鏁版嵁鍚堟硶鏂�
+ if(!isNumber(dev_id)) {
+ layer.msg('瀛樺湪杩濇硶瀛楃涓�');
+ }else{
+ dev_id = dev_id.length==0?0:dev_id;
+ Page.setCurr(1);
+ // 鏋勯�犳煡璇㈡潯浠�
+ var temp = {
+ FBSDeviceId: dev_id
+ ,page: Page.getPage()
+ };
+ search(temp, true);
+ }
+ });
+
//鐐瑰嚮鏌ヨ鎸夐挳
$('#paging .search').click(function(){
@@ -521,7 +270,7 @@
var value=$('#number').val();
//褰撹緭鍏ョ殑鏁板ぇ浜�0鏃�
if(value>0){
- if(value != Page.pageSize){
+ if(value != Page.size){
Page.setSize(parseInt(value));
Page.setCurr(1);
}
diff --git a/gx_tieta/WebRoot/ele-param1.jsp b/gx_tieta/WebRoot/ele-param1.jsp
index c8eb539..8949974 100644
--- a/gx_tieta/WebRoot/ele-param1.jsp
+++ b/gx_tieta/WebRoot/ele-param1.jsp
@@ -804,7 +804,7 @@
var value=$('#number').val();
//褰撹緭鍏ョ殑鏁板ぇ浜�0鏃�
if(value>0){
- if(value != Page.pageSize){
+ if(value != Page.size){
Page.setSize(parseInt(value));
Page.setCurr(1);
}
--
Gitblit v1.9.1