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

81041

2018-11-12 43fe18b40a84b82ca5c5f1a88abb89ea168f95f5

 gx_tieta/WebRoot/index.jsp

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

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

                              <table>

                                 <tbody>

                                    <tr>

                                       <td class="w5em alg-c f-bold">机房名称:</td>

                                           <td><input type="text" id="mapToolSearch"></td>

                                    </tr>

                                    <tr>

                                           <td colspan="2" class="alg-r btn-container">

                                              <button type="button" value="搜索" id="mapToolSearchBtn" class="mrr8">搜索</button>

                                           </td>

                                        </tr>

                                 </tbody>

                              </table>

                           </div>

                        </div>

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

                           <h2 class="layui-colla-title">添加机房</h2>

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

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

                                  <table id="mapToolAddHome">

                                     <tbody>

                                        <tr>

@@ -149,24 +167,6 @@
                                     </tbody>

                                  </table>

                               </div>

                        </div>

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

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

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

                              <table>

                                 <tbody>

                                    <tr>

                                       <td class="w5em alg-c f-bold">机房名称:</td>

                                           <td><input type="text" id="mapToolSearch"></td>

                                    </tr>

                                    <tr>

                                           <td colspan="2" class="alg-r btn-container">

                                              <button type="button" value="搜索" id="mapToolSearchBtn" class="mrr8">搜索</button>

                                           </td>

                                        </tr>

                                 </tbody>

                              </table>

                           </div>

                        </div>

                     </div>

                  </div>

@@ -3631,6 +3631,13 @@
         });

      }

      

      // 根据权限更新地图工具内容

      var permitAddHome = getPermit('batt_map_edit_permit', permits);   // 添加机房的权限

      // 没有添加机房的权限

      if(!permitAddHome) {

         $('#permitAddHome').remove();

      }

		
      // 地图左上方面板模块-点击面板上方的小图标显示设定信息

      $('#showMapInfoDetail').click(function() {

         $('.map-info-detail').slideToggle();