LiJun
2018-12-06 ff2efca24852572526b32db23816d28d78dcd8a1
设备连接信息页面查询添加
2个文件已修改
143 ■■■■■ 已修改文件
gx_tieta/.settings/org.jboss.tools.jst.web.xml 68 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/bts-comm-task.jsp 75 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/.settings/org.jboss.tools.jst.web.xml
@@ -9,73 +9,73 @@
 <file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/>
 <file-system NAME="fuguang" location="%eclipse.project%" model-entity="FileSystemFolder"/>
 <file-system NAME="lib-javaee.jar"
  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\javaee.jar" model-entity="FileSystemJar"/>
  location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\javaee.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-jsf-impl.jar"
  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-impl.jar" model-entity="FileSystemJar"/>
  location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-impl.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-jsf-api.jar"
  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-api.jar" model-entity="FileSystemJar"/>
  location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-api.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-jstl-1.2.jar"
  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jstl-1.2.jar" model-entity="FileSystemJar"/>
  location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jstl-1.2.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-c3p0-0.9.5.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\c3p0-0.9.5.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\lib\c3p0-0.9.5.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-c3p0-oracle-thin-extras-0.9.5.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\c3p0-oracle-thin-extras-0.9.5.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\lib\c3p0-oracle-thin-extras-0.9.5.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-mchange-commons-java-0.2.9.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\mchange-commons-java-0.2.9.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\lib\mchange-commons-java-0.2.9.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-resources.jar"
  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\resources.jar" model-entity="FileSystemJar"/>
  location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\resources.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-dnsns.jar"
  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\dnsns.jar" model-entity="FileSystemJar"/>
  location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\dnsns.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-localedata.jar"
  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\localedata.jar" model-entity="FileSystemJar"/>
  location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\localedata.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-sunjce_provider.jar"
  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\sunjce_provider.jar" model-entity="FileSystemJar"/>
  location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\sunjce_provider.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-beanutils-1.7.0.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-codec-1.10.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-codec-1.10.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-codec-1.10.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-collections-3.1.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-collections-3.1.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-collections-3.1.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-dbcp-1.2.1.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-dbcp-1.2.1.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-dbcp-1.2.1.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-fileupload-1.2.2.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-fileupload-1.2.2.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-fileupload-1.2.2.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-io-2.0.1.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-io-2.0.1.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-io-2.0.1.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-lang-2.5.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-lang-2.5.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-lang-2.5.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-commons-pool-1.2.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-pool-1.2.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-pool-1.2.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-dom4j-1.6.1.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\dom4j-1.6.1.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\dom4j-1.6.1.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-ezmorph-1.0.3.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ezmorph-1.0.3.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ezmorph-1.0.3.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-freemarker-2.3.16.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\freemarker-2.3.16.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\freemarker-2.3.16.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-gson-2.2.4.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\gson-2.2.4.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\gson-2.2.4.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-javassist-3.11.0.GA.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\javassist-3.11.0.GA.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\javassist-3.11.0.GA.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-json-lib-2.1-jdk15.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\json-lib-2.1-jdk15.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\json-lib-2.1-jdk15.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-mysql-connector-java-5.1.33-bin.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\mysql-connector-java-5.1.33-bin.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\mysql-connector-java-5.1.33-bin.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-ognl-3.0.1.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ognl-3.0.1.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ognl-3.0.1.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-poi-3.10.1-20140818.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\poi-3.10.1-20140818.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\poi-3.10.1-20140818.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-sqljdbc.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\sqljdbc.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\sqljdbc.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-struts2-core-2.2.3.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-core-2.2.3.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-core-2.2.3.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-struts2-json-plugin-2.2.3.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-json-plugin-2.2.3.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-json-plugin-2.2.3.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-struts2-sunspoter-stream-1.0.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-sunspoter-stream-1.0.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-sunspoter-stream-1.0.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-xwork-core-2.2.3.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\xwork-core-2.2.3.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\xwork-core-2.2.3.jar" model-entity="FileSystemJar"/>
 <file-system NAME="lib-jacob.jar"
  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\jacob.jar" model-entity="FileSystemJar"/>
  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\jacob.jar" model-entity="FileSystemJar"/>
 <web SERVLET_VERSION="2.4" model-entity="JstWeb" model-path="/web.xml">
  <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule"
   model-path="/faces-config.xml" src="src" web-root="WEB-ROOT"/>
