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

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

2018-12-28 b3f62ab5fb6adf03a92f62b42e69ad849f903b45

 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>

@@ -1700,7 +1705,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');

@@ -2296,10 +2301,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>';



@@ -2317,7 +2322,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+"机房设置到该位置吗？")){

@@ -3335,7 +3340,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 = 'image/home-weak.gif';

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

      return rs;

   }