فهرست منبع

前台样式变更

git-svn-id: https://192.168.57.71/svn/jsgkj@1390 931142cf-59ea-a443-aa0e-51397b428577
ld_zhouk 8 سال پیش
والد
کامیت
05945ef4d9
20فایلهای تغییر یافته به همراه1552 افزوده شده و 1941 حذف شده
  1. 1 1
      gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/ParamCtl.java
  2. 1 1
      gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/UserCtl.java
  3. 147 153
      gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/dict.jsp
  4. 118 122
      gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/group.jsp
  5. 210 219
      gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/menu.jsp
  6. 152 159
      gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/org.jsp
  7. 100 107
      gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/param.jsp
  8. 114 119
      gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/role.jsp
  9. 90 97
      gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/xzqh.jsp
  10. 234 241
      gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/user/main.jsp
  11. 2 2
      gkaqv2/trunk/modules/web/src/main/webapp/static/css/common/basic.css
  12. 18 0
      gkaqv2/trunk/modules/web/src/main/webapp/static/css/common/main.css
  13. 48 103
      gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/dict.js
  14. 41 83
      gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/group.js
  15. 44 94
      gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/menu.js
  16. 62 119
      gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/org.js
  17. 38 74
      gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/param.js
  18. 40 78
      gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/role.js
  19. 41 71
      gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/xzqh.js
  20. 51 98
      gkaqv2/trunk/modules/web/src/main/webapp/static/js/user/index.js

+ 1 - 1
gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/ParamCtl.java

@@ -25,7 +25,7 @@ import com.yuanxd.tools.utils.string.StringUtils;
  * ϵͳ²ÎÊý¹ÜÀí¿ØÖÆ
  */
 @Controller
