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

Administrator

2018-11-21 c02e430f16cb51cabb6f4b24f99ec48efc7b0596

 gx_tieta/WebRoot/index.jsp

@@ -121,7 +121,7 @@
                  <div class="map-info-detail">

                     <div class="layui-collapse" lay-filter="test" lay-accordion="">

                        <div class="layui-colla-item">

                           <h2 class="layui-colla-title">定位机房</h2>

                           <h2 class="layui-colla-title">搜索机房</h2>

                           <div class="layui-colla-content layui-show">

                              <table>

                                 <tbody>

@@ -216,12 +216,12 @@
                  <i class="fa fa-cog"></i>

               </a>

            </div>

            <!--电池故障修复图-->

            <div class="repair-pie module"></div>

            <!-- 电池故障饼状图 -->

            <div class="brdn-pie module"></div>

            <!-- 电池告警饼状图 -->

            <div class="warn-pie module"></div>

            <!--电池故障修复图-->

            <div class="repair-pie module"></div>

            <!--电池健康饼状图-->

            <div class="health-pie module"></div>

            <!--清除浮动-->

@@ -387,6 +387,7 @@
      </div>

   </div>

   <input type="hidden" id="user_logo" value="<%=user_logo  %>">

   <div id="homeInfoIframeData"></div>

   <!--清除浮动-->

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

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

@@ -401,6 +402,8 @@
   <script type="text/javascript" src="js/myConfirm.js"></script>

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

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

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

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

   <script type="text/javascript">

   var permits;

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

@@ -718,7 +721,7 @@
                  }

               },

               {

                  text: '恢复正常',

                  text: '退出全屏显示',

                  callback: function(e) {

                     // console.info(e);

                     smallMap();

@@ -953,6 +956,8 @@
                        Almarr.push(/*{

                        name:"<s:text name='Capacity'/><s:text name='Alarm'/><s:text name='Alarm'/>",val:parseInt(data.BattGroupId)         // 容量告警告警                            

                        } ,*/{

                           name:"<s:text name='On-line_voltage'/>",val:parseInt(data.Record_Id),            // 在线电压 
                        },{

                           name:"<s:text name='Group_voltage'/>",val:parseInt(data.MonNum),               // 组端电压 

                        },{

                           name:"<s:text name='Charging_current'/>",val:parseInt(data.alm_id),               // 充电电流 

@@ -1076,7 +1081,8 @@
      }

      $.ajax({    

             type: "post",             

           url: "BattPower_offAction!serchPowerOff",				
           //url: "BattPower_offAction!serchPowerOff",		
           url: "Bts_station_stateAction_action_serchPowerOff",	
           async:true,            

           dataType:'text',

           data:null,      

@@ -1098,7 +1104,7 @@
                 powercut_isNew = false;

                 createPie(repairPie,repairTle,repairObj);

                 repairPie.on('click', function() {

                  window.open('powercut.jsp?power_state=0');

                  window.open('batt-state-manage.jsp?power_state=0');

               });

              }else{

                 var opt = getOpt(repairTle, repairObj);

@@ -2466,11 +2472,13 @@
               var content = '<div style="padding:6px;"><span>蓄电池组告警数目：</span>'+data.code+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">详情>></a></div>'+

                     '<div style="padding:6px;"><span>蓄电池组落后数目：</span>'+data.sum+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">详情>></a></div>'+

                     '<div style="padding:6px;"><span>蓄电池组延时数目：</span>'+data.newsum+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">详情>></a></div>'+

                     '<div style="padding:6px"><a href="javascript:loadToRealTime();">实时数据</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">历史数据</a></div>'+

                     '<div style="padding:6px"><a href="javascript:loadToRealTime();">实时数据</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">历史数据</a>'+

                     '<a style="margin-left: 20px" href="javascript:showHomeInfo('+data.data.StationId+');">基站信息</a></div>'+

                     '<div style="padding:6px;"><span>地址：</span>'+data.data.Address+'</div>'+

                     '<input type="hidden" class="ipt-hide home" value="'+data.data.StationName+'">'+

                     '<input type="hidden" class="ipt-hide province" value="'+data.data.stationName1+'">'+

                     '<input type="hidden" class="ipt-hide county" value="'+data.data.stationName5+'">'+                     

                     '<input type="hidden" class="ipt-hide sid" value="'+data.data.StationId+'">'+

                     '<input type="hidden" class="ipt-hide city" value="'+data.data.stationName2+'">';

               

               var list = {