D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore
2019-01-18 2fe250ece8de95b3f70172fe5b45793ab6a3084a
gx_tieta/WebRoot/dischargetest.jsp
@@ -67,6 +67,19 @@
         outline: none !important;
         border: 1px solid #FF0000 !important;
      }
      .page-link {
         cursor: pointer;
      }
      .page-link:hover {
         color: #1495E7;
      }
      .page-link:active {
         color: #FF0000;
      }
      i.fa.f-size16 {
         font-size: 16px;
         vertical-align: middle;
      }
   </style>
  </head> 
  <body>
@@ -209,7 +222,7 @@
                  </tr>
                  <tr>
                     <th><s:text name="Booster"/><s:text name="Upper_limit"/><!-- 升压上限 -->(V)</th>
                     <th><s:text name="Charging_current"/><!-- 充电电流 -->(A)</th>
                     <th id="ChargeCurrSetLabel"><s:text name="Charging_current"/><!-- 充电电流 -->(<span class="val-range"></span>A)<i class="fa fa-edit page-link f-size16" title="修改充电电流范围"></i></th>
                  </tr>
                  <tr>
                     <td><input id="DCVolHighLimit" type="text" value="0"><i class="fa fa-frown-o error-img" title="数据格式错误"></i></td>
@@ -732,46 +745,160 @@
               };   // 充电电流
               
               $('.popup.fbs9100 .popup-tbl td i').removeClass('error-data');
               $('.popup.fbs9100 .popup-tbl input[type=text]').removeClass('error-data');
            }
         });
      })(jQuery);
      
      // 更改放电面板的值后
      $(function() {
         $('.popup.fbs9100 .popup-tbl td i').tooltip();
         // 监测面板中的input改变触发$.checkTestInfor()事件
         $('.popup.fbs9100 .popup-tbl').on('input propertychange', 'input', function() {
         // 放电电流
         $('#discurr').testVal({
            pattern: /^[0-9]+(\.[0-9]*)?$/,
            regVal: true,
            min: 0,
            max: 1000,
            msg: '取值范围0~1000A'
         });
         // 放电小时率
         $('#hourrate').testVal({
            pattern: /^[0-9]+$/,
            regVal: false,
            msg: '输入的数据格式不正确'
         });
         // 放电电容
         $('#discap').testVal({
            pattern: /^[0-9]+$/,
            regVal: true,
            min: 0,
            max: 90000,
            msg: '取值范围0~90000AH'
         });
         // 放电时长
         $('#distime').testVal({
            pattern: /^[0-9]+$/,
            regVal: true,
            min: 0,
            max: 5940,
            msg: '取值范围0~5940分钟'
         });
         // 单体下限阀值
         $('#MonomerVol_low').testVal({
            pattern: /^[0-9]+(\.[0-9]*)?$/,
            regVal: true,
            min: 0,
            max: 20,
            msg: '取值范围0~20V'
         });
         // 组端下限阀值GroupVol_low
         $('#GroupVol_low').testVal({
            pattern: /^[0-9]+(\.[0-9]*)?$/,
            regVal: true,
            min: 0,
            max: 60,
            msg: '取值范围0~60V'
         });
         // 单体下限数量
         $('#MonomerlowCount').testVal({
            pattern: /^[0-9]+$/,
            regVal: false,
            msg: '输入的数据格式不正确'
         });
         // 升压上限
         $('#MonomerlowCount').testVal({
            pattern: /^[0-9]+(\.[0-9]*)?$/,
            regVal: false,
            msg: '输入的数据格式不正确'
         });
         // 充电电流
         $('#ChargeCurrSet').testVal({
            pattern: /^[0-9]+(\.[0-9]*)?$/,
            regVal: false,
            msg: '输入的数据格式不正确'
         });
         // 温度上限
         $('#TempUpHighLimit').testVal({
            pattern: /^[0-9]+$/,
            regVal: false,
            msg: '输入的数据格式不正确'
         });
         // bts面板充电电流编辑
         $('#ChargeCurrSetLabel .fa-edit').click(function() {
            var battGroupId = $('#battgroupname').find('option:selected').attr('battgroupid');
            //console.log(batt);
            // 设置面板
            layer.open({
               type: 1
               ,title: '设置充电电流阀值'
               , content: '<div style="width:300px; height: 50px;"><div style="margin-top: 20px;margin-left: 8px; margin-right: 8px;">'+
                        '<input type="text" style="width: 100%; height:32px; border: 1px solid #ccc;" id="setChargeCurrVal" value="">'+
                        '</div></div>'
               ,btn:['设置', '取消']
               ,yes: function(index) {
                  var chargeCurrVal = $('#setChargeCurrVal').val();
                  var num = Number(chargeCurrVal);
                  if(isNaN(num) || num==0) {
                     layer.msg('请输入数字');
                     return;
                  }
                  var tmp = {
                     charge_curr_max: num
                     ,BattGroupId: battGroupId
                  };
                  var load;
                  // 请求设置电流的后台
                  $.ajax({
                     type: 'post'
                     ,async: true
                     ,url: 'BattInfAction!update_charge'
                     ,data: 'json='+JSON.stringify(tmp)
                     ,dataType: 'json'
                     ,beforeSend: function(){
                        load = layer.load(1);
                     }
                     ,success: function(res) {
                        var rs = JSON.parse(res.result);
                        // 关闭等待框
                        layer.close(load);
                        //console.log(rs);
                        if(rs.code == 1) {
                           // 设置弹出框信息
                           layer.msg('设置成功!');
                           layer.close(index);
                           // 充电电流
                           $('#ChargeCurrSet').testVal('option', 'allOpts', {
                              regVal: true
                              ,update: true
                              ,min: 0
                              ,max: num
                              ,msg: '取值范围0~'+num+'A'
                           });
                           // 设置文本值
                           $('#ChargeCurrSetLabel .val-range').text('0~'+num);
                        }else {
                           layer.msg('设置失败!请重新设置');
                        }
                     }
                  });
               }
            });
         });
         $('.popup.fbs9100').on('input propertychange', 'input[type=text]', function() {
            $.checkTestInfor();
            var bool = $.regPositiveNum($(this).val());
            if(bool) {
               // 读取放电参数成功执行
               if($.disTestInfor.success) {
                  paramsBtn.ensure(true);
               }
               $(this).next('i').removeClass('error-data');
               $(this).myTooltip('hide');
            }else {
               paramsBtn.ensure(false);
               //var errorImg = $('<i class="fa fa-frown-o error-img"></i>');
               $(this).next('i').addClass('error-data');
               $(this).myTooltip({
                       position: 'top',
                       thing: 'show',
                       content: '<span style="color:#FF0000">数据格式错误(请输入正数)</span>'
                   });
            }
         });
         // 当文本框获取焦点时
         $('.popup.fbs9100 .popup-tbl').on('focus', 'input', function() {
            if($(this).next('i').hasClass('error-data')) {
               $(this).myTooltip('show');
            }
         });
         // 文本框失去焦点
         $('.popup.fbs9100 .popup-tbl').on('blur', 'input', function() {
            $(this).myTooltip('hide');
         });
         
         $('.popup.fbs9100').on('change', 'select', function() {
@@ -1128,6 +1255,17 @@
                  $('#DCVolHighLimit').val(list[i].fsparam.DCVolHighLimit);
                  $('#ChargeCurrSet').val(list[i].fsparam.ChargeCurrSet);
                  $('#TempUpHighLimit').val(list[i].fsparam.MonomerTmp_High);
                  // 充电电流
                  $('#ChargeCurrSet').testVal('option', 'allOpts', {
                     regVal: true,
                     min: 0,
                     max: list[0].binf.charge_curr_max,
                     msg: '取值范围0~'+list[0].binf.charge_curr_max+'A'
                  });
                  // 设置文本值
                  $('#ChargeCurrSetLabel .val-range').text('0~'+list[0].binf.charge_curr_max);
               }            
            }
         }