修改

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-21 35fefed0792c40cb99b8d15fa5811bbb5992bff9

 gx_tieta/WebRoot/index.jsp

@@ -94,6 +94,11 @@
       body .layui-layer-dialog {

          min-width:400px;

       }

       .add-panel .addr {

          width: 210px;

          height: 22px;

          border: 1px solid #ccc;

       }

   </style>

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

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

@@ -121,7 +126,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>

@@ -683,6 +688,7 @@
            //map.setMapStyle({style: 'grayscale'});   //  设置地图的风格

            // 添加地图类型控件

            map.addControl(new BMap.MapTypeControl());

            add_control();

            // 给地图添加工具条(地图-卫星-三维)和比例尺控件

            var bottom_left_control = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});

            map.addControl(bottom_left_control);   // 添加比例尺到地图

@@ -795,12 +801,14 @@
   }

   

   //需要实时查询的方法

   function Repeatoperation(){		
      searchBattmaintrecords();

      searchUserTask();		
      searchAnnounceall();

      searchTestsCale();

		
   function Repeatoperation(){	
      // 判断页面是否正在被访问

      if(pageIsVisit) {

         searchBattmaintrecords();

         searchUserTask();		
         searchAnnounceall();

         searchTestsCale();

      }	
      setTimeout(Repeatoperation,10000);

   }

   

@@ -934,6 +942,13 @@
      if($('#content .warn-pie').length==0){

         return;

      }

		
      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchalarm_data, 10000);

         return;

      }

		
      //生成电池告警率饼状图

      var $warn=$('#content .pie-con .warn-pie');   //获取告警容器的jquery对象

      if($warn.length!=0){

@@ -1045,6 +1060,12 @@
         return;

      }

      

      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchmaintByMap, 10000);

         return;

      }

		
      // 判断是否为Echarts对象

      var isEcharts = isObject(brdnPie)?true:false;

      

