Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git...

81041

2018-11-12 43fe18b40a84b82ca5c5f1a88abb89ea168f95f5

 gx_tieta/WebRoot/control.jsp

@@ -235,7 +235,7 @@
                       <div class="tools-btn">

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

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

                           <span class="whyc-btn-txt">启动核容测试</span>

                           <span class="whyc-btn-txt">核容测试</span>

                        </a>

                        <br>

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

@@ -1130,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>

@@ -1152,8 +1154,6 @@
   <!-- 引入电路图 -->

   <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");

@@ -1780,6 +1780,7 @@
               var model = eval("("+data.result+")");

               //console.log(model);

               

					
               var outTime = 2*60;            //设备超时时间(2分钟)

               var isOutTime = true;         //通讯中断      判断设备是否通讯中断    true:中断    false:正常

               var batt = getBatt();         //获取当前选中的电池组

@@ -1794,6 +1795,14 @@
               //console.log(mygraph);

               //debugger;

               if(model.code == 1) {

                  var _data = model.data[0];					
						
                  var alarmstates = GLOBAL.BTS9100.alarmstates;

                  var lastStopReason = getStateFromIndex(_data.dev_last_captest_stop_type,alarmstates);

                  console.info("上一次核容测试停止原因："+lastStopReason);

                  console.info("通信计数："+_data.dev_commcount);

                  console.info("通信丢包率："+(_data.dev_commcount==0?0:(_data.dev_errcommcount*100/_data.dev_commcount)));						
						
                  var nowTime = new Date().getTime();      //当前时间

                  var record = new Date(model.data[0].record_datetime).getTime();

                  

@@ -3030,7 +3039,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);

         });

      });

   

@@ -3129,9 +3139,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(){

@@ -4735,8 +4743,10 @@
         $('#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,

@@ -4809,7 +4819,14 @@
         dev_id:910000577

      };

      

		
      //根据索引获取状态

      function getStateFromIndex(index,statearr){

         var state = '无';

         if(index>0 && statearr && statearr.length>index){

            state = statearr[index];

         }

         return state;

      }

      

      /* searchStationSignal(temp,function(data){

         changeEleCircleOpt(eleCircle, 'signal', {