-@RequestMapping(value = "/param")
+@RequestMapping(value = "/param", produces = "application/json; charset=utf-8")
 public class ParamCtl extends BaseCtl {
     @Autowired
     private ParamService paramService;

+ 1 - 1
gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/UserCtl.java

@@ -32,7 +32,7 @@ import com.yuanxd.tools.utils.WebJsonResult;
 import com.yuanxd.tools.utils.string.StringUtils;
 
 @Controller
-@RequestMapping(value = "/user")
+@RequestMapping(value = "/user", produces = "application/json; charset=utf-8")
 public class UserCtl extends BaseCtl {
     @Autowired
     private UserService userService;

+ 147 - 153
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/dict.jsp

@@ -8,163 +8,157 @@
 <script src="<%=base%>/static/js/frame/dict.js"></script>
 </head>
 <body class="p_body">
-	<div class="easyui-layout" data-options="fit:true">
-		<!-- 头部 -->
-		<div id="regionNorth" data-options="region:'north'" class="regionNorthStyle">
-			<%@ include file="../layouts/navbar.jsp"%>
-		</div>
-		<!-- 左边部分 -->
-		<div id="regionWest" data-options="region:'west'" class="regionWestStyle">
-			<%@ include file="../layouts/sidebar.jsp"%>
-		</div>
-		<!-- 底部 -->
-		<div id="regionFooter" data-options="region:'south'" class="regionFooterStyle">
-			<%@ include file="../layouts/footer.jsp"%>
-		</div>
-		<!-- 内容部分 -->
-		<div id="regionCenter" data-options="region:'center'" class="regionCenterStyle">
-			<div class="p_all">
-            <%@ include file="../layouts/menubar.jsp"%>
-				<div class="p_block">
-					<div class="p_headdiv">
-						<div class="p_headblock">
-							<div class="p_headleft">字典管理</div>
-						</div>
-					</div>
-					<div class="p_buttondiv">
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()" title="新增" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()" title="删除" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()" title="修改" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()" title="查询" />
-						</div>
-					</div>
-                    <div class="p_searchdiv">
-                        <table class="tabsearch">
-                            <tr class="trsearch">
-                                <td class="tdname">名称</td>
-                                <td class="tdcontent"><input type="text" id="srh_text" name="srh_text" class="p_txt"></td>
-                                <td class="tdname">编码</td>
-                                <td class="tdcontent"><input type="text" id="srh_code" name="srh_code" class="p_txt"></td>
-                                <td class="tdname"><img class="p_searchbtn"
-                                    src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" />
-                                </td>
-                            </tr>
-                        </table>
+    <div class="p_all">
+        <div class="p_headdiv">
+            <div class="p_headnav">
+                <img class="p_headnavimg" onclick="gotoHome()" src="<%=base%>/static/images/list/home.png" />
+            </div>
+            <div class="p_headblock">
+                <div class="p_headleft">权限管理 > 字典管理</div>
+            </div>
+        </div>
+        <div class="p_block">
+            <div class="p_fucdiv">
+                <div class="p_titlediv">
+                    <div class="p_titlename">字典管理</div>
+                    <div id="totalRecord" class="p_titlerecord">共0条记录</div>
+                </div>
+                <div class="p_buttondiv">
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()"
+                            title="删除" />
                     </div>
-                    <div class="container page-content">
-                        <div class="row clearfix">
-                            <div class="col-md-3 column page-content-tree">
-                                <!-- 字典树 -->
-                                <div id="dictTree" class="ztree"></div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()"
+                            title="修改" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()"
+                            title="新增" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()"
+                            title="查询" />
+                    </div>
+                </div>
+            </div>
+            <div class="p_searchdiv">
+                <table class="tabsearch">
+                    <tr class="trsearch">
+                        <td class="tdname">名称</td>
+                        <td class="tdcontent"><input type="text" id="srh_text" name="srh_text" class="p_txt"></td>
+                        <td class="tdname">编码</td>
+                        <td class="tdcontent"><input type="text" id="srh_code" name="srh_code" class="p_txt"></td>
+                        <td class="tdname"><img class="p_searchbtn"
+                            src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" /></td>
+                    </tr>
+                </table>
+            </div>
+            <div class="container page-content">
+                <div class="row clearfix">
+                    <div class="col-md-3 column page-content-tree">
+                        <!-- 字典树 -->
+                        <div id="dictTree" class="ztree"></div>
+                    </div>
+                    <div class="col-md-9 column page-content-grid">
+                        <!--  列表部分 -->
+                        <table grid-manager="grid-table" id="grid-table"></table>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <%@ include file="../layouts/footer.jsp"%>
+    </div>
+
+    <div class="modal fade" id="editWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+        aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">
+                        <span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+                    </button>
+                    <h6 class="modal-title" id="myModalLabel"></h6>
+                </div>
+                <div class="modal-body">
+                    <form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
+                        <input type="hidden" id="id" name="id"> <input type="hidden" id="pcode"
+                            name="pcode">
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="pid">上级名称</label>
+                            <div class="col-sm-9">
+                                <select class="selectpicker form-control" id="pid" name="pid"
+                                    onchange="changePcode()">
+                                    <option value="" selected="selected">请选择...</option>
+                                </select>
                             </div>
-                            <div class="col-md-9 column page-content-grid">
-                               <!--  列表部分 -->
-                                <table id="grid-table"></table>
-                                <div id="grid-pager"></div>
+                        </div>
+                        <!-- <input type="hidden" id="pid" name="pid">
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="ptext">上级名称</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="ptext" name="ptext" type="text" readonly="readonly" />
                             </div>
                         </div>
-                    </div>
-				</div>
-			</div>
-
-			<div class="modal fade" id="editWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal">
-								<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
-							</button>
-							<h6 class="modal-title" id="myModalLabel"></h6>
-						</div>
-						<!-- form 表单信息 -->
-						<div class="modal-body">
-							<form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
-								<input type="hidden" id="id" name="id">
-                                <input type="hidden" id="pcode" name="pcode">
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="pid">上级名称</label>
-                                    <div class="col-sm-9">
-                                        <select class="selectpicker form-control" id="pid" name="pid" onchange="changePcode()">
-                                            <option value="" selected="selected">请选择...</option>
-                                        </select>
-                                    </div>
-                                </div>
-<!--                                 <input type="hidden" id="pid" name="pid">
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="ptext">上级名称</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="ptext" name="ptext" type="text" readonly="readonly" />
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="pcode">上级编码</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="pcode" name="pcode" type="text" readonly="readonly" />
-									</div>
-								</div> -->
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="text">名称</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="text" name="text" type="text" />
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="code">编码</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="code" name="code" type="text" />
-									</div>
-								</div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="val">编码值</label>
-                                    <div class="col-sm-9">
-                                        <input class="form-control" id="val" name="val" type="text" />
-                                    </div>
-                                </div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="leaf">是否末级</label>
-									<div class="col-sm-9">
-										<select class="selectpicker form-control" id="leaf" name="leaf">
-                                            <option value="Y">是</option>
-											<option value="N">否</option>
-										</select>
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="sortno">序号</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="sortno" name="sortno" type="text" />
-									</div>
-								</div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="remark">备注</label>
-                                    <div class="col-sm-9">
-                                        <input class="form-control" id="remark" name="remark" type="text" />
-                                    </div>
-                                </div>
-							</form>
-						</div>
-                        <div class="modal-footer">
-                                <div class="center-block" style="width: 160px;">
-                                    <button id="btnSave" class="btn btn-success btn-round btn-sm" onclick="save()">
-                                        <i class="glyphicon glyphicon-ok"></i> 保存
-                                    </button>
-                                    <button type="button" class="btn btn-grey btn-round btn-sm" onclick="closeWin()">
-                                        <i class="glyphicon glyphicon-remove"></i> 关闭
-                                    </button>
-                                </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="pcode">上级编码</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="pcode" name="pcode" type="text" readonly="readonly" />
+                            </div>
+                        </div> -->
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="text">名称</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="text" name="text" type="text" />
+                            </div>
                         </div>
-						<!-- form 表单信息 -->
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="code">编码</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="code" name="code" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="val">编码值</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="val" name="val" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="leaf">是否末级</label>
+                            <div class="col-sm-9">
+                                <select class="selectpicker form-control" id="leaf" name="leaf">
+                                    <option value="Y">是</option>
+                                    <option value="N">否</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="sortno">序号</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="sortno" name="sortno" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="remark">备注</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="remark" name="remark" type="text" />
+                            </div>
+                        </div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <div class="center-block" style="width: 160px;">
+                        <button id="btnSave" class="btn btn-custom btn-round btn-sm" onclick="save()">
+                            <i class="glyphicon glyphicon-ok"></i> 保存
+                        </button>
+                        <button type="button" class="btn btn-custom btn-round btn-sm" onclick="closeWin()">
+                            <i class="glyphicon glyphicon-remove"></i> 关闭
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </body>
 </html>

+ 118 - 122
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/group.jsp

@@ -8,133 +8,129 @@
 <script src="<%=base%>/static/js/frame/group.js"></script>
 </head>
 <body class="p_body">
-	<div class="easyui-layout" data-options="fit:true">
-		<!-- 头部 -->
-		<div id="regionNorth" data-options="region:'north'" class="regionNorthStyle">
-			<%@ include file="../layouts/navbar.jsp"%>
-		</div>
-		<!-- 左边部分 -->
-		<div id="regionWest" data-options="region:'west'" class="regionWestStyle">
-			<%@ include file="../layouts/sidebar.jsp"%>
-		</div>
-		<!-- 底部 -->
-		<div id="regionFooter" data-options="region:'south'" class="regionFooterStyle">
-			<%@ include file="../layouts/footer.jsp"%>
-		</div>
-		<!-- 内容部分 -->
-		<div id="regionCenter" data-options="region:'center'" class="regionCenterStyle">
-			<div class="p_all">
-            <%@ include file="../layouts/menubar.jsp"%>
-				<div class="p_block">
-					<div class="p_headdiv">
-						<div class="p_headblock">
-							<div class="p_headleft">分组管理</div>
-						</div>
-					</div>
-					<div class="p_buttondiv">
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()" title="新增" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()" title="删除" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()" title="修改" />
-						</div>
-                        <div class="p_buttonbg">
-                            <img class="p_buttonimg" src="<%=base%>/static/images/list/bgzy.png" onclick="editAuthInfo()" title="授权" />
-                        </div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()" title="查询" />
-						</div>
-					</div>
-                    <div class="p_searchdiv">
-                        <table class="tabsearch">
-                            <tr class="trsearch">
-                                <td class="tdname">角色</td>
-                                <td class="tdcontent">
-                                    <select class="selectpicker form-control" data-width="200px" id="srh_role" name="srh_role">
-                                        <option value="" selected="selected">请选择...</option>
-                                    </select></td>
-                                <td class="tdname"><img class="p_searchbtn"
-                                    src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" />
-                                </td>
-                            </tr>
-                        </table>
+    <div class="p_all">
+        <div class="p_headdiv">
+            <div class="p_headnav">
+                <img class="p_headnavimg" onclick="gotoHome()" src="<%=base%>/static/images/list/home.png" />
+            </div>
+            <div class="p_headblock">
+                <div class="p_headleft">权限管理 > 分组管理</div>
+            </div>
+        </div>
+        <div class="p_block">
+            <div class="p_fucdiv">
+                <div class="p_titlediv">
+                    <div class="p_titlename">分组管理</div>
+                    <div id="totalRecord" class="p_titlerecord">共0条记录</div>
+                </div>
+                <div class="p_buttondiv">
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()"
+                            title="删除" />
                     </div>
-                    <div class="container page-content">
-                        <div class="row clearfix">
-                            <div class="col-md-3 column page-content-tree">
-                                <!-- 组织树 -->
-                                <div id="orgTree" class="ztree"></div>
-                            </div>
-                            <div class="col-md-9 column page-content-grid">
-                               <!--  列表部分 -->
-                                <table id="grid-table"></table>
-                                <div id="grid-pager"></div>
-                            </div>
-                        </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/bgzy.png" onclick="editAuthInfo()"
+                            title="授权" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()"
+                            title="修改" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()"
+                            title="新增" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()"
+                            title="查询" />
+                    </div>
+                </div>
+            </div>
+            <div class="p_searchdiv">
+                <table class="tabsearch">
+                    <tr class="trsearch">
+                        <td class="tdname">角色</td>
+                        <td class="tdcontent"><select class="selectpicker form-control" data-width="200px"
+                            id="srh_role" name="srh_role">
+                                <option value="" selected="selected">请选择...</option>
+                        </select></td>
+                        <td class="tdname"><img class="p_searchbtn"
+                            src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" />
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <div class="container page-content">
+                <div class="row clearfix">
+                    <div class="col-md-3 column page-content-tree">
+                        <!-- 组织树 -->
+                        <div id="orgTree" class="ztree"></div>
+                    </div>
+                    <div class="col-md-9 column page-content-grid">
+                        <!--  列表部分 -->
+                        <table grid-manager="grid-table" id="grid-table"></table>
                     </div>
                 </div>
-			</div>
+            </div>
+        </div>
+        <%@ include file="../layouts/footer.jsp"%>
+    </div>
 
-			<div class="modal fade" id="editWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal">
-								<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
-							</button>
-							<h6 class="modal-title" id="myModalLabel"></h6>
-						</div>
-						<!-- form 表单信息 -->
-						<div class="modal-body">
-							<form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
-								<input type="hidden" id="id" name="id">
-                                <input type="hidden" id="menuBtnRef" name="menuBtnRef">
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="remark">分组名称</label>
-                                    <div class="col-sm-9">
-                                        <input class="form-control" id="remark" name="remark" type="text" />
-                                    </div>
-                                </div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="org">组织</label>
-									<div class="col-sm-9">
-                                        <select class="selectpicker form-control" id="org" name="org" title="请选择..."></select>
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="role">角色</label>
-									<div class="col-sm-9">
-                                        <select class="selectpicker form-control" id="role" name="role" title="请选择..."></select>
-									</div>
-								</div>
-                                <div class="form-group" id="menuTreeDiv">
-                                    <label class="col-sm-2 control-label" for="menuTree">关联菜单</label>
-                                    <div class="col-sm-9">
-                                    	<div class="form-control" style="height: 200px;  overflow-x: auto; overflow-y: scroll;">
-                                            <div id="menuTree" class="ztree"></div>
-                                        </div>
-                                    </div>
-                                </div>
-							</form>
-						</div>
-                        <div class="modal-footer">
-                                <div class="center-block" style="width: 160px;">
-                                    <button id="btnSave" class="btn btn-success btn-round btn-sm" onclick="save()">
-                                        <i class="glyphicon glyphicon-ok"></i> 保存
-                                    </button>
-                                    <button type="button" class="btn btn-grey btn-round btn-sm" onclick="closeWin()">
-                                        <i class="glyphicon glyphicon-remove"></i> 关闭
-                                    </button>
+    <div class="modal fade" id="editWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+        aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">
+                        <span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+                    </button>
+                    <h6 class="modal-title" id="myModalLabel"></h6>
+                </div>
+                <div class="modal-body">
+                    <form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
+                        <input type="hidden" id="id" name="id"> <input type="hidden" id="menuBtnRef"
+                            name="menuBtnRef">
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="remark">分组名称</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="remark" name="remark" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="org">组织</label>
+                            <div class="col-sm-9">
+                                <select class="selectpicker form-control" id="org" name="org" title="请选择..."></select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="role">角色</label>
+                            <div class="col-sm-9">
+                                <select class="selectpicker form-control" id="role" name="role" title="请选择..."></select>
+                            </div>
+                        </div>
+                        <div class="form-group" id="menuTreeDiv">
+                            <label class="col-sm-2 control-label" for="menuTree">关联菜单</label>
+                            <div class="col-sm-9">
+                                <div class="form-control"
+                                    style="height: 200px; overflow-x: auto; overflow-y: scroll;">
+                                    <div id="menuTree" class="ztree"></div>
                                 </div>
+                            </div>
                         </div>
-						<!-- form 表单信息 -->
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <div class="center-block" style="width: 160px;">
+                        <button id="btnSave" class="btn btn-custom btn-round btn-sm" onclick="save()">
+                            <i class="glyphicon glyphicon-ok"></i> 保存
+                        </button>
+                        <button type="button" class="btn btn-custom btn-round btn-sm" onclick="closeWin()">
+                            <i class="glyphicon glyphicon-remove"></i> 关闭
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </body>
 </html>

+ 210 - 219
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/menu.jsp

@@ -8,229 +8,220 @@
 <script src="<%=base%>/static/js/frame/menu.js"></script>
 </head>
 <body class="p_body">
-    <div id="easyuiLayout" class="easyui-layout" data-options="fit:true">
-		<!-- 头部 -->
-		<div id="regionNorth" data-options="region:'north'" class="regionNorthStyle">
-			<%@ include file="../layouts/navbar.jsp"%>
-		</div>
-		<!-- 左边部分 -->
-		<div id="regionWest" data-options="region:'west'" class="regionWestStyle">
-			<%@ include file="../layouts/sidebar.jsp"%>
-		</div>
-		<!-- 底部 -->
-		<div id="regionFooter" data-options="region:'south'" class="regionFooterStyle">
-			<%@ include file="../layouts/footer.jsp"%>
-		</div>
-		<!-- 内容部分 -->
-		<div id="regionCenter" data-options="region:'center'" class="regionCenterStyle">
-			<div class="p_all">
-            <%@ include file="../layouts/menubar.jsp"%>
-				<div class="p_block">
-					<div class="p_headdiv">
-						<div class="p_headblock">
-							<div class="p_headleft">菜单管理</div>
-						</div>
-					</div>
-					<div class="p_buttondiv">
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()" title="新增" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()" title="删除" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()" title="修改" />
-						</div>
-                        <div class="p_buttonbg">
-                            <img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()" title="查询" />
-                        </div>
-					</div>
-                    <div class="p_searchdiv">
-                        <table class="tabsearch">
-                            <tr class="trsearch">
-                                <td class="tdname">名称</td>
-                                <td class="tdcontent"><input type="text" id="srh_name" name="srh_name" class="p_txt" value=""></td>
-                                <td class="tdname">编码</td>
-                                <td class="tdcontent"><input type="text" id="srh_code" name="srh_code" class="p_txt" value=""></td>
-                                <td class="tdname"><img class="p_searchbtn"
-                                    src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" />
-                                </td>
-                            </tr>
-                        </table>
+    <div class="p_all">
+        <div class="p_headdiv">
+            <div class="p_headnav">
+                <img class="p_headnavimg" onclick="gotoHome()" src="<%=base%>/static/images/list/home.png" />
+            </div>
+            <div class="p_headblock">
+                <div class="p_headleft">权限管理 > 菜单管理</div>
+            </div>
+        </div>
+        <div class="p_block">
+            <div class="p_fucdiv">
+                <div class="p_titlediv">
+                    <div class="p_titlename">菜单管理</div>
+                    <div id="totalRecord" class="p_titlerecord">共0条记录</div>
+                </div>
+                <div class="p_buttondiv">
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()"
+                            title="删除" />
                     </div>
-                    <div class="container page-content">
-                        <div class="row clearfix">
-                            <div class="col-md-3 column page-content-tree">
-                                <!-- 菜单树 -->
-                                <div id="menuTree" class="ztree"></div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()"
+                            title="修改" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()"
+                            title="新增" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()"
+                            title="查询" />
+                    </div>
+                </div>
+            </div>
+            <div class="p_searchdiv">
+                <table class="tabsearch">
+                    <tr class="trsearch">
+                        <td class="tdname">名称</td>
+                        <td class="tdcontent"><input type="text" id="srh_name" name="srh_name" class="p_txt" value=""></td>
+                        <td class="tdname">编码</td>
+                        <td class="tdcontent"><input type="text" id="srh_code" name="srh_code" class="p_txt" value=""></td>
+                        <td class="tdname"><img class="p_searchbtn"
+                            src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" />
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <div class="container page-content">
+                <div class="row clearfix">
+                    <div class="col-md-3 column page-content-tree">
+                        <!-- 菜单树 -->
+                        <div id="menuTree" class="ztree"></div>
+                    </div>
+                    <div class="col-md-9 column page-content-grid">
+                        <!--  列表部分 -->
+                        <table grid-manager="grid-table" id="grid-table"></table>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <%@ include file="../layouts/footer.jsp"%>
+    </div>
+
+    <div class="modal fade" id="editWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">
+                        <span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+                    </button>
+                    <h6 class="modal-title" id="myModalLabel"></h6>
+                </div>
+                <div class="modal-body">
+                    <form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
+                        <input type="hidden" id="id" name="id">
+                        <input type="hidden" id="pid" name="pid">
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="pname">上级名称</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="pname" name="pname" type="text" readonly="readonly" />
                             </div>
-                            <div class="col-md-9 column page-content-grid">
-                               <!--  列表部分 -->
-                                <table id="grid-table"></table>
-                                <div id="grid-pager"></div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="pcode">上级编码</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="pcode" name="pcode" type="text" readonly="readonly" />
                             </div>
                         </div>
-                    </div>
-				</div>
-			</div>
-
-			<div class="modal fade" id="editWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal">
-								<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
-							</button>
-							<h6 class="modal-title" id="myModalLabel"></h6>
-						</div>
-						<!-- form 表单信息 -->
-						<div class="modal-body">
-							<form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
-								<input type="hidden" id="id" name="id">
-                                <input type="hidden" id="pid" name="pid">
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="pname">上级名称</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="pname" name="pname" type="text" readonly="readonly" />
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="pcode">上级编码</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="pcode" name="pcode" type="text" readonly="readonly" />
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="name">名称</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="name" name="name" type="text" />
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="code">编码</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="code" name="code" type="text" />
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="leaf">类型</label>
-									<div class="col-sm-9">
-										<select class="selectpicker form-control" id="leaf" name="leaf">
-											<option value="N">目录</option>
-											<option value="Y">页面</option>
-										</select>
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="url">路径</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="url" name="url" type="text" />
-									</div>
-								</div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="icon">图标</label>
-                                    <div class="col-sm-9">
-                                        <input class="form-control" id="icon" name="icon" type="text" />
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="remark">备注</label>
-                                    <div class="col-sm-9">
-                                        <input class="form-control" id="remark" name="remark" type="text" />
-                                    </div>
-                                </div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="sortno">序号</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="sortno" name="sortno" type="text" />
-									</div>
-								</div>
-							</form>
-						</div>
-                        <div class="modal-footer">
-                                <div class="center-block" style="width: 160px;">
-                                    <button id="btnSave" class="btn btn-success btn-round btn-sm" onclick="save()">
-                                        <i class="glyphicon glyphicon-ok"></i> 保存
-                                    </button>
-                                    <button type="button" class="btn btn-grey btn-round btn-sm" onclick="closeWin()">
-                                        <i class="glyphicon glyphicon-remove"></i> 关闭
-                                    </button>
-                                </div>
-                        </div>
-						<!-- form 表单信息 -->
-					</div>
-				</div>
-			</div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="name">名称</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="name" name="name" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="code">编码</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="code" name="code" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="leaf">类型</label>
+                            <div class="col-sm-9">
+                                <select class="selectpicker form-control" id="leaf" name="leaf">
+                                    <option value="N">目录</option>
+                                    <option value="Y">页面</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="url">路径</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="url" name="url" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="icon">图标</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="icon" name="icon" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="remark">备注</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="remark" name="remark" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="sortno">序号</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="sortno" name="sortno" type="text" />
+                            </div>
+                        </div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                        <div class="center-block" style="width: 160px;">
+                            <button id="btnSave" class="btn btn-custom btn-round btn-sm" onclick="save()">
+                                <i class="glyphicon glyphicon-ok"></i> 保存
+                            </button>
+                            <button type="button" class="btn btn-custom btn-round btn-sm" onclick="closeWin()">
+                                <i class="glyphicon glyphicon-remove"></i> 关闭
+                            </button>
+                        </div>
+                </div>
+            </div>
+        </div>
+    </div>
 
-			<div class="modal fade" id="editBtnWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal">
-								<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
-							</button>
-							<h6 class="modal-title" id="myModalLabel"></h6>
-						</div>
-						<!-- form 表单信息 -->
-						<div class="modal-body">
-							<form class="form-horizontal" id="editBtnForm" method="post" onsubmit="return false;">
-								<input type="hidden" id="btnId" name="btnId">
-                                <input type="hidden" id="menuId" name="menuId">
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="menuName">菜单名称</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="menuName" name="menuName" type="text" readonly="readonly" />
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="btnName">名称</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="btnName" name="btnName" type="text" />
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="btnCode">编码</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="btnCode" name="btnCode" type="text" />
-									</div>
-								</div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="btnIcon">图标</label>
-                                    <div class="col-sm-9">
-                                        <input class="form-control" id="btnIcon" name="btnIcon" type="text" />
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="btnRemark">备注</label>
-                                    <div class="col-sm-9">
-                                        <input class="form-control" id="btnRemark" name="btnRemark" type="text" />
-                                    </div>
-                                </div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="btnSortno">序号</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="btnSortno" name="btnSortno" type="text" />
-									</div>
-								</div>
-							</form>
-						</div>
-                        <div class="modal-footer">
-                                <div class="row">
-                                    <div class="center-block" style="width: 160px;">
-                                        <button id="btnSave" class="btn btn-success btn-round btn-sm" onclick="btnSave()">
-                                            <i class="glyphicon glyphicon-ok"></i> 保存
-                                        </button>
-                                        <button type="button" class="btn btn-grey btn-round btn-sm" onclick="closeBtnWin()">
-                                            <i class="glyphicon glyphicon-remove"></i> 关闭
-                                        </button>
-                                    </div>
-                                </div>
-                        </div>
-						<!-- form 表单信息 -->
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
+    <div class="modal fade" id="editBtnWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">
+                        <span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+                    </button>
+                    <h6 class="modal-title" id="myModalLabel"></h6>
+                </div>
+                <div class="modal-body">
+                    <form class="form-horizontal" id="editBtnForm" method="post" onsubmit="return false;">
+                        <input type="hidden" id="btnId" name="btnId">
+                        <input type="hidden" id="menuId" name="menuId">
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="menuName">菜单名称</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="menuName" name="menuName" type="text" readonly="readonly" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="btnName">名称</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="btnName" name="btnName" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="btnCode">编码</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="btnCode" name="btnCode" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="btnIcon">图标</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="btnIcon" name="btnIcon" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="btnRemark">备注</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="btnRemark" name="btnRemark" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="btnSortno">序号</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="btnSortno" name="btnSortno" type="text" />
+                            </div>
+                        </div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                        <div class="row">
+                            <div class="center-block" style="width: 160px;">
+                                <button id="btnSave" class="btn btn-custom btn-round btn-sm" onclick="btnSave()">
+                                    <i class="glyphicon glyphicon-ok"></i> 保存
+                                </button>
+                                <button type="button" class="btn btn-custom btn-round btn-sm" onclick="closeBtnWin()">
+                                    <i class="glyphicon glyphicon-remove"></i> 关闭
+                                </button>
+                            </div>
+                        </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </body>
 </html>

+ 152 - 159
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/org.jsp

@@ -8,170 +8,163 @@
 <script src="<%=base%>/static/js/frame/org.js"></script>
 </head>
 <body class="p_body">
-	<div class="easyui-layout" data-options="fit:true">
-		<!-- 头部 -->
-		<div id="regionNorth" data-options="region:'north'" class="regionNorthStyle">
-			<%@ include file="../layouts/navbar.jsp"%>
-		</div>
-		<!-- 左边部分 -->
-		<div id="regionWest" data-options="region:'west'" class="regionWestStyle">
-			<%@ include file="../layouts/sidebar.jsp"%>
-		</div>
-		<!-- 底部 -->
-		<div id="regionFooter" data-options="region:'south'" class="regionFooterStyle">
-			<%@ include file="../layouts/footer.jsp"%>
-		</div>
-		<!-- 内容部分 -->
-		<div id="regionCenter" data-options="region:'center'" class="regionCenterStyle">
-			<div class="p_all">
-            <%@ include file="../layouts/menubar.jsp"%>
-				<div class="p_block">
-					<div class="p_headdiv">
-						<div class="p_headblock">
-							<div class="p_headleft">组织管理</div>
-						</div>
-					</div>
-					<div class="p_buttondiv">
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()" title="新增" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()" title="删除" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()" title="修改" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()" title="查询" />
-						</div>
-					</div>
-                    <div class="p_searchdiv">
-                        <table class="tabsearch">
-                            <tr class="trsearch">
-                                <td class="tdname">组织名称</td>
-                                <td class="tdcontent"><input type="text" id="srh_name" name="srh_name" class="p_txt"></td>
-                                <td class="tdname">组织编码</td>
-                                <td class="tdcontent"><input type="text" id="srh_code" name="srh_code" class="p_txt"></td>
-                                <td class="tdname"><img class="p_searchbtn"
-                                    src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" />
-                                </td>
-                            </tr>
-                        </table>
+    <div class="p_all">
+        <div class="p_headdiv">
+            <div class="p_headnav">
+                <img class="p_headnavimg" onclick="gotoHome()" src="<%=base%>/static/images/list/home.png" />
+            </div>
+            <div class="p_headblock">
+                <div class="p_headleft">权限管理 > 组织管理</div>
+            </div>
+        </div>
+        <div class="p_block">
+            <div class="p_fucdiv">
+                <div class="p_titlediv">
+                    <div class="p_titlename">组织管理</div>
+                    <div id="totalRecord" class="p_titlerecord">共0条记录</div>
+                </div>
+                <div class="p_buttondiv">
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()"
+                            title="删除" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()"
+                            title="修改" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()"
+                            title="新增" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()"
+                            title="查询" />
                     </div>
-                    <div class="container page-content">
-                        <div class="row clearfix">
-                            <div class="col-md-3 column page-content-tree">
-                                <!-- 组织树 -->
-                                <div id="orgTree" class="ztree"></div>
+                </div>
+            </div>
+            <div class="p_searchdiv">
+                <table class="tabsearch">
+                    <tr class="trsearch">
+                        <td class="tdname">组织名称</td>
+                        <td class="tdcontent"><input type="text" id="srh_name" name="srh_name" class="p_txt"></td>
+                        <td class="tdname">组织编码</td>
+                        <td class="tdcontent"><input type="text" id="srh_code" name="srh_code" class="p_txt"></td>
+                        <td class="tdname"><img class="p_searchbtn"
+                            src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" />
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <div class="container page-content">
+                <div class="row clearfix">
+                    <div class="col-md-3 column page-content-tree">
+                        <!-- 组织树 -->
+                        <div id="orgTree" class="ztree"></div>
+                    </div>
+                    <div class="col-md-9 column page-content-grid">
+                        <!--  列表部分 -->
+                        <table grid-manager="grid-table" id="grid-table"></table>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <%@ include file="../layouts/footer.jsp"%>
+    </div>
+
+    <div class="modal fade" id="editWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">
+                        <span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+                    </button>
+                    <h6 class="modal-title" id="myModalLabel"></h6>
+                </div>
+                <div class="modal-body">
+                    <form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
+                        <input type="hidden" id="id" name="id">
+                        <input type="hidden" id="pid" name="pid">
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="pname">上级名称</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="pname" name="pname" type="text" readonly="readonly" />
                             </div>
-                            <div class="col-md-9 column page-content-grid">
-                               <!--  列表部分 -->
-                                <table id="grid-table"></table>
-                                <div id="grid-pager"></div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="pcode">上级编码</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="pcode" name="pcode" type="text" readonly="readonly" />
                             </div>
                         </div>
-                    </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="name">组织名称</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="name" name="name" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="code">组织编码</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="code" name="code" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="orgType">组织类型</label>
+                            <div class="col-sm-9">
+                                <select class="selectpicker form-control" id="orgType" name="orgType" onchange="changeSzdSel()">
+                                    <option value="" selected="selected">请选择...</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="remark">备注</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="remark" name="remark" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="sortno">序号</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="sortno" name="sortno" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="szd">所在地</label>
+                            <div class="col-sm-9">
+                                <select class="selectpicker form-control" id="szd" name="szd" onchange="changeSzd()">
+                                    <option value="" selected="selected">请选择...</option>
+                                </select>
+                                <input id="szdName" name="szdName" type="hidden" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="xzqh">行政区划</label>
+                            <div class="col-sm-9">
+                                <select class="selectpicker form-control" id="xzqh" name="xzqh" data-live-search="true">
+                                    <option value="" selected="selected">请选择...</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="level">等级</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="level" name="level" type="text" />
+                            </div>
+                        </div>
+                    </form>
                 </div>
-			</div>
-
-			<div class="modal fade" id="editWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal">
-								<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
-							</button>
-							<h6 class="modal-title" id="myModalLabel"></h6>
-						</div>
-						<!-- form 表单信息 -->
-						<div class="modal-body">
-							<form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
-								<input type="hidden" id="id" name="id">
-                                <input type="hidden" id="pid" name="pid">
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="pname">上级名称</label>
-                                    <div class="col-sm-9">
-                                        <input class="form-control" id="pname" name="pname" type="text" readonly="readonly" />
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="pcode">上级编码</label>
-                                    <div class="col-sm-9">
-                                        <input class="form-control" id="pcode" name="pcode" type="text" readonly="readonly" />
-                                    </div>
-                                </div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="name">组织名称</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="name" name="name" type="text" />
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="code">组织编码</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="code" name="code" type="text" />
-									</div>
-								</div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="orgType">组织类型</label>
-                                    <div class="col-sm-9">
-                                        <select class="selectpicker form-control" id="orgType" name="orgType" onchange="changeSzdSel()">
-                                            <option value="" selected="selected">请选择...</option>
-                                        </select>
-                                    </div>
-                                </div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="remark">备注</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="remark" name="remark" type="text" />
-									</div>
-								</div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="sortno">序号</label>
-                                    <div class="col-sm-9">
-                                        <input class="form-control" id="sortno" name="sortno" type="text" />
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="szd">所在地</label>
-                                    <div class="col-sm-9">
-                                        <select class="selectpicker form-control" id="szd" name="szd" onchange="changeSzd()">
-                                            <option value="" selected="selected">请选择...</option>
-                                        </select>
-                                        <input id="szdName" name="szdName" type="hidden" />
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="xzqh">行政区划</label>
-                                    <div class="col-sm-9">
-                                        <select class="selectpicker form-control" id="xzqh" name="xzqh" data-live-search="true">
-                                            <option value="" selected="selected">请选择...</option>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="level">等级</label>
-                                    <div class="col-sm-9">
-                                        <input class="form-control" id="level" name="level" type="text" />
-                                    </div>
-                                </div>
-							</form>
-						</div>
-                        <div class="modal-footer">
-                                <div class="center-block" style="width: 160px;">
-                                    <button id="btnSave" class="btn btn-success btn-round btn-sm" onclick="save()">
-                                        <i class="glyphicon glyphicon-ok"></i> 保存
-                                    </button>
-                                    <button type="button" class="btn btn-grey btn-round btn-sm" onclick="closeWin()">
-                                        <i class="glyphicon glyphicon-remove"></i> 关闭
-                                    </button>
-                                </div>
+                <div class="modal-footer">
+                        <div class="center-block" style="width: 160px;">
+                            <button id="btnSave" class="btn btn-custom btn-round btn-sm" onclick="save()">
+                                <i class="glyphicon glyphicon-ok"></i> 保存
+                            </button>
+                            <button type="button" class="btn btn-custom btn-round btn-sm" onclick="closeWin()">
+                                <i class="glyphicon glyphicon-remove"></i> 关闭
+                            </button>
                         </div>
-						<!-- form 表单信息 -->
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
+                </div>
+            </div>
+        </div>
+    </div>
 </body>
 </html>

+ 100 - 107
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/param.jsp

@@ -8,116 +8,109 @@
 <script src="<%=base%>/static/js/frame/param.js"></script>
 </head>
 <body class="p_body">
-	<div class="easyui-layout" data-options="fit:true">
-		<!-- 头部 -->
-		<div id="regionNorth" data-options="region:'north'" class="regionNorthStyle">
-			<%@ include file="../layouts/navbar.jsp"%>
-		</div>
-		<!-- 左边部分 -->
-		<div id="regionWest" data-options="region:'west'" class="regionWestStyle">
-			<%@ include file="../layouts/sidebar.jsp"%>
-		</div>
-		<!-- 底部 -->
-		<div id="regionFooter" data-options="region:'south'" class="regionFooterStyle">
-			<%@ include file="../layouts/footer.jsp"%>
-		</div>
-		<!-- 内容部分 -->
-		<div id="regionCenter" data-options="region:'center'" class="regionCenterStyle">
-			<div class="p_all">
-            <%@ include file="../layouts/menubar.jsp"%>
-				<div class="p_block">
-					<div class="p_headdiv">
-						<div class="p_headblock">
-							<div class="p_headleft">参数管理</div>
-						</div>
-					</div>
-					<div class="p_buttondiv">
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()" title="新增" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()" title="删除" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()" title="修改" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()" title="查询" />
-						</div>
-					</div>
-                    <div class="p_searchdiv">
-                        <table class="tabsearch">
-                            <tr class="trsearch">
-                                <td class="tdname">参数主键</td>
-                                <td class="tdcontent"><input type="text" id="srh_key" name="srh_key" class="p_txt"></td>
-                                <td class="tdname"><img class="p_searchbtn"
-                                    src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" />
-                                </td>
-                            </tr>
-                        </table>
+    <div class="p_all">
+        <div class="p_headdiv">
+            <div class="p_headnav">
+                <img class="p_headnavimg" onclick="gotoHome()" src="<%=base%>/static/images/list/home.png" />
+            </div>
+            <div class="p_headblock">
+                <div class="p_headleft">权限管理 > 参数管理</div>
+            </div>
+        </div>
+        <div class="p_block">
+            <div class="p_fucdiv">
+                <div class="p_titlediv">
+                    <div class="p_titlename">参数管理</div>
+                    <div id="totalRecord" class="p_titlerecord">共0条记录</div>
+                </div>
+                <div class="p_buttondiv">
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()"
+                            title="删除" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()"
+                            title="修改" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()"
+                            title="新增" />
                     </div>
-                    <div class="container page-content">
-                        <!--列表部分-->
-                        <table id="grid-table"></table>
-                        <div id="grid-pager"></div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()"
+                            title="查询" />
                     </div>
                 </div>
-			</div>
+            </div>
+            <div class="p_searchdiv">
+                <table class="tabsearch">
+                    <tr class="trsearch">
+                        <td class="tdname">参数主键</td>
+                        <td class="tdcontent"><input type="text" id="srh_key" name="srh_key" class="p_txt"></td>
+                        <td class="tdname"><img class="p_searchbtn"
+                            src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" />
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <div class="container page-content">
+                <!--  列表部分 -->
+                <table grid-manager="grid-table" id="grid-table"></table>
+            </div>
+        </div>
+        <%@ include file="../layouts/footer.jsp"%>
+    </div>
 
-			<div class="modal fade" id="editWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal">
-								<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
-							</button>
-							<h6 class="modal-title" id="myModalLabel"></h6>
-						</div>
-						<!-- form 表单信息 -->
-						<div class="modal-body">
-							<form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
-								<input type="hidden" id="id" name="id">
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="key">参数主键</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="key" name="key" type="text" />
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="value">参数值</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="value" name="value" type="text" />
-									</div>
-								</div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="clazz">所属类</label>
-                                    <div class="col-sm-9">
-                                        <input class="form-control" id="clazz" name="clazz" type="text" />
-                                    </div>
-                                </div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="disp">属性描述</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="disp" name="disp" type="text" />
-									</div>
-								</div>
-								<div class="row">
-									<div class="center-block" style="width: 160px;">
-										<button class="btn btn-success btn-round btn-sm" onclick="save()">
-											<i class="glyphicon glyphicon-ok"></i> 保存
-										</button>
-										<button class="btn btn-grey btn-round btn-sm" onclick="closeWin()">
-											<i class="glyphicon glyphicon-remove"></i> 关闭
-										</button>
-									</div>
-								</div>
-							</form>
-						</div>
-						<!-- form 表单信息 -->
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
+    <div class="modal fade" id="editWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">
+                        <span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+                    </button>
+                    <h6 class="modal-title" id="myModalLabel"></h6>
+                </div>
+                <div class="modal-body">
+                    <form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
+                        <input type="hidden" id="id" name="id">
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="key">参数主键</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="key" name="key" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="value">参数值</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="value" name="value" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="clazz">所属类</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="clazz" name="clazz" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="disp">属性描述</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="disp" name="disp" type="text" />
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="center-block" style="width: 160px;">
+                                <button class="btn btn-custom btn-round btn-sm" onclick="save()">
+                                    <i class="glyphicon glyphicon-ok"></i> 保存
+                                </button>
+                                <button class="btn btn-custom btn-round btn-sm" onclick="closeWin()">
+                                    <i class="glyphicon glyphicon-remove"></i> 关闭
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
 </body>
 </html>

+ 114 - 119
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/role.jsp

@@ -8,130 +8,125 @@
 <script src="<%=base%>/static/js/frame/role.js"></script>
 </head>
 <body class="p_body">
-	<div class="easyui-layout" data-options="fit:true">
-		<!-- 头部 -->
-		<div id="regionNorth" data-options="region:'north'" class="regionNorthStyle">
-			<%@ include file="../layouts/navbar.jsp"%>
-		</div>
-		<!-- 左边部分 -->
-		<div id="regionWest" data-options="region:'west'" class="regionWestStyle">
-			<%@ include file="../layouts/sidebar.jsp"%>
-		</div>
-		<!-- 底部 -->
-		<div id="regionFooter" data-options="region:'south'" class="regionFooterStyle">
-			<%@ include file="../layouts/footer.jsp"%>
-		</div>
-		<!-- 内容部分 -->
-		<div id="regionCenter" data-options="region:'center'" class="regionCenterStyle">
-			<div class="p_all">
-            <%@ include file="../layouts/menubar.jsp"%>
-				<div class="p_block">
-					<div class="p_headdiv">
-						<div class="p_headblock">
-							<div class="p_headleft">角色管理</div>
-						</div>
-					</div>
-					<div class="p_buttondiv">
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()" title="新增" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()" title="删除" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()" title="修改" />
-						</div>
-                        <div class="p_buttonbg">
-                            <img class="p_buttonimg" src="<%=base%>/static/images/list/bgzy.png" onclick="editAuthInfo()" title="授权" />
-                        </div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()" title="查询" />
-						</div>
-					</div>
-                    <div class="p_searchdiv">
-                        <table class="tabsearch">
-                            <tr class="trsearch">
-                                <td class="tdname">角色编码</td>
-                                <td class="tdcontent"><input type="text" id="srh_code" name="srh_code" class="p_txt"></td>
-                                <td class="tdname">角色名称</td>
-                                <td class="tdcontent"><input type="text" id="srh_name" name="srh_name" class="p_txt"></td>
-                                <td class="tdname"><img class="p_searchbtn"
-                                    src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" />
-                                </td>
-                            </tr>
-                        </table>
+    <div class="p_all">
+        <div class="p_headdiv">
+            <div class="p_headnav">
+                <img class="p_headnavimg" onclick="gotoHome()" src="<%=base%>/static/images/list/home.png" />
+            </div>
+            <div class="p_headblock">
+                <div class="p_headleft">权限管理 > 角色管理</div>
+            </div>
+        </div>
+        <div class="p_block">
+            <div class="p_fucdiv">
+                <div class="p_titlediv">
+                    <div class="p_titlename">角色管理</div>
+                    <div id="totalRecord" class="p_titlerecord">共0条记录</div>
+                </div>
+                <div class="p_buttondiv">
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()"
+                            title="删除" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/bgzy.png" onclick="editAuthInfo()"
+                            title="授权" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()"
+                            title="修改" />
                     </div>
-                    <div class="container page-content">
-                        <!--列表部分-->
-                        <table id="grid-table"></table>
-                        <div id="grid-pager"></div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()"
+                            title="新增" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()"
+                            title="查询" />
                     </div>
                 </div>
-			</div>
+            </div>
+            <div class="p_searchdiv">
+                <table class="tabsearch">
+                    <tr class="trsearch">
+                        <td class="tdname">角色名称</td>
+                        <td class="tdcontent"><input type="text" id="srh_name" name="srh_name" class="p_txt"></td>
+                        <td class="tdname">角色编码</td>
+                        <td class="tdcontent"><input type="text" id="srh_code" name="srh_code" class="p_txt"></td>
+                        <td class="tdname"><img class="p_searchbtn"
+                            src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" />
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <div class="container page-content">
+                <!--  列表部分 -->
+                <table grid-manager="grid-table" id="grid-table"></table>
+            </div>
+        </div>
+        <%@ include file="../layouts/footer.jsp"%>
+    </div>
 
-			<div class="modal fade" id="editWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal">
-								<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
-							</button>
-							<h6 class="modal-title" id="myModalLabel"></h6>
-						</div>
-						<!-- form 表单信息 -->
-						<div class="modal-body">
-							<form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
-								<input type="hidden" id="id" name="id">
-                                <input type="hidden" id="menuBtnRef" name="menuBtnRef">
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="name">角色名称</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="name" name="name" type="text" />
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="code">角色编码</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="code" name="code" type="text" />
-									</div>
-								</div>
-								<div class="form-group" id="remarkDiv">
-									<label class="col-sm-2 control-label" for="remark">备注</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="remark" name="remark" type="text" />
-									</div>
-								</div>
-                                <div class="form-group" id="sortnoDiv">
-                                    <label class="col-sm-2 control-label" for="sortno">序号</label>
-                                    <div class="col-sm-9">
-                                        <input class="form-control" id="sortno" name="sortno" type="text" />
-                                    </div>
-                                </div>
-                                <div class="form-group" id="menuTreeDiv">
-                                    <label class="col-sm-2 control-label" for="menuTree">关联菜单</label>
-                                    <div class="col-sm-9">
-                                    	<div class="form-control" style="height: 200px;  overflow-x: auto; overflow-y: scroll;">
-                                            <div id="menuTree" class="ztree"></div>
-                                        </div>
-                                    </div>
-                                </div>
-							</form>
-						</div>
-                        <div class="modal-footer">
-                                <div class="center-block" style="width: 160px;">
-                                    <button id="btnSave" class="btn btn-success btn-round btn-sm" onclick="save()">
-                                        <i class="glyphicon glyphicon-ok"></i> 保存
-                                    </button>
-                                    <button type="button" class="btn btn-grey btn-round btn-sm" onclick="closeWin()">
-                                        <i class="glyphicon glyphicon-remove"></i> 关闭
-                                    </button>
+    <div class="modal fade" id="editWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">
+                        <span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+                    </button>
+                    <h6 class="modal-title" id="myModalLabel"></h6>
+                </div>
+                <div class="modal-body">
+                    <form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
+                        <input type="hidden" id="id" name="id">
+                        <input type="hidden" id="menuBtnRef" name="menuBtnRef">
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="name">角色名称</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="name" name="name" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="code">角色编码</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="code" name="code" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group" id="remarkDiv">
+                            <label class="col-sm-2 control-label" for="remark">备注</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="remark" name="remark" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group" id="sortnoDiv">
+                            <label class="col-sm-2 control-label" for="sortno">序号</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="sortno" name="sortno" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group" id="menuTreeDiv">
+                            <label class="col-sm-2 control-label" for="menuTree">关联菜单</label>
+                            <div class="col-sm-9">
+                                <div class="form-control" style="height: 200px;  overflow-x: auto; overflow-y: scroll;">
+                                    <div id="menuTree" class="ztree"></div>
                                 </div>
+                            </div>
                         </div>
-						<!-- form 表单信息 -->
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                        <div class="center-block" style="width: 160px;">
+                            <button id="btnSave" class="btn btn-custom btn-round btn-sm" onclick="save()">
+                                <i class="glyphicon glyphicon-ok"></i> 保存
+                            </button>
+                            <button type="button" class="btn btn-custom btn-round btn-sm" onclick="closeWin()">
+                                <i class="glyphicon glyphicon-remove"></i> 关闭
+                            </button>
+                        </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
 </body>
 </html>

+ 90 - 97
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/frame/xzqh.jsp

@@ -8,110 +8,103 @@
 <script src="<%=base%>/static/js/frame/xzqh.js"></script>
 </head>
 <body class="p_body">
-	<div class="easyui-layout" data-options="fit:true">
-		<!-- 头部 -->
-		<div id="regionNorth" data-options="region:'north'" class="regionNorthStyle">
-			<%@ include file="../layouts/navbar.jsp"%>
-		</div>
-		<!-- 左边部分 -->
-		<div id="regionWest" data-options="region:'west'" class="regionWestStyle">
-			<%@ include file="../layouts/sidebar.jsp"%>
-		</div>
-		<!-- 底部 -->
-		<div id="regionFooter" data-options="region:'south'" class="regionFooterStyle">
-			<%@ include file="../layouts/footer.jsp"%>
-		</div>
-		<!-- 内容部分 -->
-		<div id="regionCenter" data-options="region:'center'" class="regionCenterStyle">
-			<div class="p_all">
-            <%@ include file="../layouts/menubar.jsp"%>
-				<div class="p_block">
-					<div class="p_headdiv">
-						<div class="p_headblock">
-							<div class="p_headleft">行政区划管理</div>
-						</div>
-					</div>
-					<div class="p_buttondiv">
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()" title="新增" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()" title="删除" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()" title="修改" />
-						</div>
-						<div class="p_buttonbg">
-							<img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()" title="查询" />
-						</div>
-					</div>
-                    <div class="p_searchdiv">
-                        <table class="tabsearch">
-                            <tr class="trsearch">
-                                <td class="tdname">编码</td>
-                                <td class="tdcontent"><input type="text" id="srh_code" name="srh_code" class="p_txt"></td>
-                                <td class="tdname">名称</td>
-                                <td class="tdcontent"><input type="text" id="srh_name" name="srh_name" class="p_txt"></td>
-                                <td class="tdname"><img class="p_searchbtn"
-                                    src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" />
-                                </td>
-                            </tr>
-                        </table>
+    <div class="p_all">
+        <div class="p_headdiv">
+            <div class="p_headnav">
+                <img class="p_headnavimg" onclick="gotoHome()" src="<%=base%>/static/images/list/home.png" />
+            </div>
+            <div class="p_headblock">
+                <div class="p_headleft">权限管理 > 行政区划管理</div>
+            </div>
+        </div>
+        <div class="p_block">
+            <div class="p_fucdiv">
+                <div class="p_titlediv">
+                    <div class="p_titlename">行政区划管理</div>
+                    <div id="totalRecord" class="p_titlerecord">共0条记录</div>
+                </div>
+                <div class="p_buttondiv">
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()"
+                            title="删除" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()"
+                            title="修改" />
+                    </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()"
+                            title="新增" />
                     </div>
-                    <div class="container page-content">
-                        <!--列表部分-->
-                        <table id="grid-table"></table>
-                        <div id="grid-pager"></div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()"
+                            title="查询" />
                     </div>
                 </div>
-			</div>
+            </div>
+            <div class="p_searchdiv">
+                <table class="tabsearch">
+                    <tr class="trsearch">
+                        <td class="tdname">名称</td>
+                        <td class="tdcontent"><input type="text" id="srh_name" name="srh_name" class="p_txt"></td>
+                        <td class="tdname">编码</td>
+                        <td class="tdcontent"><input type="text" id="srh_code" name="srh_code" class="p_txt"></td>
+                        <td class="tdname"><img class="p_searchbtn"
+                            src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" />
+                        </td>
+                    </tr>
+                </table>
+            </div>
+            <div class="container page-content">
+                <!--  列表部分 -->
+                <table grid-manager="grid-table" id="grid-table"></table>
+            </div>
+        </div>
+        <%@ include file="../layouts/footer.jsp"%>
+    </div>
 
-			<div class="modal fade" id="editWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal">
-								<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
-							</button>
-							<h6 class="modal-title" id="myModalLabel"></h6>
+	<div class="modal fade" id="editWin" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal">
+						<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+					</button>
+					<h6 class="modal-title" id="myModalLabel"></h6>
+				</div>
+				<div class="modal-body">
+					<form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
+						<input type="hidden" id="id" name="id">
+						<div class="form-group">
+							<label class="col-sm-2 control-label" for="code">编码</label>
+							<div class="col-sm-9">
+								<input class="form-control" id="code" name="code" type="text" />
+							</div>
 						</div>
-						<!-- form 表单信息 -->
-						<div class="modal-body">
-							<form class="form-horizontal" id="editForm" method="post" onsubmit="return false;">
-								<input type="hidden" id="id" name="id">
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="code">编码</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="code" name="code" type="text" />
-									</div>
-								</div>
-								<div class="form-group">
-									<label class="col-sm-2 control-label" for="name">名称</label>
-									<div class="col-sm-9">
-										<input class="form-control" id="name" name="name" type="text" />
-									</div>
-								</div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="xh">序号</label>
-                                    <div class="col-sm-9">
-                                        <input class="form-control" id="xh" name="xh" type="text" />
-                                    </div>
-                                </div>
-								<div class="row">
-									<div class="center-block" style="width: 160px;">
-										<button class="btn btn-success btn-round btn-sm" onclick="save()">
-											<i class="glyphicon glyphicon-ok"></i> 保存
-										</button>
-										<button class="btn btn-grey btn-round btn-sm" onclick="closeWin()">
-											<i class="glyphicon glyphicon-remove"></i> 关闭
-										</button>
-									</div>
-								</div>
-							</form>
+						<div class="form-group">
+							<label class="col-sm-2 control-label" for="name">名称</label>
+							<div class="col-sm-9">
+								<input class="form-control" id="name" name="name" type="text" />
+							</div>
 						</div>
-						<!-- form 表单信息 -->
-					</div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="xh">序号</label>
+                            <div class="col-sm-9">
+                                <input class="form-control" id="xh" name="xh" type="text" />
+                            </div>
+                        </div>
+					</form>
 				</div>
+                <div class="modal-footer">
+                        <div class="center-block" style="width: 160px;">
+                            <button id="btnSave" class="btn btn-custom btn-round btn-sm" onclick="save()">
+                                <i class="glyphicon glyphicon-ok"></i> 保存
+                            </button>
+                            <button type="button" class="btn btn-custom btn-round btn-sm" onclick="closeWin()">
+                                <i class="glyphicon glyphicon-remove"></i> 关闭
+                            </button>
+                        </div>
+                </div>
 			</div>
 		</div>
 	</div>

+ 234 - 241
gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/user/main.jsp

@@ -7,269 +7,262 @@
 <script src="<%=base%>/static/js/user/index.js"></script>
 </head>
 <body class="p_body">
-    <div class="easyui-layout" data-options="fit:true">
-        <!-- 内容部分 -->
-        <div id="regionCenter" id="regionCenter" data-options="region:'center'" class="regionCenterStyle">
-            <div class="p_all">
-            <%@ include file="../layouts/menubar.jsp"%>
-                <div class="p_block">
-                    <div class="p_headdiv">
-                        <div class="p_headblock">
-                            <div class="p_headleft">用户管理</div>
-                        </div>
+    <div class="p_all">
+        <div class="p_headdiv">
+            <div class="p_headnav">
+                <img class="p_headnavimg" onclick="gotoHome()" src="<%=base%>/static/images/list/home.png" />
+            </div>
+            <div class="p_headblock">
+                <div class="p_headleft">用户管理</div>
+            </div>
+        </div>
+        <div class="p_block">
+            <div class="p_fucdiv">
+                <div class="p_titlediv">
+                    <div class="p_titlename">用户管理</div>
+                    <div id="totalRecord" class="p_titlerecord">共0条记录</div>
+                </div>
+                <div class="p_buttondiv">
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()"
+                            title="删除" />
                     </div>
-                    <div class="p_buttondiv">
-                        <div class="p_buttonbg">
-                            <img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()" title="新增" />
-                        </div>
-                        <div class="p_buttonbg">
-                            <img class="p_buttonimg" src="<%=base%>/static/images/list/delete.png" onclick="delInfo()" title="删除" />
-                        </div>
-                        <div class="p_buttonbg">
-                            <img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()" title="修改" />
-                        </div>
-                        <div class="p_buttonbg">
-                            <img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()" title="查询" />
-                        </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/edit.png" onclick="editInfo()"
+                            title="修改" />
                     </div>
-                    <div class="p_searchdiv">
-                        <table class="tabsearch">
-                            <tr class="trsearch">
-                                <td class="tdname">用户名</td>
-                                <td class="tdcontent"><input type="text" id="srh_realName" name="srh_realName" class="p_txt" value=""></td>
-                                <td class="tdname">登录帐号</td>
-                                <td class="tdcontent"><input type="text" id="srh_loginName" name="srh_loginName" class="p_txt" value=""></td>
-                                <td class="tdname"><img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" />
-                                </td>
-                            </tr>
-                        </table>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" onclick="addInfo()"
+                            title="新增" />
                     </div>
-                    <div class="container page-content">
-                        <div class="form group">
-                            <div class="col-md-3 column page-content-tree">
-                                <!-- 组织树 -->
-                                <div id="orgTree" class="ztree"></div>
-                            </div>
-                            <div class="col-md-9 column page-content-grid">
-                               <!--  列表部分 -->
-                                <table id="grid-table"></table>
-                                <div id="grid-pager"></div>
-                            </div>
-                        </div>
+                    <div class="p_buttonbg">
+                        <img class="p_buttonimg" src="<%=base%>/static/images/list/search.png" onclick="showSearch()"
+                            title="查询" />
+                    </div>
+                </div>
+            </div>
+            <div class="p_searchdiv">
+                <table class="tabsearch">
+                    <tr class="trsearch">
+                        <td class="tdname">用户名</td>
+                        <td class="tdcontent"><input type="text" id="srh_realName" name="srh_realName"
+                            class="p_txt" value=""></td>
+                        <td class="tdname">登录帐号</td>
+                        <td class="tdcontent"><input type="text" id="srh_loginName" name="srh_loginName"
+                            class="p_txt" value=""></td>
+                        <td class="tdname"><img class="p_searchbtn"
+                            src="<%=base%>/static/images/list/btn_query.png" title="查询" onclick="searchRecord()" /></td>
+                    </tr>
+                </table>
+            </div>
+            <div class="container page-content">
+                <div class="row clearfix">
+                    <div class="col-md-3 column page-content-tree">
+                        <!-- 组织树 -->
+                        <div id="orgTree" class="ztree"></div>
+                    </div>
+                    <div class="col-md-9 column page-content-grid">
+                        <!--  列表部分 -->
+                        <table grid-manager="grid-table" id="grid-table"></table>
                     </div>
                 </div>
             </div>
+        </div>
+        <%@ include file="../layouts/footer.jsp"%>
+    </div>
 
-            <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-                aria-hidden="true">
-                <div class="modal-dialog" style="width: 760px">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal">
-                                <span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
-                            </button>
-                            <h6 class="modal-title" id="myModalLabel"></h6>
+    <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal-dialog" style="width: 760px">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">
+                        <span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+                    </button>
+                    <h6 class="modal-title" id="myModalLabel"></h6>
+                </div>
+                <div class="modal-body" style="max-height: 480px; overflow-y: auto;">
+                    <form class="form-horizontal" id="myForm" method="post" onsubmit="return false;">
+                        <input type="hidden" id="id" name="id">
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="realName">真实姓名</label>
+                            <div class="col-sm-4">
+                                <input class="form-control" id="realName" name="realName" type="text" />
+                            </div>
+                            <label class="col-sm-2 control-label" for="loginName">登录账号</label>
+                            <div class="col-sm-4">
+                                <input class="form-control" id="loginName" name="loginName" type="text" />
+                            </div>
                         </div>
-                        <!-- form 表单信息 -->
-                        <div class="modal-body" style="max-height: 480px; overflow-y: auto;">
-                            <form class="form-horizontal" id="myForm" method="post" onsubmit="return false;">
-                                <input type="hidden" id="id" name="id">
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="realName">真实姓名</label>
-                                    <div class="col-sm-4">
-                                        <input class="form-control" id="realName" name="realName" type="text" />
-                                    </div>
-                                    <label class="col-sm-2 control-label" for="loginName">登录账号</label>
-                                    <div class="col-sm-4">
-                                        <input class="form-control" id="loginName" name="loginName" type="text" />
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="orgid">所属组织</label>
-                                    <div class="col-sm-4">
-                                        <select class="selectpicker form-control" id="orgid" name="orgid" onchange="changeSzd()"></select>
-                                    </div>
-                                    <label class="col-sm-2 control-label" for="szdName">所在地市</label>
-                                    <div class="col-sm-4">
-                                        <input class="form-control" id="szdName" name="szdName" type="text" readonly="readonly" />
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="groupid">所属分组</label>
-                                    <div class="col-sm-4">
-                                        <select class="selectpicker form-control" multiple id="groupid" name="groupid" title="请选择..."></select>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="ifSafteyChk">是否安全负责人</label>
-                                    <label class="col-sm-1 checkbox">
-                                      <input type="checkbox" id="ifSafteyChk" name="ifSafteyChk" value="Y">
-                                      <input type="hidden" id="ifSaftey" name="ifSaftey" value="N">
-                                    </label>
-                                    <label class="col-sm-3 control-label" for="ifLoginChk">是否允许登录
-                                      <input type="checkbox" id="ifLoginChk" id="ifLoginChk" value="Y">
-                                      <input type="hidden" id="ifLogin" name="ifLogin" value="N">
-                                    </label>
-                                    <label class="col-sm-3 control-label" for="ifMapviewChk">是否允许查看地图
-                                      <input type="checkbox" id="ifMapviewChk" id="ifMapviewChk" value="Y">
-                                      <input type="hidden" id="ifMapview" name="ifMapview" value="N">
-                                    </label>
-                                    <label class="col-sm-3 control-label" for="ifOverseerChk">是否监察人员
-                                      <input type="checkbox" id="ifOverseerChk" id="ifOverseerChk" value="Y">
-                                      <input type="hidden" id="ifOverseer" name="ifOverseer" value="N">
-                                    </label>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="orgid">所属组织</label>
+                            <div class="col-sm-4">
+                                <select class="selectpicker form-control" id="orgid" name="orgid" onchange="changeSzd()"></select>
+                            </div>
+                            <label class="col-sm-2 control-label" for="szdName">所在地市</label>
+                            <div class="col-sm-4">
+                                <input class="form-control" id="szdName" name="szdName" type="text" readonly="readonly" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="groupid">所属分组</label>
+                            <div class="col-sm-4">
+                                <select class="selectpicker form-control" multiple id="groupid" name="groupid"
+                                    title="请选择..."></select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="ifSafteyChk">是否安全负责人</label> <label
+                                class="col-sm-1 checkbox"> <input type="checkbox" id="ifSafteyChk"
+                                name="ifSafteyChk" value="Y"> <input type="hidden" id="ifSaftey" name="ifSaftey"
+                                value="N">
+                            </label> <label class="col-sm-3 control-label" for="ifLoginChk">是否允许登录 <input
+                                type="checkbox" id="ifLoginChk" id="ifLoginChk" value="Y"> <input type="hidden"
+                                id="ifLogin" name="ifLogin" value="N">
+                            </label> <label class="col-sm-3 control-label" for="ifMapviewChk">是否允许查看地图 <input
+                                type="checkbox" id="ifMapviewChk" id="ifMapviewChk" value="Y"> <input
+                                type="hidden" id="ifMapview" name="ifMapview" value="N">
+                            </label> <label class="col-sm-3 control-label" for="ifOverseerChk">是否监察人员 <input
+                                type="checkbox" id="ifOverseerChk" id="ifOverseerChk" value="Y"> <input
+                                type="hidden" id="ifOverseer" name="ifOverseer" value="N">
+                            </label>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="ifAdminChk">是否行政人员</label> <label
+                                class="col-sm-1 checkbox"> <input type="checkbox" id="ifAdminChk"
+                                id="ifAdminChk" value="Y"> <input type="hidden" id="ifAdmin" name="ifAdmin"
+                                value="N">
+                            </label> <label id="ifApproveLbl" class="col-sm-3 control-label" for="ifApproveChk">是否自动审批人员
+                                <input type="checkbox" id="ifApproveChk" id="ifApproveChk" value="Y"> <input
+                                type="hidden" id="ifApprove" name="ifApprove" value="N">
+                            </label> <label id="ifJobLbl" class="col-sm-3 control-label" for="ifJobChk">是否允许作业申请 <input
+                                type="checkbox" id="ifJobChk" id="ifJobChk" value="Y"> <input type="hidden"
+                                id="ifJob" name="ifJob" value="N">
+                            </label> <label class="col-sm-3 control-label" for="ifShipChk">是否船代 <input type="checkbox"
+                                id="ifShipChk" id="ifShipChk" value="Y"> <input type="hidden" id="ifShip"
+                                name="ifShip" value="N">
+                            </label>
+                        </div>
+                        <div class="form-group">
+                            <div id="belongsOrgLbl">
+                                <label class="col-sm-2 control-label" for="belongsOrg">所属机构</label>
+                                <div class="col-sm-4" style="margin-top: 8px">
+                                    <input class="form-control" id="belongsOrg" name="belongsOrg" type="text" />
                                 </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="ifAdminChk">是否行政人员</label>
-                                    <label class="col-sm-1 checkbox">
-                                      <input type="checkbox" id="ifAdminChk" id="ifAdminChk" value="Y">
-                                      <input type="hidden" id="ifAdmin" name="ifAdmin" value="N">
-                                    </label>
-                                    <label id="ifApproveLbl" class="col-sm-3 control-label" for="ifApproveChk">是否自动审批人员
-                                      <input type="checkbox" id="ifApproveChk" id="ifApproveChk" value="Y">
-                                      <input type="hidden" id="ifApprove" name="ifApprove" value="N">
-                                    </label>
-                                    <label id="ifJobLbl" class="col-sm-3 control-label" for="ifJobChk">是否允许作业申请
-                                      <input type="checkbox" id="ifJobChk" id="ifJobChk" value="Y">
-                                      <input type="hidden" id="ifJob" name="ifJob" value="N">
-                                    </label>
-                                    <label class="col-sm-3 control-label" for="ifShipChk">是否船代
-                                      <input type="checkbox" id="ifShipChk" id="ifShipChk" value="Y">
-                                      <input type="hidden" id="ifShip" name="ifShip" value="N">
-                                    </label>
+                            </div>
+                            <div id="belongsShipLbl">
+                                <label class="col-sm-2 control-label" for="belongsShip">所属船代</label>
+                                <div class="col-sm-4" style="margin-top: 8px">
+                                    <input class="form-control" id="belongsShip" name="belongsShip" type="text" />
                                 </div>
-                                <div class="form-group">
-                                    <div id="belongsOrgLbl">
-                                        <label class="col-sm-2 control-label" for="belongsOrg">所属机构</label>
-                                        <div class="col-sm-4" style="margin-top: 8px">
-                                            <input class="form-control" id="belongsOrg" name="belongsOrg" type="text" />
-                                        </div>
-                                    </div>
-                                    <div id="belongsShipLbl">
-                                        <label class="col-sm-2 control-label" for="belongsShip">所属船代</label>
-                                        <div class="col-sm-4" style="margin-top: 8px">
-                                            <input class="form-control" id="belongsShip" name="belongsShip" type="text" />
-                                        </div>
-                                    </div>
-                                    <div id="approveSetLbl">
-                                        <label class="col-sm-2 control-label" for="approveSet">审批设置</label>
-                                        <div class="col-sm-4" style="margin-top: 8px">
-                                            <select class="selectpicker form-control" multiple id="approveSet" name="approveSet" title="请选择..."></select>
-                                        </div>
-                                    </div>
-                                    <div id="declarerCidLbl">
-                                        <label class="col-sm-2 control-label" for="declarerCid">申报员证书编号</label>
-                                        <div class="col-sm-4" style="margin-top: 8px">
-                                            <input class="form-control" id="declarerCid" name="declarerCid" type="text" />
-                                        </div>
-                                    </div>
-                                    <div id="belongsOperatorLbl">
-                                        <label class="col-sm-2 control-label" for="belongsOperator">所属经营人</label>
-                                        <div class="col-sm-4" style="margin-top: 8px">
-                                            <input class="form-control" id="belongsOperator" name="belongsOperator" type="text" />
-                                        </div>
-                                    </div>
-                                    <div id="safetyAssessOrgLbl">
-                                        <label class="col-sm-2 control-label" for="safetyAssessOrg">安全评价机构</label>
-                                        <div class="col-sm-4" style="margin-top: 8px">
-                                            <input class="form-control" id="safetyAssessOrg" name="safetyAssessOrg" type="text" />
-                                        </div>
-                                    </div>
-                                    <div id="developmentOrgLbl">
-                                        <label class="col-sm-2 control-label" for="developmentOrg">建设单位</label>
-                                        <div class="col-sm-4" style="margin-top: 8px">
-                                            <input class="form-control" id="developmentOrg" name="developmentOrg" type="text" />
-                                        </div>
-                                    </div>
-                                    <label class="col-sm-2 control-label" for="birthday">出生年月</label>
-                                    <div class="col-sm-4" style="margin-top: 8px">
-                                        <div class="input-group date" id="birthdayDiv">
-                                            <input id="birthday" name="birthday" class="form-control" type="text" readonly="readonly">
-                                            <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
-                                        </div>
-                                    </div>
+                            </div>
+                            <div id="approveSetLbl">
+                                <label class="col-sm-2 control-label" for="approveSet">审批设置</label>
+                                <div class="col-sm-4" style="margin-top: 8px">
+                                    <select class="selectpicker form-control" multiple id="approveSet" name="approveSet"
+                                        title="请选择..."></select>
                                 </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="sex">性别</label>
-                                    <div class="col-sm-4">
-                                        <select class="selectpicker form-control" id="sex" name="sex" title="请选择..."></select>
-                                    </div>
-                                    <label class="col-sm-2 control-label" for="politicsStatus">政治面貌</label>
-                                    <div class="col-sm-4">
-                                        <select class="selectpicker form-control" id="politicsStatus" name="politicsStatus" title="请选择..."></select>
-                                    </div>
+                            </div>
+                            <div id="declarerCidLbl">
+                                <label class="col-sm-2 control-label" for="declarerCid">申报员证书编号</label>
+                                <div class="col-sm-4" style="margin-top: 8px">
+                                    <input class="form-control" id="declarerCid" name="declarerCid" type="text" />
                                 </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="educationBackground">学历</label>
-                                    <div class="col-sm-4">
-                                        <select class="selectpicker form-control" id="educationBackground" name="educationBackground" title="请选择..."></select>
-                                    </div>
-                                    <label class="col-sm-2 control-label" for="duty">职务</label>
-                                    <div class="col-sm-4">
-                                        <select class="selectpicker form-control" id="duty" name="duty" title="请选择..."></select>
-                                    </div>
+                            </div>
+                            <div id="belongsOperatorLbl">
+                                <label class="col-sm-2 control-label" for="belongsOperator">所属经营人</label>
+                                <div class="col-sm-4" style="margin-top: 8px">
+                                    <input class="form-control" id="belongsOperator" name="belongsOperator" type="text" />
                                 </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="planning">编制</label>
-                                    <div class="col-sm-4">
-                                        <select class="selectpicker form-control" id="planning" name="planning" title="请选择..."></select>
-                                    </div>
-                                    <label class="col-sm-2 control-label" for="userState">人员状态</label>
-                                    <div class="col-sm-4">
-                                        <select class="selectpicker form-control" id="userState" name="userState" title="请选择..."></select>
-                                    </div>
+                            </div>
+                            <div id="safetyAssessOrgLbl">
+                                <label class="col-sm-2 control-label" for="safetyAssessOrg">安全评价机构</label>
+                                <div class="col-sm-4" style="margin-top: 8px">
+                                    <input class="form-control" id="safetyAssessOrg" name="safetyAssessOrg" type="text" />
                                 </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="phone">联系电话</label>
-                                    <div class="col-sm-4">
-                                        <input class="form-control" id="phone" name="phone" type="text" />
-                                    </div>
-                                    <label class="col-sm-2 control-label" for="email">电子邮箱</label>
-                                    <div class="col-sm-4">
-                                        <input class="form-control" id="email" name="email" type="text" />
-                                    </div>
+                            </div>
+                            <div id="developmentOrgLbl">
+                                <label class="col-sm-2 control-label" for="developmentOrg">建设单位</label>
+                                <div class="col-sm-4" style="margin-top: 8px">
+                                    <input class="form-control" id="developmentOrg" name="developmentOrg" type="text" />
                                 </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label" for="fax">传真</label>
-                                    <div class="col-sm-4">
-                                        <input class="form-control" id="fax" name="fax" type="text" />
-                                    </div>
-                                    <label class="col-sm-2 control-label" for="address">办公地址</label>
-                                    <div class="col-sm-4">
-                                        <input class="form-control" id="address" name="address" type="text" />
-                                    </div>
+                            </div>
+                            <label class="col-sm-2 control-label" for="birthday">出生年月</label>
+                            <div class="col-sm-4" style="margin-top: 8px">
+                                <div class="input-group date" id="birthdayDiv">
+                                    <input id="birthday" name="birthday" class="form-control" type="text"
+                                        readonly="readonly"> <span class="input-group-addon"><span
+                                        class="glyphicon glyphicon-calendar"></span></span>
                                 </div>
-                            </form>
+                            </div>
                         </div>
-                        <div class="modal-footer">
-                                <div class="row">
-                                    <div class="center-block" style="width: 160px;">
-                                        <button id="btnSave" class="btn btn-success btn-round btn-sm" onclick="save()">
-                                            <i class="glyphicon glyphicon-ok"></i> 保存
-                                        </button>
-                                        <button type="button" class="btn btn-grey btn-round btn-sm" onclick="closeWin()">
-                                            <i class="glyphicon glyphicon-remove"></i> 关闭
-                                        </button>
-                                    </div>
-                                </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="sex">性别</label>
+                            <div class="col-sm-4">
+                                <select class="selectpicker form-control" id="sex" name="sex" title="请选择..."></select>
+                            </div>
+                            <label class="col-sm-2 control-label" for="politicsStatus">政治面貌</label>
+                            <div class="col-sm-4">
+                                <select class="selectpicker form-control" id="politicsStatus" name="politicsStatus"
+                                    title="请选择..."></select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="educationBackground">学历</label>
+                            <div class="col-sm-4">
+                                <select class="selectpicker form-control" id="educationBackground"
+                                    name="educationBackground" title="请选择..."></select>
+                            </div>
+                            <label class="col-sm-2 control-label" for="duty">职务</label>
+                            <div class="col-sm-4">
+                                <select class="selectpicker form-control" id="duty" name="duty" title="请选择..."></select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="planning">编制</label>
+                            <div class="col-sm-4">
+                                <select class="selectpicker form-control" id="planning" name="planning" title="请选择..."></select>
+                            </div>
+                            <label class="col-sm-2 control-label" for="userState">人员状态</label>
+                            <div class="col-sm-4">
+                                <select class="selectpicker form-control" id="userState" name="userState" title="请选择..."></select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="phone">联系电话</label>
+                            <div class="col-sm-4">
+                                <input class="form-control" id="phone" name="phone" type="text" />
+                            </div>
+                            <label class="col-sm-2 control-label" for="email">电子邮箱</label>
+                            <div class="col-sm-4">
+                                <input class="form-control" id="email" name="email" type="text" />
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label" for="fax">传真</label>
+                            <div class="col-sm-4">
+                                <input class="form-control" id="fax" name="fax" type="text" />
+                            </div>
+                            <label class="col-sm-2 control-label" for="address">办公地址</label>
+                            <div class="col-sm-4">
+                                <input class="form-control" id="address" name="address" type="text" />
+                            </div>
+                        </div>
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <div class="row">
+                        <div class="center-block" style="width: 160px;">
+                            <button id="btnSave" class="btn btn-custom btn-round btn-sm" onclick="save()">
+                                <i class="glyphicon glyphicon-ok"></i> 保存
+                            </button>
+                            <button type="button" class="btn btn-custom btn-round btn-sm" onclick="closeWin()">
+                                <i class="glyphicon glyphicon-remove"></i> 关闭
+                            </button>
                         </div>
-                        <!-- form 表单信息 -->
                     </div>
                 </div>
             </div>
         </div>
-        <!-- 头部 -->
-        <div id="regionNorth" data-options="region:'north'" class="regionNorthStyle">
-            <%@ include file="../layouts/navbar.jsp"%>
-        </div>
-        <!-- 左边部分 -->
-        <div id="regionWest" data-options="region:'west'" class="regionWestStyle">
-            <%@ include file="../layouts/sidebar.jsp"%>
-        </div>
-        <!-- 底部 -->
-        <div id="regionFooter" data-options="region:'south'" class="regionFooterStyle">
-            <%@ include file="../layouts/footer.jsp"%>
-        </div>
     </div>
 </body>
 </html>

+ 2 - 2
gkaqv2/trunk/modules/web/src/main/webapp/static/css/common/basic.css

@@ -103,8 +103,8 @@ body {
   overflow-y: scroll;
 }
 .page-content-grid {
-  margin: 0;
-  padding-left: 0px;
+  padding:0px 8px 0px 8px;
+  margin:0px auto;
 }
 .page-content {
   background-color: #ffffff;

+ 18 - 0
gkaqv2/trunk/modules/web/src/main/webapp/static/css/common/main.css

@@ -311,3 +311,21 @@ input[type=radio], input[type=checkbox] {
   background-color: #4868c7;
   border-color: #4868c7;
 }
+
+.page-content {
+	width:100%;
+	padding:0px 8px 0px 8px;
+	margin:0px auto;
+  	/* border:1px solid #939393; */
+}
+.page-content-tree {
+  margin: 0;
+  padding: 0px 0px 0px;
+  height: 400px;
+  overflow-x: auto;
+  overflow-y: scroll;
+}
+.page-content-grid {
+  padding:0px 8px 0px 8px;
+  margin:0px auto;
+}

+ 48 - 103
gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/dict.js

@@ -1,5 +1,4 @@
 var grid_selector = "#grid-table";
-var pager_selector = "#grid-pager";
 var dictTree;
 //zTree的参数配置,setting主要是设置一些tree的属性,是本地数据源,还是远程,动画效果,是否含有复选框等等
 var setting = {
@@ -116,101 +115,43 @@ $(document).ready(function() {
  * 初始化Grid
  */
 function initGrid() {
-    resizeTreePageGrid(grid_selector);
-    // 数据表格初始化
-    $(grid_selector).jqGrid({
-        url : basePath + '/dict/list',
-        mtype : "POST", // 提交方式
-        datatype : "json",
-        height : "auto",
-        colNames : [
-                '唯一标识', '名称', '编码', '编码值', '上级', '上级编码', '上级名称', '是否末级', '备注', '排序'
-        ],
-        colModel : [
-                {
-                    name : 'id',
-                    index : 'id',
-                    key : true,
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'text',
-                    index : 'text',
-                    sortable : false
-                }, {
-                    name : 'code',
-                    index : 'code',
-                    sortable : false
-                }, {
-                    name : 'val',
-                    index : 'val',
-                    sortable : false
-                }, {
-                    name : 'pid',
-                    index : 'pid',
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'pcode',
-                    index : 'pcode',
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'ptext',
-                    index : 'ptext',
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'leaf',
-                    index : 'leaf',
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'remark',
-                    index : 'remark',
-                    sortable : false
-                }, {
-                    name : 'sortno',
-                    index : 'sortno',
-                    sortable : false
-                }
-        ],
-        rowNum : _rowNum, // 每页显示记录数
-        rowList : _rowList, // 用于改变显示行数的下拉列表框的元素数组。
-        pager : pager_selector, // 定义翻页用的导航栏
-        rownumbers : true,
-        altRows : true, // 设置为交替行表格,默认为false
-        multiselect : true, // 可以多选
-        loadComplete : function() {
-            var table = this;
-            setTimeout(function() {
-                updatePagerIcons(table);
-                enableTooltips(table);
-            }, 0);
-        },
-        prmNames : {
-            oper : "oper",
-            page : "page",
-            rows : "rows",
-            sort : "sidx",
-            order : "sord"
-        },
-        jsonReader : {
-            root : "list", // json中代表实际模型数据的入口
-            page : "page", // json中代表当前页码的数据
-            total : "pages", // json中代表页码总数的数据
-            records : "total", // json中代表数据行总数的数据
-            repeatitems : false // 如果设为false,则jqGrid在解析json时,会根据name来搜索对应的数据元素
-        },
-        gridComplete : function() {
-            comGridComplete("grid-table", "editRecord");
-        },
-        onPaging : function() {
-            comGridPage("grid-table");
+    //单列表简易渲染
+    var table = $(grid_selector);
+    table.GM({
+        ajax_url: basePath + '/dict/list'
+        ,ajax_type: 'POST'
+        ,columnData: [
+            {
+                key: 'text',
+                text: '名称'
+            },{
+                key: 'code',
+                text: '编码'
+            },{
+                key: 'val',
+                text: '编码值'
+            },{
+                key: 'leaf',
+                text: '是否末级'
+            },{
+                key: 'remark',
+                text: '备注'
+            },{
+                key: 'sortno',
+                text: '排序'
+            }
+        ]
+        ,pagingBefore:function(query){}
+        ,pagingAfter: function(query){}
+        ,sortingBefore:function(query){}
+        ,sortingAfter: function(query){}
+        ,ajax_beforeSend: function(query){}
+        ,ajax_complete: function(data){
+            showTotalRecord(data);
         }
+    },function(query){
+//        console.log('init方法回调query参数', query);
     });
-    // 调整jqgrid
-    ajustJqGrid(grid_selector, pager_selector);
 };
 
 /**
@@ -262,7 +203,8 @@ function editInfo() {
                 $('#pid').selectpicker('refresh');
                 $('#leaf').selectpicker('refresh');
 
-                var selData = $(grid_selector).jqGrid('getRowData', ids);
+                var rows = $(grid_selector).GM('getCheckedTr');
+                var selData = $(grid_selector).GM('getRowData', rows[0]);
                 $('#pid').selectpicker('val', selData.pid);
                 $("#pcode").val(selData.pcode);
                 $("#id").val(data.id);
@@ -316,19 +258,22 @@ function delInfo() {
  * 查询
  */
 function searchRecord() {
-    var srh_text = encodeURI(encodeURI($("#srh_text").val()));
+    var srh_text = encodeURI($("#srh_text").val());
     var srh_code = $("#srh_code").val();
-    var srh_pid_str = "";
 
+    // 定义查询参数
+    var obj = {
+        'text': srh_text,
+        'code': srh_code,
+    };
     var nodes = dictTree.getSelectedNodes();
     if (nodes.length == 1) {
-        srh_pid_str = "&pid=" + nodes[0].id;
+        obj.pid = nodes[0].id;
     }
-
-    $(grid_selector).jqGrid('setGridParam', {
-        url : basePath + "/dict/list?text=" + srh_text + "&code=" + srh_code + srh_pid_str,
-        page : 1
-    }).trigger("reloadGrid");
+    // 设置gird参数
+    $(grid_selector).GM('setQuery', obj);
+    // 查询grid
+    $(grid_selector).GM('refreshGrid', true, null);
 };
 
 /**

+ 41 - 83
gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/group.js

@@ -1,5 +1,4 @@
 var grid_selector = "#grid-table";
-var pager_selector = "#grid-pager";
 var menuTree;
 var orgTree;
 //zTree的参数配置,setting主要是设置一些tree的属性,是本地数据源,还是远程,动画效果,是否含有复选框等等
@@ -127,81 +126,40 @@ $(document).ready(function() {
  * 初始化Grid
  */
 function initGrid() {
-    resizeTreePageGrid(grid_selector);
-    // 数据表格初始化
-    $(grid_selector).jqGrid({
-        url : basePath + '/group/list',
-        mtype : "POST", // 提交方式
-        datatype : "json",
-        height : "auto",
-        colNames : [
-                '唯一标识', '分组名称', '组织名称', '组织编码', '角色名称', '角色编码'
-        ],
-        colModel : [
-                {
-                    name : 'id',
-                    index : 'id',
-                    key : true,
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'remark',
-                    index : 'remark',
-                    sortable : false
-                }, {
-                    name : 'orgName',
-                    index : 'orgName',
-                    sortable : false
-                }, {
-                    name : 'orgCode',
-                    index : 'orgCode',
-                    sortable : false
-                }, {
-                    name : 'roleName',
-                    index : 'roleName',
-                    sortable : false
-                }, {
-                    name : 'roleCode',
-                    index : 'roleCode',
-                    sortable : false
-                }
-        ],
-        rowNum : _rowNum, // 每页显示记录数
-        rowList : _rowList, // 用于改变显示行数的下拉列表框的元素数组。
-        pager : pager_selector, // 定义翻页用的导航栏
-        rownumbers : true,
-        altRows : true, // 设置为交替行表格,默认为false
-        multiselect : true, // 可以多选
-        loadComplete : function() {
-            var table = this;
-            setTimeout(function() {
-                updatePagerIcons(table);
-                enableTooltips(table);
-            }, 0);
-        },
-        prmNames : {
-            oper : "oper",
-            page : "page",
-            rows : "rows",
-            sort : "sidx",
-            order : "sord"
-        },
-        jsonReader : {
-            root : "list", // json中代表实际模型数据的入口
-            page : "page", // json中代表当前页码的数据
-            total : "pages", // json中代表页码总数的数据
-            records : "total", // json中代表数据行总数的数据
-            repeatitems : false // 如果设为false,则jqGrid在解析json时,会根据name来搜索对应的数据元素
-        },
-        gridComplete : function() {
-            comGridComplete("grid-table", "editRecord");
-        },
-        onPaging : function() {
-            comGridPage("grid-table");
+    //单列表简易渲染
+    var table = $(grid_selector);
+    table.GM({
+        ajax_url: basePath + '/group/list'
+        ,ajax_type: 'POST'
+        ,columnData: [
+            {
+                key: 'remark',
+                text: '分组名称'
+            },{
+                key: 'orgName',
+                text: '组织名称'
+            },{
+                key: 'orgCode',
+                text: '组织编码'
+            },{
+                key: 'roleName',
+                text: '角色名称'
+            },{
+                key: 'roleCode',
+                text: '角色编码'
+            }
+        ]
+        ,pagingBefore:function(query){}
+        ,pagingAfter: function(query){}
+        ,sortingBefore:function(query){}
+        ,sortingAfter: function(query){}
+        ,ajax_beforeSend: function(query){}
+        ,ajax_complete: function(data){
+            showTotalRecord(data);
         }
+    },function(query){
+//        console.log('init方法回调query参数', query);
     });
-    // 调整jqgrid
-    ajustJqGrid(grid_selector, pager_selector);
 };
 
 /**
@@ -260,7 +218,6 @@ function editInfo() {
                 menuTree.checkAllNodes(false);
                 menuTree.expandAll(false);
 
-                var selData = $(grid_selector).jqGrid('getRowData', ids);
                 $("#id").val(data.id);
                 $("#org").selectpicker('val', data.org);
                 $("#role").selectpicker('val', data.role);
@@ -311,17 +268,19 @@ function delInfo() {
  */
 function searchRecord() {
     var srh_role = $("#srh_role").val();
-    var srh_org_str = "";
 
+    // 定义查询参数
+    var obj = {
+        'role': srh_role,
+    };
     var nodes = orgTree.getSelectedNodes();
     if (nodes.length == 1) {
-        srh_org_str = "&org=" + nodes[0].id;
+        obj.org = nodes[0].id;
     }
-
-    $(grid_selector).jqGrid('setGridParam', {
-        url : basePath + "/group/list?role=" + srh_role + srh_org_str,
-        page : 1
-    }).trigger("reloadGrid");
+    // 设置gird参数
+    $(grid_selector).GM('setQuery', obj);
+    // 查询grid
+    $(grid_selector).GM('refreshGrid', true, null);
 };
 
 /**
@@ -423,7 +382,6 @@ function editAuthInfo() {
             },
             url : basePath + '/group/getAuthRecord',
             success : function(data) {
-                var selData = $(grid_selector).jqGrid('getRowData', ids);
                 $("#id").val(data.id);
                 $("#org").selectpicker('val', data.org);
                 $("#role").selectpicker('val', data.role);

+ 44 - 94
gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/menu.js

@@ -1,5 +1,4 @@
 var grid_selector = "#grid-table";
-var pager_selector = "#grid-pager";
 var menuTree;
 // zTree的参数配置,setting主要是设置一些tree的属性,是本地数据源,还是远程,动画效果,是否含有复选框等等
 var setting = {
@@ -169,91 +168,37 @@ $(document).ready(function() {
  * 初始化Grid
  */
 function initGrid() {
-    // resize to fit page size
-    resizeTreePageGrid(grid_selector);
-    // 数据表格初始化
-    jQuery(grid_selector).jqGrid({
-        url : basePath + '/menu/list',
-        mtype : "POST", // 提交方式
-        datatype : "json",
-        autowidth : false,
-        height : "auto",
-        shrinkToFit : true,
-        sortname : "", // 默认的排序列
-        sortorder : "", // 默认的排序列
-        colNames : [
-                'id', 'leaf', '名称', '编码', '备注', '序号'
-        ],
-        colModel : [
-                {
-                    name : 'id',
-                    index : 'id',
-                    key : true,
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'leaf',
-                    index : 'leaf',
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'name',
-                    index : 'name',
-                    sortable : false
-                }, {
-                    name : 'code',
-                    index : 'code',
-                    sortable : false
-                }, {
-                    name : 'remark',
-                    index : 'remark',
-                    sortable : false
-                }, {
-                    name : 'sortno',
-                    index : 'sortno',
-                    sortable : false
-                }
-        ],
-        rowNum : _rowNum, // 每页显示记录数
-        rowList : _rowList, // 用于改变显示行数的下拉列表框的元素数组。
-        pager : pager_selector, // 定义翻页用的导航栏
-        page : 1, // 设置初始的页码,初始为1
-        rownumbers : true,
-        pagerpos : 'center', // 指定分页栏的位置
-        altRows : true, // 设置为交替行表格,默认为false
-        multiselect : true, // 可以多选
-        multiboxonly : true, // 只有选择checkbox才会起作用
-        loadComplete : function() {
-            var table = this;
-            setTimeout(function() {
-                updatePagerIcons(table);
-                enableTooltips(table);
-            }, 0);
-        },
-        prmNames : {
-            oper : "oper",
-            page : "page",
-            rows : "rows",
-            sort : "sidx",
-            order : "sord"
-        },
-        jsonReader : {
-            root : "list", // json中代表实际模型数据的入口
-            page : "page", // json中代表当前页码的数据
-            total : "pages", // json中代表页码总数的数据
-            records : "total", // json中代表数据行总数的数据
-            repeatitems : false
-        // 如果设为false,则jqGrid在解析json时,会根据name来搜索对应的数据元素
-        },
-        gridComplete : function() {
-            comGridComplete("grid-table", "editRecord");
-        },
-        onPaging : function() {
-            comGridPage("grid-table");
+    //单列表简易渲染
+    var table = $(grid_selector);
+    table.GM({
+        ajax_url: basePath + '/menu/list'
+        ,ajax_type: 'POST'
+        ,columnData: [
+            {
+                key: 'name',
+                text: '名称'
+            },{
+                key: 'code',
+                text: '编码'
+            },{
+                key: 'remark',
+                text: '备注'
+            },{
+                key: 'sortno',
+                text: '排序'
+            }
+        ]
+        ,pagingBefore:function(query){}
+        ,pagingAfter: function(query){}
+        ,sortingBefore:function(query){}
+        ,sortingAfter: function(query){}
+        ,ajax_beforeSend: function(query){}
+        ,ajax_complete: function(data){
+            showTotalRecord(data);
         }
+    },function(query){
+//        console.log('init方法回调query参数', query);
     });
-    // 调整jqgrid
-    ajustJqGrid(grid_selector, pager_selector);
 };
 
 /**
@@ -306,9 +251,10 @@ function editInfo() {
         layer.alert("请选择且只选择一条记录!");
         return;
     } else {
-        var selData = $(grid_selector).jqGrid('getRowData', ids);
+        var rows = $(grid_selector).GM('getCheckedTr');
+        var selData = $(grid_selector).GM('getRowData', rows[0]);
         if (selData.leaf == 'B') { // 按钮节点
-            var pnode = menuTree.getNodeByParam("id", selData.id).getParentNode();
+            var pnode = menuTree.getNodeByParam("id", selData.pid);
             $.ajax({
                 type : 'POST',
                 dataType : "json",
@@ -402,19 +348,23 @@ function delInfo() {
  * 查询信息
  */
 function searchRecord() {
-    var srh_name = encodeURI(encodeURI($("#srh_name").val()));
+    var srh_name = encodeURI($("#srh_name").val());
     var srh_code = $("#srh_code").val();
-    var srh_pid_str = "";
 
+    // 定义查询参数
+    var obj = {
+        'name': srh_name,
+        'code': srh_code,
+    };
     var nodes = menuTree.getSelectedNodes();
     if (nodes.length == 1) {
-        srh_pid_str = "&pid=" + nodes[0].id + "&leaf=" + nodes[0].leaf;
+        obj.pid = nodes[0].id;
+        obj.leaf = nodes[0].leaf;
     }
-
-    $(grid_selector).jqGrid('setGridParam', {
-        url : basePath + "/menu/list?name=" + srh_name + "&code=" + srh_code + srh_pid_str,
-        page : 1
-    }).trigger("reloadGrid");
+    // 设置gird参数
+    $(grid_selector).GM('setQuery', obj);
+    // 查询grid
+    $(grid_selector).GM('refreshGrid', true, null);
 };
 
 /**

+ 62 - 119
gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/org.js

@@ -1,5 +1,4 @@
 var grid_selector = "#grid-table";
-var pager_selector = "#grid-pager";
 var orgTree;
 //zTree的参数配置,setting主要是设置一些tree的属性,是本地数据源,还是远程,动画效果,是否含有复选框等等
 var setting = {
@@ -141,119 +140,59 @@ $(document).ready(function() {
  * 初始化Grid
  */
 function initGrid() {
-    resizeTreePageGrid(grid_selector);
-    // 数据表格初始化
-    $(grid_selector).jqGrid({
-        url : basePath + '/org/list',
-        mtype : "POST", // 提交方式
-        datatype : "json",
-        height : "auto",
-        colNames : [
-                '唯一标识', '组织名称', '组织编码', '上级组织', '上级组织名称', '上级组织编码', '组织类型', '所在地名称', '所在地编码', '行政区划', '等级', '备注', '排序'
-        ],
-        colModel : [
-                {
-                    name : 'id',
-                    index : 'id',
-                    key : true,
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'name',
-                    index : 'name',
-                    sortable : false
-                }, {
-                    name : 'code',
-                    index : 'code',
-                    sortable : false
-                }, {
-                    name : 'pid',
-                    index : 'pid',
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'pname',
-                    index : 'pname',
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'pcode',
-                    index : 'pcode',
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'orgType',
-                    index : 'orgType',
-                    sortable : false,
-                    formatter : function(cellvalue, options, rowObject) {
-                        var val = eval('constData.orgType_' + cellvalue);
-                        if (isNull(val)) {
-                            val = cellvalue;
-                        }
-                        return val;
+    //单列表简易渲染
+    var table = $(grid_selector);
+    table.GM({
+        ajax_url: basePath + '/org/list'
+        ,ajax_type: 'POST'
+        ,columnData: [
+            {
+                key: 'name',
+                text: '组织名称'
+            },{
+                key: 'code',
+                text: '组织编码'
+            },{
+                key: 'orgType',
+                text: '组织类型',
+                template: function(operation, rowObject) {
+                    var val = eval('constData.orgType_' + operation);
+                    if (isNull(val)) {
+                        val = operation;
                     }
-                }, {
-                    name : 'szdName',
-                    index : 'szdName',
-                    sortable : false
-                }, {
-                    name : 'szd',
-                    index : 'szd',
-                    sortable : false
-                }, {
-                    name : 'xzqh',
-                    index : 'xzqh',
-                    sortable : false
-                }, {
-                    name : 'level',
-                    index : 'level',
-                    sortable : false
-                }, {
-                    name : 'remark',
-                    index : 'remark',
-                    sortable : false
-                }, {
-                    name : 'sortno',
-                    index : 'sortno',
-                    sortable : false
+                    return val;
                 }
-        ],
-        rowNum : _rowNum, // 每页显示记录数
-        rowList : _rowList, // 用于改变显示行数的下拉列表框的元素数组。
-        pager : pager_selector, // 定义翻页用的导航栏
-        rownumbers : true,
-        altRows : true, // 设置为交替行表格,默认为false
-        multiselect : true, // 可以多选
-        loadComplete : function() {
-            var table = this;
-            setTimeout(function() {
-                updatePagerIcons(table);
-                enableTooltips(table);
-            }, 0);
-        },
-        prmNames : {
-            oper : "oper",
-            page : "page",
-            rows : "rows",
-            sort : "sidx",
-            order : "sord"
-        },
-        jsonReader : {
-            root : "list", // json中代表实际模型数据的入口
-            page : "page", // json中代表当前页码的数据
-            total : "pages", // json中代表页码总数的数据
-            records : "total", // json中代表数据行总数的数据
-            repeatitems : false // 如果设为false,则jqGrid在解析json时,会根据name来搜索对应的数据元素
-        },
-        gridComplete : function() {
-            comGridComplete("grid-table", "editRecord");
-        },
-        onPaging : function() {
-            comGridPage("grid-table");
+            },{
+                key: 'szdName',
+                text: '所在地名称'
+            },{
+                key: 'szd',
+                text: '所在地编码'
+            },{
+                key: 'xzqh',
+                text: '行政区划'
+            },{
+                key: 'level',
+                text: '等级'
+            },{
+                key: 'remark',
+                text: '备注'
+            },{
+                key: 'sortno',
+                text: '排序'
+            }
+        ]
+        ,pagingBefore:function(query){}
+        ,pagingAfter: function(query){}
+        ,sortingBefore:function(query){}
+        ,sortingAfter: function(query){}
+        ,ajax_beforeSend: function(query){}
+        ,ajax_complete: function(data){
+            showTotalRecord(data);
         }
+    },function(query){
+//        console.log('init方法回调query参数', query);
     });
-    // 调整jqgrid
-    ajustJqGrid(grid_selector, pager_selector);
 };
 
 /**
@@ -309,7 +248,8 @@ function editInfo() {
                 $('#xzqh').selectpicker('refresh');
                 $('#szd').prop('disabled', true);
 
-                var selData = $(grid_selector).jqGrid('getRowData', ids);
+                var rows = $(grid_selector).GM('getCheckedTr');
+                var selData = $(grid_selector).GM('getRowData', rows[0]);
                 $("#pid").val(selData.pid);
                 $("#pcode").val(selData.pcode);
                 $("#pname").val(selData.pname);
@@ -368,19 +308,22 @@ function delInfo() {
  * 查询
  */
 function searchRecord() {
-    var srh_name = encodeURI(encodeURI($("#srh_name").val()));
+    var srh_name = encodeURI($("#srh_name").val());
     var srh_code = $("#srh_code").val();
-    var srh_pid_str = "";
 
+    // 定义查询参数
+    var obj = {
+        'name': srh_name,
+        'code': srh_code,
+    };
     var nodes = orgTree.getSelectedNodes();
     if (nodes.length == 1) {
-        srh_pid_str = "&pid=" + nodes[0].id;
+        obj.pid = nodes[0].id;
     }
-
-    $(grid_selector).jqGrid('setGridParam', {
-        url : basePath + "/org/list?name=" + srh_name + "&code=" + srh_code + srh_pid_str,
-        page : 1
-    }).trigger("reloadGrid");
+    // 设置gird参数
+    $(grid_selector).GM('setQuery', obj);
+    // 查询grid
+    $(grid_selector).GM('refreshGrid', true, null);
 };
 
 /**

+ 38 - 74
gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/param.js

@@ -1,5 +1,4 @@
 var grid_selector = "#grid-table";
-var pager_selector = "#grid-pager";
 
 $(document).ready(function() {
     initGrid();
@@ -9,77 +8,37 @@ $(document).ready(function() {
  * 初始化Grid
  */
 function initGrid() {
-    resizePageGrid(grid_selector);
-    // 数据表格初始化
-    $(grid_selector).jqGrid({
-        url : basePath + '/param/list',
-        mtype : "POST", // 提交方式
-        datatype : "json",
-        height : "auto",
-        colNames : [
-                '唯一标识', '参数主键', '参数值', '所属类', '属性描述'
-        ],
-        colModel : [
-                {
-                    name : 'id',
-                    index : 'id',
-                    key : true,
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'key',
-                    index : 'key',
-                    sortable : false
-                }, {
-                    name : 'value',
-                    index : 'value',
-                    sortable : false
-                }, {
-                    name : 'clazz',
-                    index : 'clazz',
-                    sortable : false
-                }, {
-                    name : 'disp',
-                    index : 'disp',
-                    sortable : false
-                }
-        ],
-        rowNum : _rowNum, // 每页显示记录数
-        rowList : _rowList, // 用于改变显示行数的下拉列表框的元素数组。
-        pager : pager_selector, // 定义翻页用的导航栏
-        rownumbers : true,
-        altRows : true, // 设置为交替行表格,默认为false
-        multiselect : true, // 可以多选
-        loadComplete : function() {
-            var table = this;
-            setTimeout(function() {
-                updatePagerIcons(table);
-                enableTooltips(table);
-            }, 0);
-        },
-        prmNames : {
-            oper : "oper",
-            page : "page",
-            rows : "rows",
-            sort : "sidx",
-            order : "sord"
-        },
-        jsonReader : {
-            root : "list", // json中代表实际模型数据的入口
-            page : "page", // json中代表当前页码的数据
-            total : "pages", // json中代表页码总数的数据
-            records : "total", // json中代表数据行总数的数据
-            repeatitems : false // 如果设为false,则jqGrid在解析json时,会根据name来搜索对应的数据元素
-        },
-        gridComplete : function() {
-            comGridComplete("grid-table", "editRecord");
-        },
-        onPaging : function() {
-            comGridPage("grid-table");
+    //单列表简易渲染
+    var table = $(grid_selector);
+    table.GM({
+        ajax_url: basePath + '/param/list'
+        ,ajax_type: 'POST'
+        ,columnData: [
+            {
+                key: 'key',
+                text: '参数主键'
+            },{
+                key: 'value',
+                text: '参数值'
+            },{
+                key: 'clazz',
+                text: '所属类'
+            },{
+                key: 'disp',
+                text: '属性描述'
+            }
+        ]
+        ,pagingBefore:function(query){}
+        ,pagingAfter: function(query){}
+        ,sortingBefore:function(query){}
+        ,sortingAfter: function(query){}
+        ,ajax_beforeSend: function(query){}
+        ,ajax_complete: function(data){
+            showTotalRecord(data);
         }
+    },function(query){
+//        console.log('init方法回调query参数', query);
     });
-    // 调整jqgrid
-    ajustJqGrid(grid_selector, pager_selector);
 };
 
 /**
@@ -161,10 +120,15 @@ function delInfo() {
  */
 function searchRecord() {
     var srh_key = $("#srh_key").val();
-    $(grid_selector).jqGrid('setGridParam', {
-        url : basePath + "/param/list?key=" + srh_key,
-        page : 1
-    }).trigger("reloadGrid");
+
+    // 定义查询参数
+    var obj = {
+        'key': srh_key,
+    };
+    // 设置gird参数
+    $(grid_selector).GM('setQuery', obj);
+    // 查询grid
+    $(grid_selector).GM('refreshGrid', true, null);
 };
 
 /**

+ 40 - 78
gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/role.js

@@ -1,5 +1,4 @@
 var grid_selector = "#grid-table";
-var pager_selector = "#grid-pager";
 var menuTree;
 // zTree的参数配置,setting主要是设置一些tree的属性,是本地数据源,还是远程,动画效果,是否含有复选框等等
 var setting = {
@@ -79,78 +78,37 @@ $(document).ready(function() {
  * 初始化Grid
  */
 function initGrid() {
-    resizePageGrid(grid_selector);
-    // 数据表格初始化
-    $(grid_selector).jqGrid({
-        url : basePath + '/role/list',
-        mtype : "POST", // 提交方式
-        datatype : "json",
-        height : "auto",
-        colNames : [
-                '唯一标识', '角色名称', '角色编码', '备注', '排序'
-        ],
-        colModel : [
-                {
-                    name : 'id',
-                    index : 'id',
-                    key : true,
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'name',
-                    index : 'name',
-                    sortable : false
-                }, {
-                    name : 'code',
-                    index : 'code',
-                    sortable : false
-                }, {
-                    name : 'remark',
-                    index : 'remark',
-                    sortable : false
-                }, {
-                    name : 'sortno',
-                    index : 'sortno',
-                    sortable : false
-                }
-        ],
-        rowNum : _rowNum, // 每页显示记录数
-        rowList : _rowList, // 用于改变显示行数的下拉列表框的元素数组。
-        pager : pager_selector, // 定义翻页用的导航栏
-        rownumbers : true,
-        altRows : true, // 设置为交替行表格,默认为false
-        multiselect : true, // 可以多选
-        loadComplete : function() {
-            var table = this;
-            setTimeout(function() {
-                updatePagerIcons(table);
-                enableTooltips(table);
-            }, 0);
-        },
-        prmNames : {
-            oper : "oper",
-            page : "page",
-            rows : "rows",
-            sort : "sidx",
-            order : "sord"
-        },
-        jsonReader : {
-            root : "list", // json中代表实际模型数据的入口
-            page : "page", // json中代表当前页码的数据
-            total : "pages", // json中代表页码总数的数据
-            records : "total", // json中代表数据行总数的数据
-            repeatitems : false
-        // 如果设为false,则jqGrid在解析json时,会根据name来搜索对应的数据元素
-        },
-        gridComplete : function() {
-            comGridComplete("grid-table", "editRecord");
-        },
-        onPaging : function() {
-            comGridPage("grid-table");
+    //单列表简易渲染
+    var table = $(grid_selector);
+    table.GM({
+        ajax_url: basePath + '/role/list'
+        ,ajax_type: 'POST'
+        ,columnData: [
+            {
+                key: 'name',
+                text: '角色名称'
+            },{
+                key: 'code',
+                text: '角色编码'
+            },{
+                key: 'remark',
+                text: '备注'
+            },{
+                key: 'sortno',
+                text: '排序'
+            }
+        ]
+        ,pagingBefore:function(query){}
+        ,pagingAfter: function(query){}
+        ,sortingBefore:function(query){}
+        ,sortingAfter: function(query){}
+        ,ajax_beforeSend: function(query){}
+        ,ajax_complete: function(data){
+            showTotalRecord(data);
         }
+    },function(query){
+//        console.log('init方法回调query参数', query);
     });
-    // 调整jqgrid
-    ajustJqGrid(grid_selector, pager_selector);
 };
 
 /**
@@ -197,7 +155,6 @@ function editInfo() {
                 menuTree.checkAllNodes(false);
                 menuTree.expandAll(false);
 
-                var selData = $(grid_selector).jqGrid('getRowData', ids);
                 $("#id").val(data.id);
                 $("#code").val(data.code);
                 $("#name").val(data.name);
@@ -247,12 +204,18 @@ function delInfo() {
  * 查询
  */
 function searchRecord() {
+    var srh_name = encodeURI($("#srh_name").val());
     var srh_code = $("#srh_code").val();
-    var srh_name = encodeURI(encodeURI($("#srh_name").val()));
-    $(grid_selector).jqGrid('setGridParam', {
-        url : basePath + "/role/list?code=" + srh_code + "&name=" + srh_name,
-        page : 1
-    }).trigger("reloadGrid");
+
+    // 定义查询参数
+    var obj = {
+        'name': srh_name,
+        'code': srh_code,
+    };
+    // 设置gird参数
+    $(grid_selector).GM('setQuery', obj);
+    // 查询grid
+    $(grid_selector).GM('refreshGrid', true, null);
 };
 
 /**
@@ -325,7 +288,6 @@ function editAuthInfo() {
             },
             url : basePath + '/role/getAuthRecord',
             success : function(data) {
-                var selData = $(grid_selector).jqGrid('getRowData', ids);
                 $("#id").val(data.id);
                 $("#code").val(data.code);
                 $("#name").val(data.name);

+ 41 - 71
gkaqv2/trunk/modules/web/src/main/webapp/static/js/frame/xzqh.js

@@ -1,5 +1,4 @@
 var grid_selector = "#grid-table";
-var pager_selector = "#grid-pager";
 
 $(document).ready(function() {
     initGrid();
@@ -9,73 +8,34 @@ $(document).ready(function() {
  * 初始化Grid
  */
 function initGrid() {
-    resizePageGrid(grid_selector);
-    // 数据表格初始化
-    $(grid_selector).jqGrid({
-        url : basePath + '/xzqh/list',
-        mtype : "POST", // 提交方式
-        datatype : "json",
-        height : "auto",
-        colNames : [
-                '唯一标识', '名称', '编码', '序号'
-        ],
-        colModel : [
-                {
-                    name : 'id',
-                    index : 'id',
-                    key : true,
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'name',
-                    index : 'name',
-                    sortable : false
-                }, {
-                    name : 'code',
-                    index : 'code',
-                    sortable : false
-                }, {
-                    name : 'xh',
-                    index : 'xh',
-                    sortable : false
-                }
-        ],
-        rowNum : _rowNum, // 每页显示记录数
-        rowList : _rowList, // 用于改变显示行数的下拉列表框的元素数组。
-        pager : pager_selector, // 定义翻页用的导航栏
-        rownumbers : true,
-        altRows : true, // 设置为交替行表格,默认为false
-        multiselect : true, // 可以多选
-        loadComplete : function() {
-            var table = this;
-            setTimeout(function() {
-                updatePagerIcons(table);
-                enableTooltips(table);
-            }, 0);
-        },
-        prmNames : {
-            oper : "oper",
-            page : "page",
-            rows : "rows",
-            sort : "sidx",
-            order : "sord"
-        },
-        jsonReader : {
-            root : "list", // json中代表实际模型数据的入口
-            page : "page", // json中代表当前页码的数据
-            total : "pages", // json中代表页码总数的数据
-            records : "total", // json中代表数据行总数的数据
-            repeatitems : false // 如果设为false,则jqGrid在解析json时,会根据name来搜索对应的数据元素
-        },
-        gridComplete : function() {
-            comGridComplete("grid-table", "editRecord");
-        },
-        onPaging : function() {
-            comGridPage("grid-table");
+    //单列表简易渲染
+    var table = $(grid_selector);
+    table.GM({
+        ajax_url: basePath + '/xzqh/list'
+        ,ajax_type: 'POST'
+        ,columnData: [
+            {
+                key: 'name',
+                text: '名称'
+            },{
+                key: 'code',
+                text: '编码'
+            },{
+                key: 'xh',
+                text: '序号'
+            }
+        ]
+        ,pagingBefore:function(query){}
+        ,pagingAfter: function(query){}
+        ,sortingBefore:function(query){}
+        ,sortingAfter: function(query){}
+        ,ajax_beforeSend: function(query){}
+        ,ajax_complete: function(data){
+            showTotalRecord(data);
         }
+    },function(query){
+//        console.log('init方法回调query参数', query);
     });
-    // 调整jqgrid
-    ajustJqGrid(grid_selector, pager_selector);
 };
 
 /**
@@ -152,12 +112,22 @@ function delInfo() {
  * 查询
  */
 function searchRecord() {
+    var srh_name = encodeURI($("#srh_name").val());
     var srh_code = $("#srh_code").val();
-    var srh_name = encodeURI(encodeURI($("#srh_name").val()));
-    $(grid_selector).jqGrid('setGridParam', {
-        url : basePath + "/xzqh/list?code=" + srh_code + "&name=" + srh_name,
-        page : 1
-    }).trigger("reloadGrid");
+
+    // 定义查询参数
+    var obj = {
+        'name': srh_name,
+        'code': srh_code,
+    };
+    var nodes = orgTree.getSelectedNodes();
+    if (nodes.length == 1) {
+        obj.pid = nodes[0].id;
+    }
+    // 设置gird参数
+    $(grid_selector).GM('setQuery', obj);
+    // 查询grid
+    $(grid_selector).GM('refreshGrid', true, null);
 };
 
 /**

+ 51 - 98
gkaqv2/trunk/modules/web/src/main/webapp/static/js/user/index.js

@@ -1,5 +1,4 @@
 var grid_selector = "#grid-table";
-var pager_selector = "#grid-pager";
 var orgTree;
 //zTree的参数配置,setting主要是设置一些tree的属性,是本地数据源,还是远程,动画效果,是否含有复选框等等
 var setting = {
@@ -123,97 +122,48 @@ jQuery(function($) {
  * 初始化Grid
  */
 function initGrid() {
-    // resize to fit page size
-    resizeTreePageGrid(grid_selector);
-    // 数据表格初始化
-    jQuery(grid_selector).jqGrid({
-        url : basePath + '/user/list',
-        mtype : "POST", // 提交方式
-        datatype : "json",
-        autowidth : false,
-        height : "auto",
-        shrinkToFit : true,
-        sortname : "", // 默认的排序列
-        sortorder : "", // 默认的排序列
-        colNames : [
-                'id', '用户名', '登录名', '人员类型', '性别', '联系电话'
-        ],
-        colModel : [
-                {
-                    name : 'id',
-                    index : 'id',
-                    key : true,
-                    hidden : true,
-                    sortable : false
-                }, {
-                    name : 'realName',
-                    index : 'realName',
-                    sortable : false
-                }, {
-                    name : 'loginName',
-                    index : 'loginName',
-                    sortable : false
-                }, {
-                    name : 'rylx',
-                    index : 'rylx',
-                    sortable : false,
-                    formatter : function(cellvalue, options, rowObject) {
-                        var val = eval('constData.userType_' + cellvalue);
-                        if (isNull(val)) {
-                            val = cellvalue;
-                        }
-                        return val;
+    //单列表简易渲染
+    var table = $(grid_selector);
+    table.GM({
+        ajax_url: basePath + '/user/list'
+        ,ajax_type: 'POST'
+        ,columnData: [
+            {
+                key: 'realName',
+                text: '用户名'
+            },{
+                key: 'loginName',
+                text: '登录名'
+            },{
+                key: 'rylx',
+                text: '人员类型',
+                template: function(operation, rowObject) {
+                    //operation:当前key所对应的单条数据;rowObject:单个一行完整数据
+                    var val = eval('constData.userType_' + operation);
+                    if (isNull(val)) {
+                        val = operation;
                     }
-                }, {
-                    name : 'sex',
-                    index : 'sex',
-                    sortable : false
-                }, {
-                    name : 'phone',
-                    index : 'phone',
-                    sortable : false
+                    return val;
                 }
-        ],
-        rowNum : _rowNum, // 每页显示记录数
-        rowList : _rowList, // 用于改变显示行数的下拉列表框的元素数组。
-        pager : pager_selector, // 定义翻页用的导航栏
-        page : 1, // 设置初始的页码,初始为1
-        rownumbers : true,
-        pagerpos : 'center', // 指定分页栏的位置
-        altRows : true, // 设置为交替行表格,默认为false
-        multiselect : true, // 可以多选
-        multiboxonly : true, // 只有选择checkbox才会起作用
-        loadComplete : function() {
-            var table = this;
-            setTimeout(function() {
-                updatePagerIcons(table);
-                enableTooltips(table);
-            }, 0);
-        },
-        prmNames : {
-            oper : "oper",
-            page : "page",
-            rows : "rows",
-            sort : "sidx",
-            order : "sord"
-        },
-        jsonReader : {
-            root : "list", // json中代表实际模型数据的入口
-            page : "page", // json中代表当前页码的数据
-            total : "pages", // json中代表页码总数的数据
-            records : "total", // json中代表数据行总数的数据
-            repeatitems : false
-        // 如果设为false,则jqGrid在解析json时,会根据name来搜索对应的数据元素
-        },
-        gridComplete : function() {
-            comGridComplete("grid-table", "editRecord");
-        },
-        onPaging : function() {
-            comGridPage("grid-table");
+            },{
+                key: 'sex',
+                text: '性别'
+            },{
+                key: 'phone',
+                text: '联系电话'
+            }
+        ]
+        ,pagingBefore:function(query){}
+        ,pagingAfter: function(query){}
+        ,sortingBefore:function(query){}
+        ,sortingAfter: function(query){}
+        ,ajax_beforeSend: function(query){}
+        ,ajax_complete: function(data){
+            showTotalRecord(data);
         }
+    },function(query){
+//        console.log('init方法回调query参数', query);
     });
-    // 调整jqgrid
-    ajustJqGrid(grid_selector, pager_selector);
 };
 
 /**
@@ -348,19 +298,22 @@ function delInfo() {
  * 查询信息
  */
 function searchRecord() {
-    var realName = encodeURI(encodeURI($("#srh_realName").val()));
-    var loginName = $("#srh_loginName").val();
-    var srh_orgId_str = "";
-
+    var srh_realName = encodeURI($("#srh_realName").val());
+    var srh_loginName = $("#srh_loginName").val();
+
+    // 定义查询参数
+    var obj = {
+        'realName': srh_realName,
+        'loginName': srh_loginName,
+    };
     var nodes = orgTree.getSelectedNodes();
     if (nodes.length == 1) {
-        srh_orgId_str = "&orgid=" + nodes[0].id;
+        obj.orgid = nodes[0].id;
     }
-
-    $(grid_selector).jqGrid('setGridParam', {
-        url : basePath + "/user/list?realName=" + realName + "&loginName=" + loginName + srh_orgId_str,
-        page : 1
-    }).trigger("reloadGrid");
+    // 设置gird参数
+    $(grid_selector).GM('setQuery', obj);
+    // 查询grid
+    $(grid_selector).GM('refreshGrid', true, null);
 };
 
 /**