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

81041

2018-12-26 94c3b603ae4fd3f26e23a33e3eabc781d9c08846

 gx_tieta/WebRoot/batt-fault-manage.jsp

@@ -366,9 +366,11 @@
            searchfault();

         });      



         var isNewLoad = true;

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

          $(document).ready(function() {

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

              var pre_province = getQueryString("province");

              $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup", null,

              function(data) {

                  data = data.result;

@@ -385,6 +387,9 @@
                          } else {

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

                      }                   

@@ -400,6 +405,8 @@
              var data = {

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

              };

              var pre_city = getQueryString('city');

              console.info(pre_city);

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

              $.ajax({

                  type: "post",

@@ -417,6 +424,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);

                          }

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

@@ -437,7 +447,7 @@
               StationName1:$("#station_name1").val(),

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

            };

				
            var pre_county = getQueryString('county');

            // 查询区县

            $.ajax({

               type: 'post',

@@ -457,6 +467,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);

                     }

                     

@@ -491,6 +504,7 @@
                  StationName2: $("#city").val(),

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

              };

              var pre_home = getQueryString('home');

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

              //alert(selectvalue);

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

@@ -507,12 +521,16 @@
                              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);

                             isNewLoad = false

                          }

                          optsList.push(tmp);

                      }

      

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

                      createOptions($select, optsList, true);

		                
                      searchfault();

                  } else {

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