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

Administrator

2018-11-21 c02e430f16cb51cabb6f4b24f99ec48efc7b0596

 gx_tieta/WebRoot/batt-state-statistical.jsp

@@ -10,7 +10,7 @@
     <!-- 默认使用最高内核 -->

   <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >

    <base href="<%=basePath%>">

    <title><s:text name="Station_statestatistical"/></title>         <!-- 机房状态统计查询  -->

    <title><s:text name="Station_histor_events_query"/></title>         <!-- 机房历史事件查询  -->

   <link rel="stylesheet" href="css/basic.css">

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

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

@@ -36,7 +36,7 @@
   <!--导航开始-->

   <jsp:include page="nav.jsp" flush="true"/>

   <div class="filter-container">

      <div class="filter-title"><a href="javascript:;"><s:text name="Station_statestatistical"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></a></div>

      <div class="filter-title"><a href="javascript:;"><s:text name="Station_histor_events_query"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></a></div>

      <div class="filter-content">

         <table>

            <tbody>

@@ -153,8 +153,8 @@
            ,defaultToolbar: ['exports', 'filter']

            ,cellMinWidth: 80

            ,cols: [[

             {field:'note', title:'告警时间段', align:'center'}

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

             {field:'note', title:'告警时间段', align:'center',width:380}

             ,{field:'stationName', title:'机房名称', align:'center',width:450}

             ,{field:'station_event_type_poff', title:'停电次数', align:'center'}

             ,{field:'station_event_type_fadian', title:'发电次数', align:'center'}

             ,{field:'station_event_type_diaozhan', title:'掉站次数', align:'center'}

@@ -252,10 +252,10 @@
               dataType:'json',

               data:"json="+json,

               success:function(data){

                  console.info(data);

                  //console.info(data);

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

                  if(data.code==1&&data!=null){

                     console.log(data.data);

                     //console.log(data.data);

                     tOptions.data = data.data;

                    }else {

                       tOptions.data = [];

@@ -344,9 +344,10 @@
            return rs;

         }

         

			
         var isNewLoad = true;

         // 省-市-机房-电池组

         var filterLoad = layer.load();

         var pre_province = getQueryString('province');

         $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){

            data=data.result;

            data=eval("("+data+")");

@@ -361,7 +362,11 @@
                     $option.attr("value", "");         

                  }else{

                     $option.text(data.data[i-1]);

                     $option.attr("value",data.data[i-1]);	
                     $option.attr("value",data.data[i-1]);

                     if(pre_province == data.data[i-1] && isNewLoad){

                        $option.attr("selected",true);

                     }	
							
                  }               

                  $select.append($option);

               }

@@ -379,6 +384,7 @@
            if(isLoad) {

               filterLoad = layer.load();

            }

            var pre_city = getQueryString('city');

            // 请求获取当前省下的市

            $.ajax({    

                 type: "post",             

@@ -396,6 +402,9 @@
                     for(var i=0;i<_data.length;i++){

                        var __data = _data[i];

                        var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);

                        if(pre_city == __data.StationName2 && isNewLoad){

                           tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);

                        }

                        optsList.push(tmp);

                     }

                     // 根据数据生成下拉列表

@@ -418,6 +427,7 @@
            if(isLoad) {

               filterLoad = layer.load();

            }

            var pre_county = getQueryString('county');

            // 查询区县

            $.ajax({

               type: 'post',

@@ -437,6 +447,9 @@
                           StationId: __data.StationId

                        };

                        var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);

                        if(pre_county == __data.StationName5 && isNewLoad){

                           tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);

                        }

                        optsList.push(tmp);

                     }

                     

@@ -474,6 +487,8 @@
            if(isLoad) {

               filterLoad = layer.load();

            }

            var pre_home = getQueryString('home');

            var auto_search = false;

            //var selectvalue=$("#station_name1 option:selected").val();

            //alert(selectvalue);

            $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){

@@ -489,6 +504,10 @@
                        StationId: __data.StationId

                     };

                     var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);

                     if(pre_home == __data.StationName && isNewLoad){

                        tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr,{},true);

                        auto_search = true;

                     }

                     optsList.push(tmp);

                  }

                  

@@ -497,8 +516,11 @@
               }else{

                  $("#station_name3").text('').html('<option>暂无可测机房站点</option>');

               }

					
               isNewLoad = false;

               layer.close(filterLoad);

               if(auto_search){

                  serachBattStatistical();

               }

            });

         }

      });