소스 검색

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

ld_xuhx 8 년 전
부모
커밋
a4f6393234
32개의 변경된 파일125개의 추가작업 그리고 125개의 파일을 삭제
  1. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtadd.jsp
  2. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtedit.jsp
  3. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtmain.jsp
  4. 3 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtview.jsp
  5. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwadd.jsp
  6. 4 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwedit.jsp
  7. 4 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwmain.jsp
  8. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwview.jsp
  9. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrcg/cgadd.jsp
  10. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrdetails.jsp
  11. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrmain.jsp
  12. 8 8
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyradd.jsp
  13. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyredit.jsp
  14. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyrview.jsp
  15. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxxview.jsp
  16. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgaddmain.jsp
  17. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgeditmain.jsp
  18. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgviewmain.jsp
  19. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqaddmain.jsp
  20. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqeditmain.jsp
  21. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqviewmain.jsp
  22. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxaddmain.jsp
  23. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxeditmain.jsp
  24. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxviewmain.jsp
  25. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxaddmain.jsp
  26. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxeditmain.jsp
  27. 5 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxviewmain.jsp
  28. 4 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/showbwview.jsp
  29. 2 2
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/mt/service/impl/MtServiceImpl.java
  30. 1 1
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrbw/service/impl/BwServiceImpl.java
  31. 1 1
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrcg/service/impl/CgServiceImpl.java
  32. 4 4
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/service/impl/GkjyrServiceImpl.java

+ 3 - 3
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtadd.jsp

@@ -174,7 +174,7 @@
 	                    </tr>
 	                    <tr>
 	                        
-	                        <th>是否对外开放:&nbsp;</th>
+	                        <th>对外开放:&nbsp;</th>
 	                        <td >
 								<select class='selectpicker' name='sfdwkfid'  >
 									<option></option>
@@ -183,7 +183,7 @@
 									</c:forEach>
 								</select>
 							</td>
-							<th>是否危化品码头:&nbsp;</th>
+							<th>危化品码头:&nbsp;</th>
 	                        <td >
 		                        <select class='selectpicker' name='sfwhpid'  >
 		                        	<option></option>
@@ -234,7 +234,7 @@
 	                        <td >
 		                        <input type="text" class="form-control"  name="mtqydbg" >
 	                        </td> -->
-	                        <th>是否为挖入式港池形式:&nbsp;</th>
+	                        <th>挖入式港池形式:&nbsp;</th>
 	                        <td >
 		                        <select class='selectpicker' name='mtsfwarsid'  >
 		                        	<option></option>

+ 3 - 3
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtedit.jsp

@@ -170,7 +170,7 @@
 	                    
 	                    <tr>
 	                        
-	                        <th>是否对外开放:&nbsp;</th>
+	                        <th>对外开放:&nbsp;</th>
 	                        <td >
 		                        <select class='selectpicker' name='sfdwkfid' >
 									<option></option>
@@ -179,7 +179,7 @@
 									</c:forEach>
 								</select>
 	                        </td>
-	                        <th>是否危化品码头:&nbsp;</th>
+	                        <th>危化品码头:&nbsp;</th>
 	                        <td >
 		                        <select class='selectpicker' name='sfwhpid' >
 									<option></option>
@@ -229,7 +229,7 @@
 	                        <td >
 		                        <input type="text" class="form-control"  name="mtqydbg" value="${record.mtqydbg }">
 	                        </td> --%>
-	                         <th>是否为挖入式港池形式:&nbsp;</th>
+	                         <th>挖入式港池形式:&nbsp;</th>
 	                        <td >
 		                        <select class='selectpicker' name='mtsfwarsid' >
 									<option></option>

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtmain.jsp

@@ -75,11 +75,11 @@
                         <td class="left"><input type="text" class="form-control" name="mtmc" value="${mtmc }" ></td>
                         <td class="right">港口经营人:&nbsp;</td>
                         <td ><input type="text" class="form-control" name="jyr" value="${jyr }" ></td>
-                        <td class="right">是否对外开放:&nbsp;</td>
+                        <td class="right">对外开放:&nbsp;</td>
                         <td ><div id="sfdwkfDiv"></div></td>
                      </tr>
                      <tr>   
-                     	<td class="right">是否危化品码头:&nbsp;</td>
+                     	<td class="right">危化品码头:&nbsp;</td>
                         <td ><div id="sfwhpDiv"></div></td>
                         <td class="right">服务类型:&nbsp;</td>
                         <td ><div id="fwlxDiv"></div></td>

+ 3 - 3
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtview.jsp

@@ -102,11 +102,11 @@
 						</tr>
 						<tr>
 							
-							<th>是否对外开放:&nbsp;</th>
+							<th>对外开放:&nbsp;</th>
 							<td >
 							${record.sfdwkfzw}
 							</td>
-							<th>是否危化品码头:&nbsp;</th>
+							<th>危化品码头:&nbsp;</th>
 							<td >
 							${record.sfwhpzw}
 							</td>
@@ -144,7 +144,7 @@
 							<td >
 								${record.mtqydbg }
 							</td> --%>
-							<th>是否为挖入式港池形式:&nbsp;</th>
+							<th>挖入式港池形式:&nbsp;</th>
 							<td >
 							${record.mtsfwarszw }
 							</td>

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwadd.jsp

@@ -163,14 +163,14 @@
                         	<span id="absel">
 							</span>
                         </td>
-					 	<th>是否位于港口规划岸线内:&nbsp;</th>
+					 	<th>位于港口规划岸线内:&nbsp;</th>
                         <td>
 	                        <span id="sfwygkghaxnsel">
 							</span>
                         </td>
                     </tr>
                      <tr>
-                    	<th>港口岸线使用证号:&nbsp;</th>
+                    	<th>港口岸线使用证号:&nbsp;</th>
                         <td>
                        	 	<input type="text" class="form-control" name="gkaxsyzh" >
                         </td>
@@ -265,7 +265,7 @@
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))" > -->
 							<input type="text" class="form-control" name="bwcd">
                         </td>
-					 	<th><span class="needwrite">*</span>是否危险品泊位:&nbsp;</th>
+					 	<th><span class="needwrite">*</span>危险品泊位:&nbsp;</th>
                         <td>
 	                        <span id="sfwxpbwsel">
 							</span>
@@ -322,7 +322,7 @@
                         </td>
                     </tr> -->
                     <tr>
-					 	<th><span class="needwrite">*</span>是否取得港口设施保安证书:&nbsp;</th>
+					 	<th><span class="needwrite">*</span>取得港口设施保安证书:&nbsp;</th>
                         <td>
 	                        <span id="sffzsel">
 							</span>
@@ -374,7 +374,7 @@
                         
                     </tr> -->
                     <tr>
-					 	<th>是否对外开放泊位:&nbsp;</th>
+					 	<th>对外开放泊位:&nbsp;</th>
                         <td>
 	                       <!--  <input type="text" class="form-control" name="sfdwkf"  > -->
 	                        <span id="sfdwkfsel">

+ 4 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwedit.jsp

