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

hdw

2018-11-02 b6e8fdb6f9bb50d29aeb29aa62b19a75c9a1ef9d

 gx_tieta/WebRoot/index.jsp

@@ -369,6 +369,7 @@
   <script type="text/javascript" src="pages/js/common.js"></script>

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

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

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

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

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

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

@@ -627,7 +628,7 @@
            centerMapByPoint(map); // 根据当前用户设定的位置显示中心点

            map.enableScrollWheelZoom();

            map.disableDoubleClickZoom();

            map.setMapStyle({style: 'grayscale'});   //  设置地图的风格

            //map.setMapStyle({style: 'grayscale'});   //  设置地图的风格

            // 添加地图类型控件

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

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

@@ -1553,11 +1554,23 @@
      iconList.append('<div class="clear"></div>');

      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-timeout" checked="checked">');

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

      var span = $('<span>电池组放电延时机房</span>');

      iconList.append(input);

      iconList.append(span);

      iconList.append(icon);

      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-poff" checked="checked">');

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

      var span = $('<span>机房停电</span>');

      iconList.append(input);

      iconList.append(span);

      iconList.append(icon);

@@ -1986,6 +1999,8 @@
   function getAddHomeInfo() {

      var lng = $('.add-panel .lng').text();                        // 获取经度

      var lat = $('.add-panel .lat').text();                        // 获取纬度

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

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

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

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

@@ -1994,8 +2009,8 @@
            StationId:homeId,         //机房编号

            StationName:homeName,      //机房名称

            Address:addr,            //机房物理信息

            longitude:lng,            // 经度

            latitude:lat,            // 纬度

            longitude: wgsPoint.lon,            // 经度

            latitude: wgsPoint.lat,            // 纬度

            information:"",            //备注

         };

         var json = JSON.stringify(temp);

@@ -2265,9 +2280,11 @@
   // 格式化查询结果

   function formatAllStation(list) {

      var obj = new Object();

      // GPS坐标转化为百度坐标

      var point = GPS.wgs2bd(list.latitude, list.longitude);

      // 构造结果集

      obj.lng = list.longitude;

      obj.lat = list.latitude;

      obj.lng = point.lon;

      obj.lat = point.lat;

      obj.title = list.StationName;

      obj.sId = list.StationId;

      obj.fbsId = list.FBSDeviceId;

@@ -2326,9 +2343,12 @@
   function formatUpdateStation(list) {

      var obj = {};

      var data = list.data;

      //console.log(list);

      // GPS坐标转化为百度坐标

      var point = GPS.wgs2bd(data.latitude, data.longitude);

      // 构造结果集

      obj.lng = data.longitude;

      obj.lat = data.latitude;

      obj.lng = point.lon;

      obj.lat = point.lat;

      obj.title = data.StationName;

      obj.sId = data.StationId;

      obj.fbsId = data.FBSDeviceId;

@@ -2971,7 +2991,8 @@
      rs.devalarm = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_dev_alarm}";   // 设备告警

      rs.precharge = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_pre_charge}";   // 预充电

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

      rs.defaults = mapDefults;

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

      return rs;

   }

   /* $(function(){

@@ -3262,6 +3283,9 @@
          case 'item-timeout':   // 延时

             rs = imgs.timeout;

             break;

          case 'item-poff':   // 停电

             rs = imgs.powercut;

             break;

          case 'item-dev_alarm':   // 61850告警

             rs = imgs.devalarm;

             break;