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

gkjsjy/trunk/WebContent/WEB-INF/pages/common.jsp

@@ -1,6 +1,7 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="authz" uri="/authz-tags"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
 <META HTTP-EQUIV="Cache-Control" CONTENT="no-cache">
 <META HTTP-EQUIV="Expires" CONTENT="0">
@@ -15,7 +16,6 @@
 	<link href='${app}/static/biz/css/login.css' rel='stylesheet'>
 	<link href='${app}/static/biz/css/index.css' rel='stylesheet'>
 	<link href='${app}/static/biz/css/sysmenu.css' rel='stylesheet'>
-
 	<!-- jQuery -->
 	<script src="${app}/static/js/jquery-1.11.1.js"></script>
 	<script src="${app}/static/bootstrap-3.3.5-dist/js/bootstrap.min.js"></script>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl2/jsjdglmain.jsp

@@ -147,10 +147,10 @@
 			<div style="background-color:#f4f4f4;">
 				<table class="main_table" cellpadding="0" cellspacing="0">
 					<tr>
-						<th width="10%">序号</th>	
-						<th width="15%">项目名称</th>
+						<th width="4%">序号</th>	
+						<th width="23%">项目名称</th>
 						<th width="15%">项目法人</th>
-						<th width="10%">所在港区</th>
+						<th width="8%">所在港区</th>
 						<th width="10%">流程节点</th>
 						<th width="10%">是否缺失文件</th>
 						<th width="10%">操作</th>
@@ -193,7 +193,7 @@
 								<%-- <a class="btn btn-default btn-xs" href="#" onclick="jsjdgl.main.view('${jsjdgl.id}')">
 							           详细信息</a> --%>
 							    <a class="btn btn-default btn-xs" href="#" onclick="jsjdgl.main.xiugai('${jsjdgl.id}')">
-							           修改</a>  
+							          <i class="glyphicon glyphicon-wrench"></i>修改</a>  
 							    <%-- <c:if test="${jsjdgl.taskkey=='axlysptb'}">  
 							    <a class="btn btn-default btn-xs" href="#" onclick="jsjdgl.main.del('${jsjdgl.id}')">
 							           删除</a>  

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/tzjhgl/tzjhglmain.jsp

@@ -133,16 +133,16 @@
 			<div  style="background-color:#f4f4f4;">
 				<table class="main_table" cellpadding="0" cellspacing="0">
 					<tr>
-						<th width="5%">序号</th>	
-						<th width="10%">项目名称</th>
-						<th width="10%">所属计划</th>
-						<th width="10%">所在港口</th>
-						<th width="10%">所在港区</th>
+						<th width="4%">序号</th>	
+						<th width="14%">项目名称</th>
+						<th width="8%">所属计划</th>
+						<th width="8%">所在港口</th>
+						<th width="8%">所在港区</th>
 						<th width="10%">项目法人</th>
 						<th width="8%">计划年度</th>
 						<th width="10%">年度计划投资<br>（万元）</th>
 						<th width="7%">是否有<br>资金补助</th>
-						<th width="15%">操作</th>
+						<th width="18%">操作</th>
 					</tr>
 					 <c:forEach items="${list}" var="tzjhgl" varStatus="status">
 						<tr class="tr_bg">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglmain.jsp

@@ -119,14 +119,14 @@
 			<div  style="background-color:#f4f4f4;">
 				<table class="main_table" cellpadding="0" cellspacing="0">
 					<tr>
-						<th width="4%">序号</th>	
-						<th width="10%">项目名称</th>
-						<th width="10%">所在港口</th>
-						<th width="10%">所在港区</th>
+						<th width="3%">序号</th>	
+						<th width="16%">项目名称</th>
+						<th width="8%">所在港口</th>
+						<th width="8%">所在港区</th>
 						<th width="10%">项目法人</th>
-						<th width="10%">项目类型</th>
+						<th width="8%">项目类型</th>
 						<th width="10%">是否有资金补助</th>	
