修改内容

hdw

2018-11-12 c426db921a97e78ad9e741301bdd346b7aba6f11

 gx_tieta/WebRoot/control.jsp

@@ -25,6 +25,7 @@
   <link rel="stylesheet" type="text/css" href="css/whyc-ui.css">

   <link rel="stylesheet" type="text/css" href="css/confirm.css">

   <link rel="stylesheet" type="text/css" href="src/css/layui.css">

   <!-- <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css"> -->

   <script type="text/javascript" src="js/echarts.js"></script>

   <script type="text/javascript" src="js/jquery-1.8.3.js"></script>

   <script type="text/javascript" src="js/base.js"></script>

@@ -244,7 +245,12 @@
                        <br>

                        <a href="javascript:void(0);" id="sysSet" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">

                           <span class="whyc-btn-icon fa fa-gear"></span>

                           <span class="whyc-btn-txt">设置系统参数</span>

                           <span class="whyc-btn-txt">系统参数</span>

                        </a>

                        <br>

                        <a href="javascript:void(0);" id="signalBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">

                           <span class="whyc-btn-icon fa fa-signal"></span>

                           <span class="whyc-btn-txt">信号质量</span>

                        </a>

                       </div>

                  </div>

@@ -954,6 +960,10 @@
      <div class="popup-title"><span>系统参数设置</span> <a href="javascript:;" class="close">X</a></div>

      <div class="popup-content">

         <div class="popup-tbl">

            <input type="hidden" id="sysSet_ip" value="">      <!-- IP地址 -->

            <input type="hidden" id="sysSet_subnet" value="">    <!-- 子网掩码 -->

            <input type="hidden" id="sysSet_netgate" value="">    <!-- 网关地址 -->

            <input type="hidden" id="sysSet_mac" value="">    <!-- 物理地址 -->

            <table>

               <tbody>

                  <tr>

@@ -965,40 +975,24 @@
                     <td><input type="text" id="sysSet_stationName" readonly="readonly" value=""></td>

                  </tr>

                  <tr>

                     <th>IP地址</th>

                     <th>子网掩码</th>

                  </tr>

                  <tr>

                     <td><input type="text" id="sysSet_ip" readonly="readonly" value=""></td>

                     <td><input type="text" id="sysSet_subnet" readonly="readonly" value=""></td>

                  </tr>

                  <tr>

                     <th>网关地址</th>

                     <th>物理地址</th>

                  </tr>

                  <tr>

                     <td><input type="text" id="sysSet_netgate" readonly="readonly" value=""></td>

                     <td><input type="text" id="sysSet_mac" readonly="readonly" value=""></td>

                  </tr>

                  <tr>

                     <th>总续航时间</th>

                     <th>保一次下电续航时间</th>

                     <th>总续航时间（0~9999分钟）</th>

                     <th>保一次下电续航时间（0~9999分钟）</th>

                  </tr>

                  <tr>

                     <td><input type="text" id="sysSet_endur" value=""></td>

                     <td><input type="text" id="sysSet_firTime" value=""></td>

                  </tr>

                  <tr>

                     <th>电流钳量程</th>

                     <th>一次下电电压(V)</th>

                     <th>电流钳量程（10~9999A）</th>

                     <th>一次下电电压（35.0~65.0V）</th>

                  </tr>

                  <tr>

                     <td><input type="text" id="sysSet_range" value=""></td>

                     <td><input type="text" id="sysSet_firVol" value=""></td>

                  </tr>

                  <tr>

                     <th>二次下电电压(V)</th>

                     <th>DCDC模块数量</th>

                     <th>二次下电电压（35.0~65.0V）</th>

                     <th>DCDC模块数量（1~10）</th>

                  </tr>

                  <tr>

                     <td><input type="text" id="sysSet_secVol" value=""></td>

@@ -1006,27 +1000,38 @@
                  </tr>

                  <tr>

                     <th>单体数据来源类型</th>

                     <th>停电升压榨干电池数量</th>

                     <th>停电升压榨干电池数量（0~2）</th>

                  </tr>

                  <tr>

                     <td><input type="text" id="sysSet_sourceStyle" value=""></td>

                     <td>

                        <select id="sysSet_sourceStyle">

                           <option value="0">从汇集器获取</option>

                           <option value="1">从一拖24获取</option>

                        </select>

                     </td>

                     <td><input type="text" id="sysSet_bleedNum" value=""></td>

                  </tr>

                  <tr>

                     <th>停电升压榨干电池端电压终止电压下限(V)</th>

                     <th>停电升压榨干电池端电压启动电压下限(V)</th>

                     <th>停电升压榨干电池端电压终止电压下限（35.0~65.0V）</th>

                     <th>停电升压榨干电池端电压启动电压下限（35.0~65.0V）</th>

                  </tr>

                  <tr>

                     <td><input type="text" id="sysSet_stopLimit" value=""></td>

                     <td><input type="text" id="sysSet_startLimit" value=""></td>

                  </tr>

                  <tr>

                     <th>电池合路器主电池组编号</th>

                     <th>背光时长</th>

                     <th>电池合路器主电池组编号（1~2）</th>

                     <th>背光时长（0~999分钟）</th>

                  </tr>

                  <tr>

                     <td><input type="text" id="sysSet_groupNum" value=""></td>

                     <td><input type="text" id="sysSet_backLightTime" value=""></td>

                  </tr>

                  <tr>

                     <th>停电充电电流（0~50A）</th>

                  </tr>

                  <tr>

                     <td><input type="text" id="sysSet_powerBreakChargeCurr" value=""></td>

                  </tr>

               </tbody>

            </table>

