hdw
2018-11-28 af4137cbcd23ec8b0e94ddb9504e5c1eebaceee6
gx_tieta/WebRoot/control.jsp
@@ -1087,47 +1087,47 @@
                     <td><input type="text" id="battInfo_home_name" readonly="readonly" value=""></td>
                  </tr>
                  <tr>
                     <th>电池标称容量(AH)</th>
                     <th>电池标称内阻(uΩ)</th>
                     <th>电池标称容量(1~6000.0AH)</th>
                     <th>电池标称内阻(1~60000uΩ)</th>
                  </tr>
                  <tr>
                     <td><input type="text" id="battInfo_nom_cap" value=""></td>
                     <td><input type="text" id="battInfo_nom_res" value=""></td>
                  </tr>
                  <tr>
                     <th>电池组数</th>
                     <th>每组电池单体数量</th>
                     <th>电池组数(1~2)</th>
                     <th>每组电池单体数量(1~300 )</th>
                  </tr>
                  <tr>
                     <td><input type="text" id="battInfo_batt_num" value=""></td>
                     <td><input type="text" id="battInfo_batt_mon_num" value=""></td>
                  </tr>
                  <tr>
                     <th>单体标称电压(V)</th>
                     <th>电池组端标称电压(V)</th>
                     <th>单体标称电压(0.1~20.0V)</th>
                     <th>电池组端标称电压(0.1~600.0V)</th>
                  </tr>
                  <tr>
                     <td><input type="text" id="battInfo_batt_nom_vol" value=""></td>
                     <td><input type="text" id="battInfo_group_nom_vol" value=""></td>
                  </tr>
                  <tr>
                     <th>电池标称温度(℃)</th>
                     <th>电池浮充电压阀值(V)</th>
                     <th>电池标称温度(0.1~60.0℃)</th>
                     <th>电池浮充电压阀值(0.1~60.0V)</th>
                  </tr>
                  <tr>
                     <td><input type="text" id="battInfo_batt_nom_temp" value=""></td>
                     <td><input type="text" id="battInfo_batt_float_vol" value=""></td>
                  </tr>
                  <tr>
                     <th>电池浮充电流阀值(A)</th>
                     <th>在线电压低阀值(V)</th>
                     <th>电池浮充电流阀值(0.1~30.0A)</th>
                     <th>在线电压低阀值(0.1~60.0V)</th>
                  </tr>
                  <tr>
                     <td><input type="text" id="battInfo_batt_float_curr" value=""></td>
                     <td><input type="text" id="battInfo_online_low_vol" value=""></td>
                  </tr>
                  <tr>
                     <th>电池组连接类型</th>
                     <th>电池组连接类型(0~1)</th>
                  </tr>
                  <tr>
                     <td><input type="text" id="battInfo_batt_link_type" value=""></td>
@@ -1138,7 +1138,7 @@
      </div>
      <div class="popup-footer">
         <input type="button" name="" id="battInfo_read" value="读取" >                     
         <input type="button" name="" id="battInfo_en" class="status-change-set " value="设置" >
         <input type="button" name="" id="battInfo_en" class="status-change-set whyc-btn-disabled" value="设置" >
      </div>
   </div>
   
@@ -5151,9 +5151,10 @@
         // 电池参数
         var battCMD = GLOBAL.CMD.batt;   // cmd命令
         var battPopup = GLOBAL.battInfoPopup; // 电池参数模块
         battPopup.testVal();   // 设置面板的取值范围
         $('#battInfoBtn').click(function() {
            // 获取电池信息
            var batt = getBatt();
            // console.log(batt);
            var temp = {
               dev_id: batt.FBSDeviceId
            };
@@ -5162,13 +5163,16 @@
            var load = layer.load(1);
            battPopup.search(temp, batt, function(res, binf) {
               layer.close(load);
               // console.log(res);
               battInfo_popup.showPopup();   // 显示battInfo_popup弹出框和遮罩层
            });
            battInfo_popup.showPopup();   // 显示battInfo_popup弹出框和遮罩层
         });
         
         // 点击设定
         $('#battInfo_en').click(function() {
            if($(this).hasClass('whyc-btn-disabled')) {
               return;
            }
            // 设置电池参数面板信息
            var load = layer.load(1);
            battPopup.set(function(res) {
@@ -5179,11 +5183,24 @@
         
         // 点击读取
         $('#battInfo_read').click(function() {
            var batt = getBatt();
            var temp = {
               dev_id: batt.FBSDeviceId
            };
            // 设置电池参数面板信息
            var load = layer.load(1);
            battPopup.read(function(res) {
               layer.close(load);
               layer.msg('获取参数成功');
               // console.log(res);
               if(res.code == 1) {
                  battPopup.search(temp, batt, function(res, binf) {
                     layer.close(load);
                     layer.msg('获取参数成功');
                  });
               }else {
                  layer.msg('获取参数失败');
               }
            });
         });
         
@@ -5199,7 +5216,7 @@
               ,dataType: 'json'
               ,success: function(res) {
                  var rs = JSON.parse(res.result);
                  console.log(rs);
                  //console.log(rs);
               }
               ,complete: function() {
                  layer.close(load);