-						<th width="20%">操作</th>
+						<th width="21%">操作</th>
 					</tr>
 					 <c:forEach items="${list}" var="xmxxgl" varStatus="status">
 						<tr class="tr_bg">
@@ -150,13 +150,14 @@
 									<input type="hidden" id="flag" value="${xmxxgl.flag}">	
 									<c:if test="${xmxxgl.showjsjd=='Y' }">        
 							            <a class="btn btn-default btn-xs" href="#"
-									onclick="parent.main.menuClick('jsjdgl','建设进度管理','/jsjdgl2/xiugai?id=${xmxxgl.id}')">   项目进度信息
-								            </a>
+									onclick="parent.main.menuClick('jsjdgl','建设进度管理','/jsjdgl2/xiugai?id=${xmxxgl.id}')">
+									<i class="	glyphicon glyphicon-tasks"></i>项目进度</a>
 							        </c:if> 
 							       <c:if test="${xmxxgl.flagForYear==1 }">       
 							       <a class="btn btn-default btn-xs" href="#"
-									onclick="parent.main.menuClick('tzjhgl','投资计划管理','/tzjhgl/main?xmid=${xmxxgl.id}')">    年度计划信息
-								            </a>     
+									onclick="parent.main.menuClick('tzjhgl','投资计划管理','/tzjhgl/main?xmid=${xmxxgl.id}')">
+									<i class="glyphicon glyphicon-pencil"></i> 
+									年度计划</a>     
 							       </c:if>
 							</td>
 						</tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrdetails.jsp

@@ -160,7 +160,7 @@
 						<div class="new_tab_main " style="display:block;">
 							<div class="apply_fill">
 								<a class="btn btn-default btn-sm" href="#"  onclick="gkjyrdetails.main.print('${gkjyrxx.id}')">
-							   	<i class="glyphicon glyphicon-arrow-left"></i> 
+							   	<i class="glyphicon glyphicon-print"></i> 
 							            打印</a>
 							  <%--   <a class="btn btn-default btn-sm" href="#"  onclick="gkjyrdetails.main.outpdf('${gkjyrxx.id}')">
 							   	<i class="glyphicon glyphicon-arrow-left"></i> 

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrxkzfz/wxhwzyfz.jsp

@@ -54,7 +54,7 @@
 
 	<div>
 		<form action="" method="post">
-			<table class="table" border="1px" bordercolor="#000"
+			<table id="table" border="1px"
 				cellpadding="5px" align="center">
 				<tr>
 					<td class="td-left">港口经营人：</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxx.jsp

@@ -11,8 +11,7 @@
 	<c:set var="local" value="http://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.request.contextPath}" />
 	<script type="text/javascript" src="${app }/static/biz/js/gkjygl/gkjyr/xkzxx/xkzxxdetail.js"></script>
 	<link href='${app }/static/biz/css/fuzheng.css' rel='stylesheet'>
-</head>
-<style type="text/css">
+	<style type="text/css">
 	 .dvs {
 	 	display: none;
 	 	position:absolute;
@@ -46,27 +45,28 @@
 	    display:none;
 	}
 	</style>
+</head>
 <body>
 <div id="overlay"></div>
 <div class="head-center">
-		<h2>港口危险货物作业附证</h2>
+		<h2>港口经营许可证</h2>
 	</div>
 
 	<div>
 		<form action="" method="post">
-			<table class="table" border="1px" bordercolor="#000"
+			<table id="table" border="1px"
 				cellpadding="5px" align="center">
 				<tr>
 					<td class="td-left">所在地：</td>
-					<td class="td-right" id="gkjyr" colspan="2">${record.szd }</td>
+					<td class="td-right" id="gkjyr" colspan="2">${record.szd.text }</td>
 				</tr>
 				<tr>
 					<td class="td-left">所在港区：</td>
