未审批可更改

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-18 2fe250ece8de95b3f70172fe5b45793ab6a3084a

 gx_tieta/WebRoot/iframe/batt-info-add.html

@@ -404,8 +404,9 @@


            var battInfoTpl = $('#battInfoTpl').html();

         var editInfo = parent.$('#iframeEdit').data('data');

         var editPopupShow = parent.$('#iframeShowEidt');

         var monCapStds = [50, 100, 150, 200, 250, 300, 350, 400, 450, 500, 1000];

         var battProducers = ['圣阳', '理士', '银泰', '南都', '双登', 'SENRY', '艾默生', '科士达', '丰日', '中兴能派', '光宇', '郎达', '艾诺斯华达', '雄韬', '风帆', '文隆', '中山'];

         var battProducers = getBattProducers();

         var monNums = [4, 24]

         

         // 添加完成后提示信息的模板

@@ -542,30 +543,80 @@
            

            // 提交内容

            form.on('submit(enAdd)', function(data) {

               //console.log(data);

               layer.confirm('是否确认添加', {icon: 3, title:'提示'}, function(index){

                   var _data = data.field;

                   var province = _data.StationName1;      // 省

                   var city = _data.StationName2;         // 市

                   var home = _data.StationName3;         // 机房名称

                   var bts = _data.StationName4;         // 设备名称

                   _data.StationName = province+'-'+city+'-'+home+'-'+bts;

            		 
                   var temp = analysisData(editInfo.addGroupNum, _data);

            		 
                   checkDevId(_data.FBSDeviceId, function(devid){

                      // 添加电池信息

                      addBatt(temp);

                   }, function(pre, max) {

                      layer.msg('设备ID:'+pre+'被占用,推荐使用'+max);

                      // 更新设备id和设备ip

                      $('#devid').val(max);

                      $('#fbsip').val(getDevIp(max));

                   });

               // 校验机房名称

               checkHomeName(data, function() {

                  //console.log(data);

                  layer.confirm('是否确认添加', {icon: 3, title:'提示'}, function(index){

                      var _data = data.field;

                      var province = _data.StationName1;      // 省

                      var city = _data.StationName2;         // 市

                      var home = _data.StationName3;         // 机房名称

                      var bts = _data.StationName4;         // 设备名称

                      _data.StationName = province+'-'+city+'-'+home+'-'+bts;

	            		 
                      var temp = analysisData(editInfo.addGroupNum, _data);

	            		 
                      checkDevId(_data.FBSDeviceId, function(devid){

                         // 添加电池信息

                         addBatt(temp);

                      }, function(pre, max) {

                         layer.msg('设备ID:'+pre+'被占用,推荐使用'+max);

                         // 更新设备id和设备ip

                         $('#devid').val(max);

                         $('#fbsip').val(getDevIp(max));

                      });

                  });

               });

            	
               return false;

            });

            

            // 检测机房名称是否相同

            function checkHomeName(data, callback) {

               var _data = data.field;

              var province = _data.StationName1;      // 省

              var city = _data.StationName2;         // 市

              var home = _data.StationName3;         // 机房名称

              var bts = _data.StationName4;         // 设备名称

              _data.StationName = province+'-'+city+'-'+home+'-'+bts;

              // 构造查询条件

              var tmp = {

                 StationName: _data.StationName

              };

              var loading = layer.load(1);

              // 请求后台验证

              $.ajax({

                 type: 'post'

                 ,async: true

                 ,url: 'BattInfAction!judgeBatt'

                 ,data: 'json='+JSON.stringify(tmp)

                 ,dataType: 'json'

                 ,success: function(res) {

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

                    //console.log(rs);

                    if(rs.code == 1) {

                       // 机房已存在判断是否进入编辑机房

                       layer.confirm('该机房已存在，是否进入编辑！',{icon:0, title: '提示'}, function(index) {

                          // 显示编辑面板

                          editPopupShow.data('sName', _data.StationName);

                          editPopupShow.click();

                          // 关闭添加面板面板

                          parent.$('#iframeClose').click();

                       });

                    }else {

                       callback();

                    }

                 }

                 ,error: function() {

                    layer.msg('校验机房名称失败，请重新提交！');

                 }

                 ,complete: function() {

                    layer.close(loading);

                 }

              });

        		
            }

            
            // 监测当前提交的设备ID是否为最大

            function checkDevId(devid, success, error) {

               var load = layer.load(1);