@@ -1035,7 +1040,7 @@
      <div class="popup-footer">

         <input type="button" name="" id="sysSet_restart" value="重启设备" >

         <input type="button" name="" id="sysSet_read" value="读取" >                     

         <input type="button" name="" id="sysSet_en" class="status-change-set" value="设置" >

         <input type="button" name="" id="sysSet_en" class="status-change-set " value="设置" >

      </div>

   </div>

   

@@ -1125,6 +1130,8 @@
   <!-- 整体的遮罩层 -->

   <div id="allShade"></div>

   <div class="clear"></div>

   <!-- 引入layui框架 -->

   <script type="text/javascript" src="src/layui.all.js"></script>

   <script type="text/javascript" src="pages/js/common.js"></script>

   <script type="text/javascript" src="js/jquery.bigcolorpicker.min.js"></script>

   <script type="text/javascript" src="jqueryui/jquery-ui.js"></script>

@@ -1141,13 +1148,12 @@
   <script type="text/javascript" src="js/dischargetest/9611.js"></script>

   <script type="text/javascript" src="js/dischargetest/bts.js"></script>

   <script type="text/javascript" src="js/dischargetest/4016.js"></script>

   <script type="text/javascript" src="js/dischargetest/sysData.js"></script>

   <script type="text/javascript" src="pages/js/pages/control-common.js"></script>

   <script type="text/javascript" src="pages/js/pages/siderbar.js"></script>

   <!-- 引入电路图 -->

   <script type="text/javascript" src="js/elecircle.js"></script>

   <script type="text/javascript" src="js/elecircle.content.js"></script>

   <!-- 引入layui框架 -->

   <script type="text/javascript" src="src/layui.all.js"></script>

   <script type="text/javascript">

   var permits;

   <%   Object obj=session.getAttribute("permits");

@@ -3024,7 +3030,8 @@
            var city = batt.StationName2;

            var county = batt.StationName5;

            var home = batt.StationName;

            $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home);

            var homeid = batt.BattGroupId;

            $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);

         });

      });

   

@@ -3123,9 +3130,7 @@
   function targetBattReport(){

      var batt = getBatt();      

      var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);

      //console.info(url);

      window.open(url);

      //window.open("eleAnalyse.jsp?battgroupId="+BattGroupId+"&stationId="+batt.StationId);

   }

   // 使用jquery实现左导航的显示和隐藏

   $(document).ready(function(){

@@ -4327,7 +4332,7 @@
               // 负载电流

               var loadCurr = batt.Load_curr+'A';

               changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'最大负载电流：'+loadCurr});

					
               changeEleCircleOpt(eleCircle, 'signal', {isShow:false});

               // 最大核容电流

               var disCurrMax = batt.DisCurrMax+'A';

               changeEleCircleOpt(eleCircle, 'disCurrMax', {name:'最大核容电流：'+disCurrMax});

@@ -4508,8 +4513,11 @@
         

         // 设置

         $('#sysSet_en').click(function() {

            // 判断当前按钮是否可以点击

            if($(this).hasClass('whyc-btn-disabled')) {

               return;

            }

            var tmp = getSysSetData();

				
            updateSysData(tmp);

         });

         