-					<td class="td-right" id="ssgq" colspan="2">${record.ssgq }</td>
+					<td class="td-right" id="ssgq" colspan="2">${record.ssgqName }</td>
 				</tr>
 				<tr>
 					<td class="td-left">港口经营人：</td>
-					<td class="td-right" id="dz" colspan="2">${record.gkjyr }</td>
+					<td class="td-right" id="dz" colspan="2">${record.gkjyrName }</td>
 				</tr>
 				<tr>
 					<td class="td-left">许可证号：</td>
@@ -106,11 +106,11 @@
 				</tr>
 				<tr>
 					<td class="td-left">发证日期：</td>
-					<td class="td-right" id="yxqz" colspan="2">${record.fzrq }</td>
+					<td class="td-right" id="yxqz" colspan="2"><fmt:formatDate value='${record.fzrq }' pattern="yyyy-MM-dd" type="date" dateStyle="long" /></td>
 				</tr>
 				<tr>
 					<td class="td-left">有效期至：</td>
-					<td class="td-right" id="fzbh" colspan="2">${record.yxqz }</td>
+					<td class="td-right" id="fzbh" colspan="2"><fmt:formatDate value='${record.yxqz }' pattern="yyyy-MM-dd" type="date" dateStyle="long" /></td>
 				</tr>
 				<tr>
 					<td class="td-left">作业货物品名：</td>
@@ -126,10 +126,10 @@
 					<%for(int i=0;i<2;i++){
 						request.setAttribute("flag",i);
 						%>
-						<img hspace="2" vspace="2" border="1" align="middle" height="30" width="30" src="${local}/xkzxx/getFileList?szd=${record.szd}+&ssgq=${record.ssgq}+&gkjyr=${record.gkjyr}+&flag=${flag}" onerror="this.src='${app }/static/biz/image/notfind.png'" 
+						<img hspace="2" vspace="2" border="1" align="middle" height="30" width="30" src="${local}/xkzxx/getFileList?xkzid=${record.id}&flag=${flag}" onerror="this.src='${app }/static/biz/image/notfind.png'" 
 						onclick="xkzxx.detail.show(${flag})"/>
 						<div id="dv${flag}" title="点击关闭" class="dvs" onclick="xkzxx.detail.hide(${flag})">
-							<img src="${local}/xkzxx/getFileList?szd=${record.szd}+&ssgq=${record.ssgq}+&gkjyr=${record.gkjyr}+&flag=${flag}" onerror="this.src='${app }/static/biz/image/notfind.png'"/>
+							<img src="${local}/xkzxx/getFileList?xkzid=${record.id}&flag=${flag}" onerror="this.src='${app }/static/biz/image/notfind.png'"/>
 						</div>
 						<%} %>
 					</td>

gkjsjy/trunk/WebContent/WEB-INF/pages/sys/main.jsp

@@ -117,9 +117,9 @@
 					
 				</div>
 				<!-- 待办部分 -->
-				 <div id="tips" onclick="main.hideTips()">
+				 <%-- <div id="tips" onclick="main.hideTips()">
         				<img src="${app }/static/biz/image/item1_1.png" id="tips_image" style="position:absolute;bottom:220px;left:0;cursor:pointer;z-index:2"/>
-    			 </div>
+    			 </div> --%>
     			 <!-- 待办详细 -->
     			 <div id="hidden_tips" >
 			        <div id="tips_menu">

gkjsjy/trunk/WebContent/static/biz/css/fuzheng.css

@@ -3,19 +3,24 @@
 	text-align: center
 }
 
-.table {
+#table {
+	padding: 8px;
 	border-collapse: collapse;
-	border-left: 1px solid #888;
-	border-top: 1px solid #888;
-	width: 100%
+	width: 100%;
+	border-color: black;
+}
+#table tr td{
+	padding: 8px;
+}
+.td-left,.td-right{
+	border-color: black;
 }
-
 .td-left {
 	text-align: right;
-	width: 22%
+	width: 28%
 }
 
 .td-right {
 	text-align: left;
-	width: 78%
+	width: 72%
 }