git-svn-id: https://192.168.57.71/svn/jsgkj@1435 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/JyrjcxxCtl.java

@@ -1,11 +1,7 @@
 package com.xt.js.gkaq.web.ctl;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.sql.Blob;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -16,15 +12,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-
 import com.alibaba.fastjson.JSONArray;
-import com.sun.tools.corba.se.idl.constExpr.And;
 import com.xt.js.gkaq.common.BaseCtl;
 import com.xt.js.gkaq.common.BaseUUIDModel;
 import com.xt.js.gkaq.common.ExportExcel;
-import com.xt.js.gkaq.common.util.FileUtil;
 import com.xt.js.gkaq.dwxx.model.JyrInfoExcelModel;
 import com.xt.js.gkaq.dwxx.model.JyrjcxxInfol;
 import com.xt.js.gkaq.dwxx.model.JyrjcxxModel;
@@ -32,15 +23,12 @@ import com.xt.js.gkaq.dwxx.service.JyrjcxxService;
 import com.xt.js.gkaq.frame.model.CodeModelDto;
 import com.xt.js.gkaq.frame.model.ComboBoxDto;
 import com.xt.js.gkaq.frame.service.CodeService;
-import com.xt.js.gkaq.web.model.BloBModel;
 import com.xt.js.gkaq.web.model.FjbModel;
 import com.xt.js.gkaq.web.model.GqModel;
-import com.xt.js.gkaq.web.model.RyzsbModel;
 import com.xt.js.gkaq.web.service.BloBService;
 import com.xt.js.gkaq.web.service.FjbService;
 import com.xt.js.gkaq.web.service.GqService;
 import com.xt.js.gkaq.web.service.RyzsbService;
-import com.xt.js.gkaq.web.vo.BloBVo;
 import com.xt.js.gkaq.web.vo.FjbVo;
 import com.xt.js.gkaq.web.vo.JyrjcxxVo;
 import com.yuanxd.tools.pagehelper.PageHelper;

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/model/WxhwModel.java