@@ -4544,6 +4552,8 @@
         function searchSysData(temp, showSU) {

            // 开启等待框

            var load = layer.load(1);

            // 设置按钮无法可点.whyc-btn-disabled

            $('#sysSet_en').addClass('whyc-btn-disabled');

            // 请求后台

            $.ajax({

                  type: "post",

@@ -4557,6 +4567,10 @@
                      if(rs.code == 1){

                         var data = rs.data[0];

                         setSysSetData(data);

                         // 移除不可点击状态

                         initSysDataPopup();

                         $('#sysSet_en').removeClass('whyc-btn-disabled');

                         sysSet_popup.showPopup();

                         if(showSU) {

                            noContent.showNoContent('读取成功', true);

                         }

@@ -4587,7 +4601,7 @@
                  data: "json = " + JSON.stringify(temp),

                  success: function(result) {

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

                      console.info(rs);

                      //console.info(rs);

                      if(rs.code == 1){

                         noContent.showNoContent('更新成功', true);

                      }else{

@@ -4654,13 +4668,12 @@
            $('#sysSet_secVol').val(data.MonomerOrder);         // 二次下电电压

            $('#sysSet_dcdc').val(data.LoaderCount);         // DCDC模块数量

            $('#sysSet_sourceStyle').val(data.DtCardCount);      // 单体数据来源类型

            $('#sysSet_bleedNum').val(data.PowerBreakChargeCurr);      // 停电升压榨干电池数量

            $('#sysSet_bleedNum').val(data.POF_BG_Boost_Cnt);      // 停电升压榨干电池数量

            $('#sysSet_stopLimit').val(data.POF_BG_Boost_VolStop);      // 停电升压榨干电池端电压终止电压下限

            $('#sysSet_startLimit').val(data.POF_BG_Boost_VolStart);      // 停电升压榨干电池端电压启动电压下限

            $('#sysSet_groupNum').val(data.MajorBattGroupNum);   // 电池合路器主电池组编号

            $('#sysSet_backLightTime').val(data.BackLightTime);               // 背光时间

				
            sysSet_popup.showPopup();

            $('#sysSet_powerBreakChargeCurr').val(data.PowerBreakChargeCurr);   //  停电充电电流

         }

         

         // 获取面板信息的值

@@ -4683,7 +4696,7 @@
            var startLimit = $('#sysSet_startLimit').val();         // 停电升压榨干电池端电压启动电压下限

            var groupNum = $('#sysSet_groupNum').val();            // 电池合路器主电池组编号

            var backLightTime = $('#sysSet_backLightTime').val();               // 背光时间

				
            var powerBreakChargeCurr = $('#sysSet_powerBreakChargeCurr').val();   //  停电充电电流

            

            var rs = {

               dev_id: dev_id,

@@ -4698,13 +4711,74 @@
               MonomerOrder: secVol,

               LoaderCount: dcdc,

               DtCardCount: sourceStyle,

               PowerBreakChargeCurr:bleedNum,

               POF_BG_Boost_Cnt:bleedNum,

               POF_BG_Boost_VolStop:stopLimit,

               POF_BG_Boost_VolStart:startLimit,

               MajorBattGroupNum:groupNum,

               BackLightTime:backLightTime,

               PowerBreakChargeCurr: powerBreakChargeCurr,

               num: sysCMD.set

            };

				
            return rs;

         }

			
         // 查询信号质量模块

         var gprs = GLOBAL.CMD.gprs;

         var signalSearch = {

            num: gprs.param,

            AT_cmd: gprs.signal,

            dev_id: ''

         };

         // 点击查看当前信号的质量

         $('#signalBtn').click(function() {

            var batt = getBatt();

            signalSearch.dev_id = batt.FBSDeviceId;

            var load = layer.load(1);

            // 请求后台获取信号的质量

            searchStationSignal(signalSearch,function(data){

               layer.close(load);

               // 基础配置

               var signalOpts = {

                  img: signalBad,

                  isShow: true,

                  startX: 10,

                  startY: 30,

                  name: ''

               };

               var signalInfo = formatSignal(""); 
               if(data.code == 1) {

                  var csq = data.data.ack_inf;

                  signalInfo = formatSignal(csq);

               }

               // 显示图片类型

               if(signalInfo.img) {

                  signalOpts.img = signalGood;

               }

					
               // 图片描述

               signalOpts.name = '信号强度：'+signalInfo.signal;

               changeEleCircleOpt(eleCircle, 'signal', signalOpts);

            });

				
         });

			
         // 解析信号质量结果

         function formatSignal(signal) {

            var rs = {

               signal: '未知',

               bitError: '未知',

               img: 0

            };

            var ptn = new RegExp(".*:\\s(\\d{2}),(\\d{2})");

            var testCsq = ptn.test(signal);

            if(testCsq) {

               rs.signal = RegExp.$1;

               rs.bitError = RegExp.$2;

               if(rs.signal>20) {

                  rs.img = 1;

               }

            }

            

            return rs;

         }

@@ -4727,6 +4801,29 @@
            tabContents.eq(index).addClass('con-show');

         });

      });

		
      var gprs = GLOBAL.CMD.gprs;

		
      var temp = {

         num: gprs.param,

         AT_cmd: gprs.signal,

         dev_id:910000577

      };

		
		
		
      /* searchStationSignal(temp,function(data){

         changeEleCircleOpt(eleCircle, 'signal', {

            img: signalBad,

            isShow: true,

         });

         var csq = data.data.ack_inf;

         var ptn = new RegExp(".*:\\s(\\d{2}),(\\d{2})");

         var testCsq = ptn.test(csq);

         console.log(RegExp.$1);

         console.log(RegExp.$2);

         console.log(data.data.ack_inf);

      }); */

   </script>

   <script type="text/javascript" src="js/Title.js"></script>

   <script type="text/javascript" src="js/control.js"></script>