@@ -179,7 +179,7 @@
                         	<span id="absel">
 							</span>
                         </td>
-					 	<th>是否位于港口规划岸线内:&nbsp;</th>
+					 	<th>位于港口规划岸线内:&nbsp;</th>
                         <td>
 	                        <span id="sfwygkghaxnsel">
 							</span>
@@ -275,7 +275,7 @@
 							onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[^\d]/g,''))" 
 							value="${record.bwcd }"> --%>
                         </td>
-					 	<th><span class="needwrite">*</span>是否危险品泊位:&nbsp;</th>
+					 	<th><span class="needwrite">*</span>危险品泊位:&nbsp;</th>
                         <td>
 	                        <span id="sfwxpbwsel">
 							</span>
@@ -337,7 +337,7 @@
                         </td>
                     </tr> --%>
                     <tr>
-					 	<th><span class="needwrite">*</span>是否取得港口设施保安证书:&nbsp;</th>
+					 	<th><span class="needwrite">*</span>取得港口设施保安证书:&nbsp;</th>
                         <td>
 	                        <span id="sffzsel">
 							</span>
@@ -400,7 +400,7 @@
                         
                     </tr> --%>
                     <tr>
-					 	<th>是否对外开放泊位:&nbsp;</th>
+					 	<th>对外开放泊位:&nbsp;</th>
                         <td>
 	                        <%-- <input type="text" class="form-control" name="sfdwkf" value="${record.sfdwkf}"> --%>
 	                       <span id="sfdwkfsel">

+ 4 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwmain.jsp

@@ -109,7 +109,7 @@
 		                 	<input type="text" style="width: 80%;" class="form-control" name="bwmc"  value="${bwmc }">
 		                </td>
 	                    <td class="right">
-		                 	是否&nbsp;&nbsp;<br>危险品泊位:&nbsp;
+		                 	危险品泊位:&nbsp;
 		                </td>
 		                <td >
 		                 	<div id="sfwxpbwsel"></div>
@@ -124,7 +124,7 @@
 		                 	<div id="bwsxsel"></div>
 		                </td> -->
 		                <td class="right">
-		                 	是否&nbsp;&nbsp;<br>对外开放泊位:&nbsp;
+		                 	对外开放泊位:&nbsp;
 		                </td>
 		                <td >
 		                 	<div id="sfdwkfsel"></div>
@@ -180,8 +180,8 @@
 							<th width="10%">所在港区</th>
 							<!-- <th width="10%">泊位属性</th> -->
 							<th width="15%">泊位用途</th>
-							<th width="5%">是否<br>危险品泊位</th>
-							<th width="8%">是否<br>对外开放泊位</th>
+							<th width="5%">危险品泊位</th>
+							<th width="8%">对外开放泊位</th>
 					        <th width="1%" class="operatetd">操作</th>
 					    </tr>
 				    </thead>

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwview.jsp

@@ -80,7 +80,7 @@
                     <tr>
                     	<th>岸别:&nbsp;</th>
                         <td>${record.ab } </td>
-					 	<th>是否位于港口规划岸线内:&nbsp;</th>
+					 	<th>位于港口规划岸线内:&nbsp;</th>
                         <td>${record.sfwygkghaxn }</td>
                     </tr>
                      <tr>
@@ -186,7 +186,7 @@
                    </tr> --%>
                    <tr>
 				 	
-				 	<th>是否取得港口设施保安证书:&nbsp;</th>
+				 	<th>取得港口设施保安证书:&nbsp;</th>
                        <td>
                         ${record.sffzzw }
                        </td>

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrcg/cgadd.jsp

@@ -209,7 +209,7 @@
 						<td >
 							<input type="text" class="form-control" name="hxpmc" maxlength="2000">
 						</td>
-						<th><span class="needwrite">*</span>储存压力(KPa):&nbsp;</th>
+						<th><span class="needwrite">*</span>储存压力(kPa):&nbsp;</th>
 						<td >
 							<input type="text" class="form-control" id="sjyltext" name="sjyl">
 						</td>

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

@@ -174,7 +174,7 @@
 										<td width="15%">${gkjyrxx.szgkzw}</td>
 										<th width="10%">所在港区:</th>
 										<td width="15%">${gkjyrxx.szgqzw}</td>
-										<th width="10%">是否危货企业:</th>
+										<th width="10%">危货企业:</th>
 										<td width="15%">${gkjyrxx.sfwhqyzw}</td>
 										
 									</tr>
@@ -253,11 +253,11 @@
 										<td>${gkjyrxx.gkssbafhzsbh}</td>
 									</tr>
 									<tr>
-										<th rowspan="3">从业人员数量<br>(人):</th>
+										<th rowspan="3">从业人员(人):</th>
 										<td rowspan="3" colspan="2">${gkjyrxx.cyrysl}</td>
 										<th>现场管理人员(人):</th>
 										<td colspan="2">${gkjyrxx.xcglrysl}</td>
-										<th rowspan="3">参加培训人员<br>数量(人):</th>
+										<th rowspan="3">参加培训人员(人):</th>
 										<td>${gkjyrxx.xcglpxrysl}</td>
 									</tr>
 									<tr>
@@ -296,7 +296,7 @@
 									<tr>
 										<th>最大靠泊能力<br>(万吨):</th>
 										<td colspan="5">${gkjyrxx.zdkbnl}</td>
-										<th>万吨级以上泊位<br>数量(个):</th>
+										<th>万吨级以上泊位(个):</th>
 										<td>${gkjyrxx.wdjysbwsl}</td>
 									</tr>
 									<tr>
@@ -366,7 +366,7 @@
 										<td colspan="4">${gkjyrxx.tlzyxcd}</td>
 									</tr>
 									<tr>
-										<th>储罐数量(个):</th>
+										<th>储罐(个):</th>
 										<td colspan="2">${gkjyrxx.cgsl}</td>
 										<th>储罐总容量<br>(立方米):</th>
 										<td colspan="4">${gkjyrxx.cgzrl}</td>

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrmain.jsp

@@ -127,7 +127,7 @@ var expandFlg=false;
 									</tr>
 								</table>
 							</td>
-								<td class="right">是否有许可证:</td>
+								<td class="right">有许可证:</td>
 							<td>
 								<select class="selectpicker" name="sfcyxkz" id="sfcyxkz">
 					            	<option value="all">全部</option>
@@ -140,7 +140,7 @@ var expandFlg=false;
 							</td>
 						</tr>
 						<tr>
-						<td class="right">是否危货企业:</td>
+						<td class="right">危货企业:</td>
 							<td>
 								<select class="selectpicker" name="sfcswhzy" id="sfcswhzy">
 					            	<option value="all">全部</option>

+ 8 - 8
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyradd.jsp

@@ -47,7 +47,7 @@
 							<td><span id="gksel"></span></td>
 							<th width="10%"><span class="needwrite">*</span>所在港区:</th>
 							<td ><span id="gqsel"></span></td>