@@ -23,12 +23,10 @@ public class WxhwModel extends BaseUUIDModel {
 	private String qylb;//区域类别
 	private Long ssqy;//所属区域
 	private String sftb;//是否同步
-	private String recordCode;
-	private String byzd1;//备用字段1
-	private String byzd2;//备用字段2
-	private String byzd3;//备用字段3
-	private String byzd4;//备用字段4
-	private String byzd5;//备用字段5
+	private String orgcode;
+	private String bhun;//编号(UN号)
+	private String lbbh;//类别编号
+	private String mchsmby;//名称和说明备用
 	private String lhxz;//理化性质
 	private String aqffcs;//防范措施
 	private String szd;//所在地
@@ -107,41 +105,29 @@ public class WxhwModel extends BaseUUIDModel {
 	public void setSftb(String sftb) {
 		this.sftb = sftb;
 	}
-	public String getRecordCode() {
-		return recordCode;
+	public String getOrgcode() {
+		return orgcode;
 	}
-	public void setRecordCode(String recordCode) {
-		this.recordCode = recordCode;
+	public void setOrgcode(String orgcode) {
+		this.orgcode = orgcode;
 	}
-	public String getByzd1() {
-		return byzd1;
+	public String getBhun() {
+		return bhun;
 	}
-	public void setByzd1(String byzd1) {
-		this.byzd1 = byzd1;
+	public void setBhun(String bhun) {
+		this.bhun = bhun;
 	}
-	public String getByzd2() {
-		return byzd2;
+	public String getLbbh() {
+		return lbbh;
 	}
-	public void setByzd2(String byzd2) {
-		this.byzd2 = byzd2;
+	public void setLbbh(String lbbh) {
+		this.lbbh = lbbh;
 	}
-	public String getByzd3() {
-		return byzd3;
+	public String getMchsmby() {
+		return mchsmby;
 	}
-	public void setByzd3(String byzd3) {
-		this.byzd3 = byzd3;
-	}
-	public String getByzd4() {
-		return byzd4;
-	}
-	public void setByzd4(String byzd4) {
-		this.byzd4 = byzd4;
-	}
-	public String getByzd5() {
-		return byzd5;
-	}
-	public void setByzd5(String byzd5) {
-		this.byzd5 = byzd5;
+	public void setMchsmby(String mchsmby) {
+		this.mchsmby = mchsmby;
 	}
 	public String getLhxz() {
 		return lhxz;

gkaqv2/trunk/modules/web/src/main/resources/com/xt/js/gkaq/web/mappers/GksssbModelMapper.xml

@@ -187,10 +187,12 @@
   
   <select id="selectTjInfo" resultMap="BaseResultTjInfoMap" parameterType="com.xt.js.gkaq.web.model.GksssbTjModel">
   	SELECT 
-  		SUM(SS.SL) AS SL, SS.SSMC,SS.SLDW
+  		SUM(SS.SL) AS SL, SS.SSMC,SS.SLDW,
+		(SELECT TEXT FROM AQ_BASIC_FRAME_CODE WHERE VAL = SS.SZD AND PCODE = 'DM_SZD' AND STATE != 9) AS SZD ,
+		(SELECT TEXT FROM AQ_BASIC_FRAME_CODE WHERE VAL = SS.YJFL AND PCODE = 'AQSS' AND STATE != 9) AS YJFL
 	FROM 
 	 	AQ_DWXX_GKSSSB SS 
-	<where>
+	<where>-
 		SS.RECORD_STATUS != 9 
 		AND SS.YJFL = #{yjfl,jdbcType=VARCHAR}
 		AND SS.SZD = #{szd,jdbcType=VARCHAR}
@@ -201,7 +203,6 @@
 			AND SS.QYMC = #{qymc,jdbcType=VARCHAR}
 		</if>
 	</where>
-		
-	GROUP BY SS.EJFL,SS.SSMC,SS.SLDW
+	GROUP BY SS.EJFL,SS.SSMC,SS.SLDW,SZD,YJFL
   </select>
 </mapper>

gkaqv2/trunk/modules/web/src/main/resources/com/xt/js/gkaq/web/mappers/WxhwModelMapper.xml

@@ -2,7 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.xt.js.gkaq.web.mappers.WxhwModelMapper" >
   <resultMap id="BaseResultMap" type="com.xt.js.gkaq.web.model.WxhwModel" >
-    <id column="ID" property="id" jdbcType="DECIMAL" />
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="BH" property="bh" jdbcType="VARCHAR" />
     <result column="MCHSM" property="mchsm" jdbcType="VARCHAR" />
     <result column="YWMC" property="ywmc" jdbcType="VARCHAR" />
     <result column="LBHXB" property="lbhxb" jdbcType="VARCHAR" />
@@ -14,48 +15,46 @@
     <result column="QYLB" property="qylb" jdbcType="VARCHAR" />
     <result column="SSQY" property="ssqy" jdbcType="DECIMAL" />
     <result column="SFTB" property="sftb" jdbcType="VARCHAR" />
-    <result column="RECORD_CODE" property="recordCode" jdbcType="VARCHAR" />
+    <result column="ORG_CODE" property="orgcode" jdbcType="VARCHAR" />
     <result column="LHXZ" property="lhxz" jdbcType="VARCHAR" />
     <result column="AQFFCS" property="aqffcs" jdbcType="VARCHAR" />
-    <result column="SZD" property="szd" jdbcType="DECIMAL" />
-    <result column="HZWXX" property="hzwxx" jdbcType="DECIMAL" />
-    <result column="DXDJ" property="dxdj" jdbcType="DECIMAL" />
-    <result column="WRLB" property="wrlb" jdbcType="DECIMAL" />
+    <result column="SZD" property="szd" jdbcType="VARCHAR" />
+    <result column="HZWXX" property="hzwxx" jdbcType="VARCHAR" />
+    <result column="DXDJ" property="dxdj" jdbcType="VARCHAR" />
+    <result column="WRLB" property="wrlb" jdbcType="VARCHAR" />
     
-    <result column="RECORD_STATUS" property="state" jdbcType="VARCHAR" />
+    <result column="STATE" property="state" jdbcType="VARCHAR" />
     
-    <result column="BYZD1" property="byzd1" jdbcType="VARCHAR" />
-    <result column="BYZD2" property="byzd2" jdbcType="VARCHAR" />
-    <result column="BYZD3" property="byzd3" jdbcType="VARCHAR" />
-    <result column="BYZD4" property="byzd4" jdbcType="VARCHAR" />
-    <result column="BYZD5" property="byzd5" jdbcType="VARCHAR" />
+    <result column="BHUN" property="bhun" jdbcType="VARCHAR" />
+    <result column="LBBH" property="lbbh" jdbcType="VARCHAR" />
+    <result column="MCHSMBY" property="mchsmby" jdbcType="VARCHAR" />
   
-    <result column="ADD_DATE" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="UPDATE_DATE" property="updateTime" jdbcType="TIMESTAMP" />
-    <result column="ADD_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
     <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
   </resultMap>
   
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
-    delete from AQ_BASIC_DWXX_WXHWPMB
+    delete from AQ_WXHWPMB
     where ID = #{id,jdbcType=DECIMAL}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.web.model.WxhwModel" >
-    insert into AQ_BASIC_DWXX_WXHWPMB (ID, BH, MCHSM, YWMC, LBHXB, CYWXX, BZLB, BZ, ADD_USER, ADD_DATE, UPDATE_USER,
-							UPDATE_DATE, RECORD_STATUS, TBZT, TBDYID, QYLB, SSQY, SFTB,RECORD_CODE, 
-							BYZD1, BYZD2, BYZD3, BYZD4,BYZD5,LHXZ,AQFFCS,SZD,HZWXX,DXDJ,WRLB)
-    values (#{id,jdbcType=DECIMAL}, #{bh,jdbcType=VARCHAR}, #{mchsm,jdbcType=DECIMAL}, #{ywmc,jdbcType=VARCHAR}, 
+    insert into AQ_WXHWPMB (ID, BH, MCHSM, YWMC, LBHXB, CYWXX, BZLB, BZ, CREATE_USER, CREATE_TIME, UPDATE_USER,
+							UPDATE_TIME, STATE, TBZT, TBDYID, QYLB, SSQY, SFTB,ORG_CODE, 
+							BHUN, LBBH, MCHSMBY, LHXZ,AQFFCS,SZD,HZWXX,DXDJ,WRLB)
+    values (#{id,jdbcType=VARCHAR}, #{bh,jdbcType=VARCHAR}, #{mchsm,jdbcType=VARCHAR}, #{ywmc,jdbcType=VARCHAR}, 
     		#{lbhxb,jdbcType=VARCHAR}, #{cywxx,jdbcType=VARCHAR}, #{bzlb,jdbcType=VARCHAR}, #{bz,jdbcType=VARCHAR}, 
     		#{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=VARCHAR}, 
     		#{updateTime,jdbcType=TIMESTAMP}, #{state,jdbcType=VARCHAR}, #{tbzt,jdbcType=VARCHAR}, #{tbdyid,jdbcType=DECIMAL},
-    		#{qylb,jdbcType=VARCHAR}, #{ssqy,jdbcType=DECIMAL}, #{sftb,jdbcType=VARCHAR},#{recordCode,jdbcType=VARCHAR},
-    		#{byzd1,jdbcType=VARCHAR}, #{byzd2,jdbcType=VARCHAR},#{byzd3,jdbcType=VARCHAR}, #{byzd4,jdbcType=VARCHAR},
-    		#{byzd5,jdbcType=VARCHAR}, #{lhxz,jdbcType=TIMESTAMP}, #{aqffcs,jdbcType=DECIMAL},#{szd,jdbcType=DECIMAL},
-    		#{hzwxx,jdbcType=DECIMAL}, #{dxdj,jdbcType=DECIMAL}, #{wrlb,jdbcType=DECIMAL},
+    		#{qylb,jdbcType=VARCHAR}, #{ssqy,jdbcType=DECIMAL}, #{sftb,jdbcType=VARCHAR},#{orgcode,jdbcType=VARCHAR},
+    		#{bhun,jdbcType=VARCHAR}, #{lbbh,jdbcType=VARCHAR},#{mchsmby,jdbcType=VARCHAR}, #{lhxz,jdbcType=TIMESTAMP}, 
+    		#{aqffcs,jdbcType=VARCHAR},#{szd,jdbcType=VARCHAR}, #{hzwxx,jdbcType=VARCHAR}, #{dxdj,jdbcType=VARCHAR},
+    		#{wrlb,jdbcType=VARCHAR},
       )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.web.model.WxhwModel" >
-    update AQ_BASIC_DWXX_WXHWPMB
+    update AQ_WXHWPMB
     set BH = #{bh,jdbcType=VARCHAR},
       MCHSM = #{mchsm,jdbcType=VARCHAR},
       YWMC = #{ywmc,jdbcType=VARCHAR},
@@ -68,44 +67,42 @@
       QYLB = #{qylb,jdbcType=VARCHAR}, 
       SSQY = #{ssqy,jdbcType=DECIMAL}, 
       SFTB = #{sftb,jdbcType=VARCHAR},
-      RECORD_CODE = #{recordCode,jdbcType=VARCHAR}, 
+      ORG_CODE = #{orgcode,jdbcType=VARCHAR}, 
       LHXZ = #{lhxz,jdbcType=VARCHAR},
       AQFFCS = #{aqffcs,jdbcType=VARCHAR},
-      SZD = #{szd,jdbcType=DECIMAL},
-      HZWXX = #{hzwxx,jdbcType=DECIMAL},
-      DXDJ = #{dxdj,jdbcType=DECIMAL},
-      WRLB = #{wrlb,jdbcType=DECIMAL},
-      BYZD1 = #{byzd1,jdbcType=VARCHAR},
-      BYZD2 = #{byzd2,jdbcType=VARCHAR},
-      BYZD3 = #{byzd3,jdbcType=VARCHAR},
-      BYZD4 = #{byzd4,jdbcType=VARCHAR},
-      BYZD5 = #{byzd5,jdbcType=VARCHAR},
-      ADD_DATE = #{createTime,jdbcType=TIMESTAMP},
-      UPDATE_DATE = #{updateTime,jdbcType=TIMESTAMP},
-      ADD_USER = #{createUser,jdbcType=VARCHAR},
+      SZD = #{szd,jdbcType=VARCHAR},
+      HZWXX = #{hzwxx,jdbcType=VARCHAR},
+      DXDJ = #{dxdj,jdbcType=VARCHAR},
+      WRLB = #{wrlb,jdbcType=VARCHAR},
+      BHUN = #{bhun,jdbcType=VARCHAR},
+      LBBH = #{lbbh,jdbcType=VARCHAR},
+      MCHSMBY = #{mchsmby,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
       UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
-      RECORD_STATUS = #{state,jdbcType=VARCHAR},
+      STATE = #{state,jdbcType=VARCHAR},
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
 	SELECT
-		ID,BH,MCHSM,YWMC,LBHXB,CYWXX,BZLB,BZ,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
-		TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,LHXZ,AQFFCS,SZD,HZWXX,DXDJ,WRLB
-		FROM AQ_BASIC_DWXX_WXHWPMB
-	WHERE ID = #{uuid,jdbcType=VARCHAR}
+		ID,BH,MCHSM,YWMC,LBHXB,CYWXX,BZLB,BZ,CREATE_USER,CREATE_TIME,UPDATE_USER,UPDATE_TIME,STATE,
+		TBZT,TBDYID,QYLB,SSQY,SFTB,ORG_CODE,BHUN,LBBH,MCHSMBY,LHXZ,AQFFCS,SZD,HZWXX,DXDJ,WRLB
+		FROM AQ_WXHWPMB
+	WHERE ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.web.model.WxhwModel">
     SELECT
-		ID,BH,MCHSM,YWMC,LBHXB,CYWXX,BZLB,BZ,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,
-		TBZT,TBDYID,QYLB,SSQY,SFTB,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5,LHXZ,AQFFCS,SZD,HZWXX,DXDJ,WRLB
-	FROM AQ_BASIC_DWXX_WXHWPMB
+		ID,BH,MCHSM,YWMC,LBHXB,CYWXX,BZLB,BZ,CREATE_USER,CREATE_TIME,UPDATE_USER,UPDATE_TIME,STATE,
+		TBZT,TBDYID,QYLB,SSQY,SFTB,ORG_CODE,BHUN,LBBH,MCHSMBY,LHXZ,AQFFCS,SZD,HZWXX,DXDJ,WRLB
+	FROM AQ_WXHWPMB
 	<where>
-		RECORD_STATUS = '1'
+		STATE = '1'
 		<if test="bh != null and bh != ''">
 			AND BH = #{bh,jdbcType=VARCHAR}
 		</if>
 		<if test="mchsm != null and mchsm != ''">
-			AND MCHSM = #{mchsm,jdbcType=VARCHAR}
+			AND MCHSM LIKE CONCAT(CONCAT('%', #{mchsm,jdbcType=VARCHAR}),'%')
 		</if>
 		<if test="lbhxb != null and lbhxb != ''">
 			AND LBHXB = #{lbhxb,jdbcType=VARCHAR}

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/gksssb/GksssbInfo.jsp

@@ -94,7 +94,7 @@
 					<div id="tab-tools" style="margin:10px;">
 				    	<div class="center-block" style="width:160px; margin-left: 0px;" >
 				    			<input id="lefile" type="file" name="file" onchange="lefileChange()" style="display:none">
-						      	<button type="button" class="btn btn-success btn-round btn-sm"
+						      	<button type="button" class="btn btn-custom btn-round btn-sm"
 									onclick="$('input[id=lefile]').click();">
 								<i class="glyphicon glyphicon-ok" ></i> ä¯ÀÀ
 						</button>

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/gksssb/GksssbTjInfo.jsp

@@ -40,8 +40,9 @@
 				</tr>
 			</table>
 		</div>
+	<div class="gridmanager">
+		<table grid-manager="tj-grid-table" id="tj-grid-table"></table>
+	</div>
 	
-	<table id="tj-grid-table" style = "width:100%;"></table>
-		<div id="tj-grid-pager" style = "width:100%;"></div>
 		
 <script src="<%=base%>/static/js/gksssb/GksssbTjInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/gksssb/main.jsp

@@ -17,141 +17,131 @@
 </head>
 
 <body class="p_body">
-<div id="easyuiLayout" class="easyui-layout" data-options="fit:true">
-<!-- 内容部分 -->
-<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_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 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="addJyrUserInfo()" 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/print.png" 
-					onclick="printInfo()" title="打印"/>
-			</div>
-			<div class="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics.png" 
-					onclick="gksssbTj()" title="统计信息"/>
+		<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/add.png" 
+							onclick="addJyrUserInfo()" 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/print.png" 
+							onclick="printInfo()" title="打印"/>
+					</div>
+					<div class="p_buttonbg">
+						<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics.png" 
+							onclick="gksssbTj()" title="统计信息"/>
+					</div>
+					<div class="p_buttonbg">
+						<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
+							onclick="" title="复制"/>
+					</div>
+					<div class="p_buttonbg">
+						<img class="p_buttonimg" src="<%=base%>/static/images/list/storage.png" 
+							onclick="" title="导入模板"/>
+							
+					</div>
+				</div>
 			</div>
-			<div class="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
-					onclick="" title="复制"/>
+			<div class="p_searchdiv">
+				<table class="tabsearch">
+					<tr class="trsearch">
+						<td class="tdname">所在地</td>
+						<td class="tdcontent">
+							<select class="p_txt" id ="szd" name = "szd" onchange="getgq()">
+								<option value = "">--请选择--</option>
+								<c:forEach items="${code }" var="code">
+									<option value = "${code.optVal }">${code.optName}</option>
+								</c:forEach>	
+							</select>
+						</td>
+						<td class="tdname">所在港区 </td>
+						<td class="tdcontent">
+							<select class="p_txt" id ="ssgq" name = "ssgq">
+								<option value = "">--请选择--</option>
+							</select>
+						</td>
+						<td class="tdname">港口经营人名称</td>
+						<td class="tdcontent">
+							<select class="p_txt" id ="jyr" name = "jyr">
+								<option value = "">--请选择--</option>
+							</select>
+						</td>
+					</tr>
+					<tr class="trsearch">
+						<td class="tdname">安全设施设备</td>
+						<td class="tdcontent">
+							<input type="text" id="ssmc" name="ssmc" class="p_txt"/>	
+						</td>
+						<td class="tdname">规格型号</td>
+						<td class="tdcontent">
+							<input type="text" id="ggxh" name="ggxh" class="p_txt"/>
+						</td>
+						<td class="tdname">存放场所</td>
+						<td class="tdcontent">
+							<input type="text" id="cfcs" name="cfcs" 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="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/storage.png" 
-					onclick="" title="导入模板"/>
-					
+			<div class="gridmanager">
+				<table grid-manager="grid-table" id="grid-table"></table>
 			</div>
 		</div>
-		<div class="p_searchdiv">
-			<table class="tabsearch">
-				<tr class="trsearch">
-					<td class="tdname">所在地</td>
-					<td class="tdcontent">
-						<select class="p_txt" id ="szd" name = "szd" onchange="getgq()">
-							<option value = "">--请选择--</option>
-							<c:forEach items="${code }" var="code">
-								<option value = "${code.optVal }">${code.optName}</option>
-							</c:forEach>	
-						</select>
-					</td>
-					<td class="tdname">所在港区 </td>
-					<td class="tdcontent">
-						<select class="p_txt" id ="ssgq" name = "ssgq">
-							<option value = "">--请选择--</option>
-						</select>
-					</td>
-					<td class="tdname">港口经营人名称</td>
-					<td class="tdcontent">
-						<select class="p_txt" id ="jyr" name = "jyr">
-							<option value = "">--请选择--</option>
-						</select>
-					</td>
-				</tr>
-				<tr class="trsearch">
-					<td class="tdname">安全设施设备</td>
-					<td class="tdcontent">
-						<input type="text" id="ssmc" name="ssmc" class="p_txt"/>	
-					</td>
-					<td class="tdname">规格型号</td>
-					<td class="tdcontent">
-						<input type="text" id="ggxh" name="ggxh" class="p_txt"/>
-					</td>
-					<td class="tdname">存放场所</td>
-					<td class="tdcontent">
-						<input type="text" id="cfcs" name="cfcs" 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="page-content">
-			<!--列表部分-->
-			<table id="grid-table"></table>
-			<div id="grid-pager"></div>
-		</div>
-	</div>
-	</div>
-		<div id="gksssbwin" class="easyui-window" title="编辑" style="width:40%;height: 60%;"    
-       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
-       		  <div id="tab-tools" style="margin-bottom:10px;">
-			    	<div class="center-block" style="width:160px; margin-left: auto;margin-right: 0px;" >
-					      	<button class="btn btn-success btn-round btn-sm"
-								onclick="eidit()">
-								<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>
+		<%@ include file="../../layouts/footer.jsp"%>
+			<div id="gksssbwin" class="easyui-window" title="编辑" style="width:40%;height: 60%;"    
+	       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
+	       		  <div id="tab-tools" style="margin-bottom:10px;">
+				    	<div class="center-block" style="width:160px; margin-left: auto;margin-right: 0px;" >
+						      	<button class="btn btn-custom btn-round btn-sm"
+									onclick="eidit()">
+									<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>
+				<%@ include file="../gksssb/GksssbInfo.jsp" %>
 			</div>
-			<%@ include file="../gksssb/GksssbInfo.jsp" %>
-		</div>
-		<div id="gksssbTjwin" class="easyui-window" title="编辑" style="width:100%;height: 100%;"    
-       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
-       		 <%@ include file="../gksssb/GksssbTjInfo.jsp" %>
-       	</div>
-       	<div id="gksssbLookwin" class="easyui-window" title="查看" style="width:80%;height: 70%;"    
-       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
-       		 <%@ include file="../gksssb/GksssbLook.jsp" %>
-       	</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>
+			<div id="gksssbTjwin" class="easyui-window" title="编辑" style="width:100%;height: 100%;"    
+	       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
+	       		 <%@ include file="../gksssb/GksssbTjInfo.jsp" %>
+	       	</div>
+	       	<div id="gksssbLookwin" class="easyui-window" title="查看" style="width:80%;height: 70%;"    
+	       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
+	       		 <%@ include file="../gksssb/GksssbLook.jsp" %>
+	       	</div>
+	</div>
 </body>
 </html>

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/glzd/GlzdInfo.jsp

@@ -87,7 +87,7 @@
 					<div id="tab-tools" style="margin:10px;">
 				    	<div class="center-block" style="width:160px; margin-left: 0px;" >
 				    			<input id="lefile" type="file" name="file" onchange="lefileChange()" style="display:none">
-						      	<button type="button" class="btn btn-success btn-round btn-sm"
+						      	<button type="button" class="btn btn-custom btn-round btn-sm"
 									onclick="$('input[id=lefile]').click();">
 								<i class="glyphicon glyphicon-ok" ></i> ä¯ÀÀ
 						</button>

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/glzd/main.jsp

@@ -17,50 +17,55 @@
 </head>
 
 <body class="p_body">
-<div id="easyuiLayout" class="easyui-layout" data-options="fit:true">
-<!-- 内容部分 -->
-<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 class="p_headdiv">
+		<div class="p_headnav">
+			<img class="p_headnavimg" onclick="gotoHome()" src="<%=base%>/static/images/list/home.png"/>
 		</div>
-		<div class="p_buttondiv">
-			<div class="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" 
-					onclick="addJyrUserInfo()" 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/print.png" 
-					onclick="printInfo()" title="打印"/>
-			</div>
-			<div class="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics.png" 
-					onclick="" title="统计信息"/>
-			</div>
-			<div class="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
-					onclick="" title="复制"/>
-			</div>
-			<div class="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/storage.png" 
-					onclick="" title="导入模板"/>
-					
+		<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/add.png" 
+						onclick="addJyrUserInfo()" 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/print.png" 
+						onclick="printInfo()" title="打印"/>
+				</div>
+				<div class="p_buttonbg">
+					<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics.png" 
+						onclick="" title="统计信息"/>
+				</div>
+				<div class="p_buttonbg">
+					<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
+						onclick="" title="复制"/>
+				</div>
+				<div class="p_buttonbg">
+					<img class="p_buttonimg" src="<%=base%>/static/images/list/storage.png" 
+						onclick="" title="导入模板"/>
+						
+				</div>
 			</div>
 		</div>
 		<div class="p_searchdiv">
@@ -117,22 +122,20 @@
 				
 			</table>
 		</div>
-		<div class="page-content">
-			<!--列表部分-->
-			<table id="grid-table"></table>
-			<div id="grid-pager"></div>
+		<div class="gridmanager">
+				<table grid-manager="grid-table" id="grid-table"></table>
 		</div>
 	</div>
-	</div>
+	<%@ include file="../../layouts/footer.jsp"%>
 		<div id="jyrGlzdwin" class="easyui-window" title="编辑" style="width:40%;height: 60%;"    
        		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
        		  <div id="tab-tools" style="margin-bottom:10px;">
 			    	<div class="center-block" style="width:160px; margin-left: auto;margin-right: 0px;" >
-					      	<button class="btn btn-success btn-round btn-sm"
+					      	<button class="btn btn-custom btn-round btn-sm"
 								onclick="eidit()">
 								<i class="glyphicon glyphicon-ok"></i> 保存
 							</button>
-							<button type="button" class="btn btn-grey btn-round btn-sm"
+							<button type="button" class="btn btn-custom btn-round btn-sm"
 								onclick="closeWin()">
 								<i class="glyphicon glyphicon-remove"></i> 关闭
 							</button>
@@ -140,19 +143,6 @@
 			</div>
 			<%@ include file="../glzd/GlzdInfo.jsp" %>
 		</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>
+	</div>
 </body>
 </html>

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/BwInfo.jsp

@@ -1,8 +1,6 @@
 <%@ page language="java" contentType="text/html;charset=GBK"
 	pageEncoding="GBK"%>
-	<div class="page-content">
-			<!--ÁÐ±í²¿·Ö-->
-			<table id="bw-grid-table" style="width: 100%;"></table>
-			<div id="bw-grid-pager" style="width: 100%;"></div>
+	<div class="gridmanager">
+				<table grid-manager="bw-grid-table" id="bw-grid-table"></table>
 	</div>
 <script src="<%=base%>/static/js/jyr/BwInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/CkInfo.jsp

@@ -1,8 +1,6 @@
 <%@ page language="java" contentType="text/html;charset=GBK"
 	pageEncoding="GBK"%>
-	<div class="page-content">
-			<!--ÁÐ±í²¿·Ö-->
-			<table id="ck-grid-table" style="width: 100%;"></table>
-			<div id="ck-grid-pager" style="width: 100%;"></div>
+	<div class="gridmanager">
+				<table grid-manager="ck-grid-table" id="ck-grid-table"></table>
 	</div>
 <script src="<%=base%>/static/js/jyr/CkInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/DcInfo.jsp

@@ -1,8 +1,6 @@
 <%@ page language="java" contentType="text/html;charset=GBK"
 	pageEncoding="GBK"%>
-	<div class="page-content">
-			<!--ÁÐ±í²¿·Ö-->
-			<table id="dc-grid-table" style="width: 100%;"></table>
-			<div id="dc-grid-pager" style="width: 100%;"></div>
+	<div class="gridmanager">
+				<table grid-manager="dc-grid-table" id="dc-grid-table"></table>
 	</div>
 <script src="<%=base%>/static/js/jyr/DcInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/JyrInfo.jsp

@@ -81,12 +81,10 @@
 			<div class="form-group">
 				 <label class="col-sm-1 control-label" for="gkjyxkzh">港口经营许可证</label>
 				<div class="col-sm-3">
-				<input class="form-control" id="gkjyxkzh" name="gkjyxkzh" 
+				<input class="form-control" style="width:60%; float: left;" id="gkjyxkzh" name="gkjyxkzh" 
 						type="text" placeholder="" />
-				<input type = "button" id = "addFile" onclick="clickfile();" value = "添加附件">
+				<input type = "button" class="btn btn-custom btn-round btn-sm" id = "addFile" onclick="clickfile();"style="margin-left: 20px;" value = "添加附件">
 						
-					<!-- <input class="form-control" id="gkjyxkzh" name="gkjyxkzh" 
-						type="file" placeholder="" /> -->
 				</div>
 				<label class="col-sm-1 control-label" for="fzrq">发证日期</label>
 				<div class="col-sm-3">
@@ -306,7 +304,7 @@
 					<textarea class="form-control" id = "zywxhwpm" name = "zywxhwpm"></textarea>
 					
 				</div>
-				<input type="button" id="choosePerson" onclick="selectWxhw();"  value="选择"/>
+				<input type="button" class="btn btn-custom btn-round btn-sm" id="choosePerson" onclick="selectWxhw();"  value="选择"/>
 			</div>
 			<div class="form-group">
 				<input id = "sfzdsp" name = "sfzdsp" hidden="true"/>
@@ -316,15 +314,28 @@
 				</div>
 			</div>
 	  	 </form>
-	  	 <div id="wh" class="easyui-window" title="选择" style="width:50%;height: 60%;"    
-       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true"> 
-					<%@ include file="../jyr/WxhwName.jsp"%>
-					
+	  	 <div class="modal fade" id="wh" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+			<div class="modal-dialog" style="width:80%;height:100%;">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h6 class="modal-title" id="myModalLabel"></h6>
+					</div>
+					<%@ include file="../../pop/pop_WxhwName.jsp"%>
+				</div>
+			</div>					
 		</div>
-		
-		<div id="fileUp" class="easyui-window" title="文件上传" style="width:30%;"    
-       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
-       		  <%@ include file="../jyr/JyrZsInfo.jsp"%>    
+		<div class="modal fade" id="fileUp" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+			<div class="modal-dialog" style="width:100%;height:100%;">
+				<div class="modal-content">
+					<div class="modal-header">
+						<button type="button" class="close" onclick="closeFile();" data-dismiss="modal">
+							<span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
+						</button>
+						<h6 class="modal-title" id="myModalLabel"></h6>
+					</div>       		 	
+					 <%@ include file="../jyr/JyrZsInfo.jsp"%>    
+       		 	</div>
+       		 </div>
 		</div>
 		
 <script src="<%=base%>/static/js/jyr/JyrInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/JyrTjcxInfo.jsp

@@ -1,7 +1,7 @@
 <%@ page language="java" contentType="text/html;charset=GBK"
 	pageEncoding="GBK"%>
 	
-	<div class="p_searchdiv" style = "width:100%;display:block;">
+	<div  style = "width:100%;display:block;">
 			<table class="tabsearch" style = "margin-top: 10px;width:100%;">
 				<tr class="trsearch">
 					<td class="tdname">所在地</td>
@@ -21,14 +21,14 @@
 					</td>
 					<td class="tdname">统计时间：起</td>
 					<td class="tdcontent">
-						<input id="tjqstime" class="easyui-datetimebox" 
-							 data-options="showSeconds:false,formatter:formatterDateNotsfm"
-							 style="width:60%;height: 34px;" type="text"/>
+						<div class="input-group date" id="tjqstimeDiv">
+                               <input id="tjqstime" name="tjqstime" class="form-control" type="text" readonly="readonly">
+                               <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
+                         </div>
 					</td>
 					<td class="tdname">统计时间：止</td>
 					<td class="tdcontent">
-						<input id="tjjstime" class="easyui-datetimebox" 
-							 data-options="showSeconds:false,formatter:formatterDateNotsfm"
+						<input id="tjjstime" 
 							 style="width:60%;height: 34px;" type="text"/>
 					</td>
 				</tr>
@@ -45,6 +45,7 @@
 				</tr>
 			</table>
 		</div>
-	<table id="tj-grid-table" style = "width:100%;"></table>
-		<div id="tj-grid-pager" style = "width:100%;"></div>
+	<div class="gridmanager">
+			<table grid-manager="tj-grid-table" id="tj-grid-table"></table>
+	</div>
 <script src="<%=base%>/static/js/jyr/JyrTjcxInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/JyrWxhwtjcxInfo.jsp

@@ -1,6 +1,7 @@
 <%@ page language="java" contentType="text/html;charset=GBK"
 	pageEncoding="GBK"%>
 	<div class="p_searchdiv" style = "width:100%;display:block;">
+			
 			<table class="tabsearch" style = "width:100%; margin-top: 10px;">
 				<tr class="trsearch">
 					<td class="tdname">ËùÔÚµØ</td>
@@ -50,6 +51,7 @@
 				</tr>
 			</table>
 		</div>
-	<table id="whtj-grid-table" style = "width:100%;"></table>
-		<div id="whtj-grid-pager" style = "width:100%;"></div>
+	<div class="gridmanager">
+		<table grid-manager="whtj-grid-table" id="whtj-grid-table"></table>
+	</div>
 <script src="<%=base%>/static/js/jyr/JyrWxhwtjcxInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/JyrZsInfo.jsp

@@ -1,7 +1,7 @@
 <%@ page language="java" contentType="text/html;charset=GBK"
 	pageEncoding="GBK"%>
 	<script src="<%=request.getContextPath()%>/static/js/ajaxfileupload.js" type="text/javascript"></script>
-	   	 <form class="form-horizontal" id="jyrUserZsInfoform" method="post"  enctype="multipart/form-data" action="<%=request.getContextPath()%>/jyrUser/saveBlob" >
+	   	 <form class="form-horizontal" id="jyrUserZsInfoform" method="post"  enctype="multipart/form-data" >
 		    <input type="hidden" id="zsid" name="zsid">
 			<input type="hidden" id="zsnr" name="zsnr">
 			<input type="hidden" id="fjbid" name="fjbid">
@@ -9,14 +9,14 @@
 			<div class="form-group">
 				<div class="col-sm-5">
 						<input id="lefile" type="file" name="file" onchange="lefileChange()" style="display:none">
-						<button type="button" class="btn btn-success btn-round btn-sm"
+						<button type="button" class="btn btn-custom btn-round btn-sm"
 								onclick="$('input[id=lefile]').click();">
 								<i class="glyphicon glyphicon-ok" ></i> ä¯ÀÀ
 						</button>
 				</div>
 			</div>
 			<div class="form-group">
-				<table class="easyui-datagrid" style="width:97%;height: 200px; padpadding:10px;" id="zstbl"
+				<table class="easyui-datagrid" style="width:970px;height: 200px;" id="zstbl"
 					        data-options="fitColumns:true,singleSelect:true,striped:true">   
 					    <thead>   
 					        <tr>   

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/WxcgtjcxInfo.jsp

@@ -33,6 +33,7 @@
 				</tr>
 			</table>
 		</div>
-	<table id="wxcgtj-grid-table" style = "width:100%;"></table>
-		<div id="wxcgtj-grid-pager" style = "width:100%;"></div>
+	<div class="gridmanager">
+		<table grid-manager="wxcgtj-grid-table" id="wxcgtj-grid-table"></table>
+	</div>
 <script src="<%=base%>/static/js/jyr/WxcgtjcxInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/WxhwName.jsp

@@ -24,7 +24,7 @@
 					<i class="glyphicon glyphicon-remove"></i> È¡Ïû
 				</button>
 		</div>
-		<div class="p_searchdiv" style = "min-width:100%;width:100%;">
+		<div style = "min-width:100%;width:100%;">
 			<table class="tabsearch" style = "min-width:100%;width:100%;">
 				<tr class="trsearch">
 					<td class="tdname">񅧏</td>
@@ -49,8 +49,8 @@
 				</tr>
 			</table>
 		</div>
-		
-		<table id="wxhw-grid-table" style = "width:100%;"></table>
-		<div id="wxhw-grid-pager" style = "width:100%;"></div>
+		<div class="gridmanager">
+				<table grid-manager="wxhw-grid-table" id="wxhw-grid-table"></table>
+			</div>
 	</div>
 <script src="<%=base%>/static/js/jyr/WxhwName.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyr/main.jsp

@@ -12,192 +12,213 @@
 <script src="<%=base%>/static/js/jyr/index.js"></script>
 	<style type="text/css">
 		.tdname{font-weight: bolder;}
-		
 	</style>
 </head>
-
 <body class="p_body">
-<div id="easyuiLayout" class="easyui-layout" data-options="fit:true">
-<!-- 内容部分 -->
-<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 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_buttondiv">
-			<div class="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" 
-					onclick="addJyrInfo()" 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 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/add.png" 
+						onclick="addJyrInfo()" 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/print.png" 
+						onclick="printInfo()" title="打印"/>
+				</div>
+				<div class="p_buttonbg">
+					<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics.png" 
+						onclick="tjxx()" title="统计信息"/>
+				</div>
+				<div class="p_buttonbg">
+					<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
+						onclick="whqy()" title="危货企业信息"/>
+				</div>
+				<div class="p_buttonbg">
+					<img class="p_buttonimg" src="<%=base%>/static/images/list/storage.png" 
+						onclick="ccss()" title="存储设施信息"/>
+				</div>
+				</div>
 			</div>
-			<div class="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/print.png" 
-					onclick="printInfo()" title="打印"/>
-			</div>
-			<div class="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics.png" 
-					onclick="tjxx()" title="统计信息"/>
-			</div>
-			<div class="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
-					onclick="whqy()" title="危货企业信息"/>
+			<div class="p_searchdiv">
+				<table class="tabsearch">
+					<tr class="trsearch">
+						<td class="tdname">所在地</td>
+						<td class="tdcontent">
+							<select class="p_txt" id ="szd" name = "szd" onchange="getgq()">
+								<option value = "">--请选择--</option>
+								<c:forEach items="${code }" var="code">
+									<option value = "${code.optVal }">${code.optName}</option>
+								</c:forEach>	
+											
+							</select>
+						</td>
+						<td class="tdname">所在区域</td>
+						<td class="tdcontent">
+							<select class="p_txt" id ="qylx" name = "qylx">
+								<option value = "">--请选择--</option>
+								<option value = "1">沿江</option>
+								<option value = "2">沿海</option>
+								<option value = "3">内河</option>				
+							</select>
+						</td>
+						<td class="tdname">所在港区 </td>
+						<td class="tdcontent">
+							<select class="p_txt" id ="szgq" name = "szgq">
+							</select>
+						</td>
+					</tr>
+					<tr class="trsearch">
+						<td class="tdname">港口经营人名称</td>
+						<td class="tdcontent">
+							<input type="text" id="gkjyr" name="gkjyr" class="p_txt"/>
+						</td>
+						<td class="tdname">法定代表人</td>
+						<td class="tdcontent">
+							<input type="text" id="fddbr" name="fddbr" class="p_txt"/>
+						</td>
+						<td class="tdname">是否危贷企业 </td>
+						<td class="tdcontent">
+							<select id="sfwhqy" name = "sfwhqy" class="p_txt" >
+								<option value= "">--请选择--</option>
+								<option value= "Y">是(有重大危险源)</option>
+								<option value= "W">是(无重大危险源)</option>
+								<option value= "N">否</option>
+							</select>	
+						</td>
+					</tr>
+					<tr class="trsearch">
+						<td class="tdname">码头企业类别</td>
+						<td class="tdcontent" colspan="4">
+							<input type="checkbox" name="byzd1" value= "危险货物集装箱码头"/>危险货物集装箱码头
+							<input type="checkbox" name="byzd1" value= "、石油化工码头、"/>石油化工码头
+							<input type="checkbox" name="byzd1" value= "危险货物非石油化工码头"/>危险货物非石油化工码头
+						</td>
+					</tr>
+					<tr class="trsearch">
+						<td class="tdname">仓储企业类别</td>
+						<td class="tdcontent" colspan="2">
+							<input type="checkbox" name="byzd1" value= "石油库"/>石油库
+							<input type="checkbox" name="byzd1" value= "港口危险货物库区"/>港口危险货物库区
+						</td>
+						<td></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="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/storage.png" 
-					onclick="ccss()" title="存储设施信息"/>
+			<div class="gridmanager">
+				<table grid-manager="grid-table" id="grid-table"></table>
 			</div>
 		</div>
-		<div class="p_searchdiv">
-			<table class="tabsearch">
-				<tr class="trsearch">
-					<td class="tdname">所在地</td>
-					<td class="tdcontent">
-						<select class="p_txt" id ="szd" name = "szd" onchange="getgq()">
-							<option value = "">--请选择--</option>
-							<c:forEach items="${code }" var="code">
-								<option value = "${code.optVal }">${code.optName}</option>
-							</c:forEach>	
-										
-						</select>
-					</td>
-					<td class="tdname">所在区域</td>
-					<td class="tdcontent">
-						<select class="p_txt" id ="qylx" name = "qylx">
-							<option value = "">--请选择--</option>
-							<option value = "1">沿江</option>
-							<option value = "2">沿海</option>
-							<option value = "3">内河</option>				
-						</select>
-					</td>
-					<td class="tdname">所在港区 </td>
-					<td class="tdcontent">
-						<select class="p_txt" id ="szgq" name = "szgq">
-						</select>
-					</td>
-				</tr>
-				<tr class="trsearch">
-					<td class="tdname">港口经营人名称</td>
-					<td class="tdcontent">
-						<input type="text" id="gkjyr" name="gkjyr" class="p_txt"/>
-					</td>
-					<td class="tdname">法定代表人</td>
-					<td class="tdcontent">
-						<input type="text" id="fddbr" name="fddbr" class="p_txt"/>
-					</td>
-					<td class="tdname">是否危贷企业 </td>
-					<td class="tdcontent">
-						<select id="sfwhqy" name = "sfwhqy" class="p_txt" >
-							<option value= "">--请选择--</option>
-							<option value= "Y">是(有重大危险源)</option>
-							<option value= "W">是(无重大危险源)</option>
-							<option value= "N">否</option>
-						</select>	
-					</td>
-				</tr>
-				<tr class="trsearch">
-					<td class="tdname">码头企业类别</td>
-					<td class="tdcontent" colspan="4">
-						<input type="checkbox" name="byzd1" value= "危险货物集装箱码头"/>危险货物集装箱码头
-						<input type="checkbox" name="byzd1" value= "、石油化工码头、"/>石油化工码头
-						<input type="checkbox" name="byzd1" value= "危险货物非石油化工码头"/>危险货物非石油化工码头
-					</td>
-				</tr>
-				<tr class="trsearch">
-					<td class="tdname">仓储企业类别</td>
-					<td class="tdcontent" colspan="2">
-						<input type="checkbox" name="byzd1" value= "石油库"/>石油库
-						<input type="checkbox" name="byzd1" value= "港口危险货物库区"/>港口危险货物库区
-					</td>
-					<td></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="page-content">
-			<!--列表部分-->
-			<table id="grid-table"></table>
-			<div id="grid-pager"></div>
-		</div>
-	</div>
-	</div>
-		<div id="jyrwin" class="easyui-window" title="编辑" style="width:100%;height: 100%;"    
-       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
-       		  
-				<div id="tt" class="easyui-tabs"  style="width:100%;height:100%;">   
-					
-				    <div title="经营人基本信息" data-options="iconCls:'icon-reload'"  style="padding:20px;display:none;">   
-				    	<div id="tab-tools" style="margin-bottom:10px;">
-					    	<div class="center-block" style="width:160px; margin-left: auto;margin-right: 0px;" >
-							      	<button id="btnEditOrSave" class="btn btn-success btn-round btn-sm"
-										onclick="editJyr()">
-										<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> 
-				        <%@ include file="../jyr/JyrInfo.jsp"%>    
-				    </div>   
-				    <div title="泊位信息" data-options="iconCls:'icon-reload',closable:true" style="overflow:auto;padding:20px;display:none;">   
-				        <%@ include file="../jyr/BwInfo.jsp"%>   
-				    </div>   
-				    <div title="堆场信息" data-options="iconCls:'icon-reload',closable:true" style="padding:20px;display:none;">   
-				        <%@ include file="../jyr/DcInfo.jsp"%> 
-				    </div> 
-				    <div title="仓库信息" data-options="iconCls:'icon-reload',closable:true" style="padding:20px;display:none;">   
-				        <%@ include file="../jyr/CkInfo.jsp"%>
-				    </div>   
-				</div>  
-					
-					
+		<%@ include file="../../layouts/footer.jsp"%>
+		<div class="modal fade" id="jyrwin" tabindex="99999999" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+			<div class="modal-dialog" style="width:80%;height:100%;">
+				<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="padding:0px;">
+						<div id="tt" class="easyui-tabs" style="width:1300px;height:600px;"> 
+						    <div title="经营人基本信息" data-options="iconCls:'icon-reload'"  style="padding:20px;display:none;">   
+						    	<div id="tab-tools" style="margin-bottom:10px;">
+							    	<div class="center-block" style="width:160px; margin-left: auto;margin-right: 0px;" >
+									      	<button id="btnEditOrSave" class="btn btn-custom btn-round btn-sm"
+												onclick="editJyr()">
+												<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> 
+						        <%@ include file="../jyr/JyrInfo.jsp"%>    
+						    </div>   
+						    <div title="泊位信息" data-options="iconCls:'icon-reload',closable:true" style="overflow:auto;padding:20px;display:none;">   
+						        <%@ include file="../jyr/BwInfo.jsp"%>   
+						    </div>   
+						    <div title="堆场信息" data-options="iconCls:'icon-reload',closable:true" style="padding:20px;display:none;">   
+						        <%@ include file="../jyr/DcInfo.jsp"%> 
+						    </div> 
+						    <div title="仓库信息" data-options="iconCls:'icon-reload',closable:true" style="padding:20px;display:none;">   
+						        <%@ include file="../jyr/CkInfo.jsp"%>
+						    </div>   
+						</div>
+					</div>
+				</div> 
+			</div>
 		</div>
-		
-		<div id="jyrTjxxinfo" class="easyui-window" title="统计信息" style="width:100%;height: 100%;"    
-       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
-       		  <%@ include file="../jyr/JyrTjcxInfo.jsp"%>
+		<div class="modal fade" id="jyrTjxxinfo" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+			<div class="modal-dialog" style="width:100%;height:100%;">
+				<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>
+       		 	 <%@ include file="../jyr/JyrTjcxInfo.jsp"%>
+       		  </div>
+       		</div>
        	</div>
-       	<div id="jyrWhTjxxinfo" class="easyui-window" title="危货企业统计信息" style="width:100%;height: 100%;"    
-       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
-       		  <%@ include file="../jyr/JyrWxhwtjcxInfo.jsp"%>
+       	<div class="modal fade" id="jyrWhTjxxinfo" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+			<div class="modal-dialog" style="width:100%;height:100%;">
+				<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>
+       		  	<%@ include file="../jyr/JyrWxhwtjcxInfo.jsp"%>
+       		  </div>
+       		</div>
        	</div>
-       	<div id="jyrWhcgTjxxinfo" class="easyui-window" title="危货存储设施统计信息" style="width:100%;height: 100%;"    
-       		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
-       		  <%@ include file="../jyr/WxcgtjcxInfo.jsp"%>
+       	<div class="modal fade" id="jyrWhcgTjxxinfo" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+			<div class="modal-dialog" style="width:100%;height:100%;">
+				<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>
+       		  	<%@ include file="../jyr/WxcgtjcxInfo.jsp"%>
+       		  </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>
+	</div>
 </body>
 </html>

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyrUser/JyrUserInfo.jsp

@@ -91,7 +91,7 @@
 					</table>  
 					<div id="tab-tools" style="margin-top:10px;">
 				    	<div class="center-block" style="width:160px; margin-left: 0px;" >
-						      	<button type="button" class="btn btn-success btn-round btn-sm"
+						      	<button type="button" class="btn btn-custom btn-round btn-sm"
 								onclick="addJyrUserZS()" >ÐÂÔö
 						</button>
 						 </div>

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyrUser/JyrUserTjInfo.jsp

@@ -33,19 +33,7 @@
 				</tr>
 			</table>
 		</div>
-		<table id="tj-grid-table"></table>
-			<div id="tj-grid-pager"></div>
-		<!-- <div>
-			<table class="easyui-datagrid" id="sssbList" data-options="fitColumns:true,singleSelect:true"
-					style="width:100%;height:300px; padpadding:10px;">   
-				<thead>   
-			        <tr>   
-			        	<th data-options="field:'qymc',width:20,align:'center'">ÆóÒµ</th>
-			            <th data-options="field:'rylx',width:10,align:'center'">ÈËÔ±ÀàÐÍ</th>   
-			            <th data-options="field:'rs',width:10,align:'center'">ÈËÊý</th>
-			        </tr>   
-				 </thead>   
-			</table>  
-		</div> -->
-		
+		<div class="gridmanager">
+				<table grid-manager="tj-grid-table" id="tj-grid-table"></table>
+		</div>
 <script src="<%=base%>/static/js/jyrUser/JyrUserTjInfo.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyrUser/JyrUserZsInfo.jsp

@@ -43,11 +43,11 @@
 					</div>
 				</div>
 				<div class="col-sm-5">
-						<button type="button" class="btn btn-success btn-round btn-sm"
+						<button type="button" class="btn btn-custom btn-round btn-sm"
 								onclick="$('input[id=lefile]').click();">
 								<i class="glyphicon glyphicon-ok" ></i> ä¯ÀÀ
 						</button>
-						<button type="button" class="btn btn-grey btn-round btn-sm"
+						<button type="button" class="btn btn-custom btn-round btn-sm"
 								onclick="deletFile()">
 								<i class="glyphicon glyphicon-remove"></i> ɾ³ý
 						</button>
@@ -55,11 +55,11 @@
 			</div>
 			<div id="tab-tools" style="margin-bottom:10px;">
 			    	<div class="center-block" style="width:160px; margin-left: auto;" >
-					      	<button type="button" class="btn btn-success btn-round btn-sm"
+					      	<button type="button" class="btn btn-custom btn-round btn-sm"
 								 onclick="saveUserZs();" >
 								<i class="glyphicon glyphicon-ok"></i> ±£´æ
 							</button>
-							<button type="button" class="btn btn-grey btn-round btn-sm"
+							<button type="button" class="btn btn-custom btn-round btn-sm"
 								onclick="closeUserZsWin()">
 								<i class="glyphicon glyphicon-remove"></i> ¹Ø±Õ
 							</button>

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/dwxx/jyrUser/main.jsp

@@ -17,50 +17,55 @@
 </head>
 
 <body class="p_body">
-<div id="easyuiLayout" class="easyui-layout" data-options="fit:true">
-<!-- 内容部分 -->
-<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 class="p_headdiv">
+		<div class="p_headnav">
+			<img class="p_headnavimg" onclick="gotoHome()" src="<%=base%>/static/images/list/home.png"/>
 		</div>
-		<div class="p_buttondiv">
-			<div class="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" 
-					onclick="addJyrUserInfo()" 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/print.png" 
-					onclick="printInfo()" title="打印"/>
-			</div>
-			<div class="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics.png" 
-					onclick="jyrUserTj()" title="统计信息"/>
-			</div>
-			<div class="p_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
-					onclick="" title="复制"/>
+		<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_buttonbg">
-				<img class="p_buttonimg" src="<%=base%>/static/images/list/storage.png" 
-					onclick="" title="导入模板"/>
-					
+			<div class="p_buttondiv">
+				<div class="p_buttonbg">
+					<img class="p_buttonimg" src="<%=base%>/static/images/list/add.png" 
+						onclick="addJyrUserInfo()" 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/print.png" 
+						onclick="printInfo()" title="打印"/>
+				</div>
+				<div class="p_buttonbg">
+					<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics.png" 
+						onclick="jyrUserTj()" title="统计信息"/>
+				</div>
+				<div class="p_buttonbg">
+					<img class="p_buttonimg" src="<%=base%>/static/images/list/statistics2.png" 
+						onclick="" title="复制"/>
+				</div>
+				<div class="p_buttonbg">
+					<img class="p_buttonimg" src="<%=base%>/static/images/list/storage.png" 
+						onclick="" title="导入模板"/>
+						
+				</div>
 			</div>
 		</div>
 		<div class="p_searchdiv">
@@ -115,22 +120,20 @@
 				
 			</table>
 		</div>
-		<div class="page-content">
-			<!--列表部分-->
-			<table id="grid-table"></table>
-			<div id="grid-pager"></div>
+		<div class="gridmanager">
+				<table grid-manager="grid-table" id="grid-table"></table>
 		</div>
 	</div>
-	</div>
+	<%@ include file="../../layouts/footer.jsp"%>
 		<div id="jyrUserwin" class="easyui-window" title="编辑" style="width:40%;height: 60%;"    
        		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
        		  <div id="tab-tools" style="margin-bottom:10px;">
 			    	<div class="center-block" style="width:160px; margin-left: auto;margin-right: 0px;" >
-					      	<button class="btn btn-success btn-round btn-sm"
+					      	<button class="btn btn-custom btn-round btn-sm"
 								onclick="eidit()">
 								<i class="glyphicon glyphicon-ok"></i> 保存
 							</button>
-							<button type="button" class="btn btn-grey btn-round btn-sm"
+							<button type="button" class="btn btn-custom btn-round btn-sm"
 								onclick="closeWin()">
 								<i class="glyphicon glyphicon-remove"></i> 关闭
 							</button>
@@ -142,19 +145,6 @@
        		 data-options="iconCls:'icon-edit',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
        		 <%@ include file="../jyrUser/JyrUserTjInfo.jsp" %>
         </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>
+	</div>
 </body>
 </html>

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/pop/ReadMe.txt

@@ -7,5 +7,32 @@
 	c) 定义函数,共通画面会自动调用该函数
 		function getPopWxhwpmbData(data){//todo}
 	d)  获取
-		data.xx ID
-		data.xxxx 名称
+	for ( var i = 0; i < data.length; i++) {
+		data[i]. bh;//编号                
+		data[i]. mchsm;//名称和说明          
+		data[i]. ywmc;//英文名称            
+		data[i]. lbhxb;//类别和项别          
+		data[i]. cywxx;//次要危险性          
+		data[i]. bzlb;//包装类别            
+		data[i]. bz;//备注                
+		data[i]. tbzt;//同步状态            
+		data[i]. tbdyid;//同步对应id          
+		data[i]. qylb;//区域类别            
+		data[i]. ssqy;//所属区域              
+		data[i]. sftb;//是否同步            
+		data[i]. orgcode;               
+		data[i]. bhun;//编号(UN号)         
+		data[i]. lbbh;//类别编号            
+		data[i]. mchsmby;//名称和说明备用      
+		data[i]. lhxz;//理化性质            
+		data[i]. aqffcs;//防范措施          
+		data[i]. szd;//所在地              
+		data[i]. hzwxx;//火灾危险性          
+		data[i]. dxdj;//毒性等级            
+		data[i]. wrlb;//污染类别
+		data[i]. state;//删除状态            
+		data[i]. createTime//添加时间
+		data[i]. createUser//添加人员
+		data[i]. updateTime//修改时间
+		data[i]. updateUser//修改人员
+	}

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/pop/pop_WxhwName.jsp

@@ -0,0 +1,56 @@
+<%@ page language="java" contentType="text/html;charset=GBK"
+	pageEncoding="GBK"%>
+<style type="text/css">
+	.tdname{
+		font-size: 12px;
+		width : 4%;
+	}
+	.tdcontent{
+		width : 5%;
+	}
+	#gbox_wxhw-grid-table{
+		width:100%;
+	}
+</style>
+	<div class="p_block" style = "min-width:100%;width:100%;margin-left: 0px;">
+		<div class="p_buttondiv" style = "min-width:100%;width:100%;">
+		
+				<button id="btnSave" class="btn btn-success btn-round btn-sm"
+				onclick="checkWxhw()">
+				<i class="glyphicon glyphicon-ok"></i> 确定
+				</button>
+				<button type="button" class="btn btn-grey btn-round btn-sm"
+					onclick="closeWxhw()">
+					<i class="glyphicon glyphicon-remove"></i> 取消
+				</button>
+		</div>
+		<div style = "min-width:100%;width:100%;">
+			<table class="tabsearch" style = "min-width:100%;width:100%;">
+				<tr class="trsearch">
+					<td class="tdname">编号</td>
+					<td class="tdcontent">
+						<input type="text" id="bh" name="bh" class="p_txt"/>
+					</td>
+					<td class="tdname">名称和说明</td>
+					<td class="tdcontent">
+						<input type="text" id="mchsm" name="mchsm" class="p_txt"/>
+					</td>
+					<td class="tdname">类别和项别 </td>
+					<td class="tdcontent">
+						<input type="text" id="lbhxb" name="lbhxb" class="p_txt"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="tdname"></td>
+					<td class="tdcontent" colspan="5">
+						<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="查询"
+							onclick="wxhwSearch()"/>
+					</td>
+				</tr>
+			</table>
+		</div>
+		<div class="gridmanager">
+				<table grid-manager="wxhw-grid-table" id="wxhw-grid-table"></table>
+			</div>
+	</div>
+<script src="<%=base%>/static/js/pop/pop_WxhwName.js"></script>	

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/zyfzsq/main.jsp

@@ -23,86 +23,86 @@
 </head>
 <body class="p_body">
 	<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 class="p_headdiv">
+			<div class="p_headnav">
+				<img class="p_headnavimg" onclick="gotoHome()" src="<%=base%>/static/images/list/home.png"/>
 			</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 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_buttonbg">
-					<img class="p_buttonimg" src="<%=base%>/static/images/list/print.png" 
-						onclick="printInfo()" title="打印"/>
+				<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/print.png" 
+							onclick="printInfo()" title="打印"/>
+					</div>
 				</div>
 			</div>
+			<div class="p_searchdiv">
+				<table class="tabsearch">
+					<tr class="trsearch">
+						<td class="tdname">所在地</td>
+						<td class="tdcontent">
+							<select class="p_txt" id="srchDdlSzd" name="srchDdlSzd" title="请选择..."></select>
+						</td>
+						<td class="tdname">所属港区</td>
+						<td class="tdcontent">
+							<select class="p_txt" id="srchDdlQq" name="srchDdlQq" title="请选择..."></select>
+						</td>
+						<td class="tdname">港口经营人名称 </td>
+						<td class="tdcontent">
+							<input type="text" id="srchGkjyr" name="srchGkjyr" 
+								class="p_txt" value=""></td>
+						<td class="tdname">
+						</td>
+					</tr>
+					<tr class="trsearch">
+						<td class="tdname">危货等级</td>
+						<td class="tdcontent">
+							<select class="p_txt" id="srchDdlWhdj" name="srchDdlWhdj" title="请选择..."></select>
+						</td>
+						<td class="tdname">法定代表人</td>
+						<td class="tdcontent">
+							<input type="text" id="srchFddbr" name="srchFddbr" 
+								class="p_txt" value=""></td>
+						<td class="tdname">任务状态 </td>
+						<td class="tdcontent">
+							<select class="p_txt" id="srchRwzt" name="srchRwzt" title="请选择..."></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="gridmanager">
+			    <table grid-manager="mainGrid" id="mainGrid"></table>
+			</div>
 		</div>
-		<div class="p_searchdiv">
-			<table class="tabsearch">
-				<tr class="trsearch">
-					<td class="tdname">所在地</td>
-					<td class="tdcontent">
-						<select class="p_txt" id="srchDdlSzd" name="srchDdlSzd" title="请选择..."></select>
-					</td>
-					<td class="tdname">所属港区</td>
-					<td class="tdcontent">
-						<select class="p_txt" id="srchDdlQq" name="srchDdlQq" title="请选择..."></select>
-					</td>
-					<td class="tdname">港口经营人名称 </td>
-					<td class="tdcontent">
-						<input type="text" id="srchGkjyr" name="srchGkjyr" 
-							class="p_txt" value=""></td>
-					<td class="tdname">
-					</td>
-				</tr>
-				<tr class="trsearch">
-					<td class="tdname">危货等级</td>
-					<td class="tdcontent">
-						<select class="p_txt" id="srchDdlWhdj" name="srchDdlWhdj" title="请选择..."></select>
-					</td>
-					<td class="tdname">法定代表人</td>
-					<td class="tdcontent">
-						<input type="text" id="srchFddbr" name="srchFddbr" 
-							class="p_txt" value=""></td>
-					<td class="tdname">任务状态 </td>
-					<td class="tdcontent">
-						<select class="p_txt" id="srchRwzt" name="srchRwzt" title="请选择..."></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="gridmanager">
-		    <table grid-manager="mainGrid" id="mainGrid"></table>
-		</div>
-	</div>
-	<%@ include file="../layouts/footer.jsp"%>
+		<%@ include file="../layouts/footer.jsp"%>
 	</div>
 	<div class="modal fade" id="myModal" tabindex="99999999" role="dialog"
 		aria-labelledby="myModalLabel" aria-hidden="true">

gkaqv2/trunk/modules/web/src/main/webapp/static/js/gksssb/GksssbTjInfo.js

@@ -2,7 +2,6 @@
  * js
  */
 var tj_grid_selector = "#tj-grid-table";
-var tj_pager_selector = "#tj-grid-pager";
 jQuery(function($) {
 	// 初始化Grid
 });
@@ -11,93 +10,49 @@ jQuery(function($) {
  * 初始化Grid
  */
 function tj_initGrid() {
-	// 数据表格初始化
-	jQuery(tj_grid_selector).jqGrid({
-		url : basePath + '/gksssb/getTjInfo',
-		mtype : "POST", //提交方式
-		datatype : "json",
-		autowidth: false,
-		height :"auto",
-	    shrinkToFit: true,
-		sortname : "", //默认的排序列
-		sortorder : "", //默认的排序列
+	//单列表简易渲染
+    var table = $(tj_grid_selector);
+    table.GM({
+    	ajax_url : basePath + '/gksssb/getTjInfo',
+    	ajax_type : "POST", //提交方式
 		colNames : ['地区/企业','安全设施设备分类','安全设施设备名称','数量','单位'],
-		colModel : [ {
-			name : 'szd',
-			index : 'szd',
-			editable : false,	
-			sortable : false
+		columnData: [{
+			key : 'szd',
+			width: '100px',
+            align:'center',	
+			text : '地区/企业'
 		},{
-			name : 'yjfl',
-			index : 'yjfl',
-			editable : false,
-			sortable : false
+			key : 'yjfl',
+			width: '100px',
+            align:'center',
+			text : '安全设施设备分类'
 		},{
-			name : 'ssmc',
-			index : 'ssmc',
-			editable : false,
-			sortable : false
+			key : 'ssmc',
+			width: '100px',
+            align:'center',
+			text : '安全设施设备名称'
 		},{
-			name : 'sl',
-			index : 'sl',
-			editable : false,
-			sortable : false
+			key : 'sl',
+			width: '100px',
+            align:'center',
+			text : '数量'
 		},{
-			name : 'sldw',
-			index : 'sldw',
-			editable : false,
-			sortable : false
-		}],
-		rowNum : _rowNum, //每页显示记录数
-		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
-		pager : tj_pager_selector, //定义翻页用的导航栏
-		page : 1, //设置初始的页码,初始为1
-		rownumbers : true,
-		pagerpos : 'center', //指定分页栏的位置
-		altRows : true, //设置为交替行表格,默认为false
-		multiselect : false, //可以多选://控制是否有chechbox选择框
-		multiboxonly : false, //只有选择checkbox才会起作用 
-		multiselect :false, //是否可以多选
-		loadComplete : function() {
-			var table = this;
-			setTimeout(function() {
-				updatePagerIcons(table);
-				enableTooltips(table);
-				
-			}, 0);
-			
-			jQuery(tj_grid_selector).setCell(1,1,$("#tjszd option:selected").text());
-			jQuery(tj_grid_selector).setCell(1,2,$("#tjyjfl option:selected").text());
-		},
-		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 () {
-        	$("#gbox_tj-grid-table").attr("style","width:100%;");
-            $("#gbox_tj-grid-table").find("div").attr("style","width:100%;");
-            $("#gview_tj-grid-table").children("div:first").attr("hidden","true");
-            $("#gbox_tj-grid-table").find("table").attr("style","width:100%;");
-            comGridComplete("tj-grid-table", "editRecord");
-            
-        },
-		onPaging: function(){
-			comGridPage("tj-grid-table");
-		}
+			key : 'sldw',
+			width: '100px',
+            align:'center',
+			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(tj_grid_selector, tj_pager_selector);
-	 
 };
 
 //查询
@@ -106,10 +61,12 @@ function gksssbTjSearch () {
 	var tjyjfl = $("#tjyjfl").val();
 	var gq = $("#gq").val();
 	var qymc = $("#qymc").val();
-	jQuery(tj_grid_selector).jqGrid(
-								'setGridParam',
-								{postData :{"szd":szd,"yjfl":tjyjfl,"szgq":gq,"qymc":qymc}}
-	).trigger("reloadGrid", [{ page: 1 }]);
+	// 定义查询参数
+    var obj = {"szd":szd,"yjfl":tjyjfl,"szgq":gq,"qymc":qymc};
+    // 设置gird参数
+    $(tj_grid_selector).GM('setQuery',obj);
+    // 查询grid
+    $(tj_grid_selector).GM('refreshGrid',true, null);
 	
 }
 /**

gkaqv2/trunk/modules/web/src/main/webapp/static/js/gksssb/index.js

@@ -2,7 +2,6 @@
  * 
  */
 var grid_selector = "#grid-table";
-var pager_selector = "#grid-pager";
 var gridData = "";
 jQuery(function($) {
 	// 初始化Grid
@@ -14,159 +13,119 @@ jQuery(function($) {
  * 初始化Grid
  */
 function initGrid() {
-	resizePageGrid(grid_selector);
-	// 数据表格初始化
-	jQuery(grid_selector).jqGrid({
-		url : basePath + '/gksssb/list',
-		mtype : "POST", //提交方式
-		datatype : "json",
-		autowidth: false,
-		height :"auto",
-	    shrinkToFit: true,
-		sortname : "", //默认的排序列
-		sortorder : "", //默认的排序列
-		colNames : [ 'id','安全设施设备','规格','数量','有效期','港口经营人名称','一级分类','二级分类','填表人','联系电话','存放场所','所在地','所在港区'],
-		colModel : [ {
-			name : 'id',
-			index : 'id',
-			key : true,
-			hidden:true,
-			editable : false,
-			sortable : false
+	//单列表简易渲染
+    var table = $(grid_selector);
+    table.GM({
+    	ajax_url : basePath + '/gksssb/list',
+    	ajax_type : "POST", //提交方式
+		columnData: [{
+			key : 'id',
+			width: '100px',
+            align:'center',
+			text:'id'
 		},{
-			name : 'ssmc',
-			index : 'ssmc',
-			editable : false,
-			sortable : false
+			key : 'ssmc',
+			width: '100px',
+            align:'center',
+			text : '安全设施设备'
 		},{
-			name : 'ggxh',
-			index : 'ggxh',
-			editable : false,
-			sortable : false
+			key : 'ggxh',
+			width: '100px',
+            align:'center',
+			text : '规格'
 		},{
-			name : 'sl',
-			index : 'sl',
-			editable : false,
-			sortable : false
+			key : 'sl',
+			width: '100px',
+            align:'center',
+			text : '数量'
 		},{
-			name : 'yxq',
-			index : 'yxq',
-			editable : false,
-			sortable : false,
-			formatter: function(value,row,index){
-				if (value != null && value != '') {
-					return formatterDateNotsfm(new Date(value));
+			key : 'yxq',
+			width: '100px',
+            align:'center',
+			text : '有效期',
+			template: function(opn,row){
+				if (row['yxq'] != null && row['yxq'] != '') {
+					return formatterDateNotsfm(new Date(row['yxq']));
 				} else {
 					return '';
 				}
 				
 			}
 		},{
-			name : 'gkjyr',
-			index : 'gkjyr',
-			editable : false,
-			sortable : false
+			key : 'gkjyr',
+			width: '100px',
+            align:'center',
+			text : '港口经营人'
 		},{
-			name : 'yjfl',
-			index : 'yjfl',
-			editable : false,
-			sortable : false
+			key : 'yjfl',
+			width: '100px',
+            align:'center',
+			text : '一级分类'
 		},{
-			name : 'ejfl',
-			index : 'ejfl',
-			editable : false,
-			sortable : false
+			key : 'ejfl',
+			width: '100px',
+            align:'center',
+			text : '二级分类'
 		},{
-			name : 'tbr',
-			index : 'tbr',
-			editable : false,
-			sortable : false
+			key : 'tbr',
+			width: '100px',
+            align:'center',
+			text : '填表人'
 		},{
-			name : 'lxdh',
-			index : 'lxdh',
-			editable : false,
-			sortable : false
+			key : 'lxdh',
+			width: '100px',
+            align:'center',
+			text : '联系电话'
 		},{
-			name : 'cfcs',
-			index : 'cfcs',
-			editable : false,
-			sortable : false
+			key : 'cfcs',
+			width: '100px',
+            align:'center',
+			text : '存放场所'
 		},{
-			name : 'szd',
-			index : 'szd',
-			editable : false,
-			sortable : false
+			key : 'szd',
+			width: '100px',
+            align:'center',
+			text : '所在地'
 		},{
-			name : 'gqmc',
-			index : 'gqmc',
-			editable : false,
-			sortable : false
-		}],
-		rowNum : _rowNum, //每页显示记录数
-		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
-		pager : pager_selector, //定义翻页用的导航栏
-		page : 1, //设置初始的页码,初始为1
-		rownumbers : true,
-		pagerpos : 'center', //指定分页栏的位置
-		altRows : true, //设置为交替行表格,默认为false
-		multiselect : true, //可以多选://控制是否有chechbox选择框
-		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");
-		},
-		ondblClickRow : function (id,row,cel,eve) {
-			$.ajax({
-				type : 'POST',
-				dataType : "json",
-				data : {"id":id},
-				url : basePath + '/gksssb/initEdit',//请求的路径				
-				success : function(data) {
-					$("#gksssbLookwin").window({title:"查看"});
-					$("#gksssbLookwin").window("open");
-					
-					$("#gksssbLookform").form("reset");//重置表单数据
-					gksssbCkInfoInit(data);
-					$("#gksssbLookform").find("input").attr("disabled","true");//禁用表单元素input
-					$("#gksssbLookform").find("select").attr("disabled","true");//禁用表单元素select
-					$("#gksssbLookform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
-					$("#gksssbLookform").find("textarea").attr("disabled","true");//禁用表单元素select
-					getLookInfo (data.qymc);
-					
-				},
-				error: function (XMLHttpRequest, textStatus, errorThrown) {
-					alert("error");
-		        }
-			});
-		}
+			key : 'gqmc',
+			width: '100px',
+            align:'center',
+			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);
 };
-
+/*$.ajax({
+	type : 'POST',
+	dataType : "json",
+	data : {"id":id},
+	url : basePath + '/gksssb/initEdit',//请求的路径				
+	success : function(data) {
+		$("#gksssbLookwin").window({title:"查看"});
+		$("#gksssbLookwin").window("open");
+		
+		$("#gksssbLookform").form("reset");//重置表单数据
+		gksssbCkInfoInit(data);
+		$("#gksssbLookform").find("input").attr("disabled","true");//禁用表单元素input
+		$("#gksssbLookform").find("select").attr("disabled","true");//禁用表单元素select
+		$("#gksssbLookform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
+		$("#gksssbLookform").find("textarea").attr("disabled","true");//禁用表单元素select
+		getLookInfo (data.qymc);
+		
+	},
+	error: function (XMLHttpRequest, textStatus, errorThrown) {
+		alert("error");
+    }
+});*/
 /**
  * 选择所在地时联动港口信息
  */
@@ -215,14 +174,15 @@ function searchRecord () {
 	var szd = $("#szd").val();
 	var ssgq = $("#ssgq").val();
 	var jyr = $("#jyr").val();
-	
 	var ssmc = $("#ssmc").val();
 	var ggxh = $("#ggxh").val();
 	var cfcs = $("#cfcs").val();
-	
-	jQuery(grid_selector).jqGrid('setGridParam',
-								{postData :{"szd":szd,"gqmc":ssgq,"gkjyr":jyr,"ssmc":ssmc,"ggxh":ggxh,"cfcs":cfcs
-														}}).trigger("reloadGrid", [{ page: 1 }]);
+	// 定义查询参数
+    var obj = {"szd":szd,"gqmc":ssgq,"gkjyr":jyr,"ssmc":ssmc,"ggxh":ggxh,"cfcs":cfcs};
+    // 设置gird参数
+    $(grid_selector).GM('setQuery',obj);
+    // 查询grid
+    $(grid_selector).GM('refreshGrid',true, null);
 }
 
 

gkaqv2/trunk/modules/web/src/main/webapp/static/js/glzd/index.js

@@ -2,7 +2,6 @@
  * 
  */
 var grid_selector = "#grid-table";
-var pager_selector = "#grid-pager";
 var scouce;
 var jyrInfo;
 jQuery(function($) {
@@ -15,151 +14,88 @@ jQuery(function($) {
  * 初始化Grid
  */
 function initGrid() {
-	resizePageGrid(grid_selector);
-	// 数据表格初始化
-	jQuery(grid_selector).jqGrid({
-		url : basePath + '/glzd/list',
-		mtype : "POST", //提交方式
-		datatype : "json",
-		autowidth: false,
-		height :"auto",
-	    shrinkToFit: true,
-		sortname : "", //默认的排序列
-		sortorder : "", //默认的排序列
-		colNames : [ 'id','制度名称','港口经营人信息','制度分类','发布日期','修订日期','联系人','联系电话','所在地','所在港区'],
-		colModel : [ {
-			name : 'id',
-			index : 'id',
-			key : true,
-			hidden:true,
-			editable : false,
-			sortable : false
+	//单列表简易渲染
+    var table = $(grid_selector);
+    table.GM({
+    	ajax_url : basePath + '/glzd/list',
+    	ajax_type : "POST", //提交方式
+		columnData: [{
+			key : 'id',
+			width: '100px',
+            align:'center',
+			text:'id'
 		},{
-			name : 'zdmc',
-			index : 'zdmc',
-			editable : false,
-			sortable : false
+			key : 'zdmc',
+			width: '100px',
+            align:'center',
+			text : '制度名称'
 		},{
-			name : 'gkjyr',
-			index : 'gkjyr',
-			editable : false,
-			sortable : false
+			key : 'gkjyr',
+			width: '100px',
+            align:'center',
+			text : '港口经营人信息'
 		},{
-			name : 'zdfl',
-			index : 'zdfl',
-			editable : false,
-			sortable : false
+			key : 'zdfl',
+			width: '100px',
+            align:'center',
+			text : '制度分类'
 		},{
-			name : 'fbrq',
-			index : 'fbrq',
-			editable : false,
-			sortable : false,
-			formatter: function(value,row,index){
-				if (value != null && value != '') {
-					return formatDate(new Date(value));
+			key : 'fbrq',
+			width: '100px',
+            align:'center',
+			text : '发布日期',
+			template: function(opn,row){
+				if (row['fbrq'] != null && row['fbrq'] != '') {
+					return formatDate(new Date(row['fbrq']));
 				} else {
 					return '';
 				}
 				
 			}
 		},{
-			name : 'xdrq',
-			index : 'xdrq',
-			editable : false,
-			sortable : false,
-			formatter: function(value,row,index){
-				if (value != null && value != '') {
-					return formatDate(new Date(value));
+			key : 'xdrq',
+			width: '100px',
+            align:'center',
+			text : '修订日期',
+			template: function(opn,row){
+				if (row['xdrq'] != null && row['xdrq'] != '') {
+					return formatDate(new Date(row['xdrq']));
 				} else {
 					return '';
 				}
 			}
 		},{
-			name : 'lxr',
-			index : 'lxr',
-			editable : false,
-			sortable : false
+			key : 'lxr',
+			width: '100px',
+            align:'center',
+			text : '联系人'
 		},{
-			name : 'lxdh',
-			index : 'lxdh',
-			editable : false,
-			sortable : false
+			key : 'lxdh',
+			width: '100px',
+            align:'center',
+			text : '联系电话'
 		},{
-			name : 'szd',
-			index : 'szd',
-			editable : false,
-			sortable : false
+			key : 'szd',
+			width: '100px',
+            align:'center',
+			text : '所在地'
 		},{
-			name : 'gqmc',
-			index : 'gqmc',
-			editable : false,
-			sortable : false
-		}],
-		rowNum : _rowNum, //每页显示记录数
-		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
-		pager : pager_selector, //定义翻页用的导航栏
-		page : 1, //设置初始的页码,初始为1
-		rownumbers : true,
-		pagerpos : 'center', //指定分页栏的位置
-		altRows : true, //设置为交替行表格,默认为false
-		multiselect : true, //可以多选://控制是否有chechbox选择框
-		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");
-		},
-		ondblClickRow : function (id,row,cel,eve) {
-			
-			$.ajax({
-				type : 'POST',
-				dataType : "json",
-				data : {"id":id},
-				url : basePath + '/glzd/initEdit',//请求的路径				
-				success : function(data) {
-					$("#jyrGlzdwin").window({title:"查看"});
-					$("#jyrGlzdwin").window("open");
-					$("#jyrGlzdInfoform").form("reset");//重置表单数据
-					$("#jyrGlzdInfoform").find("input").attr("disabled","true");//禁用表单元素input
-					$("#jyrGlzdInfoform").find("select").attr("disabled","true");//禁用表单元素select
-					$("#jyrGlzdInfoform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
-					$("#jyrGlzdInfoform").find("textarea").attr("disabled","true");//禁用表单元素select
-					
-					$("#tab-tools").attr("hidden",true);
-					JyrGlzdInfoInit(data);
-					glzdZsInint(data.id,"2");//参数说明：data.id:指附件表中的ssid，“2”指是查看状态，“1”指是编辑状态
-				},
-				error: function (XMLHttpRequest, textStatus, errorThrown) {
-					alert("error");
-		        }
-			});
-			
-		}
+			key : 'gqmc',
+			width: '100px',
+            align:'center',
+			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);
 };
 
 /**
@@ -215,10 +151,12 @@ function searchRecord () {
 	var xdrqk = $("#xdrqk").datetimebox("getValue");
 	var xdrqj = $("#xdrqj").datetimebox("getValue");
 	var zdmc = $("#zdmc").val();
-	
-	jQuery(grid_selector).jqGrid('setGridParam',
-								{postData :{"szd":szd,"gqmc":ssgq,"gkjyr":jyr,"zdfl":zdfl,"xdrq":xdrqk,"fbrq":xdrqj,"zdmc":zdmc
-														}}).trigger("reloadGrid", [{ page: 1 }]);
+	// 定义查询参数
+    var obj = {"szd":szd,"gqmc":ssgq,"gkjyr":jyr,"zdfl":zdfl,"xdrq":xdrqk,"fbrq":xdrqj,"zdmc":zdmc};
+    // 设置gird参数
+    $(grid_selector).GM('setQuery',obj);
+    // 查询grid
+    $(grid_selector).GM('refreshGrid',true, null);
 }
 
 

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/BwInfo.js

@@ -2,7 +2,6 @@
  * js
  */
 var bw_grid_selector = "#bw-grid-table";
-var bw_pager_selector = "#bw-grid-pager";
 jQuery(function($) {
 	// 初始化Grid
 });
@@ -12,99 +11,53 @@ jQuery(function($) {
  * 初始化Grid
  */
 function bw_initGrid(qymc) {
-	jQuery(bw_grid_selector).jqGrid({
-		url : basePath + '/bw/list',
-		mtype : "POST", //提交方式
-		datatype : "json",
-		autowidth: false,
-		height :"auto",
-	    shrinkToFit: true,
-		sortname : "", //默认的排序列
-		sortorder : "", //默认的排序列
-		colNames : [ 'id','泊位名称','码头名称','设计靠泊能力(万吨)','泊位长度(米)','泊位用途'],
-		colModel : [ {
-			name : 'id',
-			index : 'id',
-			key : true,
-			hidden:true,
-			editable : false,
-			sortable : false
+ //单列表简易渲染
+    var table = $(bw_grid_selector);
+ // 数据表格初始化
+    table.GM({
+    	ajax_url : basePath + '/bw/list',
+    	ajax_type : "POST", //提交方式
+    	columnData: [{
+			key : 'id',
+			width: '100px',
+	        align:'center',
+			text : 'id'
 		},{
-			name : 'bwmc',
-			index : 'bwmc',
-			editable : false,
-			sortable : false
+			key : 'bwmc',
+			width: '100px',
+	        align:'center',
+			text : '泊位名称'
 		},{
-			name : 'mtName',
-			index : 'mtName',
-			editable : false,
-			sortable : false
+			key : 'mtName',
+			width: '100px',
+	        align:'center',
+			text : '码头名称'
 		},{
-			name : 'sjkpnl',
-			index : 'sjkpnl',
-			editable : false,
-			sortable : false
+			key : 'sjkpnl',
+			width: '100px',
+	        align:'center',
+			text : '设计靠泊能力(万吨)'
 		},{
-			name : 'bwcd',
-			index : 'bwcd',
-			editable : false,
-			sortable : false
+			key : 'bwcd',
+			width: '100px',
+	        align:'center',
+			text : '泊位长度(米)'
 		},{
-			name : 'zwbwyt',
-			index : 'zwbwyt',
-			editable : false,
-			sortable : false
-		}],
-		rowNum : _rowNum, //每页显示记录数
-		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
-		pager : bw_pager_selector, //定义翻页用的导航栏
-		page : 1, //设置初始的页码,初始为1
-		rownumbers : true,
-		pagerpos : 'center', //指定分页栏的位置
-		altRows : true, //设置为交替行表格,默认为false
-		multiselect : false, //可以多选://控制是否有chechbox选择框
-		multiboxonly : false, //只有选择checkbox才会起作用 
-		multiselect :false, //是否可以多选
-		loadComplete : function() {
-			var table = this;
-			setTimeout(function() {
-				updatePagerIcons(table);
-				enableTooltips(table);
-				
-			}, 0);
-		},
-		prmNames : {
-             oper : "oper",
-             page : "page",
-             rows : "rows",
-             sort : "sidx",
-             order : "sord"
-        },
-		postData :{
-			"qymc" : qymc
-		},
-		jsonReader : {
-			root : "list", // json中代表实际模型数据的入口
-			page : "page", // json中代表当前页码的数据
-			total : "pages", // json中代表页码总数的数据
-			records : "total", // json中代表数据行总数的数据
-			repeatitems : false// 如果设为false，则jqGrid在解析json时，会根据name来搜索对应的数据元素
-		},
-        gridComplete: function () {
-        	$("#gbox_bw-grid-table").attr("style","width:100%;");
-            $("#gbox_bw-grid-table").find("div").attr("style","width:100%;");
-            $("#gview_bw-grid-table").children("div:first").attr("hidden","true");
-            $("#gbox_bw-grid-table").find("table").attr("style","width:100%;");
-            comGridComplete("bw-grid-table", "editRecord");
-            
-        },
-		onPaging: function(){
-			comGridPage("bw-grid-table");
-		}
-	});
-	jQuery(bw_grid_selector).jqGrid('setGridParam',{postData : {"qymc":qymc}}).trigger("reloadGrid", [{ page: 1 }]);
-	// 调整jqgrid
-	ajustJqGrid(bw_grid_selector, bw_pager_selector);	
+			key : 'zwbwyt',
+			width: '100px',
+	        align:'center',
+			text : '泊位用途'
+		}]
+		,pagingBefore:function(query){}
+	    ,pagingAfter: function(query){}
+	    ,sortingBefore:function(query){}
+	    ,sortingAfter: function(query){}
+	    ,ajax_beforeSend: function(query){}
+	    ,ajax_complete: function(data){
+	    }
+	    },function(query){
+//	      console.log('init方法回调query参数', query);
+	  });
 	 
 };
 

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/CkInfo.js

@@ -2,7 +2,6 @@
  * js
  */
 var ck_grid_selector = "#ck-grid-table";
-var ck_pager_selector = "#ck-grid-pager";
 jQuery(function($) {
 	// 初始化Grid
 });
@@ -12,100 +11,53 @@ jQuery(function($) {
  * 初始化Grid
  */
 function ck_initGrid(ssjyr) {
-	jQuery(ck_grid_selector).jqGrid({
-		url : basePath + '/ck/list',
-		mtype : "POST", //提交方式
-		datatype : "json",
-		autowidth: false,
-		height :"auto",
-	    shrinkToFit: true,
-		sortname : "", //默认的排序列
-		sortorder : "", //默认的排序列
-		colNames : [ 'id','仓库名称','仓库个数(个)','仓库用途','仓库面积','仓库容积'],
-		colModel : [ {
-			name : 'id',
-			index : 'id',
-			key : true,
-			hidden:true,
-			editable : false,
-			sortable : false
+	//单列表简易渲染
+    var table = $(ck_grid_selector);
+ // 数据表格初始化
+    table.GM({
+    	ajax_url : basePath + '/ck/list',
+    	ajax_type : "POST", //提交方式
+		columnData: [{
+			key : 'id',
+			width: '100px',
+	        align:'center',
+			text : 'id'
 		},{
-			name : 'ckmc',
-			index : 'ckmc',
-			editable : false,
-			sortable : false
+			key : 'ckmc',
+			width: '100px',
+	        align:'center',
+			text : '仓库名称'
 		},{
-			name : 'ckgs',
-			index : 'ckgs',
-			editable : false,
-			sortable : false
+			key : 'ckgs',
+			width: '100px',
+	        align:'center',
+			text : '仓库个数(个)'
 		},{
-			name : 'zwckyt',
-			index : 'zwckyt',
-			editable : false,
-			sortable : false
+			key : 'zwckyt',
+			width: '100px',
+	        align:'center',
+			text : '仓库用途'
 		},{
-			name : 'scyckmj',
-			index : 'scyckmj',
-			editable : false,
-			sortable : false
+			key : 'scyckmj',
+			width: '100px',
+	        align:'center',
+			text : '仓库面积'
 		},{
-			name : 'scyckrj',
-			index : 'scyckrj',
-			editable : false,
-			sortable : false
-		}],
-		rowNum : _rowNum, //每页显示记录数
-		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
-		pager : ck_pager_selector, //定义翻页用的导航栏
-		page : 1, //设置初始的页码,初始为1
-		rownumbers : true,
-		pagerpos : 'center', //指定分页栏的位置
-		altRows : true, //设置为交替行表格,默认为false
-		multiselect : false, //可以多选://控制是否有chechbox选择框
-		multiboxonly : false, //只有选择checkbox才会起作用 
-		multiselect :false, //是否可以多选
-		loadComplete : function() {
-			var table = this;
-			setTimeout(function() {
-				updatePagerIcons(table);
-				enableTooltips(table);
-				
-			}, 0);
-		},
-		prmNames : {
-             oper : "oper",
-             page : "page",
-             rows : "rows",
-             sort : "sidx",
-             order : "sord"
-        },
-		postData :{
-			"ssjyr" : ssjyr
-		},
-		jsonReader : {
-			root : "list", // json中代表实际模型数据的入口
-			page : "page", // json中代表当前页码的数据
-			total : "pages", // json中代表页码总数的数据
-			records : "total", // json中代表数据行总数的数据
-			repeatitems : false// 如果设为false，则jqGrid在解析json时，会根据name来搜索对应的数据元素
-		},
-        gridComplete: function () {
-        	$("#gbox_ck-grid-table").attr("style","width:100%;");
-            $("#gbox_ck-grid-table").find("div").attr("style","width:100%;");
-            $("#gview_ck-grid-table").children("div:first").attr("hidden","true");
-            $("#gbox_ck-grid-table").find("table").attr("style","width:100%;");
-            comGridComplete("ck-grid-table", "editRecord");
-            
-        },
-		onPaging: function(){
-			comGridPage("ck-grid-table");
-		}
-	});
-	jQuery(ck_grid_selector).jqGrid('setGridParam',{postData : {"ssjyr":ssjyr}}).trigger("reloadGrid", [{ page: 1 }]);
-	// 调整jqgrid
-	ajustJqGrid(ck_grid_selector, ck_pager_selector);	
-	 
+			key : 'scyckrj',
+			width: '100px',
+	        align:'center',
+			text : '仓库容积'
+		}]
+    ,pagingBefore:function(query){}
+    ,pagingAfter: function(query){}
+    ,sortingBefore:function(query){}
+    ,sortingAfter: function(query){}
+    ,ajax_beforeSend: function(query){}
+    ,ajax_complete: function(data){
+    }
+    },function(query){
+//      console.log('init方法回调query参数', query);
+  });
 };
 
 formatterDate = function (date) {

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/DcInfo.js

@@ -2,7 +2,6 @@
  * js
  */
 var dc_grid_selector = "#dc-grid-table";
-var dc_pager_selector = "#dc-grid-pager";
 jQuery(function($) {
 	// 初始化Grid
 });
@@ -12,109 +11,63 @@ jQuery(function($) {
  * 初始化Grid
  */
 function dc_initGrid(qymc) {
-	jQuery(dc_grid_selector).jqGrid({
-		url : basePath + '/dc/list',
-		mtype : "POST", //提交方式
-		datatype : "json",
-		autowidth: false,
-		height :"auto",
-	    shrinkToFit: true,
-		sortname : "", //默认的排序列
-		sortorder : "", //默认的排序列
-		colNames : [ 'id','堆场名称','主要用途','堆场总面积(平方米)','堆场总容量(吨)','是否危险品堆场'],
-		colModel : [ {
-			name : 'id',
-			index : 'id',
-			key : true,
-			hidden:true,
-			editable : false,
-			sortable : false
+	//单列表简易渲染
+    var table = $(dc_grid_selector);
+ // 数据表格初始化
+    table.GM({
+    	ajax_url : basePath + '/dc/list',
+    	ajax_type : "POST", //提交方式
+		columnData: [{
+			key : 'id',
+			width: '100px',
+	        align:'center',
+			text : 'id'
 		},{
-			name : 'dcmc',
-			index : 'dcmc',
-			editable : false,
-			sortable : false
+			key : 'dcmc',
+			width: '100px',
+	        align:'center',
+			text : '堆场名称'
 		},{
-			name : 'zwdcyt',
-			index : 'zwdcyt',
-			editable : false,
-			sortable : false
+			key : 'zwdcyt',
+			width: '100px',
+	        align:'center',
+			text : '主要用途'
 		},{
-			name : 'dczmj',
-			index : 'dczmj',
-			editable : false,
-			sortable : false
+			key : 'dczmj',
+			width: '100px',
+	        align:'center',
+			text : '堆场总面积(平方米)'
 		},{
-			name : 'dczrl',
-			index : 'dczrl',
-			editable : false,
-			sortable : false
+			key : 'dczrl',
+			width: '100px',
+	        align:'center',
+			text : '堆场总容量(吨)'
 		},{
-			name : 'wxpdc',
-			index : 'wxpdc',
-			editable : false,
-			sortable : false,
-			formatter : function (cell,opt,row) {
-				if (row.wxpdc == "N") {
-					return "否";
-				} else if (row.wxpdc == "Y") {
-					return "是";
-				}
-			}
-		}],
-		rowNum : _rowNum, //每页显示记录数
-		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
-		pager : dc_pager_selector, //定义翻页用的导航栏
-		page : 1, //设置初始的页码,初始为1
-		rownumbers : true,
-		pagerpos : 'center', //指定分页栏的位置
-		altRows : true, //设置为交替行表格,默认为false
-		multiselect : false, //可以多选://控制是否有chechbox选择框
-		multiboxonly : false, //只有选择checkbox才会起作用 
-		multiselect :false, //是否可以多选
-		loadComplete : function() {
-			var table = this;
-			setTimeout(function() {
-				updatePagerIcons(table);
-				enableTooltips(table);
-				
-			}, 0);
-		},
-		prmNames : {
-             oper : "oper",
-             page : "page",
-             rows : "rows",
-             sort : "sidx",
-             order : "sord"
-        },
-		postData :{
-			"qymc" : qymc
-		},
-		jsonReader : {
-			root : "list", // json中代表实际模型数据的入口
-			page : "page", // json中代表当前页码的数据
-			total : "pages", // json中代表页码总数的数据
-			records : "total", // json中代表数据行总数的数据
-			repeatitems : false// 如果设为false，则jqGrid在解析json时，会根据name来搜索对应的数据元素
-		},
-        gridComplete: function () {
-        	$("#gbox_dc-grid-table").attr("style","width:100%;");
-            $("#gbox_dc-grid-table").find("div").attr("style","width:100%;");
-            $("#gview_dc-grid-table").children("div:first").attr("hidden","true");
-            $("#gbox_dc-grid-table").find("table").attr("style","width:100%;");
-            comGridComplete("dc-grid-table", "editRecord");
-            
-        },
-		onPaging: function(){
-			comGridPage("dc-grid-table");
-		}
-	});
-	jQuery(dc_grid_selector).jqGrid('setGridParam',{postData : {"qymc":qymc}}).trigger("reloadGrid", [{ page: 1 }]);
-	// 调整jqgrid
-	ajustJqGrid(dc_grid_selector, dc_pager_selector);	
+			key : 'wxpdc',
+			width: '100px',
+	        align:'center',
+			text : '是否危险品堆场',
+			template: function(operation, rowObject){  
+             	if (rowObject["wxpdc"]  == "N" ) {
+ 					return "否";
+ 				} else if (rowObject["wxpdc"]  == "Y") {
+ 					return "是";
+ 				}
+             	return rowObject["wxpdc"];
+            }
+		}]
+	,pagingBefore:function(query){}
+    ,pagingAfter: function(query){}
+    ,sortingBefore:function(query){}
+    ,sortingAfter: function(query){}
+    ,ajax_beforeSend: function(query){}
+    ,ajax_complete: function(data){
+    }
+    },function(query){
+//      console.log('init方法回调query参数', query);
+  });
 	 
 };
-
 formatterDate = function (date) {
 	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
 	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/JyrInfo.js

@@ -322,10 +322,8 @@ function getqylb () {
 function selectWxhw () {
 	//获得先已有的危险物品
 	zywxhwpm = $("#zywxhwpm").text();
-	
-	$("#wh").window('open');//打开弹窗
+	showModelDialog("wh", "选择");
 	wxhw_initGrid($("#szd2").val());//加载弹窗中的数据表格
-	showSearch();//显示弹窗中的条件查询的元素
 }
 /**
  * 是否自动审批的checked
@@ -436,11 +434,28 @@ function editFJInfo (data) {
 		});
 }
 function clickfile() {
-	$("#fileUp").window('open');//打开弹窗
-	
+//	$("#fileUp").window('open');//打开弹窗
+	showModelDialog("fileUp", "选择文件");
 	zsInint($("#id").val(),"1");
 }
 
+function closeFile() {
+	hideModelDialog("fileUp");
+}
+
+function getPopWxhwpmbData (data) {
+	if (data != null && data.length > 0) {
+		var mchsm = "";
+		for ( var i = 0; i < data.length; i++) {
+			if (i == data.length-1) {
+				mchsm += data[i].mchsm;
+			} else {
+				mchsm += data[i].mchsm+ ";";
+			}
+		}
+		$("#jyrwin").find("#zywxhwpm").val(mchsm);
+	}
+}
 
 formatterDate = function (date) {
 	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/JyrTjcxInfo.js

@@ -2,9 +2,16 @@
  * js
  */
 var tj_grid_selector = "#tj-grid-table";
-var tj_pager_selector = "#tj-grid-pager";
 jQuery(function($) {
 	// 初始化Grid
+	$("#tjqstimeDiv").datetimepicker({
+        language : "zh-CN",
+        todayHighlight : true,
+        todayBtn : "linked",
+        format : 'yyyy-mm-dd',
+        autoclose : true,
+        minView : 2
+    });
 });
 
 
@@ -12,191 +19,148 @@ jQuery(function($) {
  * 初始化Grid
  */
 function tj_initGrid() {
-	// 数据表格初始化
-	jQuery(tj_grid_selector).jqGrid({
-		url : basePath + '/tjcx/list',
-		mtype : "POST", //提交方式
-		datatype : "json",
-		autowidth: false,
-		height :"auto",
-	    shrinkToFit: true,
-		sortname : "", //默认的排序列
-		sortorder : "", //默认的排序列
-		colNames : ['企业名称','石油货物码头','危险货物码头','普货','集装箱','万吨以上','万吨以下','千吨以上','千吨以下','数量','重大危险源单元数量','容积'],
-		colModel : [ {
-			name : 'gkjyr',
-			index : 'gkjyr',
-			editable : false,
-			sortable : false
+	//单列表简易渲染
+    var table = $(tj_grid_selector);
+    table.GM({
+    	ajax_url : basePath + '/tjcx/list',
+    	ajax_type : "POST", //提交方式
+    	columnData: [{
+			key : 'gkjyr',
+			width: '80px',
+	        align:'center',
+			text : '企业名称'
 		},{
-			name : 'syhgmt',
-			index : 'syhgmt',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.syhgmt == null || row.syhgmt == '' ) {
+			key : 'syhgmt',
+			width: '80px',
+	        align:'center',
+			text : '石油货物码头',
+			template : function (opt,row) {
+				if (row['syhgmt'] == null || row['syhgmt'] == '' ) {
 					return 0;
 				}
-				return row.syhgmt;
+				return row['syhgmt'];
 			}
 		},{
-			name : 'wxhw',
-			index : 'wxhw',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.wxhw == null || row.wxhw == '' ) {
+			key : 'wxhw',
+			width: '80px',
+	        align:'center',
+			text : '危险货物码头',
+			template : function (opt,row) {
+				if (row['wxhw'] == null || row['wxhw'] == '' ) {
 					return 0;
 				}
-				return row.wxhw;
+				return row['wxhw'];
 			}
 		},{
-			name : 'ph',
-			index : 'ph',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.ph == null || row.ph == '' ) {
+			key : 'ph',
+			width: '80px',
+	        align:'center',
+			text : '普货',
+			template : function (opt,row) {
+				if (row['ph'] == null || row['ph'] == '' ) {
 					return 0;
 				}
-				return row.ph;
+				return row['ph'];
 			}
 		},{
-			name : 'jzx',
-			index : 'jzx',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.jzx == null || row.jzx == '' ) {
+			key : 'jzx',
+			width: '80px',
+	        align:'center',
+			text : '集装箱',
+			template : function (opt,row) {
+				if (row['jzx'] == null || row['jzx'] == '' ) {
 					return 0;
 				}
-				return row.jzx;
+				return row['jzx'];
 			}
 		},{
-			name : 'wd',
-			index : 'wd',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.wd == null || row.wd == '' ) {
+			key : 'wd',
+			width: '50px',
+	        align:'center',
+			text : '万吨以上',
+			template : function (opt,row) {
+				if (row['wd'] == null || row['wd'] == '' ) {
 					return 0;
 				}
-				return row.wd;
+				return row['wd'];
 			}
 		},{
-			name : 'wdyx',
-			index : 'wdyx',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.wdyx == null || row.wdyx == '' ) {
+			key : 'wdyx',
+			width: '50px',
+	        align:'center',
+			text : '万吨以下',
+			template : function (opt,row) {
+				if (row['wdyx'] == null || row['wdyx'] == '' ) {
 					return 0;
 				}
-				return row.wdyx;
+				return row['wdyx'];
 			}
 		},{
-			name : 'qd',
-			index : 'qd',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.qd == null || row.qd == '' ) {
+			key : 'qd',
+			width: '50px',
+	        align:'center',
+			text : '千吨以上',
+			template : function (opt,row) {
+				if (row['qd'] == null || row['qd'] == '' ) {
 					return 0;
 				}
-				return row.qd;
+				return row['qd'];
 			}
 		},{
-			name : 'qdyx',
-			index : 'qdyx',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.qdyx == null || row.qdyx == '' ) {
+			key : 'qdyx',
+			width: '50px',
+	        align:'center',
+			text : '千吨以下',
+			template : function (opt,row) {
+				if (row['qdyx'] == null || row['qdyx'] == '' ) {
 					return 0;
 				}
-				return row.qdyx;
+				return row['qdyx'];
 			}
 		},{
-			name : 'sl',
-			index : 'sl',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.sl == null || row.sl == '' ) {
+			key : 'sl',
+			width: '50px',
+	        align:'center',
+			text : '数量',
+			template : function (opt,row) {
+				if (row['sl'] == null || row['sl'] == '' ) {
 					return 0;
 				}
-				return row.sl;
+				return row['sl'];
 			}
 		},{
-			name : 'wxsl',
-			index : 'wxsl',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.wxsl == null || row.wxsl == '' ) {
+			key : 'wxsl',
+			width: '50px',
+	        align:'center',
+			text : '重大危险源单元数量',
+			template : function (opt,row) {
+				if (row['wxsl'] == null || row['wxsl'] == '' ) {
 					return 0;
 				}
-				return row.wxsl;
+				return row['wxsl'];
 			}
 		},{
-			name : 'rj',
-			index : 'rj',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.rj == null || row.rj == '' ) {
+			key : 'rj',
+			width: '50px',
+	        align:'center',
+			text : '容积',
+			template : function (opt,row) {
+				if (row['rj'] == null || row['rj'] == '' ) {
 					return 0;
 				}
-				return row.rj;
+				return row['rj'];
 			}
-		}],
-		rowNum : _rowNum, //每页显示记录数
-		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
-		pager : tj_pager_selector, //定义翻页用的导航栏
-		page : 1, //设置初始的页码,初始为1
-		rownumbers : true,
-		pagerpos : 'center', //指定分页栏的位置
-		altRows : true, //设置为交替行表格,默认为false
-		multiselect : false, //可以多选://控制是否有chechbox选择框
-		multiboxonly : false, //只有选择checkbox才会起作用 
-		multiselect :false, //是否可以多选
-		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 () {
-        	$("#gbox_tj-grid-table").attr("style","width:100%;");
-            $("#gbox_tj-grid-table").find("div").attr("style","width:100%;");
-            $("#gview_tj-grid-table").children("div:first").attr("hidden","true");
-            $("#gbox_tj-grid-table").find("table").attr("style","width:100%;");
-            comGridComplete("tj-grid-table", "editRecord");
-            
-        },
-		onPaging: function(){
-			comGridPage("tj-grid-table");
-		}
+		}]
+    ,pagingBefore:function(query){}
+    ,pagingAfter: function(query){}
+    ,sortingBefore:function(query){}
+    ,sortingAfter: function(query){}
+    ,ajax_beforeSend: function(query){}
+    ,ajax_complete: function(data){
+    }
+	},function(query){
+	//    console.log('init方法回调query参数', query);
 	});
-	// 调整jqgrid
-	ajustJqGrid(tj_grid_selector, tj_pager_selector);
-	 
 };
 //查询
 function jyrTjSearch () {
@@ -204,13 +168,14 @@ function jyrTjSearch () {
 	var qylx = $("#tjqylx").val();
 	var qstime = $("#tjqstime").datetimebox("getValue");
 	var jstime = $("#tjjstime").datetimebox("getValue");
-	jQuery(tj_grid_selector).jqGrid(
-								'setGridParam',
-								{postData :{"szd":szd,"qylx":qylx,"qstime":qstime,"jstime":jstime}}
-	).trigger("reloadGrid", [{ page: 1 }]);
+	// 定义查询参数
+    var obj = {"szd":szd,"qylx":qylx,"qstime":qstime,"jstime":jstime};
+    // 设置gird参数
+    $(tj_grid_selector).GM('setQuery',obj);
+    // 查询grid
+    $(tj_grid_selector).GM('refreshGrid',true, null);
 }
 
-
 function printJyrTjInfo () {
 	location.href = basePath + '/tjcx/printJyrTjInfo';
 }

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/JyrWxhwtjcxInfo.js

@@ -2,7 +2,6 @@
  * js
  */
 var whtj_grid_selector = "#whtj-grid-table";
-var whtj_pager_selector = "#whtj-grid-pager";
 jQuery(function($) {
 	// 初始化Grid
 });
@@ -12,159 +11,116 @@ jQuery(function($) {
  * 初始化Grid
  */
 function whtj_initGrid() {
-	// 数据表格初始化
-	jQuery(whtj_grid_selector).jqGrid({
-		url : basePath + '/jyrwxhw/list',
-		mtype : "POST", //提交方式
-		datatype : "json",
-		autowidth: false,
-		height :"auto",
-	    shrinkToFit: true,
-		sortname : "", //默认的排序列
-		sortorder : "", //默认的排序列
-		colNames : ['所在地','企业名称','类别','码头名称','万吨级泊位数量','千吨级泊位数量','吞吐量(TEU)','吞吐量(吨)','所在港区','建设规模','是否持有附证','主要作业货种','所在区域'],
-		colModel : [ {
-			name : 'bz',
-			index : 'bz',
-			editable : false,
-			sortable : false
+	//单列表简易渲染
+    var table = $(whtj_grid_selector);
+    table.GM({
+    	ajax_url : basePath + '/jyrwxhw/list',
+    	ajax_type : "POST", //提交方式
+    	columnData: [{
+			key : 'gkjyr',
+			width: '100px',
+	        align:'center',
+			text : '企业名称'
 		},{
-			name : 'gkjyr',
-			index : 'gkjyr',
-			editable : false,
-			sortable : false
+			key : 'bz',
+			width: '50px',
+	        align:'center',
+			text : '所在地'
 		},{
-			name : 'byzd1',
-			index : 'byzd1',
-			editable : false,
-			sortable : false
+			key : 'byzd1',
+			width: '50px',
+	        align:'center',
+			text : '类别'
 		},{
-			name : 'bwmc',
-			index : 'bwmc',
-			editable : false,
-			sortable : false
+			key : 'bwmc',
+			width: '50px',
+	        align:'center',
+			text : '码头名称'
 		},{
-			name : 'wd',
-			index : 'wd',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.wd == null || row.wd == '' ) {
+			key : 'wd',
+			width: '50px',
+	        align:'center',
+			text : '万吨级泊位数量',
+			template : function (opt,row) {
+				if (row['wd'] == null || row['wd'] == '' ) {
 					return 0;
 				}
-				return row.wd;
+				return row['wd'];
 			}
 		},{
-			name : 'qd',
-			index : 'qd',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.qd == null || row.qd == '' ) {
+			key : 'qd',
+			width: '50px',
+	        align:'center',
+			text : '千吨级泊位数量',
+			template : function (opt,row) {
+				if (row['qd'] == null || row['qd'] == '' ) {
 					return 0;
 				}
-				return row.qd;
+				return row['qd'];
 			}
 		},{
-			name : 'jzxttl',
-			index : 'jzxttl',
-			editable : false,
-			sortable : false
+			key : 'jzxttl',
+			width: '50px',
+	        align:'center',
+			text : '吞吐量(TEU)'
 		},{
-			name : 'ttl',
-			index : 'qd',
-			editable : false,
-			sortable : false
+			key : 'ttl',
+			width: '50px',
+	        align:'center',
+			text : '吞吐量(吨)'
 		},{
-			name : 'gqmc',
-			index : 'gqmc',
-			editable : false,
-			sortable : false
+			key : 'gqmc',
+			width: '50px',
+	        align:'center',
+			text : '所在港区'
 		},{
-			name : 'gm',
-			index : 'gm',
-			editable : false,
-			sortable : false
+			key : 'gm',
+			width: '100px',
+	        align:'center',
+			text : '建设规模'
 		},{
-			name : 'sffz',
-			index : 'sffz',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.sffz == null || row.syhgmt == '' ) {
+			key : 'sffz',
+			width: '50px',
+	        align:'center',
+			text : '是否持有附证',
+			template : function (opt,row) {
+				if (row['sffz'] == null || row['sffz'] == '' ) {
 					return "否";
 				}
 				return "是";
 			}
 		},{
-			name : 'hz',
-			index : 'hz',
-			editable : false,
-			sortable : false
+			key : 'hz',
+			width: '100px',
+	        align:'center',
+			text : '主要作业货种'
 		},{
-			name : 'qylx',
-			index : 'qylx',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.qylx == '1') {
+			key : 'qylx',
+			width: '50px',
+	        align:'center',
+			text : '所在区域',
+			template : function (opt,row) {
+				if (row['qylx'] == '1') {
 					return "沿江";
 				}
-				if (row.qylx == '2') {
+				if (row['qylx'] == '2') {
 					return "沿海";
 				}
-				if (row.qylx == '3') {
+				if (row['qylx'] == '3') {
 					return "内河";
 				}
 			}
-		}],
-		rowNum : _rowNum, //每页显示记录数
-		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
-		pager : whtj_pager_selector, //定义翻页用的导航栏
-		page : 1, //设置初始的页码,初始为1
-		rownumbers : true,
-		pagerpos : 'center', //指定分页栏的位置
-		altRows : true, //设置为交替行表格,默认为false
-		multiselect : false, //可以多选://控制是否有chechbox选择框
-		multiboxonly : false, //只有选择checkbox才会起作用 
-		multiselect :false, //是否可以多选
-		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 () {
-        	$("#gbox_whtj-grid-table").attr("style","width:100%;");
-            $("#gbox_whtj-grid-table").find("div").attr("style","width:100%;");
-            $("#gview_whtj-grid-table").children("div:first").attr("hidden","true");
-            $("#gbox_whtj-grid-table").find("table").attr("style","width:100%;");
-            comGridComplete("whtj-grid-table", "editRecord");
-            
-        },
-		onPaging: function(){
-			comGridPage("whtj-grid-table");
-		}
-	});
-	// 调整jqgrid
-	ajustJqGrid(whtj_grid_selector, whtj_pager_selector);
-	 
+		}]
+    ,pagingBefore:function(query){}
+    ,pagingAfter: function(query){}
+    ,sortingBefore:function(query){}
+    ,sortingAfter: function(query){}
+    ,ajax_beforeSend: function(query){}
+    ,ajax_complete: function(data){
+    }
+},function(query){
+//    console.log('init方法回调query参数', query);
+});
 }; 
 
 /**
@@ -205,10 +161,13 @@ function jyrWxTjsearch () {
 			wxbyzd3 = str[i];
 		}
 	}
-	jQuery(whtj_grid_selector).jqGrid(
-								'setGridParam',
-								{postData : {"szd":szd,"qylx":qylx,"kssj":qstime,"jssj":jstime,"byzd1":wxbyzd1,"byzd2":wxbyzd2,"byzd3":wxbyzd3}}
-	).trigger("reloadGrid", [{ page: 1 }]);
+	
+	// 定义查询参数
+    var obj = {"szd":szd,"qylx":qylx,"kssj":qstime,"jssj":jstime,"byzd1":wxbyzd1,"byzd2":wxbyzd2,"byzd3":wxbyzd3};
+    // 设置gird参数
+    $(whtj_grid_selector).GM('setQuery',obj);
+    // 查询grid
+    $(whtj_grid_selector).GM('refreshGrid',true, null);
 }
 
 /**

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/WxcgtjcxInfo.js

@@ -2,7 +2,6 @@
  * js
  */
 var wxcgtj_grid_selector = "#wxcgtj-grid-table";
-var wxcgtj_pager_selector = "#wxcgtj-grid-pager";
 jQuery(function($) {
 	// 初始化Grid
 });
@@ -12,134 +11,98 @@ jQuery(function($) {
  * 初始化Grid
  */
 function wxcgtj_initGrid() {
-	// 数据表格初始化
-	jQuery(wxcgtj_grid_selector).jqGrid({
-		url : basePath + '/wxcg/list',
-		mtype : "POST", //提交方式
-		datatype : "json",
-		autowidth: false,
-		height :"auto",
-	    shrinkToFit: true,
-		sortname : "", //默认的排序列
-		sortorder : "", //默认的排序列
-		colNames : ['所在地','企业名称','类别','个数','容积(万立方)','型号个数(万立方*个)','主要作业货种','重大危险源储罐(个)','所在区域'],
-		colModel : [ {
-			name : 'bz',
-			index : 'bz',
-			editable : false,
-			sortable : false
+	//单列表简易渲染
+    var table = $(wxcgtj_grid_selector);
+    table.GM({
+    	ajax_url : basePath + '/wxcg/list',
+    	ajax_type : "POST", //提交方式
+    	supportCheckbox : 'false',
+    	supportAutoOrder : 'false',
+    	columnData: [{
+			key : 'bz',
+			width: '30px',
+			text : '所在地'
 		},{
-			name : 'gkjyr',
-			index : 'gkjyr',
-			editable : false,
-			sortable : false
+			key : 'gkjyr',
+			width: '100px',
+	        align:'center',
+			text : '企业名称'
 		},{
-			name : 'byzd1',
-			index : 'byzd1',
-			editable : false,
-			sortable : false
+			key : 'byzd1',
+			width: '50px',
+	        align:'center',
+			text : '类别'
 		},{
-			name : 'sl',
-			index : 'sl',
-			editable : false,
-			sortable : false
+			key : 'sl',
+			width: '20px',
+	        align:'center',
+			text : '个数'
 		},{
-			name : 'rj',
-			index : 'rj',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.rj == null || row.rj == '' ) {
+			key : 'rj',
+			width: '30px',
+	        align:'center',
+			text : '容积(万立方)',
+			template : function(operation, rowObject){
+				if (rowObject['rj'] == null || rowObject['rj'] == '' ) {
 					return 0;
 				}
-				return row.rj;
+				return rowObject['rj'];
 			}
 		},{
-			name : 'xhgs',
-			index : 'xhgs',
-			editable : false,
-			sortable : false
+			key : 'xhgs',
+			width: '100px',
+	        align:'center',
+			text : '型号个数(万立方*个)'
 		},{
-			name : 'hz',
-			index : 'hz',
-			editable : false,
-			sortable : false
+			key : 'hz',
+			width: '100px',
+	        align:'center',
+			text : '主要作业货种'
 		},{
-			name : 'wxsl',
-			index : 'wxsl',
-			editable : false,
-			sortable : false
+			key : 'wxsl',
+			width: '10px',
+	        align:'center',
+			text : '重大危险源储罐(个)'
 		},{
-			name : 'qylx',
-			index : 'qylx',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row) {
-				if (row.qylx == '1') {
+			key : 'qylx',
+			width: '20px',
+	        align:'center',
+			text : '所在区域',
+			template : function (opt,row) {
+				if (row['qylx'] == '1') {
 					return "沿江";
 				}
-				if (row.qylx == '2') {
+				if (row['qylx'] == '2') {
 					return "沿海";
 				}
-				if (row.qylx == '3') {
+				if (row['qylx'] == '3') {
 					return "内河";
 				}
 			}
-		}],
-		rowNum : _rowNum, //每页显示记录数
-		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
-		pager : wxcgtj_pager_selector, //定义翻页用的导航栏
-		page : 1, //设置初始的页码,初始为1
-		rownumbers : true,
-		pagerpos : 'center', //指定分页栏的位置
-		altRows : true, //设置为交替行表格,默认为false
-		multiselect : false, //可以多选://控制是否有chechbox选择框
-		multiboxonly : false, //只有选择checkbox才会起作用 
-		multiselect :false, //是否可以多选
-		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 () {
-        	$("#gbox_wxcgtj-grid-table").attr("style","width:100%;");
-            $("#gbox_wxcgtj-grid-table").find("div").attr("style","width:100%;");
-            $("#gview_wxcgtj-grid-table").children("div:first").attr("hidden","true");
-            $("#gbox_wxcgtj-grid-table").find("table").attr("style","width:100%;");
-            comGridComplete("wxcgtj-grid-table", "editRecord");
-            
-        },
-		onPaging: function(){
-			comGridPage("wxcgtj-grid-table");
-		}
+		}]
+    ,pagingBefore:function(query){}
+    ,pagingAfter: function(query){}
+    ,sortingBefore:function(query){}
+    ,sortingAfter: function(query){}
+    ,ajax_beforeSend: function(query){}
+    ,ajax_complete: function(data){
+    }
+	},function(query){
+	//    console.log('init方法回调query参数', query);
 	});
-	// 调整jqgrid
-	ajustJqGrid(wxcgtj_grid_selector, wxcgtj_pager_selector);
-	 
 };
+/**
+ * 查询
+ */
 function jyrWxcgSearch () {
-	alert(1);
 	var szd = $("#wcszd").val();
 	var qylx = $("#wcqylx").val();
-	jQuery(wxcgtj_grid_selector).jqGrid('setGridParam',{postData : {"szd":szd,"qylx":qylx}}).trigger("reloadGrid", [{ page: 1 }]);
-	
+	// 定义查询参数
+    var obj ={"szd":szd,"qylx":qylx};
+    // 设置gird参数
+    $(wxcgtj_grid_selector).GM('setQuery',obj);
+    // 查询grid
+    $(wxcgtj_grid_selector).GM('refreshGrid',true, null);
 }
 
 /**

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/WxhwName.js

@@ -2,128 +2,83 @@
  * js
  */
 var wxhw_grid_selector = "#wxhw-grid-table";
-var wxhw_pager_selector = "#wxhw-grid-pager";
 jQuery(function($) {
 	// 初始化Grid
 });
-var mchsm = "";
 
 /**
  * 初始化Grid
  */
 function wxhw_initGrid(szd) {
+	 //单列表简易渲染
+    var table = $(wxhw_grid_selector);
 	// 数据表格初始化
-	jQuery(wxhw_grid_selector).jqGrid({
-		url : basePath + '/wxhw/list',
-		mtype : "POST", //提交方式
-		datatype : "json",
-		autowidth: false,
-		height :"auto",
-	    shrinkToFit: true,
-		sortname : "", //默认的排序列
-		sortorder : "", //默认的排序列
-		colNames : [ 'id','编号','名称和说明','类别和项别'],
-		colModel : [ {
-			name : 'id',
-			index : 'id',
-			key : true,
-			hidden:true,
-			editable : false,
-			sortable : false
+    table.GM({
+    	ajax_url : basePath + '/wxhw/list'
+        ,ajax_type: 'POST'
+		,columnData: [{
+			key : 'id',
+			width: '100px',
+	        align:'center',
+			text : 'id'
 		},{
-			name : 'bh',
-			index : 'bh',
-			editable : false,
-			sortable : false
+			key : 'bh',
+			width: '100px',
+	        align:'center',
+			text : "编号"
 		},{
-			name : 'mchsm',
-			index : 'mchsm',
-			editable : false,
-			sortable : false
+			key : 'mchsm',
+			width: '100px',
+	        align:'center',
+			text : '名称和说明'
 		},{
-			name : 'lbhxb',
-			index : 'lbhxb',
-			editable : false,
-			sortable : false
-		}],
-		rowNum : _rowNum, //每页显示记录数
-		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
-		pager : wxhw_pager_selector, //定义翻页用的导航栏
-		page : 1, //设置初始的页码,初始为1
-		rownumbers : true,
-		pagerpos : 'center', //指定分页栏的位置
-		altRows : true, //设置为交替行表格,默认为false
-		multiselect : true, //可以多选://控制是否有chechbox选择框
-		multiboxonly : false, //只有选择checkbox才会起作用 
-		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"
-        },
-		postData :{
-			"szd" : szd
-		},
-		jsonReader : {
-			root : "list", // json中代表实际模型数据的入口
-			page : "page", // json中代表当前页码的数据
-			total : "pages", // json中代表页码总数的数据
-			records : "total", // json中代表数据行总数的数据
-			repeatitems : false// 如果设为false，则jqGrid在解析json时，会根据name来搜索对应的数据元素
-		},
-        gridComplete: function () {
-        	$("#gbox_wxhw-grid-table").attr("style","width:100%;");
-            $("#gbox_wxhw-grid-table").find("div").attr("style","width:100%;");
-            $("#gview_wxhw-grid-table").children("div:first").attr("hidden","true");
-            $("#gbox_wxhw-grid-table").find("table").attr("style","width:100%;");
-            comGridComplete("wxhw-grid-table", "editRecord");
-            
-        },
-        onSelectRow: function (rowid,status) {
-        	if (status) {
-        		var data = jQuery("#wxhw-grid-table").jqGrid('getRowData', rowid);
-        		mchsm += data.mchsm + ";";
-        	} else {
-        		var data = jQuery("#wxhw-grid-table").jqGrid('getRowData', rowid);
-        		mchsm = mchsm.replace(data.mchsm+";", "");
-        	}
-        	
-        	
-        },
-		onPaging: function(){
-			comGridPage("wxhw-grid-table");
-		}
-	});
-	jQuery(wxhw_grid_selector).jqGrid('setGridParam',{postData : {"szd":szd}}).trigger("reloadGrid", [{ page: 1 }]);
-	// 调整jqgrid
-	ajustJqGrid(wxhw_grid_selector, wxhw_pager_selector);
-	 
+			key : 'lbhxb',
+			width: '100px',
+	        align:'center',
+			text : '类别和项别'
+		}]
+	,pagingBefore:function(query){}
+    ,pagingAfter: function(query){}
+    ,sortingBefore:function(query){}
+    ,sortingAfter: function(query){}
+    ,ajax_beforeSend: function(query){}
+    ,ajax_complete: function(data){
+    }
+    },function(query){
+//      console.log('init方法回调query参数', query);
+  });
 };
 //危险物品名称查询
 function wxhwSearch () {
-	jQuery(wxhw_grid_selector).jqGrid(
-			'setGridParam',
-			{postData :{"bh":$("#bh").val(),"mchsm":$("#mchsm").val(),"lbhxb":$("#lbhxb").val()}}
-	).trigger("reloadGrid", [{ page: 1 }]);
+	// 定义查询参数
+    var obj = {"bh":$("#bh").val(),"mchsm":$("#mchsm").val(),"lbhxb":$("#lbhxb").val()};
+			 
+    // 设置gird参数
+    $(wxhw_grid_selector).GM('setQuery',obj);
+    // 查询grid
+    $(wxhw_grid_selector).GM('refreshGrid',true, null);
+}
+/**
+ * 获取选中数据
+ */
+function checkGridData () {
+	 var rows = $(wxhw_grid_selector).GM('getCheckedTr');
+	 var mchsms = "";
+	 if (rows.length >= 1) {
+	        for (var i = 0; i < rows.length; i++) {
+	            //获取选择的行的数据，只要传入rowId即可
+	            var data = $(wxhw_grid_selector).GM('getRowData', rows[i]);
+	            mchsms += data.mchsm +";";
+	        }
+	  }
+	 return mchsms;
 }
-
 /**
  * 将选中的危险物品放入到上层window的页面元素中
  */
 function checked () {
-	var data = mchsm.substring(0, mchsm.length-1);
+	var data = checkGridData();
 	$("#jyrwin").find("#zywxhwpm").val(data);
-	mchsm="";
 	$("#wh").window('close');
 }
 

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyr/index.js

@@ -2,17 +2,14 @@
  * js
  */
 var grid_selector = "#grid-table";
-var pager_selector = "#grid-pager";
 var scouce;
 var jyrInfo;
 jQuery(function($) {
 	// 初始化Grid
-	initGrid();
-	$("#jyrwin").window("close");
-	$("#win").window("close");
-	$("#jyrinfo").window("close");
-	
-	
+	initJyrGrid();
+//	$("#jyrwin").window("close");
+//	$("#win").window("close");
+//	$("#jyrinfo").window("close");
 	getgq();
 	xzqhSelect();
 	
@@ -20,185 +17,181 @@ jQuery(function($) {
 /**
  * 初始化Grid
  */
-function initGrid() {
-	//resize to fit page size
-	resizePageGrid(grid_selector);
-	// 数据表格初始化
-	jQuery(grid_selector).jqGrid({
-		url : basePath + '/jyr/list',
-		mtype : "POST", //提交方式
-		datatype : "json",
-		autowidth: false,
-		height :"auto",
-	    shrinkToFit: true,
-		sortname : "", //默认的排序列
-		sortorder : "", //默认的排序列
-		colNames : [ 'id','港口经营人名称','类别','是否危贷企业','有无重大危险源','港口经营许可证','港口危险作业附证编号','经营范围','法定代表人','安全部门负责人','值班电话','所在地','所在港区'],
-		colModel : [ {
-			name : 'id',
-			index : 'id',
-			key : true,
-			hidden:true,
-			editable : false,
-			sortable : false
-		},{
-			name : 'gkjyr',
-			index : 'gkjyr',
-			editable : false,
-			sortable : false
-		},{
-			name : 'byzd1',
-			index : 'byzd1',
-			editable : false,
-			sortable : false,
-			formatter : function (cel,opt,row){
-				if (row.byzd1 == null) {
-					return "";
-				}
-				return row.byzd1;
-			}
-		},{
-			name : 'sfwhqy',
-			index : 'sfwhqy',
-			editable : false,
-			sortable : false,
-			formatter : function (cell,opt,row) {
-				if (row.sfwhqy == "Y"||row.sfwhqy=="W") {
-					return "是";
-				} else if (row.sfwhqy == "N") {
-					return "否";
-				}
-			}
-		},{
-			name : 'sfwhqy',
-			index : 'sfwhqy',
-			editable : false,
-			sortable : false,
-			formatter : function (cell,opt,row) {
-				if (row.sfwhqy == "W" || row.sfwhqy == "N") {
-					return "否";
-				} else if (row.sfwhqy == "Y") {
-					return "是";
+function initJyrGrid() {
+    //单列表简易渲染
+    var table = $(grid_selector);
+    table.GM({
+        ajax_url:  basePath + '/jyr/list'
+        ,ajax_type: 'POST'
+        ,columnData: [{
+                key: 'gkjyr',
+                width: '100px',
+                align:'center',
+                text: '港口经营人名称'
+            },{
+                key: 'byzd1',
+                width: '100px',
+                text: '类别',
+                template: function(operation, rowObject){  
+                	if (rowObject["byzd1"] == null) {
+    					return "";
+    				}
+    				return rowObject["byzd1"];
+                }
+            },{
+                key: 'sfwhqy',
+                width: '100px',
+                text: '是否危贷企业',
+                template: function(operation, rowObject){  
+                	if (rowObject["sfwhqy"]  == "Y" || rowObject["sfwhqy"]  == "W") {
+    					return "否";
+    				} else if (rowObject["sfwhqy"]  == "N") {
+    					return "是";
+    				}
+                }
+            },{
+                key: 'sfwhqy',
+                width: '100px',
+                text: '有无重大危险源',
+                template: function(operation, rowObject){  
+                	if (rowObject["sfwhqy"]  == "W" || rowObject["sfwhqy"]  == "N") {
+    					return "否";
+    				} else if (rowObject["sfwhqy"]  == "Y") {
+    					return "是";
+    				}
+                	
+                }
+            },{
+                key: 'gkjyxkzh',
+                width: '100px',
+                text: '港口经营许可证'
+            },{
+                key: 'gkwxhwzyfzbh',
+                width: '60px',
+                text: '港口危险作业附证编号'
+            },{
+                key: 'jyfw',
+                width: '80px',
+                text: '经营范围'
+            },{
+                key: 'fddbr',
+                width: '100px',
+                text: '法定代表人'
+            },{
+                key: 'aqbmfzr',
+                width: '100px',
+                text: '安全部门负责人'
+            },{
+                key: 'aqfzrzbdh',
+                width: '100px',
+                text: '值班电话'
+            },{
+                key: 'text',
+                width: '100px',
+                text: '所在地'
+            },{
+                key: 'gqmc',
+                width: '100px',
+                text: '所在港区',
+                align:'center'
+            },{
+            	key : 'id',
+            	width: '30px',
+            	align : "center",
+            	text : '操作',
+            	template: function(operation, rowObject){  
+                    //operation:当前key所对应的单条数据；rowObject：单个一行完整数据
+                    return '<a class="operation" href="javascript:getLookInfo(\''+rowObject['id']+'\');">查看</a>';
+                }
+            }
+        ]
+        ,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);
+    });
+};
+/**
+ * 查看详细
+ * @param id
+ */
+function getLookInfo (id) {
+		$.ajax({
+			type : 'POST',
+			dataType : "json",
+			data : {"id":id},
+			url : basePath + '/jyr/initEdit',//请求的路径				
+			success : function(data) {
+				// 弹出模态框
+			    showModelDialog("jyrwin", "查看");
+				$("#jyrInfoform").form("reset");//重置表单数据
+				$("#jyrInfoform").find("input").attr("disabled","true");//禁用表单元素input
+				$("#jyrInfoform").find("select").attr("disabled","true");//禁用表单元素select
+				$("#jyrInfoform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
+				$("#jyrInfoform").find("textarea").attr("disabled","true");//禁用表单元素select
+				$("#tab-tools").attr("hidden",true);
+				manageInfo(data);
+				$("#tt").tabs('enableTab',1);
+				$("#tt").tabs('enableTab',2);
+				$("#tt").tabs('enableTab',3);
+				bw_initGrid(data[0].id);
+				ck_initGrid(data[0].id);
+				dc_initGrid(data[0].id);
+			},
+			error: function (XMLHttpRequest, textStatus, errorThrown) {
+				alert("error");
+	    }
+		});
+}
+
+/**
+ * 查询事件
+ */
+function searchRecord() {
+	var str = getcheckbox();
+	var souce = str.split(",");
+	var szd = $("#szd").val();
+	var qylx = $("#qylx").val();
+	var szgq = $("#szgq").val();
+	var gkjyr = $("#gkjyr").val();
+	var fddbr = $("#fddbr").val();
+	var sfwhqy = $("#sfwhqy").val();
+	var byzd1 = "";
+	var byzd2 = "";
+	var byzd3 = "";
+	var byzd4 = "";
+	var byzd5 = "";
+	if(souce.length > 0) {
+		byzd1 = souce[0];
+		if (souce.length > 1) {
+			byzd2 = souce[1];
+			if (souce.length > 2) {
+				byzd3 = souce[2];
+				if (souce.length > 3) {
+					byzd4 = souce[3];
+					if (souce.length > 4) {
+						byzd5 = souce[4];
+					}
 				}
 			}
-		},{
-			name : 'gkjyxkzh',
-			index : 'gkjyxkzh',
-			editable : false,
-			sortable : false
-		},{
-			name : 'gkwxhwzyfzbh',
-			index : 'gkwxhwzyfzbh',
-			editable : false,
-			sortable : false
-		},{
-			name : 'jyfw',
-			index : 'jyfw',
-			editable : false,
-			sortable : false
-		},{
-			name : 'fddbr',
-			index : 'fddbr',
-			editable : false,
-			sortable : false
-		},{
-			name : 'aqbmfzr',
-			index : 'aqbmfzr',
-			editable : false,
-			sortable : false
-		},{
-			name : 'aqfzrzbdh',
-			index : 'aqfzrzbdh',
-			editable : false,
-			sortable : false
-		},{
-			name : 'text',
-			index : 'szd',
-			editable : false,
-			sortable : false
-		},{
-			name : 'gqmc',
-			index : 'szgq',
-			editable : false,
-			sortable : false
-		} ],
-		rowNum : _rowNum, //每页显示记录数
-		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
-		pager : pager_selector, //定义翻页用的导航栏
-		page : 1, //设置初始的页码,初始为1
-		rownumbers : true,
-		pagerpos : 'center', //指定分页栏的位置
-		altRows : true, //设置为交替行表格,默认为false
-		multiselect : true, //可以多选://控制是否有chechbox选择框
-		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"
-        },
-		postData :{
-			condition1 : function(){ return ""; },//查询条件1
-			condition2 : function(){ return ""; }//查询条件2
-		},
-		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");
-		},
-		ondblClickRow : function (id,row,cel,eve) {
-			
-			$.ajax({
-				type : 'POST',
-				dataType : "json",
-				data : {"id":id},
-				url : basePath + '/jyr/initEdit',//请求的路径				
-				success : function(data) {
-					$("#jyrwin").window({title:"查看"});
-					$("#jyrwin").window("open");
-					$("#jyrInfoform").form("reset");//重置表单数据
-					$("#jyrInfoform").find("input").attr("disabled","true");//禁用表单元素input
-					$("#jyrInfoform").find("select").attr("disabled","true");//禁用表单元素select
-					$("#jyrInfoform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
-					$("#jyrInfoform").find("textarea").attr("disabled","true");//禁用表单元素select
-					
-					$("#tab-tools").attr("hidden",true);
-					manageInfo(data);
-					$("#tt").tabs('enableTab',1);
-					$("#tt").tabs('enableTab',2);
-					$("#tt").tabs('enableTab',3);
-					bw_initGrid(data[0].id);
-					ck_initGrid(data[0].id);
-					dc_initGrid(data[0].id);
-				},
-				error: function (XMLHttpRequest, textStatus, errorThrown) {
-					alert("error");
-		        }
-			});
-			
 		}
-	});
-	// 调整jqgrid
-	ajustJqGrid(grid_selector, pager_selector);
+	}
+	// 定义查询参数
+    var obj = {"szd":szd,"qylx":qylx,"szgq":szgq,"gkjyr":gkjyr,"fddbr":fddbr,"sfwhqy":sfwhqy,
+			 "byzd1":byzd1,"byzd2":byzd2,"byzd3":byzd3,"byzd4":byzd4,"byzd5":byzd5
+		};
+    // 设置gird参数
+    $(grid_selector).GM('setQuery',obj);
+    // 查询grid
+    $(grid_selector).GM('refreshGrid',true, null);
 };
 
-
 /**
  * 下拉框绑定
  */
@@ -268,48 +261,12 @@ function getcheckbox(){
 	});
 	return str;
 }
-/**
- * 查询事件
- */
-function searchRecord() {
-	var str = getcheckbox();
-	var souce = str.split(",");
-	var szd = $("#szd").val();
-	var qylx = $("#qylx").val();
-	var szgq = $("#szgq").val();
-	var gkjyr = $("#gkjyr").val();
-	var fddbr = $("#fddbr").val();
-	var sfwhqy = $("#sfwhqy").val();
-	var byzd1 = "";
-	var byzd2 = "";
-	var byzd3 = "";
-	var byzd4 = "";
-	var byzd5 = "";
-	if(souce.length > 0) {
-		byzd1 = souce[0];
-		if (souce.length > 1) {
-			byzd2 = souce[1];
-			if (souce.length > 2) {
-				byzd3 = souce[2];
-				if (souce.length > 3) {
-					byzd4 = souce[3];
-					if (souce.length > 4) {
-						byzd5 = souce[4];
-					}
-				}
-			}
-		}
-	}
-	jQuery(grid_selector).jqGrid('setGridParam',{postData :
-								{"szd":szd,"qylx":qylx,"szgq":szgq,"gkjyr":gkjyr,"fddbr":fddbr,"sfwhqy":sfwhqy,
-			 					 "byzd1":byzd1,"byzd2":byzd2,"byzd3":byzd3,"byzd4":byzd4,"byzd5":byzd5
-			 					}}).trigger("reloadGrid", [{ page: 1 }]);
-};
 
 /**
  * 编辑信息
  */
 function editInfo() {
+	$("#tt").tabs("select","经营人基本信息");
 	// 获取选择行
 	var ids = getMultiData(grid_selector);
 	if(isNull(ids) || ids.indexOf(",")!=-1) {
@@ -322,16 +279,16 @@ function editInfo() {
 			data : {"id":ids},
 			url : basePath + '/jyr/initEdit',//请求的路径				
 			success : function(data) {
-				$("#jyrwin").window({title:"编辑"});
-				$("#jyrwin").window("open");
-				
+				showModelDialog("jyrwin", "编辑");
 				$("#jyrInfoform").form("reset");//重置表单数据
-				
 				$("#tab-tools").removeAttr("hidden");
 				manageInfo(data);
-				$("#tt").tabs("disableTab","泊位信息");
-				$("#tt").tabs("disableTab","堆场信息");
-				$("#tt").tabs("disableTab","仓库信息");
+				$("#tt").tabs("disableTab",1);
+				$("#tt").tabs("disableTab",2);
+				$("#tt").tabs("disableTab",3);
+//				$("#tt").tabs("disableTab","泊位信息");
+//				$("#tt").tabs("disableTab","堆场信息");
+//				$("#tt").tabs("disableTab","仓库信息");
 			},
 			error: function (XMLHttpRequest, textStatus, errorThrown) {
 	        }
@@ -342,8 +299,9 @@ function editInfo() {
  * 增加信息
  */
 function addJyrInfo() {
-	$("#jyrwin").window({title:"新增"});
-	$("#jyrwin").window("open");
+	$("#tt").tabs("select",0);
+	showModelDialog("jyrwin", "新增");
+	
 	$("#szd2").removeAttr("disabled");
 	$("#tt").tabs("disableTab","泊位信息");
 	$("#tt").tabs("disableTab","堆场信息");
@@ -410,19 +368,22 @@ function initszd (select) {
 }
 //统计信息查询
 function tjxx () {
-	$("#jyrTjxxinfo").window("open");
+//	$("#jyrTjxxinfo").window("open");
+	showModelDialog("jyrTjxxinfo", "新增");
 	initszd("#tjszd");
 	tj_initGrid();
 }
 //危险货物企业统计
 function whqy () {
-	$("#jyrWhTjxxinfo").window("open");
+//	$("#jyrWhTjxxinfo").window("open");
+	showModelDialog("jyrWhTjxxinfo", "新增");
 	initszd("#wxszd");
 	whtj_initGrid();
 }
 //危险储罐统计
 function ccss (){
-	$("#jyrWhcgTjxxinfo").window("open");
+//	$("#jyrWhcgTjxxinfo").window("open");
+	showModelDialog("jyrWhcgTjxxinfo", "新增");
 	initszd("#wcszd");
 	wxcgtj_initGrid();
 }
@@ -443,9 +404,8 @@ function printInfo () {
 	location.href = basePath + '/jyr/printJyrInfo';
 }
 
-
 function closeWin () {
-	$("#jyrwin").window("close");
+	 hideModelDialog("jyrwin");
 }
 
 formatterDate = function (date) {

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyrUser/JyrUserTjInfo.js

@@ -2,7 +2,6 @@
  * js
  */
 var tj_grid_selector = "#tj-grid-table";
-var tj_pager_selector = "#tj-grid-pager";
 jQuery(function($) {
 	// 初始化Grid
 });
@@ -11,81 +10,38 @@ jQuery(function($) {
  * 初始化Grid
  */
 function tj_initGrid() {
-	// 数据表格初始化
-	jQuery(tj_grid_selector).jqGrid({
-		url : basePath + '/jyrUser/selectTJByInfo',
-		mtype : "POST", //提交方式
-		datatype : "json",
-		autowidth: false,
-		height :"auto",
-	    shrinkToFit: true,
-		sortname : "", //默认的排序列
-		sortorder : "", //默认的排序列
-		colNames : ['地区/企业','人员类型','人数'],
-		colModel : [ {
-			name : 'qymc',
-			index : 'qymc',
-			editable : false,	
-			sortable : false
+	//单列表简易渲染
+    var table = $(tj_grid_selector);
+    table.GM({
+    	ajax_url : basePath + '/jyrUser/selectTJByInfo',
+    	ajax_type : "POST", //提交方式
+		columnData: [{
+			key : 'qymc',
+			width: '100px',
+            align:'center',
+			text : '地区/企业'
 		},{
-			name : 'rylx',
-			index : 'rylx',
-			editable : false,
-			sortable : false
+			key : 'rylx',
+			width: '100px',
+            align:'center',
+			text : '人员类型'
 		},{
-			name : 'rs',
-			index : 'rs',
-			editable : false,
-			sortable : false
-		}],
-		rowNum : _rowNum, //每页显示记录数
-		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
-		pager : tj_pager_selector, //定义翻页用的导航栏
-		page : 1, //设置初始的页码,初始为1
-		rownumbers : true,
-		pagerpos : 'center', //指定分页栏的位置
-		altRows : true, //设置为交替行表格,默认为false
-		multiselect : false, //可以多选://控制是否有chechbox选择框
-		multiboxonly : false, //只有选择checkbox才会起作用 
-		multiselect :false, //是否可以多选
-		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 () {
-        	$("#gbox_tj-grid-table").attr("style","width:100%;");
-            $("#gbox_tj-grid-table").find("div").attr("style","width:100%;");
-            $("#gview_tj-grid-table").children("div:first").attr("hidden","true");
-            $("#gbox_tj-grid-table").find("table").attr("style","width:100%;");
-            comGridComplete("tj-grid-table", "editRecord");
-            
-        },
-		onPaging: function(){
-			comGridPage("tj-grid-table");
-		}
+			key : 'rs',
+			width: '100px',
+            align:'center',
+			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(tj_grid_selector, tj_pager_selector);
-	 
 };
 
 //查询
@@ -93,10 +49,12 @@ function jyrUserTjSearch () {
 	var szd = $("#tjszd").val();
 	var rylx = $("#tjrylx").val();
 	var byzd1 = $("#addtime").val();
-	jQuery(tj_grid_selector).jqGrid(
-								'setGridParam',
-								{postData :{"szd":szd,"rylx":rylx,"byzd1":byzd1}}
-	).trigger("reloadGrid", [{ page: 1 }]);
+	// 定义查询参数
+    var obj = {"szd":szd,"rylx":rylx,"byzd1":byzd1};
+    // 设置gird参数
+    $(tj_grid_selector).GM('setQuery',obj);
+    // 查询grid
+    $(tj_grid_selector).GM('refreshGrid',true, null);
 	
 }
 

gkaqv2/trunk/modules/web/src/main/webapp/static/js/jyrUser/index.js

@@ -2,7 +2,6 @@
  * 
  */
 var grid_selector = "#grid-table";
-var pager_selector = "#grid-pager";
 var scouce;
 var jyrInfo;
 jQuery(function($) {
@@ -17,146 +16,83 @@ jQuery(function($) {
  * 初始化Grid
  */
 function initGrid() {
-	//resize to fit page size
-	resizePageGrid(grid_selector);
-	// 数据表格初始化
-	jQuery(grid_selector).jqGrid({
-		url : basePath + '/jyrUser/list',
-		mtype : "POST", //提交方式
-		datatype : "json",
-		autowidth: false,
-		height :"auto",
-	    shrinkToFit: true,
-		sortname : "", //默认的排序列
-		sortorder : "", //默认的排序列
-		colNames : [ 'id','姓名','港口经营人名称','人员类型','职务','证书名称','证书种类','证书编号','有效期','所在地','所在港区','备注'],
-		colModel : [ {
-			name : 'id',
-			index : 'id',
-			key : true,
-			hidden:true,
-			editable : false,
-			sortable : false
+	//单列表简易渲染
+    var table = $(grid_selector);
+    table.GM({
+    	ajax_url : basePath + '/jyrUser/list',
+    	ajax_type : "POST", //提交方式
+    	columnData: [{
+			key : 'id',
+			width: '100px',
+            align:'center',
+			text:'id'
 		},{
-			name : 'xm',
-			index : 'xm',
-			editable : false,
-			sortable : false
+			key : 'xm',
+			width: '100px',
+            align:'center',
+			text : '姓名'
 		},{
-			name : 'jyrmc',
-			index : 'jyrmc',
-			editable : false,
-			sortable : false
+			key : 'jyrmc',
+			width: '100px',
+            align:'center',
+			text : '港口经营人名称'
 		},{
-			name : 'rylxmc',
-			index : 'rylxmc',
-			editable : false,
-			sortable : false
+			key : 'rylxmc',
+			width: '100px',
+            align:'center',
+			text : '人员类型'
 		},{
-			name : 'zwhzc',
-			index : 'zwhzc',
-			editable : false,
-			sortable : false
+			key : 'zwhzc',
+			width: '100px',
+            align:'center',
+			text : '职务'
 		},{
-			name : 'zsmc',
-			index : 'zsmc',
-			editable : false,
-			sortable : false
+			key : 'zsmc',
+			width: '100px',
+            align:'center',
+			text : '证书名称'
 		},{
-			name : 'zszl',
-			index : 'zszl',
-			editable : false,
-			sortable : false
+			key : 'zszl',
+			width: '100px',
+            align:'center',
+			text : '证书种类'
 		},{
-			name : 'zsbh',
-			index : 'zsbh',
-			editable : false,
-			sortable : false
+			key : 'zsbh',
+			width: '100px',
+            align:'center',
+			text : '证书编号'
 		},{
-			name : 'yxq',
-			index : 'yxq',
-			editable : false,
-			sortable : false
+			key : 'yxq',
+			width: '100px',
+            align:'center',
+			text : '有效期'
 		},{
-			name : 'szdmc',
-			index : 'szdmc',
-			editable : false,
-			sortable : false
+			key : 'szdmc',
+			width: '100px',
+            align:'center',
+			text : '所在地'
 		},{
-			name : 'gqmc',
-			index : 'gqmc',
-			editable : false,
-			sortable : false
+			key : 'gqmc',
+			width: '100px',
+            align:'center',
+			text : '所在港区'
 		},{
-			name : 'bz',
-			index : 'bz',
-			editable : false,
-			sortable : false
-		}],
-		rowNum : _rowNum, //每页显示记录数
-		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
-		pager : pager_selector, //定义翻页用的导航栏
-		page : 1, //设置初始的页码,初始为1
-		rownumbers : true,
-		pagerpos : 'center', //指定分页栏的位置
-		altRows : true, //设置为交替行表格,默认为false
-		multiselect : true, //可以多选://控制是否有chechbox选择框
-		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");
-		},
-		ondblClickRow : function (id,row,cel,eve) {
-			
-			$.ajax({
-				type : 'POST',
-				dataType : "json",
-				data : {"id":id},
-				url : basePath + '/jyrUser/initEdit',//请求的路径				
-				success : function(data) {
-					$("#jyrUserwin").window({title:"查看"});
-					$("#jyrUserwin").window("open");
-					$("#jyrUserInfoform").form("reset");//重置表单数据
-					$("#jyrUserInfoform").find("input").attr("disabled","true");//禁用表单元素input
-					$("#jyrUserInfoform").find("select").attr("disabled","true");//禁用表单元素select
-					$("#jyrUserInfoform .easyui-datetimebox").datetimebox({ disabled: true });//禁用表单元素日期控件
-					$("#jyrUserInfoform").find("textarea").attr("disabled","true");//禁用表单元素select
-					
-					$("#tab-tools").attr("hidden",true);
-					JyrUserInfoInit(data);
-				},
-				error: function (XMLHttpRequest, textStatus, errorThrown) {
-					alert("error");
-		        }
-			});
-			
-		}
+			key : 'bz',
+			width: '100px',
+            align:'center',
+			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);
 };
 
 /**
@@ -235,9 +171,12 @@ function searchRecord () {
 	var rylx = $("#rylx").val();
 	var xm = $("#xm").val();
 	var zwhzc = $("#zwhzc").val();
-	
-	jQuery(grid_selector).jqGrid('setGridParam',{postData :{"szd":szd,"ssgq":ssgq,"ssjyr":jyr,"rylx":rylx,"xm":xm,"zwhzc":zwhzc
-														}}).trigger("reloadGrid", [{ page: 1 }]);
+	// 定义查询参数
+    var obj = {"szd":szd,"ssgq":ssgq,"ssjyr":jyr,"rylx":rylx,"xm":xm,"zwhzc":zwhzc};
+    // 设置gird参数
+    $(grid_selector).GM('setQuery',obj);
+    // 查询grid
+    $(grid_selector).GM('refreshGrid',true, null);
 }
 
 

gkaqv2/trunk/modules/web/src/main/webapp/static/js/pop/pop_WxhwName.js

@@ -0,0 +1,108 @@
+/**
+ * js
+ */
+var wxhw_grid_selector = "#wxhw-grid-table";
+jQuery(function($) {
+	// 初始化Grid
+});
+
+/**
+ * 初始化Grid
+ */
+function wxhw_initGrid(szd) {
+	/*{
+		key : 'id',
+		width: '100px',
+        align:'center',
+		text : 'id'
+	},*/
+	 //单列表简易渲染
+    var table = $(wxhw_grid_selector);
+	// 数据表格初始化
+    table.GM({
+    	ajax_url : basePath + '/wxhw/list'
+        ,ajax_type: 'POST'
+		,columnData: [{
+			key : 'bh',
+			width: '100px',
+	        align:'center',
+			text : "编号"
+		},{
+			key : 'mchsm',
+			width: '100px',
+	        align:'center',
+			text : '名称和说明'
+		},{
+			key : 'lbhxb',
+			width: '100px',
+	        align:'center',
+			text : '类别和项别'
+		}]
+	,pagingBefore:function(query){}
+    ,pagingAfter: function(query){}
+    ,sortingBefore:function(query){}
+    ,sortingAfter: function(query){}
+    ,ajax_beforeSend: function(query){}
+    ,ajax_complete: function(data){
+    }
+    },function(query){
+//      console.log('init方法回调query参数', query);
+  });
+};
+//危险物品名称查询
+function wxhwSearch () {
+	// 定义查询参数
+    var obj = {"bh":$("#bh").val(),"mchsm":$("#mchsm").val(),"lbhxb":$("#lbhxb").val()};
+			 
+    // 设置gird参数
+    $(wxhw_grid_selector).GM('setQuery',obj);
+    // 查询grid
+    $(wxhw_grid_selector).GM('refreshGrid',true, null);
+}
+/**
+ * 获取选中数据
+ */
+function getCheckedWxhwData () {
+	var list=[];
+	 var rows = $(wxhw_grid_selector).GM('getCheckedTr');
+	 if (rows.length >= 1) {
+		 var obj = new Object();
+	        for (var i = 0; i < rows.length; i++) {
+	            //获取选择的行的数据，只要传入rowId即可
+	            var data = $(wxhw_grid_selector).GM('getRowData', rows[i]);
+	            obj = data;
+	            list.push(obj);
+	        }
+	  }
+	 return list;
+}
+/**
+ * 将选中的危险物品放入到上层window的页面元素中
+ */
+function checkWxhw () {
+	var data = getCheckedWxhwData();
+	getPopWxhwpmbData(data);
+	hideModelDialog("wh");
+}
+/**
+ * 关闭当前窗口
+ */
+function closeWxhw() {
+	 hideModelDialog("wh");
+}
+formatterDate = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	var hor = date.getHours();
+	var min = date.getMinutes();
+	var sec = date.getSeconds();
+	return date.getFullYear() + '-' + month + '-' + day+" "+hor+":"+min+":"+sec;
+};
+
+formatterDateNotsfm = function (date) {
+	var day = date.getDate() > 9 ? date.getDate() : "0" + date.getDate();
+	var month = (date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : "0"
+	+ (date.getMonth() + 1);
+	return date.getFullYear() + '-' + month + '-' + day;
+};

gkaqv2/trunk/modules/web/src/main/webapp/uplod/836ED77540024077859F7B732B75452420161221154428.txt

@@ -0,0 +1,10 @@
+<dependency>
+		    <groupId>commons-fileupload</groupId>
+		    <artifactId>commons-fileupload</artifactId>
+		    <version>1.2.2</version>
+		</dependency>
+		<dependency>
+		    <groupId>commons-io</groupId>
+		    <artifactId>commons-io</artifactId>
+		    <version>2.0.1</version>
+		</dependency>