From 43fe18b40a84b82ca5c5f1a88abb89ea168f95f5 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期一, 12 十一月 2018 10:12:26 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 33cb90f..a92b69e 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/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();
--
Gitblit v1.9.1