-							<th width="10%">是否危货企业:</th>
+							<th width="10%">危货企业:</th>
 							<td><span id="sfwhqysel"></span></td>
 						</tr>
 						<tr>
@@ -136,20 +136,20 @@
 								name="gkssbafhzsbh" maxlength="400" style="width:99%"></td>
 						</tr>
 						<tr>
-							<th rowspan="3">从业人员数量<br>(人):</th>
+							<th rowspan="3">从业人员(人):</th>
 							<td rowspan="3" colspan="2"><input type="text" class="form-control" name="cyrysl" maxlength="100" style="width:97.5%"></td>
-							<th>现场管理人员数量(人):</th>
+							<th>现场管理人员(人):</th>
 							<td colspan="2"><input type="text" class="form-control" name="xcglrysl" maxlength="100" style="width:97.5%"></td>
-							<th rowspan="3">参加培训人员<br>数量(人):</th>
+							<th rowspan="3">参加培训人员<br>(人):</th>
 							<td><input type="text" class="form-control" name="xcglpxrysl" maxlength="100"></td>
 						</tr>
 						<tr>
-							<th>专业技术人员数量(人):</th>
+							<th>专业技术人员(人):</th>
 							<td colspan="2"><input type="text" class="form-control" name="zyjsrysl" maxlength="100" style="width:97.5%"></td>
 							<td><input type="text" class="form-control" name="zyjspxrysl" maxlength="100"></td>
 						</tr>
 						<tr>
-							<th>现场作业人员数量(人):</th>
+							<th>现场作业人员(人):</th>
 							<td colspan="2"><input type="text" class="form-control" name="xczyrysl" maxlength="100" style="width:97.5%"></td>
 							<td><input type="text" class="form-control" name="xczyrypxsl" maxlength="100"></td>
 						</tr>
@@ -179,7 +179,7 @@
 						<tr>
 							<th>最大靠泊能力<br>(万吨):</th>
 							<td colspan="5"><input readonly = "readonly" type="text"  class="form-control" name="zdkbnl" maxlength="100" style="width:99%"></td>
-							<th>万吨级以上泊位<br>数量(个):</th>
+							<th>万吨级以上泊位(个):</th>
 							<td><input readonly = "readonly" type="text"  class="form-control" name="wdjysbwsl" maxlength="100"></td>
 						</tr>
 						<tr>
@@ -254,7 +254,7 @@
 							<td colspan="4"><input type="text"  class="form-control" name="tlzyxcd" maxlength="100" style="width:98.75%"></td>
 						</tr>
 						<tr>
-							<th>储罐数量(个):</th>
+							<th>储罐(个):</th>
 							<td colspan="2"><input readonly = "readonly" type="text"  class="form-control" name="cgsl" maxlength="100" style="width:97.5%"></td>
 							<th>罐体总容积<br>(立方米):</th>
 							<td colspan="4"><input readonly = "readonly" type="text"  class="form-control" name="cgzrl" maxlength="100" style="width:98.75%"></td>

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyredit.jsp

@@ -50,7 +50,7 @@
 							<td><span id="gksel"></span></td>
 							<th width="10%"><span class="needwrite">*</span>所在港区:</th>
 							<td ><span id="gqsel"></span></td>
-							<th>是否危货企业:</th>
+							<th>危货企业:</th>
 							<td  width="10%"><span id="sfwhqysel"></span></td>
 							</tr>
 						<tr>
@@ -149,11 +149,11 @@
 								value="${gkjyr.gkssbafhzsbh}" name="gkssbafhzsbh" maxlength="200" style="width: 99%"></td>
 						</tr>
 						<tr>
-							<th rowspan="3">从业人员数量<br>(人):</th>
+							<th rowspan="3">从业人员<br>(人):</th>
 							<td rowspan="3" colspan="2"><input type="text" class="form-control" value="${gkjyr.cyrysl}" name="cyrysl" maxlength="100" style="width:97.5%"></td>
 							<th>现场管理人员(人):</th>
 							<td colspan="2"><input type="text" class="form-control" value="${gkjyr.xcglrysl}" name="xcglrysl" maxlength="100" style="width:97.5%"></td>
-							<th rowspan="3">参加培训人员<br>数量(人):</th>
+							<th rowspan="3">参加培训人员(人):</th>
 							<td><input type="text" class="form-control" value="${gkjyr.xcglpxrysl}" name="xcglpxrysl" maxlength="100"></td>
 						</tr>
 						<tr>
@@ -192,7 +192,7 @@
 						<tr>
 							<th>最大靠泊能力<br>(万吨):</th>
 							<td colspan="5"><input readonly = "readonly" type="text"  class="form-control" value="${gkjyr.zdkbnl}" name="zdkbnl" maxlength="100" style="width:99%"></td>
-							<th>万吨级以上泊位<br>数量(个):</th>
+							<th>万吨级以上泊位(个):</th>
 							<td><input type="text" readonly = "readonly"  class="form-control" value="${gkjyr.wdjysbwsl}" name="wdjysbwsl" maxlength="100"></td>
 						</tr>
 						<tr>
@@ -267,7 +267,7 @@
 							<td colspan="4"><input type="text"  class="form-control" value="${gkjyr.tlzyxcd}" name="tlzyxcd" maxlength="100" style="width:98.75%"></td>
 						</tr>
 						<tr>
-							<th>储罐数量(个):</th>
+							<th>储罐(个):</th>
 							<td colspan="2"><input readonly = "readonly" type="text"  class="form-control" value="${gkjyr.cgsl}" name="cgsl" maxlength="100" style="width:97.5%"></td>
 							<th>罐体总容积<br>(立方米):</th>
 							<td colspan="4"><input readonly = "readonly" type="text"  class="form-control" value="${gkjyr.cgzrl}" name="cgzrl" maxlength="100" style="width:98.75%"></td>

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/jyrview.jsp

@@ -37,7 +37,7 @@
 							<td width="15%">${gkjyr.szgkzw}</td>
 							<th width="10%">所在港区:</th>
 							<td width="15%">${gkjyr.szgqzw}</td>
-							<th width="10%">是否危货企业:</th>
+							<th width="10%">危货企业:</th>
 							<td>${gkjyr.sfwhqyzw}</td>
 							
 						</tr>
@@ -116,11 +116,11 @@
 							<td>${gkjyr.gkssbafhzsbh}</td>
 						</tr>
 						<tr>
-							<th rowspan="3">从业人员数量<br>(人):</th>
+							<th rowspan="3">从业人员(人):</th>
 							<td rowspan="3" colspan="2">${gkjyr.cyrysl}</td>
 							<th>现场管理人员(人):</th>
 							<td colspan="2">${gkjyr.xcglrysl}</td>
-							<th rowspan="3">参加培训人员<br>数量(人):</th>
+							<th rowspan="3">参加培训人员(人):</th>
 							<td>${gkjyr.xcglpxrysl}</td>
 						</tr>
 						<tr>
@@ -159,7 +159,7 @@
 						<tr>
 							<th>最大靠泊能力<br>(万吨):</th>
 							<td colspan="5">${gkjyr.zdkbnl}</td>
