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

didiyu

2018-09-28 97db75238a96a75f41bafd469548c2a84ba37080

 gx_tieta/WebRoot/elewarn.jsp

@@ -649,7 +649,7 @@
               var _attr = {

                  StationId: __data.StationId

               };

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

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

               optsList.push(tmp);

            }

            

@@ -674,7 +674,7 @@
      var tmp = {

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

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

         StationName3: $("#station_name").val(),

         StationName: $("#station_name").val(),

         StationId: stationid

      };