@@ -1117,6 +1138,13 @@
      if($('#content .repair-pie').length==0){

         return;

      }

		
      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchBatt_maint_inf, 10000);

         return;

      }

		
      // 判断是否为Echarts对象

      var isEcharts = isObject(repairPie)?true:false;

      if(!isEcharts) {

@@ -1172,6 +1200,13 @@
      if($('#content .health-pie').length==0){      

         return;

      }

		
      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchGood, 10000);

         return;

      }

		
      //生成电池健康率

      var $health=$('#content .pie-con .health-pie');   //获取故障容器的jquery对象

      if($health.length!=0){

@@ -1222,6 +1257,12 @@
   var endurPie;

   function searchEndurHome() {

      if($('#content .endur-pie').length==0){

         return;

      }

		
      // 判断页面是否被访问

      if(!pageIsVisit) {

         setTimeout(searchEndurHome, 10000);

         return;

      }

      

@@ -1699,7 +1740,7 @@
   // 生成图标的说明

   function createIconExplain(mapEle) {

      var iconExplain = $('<div id="mapImgDesc" style="position:absolute;background-color: #fff; border: 1px solid #ccc; right: 10px; bottom: 10px; z-index: 99999"></div>');   // 地图图标说明容器

      var iconExplainHt = $('<div class="explain-header" style="padding:4px 8px; border-bottom:1px solid #ccc; background-color: #CDDCFA">地图图标说明<img src="image/explain-down.gif" style="float:right;"/></div>');

      var iconExplainHt = $('<div class="explain-header" style="padding:4px 8px; border-bottom:1px solid #ccc; background-color: #CDDCFA">图标显示与选择<img src="image/explain-down.gif" style="float:right;"/></div>');

      iconExplain.append(iconExplainHt);

      

      changeMapImgDesc(iconExplain, 'normal');

@@ -1750,7 +1791,19 @@
      iconList.append(icon);

      iconList.append(badge);

      iconExplain.append(iconList);

	
		
      // 续航不足

      var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');

      var input = $('<input type="checkbox" data-img="item-xuhang" checked="checked">');

      var icon = $('<img src="'+mapImages.xuhang+'">');

      var span = $('<span>续航不足机房</span>');

      var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-xuhang">0</a>');

      iconList.append(input);

      iconList.append(span);

      iconList.append(icon);

      iconList.append(badge);

      iconExplain.append(iconList);

		
      // 落后机房

      var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');

      var input = $('<input type="checkbox" data-img="item-behind" checked="checked">');

@@ -1821,8 +1874,8 @@
      var down = mapImgDesc.find('.badge-down');         // 掉站机房

      var powercut = mapImgDesc.find('.badge-powercut');   // 停电机房

      var normal = mapImgDesc.find('.badge-normal');      // 正常机房

      var weak = mapImgDesc.find('.badge-weak');         // 续航不足3小时机房

      console.log(warn.length);

      var weak = mapImgDesc.find('.badge-xuhang');         // 续航不足3小时机房

      // console.log(warn.length);

      //  请求后台数据

      $.ajax({

         type: 'post'

@@ -1832,12 +1885,12 @@
         ,dataType: 'json'

         ,success:function(res) {

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

            //console.log(rs);

            console.log(rs);

            powercut.text(rs.sum);      // 停电数

            down.text(rs.code);      // 掉站数

            behind.text(rs.msgN);   // 落后机房

            warn.text(rs.msg);      // 告警机房

				
            weak.text(rs.msgT);      // 续航不足3小时

            /* var normalNum = Number(rs.newsum) - (Number(rs.sum)+Number(rs.code)+Number(rs.msgN)+Number(rs.msg));

            normal.text(normalNum); */   // 正常机房

         }

@@ -2283,10 +2336,10 @@


         var content = '<div class="add-panel">'+

            '<div style="padding: 6px 4px"><span>地址：</span>'+

            '<span class="addr">'+addComp.province+'-'+addComp.city+'-'+addComp.district+'-'+addComp.street+'</span></div>'+

            '<input type="text" class="addr" value="'+addComp.province+'-'+addComp.city+'-'+addComp.district+'-'+addComp.street+'"></div>'+

            '<div style="padding: 6px 4px">经度：<span class="lng">'+rs.point.lng+'</span>，纬度：<span class="lat">'+rs.point.lat+'</span></div>'+

            '<div style="padding: 6px 4px"><span>设置站点名：</span>'+'<select style="border: 1px solid #ccc; width: 180px">'+options+'</select></div>'+

            '<div style="padding: 6px 4px; margin-top: 20px">'+

            '<div style="padding: 6px 4px"><span>设置站点名：</span>'+'<select style="border: 1px solid #ccc; width: 180px;height: 22px;">'+options+'</select></div>'+

            '<div style="padding: 6px 4px; margin-top: 15px">'+

            '<a href="javascript:getAddHomeInfo();" class="map-panel-btn">确定</a></div>'

         +'</div>';



@@ -2304,7 +2357,7 @@
      var lat = $('.add-panel .lat').text();                        // 获取纬度

      var wgsPoint = GPS.bd2wgs(lat, lng);                        // 百度地图坐标转化为GPS

      

      var addr = $('.add-panel .addr').text();                     // 获取地址

      var addr = $('.add-panel .addr').val();                     // 获取地址

      var homeName = $('.add-panel select option:selected').text();      // 机房名称

      var homeId = $('.add-panel select option:selected').val();         // 机房ID

      if(homeId !=0 && confirm("确认将"+homeName+"机房设置到该位置吗？")){

@@ -2613,6 +2666,13 @@
   function updateStation(isLoad) {

      var bmap = GLOBAL.BMap;      // BMap的命名空间

      var updateStationData = [];

		
      // 判断是否被访问

      if(!pageIsVisit) {

         // 关闭并添加延时执行

           clearInterval(updateTimeout);

           updateTimeout = setTimeout(updateStation, 4000);

      }

      

      if(isLoad) {

         updateLoad = layer.load(1);

@@ -3322,6 +3382,7 @@
      rs.float = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_online_charge}";   // 浮充

      rs.powercut = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_poff}";

      rs.defaults = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_install}";

      rs.xuhang = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:Chart_xuhang}";

      return rs;

   }

   

@@ -3542,6 +3603,9 @@
             break;

          case 'item-pre_charge':   // 61850预充电

             rs = imgs.precharge;

             break;

          case 'item-xuhang':      // 续航不足

             rs = imgs.xuhang;

             break;

          default:

             rs = imgs.defaults;

@@ -4102,5 +4166,11 @@
      

      $( "#mapToolSearch" ).autocomplete('option', 'source', homeSource);

   }

	
   // 添加地图控件

   function add_control(){

      var bottom_left_navigation = new BMap.NavigationControl({anchor: BMAP_ANCHOR_BOTTOM_LEFT});

      map.addControl(bottom_left_navigation);  
   }

   </script> 

</html>