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

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/dwxx/jyrjcxx/JyrUserCtl.java

@@ -55,22 +55,22 @@ import com.yuanxd.tools.utils.string.StringUtils;
 @RequestMapping(value = "/jyrUser", produces = "application/json; charset=utf-8")
 public class JyrUserCtl extends BaseCtl {
     @Autowired
-    private JyrUserService jyrUserService;
+    private JyrUserService jyrUserService;//经营人人员
     
     @Autowired
-    private JyrjcxxService jyrjcxxService;
+    private JyrjcxxService jyrjcxxService;//经营人
     @Autowired
-    private CodeService codeService;
+    private CodeService codeService;//字典
     @Autowired
-    private GqService gqService;
+    private GqService gqService;//港区
     
     @Autowired
-    private BloBService bloBService;
+    private BloBService bloBService;//大字段
     
     @Autowired
-    private RyzsbService ryzsbService;
+    private RyzsbService ryzsbService;//人员证书
     @Autowired
-    private FjbService fjbService;
+    private FjbService fjbService;//附件表
 
     @RequestMapping("")
     public String main(HttpServletRequest request) {

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

@@ -44,15 +44,15 @@ import com.yuanxd.tools.utils.string.StringUtils;
 @RequestMapping(value = "/jyr", produces = "application/json; charset=utf-8")
 public class JyrjcxxCtl extends BaseCtl {
     @Autowired
-    private JyrjcxxService jyrjcxxService;
+    private JyrjcxxService jyrjcxxService;//经营人
     @Autowired
-    private CodeService codeService;
+    private CodeService codeService;//字典
     @Autowired
-    private GqService gqService;
+    private GqService gqService;//港区
     @Autowired
-    private FjbService fjbService;
+    private FjbService fjbService;//附件表
     @Autowired
-    private RyzsbService ryzsbService;
+    private RyzsbService ryzsbService;//人员证书表
 
     //    @RequiresPermissions("jyr:main")
     @RequestMapping("")
@@ -228,7 +228,6 @@ public class JyrjcxxCtl extends BaseCtl {
     		model.setSslx(list.get(0).getOptVal());
     		fjbService.add(model);
     	}
-    	
     	return success();
     }
     

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

@@ -14,6 +14,9 @@
 						</button>
 				</div>
 			</div>
+			<!-- <div class="gridmanager">
+			    <table grid-manager="zstbl" id="zstbl"></table>
+			</div> -->
 			<div class="form-group">
 				<table class="easyui-datagrid" style="width:100%;height: 100px;" id="zstbl"
 					        data-options="fitColumns:true,singleSelect:true,striped:true">   

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

@@ -6,6 +6,7 @@ var gridData = "";
 jQuery(function($) {
 	// 初始化Grid
 	initGrid();
+	tj_initGrid();//港口设施设备统计grid初始化
 	getgq();
 	getJyrInfo();
 });
@@ -272,7 +273,8 @@ function gksssbTj() {
 	getqymcInfo();
 	gettjgqInfo('');
 	gettjSzd();
-	tj_initGrid();
+	$("#tj-grid-table").GM("refreshGrid",null,null);
+	
 }
 /**
  * 关闭弹窗

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

@@ -16,13 +16,9 @@ function bw_initGrid(qymc) {
  // 数据表格初始化
     table.GM({
     	ajax_url : basePath + '/bw/list',
+    	query:{'qymc':qymc},
     	ajax_type : "POST", //提交方式
     	columnData: [{
-			key : 'id',
-			width: '100px',
-	        align:'center',
-			text : 'id'
-		},{
 			key : 'bwmc',
 			width: '100px',
 	        align:'center',

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

@@ -18,11 +18,6 @@ function ck_initGrid(ssjyr) {
     	ajax_url : basePath + '/ck/list',
     	ajax_type : "POST", //提交方式
 		columnData: [{
-			key : 'id',
-			width: '100px',
-	        align:'center',
-			text : 'id'
-		},{
 			key : 'ckmc',
 			width: '100px',
 	        align:'center',

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

@@ -18,11 +18,6 @@ function dc_initGrid(qymc) {
     	ajax_url : basePath + '/dc/list',
     	ajax_type : "POST", //提交方式
 		columnData: [{
-			key : 'id',
-			width: '100px',
-	        align:'center',
-			text : 'id'
-		},{
 			key : 'dcmc',
 			width: '100px',
 	        align:'center',

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

@@ -6,6 +6,7 @@ var gridData="";
  */
 jQuery(function($) {
 	// 初始化Grid
+	
 });
 /**
  * 附件列表初始化
@@ -36,7 +37,7 @@ function zsInint (ssid,val) {
 				insertJyrZs(gridData);
 			}
 		}
-	})
+	});
 }
 /**
  * 上传文件的onchange事件
@@ -93,7 +94,7 @@ function deletFile () {
 function fileDow () {
 	var row = $('#zstbl').datagrid('getSelected');//当前row
 	if (row != null && row != "") {
-		location.href= basePath+"/fileUtil/fileDow?id="+row.zsnr+"&fjid="+row.fjid
+		location.href= basePath+"/fileUtil/fileDow?id="+row.zsnr+"&fjid="+row.fjid;
 	}
 	
 }
@@ -139,6 +140,7 @@ function insertJyrZs (gridDate) {
 		$("#zstbl").datagrid('insertRow',{
 			row:gridData
 		});
+//		$("#zstbl").GM("insertRow",gridDate);
 	}
 }
 

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

@@ -7,6 +7,12 @@ var jyrInfo;
 jQuery(function($) {
 	// 初始化Grid
 	initJyrGrid();
+	bw_initGrid("");//泊位grid初始化
+	ck_initGrid("");//仓库grid初始化
+	dc_initGrid("");//堆场grid初始化
+	tj_initGrid();//经营人统计查询grid初始化
+	whtj_initGrid();//危险货物企业grid初始化
+	wxcgtj_initGrid();//危险储罐统计grid初始化
 	getgq();
 	xzqhSelect();
 	
@@ -140,9 +146,15 @@ function getLookInfo (id) {
 				$("#tt").tabs('enableTab',2);
 				$("#tt").tabs('enableTab',3);
 				//加载选项卡的数据
-				bw_initGrid(data[0].id);
-				ck_initGrid(data[0].id);
-				dc_initGrid(data[0].id);
+				//泊位信息
+				$("#bw-grid-table").GM("setQuery",{'qymc':data[0].id});
+				$("#bw-grid-table").GM("refreshGrid",null,null);
+				//仓库信息
+				$("#ck-grid-table").GM("setQuery",{'ssjyr':data[0].id});
+				$("#ck-grid-table").GM("refreshGrid",null,null);
+				//堆场信息
+				$("#dc-grid-table").GM("setQuery",{'qymc':data[0].id});
+				$("#dc-grid-table").GM("refreshGrid",null,null);
 			},
 			error: function (XMLHttpRequest, textStatus, errorThrown) {
 				alert("error");
@@ -372,21 +384,24 @@ function tjxx () {
 //	$("#jyrTjxxinfo").window("open");
 	showModelDialog("jyrTjxxinfo", "统计查询");
 	initszd("#tjszd");
-	tj_initGrid();
+	$("#tj-grid-table").GM("refreshGrid",null,null);
+	
 }
 //危险货物企业统计
 function whqy () {
 //	$("#jyrWhTjxxinfo").window("open");
 	showModelDialog("jyrWhTjxxinfo", "危险货物企业统计");
 	initszd("#wxszd");
-	whtj_initGrid();
+	$("#whtj-grid-table").GM("refreshGrid",null,null);
+	
 }
 //危险储罐统计
 function ccss (){
 //	$("#jyrWhcgTjxxinfo").window("open");
 	showModelDialog("jyrWhcgTjxxinfo", "危险储罐统计");
 	initszd("#wcszd");
-	wxcgtj_initGrid();
+	$("#wxcgtj-grid-table").GM("refreshGrid",null,null);
+	
 }
 
 //加载行政区划下拉框选项

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

@@ -31,7 +31,9 @@ function JyrUserInfoInit (data) {
  * @param data
  */
 function ryzsbInfoInit (data,opn) {
-	var manage = '<a onclick="eiditUserFile()">编辑</a>&nbsp;&nbsp;<a onclick="deleteUserFile()">删除</a>&nbsp;&nbsp;<a onclick="fileDow()">下载</a>';
+	var manage = '<a onclick="eiditUserFile()">编辑</a>&nbsp;&nbsp;'+
+				 '<a onclick="deleteUserFile()">删除</a>&nbsp;&nbsp;'+
+				 '<a onclick="fileDow()">下载</a>';
 	if (opn == "1") {
 		//查看
 		manage = '<a onclick="fileDow()">下载</a>';
@@ -45,7 +47,7 @@ function ryzsbInfoInit (data,opn) {
 					zs:data[i].wjm,
 					fjid:data[i].fjid,
 					manage:manage,
-					zsnr:data[i].zsnr,
+						zsnr:data[i].zsnr,
 					index:i,
 					filename:''
 					};
@@ -327,6 +329,7 @@ function insertJyrUserZs (gridData) {
 		$("#zstbl").datagrid('insertRow',{
 			row:gridData
 		});
+//		$("#zstbl").GM("insertRow",gridDate);
 	}
 }
 /**
@@ -352,7 +355,7 @@ function eiditUserFile () {
 /**
  * 修改人员证书
  */
-function eiditJyrUserZs () {
+function eiditJyrUserZs (gridData) {
 	if (gridData != "" && gridData != null) {
 		$("#zstbl").datagrid('updateRow',{
 			index:gridData.index,

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

@@ -53,7 +53,7 @@ function saveUserZs () {
 	        					wjdx:size,
 	        					wjhzm:type
 	        					};
-	        		insertJyrUserZs();
+	        		insertJyrUserZs(gridData);
 	        		$("#jyrUserZsinfo").window("close");
 	            } else {
 	                layer.alert("数据保存失败！");
@@ -74,7 +74,7 @@ function saveUserZs () {
 					fjbid:$("#fjbid").val(),
 					index:index,
 					};
-		eiditJyrUserZs();
+		eiditJyrUserZs(gridData);
 		$("#jyrUserZsinfo").window("close");
 	}
 	  

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

@@ -7,6 +7,7 @@ var jyrInfo;
 jQuery(function($) {
 	// 初始化Grid
 	initGrid();
+	tj_initGrid();//经营人人员统计grid初始化
 	getgq();
 	getJyrInfoSelect ();
 
@@ -313,7 +314,8 @@ function jyrUserTj() {
 	showModelDialog("jyrUserTjwin", "新增");
 	getTjSzd();
 	getjyrUserTjRylx();
-	tj_initGrid();
+	$("#tj-grid-table").GM("refreshGrid",null,null);
+	
 }
 /**
  * 启用from表单元素