gx_tieta/WebRoot/bts-comm-task.jsp
@@ -147,7 +147,7 @@
                var form = layui.form;            // 获取表单模块
                var layer = layui.layer;        // 获取弹出框模块
                var element = layui.element;    // 获取元素操作模块
                var isNewLoad = true;
                var pre_province = getQueryString('province');
                // 查询省下拉框
@@ -371,14 +371,14 @@
                    ,toolbar: false
                    ,cellMinWidth: 80
                    ,cols: [[
                        {fileld: 'Staionanme', title: '机房名称', align: 'center', width: 380}
                        {field: 'Staionanme', title: '机房名称', align: 'center', width: 450}
                        ,{field:'dev_id', title:'设备id', align:'center', width: 150}
                        ,{field:'battgroup_id1', title:'电池组1', align:'center', width: 150}
                        ,{field:'battgroup_id2', title:'电池组2', align:'center', width: 150}
                        ,{field:'battgroup_id3', title:'电池组3', align:'center', width: 150}
                        ,{field:'battgroup_id4', title:'电池组4', align:'center', width: 150}
                        ,{field:'connet_time', title:'设备连接时间', align:'center'}
                        ,{field: 'dev_comm_runtime', title: '设备运行时长', align: 'center'}
                        ,{field: 'dev_comm_runtime', title: '设备运行时间', align: 'center'}
                        ,{field:'break_type_txt', title:'连接状态', align:'center', templet: '#breakTypeTpl', width: 150}
                    ]]
                    ,data:[
@@ -393,7 +393,7 @@
                table.render(tOptions);
                
                var Page = new TblPage();
                Page.set(1, 100, 10);
                Page.set(1, 0, 10);
                //console.log(Page);
                 
                // 查询后台数据
@@ -401,31 +401,70 @@
                function search(temp, newLoad) {
                    var load;
                    if(newLoad) {
                        load = layer.load(1)
                        load = layer.load(1);
                    }
                    console.log(temp);
                    setTimeout(function() {
                        setPageVal(Page);
                        layer.close(load);
                    }, 1000);
                    console.log(temp);
                    $.ajax({
                        type:'post',
                        async:true,
                        url: 'App_bts_comm_taskAction!serchByCondition',
                        data: "json="+JSON.stringify(temp),
                        dataType: 'json',
                        success:function(result) {
                            var model = JSON.parse(result.result);
                            console.info(model);
                            var arr_td = new Array();
                            if(model.code == 1){
                                for(var i=0;i<model.data.length;i++){
                                    var _data = model.data[i];
                                    var _tmp = {};
                                    _tmp.Staionanme = _data.stationName;
                                    _tmp.dev_id = _data.dev_id;
                                    _tmp.battgroup_id1 = _data.battgroup_id1;
                                    _tmp.battgroup_id2 = _data.battgroup_id2;
                                    _tmp.battgroup_id3 = _data.battgroup_id3;
                                    _tmp.battgroup_id4 = _data.battgroup_id4;
                                    _tmp.connet_time = _data.connet_time;
                                    _tmp.dev_comm_runtime = _data.dev_comm_runtime;
                                    _tmp.break_type = _data.break_type;
                                    arr_td.push(_tmp);
                                    Page.setAll(_data.num);
                                }
                            }
                            console.info(arr_td);
                            tOptions.data = arr_td;
                            // 生成表格数据
                            table.render(tOptions);
                            setPageVal(Page);
                            layer.close(load);
                        },error:function(e){
                            layer.close(load);
                        }
                    });
                }
                
                // 构造查询条件
                function createSearchParam() {
                    var sid = $('#home').attr('stationid')?$('#home').attr('stationid'): 0;
                    var sid = $('#home').find('option:selected').attr('stationid')?$('#home').find('option:selected').attr('stationid'): 0;
                    var temp = {
                        StationId: sid
                        ,page: Page.getPage()
                        StationId: sid,
                        StationName1:$('#province').attr('value'),
                        StationName2:$('#city').attr('value'),
                        StationName5:$('#county').attr('value'),
                        page: Page.getPage(),
                    };
                    return temp;
                }
                //点击查询按钮
                $('#paging .search').click(function(){
                    search(createSearchParam(), false);
                });
                
                //首页
                $('#page_home').click(function(){
                    alert(123);
                    if(Page != undefined){
                        if(Page.curr != 1){
                            Page.setCurr(1);
@@ -457,7 +496,7 @@
                //尾页
                $('#page_last').click(function(){
                    if(Page != undefined){
                        if(Page.pageCurr < Page.num){
                        if(Page.curr < Page.num){
                            Page.setCurr(Page.num);
                            search(createSearchParam(), true);
                        }