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

didiyu

2018-09-28 97db75238a96a75f41bafd469548c2a84ba37080

 gx_tieta/WebRoot/equipWarn1.jsp

@@ -90,13 +90,18 @@
                    <!-- 维护区信息 -->

                    <table>

                        <tr class="fWeight">

                            <td><s:text name="Maintenance_area"/></td>            <!-- 维护区 -->

                            <td>省</td>            <!-- 省 -->

                            <td>市</td>            <!-- 市 -->

                            <td><s:text name="Computer_name"/></td>               <!-- 机房站点（或机房设备） -->

                            <td><s:text name="Alarm"/><s:text name="Type"/></td>            <!-- 告警类型 -->

                        </tr>

                        <tr>

                            <td>

                                <select id="station_name1" name="station_name1">

                                </select>

                            </td>

                            <td>

                                <select id="city" name="station_name2">

                                </select>

                            </td>

                            <td>

@@ -561,6 +566,7 @@
        function createSearchParam(){

           var temp = {

              stationName1:$('#station_name1').val(),

              stationName2:$('#city').val(),

              stationName:$('#station_name').val(),

              alm_type:$('#alarm_type').val(),

              page:{

@@ -568,6 +574,7 @@
               pageCurr:Page.pageCurr,                  //当前页

            }

           };

           console.log(temp);

           return temp;

        }

        

@@ -868,6 +875,7 @@
         return undefined;

      }

      

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

      $(document).ready(function(){

         //页面加载时查询维护区中的枢纽类型

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

@@ -891,48 +899,82 @@
            }else{

               $("#station_name1").text('').html('<option>暂无管理的维护区</option>');

            }

            findStationNamebyStationname1();		
            findCity();		
         });

      });

      

      //当维护区的值变换时更新机房站点

      // 根据维护区的内容查询市

      function findCity() {

         var data = {

            StationName1: $("#station_name1").val()

         };

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

         $.ajax({ 	
              type: "post", 				
              url: "BattInfAction!serchStationName2",				
              async:true,				
              dataType:'json',

              data:"json = "+JSON.stringify(data),	
              success: function(data){

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

                 var $select = $("#city");

                 if(rs.code == 1) {

                    var _data= rs.data;

                    // 根据数据构造生成下拉列表的数据

                  var optsList = [];

                  for(var i=0;i<_data.length;i++){

                     var __data = _data[i];

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

                     optsList.push(tmp);

                  }

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

                  createOptions($select, optsList, true);

                 }else {

                    $select.text('').html('<option>暂无可测市</option>');

                 }

                 findStationNamebyStationname1();

              }

          });

      }

		
      //当维护区的值变换时更新市

      $('#station_name1').change(function(){

         findCity();

      });

		
      //当维护区的值变换时更新机房站点

      $('#city').change(function(){

         findStationNamebyStationname1();

      });

      

      var isNewload = true;

      //根据维护区查询站点

      //根据省，市查询站点

      function findStationNamebyStationname1(){

         var user = {

            UNote:$("#station_name1 option:selected").val()

         var tmp = {

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

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

         };

         var stationid = getQueryString("stationId");

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

         //alert(selectvalue);

         $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){

            //console.info(data);

            data=data.result;

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

            if(data.code==1 && data.data.length>0){

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

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

            if(rs.code==1){

               var _data = rs.data;

               var $select = $("#station_name");

               $select.text('');

               for(var i=0;i<=data.data.length;i++){

                  var $option=$("<option></option>");

                  if(i==0){

                     $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");	
                     $option.attr("value", "");			
                  }else{

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

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

                     if(stationid!=undefined && stationid == data.data[i-1].StationId && isNewload){

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

                        isNewload = false;

                     }	
                  }					
                  $select.append($option);

               // 根据数据构造生成下拉列表的数据

               var optsList = [];

               for(var i=0;i<_data.length;i++){

                  var __data = _data[i];

                  var _attr = {

                     StationId: __data.StationId

                  };

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

                  optsList.push(tmp);

               }

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

               createOptions($select, optsList, true);

            }else{

               $("#station_name").text('').html('<option>暂无管理的机房站点</option>');

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

            }

            searchDevAlarm();

         });