D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore
2019-01-18 2fe250ece8de95b3f70172fe5b45793ab6a3084a
gx_tieta/WebRoot/iframe/set-match-group.html
@@ -36,7 +36,14 @@
                        <div class="layui-input-inline">
                           <div class="layui-form" lay-filter="cityFilter">
                              <select name="city" id="city" lay-filter="city">
                                 <option value="">请选择市/区</option>
                                 <option value="">请选择市</option>
                              </select>
                           </div>
                        </div>
                        <div class="layui-input-inline">
                           <div class="layui-form" lay-filter="countyFilter">
                              <select name="county" id="county" lay-filter="county">
                                 <option value="">请选择区/县</option>
                              </select>
                           </div>
                        </div>
@@ -71,9 +78,7 @@
   <script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
   <script type="text/javascript" src="../jqueryui/jquery-ui.min.js"></script>
   <script type="text/javascript" src="../src/layui.js"></script>
   <script type="text/javascript" src="../src/layui.js"></script>
   <script type="text/javascript" src="../pages/js/mylayui.js"></script>
   <script type="text/javascript" src="../js/base.js"></script>
   <script type="text/javascript">
      layui.use(['layer', 'table', 'form', 'laytpl', 'element'],function() {
         var layer = layui.layer    // 获取layer模块
@@ -154,6 +159,7 @@
            var obj = {};
            obj.StationName1 = '';
            obj.StationName2 = '';
            obj.StationName5 = '';
            obj.StationName3 = '';
            obj.BattGroupName = '';
            obj.BattGroupId = data.BattGroupId;
@@ -162,6 +168,7 @@
         
         // 构造生成表格数据的方法
         function formaterTblData(data) {
            //console.log(data);
            var rs = [];   // 结果集
            
            // 遍历查询的结果根据查询结果生成指定的格式
@@ -177,8 +184,11 @@
               // 不显示内容
               obj.num = _data.MonNum;                     // 单体编号不加#
               obj.battgroupid = _data.BattGroupId;         // 电池组id
               obj.stationid = _data.StationId;            // 机房id
               rs.push(obj);
               obj.stationid = _data.StationId;            // 机房id
               // 判断当前位置的单体是否为空白()
               if(_data.num || _data.num == undefined) {
                  rs.push(obj);
               }
            }
            
            return rs;   // 返回结果集
@@ -251,7 +261,7 @@
            obj.old_battproducer = oData.brandname;      // 单体的品牌
            obj.old_stationid = oData.stationid;      // 机房id
            obj.old_battgroupid = oData.battgroupid;   // 电池组id
            obj.old_monnum = oData.num;               // 单体编号
            obj.old_monum = oData.num;               // 单体编号
            
            // 被配组单体的信息
            obj.new_stationname = nData.stationname;   // 机房名称
@@ -259,7 +269,7 @@
            obj.new_battproducer = nData.brandname;      // 单体的品牌
            obj.new_stationid = nData.stationid;      // 机房id
            obj.new_battgroupid = nData.battgroupid;   // 电池组id
            obj.new_monnum = nData.num;               // 单体编号
            obj.new_monum = nData.num;               // 单体编号
            
            // 公共信息
            obj.rebuild_time = nowTime;
@@ -270,6 +280,7 @@
         }
         
         // 查询省下拉框
         var filterLoad = layer.load();
         searchProvince();
         // 查询省
         function searchProvince() {
@@ -310,11 +321,11 @@
         // 切换省-市
         form.on('select(province)', function(data) {
            // 查询市
            searchCity();
            searchCity(true);
         });
         
         // 查询市
         function searchCity() {
         function searchCity(isLoad) {
            // 构造查询条件
            var tmp = {
               StationName1: $("#province").val()
@@ -347,25 +358,82 @@
                  createLayuiSelect(ele, list);
                  form.render('select', 'cityFilter');
                  
                  // 查询区/县
                  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);
                  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);
                        list.push(_tmp);
                     }
                  }else {
                     list.push(getLayuiSelect('暂无区/县', '', {}, undefined));
                  }
                  // 根据对象数组生成下拉列表
                  createLayuiSelect(ele, list);
                  form.render('select', 'countyFilter');
                  // 查询机房
                  searchHome();
               }
            });
         }
         
         // 切换市-机房
         // 切换市-区/县
         form.on('select(city)', function(data) {
            // 查询区/县
            searchCounty(true);
         });
         // 切换区/县-机房
         form.on('select(county)', function(data) {
            // 查询机房
            searchHome();
            searchHome(true);
         });
         
         // 查询机房
         function searchHome() {
         function searchHome(isLoad) {
            // 构造查询条件
            var tmp = {
               StationName1:$("#province").val(),
               StationName2:$("#city").val()
               StationName2:$("#city").val(),
               StationName5:$("#county").val()
            };
            // 是否添加等待
            if(isLoad) {
               filterLoad = layer.load();
            }
            // 根据构造条件查询内容
            $.ajax({
               type: 'post',
@@ -410,18 +478,23 @@
         // 切换机房-电池组
         form.on('select(home)', function(data) {
            // 查询电池组
            searchGroup();
            searchGroup(true);
         });
         
         // 查询机房
         function searchGroup() {
         function searchGroup(isLoad) {
            // 构造查询条件
            var tmp = {
               StationName1:$("#province").val(),
               StationName2:$("#city").val(),
               StationName5:$("#county").val(),
               StationName: $("#home").val(),
               StationId: $("#home").find('option:selected').attr('stationid')
            };
            // 是否添加等待
            if(isLoad) {
               filterLoad = layer.load();
            }
            // 根据构造条件查询内容
            $.ajax({
               type: 'post',
@@ -456,6 +529,7 @@
                     list.push(getLayuiSelect('暂无机房', '', {}, undefined));
                  }
                  
                  layer.close(filterLoad);
                  // 根据对象数组生成下拉列表
                  createLayuiSelect(ele, list);
                  form.render('select', 'groupFilter');