Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git ...

hdw

2018-11-03 b56adb397d5ba2d20f9f2a689a0cba2bf398a6cb

 gx_tieta/WebRoot/batt-traffic-statistics1.jsp

@@ -15,7 +15,7 @@
      <meta http-equiv="expires" content="0">    

      <meta http-equiv="keywords" content="keyword1,keyword2,keyword3">

      <meta http-equiv="description" content="This is my page">

       <title>流量统计</title>            <!--流量统计-->

       <title>机房流量统计查询</title>            <!--流量统计-->

      <link rel="stylesheet" type="text/css" href="pages/css/base.css">

      <link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.min.js">

       <link rel="stylesheet" type="text/css" href="src/css/layui.css">

@@ -31,12 +31,13 @@
        <div class="layui-page-container">

           <!-- 条件筛选 -->

            <div class="layui-page-filter">

                <div class="page-filter-header layui-page-filter-fweight">流量统计</div>

                <div class="page-filter-header layui-page-filter-fweight">机房流量统计查询</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>                     <!-- 机房名称 -->

                            <td>统计方式</td>

                            <td colspan="2">时间段</td>

@@ -64,6 +65,19 @@
                                  </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">

@@ -236,15 +250,69 @@
                     createLayuiSelect(ele, list);

                     form.render('select', 'cityFilter');

                     

                     // 查询区县

                     searchCounty();

                  }

               });

            }

				
            // 切换市-区县

            form.on('select(city)', function(data) {

               // 查询区县

               searchCounty();

            });

				
				
            // 查询区/县

            function searchCounty(isLoad) {

               // 构造查询条件

               var tmp = {

                  StationName1: $("#province").val(),

                  StationName2: $("#city").val()

               };

               // 是否添加等待

               if(isLoad) {

                  filterLoad = layer.load();

               }

               // 根据构造条件查询内容

               $.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);

                           //console.info(_tmp);

                           list.push(_tmp);

                        }

                     }else {

                        list.push(getLayuiSelect('暂无区/县', '', {}, undefined));

                     }

							
                     // 根据对象数组生成下拉列表

                     createLayuiSelect(ele, list);

                     form.render('select', 'countyFilter');

							
                     // 查询机房

                     searchHome();

                  }

               });

            }

            

            // 切换市-机房

            form.on('select(city)', function(data) {

               // 查询机房

            // 切换市-区县

            form.on('select(county)', function(data) {

               // 查询区县

               searchHome();

            });

            

@@ -253,7 +321,8 @@
               // 构造查询条件

               var tmp = {

                  StationName1:$("#province").val(),

                  StationName2:$("#city").val()

                  StationName2:$("#city").val(),

                  StationName5:$("#county").val(),

               };

               // 根据构造条件查询内容

               $.ajax({

@@ -298,9 +367,9 @@
               ,cellMinWidth: 80

               ,cols: [[

                  {field:'timeSlot', title:'统计时间段', align:'center', width: 380}

                  ,{field:'province', title:'省', align:'center'}

                  ,{field:'city', title:'市', align:'center'}

                  ,{field:'home', title:'机房名称', align:'center'}

                  ,{field:'province', title:'省', align:'center',width:200}

                  ,{field:'city', title:'市', align:'center',width:200}

                  ,{field:'home', title:'机房名称', align:'center',width:600}

                  ,{field:'flowSize', title:'流量', align:'center'}

                ]]

               ,data:[]

@@ -338,6 +407,7 @@
                     layer.close(loading);

                     // 解析获取的json

                     var rs = JSON.parse(result.result);

                     console.info(rs);

                     // 初始化数据结果

                     tOptions.data = [];

                     if(rs.code == 1) {

@@ -350,7 +420,7 @@
                           tmp.province = _data.stationName1;

                           tmp.city = _data.stationName2;

                           tmp.home = _data.stationName;

                           tmp.flowSize = tranfficCount(_data.nowflow);

                           tmp.flowSize = tranfficCount(_data.dayflow);

                           tOptions.data.push(tmp);

                        }

                     }else {