-							<th>万吨级以上泊位<br>数量(个):</th>
+							<th>万吨级以上泊位(个):</th>
 							<td>${gkjyr.wdjysbwsl}</td>
 						</tr>
 						<tr>
@@ -229,7 +229,7 @@
 							<td colspan="4">${gkjyr.tlzyxcd}</td>
 						</tr>
 						<tr>
-							<th>储罐数量(个):</th>
+							<th>储罐(个):</th>
 							<td colspan="2">${gkjyr.cgsl}</td>
 							<th>罐体总容积<br>(立方米):</th>
 							<td colspan="4">${gkjyr.cgzrl}</td>

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

@@ -115,7 +115,7 @@
 						</td>
 					</tr>
 					<tr>
-						<th>许可证电子扫描件&nbsp;</th>
+						<th>许可证电子扫描件:&nbsp;</th>
 						<td >
 						<%for(int i=0;i<2;i++){
 						request.setAttribute("flag",i);

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgaddmain.jsp

@@ -599,7 +599,7 @@
 											<th width="10%">所在港区:</th>
 											<td width="15%"><span id="szgqzw">${gkjyr.szgqzw}</span></td>
 											
-											<th width="10%">是否危货企业:</th>
+											<th width="10%">危货企业:</th>
 											<td width="15%"><span id="sfwhqysel">${gkjyr.sfwhqyzw}</span></td>
 										</tr>
 										<tr>
@@ -715,7 +715,7 @@
 												maxlength="200" style="width:99%"></td>
 										</tr>
 										<tr>
-											<th rowspan="3">从业人员数量<br>(人):
+											<th rowspan="3">从业人员(人):
 											</th>
 											<td rowspan="3" colspan="2"><input type="text"
 												class="form-control" value="${gkjyr.cyrysl}" name="cyrysl"
@@ -726,7 +726,7 @@
 												id="xcglrysl"
 												value="${gkjyr.xcglrysl}" name="xcglrysl" maxlength="100"
 												style="width: 97.5%"></td>
-											<th rowspan="3">参加培训人员<br>数量(人):
+											<th rowspan="3">参加培训人员(人):
 											</th>
 											<td><input type="text" class="form-control"
 												id="xcglpxrysl"
@@ -805,7 +805,7 @@
 												id="zdkbnl"
 												value="${gkjyr.zdkbnl}" name="zdkbnl" maxlength="100"
 												style="width: 99%"></td>
-											<th>万吨级以上泊位<br>数量(个):
+											<th>万吨级以上泊位(个):
 											</th>
 											<td><input type="text" class="form-control"
 												id="wdjysbwsl"
@@ -946,7 +946,7 @@
 												style="width: 98.75%"></td>
 										</tr>
 										<tr>
-											<th>储罐数量(个):</th>
+											<th>储罐(个):</th>
 											<td colspan="2"><input type="text" class="form-control" 
 												id="cgsl"
 												value="${gkjyr.cgsl}" name="cgsl" maxlength="100"

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgeditmain.jsp

@@ -509,7 +509,7 @@
 											<td width="15%">${gkjyr.szgkzw}</td>
 											<th width="10%">所在港区:</th>
 											<td width="15%">${gkjyr.szgqzw}</td>
-											<th width="10%">是否危货企业:</th>
+											<th width="10%">危货企业:</th>
 											<td width="15%"><span id="sfwhqysel">${gkjyr.sfwhqyzw}</span></td>
 										</tr>
 										<tr>
@@ -623,7 +623,7 @@
 												maxlength="200" style="width:99%"></td>
 										</tr>
 										<tr>
-											<th rowspan="3">从业人员数量<br>(人):
+											<th rowspan="3">从业人员(人):
 											</th>
 											<td rowspan="3" colspan="2"><input type="text"
 												class="form-control" value="${gkjyr.cyrysl}" name="cyrysl"
@@ -632,7 +632,7 @@
 											<td colspan="2"><input type="text" class="form-control"
 												value="${gkjyr.xcglrysl}" name="xcglrysl" maxlength="100"
 												style="width: 97.5%"></td>
-											<th rowspan="3">参加培训人员<br>数量(人):
+											<th rowspan="3">参加培训人员(人):
 											</th>
 											<td><input type="text" class="form-control"
 												value="${gkjyr.xcglpxrysl}" name="xcglpxrysl"
@@ -699,7 +699,7 @@
 											<td colspan="5"><input type="text" class="form-control"
 												value="${gkjyr.zdkbnl}" name="zdkbnl" maxlength="100"
 												style="width: 99%"></td>
-											<th>万吨级以上泊位<br>数量(个):
+											<th>万吨级以上泊位(个):
 											</th>
 											<td><input type="text" class="form-control"
 												value="${gkjyr.wdjysbwsl}" name="wdjysbwsl" maxlength="100"></td>
@@ -817,7 +817,7 @@
 												style="width: 98.75%"></td>
 										</tr>
 										<tr>
-											<th>储罐数量(个):</th>
+											<th>储罐(个):</th>
 											<td colspan="2"><input type="text" class="form-control"
 												value="${gkjyr.cgsl}" name="cgsl" maxlength="100"
 												style="width: 97.5%"></td>

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgviewmain.jsp

@@ -504,7 +504,7 @@
 										<td width="15%">${gkjyrxx.szgkzw}</td>
 										<th width="10%">所在港区:</th>
 										<td width="15%">${gkjyrxx.szgqzw}</td>
-										<th width="10%">是否危货企业:</th>
+										<th width="10%">危货企业:</th>
 										<td width="15%">${gkjyrxx.sfwhqyzw}</td>
 									</tr>
 									<tr>
@@ -583,11 +583,11 @@
 										<td>${gkjyrxx.gkssbafhzsbh}</td>
 									</tr>
 									<tr>
-										<th rowspan="3">从业人员数量<br>(人):</th>
+										<th rowspan="3">从业人员(人):</th>
 										<td rowspan="3" colspan="2">${gkjyrxx.cyrysl}</td>
 										<th>现场管理人员(人):</th>
 										<td colspan="2">${gkjyrxx.xcglrysl}</td>
-										<th rowspan="3">参加培训人员<br>数量(人):</th>
+										<th rowspan="3">参加培训人员(人):</th>
 										<td>${gkjyrxx.xcglpxrysl}</td>
 									</tr>
 									<tr>
@@ -626,7 +626,7 @@
 									<tr>
 										<th>最大靠泊能力<br>(万吨):</th>
 										<td colspan="5">${gkjyrxx.zdkbnl}</td>
-										<th>万吨级以上泊位<br>数量(个):</th>
+										<th>万吨级以上泊位(个):</th>
 										<td>${gkjyrxx.wdjysbwsl}</td>
 									</tr>
 									<tr>
@@ -696,7 +696,7 @@
 										<td colspan="4">${gkjyrxx.tlzyxcd}</td>
 									</tr>
 									<tr>
-										<th>储罐数量(个):</th>
+										<th>储罐(个):</th>
 										<td colspan="2">${gkjyrxx.cgsl}</td>
 										<th>储罐总容量<br>(立方米):</th>
 										<td colspan="4">${gkjyrxx.cgzrl}</td>

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqaddmain.jsp

@@ -502,7 +502,7 @@
 											<td width="15%"><span id="szgkzw">${gkjyr.szgkzw}</span></td>
 											<th width="10%">所在港区:</th>
 											<td width="15%"><span id="szgqzw">${gkjyr.szgqzw}</span></td>
-											<th width="10%">是否危货企业:</th>
+											<th width="10%">危货企业:</th>
 											<td width="15%"><span id="sfwhqyzw">${gkjyr.sfwhqyzw }</span></td>
 											
 										</tr>
@@ -619,7 +619,7 @@
 												maxlength="200" style="99%"></td>
 										</tr>
 										<tr>
-											<th rowspan="3">从业人员数量<br>(人):
+											<th rowspan="3">从业人员(人):
 											</th>
 											<td rowspan="3" colspan="2"><input type="text"
 												class="form-control" value="${gkjyr.cyrysl}" name="cyrysl"
@@ -630,7 +630,7 @@
 												id="xcglrysl"
 												value="${gkjyr.xcglrysl}" name="xcglrysl" maxlength="100"
 												style="width: 97.5%"></td>
-											<th rowspan="3">参加培训人员<br>数量(人):
+											<th rowspan="3">参加培训人员(人):
 											</th>
 											<td><input type="text" class="form-control"
 												id="xcglpxrysl"
@@ -709,7 +709,7 @@
 												id="zdkbnl"
 												value="${gkjyr.zdkbnl}" name="zdkbnl" maxlength="100"
 												style="width: 99%"></td>
-											<th>万吨级以上泊位<br>数量(个):
+											<th>万吨级以上泊位(个):
 											</th>
 											<td><input type="text" class="form-control"
 												id="wdjysbwsl"
@@ -850,7 +850,7 @@
 												style="width: 98.75%"></td>
 										</tr>
 										<tr>
-											<th>储罐数量(个):</th>
+											<th>储罐(个):</th>
 											<td colspan="2"><input type="text" class="form-control" 
 												id="cgsl"
 												value="${gkjyr.cgsl}" name="cgsl" maxlength="100"

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqeditmain.jsp

@@ -432,7 +432,7 @@
 											<td width="15%">${gkjyr.szgkzw}</td>
 											<th width="10%">所在港区:</th>
 											<td width="15%">${gkjyr.szgqzw}</td>
-											<th width="10%">是否危货企业:</th>
+											<th width="10%">危货企业:</th>
 											<td width="15%"><span id="sfwhqysel">${gkjyr.sfwhqyzw}</span></td>
 											
 										</tr>
@@ -543,7 +543,7 @@
 												maxlength="200" style="width:99%"></td>
 										</tr>
 										<tr>
-											<th rowspan="3">从业人员数量<br>(人):
+											<th rowspan="3">从业人员(人):
 											</th>
 											<td rowspan="3" colspan="2"><input type="text"
 												class="form-control" value="${gkjyr.cyrysl}" name="cyrysl"
@@ -552,7 +552,7 @@
 											<td colspan="2"><input type="text" class="form-control"
 												value="${gkjyr.xcglrysl}" name="xcglrysl" maxlength="100"
 												style="width: 97.5%"></td>
-											<th rowspan="3">参加培训人员<br>数量(人):
+											<th rowspan="3">参加培训人员(人):
 											</th>
 											<td><input type="text" class="form-control"
 												value="${gkjyr.xcglpxrysl}" name="xcglpxrysl"
@@ -619,7 +619,7 @@
 											<td colspan="5"><input type="text" class="form-control" readonly="readonly" 
 												value="${gkjyr.zdkbnl}" name="zdkbnl" maxlength="100"
 												style="width: 99%"></td>
-											<th>万吨级以上泊位<br>数量(个):
+											<th>万吨级以上泊位(个):
 											</th>
 											<td><input type="text" class="form-control"
 												value="${gkjyr.wdjysbwsl}" name="wdjysbwsl" maxlength="100"></td>
@@ -737,7 +737,7 @@
 												style="width: 98.75%"></td>
 										</tr>
 										<tr>
-											<th>储罐数量(个):</th>
+											<th>储罐(个):</th>
 											<td colspan="2"><input type="text" class="form-control" readonly="readonly" 
 												value="${gkjyr.cgsl}" name="cgsl" maxlength="100"
 												style="width: 97.5%"></td>

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqviewmain.jsp

@@ -456,7 +456,7 @@
 										<td width="15%">${gkjyrxx.szgkzw}</td>
 										<th width="10%">所在港区:</th>
 										<td width="15%">${gkjyrxx.szgqzw}</td>
-										<th width="10%">是否危货企业:</th>
+										<th width="10%">危货企业:</th>
 										<td width="15%">${gkjyrxx.sfwhqyzw}</td>
 										
 									</tr>
@@ -538,11 +538,11 @@
 										<td>${gkjyrxx.gkssbafhzsbh}</td>
 									</tr>
 									<tr>
-										<th rowspan="3">从业人员数量<br>(人):</th>
+										<th rowspan="3">从业人员(人):</th>
 										<td rowspan="3" colspan="2">${gkjyrxx.cyrysl}</td>
 										<th>现场管理人员(人):</th>
 										<td colspan="2">${gkjyrxx.xcglrysl}</td>
-										<th rowspan="3">参加培训人员<br>数量(人):</th>
+										<th rowspan="3">参加培训人员(人):</th>
 										<td>${gkjyrxx.xcglpxrysl}</td>
 									</tr>
 									<tr>
@@ -581,7 +581,7 @@
 									<tr>
 										<th>最大靠泊能力<br>(万吨):</th>
 										<td colspan="5">${gkjyrxx.zdkbnl}</td>
-										<th>万吨级以上泊位<br>数量(个):</th>
+										<th>万吨级以上泊位(个):</th>
 										<td>${gkjyrxx.wdjysbwsl}</td>
 									</tr>
 									<tr>
@@ -651,7 +651,7 @@
 										<td colspan="4">${gkjyrxx.tlzyxcd}</td>
 									</tr>
 									<tr>
-										<th>储罐数量(个):</th>
+										<th>储罐(个):</th>
 										<td colspan="2">${gkjyrxx.cgsl}</td>
 										<th>储罐总容量<br>(立方米):</th>
 										<td colspan="4">${gkjyrxx.cgzrl}</td>

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxaddmain.jsp

@@ -460,7 +460,7 @@
 											<td width="15%"><span id="szgkzw">${gkjyr.szgkzw}</span></td>
 											<th width="10%">所在港区:</th>
 											<td width="15%"><span id="szgqzw">${gkjyr.szgqzw}</span></td>
-											<th width="10%">是否危货企业:</th>
+											<th width="10%">危货企业:</th>
 											<td width="15%"><span id="sfwhqysel">${gkjyr.sfwhqyzw}</span></td>
 										</tr>
 										<tr>
@@ -576,7 +576,7 @@
 												maxlength="200" style="width:99%"></td>
 										</tr>
 										<tr>
-											<th rowspan="3">从业人员数量<br>(人):
+											<th rowspan="3">从业人员(人):
 											</th>
 											<td rowspan="3" colspan="2"><input type="text"
 												class="form-control" value="${gkjyr.cyrysl}" name="cyrysl"
@@ -587,7 +587,7 @@
 												id="xcglrysl"
 												value="${gkjyr.xcglrysl}" name="xcglrysl" maxlength="100"
 												style="width: 97.5%"></td>
-											<th rowspan="3">参加培训人员<br>数量(人):
+											<th rowspan="3">参加培训人员(人):
 											</th>
 											<td><input type="text" class="form-control"
 												id="xcglpxrysl"
@@ -665,7 +665,7 @@
 												id="zdkbnl"
 												value="${gkjyr.zdkbnl}" name="zdkbnl" maxlength="100"
 												style="width: 99%"></td>
-											<th>万吨级以上泊位<br>数量(个):
+											<th>万吨级以上泊位(个):
 											</th>
 											<td><input type="text" class="form-control"
 												id="wdjysbwsl"
@@ -806,7 +806,7 @@
 												style="width: 98.75%"></td>
 										</tr>
 										<tr>
-											<th>储罐数量(个):</th>
+											<th>储罐(个):</th>
 											<td colspan="2"><input type="text" class="form-control" 
 												id="cgsl"
 												value="${gkjyr.cgsl}" name="cgsl" maxlength="100"

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxeditmain.jsp

@@ -371,7 +371,7 @@
 											<td width="15%">${gkjyr.szgkzw}</td>
 											<th width="10%">所在港区:</th>
 											<td width="15%">${gkjyr.szgqzw}</td>
-											<th width="10%">是否危货企业:</th>
+											<th width="10%">危货企业:</th>
 											<td width="15%"><span id="sfwhqysel">${gkjyr.sfwhqyzw}</span></td>
 										</tr>
 										<tr>
@@ -484,7 +484,7 @@
 												maxlength="200" style="width:99%"></td>
 										</tr>
 										<tr>
-											<th rowspan="3">从业人员数量<br>(人):
+											<th rowspan="3">从业人员(人):
 											</th>
 											<td rowspan="3" colspan="2"><input type="text"
 												class="form-control" value="${gkjyr.cyrysl}" name="cyrysl"
@@ -493,7 +493,7 @@
 											<td colspan="2"><input type="text" class="form-control"
 												value="${gkjyr.xcglrysl}" name="xcglrysl" maxlength="100"
 												style="width: 97.5%"></td>
-											<th rowspan="3">参加培训人员<br>数量(人):
+											<th rowspan="3">参加培训人员(人):
 											</th>
 											<td><input type="text" class="form-control"
 												value="${gkjyr.xcglpxrysl}" name="xcglpxrysl"
@@ -560,7 +560,7 @@
 											<td colspan="5"><input type="text" class="form-control"
 												value="${gkjyr.zdkbnl}" name="zdkbnl" maxlength="100"
 												style="width: 99%"></td>
-											<th>万吨级以上泊位<br>数量(个):
+											<th>万吨级以上泊位(个):
 											</th>
 											<td><input type="text" class="form-control"
 												value="${gkjyr.wdjysbwsl}" name="wdjysbwsl" maxlength="100"></td>
@@ -678,7 +678,7 @@
 												style="width: 98.75%"></td>
 										</tr>
 										<tr>
-											<th>储罐数量(个):</th>
+											<th>储罐(个):</th>
 											<td colspan="2"><input type="text" class="form-control"
 												value="${gkjyr.cgsl}" name="cgsl" maxlength="100"
 												style="width: 97.5%"></td>

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxviewmain.jsp

@@ -491,7 +491,7 @@
 										<td width="15%">${gkjyrxx.szgkzw}</td>
 										<th width="10%">所在港区:</th>
 										<td width="15%">${gkjyrxx.szgqzw}</td>
-										<th width="10%">是否危货企业:</th>
+										<th width="10%">危货企业:</th>
 										<td width="15%">${gkjyrxx.sfwhqyzw}</td>
 									</tr>
 									<tr>
@@ -570,11 +570,11 @@
 										<td>${gkjyrxx.gkssbafhzsbh}</td>
 									</tr>
 									<tr>
-										<th rowspan="3">从业人员数量<br>(人):</th>
+										<th rowspan="3">从业人员(人):</th>
 										<td rowspan="3" colspan="2">${gkjyrxx.cyrysl}</td>
 										<th>现场管理人员(人):</th>
 										<td colspan="2">${gkjyrxx.xcglrysl}</td>
-										<th rowspan="3">参加培训人员<br>数量(人):</th>
+										<th rowspan="3">参加培训人员(人):</th>
 										<td>${gkjyrxx.xcglpxrysl}</td>
 									</tr>
 									<tr>
@@ -613,7 +613,7 @@
 									<tr>
 										<th>最大靠泊能力<br>(万吨):</th>
 										<td colspan="5">${gkjyrxx.zdkbnl}</td>
-										<th>万吨级以上泊位<br>数量(个):</th>
+										<th>万吨级以上泊位(个):</th>
 										<td>${gkjyrxx.wdjysbwsl}</td>
 									</tr>
 									<tr>
@@ -683,7 +683,7 @@
 										<td colspan="4">${gkjyrxx.tlzyxcd}</td>
 									</tr>
 									<tr>
-										<th>储罐数量(个):</th>
+										<th>储罐(个):</th>
 										<td colspan="2">${gkjyrxx.cgsl}</td>
 										<th>储罐总容量<br>(立方米):</th>
 										<td colspan="4">${gkjyrxx.cgzrl}</td>

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxaddmain.jsp

@@ -450,7 +450,7 @@
 											<td width="15%"><span id="szgkzw">${gkjyr.szgkzw}</span></td>
 											<th width="10%">所在港区:</th>
 											<td width="15%"><span id="szgqzw">${gkjyr.szgqzw}</span></td>
-											<th width="10%">是否危货企业:</th>
+											<th width="10%">危货企业:</th>
 											<td width="15%"><span id="sfwhqysel">${gkjyr.sfwhqyzw}</span></td>
 										</tr>
 										<tr>
@@ -566,7 +566,7 @@
 												maxlength="200" style="width:99%"></td>
 										</tr>
 										<tr>
-											<th rowspan="3">从业人员数量<br>(人):
+											<th rowspan="3">从业人员(人):
 											</th>
 											<td rowspan="3" colspan="2"><input type="text"
 												class="form-control" value="${gkjyr.cyrysl}" name="cyrysl"
@@ -577,7 +577,7 @@
 												id="xcglrysl"
 												value="${gkjyr.xcglrysl}" name="xcglrysl" maxlength="100"
 												style="width: 97.5%"></td>
-											<th rowspan="3">参加培训人员<br>数量(人):
+											<th rowspan="3">参加培训人员(人):
 											</th>
 											<td><input type="text" class="form-control"
 												id="xcglpxrysl"
@@ -656,7 +656,7 @@
 												id="zdkbnl"
 												value="${gkjyr.zdkbnl}" name="zdkbnl" maxlength="100"
 												style="width: 99%"></td>
-											<th>万吨级以上泊位<br>数量(个):
+											<th>万吨级以上泊位(个):
 											</th>
 											<td><input type="text" class="form-control"
 												id="wdjysbwsl"
@@ -797,7 +797,7 @@
 												style="width: 98.75%"></td>
 										</tr>
 										<tr>
-											<th>储罐数量(个):</th>
+											<th>储罐(个):</th>
 											<td colspan="2"><input type="text" class="form-control" 
 												id="cgsl"
 												value="${gkjyr.cgsl}" name="cgsl" maxlength="100"

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxeditmain.jsp

@@ -345,7 +345,7 @@
 											<td width="15%">${gkjyr.szgkzw}</td>
 											<th width="10%">所在港区:</th>
 											<td width="15%">${gkjyr.szgqzw}</td>
-											<th width="10%">是否危货企业:</th>
+											<th width="10%">危货企业:</th>
 											<td width="15%"><span id="sfwhqysel">${gkjyr.sfwhqyzw}</span></td>
 										</tr>
 										<tr>
@@ -458,7 +458,7 @@
 												maxlength="200" style="width:99%"></td>
 										</tr>
 										<tr>
-											<th rowspan="3">从业人员数量<br>(人):
+											<th rowspan="3">从业人员(人):
 											</th>
 											<td rowspan="3" colspan="2"><input type="text"
 												class="form-control" value="${gkjyr.cyrysl}" name="cyrysl"
@@ -467,7 +467,7 @@
 											<td colspan="2"><input type="text" class="form-control"
 												value="${gkjyr.xcglrysl}" name="xcglrysl" maxlength="100"
 												style="width: 97.5%"></td>
-											<th rowspan="3">参加培训人员<br>数量(人):
+											<th rowspan="3">参加培训人员(人):
 											</th>
 											<td><input type="text" class="form-control"
 												value="${gkjyr.xcglpxrysl}" name="xcglpxrysl"
@@ -534,7 +534,7 @@
 											<td colspan="5"><input type="text" class="form-control"
 												value="${gkjyr.zdkbnl}" name="zdkbnl" maxlength="100"
 												style="width: 99%"></td>
-											<th>万吨级以上泊位<br>数量(个):
+											<th>万吨级以上泊位(个):
 											</th>
 											<td><input type="text" class="form-control"
 												value="${gkjyr.wdjysbwsl}" name="wdjysbwsl" maxlength="100"></td>
@@ -652,7 +652,7 @@
 												style="width: 98.75%"></td>
 										</tr>
 										<tr>
-											<th>储罐数量(个):</th>
+											<th>储罐(个):</th>
 											<td colspan="2"><input type="text" class="form-control"
 												value="${gkjyr.cgsl}" name="cgsl" maxlength="100"
 												style="width: 97.5%"></td>

+ 5 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxviewmain.jsp

@@ -481,7 +481,7 @@
 										<td width="15%">${gkjyrxx.szgkzw}</td>
 										<th width="10%">所在港区:</th>
 										<td width="15%">${gkjyrxx.szgqzw}</td>
-										<th width="10%">是否危货企业:</th>
+										<th width="10%">危货企业:</th>
 										<td width="15%">${gkjyrxx.sfwhqyzw}</td>
 									</tr>
 									<tr>
@@ -560,11 +560,11 @@
 										<td>${gkjyrxx.gkssbafhzsbh}</td>
 									</tr>
 									<tr>
-										<th rowspan="3">从业人员数量<br>(人):</th>
+										<th rowspan="3">从业人员(人):</th>
 										<td rowspan="3" colspan="2">${gkjyrxx.cyrysl}</td>
 										<th>现场管理人员(人):</th>
 										<td colspan="2">${gkjyrxx.xcglrysl}</td>
-										<th rowspan="3">参加培训人员<br>数量(人):</th>
+										<th rowspan="3">参加培训人员(人):</th>
 										<td>${gkjyrxx.xcglpxrysl}</td>
 									</tr>
 									<tr>
@@ -603,7 +603,7 @@
 									<tr>
 										<th>最大靠泊能力<br>(万吨):</th>
 										<td colspan="5">${gkjyrxx.zdkbnl}</td>
-										<th>万吨级以上泊位<br>数量(个):</th>
+										<th>万吨级以上泊位(个):</th>
 										<td>${gkjyrxx.wdjysbwsl}</td>
 									</tr>
 									<tr>
@@ -673,7 +673,7 @@
 										<td colspan="4">${gkjyrxx.tlzyxcd}</td>
 									</tr>
 									<tr>
-										<th>储罐数量(个):</th>
+										<th>储罐(个):</th>
 										<td colspan="2">${gkjyrxx.cgsl}</td>
 										<th>储罐总容量<br>(立方米):</th>
 										<td colspan="4">${gkjyrxx.cgzrl}</td>

+ 4 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/showbwview.jsp

@@ -123,7 +123,7 @@ function guanbibw(){
                         	<span id="ab">
 							</span>
                         </td>
-					 	<th>是否位于港口规划岸线内:&nbsp;</th>
+					 	<th>位于港口规划岸线内:&nbsp;</th>
                         <td>
 	                        <span id="sfwygkghaxn">
 							</span>
@@ -189,7 +189,7 @@ function guanbibw(){
                        <td>
                         <span id="bwcd"></span>
                        </td>
-				 	<th>是否危险品泊位:&nbsp;</th>
+				 	<th>危险品泊位:&nbsp;</th>
                        <td>
                         <span id="wxpbwzw"></span>
                        </td>
@@ -207,7 +207,7 @@ function guanbibw(){
                    </tr>
                    <tr>
 				 	
-				 	<th>是否取得港口设施保安证书:&nbsp;</th>
+				 	<th>取得港口设施保安证书:&nbsp;</th>
                        <td>
                         <span id="sffzzw"></span>
                        </td>
@@ -229,7 +229,7 @@ function guanbibw(){
                         </td>
                     </tr>
                     <tr>
-				 	   <th>是否对外开放泊位:&nbsp;</th>
+				 	   <th>对外开放泊位:&nbsp;</th>
                        <td>
                         <span id="sfdwkfzw"></span>
                        </td>

+ 2 - 2
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/mt/service/impl/MtServiceImpl.java

@@ -116,8 +116,8 @@ public class MtServiceImpl extends JyglBaseService<MtEntity, String> implements
 	@Override
 	public void setSheet(List<MtVo> voList, ServletOutputStream outputStream, XSSFWorkbook workBook) {
 		String[] titles = { "序号", "所在地", "所在港口", "所在港区", "港口经营人", "所在作业区", "所在岸线", "码头名称", "码头长度(米)", "设计货物吞吐量(万吨)", "设计旅客吞吐量(万人)", 
-				"年旅客通过能力(万人)", "年集装箱通过能力(万TEU)", "年货物通过能力(万吨)", "服务类型", "是否对外开放", "是否危化品码头", "码头用途", "码头结构型式", "建成日期", 
-				"是否为挖入式港池形式", "码头前沿设计水深(米)" };
+				"年旅客通过能力(万人)", "年集装箱通过能力(万TEU)", "年货物通过能力(万吨)", "服务类型", "对外开放", "危化品码头", "码头用途", "码头结构型式", "建成日期", 
+				"挖入式港池形式", "码头前沿设计水深(米)" };
 		// 在workbook中添加一个sheet,对应Excel文件中的sheet
 		XSSFSheet mtSheet = workBook.createSheet("码头信息");
 		ExportUtil exportUtil = new ExportUtil(workBook, mtSheet);

+ 1 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrbw/service/impl/BwServiceImpl.java

@@ -121,7 +121,7 @@ public class BwServiceImpl extends JyglBaseService<BwEntity, String> implements
 	
 	@Override
 	public void setSheet(List<BwVo> voList, ServletOutputStream outputStream, XSSFWorkbook workBook) {
-		String[] titles = { "序号", "所在地", "所在港口", "所在港区", "港口经营人", "所在作业区", "所在码头", "泊位名称", "泊位属性", "泊位用途", "泊位所在航道", "泊位所在水系", "服务类型", "投产年份", "竣工验收年份", "前沿设计水深(米)", "前沿实际水深(米)", "泊位长度", "危险品泊位", "设计靠泊能力(吨)", "核查靠泊能力(吨)", "是否取得港口设施保安证书", "泊位型式", "泊位型式_直立式", "泊位型式_斜坡", "是否对外开放泊位", "泊位生产类型", "货物设计年综合通过能力(万吨)", "集装箱设计年综合通过能力(万TEU)", "滚装汽车设计年综合通过能力(万辆)", "旅客设计年综合通过能力(万人)", "靠泊船舶类型(按用途分)", "备注" };
+		String[] titles = { "序号", "所在地", "所在港口", "所在港区", "港口经营人", "所在作业区", "所在码头", "泊位名称", "泊位属性", "泊位用途", "泊位所在航道", "泊位所在水系", "服务类型", "投产年份", "竣工验收年份", "前沿设计水深(米)", "前沿实际水深(米)", "泊位长度", "危险品泊位", "设计靠泊能力(吨)", "核查靠泊能力(吨)", "取得港口设施保安证书", "泊位型式", "泊位型式_直立式", "泊位型式_斜坡", "对外开放泊位", "泊位生产类型", "货物设计年综合通过能力(万吨)", "集装箱设计年综合通过能力(万TEU)", "滚装汽车设计年综合通过能力(万辆)", "旅客设计年综合通过能力(万人)", "靠泊船舶类型(按用途分)", "备注" };
 		// 在workbook中添加一个sheet,对应Excel文件中的sheet
 		XSSFSheet bwSheet = workBook.createSheet("泊位信息");
 		ExportUtil exportUtil = new ExportUtil(workBook, bwSheet);

+ 1 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrcg/service/impl/CgServiceImpl.java

@@ -86,7 +86,7 @@ public class CgServiceImpl extends JyglBaseService<CgEntity, String> implements
 	
 	@Override
 	public void setSheet(List<CgVo> voList, ServletOutputStream outputStream, XSSFWorkbook workBook) {
-		String[] titles = { "序号", "所在地", "所在港口", "所在港区", "港口经营人", "储罐名称", "储罐类型", "作业品名", "储存压力(KPa)", "罐体高度(米)", "罐体直径(米)", "罐体容积(立方米)", "投产日期", "备注" };
+		String[] titles = { "序号", "所在地", "所在港口", "所在港区", "港口经营人", "储罐名称", "储罐类型", "作业品名", "储存压力(kPa)", "罐体高度(米)", "罐体直径(米)", "罐体容积(立方米)", "投产日期", "备注" };
 		// 在workbook中添加一个sheet,对应Excel文件中的sheet
 		XSSFSheet cgSheet = workBook.createSheet("储罐信息");
 		ExportUtil exportUtil = new ExportUtil(workBook, cgSheet);

+ 4 - 4
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/service/impl/GkjyrServiceImpl.java

@@ -165,13 +165,13 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 	}
 	
 	public void setSheet(List<GkjyrVo> voList, ServletOutputStream outputStream, XSSFWorkbook workBook) {
-		String[] titles = { "序号", "所在地", "所在港口", "所在港区", "是否危货企业", "经营人名称", "企业性质", "办公地址", "邮政编码", "经营许可证号编号", "发证日期", "发证机关", 
+		String[] titles = { "序号", "所在地", "所在港口", "所在港区", "危货企业", "经营人名称", "企业性质", "办公地址", "邮政编码", "经营许可证号编号", "发证日期", "发证机关", 
 				"经营范围", "经营区域", "主营货种", "法定代表人姓名", "联系电话", "传真", "工商营业执照编号", "投资总额(万元)", "注册资本(万元)", "危险货物作业附证编号", "设施保安符合证书编号", 
-				"从业人员数量", "现场管理人员(人)", "专业技术人员(人)", "现场作业人员(人)", "房建设施总面积(平方米)", "有无产权证明", "办公用房(平方米)", 
-				"岸线长度(米)", "码头前沿河底高程(米)", "码头泊位总数(平方米)", "生产性泊位(个)", "非生产性泊位(个)", "最大靠泊能力(万吨)", "万吨级以上泊位数量(个)", "码头结构型式", 
+				"从业人员", "现场管理人员(人)", "专业技术人员(人)", "现场作业人员(人)", "房建设施总面积(平方米)", "有无产权证明", "办公用房(平方米)", 
+				"岸线长度(米)", "码头前沿河底高程(米)", "码头泊位总数(平方米)", "生产性泊位(个)", "非生产性泊位(个)", "最大靠泊能力(万吨)", "万吨级以上泊位(个)", "码头结构型式", 
 				"泊位总长度(米)", "有无竣工验收证明", "设计年通过能力(万吨)", "上年度总吞量(万吨)", "其中外贸总吞量(万吨)", "陆域总面积(平方米)", "仓库总面积(平方米)", "堆场总面积(平方米)", 
 				"装卸设备(台)", "其中门座吊机(台)", "轮胎起重机(台)", "固定吊机(台)", "汽车起重机(台)", "输送设备(台)", "其他机械(台)", "港作船舶(艘)", "船舶总载重量(万吨)", 
-				"工艺管线长度(米)", "铁路专用长度(米)", "储罐数量(个)", "储罐总容量(立方米)" };
+				"工艺管线长度(米)", "铁路专用长度(米)", "储罐(个)", "储罐总容量(立方米)" };
 		// 在workbook中添加一个sheet,对应Excel文件中的sheet
 		XSSFSheet jyrSheet = workBook.createSheet("港口经营人信息");
 		ExportUtil exportUtil = new ExportUtil(workBook, jyrSheet);