Selaa lähdekoodia

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

xt_xuhao 8 vuotta sitten
vanhempi
commit
7adb391c8e
83 muutettua tiedostoa jossa 1689 lisäystä ja 2460 poistoa
  1. 11 0
      gkaq/yjpt-java/trunk/.project
  2. 1 1
      gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java
  3. 13 8
      gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/zysqbp/ZysqbpDao.java
  4. 1 1
      gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zysqbp/XksbEntity.java
  5. 1 1
      gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zysqbp/ZysqbpBgEntity.java
  6. 1 1
      gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zysqbp/ZysqbpEntity.java
  7. 99 37
      gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/zysqbp/ZysqbpServiceImpl.java
  8. BIN
      gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq.jasper
  9. 1 1
      gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq.jrxml
  10. BIN
      gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport1.jasper
  11. 1 1
      gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport2-html.jrxml
  12. BIN
      gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport2.jasper
  13. 1 1
      gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport2.jrxml
  14. BIN
      gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport3.jasper
  15. BIN
      gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport4.jasper
  16. BIN
      gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport5.jasper
  17. BIN
      gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport6.jasper
  18. BIN
      gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport7.jasper
  19. BIN
      gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport8.jasper
  20. 1 1
      gkaq/yjpt-java/trunk/resources/iReport/aqsp/zysq-html.jrxml
  21. 1 1
      gkaq/yjpt-java/trunk/resources/iReport/aqsp/zysq.jrxml
  22. BIN
      gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr.jasper
  23. 1439 0
      gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr.jrxml
  24. BIN
      gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_bw.jasper
  25. 18 6
      gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_bw.jrxml
  26. BIN
      gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_cg.jasper
  27. 22 12
      gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_cg.jrxml
  28. BIN
      gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_ck.jasper
  29. 17 7
      gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_ck.jrxml
  30. BIN
      gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_dc.jasper
  31. 22 12
      gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_dc.jrxml
  32. BIN
      gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_fz.jasper
  33. 14 8
      gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_fz.jrxml
  34. BIN
      gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_mt.jasper
  35. 23 6
      gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_mt.jrxml
  36. 1 1
      gkaq/yjpt-java/trunk/resources/spring/application.properties
  37. 0 98
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/Info_1.htm
  38. 0 26
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/Info_2.htm
  39. 0 88
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/Info_3.htm
  40. 0 462
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/default.html
  41. BIN
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/Cylinder.jpg
  42. BIN
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/ball.jpg
  43. BIN
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/img.jpg
  44. BIN
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/jgylogo.png
  45. BIN
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/level.png
  46. BIN
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/pangu.jpg
  47. BIN
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/shuilifang.jpg
  48. BIN
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/vertical.png
  49. BIN
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/whiteCircle.png
  50. 0 1
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/json.txt
  51. 0 4
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/lib_Ajax/MicrosoftAjax.js
  52. 0 0
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/lib_Ajax/SuperMap-7.0.1-11323.js
  53. 0 0
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/lib_Realspace/SuperMap.Web.Realspace.js
  54. 0 97
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/Lang/en.js
  55. 0 164
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/Lang/zh-CN.js
  56. 0 49
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/Scripts/GettingStarted.js
  57. 0 25
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/Scripts/SuperMap.Include.js
  58. 0 1
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/Scripts/jquery.min.js
  59. 0 0
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/SuperMap-8.0.1-13225.js
  60. 0 48
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/SuperMap.Include.js
  61. 0 0
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/SuperMap_Basic-8.0.1-13225.js
  62. 0 0
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/SuperMap_Cloud-8.0.1-13225.js
  63. 0 0
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/SuperMap_IServer-8.0.1-13225.js
  64. 0 0
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/SuperMap_OGC-8.0.1-13225.js
  65. 0 0
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/SuperMap_Visualization-8.0.1-13225.js
  66. 0 4
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/lib_Ajax/MicrosoftAjax.js
  67. 0 0
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/lib_Ajax/SuperMap-7.0.1-11323.js
  68. 0 0
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/lib_Realspace/SuperMap.Web.Realspace.js
  69. 0 2
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/new 13.txt
  70. 0 10
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/noInfo.htm
  71. 0 196
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/test.html
  72. 0 98
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_1.htm
  73. 0 98
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_10.htm
  74. 0 98
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_11.htm
  75. 0 98
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_2.htm
  76. 0 98
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_3.htm
  77. 0 98
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_4.htm
  78. 0 98
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_5.htm
  79. 0 98
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_6.htm
  80. 0 98
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_7.htm
  81. 0 98
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_8.htm
  82. 0 98
      gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_9.htm
  83. 1 1
      gkaq/yjpt-java/trunk/yjpt/iSignature/view/ZysqbpPrintSignature.jsp

+ 11 - 0
gkaq/yjpt-java/trunk/.project

@@ -27,4 +27,15 @@
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1485071182371</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-.svn</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

+ 1 - 1
gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java

@@ -778,7 +778,7 @@ public class ZysqbpController extends BaseController {
 				}
 			}
 		}
-		download(parameters, "危险货物港口作业申请书", report, type,
+		download(parameters, "港口危险货物作业申请书", report, type,
 				new JRBeanCollectionDataSource(dataList), response, request);
 	}
 

+ 13 - 8
gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/zysqbp/ZysqbpDao.java

@@ -161,16 +161,21 @@ public interface ZysqbpDao extends MyRepository<ZysqbpEntity, Long> {
 			String kgsj, String wgsj, String wxwpmc);
 
 	/*** 查询所在地或者全省在某一区间内排行前n的货物的吞吐量 ***/
-	@Query(value = "SELECT C.MC,C.SL,C.BH FROM  "
-			+ "(SELECT T.WPBH MC, SUM(T.ZYSL)  SL ,T.WXHWMCBH BH "
+	@Query(value = "SELECT AA.MC as BH,AA.SL,BB.MCHSM as MC FROM  "
+			+ "(SELECT C.MC,C.SL FROM "
+			+ "	( "
+			+ " SELECT T.WXWPMC MC, SUM(T.ZYSL)  SL "
 			+ " FROM T_YJPT_WXHWGKZYSBD T "
-			+ " WHERE T.ZYDD='10000501' AND  (T.RECORD_STATUS= 2 OR T.RECORD_STATUS=10)  AND T.QXZYSJ IS NULL"
-			+ " AND T.BGSJ > =?2 AND  T.BGSJ <= ?3 " + " AND ( T.SZD like ?1)  AND (T.WXWPMC =?5 OR ?5 IS NULL)"
-			+ " GROUP BY T.WPBH,T.WXHWMCBH ORDER BY SUM(T.ZYSL) DESC ) C "
-			+ " WHERE  ROWNUM <=?4  ORDER BY C.SL DESC ", nativeQuery = true)
-	public List<Object[]> findTopTttlAndbasj(String szd, Date tjsjq,
-			Date tjsjz, int n, String wxwpmc);
+			+ " WHERE T.ZYDD='10000501' AND  (T.RECORD_STATUS= 2 OR T.RECORD_STATUS=10)  AND T.QXZYSJ IS NULL "
+			+ " AND T.BGSJ >=?2 AND T.BGSJ <=?3 AND ( T.SZD like ?1 ) AND (T.WXWPMC =?5 OR ?5 IS NULL) "
+			+ " GROUP BY T.WXWPMC ORDER BY SUM(T.ZYSL) DESC "
+			+ " ) "
+			+ " C "
+			+ " WHERE ROWNUM<=?4 ORDER BY C.SL DESC ) AA LEFT JOIN T_YJPT_WXHWPMB BB ON AA.MC=BB.BH WHERE BB.RECORD_STATUS!=9 order by SL DESC ",
+			nativeQuery = true)
+	public List<Object[]> findTopTttlAndbasj(String szd, Date tjsjq,Date tjsjz, int n, String wxwpmc);
 
+	
 	/*** 查询所在地或者全省在某一区间内排行前n的货物的吞吐量 ***/
 	@Query(value = "SELECT C.MC,NVL(C.SL,0),C.BH FROM  "
 			+ "(SELECT T.WPBH MC, SUM(T.TEU)  SL ,T.WXHWMCBH BH "

+ 1 - 1
gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zysqbp/XksbEntity.java

@@ -4,7 +4,7 @@ import java.util.Date;
 
 
 /**
- * 危险货物港口作业申报许可
+ * 港口危险货物作业申报许可
  */
 public class XksbEntity{
 

+ 1 - 1
gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zysqbp/ZysqbpBgEntity.java

@@ -17,7 +17,7 @@ import com.jtgh.yjpt.entity.BaseEntity;
 
 
 /**
- * 应急平台危险货物港口作业申报单  变更子表
+ * 应急平台港口危险货物作业申报单  变更子表
  * 
  */
 @Entity

+ 1 - 1
gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zysqbp/ZysqbpEntity.java

@@ -27,7 +27,7 @@ import com.jtgh.yjpt.entity.jyr.JyrEntity;
 import com.jtgh.yjpt.entity.zyfzndjy.GkwxhwzyfzblFzEntity;
 
 /**
- * 应急平台危险货物港口作业申报单
+ * 应急平台港口危险货物作业申报单
  * 
  * @author shixm
  */

+ 99 - 37
gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/zysqbp/ZysqbpServiceImpl.java

@@ -13,11 +13,14 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.activiti.engine.task.Task;
 import org.apache.log4j.Logger;
@@ -529,7 +532,7 @@ public class ZysqbpServiceImpl extends
 		List<ZysqbpCountEntity> list = new ArrayList<ZysqbpCountEntity>();
 		// 合计的信息
 		ZysqbpCountEntity hjentity = new ZysqbpCountEntity();
-		if (szd == 0l) {
+		if (szd == 0L) {
 			// 设置全省
 			hjentity.setQymc(Utils.getResource("select", "SZD.JIANGSU"));
 			List<Object[]> hjList = null;
@@ -669,7 +672,7 @@ public class ZysqbpServiceImpl extends
 			list.add(sl40t);
 		}
 		// 全省的
-		if (szd == 0l) {
+		if (szd == 0L) {
 			// 查询合计,就只有一条信息
 			List<Object[]> jdlxList = null;
 			if (ttlOrTeu)
@@ -884,9 +887,7 @@ public class ZysqbpServiceImpl extends
 		return list;
 	}
 
-	public List<ZysqbpCountEntity> findQsNdList(Long szd, int ndName,
-			int jdName, Boolean qnFlag, Boolean qjdFlag, String hzName,
-			Boolean ttlOrTeu) {
+	public List<ZysqbpCountEntity> findQsNdList(Long szd, int ndName,int jdName, Boolean qnFlag, Boolean qjdFlag, String hzName,Boolean ttlOrTeu) {
 		// 根据年度查询出区间的范围
 		Date tjsjq;
 		Date tjsjz;
@@ -906,7 +907,7 @@ public class ZysqbpServiceImpl extends
 		List<ZysqbpCountEntity> list = new ArrayList<ZysqbpCountEntity>();
 		// 合计的信息
 		ZysqbpCountEntity hjentity = new ZysqbpCountEntity();
-		if (szd == 0l) {
+		if (szd == 0L) {
 			// 设置全省
 			hjentity.setQymc(Utils.getResource("select", "SZD.JIANGSU"));
 			List<Object[]> hjList = null;
@@ -945,7 +946,7 @@ public class ZysqbpServiceImpl extends
 		in.setJd1_hwttl("0");
 		out.setJd1_hwttl("0");
 		List<Object[]> hjList = null;
-		if (szd == 0l) {
+		if (szd == 0L) {
 			// 设置全省
 			if (ttlOrTeu)
 				hjList = zysqbpDao.findQsOrSzdInoroutTotalTTl(
@@ -1041,28 +1042,23 @@ public class ZysqbpServiceImpl extends
 			list.add(sl40t);
 		}
 		// 全省的
-		if (szd == 0l) {
+		if (szd == 0L) {
 			// 查询合计,就只有一条信息
 			List<Object[]> jdlxList = null;
 			if (ttlOrTeu)
-				jdlxList = zysqbpDao.findQsbyAndbasj(Constants.SZD_ID_PROVINCE
-						+ "%", tjsjq, tjsjz, hzName);
+				jdlxList = zysqbpDao.findQsbyAndbasj(Constants.SZD_ID_PROVINCE + "%", tjsjq, tjsjz, hzName);
 			else
-				jdlxList = zysqbpDao.findQsbyAndbasjContainer(
-						Constants.SZD_ID_PROVINCE + "%", tjsjq, tjsjz, hzName);
+				jdlxList = zysqbpDao.findQsbyAndbasjContainer(Constants.SZD_ID_PROVINCE + "%", tjsjq, tjsjz, hzName);
 			list = changeToEntity(list, jdlxList, null);
 			// 查询吞吐量前n的货物
 			List<Object[]> ttlList = null;
 			if (ttlOrTeu)
-				ttlList = zysqbpDao.findTopTttlAndbasj(
-						Constants.SZD_ID_PROVINCE + "%", tjsjq, tjsjz, 20,
-						hzName);
+				ttlList = zysqbpDao.findTopTttlAndbasj(Constants.SZD_ID_PROVINCE + "%", tjsjq, tjsjz, 20,hzName);
 			else
-				ttlList = zysqbpDao.findTopAndbasjContainer(
-						Constants.SZD_ID_PROVINCE + "%", tjsjq, tjsjz, 20,
-						hzName);
+				ttlList = zysqbpDao.findTopAndbasjContainer(Constants.SZD_ID_PROVINCE + "%", tjsjq, tjsjz, 20,hzName);
+			
 			if (ttlList.size() > 0) {
-				list.addAll(hwChangetToEntity(ttlList));
+				list.addAll(hwChangetToEntity(GetDistinctObject(ttlList)));
 			}
 			// 17个所在地吞吐量前n的货物
 			// List<CodeEntity> szdList = InitServlet.parentMap.get(new Long(
@@ -1070,11 +1066,9 @@ public class ZysqbpServiceImpl extends
 			// for (CodeEntity entity : szdList) {
 			List<Object[]> szdList = null;
 			if (ttlOrTeu)
-				szdList = zysqbpDao.findSzdOrderByTotalTTl(
-						Constants.SZD_ID_PROVINCE, tjsjq, tjsjz, hzName);
+				szdList = zysqbpDao.findSzdOrderByTotalTTl(Constants.SZD_ID_PROVINCE, tjsjq, tjsjz, hzName);
 			else
-				szdList = zysqbpDao.findSzdOrderByTotalContainer(
-						Constants.SZD_ID_PROVINCE, tjsjq, tjsjz, hzName);
+				szdList = zysqbpDao.findSzdOrderByTotalContainer(Constants.SZD_ID_PROVINCE, tjsjq, tjsjz, hzName);
 			for (Object[] entity : szdList) {
 				// 所在地的合计
 				ZysqbpCountEntity szde1 = new ZysqbpCountEntity();
@@ -1082,11 +1076,9 @@ public class ZysqbpServiceImpl extends
 				// 合计的数量
 				List<Object[]> szdhjList = null;
 				if (ttlOrTeu)
-					szdhjList = zysqbpDao.findQsOrSzdTotalTTl(entity[0] + "%",
-							tjsjq, tjsjz, hzName);
+					szdhjList = zysqbpDao.findQsOrSzdTotalTTl(entity[0] + "%",tjsjq, tjsjz, hzName);
 				else
-					szdhjList = zysqbpDao.findQsOrSzdTotalContainer(entity[0]
-							+ "%", tjsjq, tjsjz, hzName);
+					szdhjList = zysqbpDao.findQsOrSzdTotalContainer(entity[0]+ "%", tjsjq, tjsjz, hzName);
 				szde1.setJd1_dqhz("合计");
 				szde1.setJd1_hwttl(prase(szdhjList.get(0)));
 				list.add(szde1);
@@ -1155,13 +1147,11 @@ public class ZysqbpServiceImpl extends
 				}
 				List<Object[]> szdttlList = null;
 				if (ttlOrTeu)
-					szdttlList = zysqbpDao.findTopTttlAndbasj(entity[0] + "%",
-							tjsjq, tjsjz, 20, hzName);
+					szdttlList = zysqbpDao.findTopTttlAndbasj(entity[0] + "%",tjsjq, tjsjz, 20, hzName);
 				else
-					szdttlList = zysqbpDao.findTopAndbasjContainer(entity[0]
-							+ "%", tjsjq, tjsjz, 20, hzName);
+					szdttlList = zysqbpDao.findTopAndbasjContainer(entity[0]+ "%", tjsjq, tjsjz, 20, hzName);
 				if (szdttlList.size() > 0)
-					list.addAll(hwChangetToEntity(szdttlList));
+					list.addAll(hwChangetToEntity(GetDistinctObject(szdttlList)));
 			}
 		} else {
 			try {
@@ -1177,13 +1167,43 @@ public class ZysqbpServiceImpl extends
 				// 查询吞吐量前n的货物
 				List<Object[]> ttlList = null;
 				if (ttlOrTeu)
-					ttlList = zysqbpDao.findTopTttlAndbasj(szd + "%", tjsjq,
-							tjsjz, 20, hzName);
+					ttlList = zysqbpDao.findTopTttlAndbasj(szd + "%", tjsjq,tjsjz, 20, hzName);
 				else
-					ttlList = zysqbpDao.findTopAndbasjContainer(szd + "%",
-							tjsjq, tjsjz, 20, hzName);
-				if (ttlList.size() > 0)
+					ttlList = zysqbpDao.findTopAndbasjContainer(szd + "%",tjsjq, tjsjz, 20, hzName);
+				if (ttlList.size() > 0){
+					//货种吞吐量统计中,“危险货物品名录管理”中的重复的货种,其系统编号一样,其他会有不一样的,
+					//此处根据系统编号做去重处理
+					Map<String,Object> tempMap = new HashMap<String,Object>();
+					for(Object[] obj:ttlList){
+						tempMap.put(String.valueOf(obj[0]==null?"":obj[0]), obj);//使用hashmap key的唯一性去重
+					}
+					ttlList = new ArrayList<Object[]>();
+					Iterator<Entry<String, Object>> entries = tempMap.entrySet().iterator();
+					while (entries.hasNext()) {  
+						Entry<String, Object> entry = entries.next();  
+						//Map.Entry entry = entries.next();  
+					    //Integer key = (Integer)entry.getKey();  
+					    Object[] value = (Object[])entry.getValue();  
+					    ttlList.add(value);
+					}
+					//ttlList排序,根据吞吐量吨数
+					//排序
+			        Collections.sort(ttlList,new Comparator<Object[]>(){
+			        	@Override
+			            public int compare(Object[] obj1, Object[] obj2) {
+			                //比较每个ArrayList的第二个元素
+			                if(Double.parseDouble(String.valueOf(obj1[1]))==Double.parseDouble(String.valueOf(obj2[1]))){
+			                    return 0;
+			                }else if(Double.parseDouble(String.valueOf(obj1[1]))>Double.parseDouble(String.valueOf(obj2[1]))){
+			                    return -1;
+			                }else{
+			                    return 1;
+			                }
+			            }
+			        });
+					
 					list.addAll(hwChangetToEntity(ttlList));
+				}
 				// List<JyrEntity> jyrList = jyrDao.findBySzdAndRecordStatusNot(
 				// codeDao.findOne(szd).getId() + "%",
 				// BaseEntity.RECORD_STATE_DELETE);
@@ -1293,6 +1313,46 @@ public class ZysqbpServiceImpl extends
 		}
 		return list;
 	}
+	
+	/**
+	 *  用于处理吞吐量list返回值的函数,根据货种编号,有重复的统计
+	 * @param list
+	 * @return
+	 */
+	List<Object[]> GetDistinctObject(List<Object[]> ttlList){
+		//货种吞吐量统计中,“危险货物品名录管理”中的重复的货种,其系统编号一样,其他会有不一样的,
+		//此处根据系统编号做去重处理
+		Map<String,Object> tempMap = new HashMap<String,Object>();
+		for(Object[] obj:ttlList){
+			tempMap.put(String.valueOf(obj[0]==null?"":obj[0]), obj);//使用hashmap key的唯一性去重
+		}
+		ttlList = new ArrayList<Object[]>();
+		Iterator<Entry<String, Object>> entries = tempMap.entrySet().iterator();
+		while (entries.hasNext()) {  
+			Entry<String, Object> entry = entries.next();  
+			//Map.Entry entry = entries.next();  
+		    //Integer key = (Integer)entry.getKey();  
+		    Object[] value = (Object[])entry.getValue();  
+		    ttlList.add(value);
+		}
+		//ttlList排序,根据吞吐量吨数
+		//排序
+        Collections.sort(ttlList,new Comparator<Object[]>(){
+        	@Override
+            public int compare(Object[] obj1, Object[] obj2) {
+                //比较每个ArrayList的第二个元素
+                if(Double.parseDouble(String.valueOf(obj1[1]))==Double.parseDouble(String.valueOf(obj2[1]))){
+                    return 0;
+                }else if(Double.parseDouble(String.valueOf(obj1[1]))>Double.parseDouble(String.valueOf(obj2[1]))){
+                    return -1;
+                }else{
+                    return 1;
+                }
+            }
+        });
+        return ttlList;
+	}
+	
 
 	/**
 	 * 得到本季度最后一天的日期
@@ -1444,6 +1504,8 @@ public class ZysqbpServiceImpl extends
 				list.add(e);
 			}
 		}
+		
+		
 		return list;
 	}
 

BIN
gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq.jasper


+ 1 - 1
gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq.jrxml

@@ -50,7 +50,7 @@
 				<textElement textAlignment="Center">
 					<font fontName="宋体" size="30" isBold="true"/>
 				</textElement>
-				<text><![CDATA[危险货物港口作业附证申请表]]></text>
+				<text><![CDATA[港口危险货物作业附证申请表]]></text>
 			</staticText>
 			<textField>
 				<reportElement x="43" y="0" width="169" height="20" uuid="8f352d5e-71f9-4769-a3a4-9120694a70ba"/>

BIN
gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport1.jasper


+ 1 - 1
gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport2-html.jrxml

@@ -90,7 +90,7 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="14" isBold="true"/>
 					</textElement>
-					<text><![CDATA[危险货物港口作业申请]]></text>
+					<text><![CDATA[港口危险货物作业申请]]></text>
 				</staticText>
 				<staticText>
 					<reportElement x="0" y="102" width="117" height="30" uuid="8a9d62d9-9374-44fa-bc71-b02303b48b24"/>

BIN
gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport2.jasper


+ 1 - 1
gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport2.jrxml

@@ -89,7 +89,7 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="14" isBold="true"/>
 					</textElement>
-					<text><![CDATA[危险货物港口作业申请]]></text>
+					<text><![CDATA[港口危险货物作业申请]]></text>
 				</staticText>
 				<staticText>
 					<reportElement x="0" y="102" width="117" height="30" uuid="8a9d62d9-9374-44fa-bc71-b02303b48b24"/>

BIN
gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport3.jasper


BIN
gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport4.jasper


BIN
gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport5.jasper


BIN
gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport6.jasper


BIN
gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport7.jasper


BIN
gkaq/yjpt-java/trunk/resources/iReport/aqsp/wxhwzysq_subreport8.jasper


+ 1 - 1
gkaq/yjpt-java/trunk/resources/iReport/aqsp/zysq-html.jrxml

@@ -471,7 +471,7 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="20" isBold="true" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
 				</textElement>
-				<text><![CDATA[危险货物港口作业申请书]]></text>
+				<text><![CDATA[港口危险货物作业申请书]]></text>
 			</staticText>
 			<staticText>
 				<reportElement stretchType="RelativeToTallestObject" x="0" y="33" width="70" height="23" uuid="4c6339ab-97eb-4106-b68e-80e2b5e244ca"/>

+ 1 - 1
gkaq/yjpt-java/trunk/resources/iReport/aqsp/zysq.jrxml

@@ -468,7 +468,7 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="20" isBold="true" pdfEncoding="Cp1252" isPdfEmbedded="true"/>
 				</textElement>
-				<text><![CDATA[危险货物港口作业申请书]]></text>
+				<text><![CDATA[港口危险货物作业申请书]]></text>
 			</staticText>
 			<staticText>
 				<reportElement x="0" y="33" width="53" height="23" uuid="4c6339ab-97eb-4106-b68e-80e2b5e244ca"/>

BIN
gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr.jasper


+ 1439 - 0
gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr.jrxml

@@ -0,0 +1,1439 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr" language="groovy" pageWidth="595" pageHeight="1000" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="7a1af753-6b2b-48d3-b76d-11716729aeab">
+	<property name="ireport.zoom" value="0.9090909090909113"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="364"/>
+	<property name="ireport.callouts" value="##Fri Jan 13 20:12:47 CST 2017"/>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
+		<defaultValueExpression><![CDATA["G:\\workplace\\yjpt-ireport\\"]]></defaultValueExpression>
+	</parameter>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="bwList" class="java.util.List">
+		<fieldDescription><![CDATA[bwList]]></fieldDescription>
+	</field>
+	<field name="cgList" class="java.util.List">
+		<fieldDescription><![CDATA[cgList]]></fieldDescription>
+	</field>
+	<field name="ckList" class="java.util.List">
+		<fieldDescription><![CDATA[ckList]]></fieldDescription>
+	</field>
+	<field name="class" class="java.lang.Class">
+		<fieldDescription><![CDATA[class]]></fieldDescription>
+	</field>
+	<field name="dcList" class="java.util.List">
+		<fieldDescription><![CDATA[dcList]]></fieldDescription>
+	</field>
+	<field name="fzList" class="java.util.List">
+		<fieldDescription><![CDATA[fzList]]></fieldDescription>
+	</field>
+	<field name="jyr" class="com.jtgh.yjpt.entity.jyr.JyrEntity">
+		<fieldDescription><![CDATA[jyr]]></fieldDescription>
+	</field>
+	<field name="mtList" class="java.util.List">
+		<fieldDescription><![CDATA[mtList]]></fieldDescription>
+	</field>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="50" splitType="Stretch">
+			<staticText>
+				<reportElement x="18" y="0" width="519" height="50" uuid="4237d389-9e85-45e9-b184-77778b375d2d"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="24" isBold="true"/>
+				</textElement>
+				<text><![CDATA[经营人基础信息]]></text>
+			</staticText>
+		</band>
+	</title>
+	<detail>
+		<band height="880" splitType="Immediate">
+			<subreport isUsingCache="false">
+				<reportElement positionType="Float" x="0" y="612" width="548" height="40" uuid="3a6f6d91-20b4-4e3f-9a2e-015c4a097808"/>
+				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{fzList})]]></dataSourceExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "jyr_fz.jasper"]]></subreportExpression>
+			</subreport>
+			<subreport isUsingCache="false">
+				<reportElement positionType="Float" x="0" y="652" width="548" height="40" uuid="2ebbc611-904a-4df6-b6f6-d2e6ffedfb75"/>
+				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{bwList})]]></dataSourceExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "jyr_bw.jasper"]]></subreportExpression>
+			</subreport>
+			<subreport isUsingCache="false">
+				<reportElement positionType="Float" x="0" y="692" width="548" height="40" uuid="92a3a441-09e2-4300-bb1f-030823a16845"/>
+				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{dcList})]]></dataSourceExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "jyr_dc.jasper"]]></subreportExpression>
+			</subreport>
+			<subreport isUsingCache="false">
+				<reportElement positionType="Float" x="0" y="732" width="548" height="40" uuid="6822fd28-a1da-45ed-89e1-195bb929f136"/>
+				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{ckList})]]></dataSourceExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "jyr_ck.jasper"]]></subreportExpression>
+			</subreport>
+			<subreport isUsingCache="false">
+				<reportElement positionType="Float" x="0" y="772" width="548" height="40" uuid="9389fdb3-a977-4735-9167-2e44a7817169"/>
+				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{cgList})]]></dataSourceExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "jyr_cg.jasper"]]></subreportExpression>
+			</subreport>
+			<subreport isUsingCache="false">
+				<reportElement positionType="Float" x="0" y="812" width="548" height="40" uuid="1c8ff2c6-6b4c-4acc-8fac-ae75b5a209e5"/>
+				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{mtList})]]></dataSourceExpression>
+				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "jyr_mt.jasper"]]></subreportExpression>
+			</subreport>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="0" width="107" height="20" uuid="0182edd3-8cde-45d7-b7b7-42ac3166f833"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[所在港区]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="382" y="0" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="1ee5b6d5-d52b-401a-a5e2-a18cb4f63a30"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getSzgq().getGqmc()]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="0" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="72b88f78-c54f-465b-9b1b-cdb9f0191044"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[com.yjpt.util.PropReader.getProperty($F{jyr}.getSzd().getName())]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="0" width="102" height="20" uuid="d35be443-d00e-4341-9cf9-d428ac3da8aa"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[所在地]]></text>
+				</staticText>
+			</elementGroup>
+			<elementGroup>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="20" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="cee31547-4af1-4151-88c6-9ffefc81aa98"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getQylx()=="1"?"沿海港口企业":($F{jyr}.getQylx()=="2"?"内河港口企业":($F{jyr}.getQylx()=="3"?"沿江港口企业":""))]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="20" width="107" height="20" uuid="472b7a4a-1c0a-435d-be31-eaa89fe541e6"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[港口经营人]]></text>
+				</staticText>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="20" width="102" height="20" uuid="53be5abb-0c6f-43e6-a8a0-265394399f62"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[企业类型]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="382" y="20" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="16000710-a42b-4886-b523-2df4e2565d6f"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getGkjyr()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="40" width="107" height="20" uuid="a7ee3c43-a02a-4689-af7d-c021a340b0da"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[港口经营许可证编号]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="382" y="40" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="6ab6919e-5a95-423f-969b-d04f5ca8defc"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getGkjyxkzh()]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="40" width="102" height="20" uuid="bf55cb24-9942-4b30-8a68-9d81ad804d2f"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[邮政编码]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="40" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="05cbe23f-f84a-49f5-b1dd-481ee6321d2a"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getYzbm()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="60" width="102" height="20" uuid="275f7e47-173d-4deb-84e0-05dad978b451"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[类别]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="60" width="417" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="5a55f929-8321-4e42-b4af-4ec904181b73"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getByzd1()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="80" width="102" height="20" uuid="4ad85921-ed86-4729-bb54-036caa23c865"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[办公地址]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="80" width="417" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="f2d4a245-d6b0-4b64-b060-7d3051107b83"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getBgdz()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="100" width="125" height="20" uuid="2d1afc90-fde3-453e-ba50-871bbde55385"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[有效期]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" pattern="yyyy-MM-dd" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="100" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="9446cf48-79f2-4a3b-b222-62112a4c3f1c"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getBafzrq()]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="100" width="102" height="20" uuid="a7a065cf-222e-4cda-a497-4e9a7ff7d7cb"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[发证日期]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" pattern="yyyy-MM-dd" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="100" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="5006f65e-b9b7-4090-af52-3a72b37f01e4"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getFzrq()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="120" width="125" height="20" uuid="56f6e33b-47f8-458e-9b2b-7b781e7c448e"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="120" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="86cebd9f-0a79-40db-b7f5-6b68febc7154"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="120" width="102" height="20" uuid="0e610cdd-74b5-4023-a824-4ebeae754e9a"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[发证机关]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="120" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="578de47a-a981-479e-9e20-56ae1dd420fa"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getFzjg()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="140" width="102" height="20" uuid="cfb56f14-4d5e-4405-87c9-129eef4b820a"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[经营范围]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="140" width="417" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="18da740f-7065-4a92-a166-f4497afa7da5"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getJyfw()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="160" width="102" height="20" uuid="e24cb324-fa1f-40ed-af29-ea450aeadded"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[经营区域]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="160" width="417" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="dbe5e304-36fb-41aa-9c11-768b6e9dd67a"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getJyqy()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="180" width="102" height="20" uuid="665e2b55-aa39-47e6-a88d-df8f7c42a7dc"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[主营货种]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="180" width="417" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="e731e296-a6e6-4871-a8fd-987ccb8bdbad"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getZyhz()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="200" width="125" height="20" uuid="c383f895-5df0-49d9-9570-c6f25925c8e5"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[联系电话(法定代表人)]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="200" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="2fef613f-373f-4d03-a328-324aae13fd22"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getLxdh()]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="200" width="102" height="20" uuid="4ae7b03e-f8da-4924-8ae9-81943b579151"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[法定代表人]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="200" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="19217b86-283d-4b57-8267-d411105ddb82"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getFddbr()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="220" width="125" height="20" uuid="ae0799e2-9231-4a37-8fe7-173adf414991"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[安全部门负责人]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="220" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="bdcbf8a3-4e2d-4a84-bf9a-437b2ab91b8a"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getAqbmfzr()]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="220" width="102" height="20" uuid="f787f4d3-d428-4d8d-8ecc-cb0cf01838d1"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[传真(法定代表人)]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="220" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="070c5bc1-3541-4f55-b72a-c843b19314f3"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getCz()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="240" width="125" height="20" uuid="6d4a1bf5-e7db-44a7-b8d8-3270acac718e"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[手机(安全部门)]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="240" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="a3f18724-e792-4c46-88a5-1184c7f7d7c2"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getAqfzrsj()]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="240" width="102" height="20" uuid="cf741867-e4f7-43ce-b311-7ed2e9e268ca"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[联系电话(安全部门)]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="240" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="ee959855-e57b-4dbd-b480-9d24c2800423"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getAqfzrlxdh()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="260" width="125" height="20" uuid="c28e56e1-ef3d-46bb-8bbf-bf7964734879"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[安全主管部门]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="260" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="4970a8bf-d379-481a-82ba-86e8897f2df5"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getAqzgbm()]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="260" width="102" height="20" uuid="ca6a1ec0-76c4-4c9c-ae83-e83d6c7f535a"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[安全负责人值班电话]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="260" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="eb860946-9f28-438b-ba70-e7eeb2b96dd0"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getAqfzrzbdh()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="280" width="125" height="20" uuid="22836601-dfcf-4c2f-b620-c677633f2be4"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[专职安管人员数量]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="280" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="a05fce90-28e4-4836-8bbd-2ae71ac2637e"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getZzagrysl()]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="280" width="102" height="20" uuid="13c524bb-9d0a-43db-ba48-37610a6e4e4b"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[安全管理机构]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="280" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="36e5a73a-11c2-4772-9650-292482ff2b72"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getAqgljg()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="300" width="125" height="20" uuid="39a0e4f8-7c2e-4214-a7ba-18e1a98ab755"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[销售金额]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="300" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="dd183655-542c-4552-b6f4-460da6bf743d"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getXsje()]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="300" width="102" height="20" uuid="9a946801-d531-4706-8755-d3fb577aac0f"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[资产总额]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="300" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="42c0df4c-ee47-4f88-a075-6b13e7e69627"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getZcze()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="320" width="125" height="20" uuid="65ba3abc-61cf-4b57-82ed-bacd02d46331"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[投资总额(万元)]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="320" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="3ae54620-9928-40f8-b74d-13b47ee558b4"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getTzze()]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="320" width="102" height="20" uuid="a300379d-d082-4efa-bf55-4a3ebe9eb72e"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[工商营业执照编号]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="320" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="b1f896b2-df71-4cf4-b285-1c4bf5f18155"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getGsyyzzbh()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="340" width="125" height="20" uuid="9dc42087-30eb-4b0c-886b-46090d966e09"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[企业组织机构代码]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="340" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="6af0caa2-4c97-40b6-851e-3fc98b97738b"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getQyzzjgdm()]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="340" width="102" height="20" uuid="92914956-4265-4afe-83cc-c358d935a4cf"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[注册资本(万元)]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="340" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="54ae114e-1b7e-4b56-b0f8-4e4301c1406a"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getZczb()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="360" width="125" height="20" uuid="516af134-bca4-4738-9e63-74c38f848569"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[所属行业中类]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="360" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="f545f7d7-9a49-4183-b11d-072628586448"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[com.yjpt.util.PropReader.getProperty($F{jyr}.getSshyz().getName())]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="360" width="102" height="20" uuid="65e4bad0-c7f6-4110-84ac-5d001a5ef551"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[所属行业大类]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="360" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="396e2c99-9d7d-42b0-bd7a-a9b6b443154f"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[com.yjpt.util.PropReader.getProperty($F{jyr}.getSshydl().getName())]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="380" width="125" height="20" uuid="54f6f243-bb60-4c5c-ab70-d947c2241e8d"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[人数]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="380" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="7fb792a4-e34f-49f3-8c6b-098474ed1180"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getRs()]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="380" width="102" height="20" uuid="6f72855c-ed36-449a-810e-f03a867bdfd3"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[企业安全等级]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="380" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="2202dae2-b88c-4ba7-9642-167438f33398"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getQyaqdj()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="400" width="125" height="20" uuid="b28cfa5a-3b21-4548-b354-1dbb541827a8"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="400" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="d5a79401-5c86-40ac-820c-701cec611f94"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="400" width="102" height="20" uuid="746eb989-614e-4d0a-9fb5-e7b690e4f410"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[是否危货企业]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="400" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="bb290ed9-3519-41a2-a48b-3b6a2a56e896"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getSfwhqy()=="Y"?"是(无重大危险源)":($F{jyr}.getSfwhqy()=="W"?"是(有重大危险源)":($F{jyr}.getSfwhqy()=="N"?"否":""))]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="420" width="102" height="30" uuid="8a331fb9-7f9d-4b0e-bf0c-fbcc72ee04e0"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[港口危险货物作业附证编号]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="420" width="417" height="30" forecolor="#000000" backcolor="#FFFFFF" uuid="12b70078-3e00-4d77-860e-0f7c6da1ec4f"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getGkwxhwzyfzbh()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="450" width="125" height="20" uuid="1bf49233-bd98-42ef-9857-3d005722059b"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="450" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="e12a522c-e074-4f0d-9377-fedd186eabe7"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="450" width="102" height="20" uuid="0100fb63-cf26-425b-a818-a7840721c65b"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[有效期]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" pattern="yyyy-MM-dd" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="450" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="c90305dd-3ed5-44de-b009-5738b78c5e3c"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getFzyxq()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="470" width="125" height="30" uuid="cb1d03e1-a6a7-4315-bc92-341a7616bad5"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[有效期]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" pattern="yyyy-MM-dd" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="470" width="137" height="30" forecolor="#000000" backcolor="#FFFFFF" uuid="60db7124-da38-4693-9a0e-ac02999f1285"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getBayxq()]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="470" width="102" height="30" uuid="93b55073-59c4-4098-b175-5e0deefd7b9c"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[港口设施保安符合证书编号]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="470" width="155" height="30" forecolor="#000000" backcolor="#FFFFFF" uuid="cc4c02b1-b0be-4a35-a3cf-e2454e66d28e"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getGkssbafhzsbh()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="275" y="500" width="125" height="20" uuid="2888a30c-a365-4d02-98c7-f23646014286"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="400" y="500" width="137" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="35ef4f13-258e-4133-9417-d2b9dc7d5ff4"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+				</textField>
+				<staticText>
+					<reportElement stretchType="RelativeToTallestObject" x="18" y="500" width="102" height="20" uuid="3e140409-019f-46f3-95fc-3490ab4dc851"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement verticalAlignment="Middle">
+						<font fontName="宋体" size="10" isBold="true"/>
+					</textElement>
+					<text><![CDATA[发证机构]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="120" y="500" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="60a65edf-a162-4f33-8633-c116b27efa35"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getBafzjg()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+			<elementGroup>
+				<staticText>
+					<reportElement mode="Transparent" x="18" y="520" width="519" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="7063ef1a-ac6f-4490-91e1-c7191f24e9b1"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="宋体" size="10" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<text><![CDATA[作业危险货物品名]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement stretchType="RelativeToTallestObject" mode="Transparent" x="18" y="540" width="519" height="40" forecolor="#000000" backcolor="#FFFFFF" uuid="8277c253-f704-418b-942b-592a95b846d3"/>
+					<box leftPadding="5">
+						<pen lineWidth="0.5"/>
+						<topPen lineWidth="0.5"/>
+						<leftPen lineWidth="0.5"/>
+						<bottomPen lineWidth="0.5"/>
+						<rightPen lineWidth="0.5"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+						<font fontName="Serif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{jyr}.getZywxhwpm()]]></textFieldExpression>
+				</textField>
+			</elementGroup>
+		</band>
+	</detail>
+</jasperReport>

BIN
gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_bw.jasper


+ 18 - 6
gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_bw.jrxml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_bw" language="groovy" pageWidth="547" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="547" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a7ed9b62-0a29-4144-ab6f-42ef25fff83d">
-	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.zoom" value="1.1000000000000005"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<queryString>
@@ -153,7 +153,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="547" height="30" uuid="17f707f3-dea6-4508-b329-01370893e24c"/>
+				<reportElement x="18" y="0" width="511" height="30" uuid="17f707f3-dea6-4508-b329-01370893e24c"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="18" isBold="true"/>
 				</textElement>
@@ -164,8 +164,9 @@
 	<columnHeader>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="80" height="20" uuid="6295e3a7-97d6-4d34-9332-c6ad926add85"/>
+				<reportElement x="18" y="0" width="62" height="20" uuid="6295e3a7-97d6-4d34-9332-c6ad926add85"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -179,6 +180,7 @@
 			<staticText>
 				<reportElement x="80" y="0" width="95" height="20" uuid="97e8ab70-e6ad-40df-8c49-77c0f9479511"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -192,6 +194,7 @@
 			<staticText>
 				<reportElement x="175" y="0" width="102" height="20" isPrintWhenDetailOverflows="true" uuid="217e1d8f-74dd-4187-8580-d4ee68b13714"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -205,6 +208,7 @@
 			<staticText>
 				<reportElement x="277" y="0" width="105" height="20" isPrintWhenDetailOverflows="true" uuid="5b5e7afe-c029-455f-b4de-9e2551a315ca"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -218,6 +222,7 @@
 			<staticText>
 				<reportElement x="382" y="0" width="75" height="20" isPrintWhenDetailOverflows="true" uuid="cbf4b5a0-385c-4484-9917-615fcd2d671a"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -229,8 +234,9 @@
 				<text><![CDATA[泊位长度(米)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="457" y="0" width="90" height="20" uuid="65480d93-a1f2-4c0e-9b43-4d4ec7d7330a"/>
+				<reportElement x="457" y="0" width="72" height="20" uuid="65480d93-a1f2-4c0e-9b43-4d4ec7d7330a"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -246,8 +252,9 @@
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="f4f52e11-20a8-44f4-b10b-d9a054ad90cb"/>
+				<reportElement stretchType="RelativeToTallestObject" x="18" y="0" width="62" height="20" isPrintWhenDetailOverflows="true" uuid="f4f52e11-20a8-44f4-b10b-d9a054ad90cb"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -261,6 +268,7 @@
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="80" y="0" width="95" height="20" isPrintWhenDetailOverflows="true" uuid="9ad5613f-3b26-47c0-9c21-2d694aa8d202"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -274,6 +282,7 @@
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="175" y="0" width="102" height="20" isPrintWhenDetailOverflows="true" uuid="0f26a0b6-6d2c-4673-951d-ac315f13f13a"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -287,6 +296,7 @@
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="277" y="0" width="105" height="20" isPrintWhenDetailOverflows="true" uuid="9443f6dc-7e69-4bba-8309-30c8f75db011"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -300,6 +310,7 @@
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="382" y="0" width="75" height="20" isPrintWhenDetailOverflows="true" uuid="466769af-7ad5-422e-a2e7-19e4b2e806b6"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -311,8 +322,9 @@
 				<textFieldExpression><![CDATA[$F{bwcd}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="457" y="0" width="90" height="20" isPrintWhenDetailOverflows="true" uuid="fbd79eb0-6ec0-410b-99f2-9e38b56ef86d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="457" y="0" width="72" height="20" isPrintWhenDetailOverflows="true" uuid="fbd79eb0-6ec0-410b-99f2-9e38b56ef86d"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>

BIN
gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_cg.jasper


+ 22 - 12
gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_cg.jrxml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_dc" language="groovy" pageWidth="547" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="547" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="cdd1edfc-a777-414a-986f-f804e59bac63">
-	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.zoom" value="1.0000000000000004"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<queryString>
@@ -231,7 +231,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="547" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
+				<reportElement x="18" y="0" width="511" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="18" isBold="true"/>
 				</textElement>
@@ -242,8 +242,9 @@
 	<columnHeader>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="124" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
+				<reportElement x="18" y="0" width="87" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -255,8 +256,9 @@
 				<text><![CDATA[储罐名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="124" y="0" width="140" height="20" uuid="2c1f753e-d8a9-4f82-90ad-310230b9e85f"/>
+				<reportElement x="105" y="0" width="76" height="20" uuid="2c1f753e-d8a9-4f82-90ad-310230b9e85f"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -268,8 +270,9 @@
 				<text><![CDATA[储罐区名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="264" y="0" width="110" height="20" uuid="287cb03a-8ed9-4049-bc49-36709bba47bc"/>
+				<reportElement x="181" y="0" width="110" height="20" uuid="287cb03a-8ed9-4049-bc49-36709bba47bc"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -281,8 +284,9 @@
 				<text><![CDATA[储罐区面积(平方米)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="374" y="0" width="60" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
+				<reportElement x="291" y="0" width="72" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -294,8 +298,9 @@
 				<text><![CDATA[储罐个数]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="434" y="0" width="112" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
+				<reportElement x="363" y="0" width="166" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -311,8 +316,9 @@
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="124" height="20" isPrintWhenDetailOverflows="true" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
+				<reportElement stretchType="RelativeToTallestObject" x="18" y="0" width="87" height="20" isPrintWhenDetailOverflows="true" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -324,8 +330,9 @@
 				<textFieldExpression><![CDATA[$F{cgmc}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="124" y="0" width="140" height="20" isPrintWhenDetailOverflows="true" uuid="05332ab5-481b-49c3-9555-7fd57c7e143f"/>
+				<reportElement stretchType="RelativeToTallestObject" x="105" y="0" width="76" height="20" isPrintWhenDetailOverflows="true" uuid="05332ab5-481b-49c3-9555-7fd57c7e143f"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -337,8 +344,9 @@
 				<textFieldExpression><![CDATA[$F{cgqmc}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="264" y="0" width="110" height="20" isPrintWhenDetailOverflows="true" uuid="fb8d441f-37f9-4e2a-9870-892245877ae9"/>
+				<reportElement stretchType="RelativeToTallestObject" x="181" y="0" width="110" height="20" isPrintWhenDetailOverflows="true" uuid="fb8d441f-37f9-4e2a-9870-892245877ae9"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -350,8 +358,9 @@
 				<textFieldExpression><![CDATA[$F{cgqmj}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="374" y="0" width="60" height="20" isPrintWhenDetailOverflows="true" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
+				<reportElement stretchType="RelativeToTallestObject" x="291" y="0" width="72" height="20" isPrintWhenDetailOverflows="true" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -363,8 +372,9 @@
 				<textFieldExpression><![CDATA[$F{cggs}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="434" y="0" width="112" height="20" isPrintWhenDetailOverflows="true" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="363" y="0" width="166" height="20" isPrintWhenDetailOverflows="true" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>

BIN
gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_ck.jasper


+ 17 - 7
gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_ck.jrxml

@@ -123,7 +123,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="547" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
+				<reportElement x="18" y="0" width="511" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="18" isBold="true"/>
 				</textElement>
@@ -134,8 +134,9 @@
 	<columnHeader>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="125" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
+				<reportElement x="18" y="0" width="107" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -149,6 +150,7 @@
 			<staticText>
 				<reportElement x="125" y="0" width="80" height="20" uuid="2c1f753e-d8a9-4f82-90ad-310230b9e85f"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -162,6 +164,7 @@
 			<staticText>
 				<reportElement x="205" y="0" width="166" height="20" uuid="287cb03a-8ed9-4049-bc49-36709bba47bc"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -173,8 +176,9 @@
 				<text><![CDATA[仓库用途]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="371" y="0" width="87" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
+				<reportElement x="371" y="0" width="74" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -186,8 +190,9 @@
 				<text><![CDATA[仓库面积]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="458" y="0" width="88" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
+				<reportElement x="445" y="0" width="84" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -203,8 +208,9 @@
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="125" height="20" isPrintWhenDetailOverflows="true" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
+				<reportElement stretchType="RelativeToTallestObject" x="18" y="0" width="107" height="20" isPrintWhenDetailOverflows="true" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -218,6 +224,7 @@
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="125" y="0" width="80" height="20" isPrintWhenDetailOverflows="true" uuid="05332ab5-481b-49c3-9555-7fd57c7e143f"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -231,6 +238,7 @@
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="205" y="0" width="166" height="20" isPrintWhenDetailOverflows="true" uuid="fb8d441f-37f9-4e2a-9870-892245877ae9"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -242,8 +250,9 @@
 				<textFieldExpression><![CDATA[$F{zwckyt}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="371" y="0" width="87" height="20" isPrintWhenDetailOverflows="true" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
+				<reportElement stretchType="RelativeToTallestObject" x="371" y="0" width="74" height="20" isPrintWhenDetailOverflows="true" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -255,8 +264,9 @@
 				<textFieldExpression><![CDATA[$F{scyckmj}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="458" y="0" width="88" height="20" isPrintWhenDetailOverflows="true" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="445" y="0" width="84" height="20" isPrintWhenDetailOverflows="true" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>

BIN
gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_dc.jasper


+ 22 - 12
gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_dc.jrxml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_dc" language="groovy" pageWidth="547" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="547" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="cdd1edfc-a777-414a-986f-f804e59bac63">
-	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.zoom" value="1.1000000000000005"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<queryString>
@@ -117,7 +117,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="547" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
+				<reportElement x="18" y="0" width="511" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="18" isBold="true"/>
 				</textElement>
@@ -128,8 +128,9 @@
 	<columnHeader>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="116" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
+				<reportElement x="18" y="0" width="98" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -141,8 +142,9 @@
 				<text><![CDATA[堆场名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="116" y="0" width="141" height="20" uuid="2c1f753e-d8a9-4f82-90ad-310230b9e85f"/>
+				<reportElement x="116" y="0" width="140" height="20" uuid="2c1f753e-d8a9-4f82-90ad-310230b9e85f"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -154,8 +156,9 @@
 				<text><![CDATA[主要用途]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="257" y="0" width="110" height="20" uuid="287cb03a-8ed9-4049-bc49-36709bba47bc"/>
+				<reportElement x="256" y="0" width="110" height="20" uuid="287cb03a-8ed9-4049-bc49-36709bba47bc"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -167,8 +170,9 @@
 				<text><![CDATA[堆场总面积(平方米)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="367" y="0" width="90" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
+				<reportElement x="366" y="0" width="90" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -180,8 +184,9 @@
 				<text><![CDATA[堆场总容量(吨)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="457" y="0" width="90" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
+				<reportElement x="456" y="0" width="73" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -197,8 +202,9 @@
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="116" height="20" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
+				<reportElement stretchType="RelativeToTallestObject" x="18" y="0" width="98" height="20" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -210,8 +216,9 @@
 				<textFieldExpression><![CDATA[$F{dcmc}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="116" y="0" width="141" height="20" uuid="05332ab5-481b-49c3-9555-7fd57c7e143f"/>
+				<reportElement stretchType="RelativeToTallestObject" x="116" y="0" width="140" height="20" uuid="05332ab5-481b-49c3-9555-7fd57c7e143f"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -223,8 +230,9 @@
 				<textFieldExpression><![CDATA[$F{zwdcyt}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="257" y="0" width="110" height="20" uuid="fb8d441f-37f9-4e2a-9870-892245877ae9"/>
+				<reportElement stretchType="RelativeToTallestObject" x="256" y="0" width="110" height="20" uuid="fb8d441f-37f9-4e2a-9870-892245877ae9"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -236,8 +244,9 @@
 				<textFieldExpression><![CDATA[$F{dczmj}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="457" y="0" width="90" height="20" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="456" y="0" width="73" height="20" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -249,8 +258,9 @@
 				<textFieldExpression><![CDATA[$F{wxpdc}=="Y"?"是":"否"]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="367" y="0" width="90" height="20" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
+				<reportElement stretchType="RelativeToTallestObject" x="366" y="0" width="90" height="20" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>

BIN
gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_fz.jasper


+ 14 - 8
gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_fz.jrxml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="jyr_fz" language="groovy" pageWidth="547" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="547" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f8ec6a28-d893-4aa5-b476-1bc970e2811e">
-	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.zoom" value="1.331000000000001"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<queryString>
@@ -93,7 +93,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="547" height="30" uuid="aae536b5-7143-4b68-b04a-119e2f7be77b"/>
+				<reportElement x="18" y="0" width="511" height="30" uuid="aae536b5-7143-4b68-b04a-119e2f7be77b"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="18" isBold="true"/>
 				</textElement>
@@ -104,8 +104,9 @@
 	<columnHeader>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement x="170" y="0" width="222" height="20" uuid="33e0c774-a8a1-4172-8f74-6b36546d084c"/>
+				<reportElement x="148" y="0" width="230" height="20" uuid="33e0c774-a8a1-4172-8f74-6b36546d084c"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -117,8 +118,9 @@
 				<text><![CDATA[附证编号]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Transparent" x="0" y="0" width="170" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="1f2295f1-76d4-4432-b710-bcf5f40a8a42"/>
+				<reportElement mode="Transparent" x="18" y="0" width="130" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="1f2295f1-76d4-4432-b710-bcf5f40a8a42"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -131,8 +133,9 @@
 				<text><![CDATA[作业地点]]></text>
 			</staticText>
 			<staticText>
-				<reportElement mode="Transparent" x="392" y="0" width="155" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="c0934221-c942-4302-954d-d18f6983351e"/>
+				<reportElement mode="Transparent" x="378" y="0" width="151" height="20" forecolor="#000000" backcolor="#FFFFFF" uuid="c0934221-c942-4302-954d-d18f6983351e"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -149,8 +152,9 @@
 	<detail>
 		<band height="20" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="170" y="0" width="222" height="20" isPrintWhenDetailOverflows="true" uuid="8f2e2f73-94c1-4fd7-963b-5d51dbf3b45f"/>
+				<reportElement stretchType="RelativeToTallestObject" x="148" y="0" width="230" height="20" isPrintWhenDetailOverflows="true" uuid="8f2e2f73-94c1-4fd7-963b-5d51dbf3b45f"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -162,8 +166,9 @@
 				<textFieldExpression><![CDATA[$F{fzcsbh}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="170" height="20" isPrintWhenDetailOverflows="true" uuid="dfa48ca3-bfc5-458d-ba65-8d2637e31211"/>
+				<reportElement stretchType="RelativeToTallestObject" x="18" y="0" width="130" height="20" isPrintWhenDetailOverflows="true" uuid="dfa48ca3-bfc5-458d-ba65-8d2637e31211"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -175,8 +180,9 @@
 				<textFieldExpression><![CDATA[com.yjpt.util.PropReader.getProperty($F{zycs}.getName())]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="392" y="0" width="155" height="20" isPrintWhenDetailOverflows="true" uuid="cb779700-9d5a-425d-b38f-8c4352a489fd"/>
+				<reportElement stretchType="RelativeToTallestObject" x="378" y="0" width="151" height="20" isPrintWhenDetailOverflows="true" uuid="cb779700-9d5a-425d-b38f-8c4352a489fd"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>

BIN
gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_mt.jasper


+ 23 - 6
gkaq/yjpt-java/trunk/resources/iReport/jyr/jyr_mt.jrxml

@@ -108,7 +108,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="547" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
+				<reportElement x="18" y="0" width="511" height="30" uuid="550c873a-d6a7-41b3-b309-c6a44315b708"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="18" isBold="true"/>
 				</textElement>
@@ -119,8 +119,9 @@
 	<columnHeader>
 		<band height="20" splitType="Stretch">
 			<staticText>
-				<reportElement x="0" y="0" width="124" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
+				<reportElement x="18" y="0" width="106" height="20" uuid="a88d5a76-38b2-4e6b-a6fc-225d4b78c565"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -134,6 +135,7 @@
 			<staticText>
 				<reportElement x="124" y="0" width="100" height="20" uuid="2c1f753e-d8a9-4f82-90ad-310230b9e85f"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -147,6 +149,7 @@
 			<staticText>
 				<reportElement x="224" y="0" width="100" height="20" uuid="287cb03a-8ed9-4049-bc49-36709bba47bc"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -160,6 +163,7 @@
 			<staticText>
 				<reportElement x="324" y="0" width="100" height="20" uuid="9efbf6ff-ce79-4c9e-b286-a782af2c73c4"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -171,8 +175,9 @@
 				<text><![CDATA[设计旅客吞吐量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="424" y="0" width="123" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
+				<reportElement x="424" y="0" width="105" height="20" uuid="e7b231a0-e39e-42ce-b586-c5947d05a428"/>
 				<box>
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -186,10 +191,11 @@
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="20" splitType="Stretch">
+		<band height="40" splitType="Stretch">
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="124" height="20" isPrintWhenDetailOverflows="true" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
+				<reportElement stretchType="RelativeToTallestObject" x="18" y="0" width="106" height="20" isPrintWhenDetailOverflows="true" uuid="b093e974-6f74-41e2-860c-1eaeb68894bd"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -203,6 +209,7 @@
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="124" y="0" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="05332ab5-481b-49c3-9555-7fd57c7e143f"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -216,6 +223,7 @@
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="224" y="0" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="fb8d441f-37f9-4e2a-9870-892245877ae9"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -229,6 +237,7 @@
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement stretchType="RelativeToTallestObject" x="324" y="0" width="100" height="20" isPrintWhenDetailOverflows="true" uuid="7a57f8d3-0571-49cb-9a94-4d01e49b7f49"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -240,8 +249,9 @@
 				<textFieldExpression><![CDATA[$F{sjlkttl}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement stretchType="RelativeToTallestObject" x="424" y="0" width="123" height="20" isPrintWhenDetailOverflows="true" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
+				<reportElement stretchType="RelativeToTallestObject" x="424" y="0" width="105" height="20" isPrintWhenDetailOverflows="true" uuid="79c98667-c2e2-4f5d-9656-af05fbb1143d"/>
 				<box leftPadding="5">
+					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
 					<leftPen lineWidth="0.5"/>
 					<bottomPen lineWidth="0.5"/>
@@ -252,6 +262,13 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{nlktgnl}]]></textFieldExpression>
 			</textField>
+			<textField pattern="" isBlankWhenNull="false">
+				<reportElement mode="Transparent" x="18" y="20" width="106" height="20" forecolor="#FFFFFF" backcolor="#FFFFFF" uuid="5126f835-11da-4a1b-9556-d8554865d470"/>
+				<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
+					<font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+			</textField>
 		</band>
 	</detail>
 </jasperReport>

+ 1 - 1
gkaq/yjpt-java/trunk/resources/spring/application.properties

@@ -22,7 +22,7 @@ hibernate.hbm2ddl.auto=
 
 
 # local WebService
-web.service.url=192.168.57.76
+web.service.url=localhost
 web.service.port=8089
 
 # Province WebService 

+ 0 - 98
gkaq/yjpt-java/trunk/yjpt/GettingStarted/Info_1.htm

@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-    <table style="width: 100%; font-size: 16px;" border="1" cellspacing="0">
-        <tr>
-            <td colspan="2">
-                <img alt="" src="images/ball.jpg" />
-            </td>
-            <td colspan="2">
-                中国船舶燃料连云港有限公司
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-                设备名称:
-            </td>
-            <td>
-                立式储油罐
-            </td>
-            <td>
-                规格型号:
-            </td>
-            <td>
-                d30m、h14.8m,10000M3
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                制造日期:
-            </td>
-            <td>
-                1994.9
-            </td>
-            <td>
-                生产厂家:
-            </td>
-            <td>
-                南通化工设备制造安装公司
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                设备编号:
-            </td>
-            <td>
-                1#
-            </td>
-
-            <td>
-                用途:
-            </td>
-            <td>
-                储存燃料油
-            </td>
-        </tr>
-
-        <tr>
-            
-            <td>
-                启用时间:
-            </td>
-            <td>
-                1995.01
-            </td>
-
-             <td>
-                大修次数和时间:
-            </td>
-            <td>
-                
-            </td>
-
-        </tr>
-        <tr>
-           
-            <td>
-                备注:
-            </td>
-            <td>
-                380CST 
-            </td>
-            
-            <td>
-                &nbsp;
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-    </table>
-</body>
-</html>

+ 0 - 26
gkaq/yjpt-java/trunk/yjpt/GettingStarted/Info_2.htm

@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-    <table style="width: 100%; font-size: 12px;" border="1" cellspacing="0">
-        <tr>
-            <td style="text-align: center;">
-                <img alt="" src="images/pangu.jpg" style="height: 227px; width: 400px" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <p>
-                    盘古大观位于北四环中路、亚奥核心区,距离水立方仅180米,距离鸟巢500米,是千顷奥林匹克公园中心区唯一的地标性城市综合体。
-                </p>
-                <p>
-                    项目总占地面积39360平方米,总建筑面积418484.70平方米,由一幢超5A级写字楼、三幢国际公寓、一座盘古七星酒店以及全长411米的世界第一商业长廊——龙廊综合组成。</p>
-                <p>
-                    本着打造“讲中国语言的世界级建筑”这一理念,开发商力邀世界著名华人建筑大师李祖原先生亲手设计。李祖原大师将华夏五千年龙图腾与中国传统文化精髓有效地融于一体,以高192米的写字楼为龙首,三栋国际公寓、一栋七星酒店由南向北依次延伸近700米,令整座建筑体形如一条通体雪白的巨龙。</p>
-            </td>
-        </tr>
-    </table>
-</body>
-</html>

+ 0 - 88
gkaq/yjpt-java/trunk/yjpt/GettingStarted/Info_3.htm

@@ -1,88 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-    <table style="width: 100%; font-size: 12px;" border="1" cellspacing="0">
-        <tr>
-            <td colspan="2">
-                <img alt="" src="images/shuilifang.jpg" style="height: 164px; width: 228px" />
-            </td>
-            <td colspan="2">
-                国家游泳中心又被称为“水立方”(Water 
-                Cube),位于北京奥林匹克公园内,是北京为2008年夏季奥运会修建的主游泳馆,也是2008年北京奥运会标志性建筑物之一。它的设计方案,是经全球设计竞赛产生的“水的立方”([H2O]3)方案。2003年12月24日开工,在2008年1月28日竣工。</td>
-        </tr>
-        <tr>
-            <td>
-                中文名称:
-            </td>
-            <td>
-                国家游泳中心
-            </td>
-            <td>
-                建筑面积:
-            </td>
-            <td>
-                79532平方米
-            </td>
-        </tr>
-        <tr>
-            <td>
-                外文名称:
-            </td>
-            <td>
-                National Aquatics Centre
-            </td>
-            <td>
-                建筑高度:
-            </td>
-            <td>
-                31米
-            </td>
-        </tr>
-        <tr>
-            <td>
-                类别:
-            </td>
-            <td>
-                薄膜结构,空间钢架的结构
-            </td>
-            <td>
-                座位数量:
-            </td>
-            <td>
-                4000个(永久性)、2000个(可拆除),临时座位数11000个 
-            </td>
-        </tr>
-        <tr>
-            <td>
-                地点:
-            </td>
-            <td>
-                北京奥林匹克公园
-            </td>
-            <td>
-                建筑造价:
-            </td>
-            <td>
-                约为10.2亿(各界捐献约8.5亿人民币)
-            </td>
-        </tr>
-        <tr>
-            <td>
-                竣工时间:
-            </td>
-            <td>
-                2008年1月28日 
-            </td>
-            <td>
-                设计单位:
-            </td>
-            <td>
-                中建设计联合体,澳大利亚PTW建筑师事务所、ARUP澳大利亚有限公司联合设计 
-            </td>
-        </tr>
-    </table>
-</body>
-</html>

+ 0 - 462
gkaq/yjpt-java/trunk/yjpt/GettingStarted/default.html

@@ -1,462 +0,0 @@
-
-<html>
-<head>
-<meta http-equiv="x-ua-compatible" content="IE=8">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>3D展现</title>
-<script type="text/javascript" src='libs/SuperMap.Include.js'></script>
-<script type="text/javascript" src="libs/Scripts/SuperMap.Include.js" ></script>
-   
-
-<script type="text/javascript">	    
-	var scene = null;
-	var cameraType = "JL";
-	var sceneControl = null;
-	
-	var htmlUrl = null;
-	var strServerUrl = null;
-	var layer3D = null;
-	var infoPage = "noInfo.htm";
-	var bubble = null;
-
-	function getJson(path) {
-	    var fso, ts, s;
-	    var ForReading = 1;
-
-	    fso = new ActiveXObject("Scripting.FileSystemObject");  //调用控件
-	    ts = fso.OpenTextFile(path, ForReading);
-	    s = ts.ReadLine();
-	   
-	    return s;
-	}
-
-	var returnValue = '';
-
-	function getData(args) {
-
-	  //  alert(args);
-
-	    returnValue = getJson("C:/SuperMap/GettingStarted/json.txt");  //必须用绝对路径,该txt中的内容不要有换行 
-	    alert(returnValue);
-	
-	};
-
-	function getRequest() { 
-		var url = location.search; //获取url中"?"符后的字串 
-		var theRequest = new Object(); 
-		if (url.indexOf("?") != -1) { 
-			var str = url.substr(1); 
-			strs = str.split("&"); 
-			for(var i = 0; i < strs.length; i ++) { 
-			    theRequest[strs[i].split("=")[0]]=unescape(strs[i].split("=")[1]); 
-			} 
-		} 
-		return theRequest; 
-	}
-	
-	function onPageLoad(index){	 
-		 var Request = new Object(); 		
-         Request = getRequest(); 		 
-		 cameraType = Request['cameraType']; 		 		  
-		//alert(curOpenWin);
-		if (index == null || index == "" || index == undefined) {
-			return;
-		}
-		 
-		if(navigator.userAgent.indexOf("MSIE") == -1) {
-			return;
-		}
-		 
-	   htmlUrl = document.location.host;
-	   //判断网页的打开方式是本地打开还是通过网络打开
-	   //不同的打开方式url赋值不同
-	   if (htmlUrl == "") {
-			htmlUrl = "http://localhost:8090";
-	   }else{
-			htmlUrl = "http://" + htmlUrl;
-	   }
-	   htmlUrl = "http://139.196.222.240:8090";
-	
-	   strServerUrl = htmlUrl + "/iserver/services/3D-lygzone/rest/realspace";
-	  // strServerUrl = htmlUrl +"/iserver/services/3D-lyghuagong/rest/realspace";
-	   
-	    
-	   
-	   backColor = new SuperMap.Web.Core.Color(255, 0, 0, 100);
-	    
-	   //初始化三维场景控件
-	   try{
-		  sceneControl = new SuperMap.Web.UI.Controls.SceneControl($get("sceneControlDiv"),initCallBack,failedCallBack);
-	   }
-	   catch(e){
-		  //若没有安装插件,则抛出该异常
-		  if (e.name == SuperMap.Web.Realspace.ExceptionName.PluginNotInstalled) {
-			  var url = htmlUrl + "/iserver/iClient/for3D/Setup.exe";
-			  document.write("<a href= ' "+url+" '>未检测到SuperMap iClient3D for  Plugin 插件,请单击此处下载安装。</a");
-		  }
-		  //若使用非IE浏览器,则抛出该异常
-		  else if (e.name == SuperMap.Web.Realspace.ExceptionName.BrowserNotSupport) {
-			   document.write("<p>SuperMap iClient3D for  Plugin 目前仅支持InternetExplorer浏览器,请更换浏览器后重新加载本页面.</p>");
-		  }
-		  //抛出其他异常
-		  else{
-			   alert(e.message);
-		  }
-	   }
-	}
-	
-	//控件初始化完成后的回调函数,初始化完成之后才能进行数据加载 
-	function initCallBack(){
-		scene = sceneControl.get_scene();        
-		screenLayer = scene.get_screenLayer3D();  
-		 
-		sceneControl.addEvent("objectSelected",objectSelected);
-		sceneControl.addEvent("bubbleInitialize",bubbleInitialize);
-		sceneControl.addEvent("bubbleResize",bubbleResize);
-		sceneControl.addEvent("bubbleClose",bubbleClose); 
-
-             
-   //获取Realspace控件的场景,控件和场景是一对一的捆绑关系
-		
-	 //新建一个照相机对象,把照相机的位置设置为中国的中心点
-		//	var camera = new SuperMap.Web.Realspace.Camera(104.348, 28.708, 10288740.0); //China
-    var camera1 = new SuperMap.Web.Realspace.Camera(119.476521,34.749126,200.0);   //ZR
-    var camera2 = new SuperMap.Web.Realspace.Camera(119.38055,  34.74817,100.0);   //JL
-    
-     //alert("disType["+cameraType+"]")
-     var camera  =  camera1;
-     if (cameraType == "JL") {
-    	 //alert("家乐");
-    	 camera = camera2;
-     }
-     
-    //camera.set_tilt(65); 
-                             
-	  //scene.get_flyingOperator().flyTo(camera,5000,400);
-	
-		var isOpen = scene.open(strServerUrl, "zr@lygzone");
-		
-		
-		if (isOpen) {
-			layer3D = scene.get_layer3Ds().get_item(0);
-			if (layer3D != null) {
-			//var mapUrl = "http://139.224.68.23:8090/iserver/services/map-tianditu/rest/maps/影像底图_经纬度";
-			var mapUrl = "http://139.196.222.240:8090/iserver/services/map-tianditu/rest/maps/影像底图_经纬度";
-			scene.get_layer3Ds().add(mapUrl,"影像底图_经纬度","影像底图_经纬度",SuperMap.Web.Realspace.Layer3DType.Map);
-			var lyrBounds = layer3D.get_bounds();
-	
-				camera.set_tilt(65);
-			//	scene.get_flyingOperator().flyTo(lyrBounds,5000,20);
-				
-				scene.get_flyingOperator().flyTo(camera,2000,20);
-				
-			}
-		}else{
-			alert("打开场景失败");
-		}
-
-  
-		
-		//添加屏幕图层文本
-
-	    try {
-			var anchorPoint = new SuperMap.Web.Core.Point3D(0.50,0.965,0);
-			var txtPart3D = new SuperMap.Web.Core.TextPart3D("中设设计", anchorPoint);
-
-			var textArray = [txtPart3D];
-			var text3D = new SuperMap.Web.Core.GeoText3D(textArray);
-			
-			var feature3D = new SuperMap.Web.Core.Feature3D();
-			feature3D.set_geometry(text3D);
-			
-			var textStyle = new SuperMap.Web.Core.TextStyle3D();
-			textStyle.set_foreColor(new SuperMap.Web.Core.Color(255,255,0,255));
-			textStyle.set_backColor(new SuperMap.Web.Core.Color(0,0,0,255));
-			textStyle.set_outline(true);
-			textStyle.set_fontName("微软雅黑");
-			textStyle.set_fontScale(0.8);
-			feature3D.set_textStyle3D(textStyle);
-			
-			scene.get_screenLayer3D().add(feature3D,"Text");
-			scene.get_screenLayer3D().set_isVisible(true);
-		}
-		catch(e){
-			alert("屏幕图层添加文字失败");
-		}
-        
-	}
-	
-	//控件初始化失败后的回调函数
-	function failedCallBack(){
-		alert("Realspace initiallized failed");
-	}
-	
-	
-
-	function objectSelected(selected3d) {
-               
-	
-
-    var selection3DCount = selected3d.length;
-
-		
-	  for(var i=0; i<selection3DCount; i++)
-    {
-        var selectCount = selected3d[i].get_count();
-	 		
-	 		//	alert("selectCount:"+ selectCount);
-
-        for(var j=0; j<selectCount; j++)
-        {
-            var selection3D = selected3d[i];
-      //      alert("item:"+selection3D.get_item(j));
-        }
-    }
-
-
-      //  var layer3D = scene.get_layer3Ds().get_item("guanzi@ZR_1");
-			
-	//			var fieldInfo = "";
-	//			fieldCount = layer3D.get_fieldInfos().get_count();
-	//			for(var i=0;i<fieldCount;i++)
-	//			{
-	//				fieldInfo += layer3D.get_fieldInfos().get_item(i).get_name() + ":";
-	//				fieldInfo += layer3D.getFieldValue(i) + "; ";
-	//			}
-	//			alert(fieldInfo);
-
-
-
-
-
-
- 
-        	var objId = selected3d[0].get_item(0);
-        	var objInLayer3D = selected3d[0].get_layer3D();
-        	
-       // 	 alert("objInLayer3D:"+objId+";"+ objInLayer3D);
-        	 
-        	 var fieldInfo = "";
-				fieldCount = objInLayer3D.get_fieldInfos().get_count();
-				for(var i=0;i<fieldCount;i++)
-				{
-					fieldInfo += objInLayer3D.get_fieldInfos().get_item(i).get_name() + ":";
-					fieldInfo += objInLayer3D.getFieldValue(i) + "; ";
-				}
-		//		alert(fieldInfo);
-	
-
-		var featrue3D = objInLayer3D.findFeature3DByID(objId);
-		var ModelName = objInLayer3D.getFieldValue(9);
-
-		
-	//	 alert("featrue3D:"+objId+";"+featrue3D);
-
-
-		var point3D = null;
-		if (featrue3D) {
-			point3D = featrue3D.get_geometry().get_position();
-		}
-		
-		var featureName = featrue3D.get_name();
-
-        var path = "<%=basePath%>/theme/GettingStarted/";
-        
-        switch (ModelName) {
-			case "TK_101":
-			    infoPage = path + "zr_1.htm";
-			  
-				break;
-			case "TK_102":
-			    infoPage = path + "zr_2.htm";
-			 	break;
-			 	
-			case "TK_108":
-				infoPage = path + "zr_8.htm";
-				
-				break;
-	
-		    case "TK_107":
-		        infoPage = path + "zr_7.htm";
-		        break;
-	
-		    case "TK_105":
-		        infoPage = path + "zr_5.htm";
-		        break;
-	
-		    case "TK_106":
-		        infoPage = path + "zr_6.htm";
-	
-		        break;
-	
-		    case "TK_104":
-		        infoPage = path + "zr_4.htm";
-		        break;
-	
-		    case "TK_103":
-		        infoPage = path + "zr_3.htm";
-		        break;
-	
-		    case "TK_109":
-		        infoPage = path + "zr_9.htm";     //ball 9
-		        break;
-	
-		    case "TK_110":
-		    
-		        infoPage = path + "zr_10.htm";    //ball 10
-		        break;
-		   
-			default:
-				infoPage = path + "noInfo.htm";
-	
-				break;
-	    }
-		createBubble(point3D);
-	}
-	
-	function createBubble(pos){
-		try{
-				bubble = new SuperMap.Web.Realspace.Bubble();
-				bubble.set_pointer(pos);
-				
-				//设置气泡标题内容
-		    //	var title = document.getElementById("TitleName").value;
-
-				var title = "储罐信息";
-				if (title != null) {
-					bubble.set_title(title);
-				}
-				  
-				var textStyle3D = new SuperMap.Web.Core.TextStyle3D();
-				
-				//设置气泡标题对齐方式
-			//	var textAligns = document.getElementById("TextAlign");
-
-				var textAligns = 10;
-				for(var i=0;i<textAligns.length;i++)
-				{
-					 if (textAligns[i].selected) {
-						textStyle3D.set_alignment(textAligns[i].value);
-					}
-				}        
-				//设置标题文本字体   
-				//var fontNames = document.getElementById("FontName");
-				textStyle3D.set_fontName("微软雅黑");
-
-				
-				//设置标题字体颜色
-				
-				textStyle3D.set_foreColor(new SuperMap.Web.Core.Color(255,255,255,100));
-				
-				bubble.set_titleTextStyle3D(textStyle3D);                      
-				
-				//设置气泡边框宽度
-				var frameWidth = 8; //document.getElementById("FrameWidth").value;
-
-				if (frameWidth != null) {
-					bubble.set_frameWidth(frameWidth);
-				}
-				
-				//设置气泡圆角程度
-				var roundQuality = 1; //document.getElementById("RoundQuality").value;
-
-				if (roundQuality != null) {
-					bubble.set_roundQuality(roundQuality);
-				}
-				
-				//设置边框颜色
-				
-				bubble.set_backColor(new SuperMap.Web.Core.Color(0,0,255,200));
-			
-				bubble.set_frameColor(new SuperMap.Web.Core.Color(255,255,255,255));    
-				 
-				bubble.set_height(380);
-				bubble.set_width(600);
-		
-				sceneControl.get_bubbles().removeAll();
-				sceneControl.get_bubbles().add(bubble);
-			} 
-		catch(e){
-			alert("创建气泡失败");
-		}   
-	}
-	
-	function bubbleInitialize(bubble){
-		try
-		{			
-           var frameInfo = document.getElementById("infoWindow");            
-            frameInfo.src = infoPage;
-
-            frameInfo.frameborder = 0;
-            frameInfo.style.marginwidth = 0;
-            frameInfo.style.marginheight = 0;
-            frameInfo.style.width = bubble.get_clientWidth()+"px";
-            frameInfo.style.height = bubble.get_clientHeight()+"px";
-            frameInfo.style.left = bubble.get_clientLeft() + sceneControl.get_controlOffsetX()+"px";
-            frameInfo.style.top = (bubble.get_clientTop() + sceneControl.get_controlOffsetY() - 45) +"px";
-			frameInfo.style.display = "block";
-		}
-		catch(e){
-			alert("Failed to initialize bubble");
-		}
-	}
-	
-	function bubbleResize(bubble){
-		try
-		{
-			var frameInfo = document.getElementById("infoWindow");
-		
-			frameInfo.src = infoPage;
-					
-			frameInfo.style.width = bubble.get_clientWidth()+"px";
-			frameInfo.style.height = bubble.get_clientHeight()+"px";
-			frameInfo.style.left = bubble.get_clientLeft() + sceneControl.get_controlOffsetX()+"px";
-			frameInfo.style.top = (bubble.get_clientTop() + sceneControl.get_controlOffsetY() - 45) +"px";
-			frameInfo.style.display = "block";
-		}
-		catch(e)
-		{
-			alert("Failed to resize bubble");
-		}
-	}
-	
-	//关闭气泡
-	function bubbleClose(bubble){
-		try
-		{
-			var frameInfo = document.getElementById("infoWindow");
-			frameInfo.style.display = "none";
-			
-			var selection3Ds = scene.findSelection3Ds(true);
-			if (selection3Ds.length > 0) {
-				for(var i = 0; i <= selection3Ds.length - 1; i++){
-					selection3Ds[i].removeAll();
-				}
-			}
-		}
-		catch(e){
-			alert("Failed to close bubble");
-		}
-	}
-</script>
-</head>
-<body onLoad="onPageLoad('ZR');">
-<meta http-equiv="x-ua-compatible" content="IE=8">
-<!-- JL -->
-<ul style="position: absolute;top: 1px;left:5px;right:5px;float:left">
-	<li>边框宽度:<input name="text" type="text" id="FrameWidth" value="15" size="10"/></li>
-	<li>边框背景颜色:<select id="FrameColor" ><option value="Red" >红色<option value="Green">绿色<option value="Blue" selected>蓝色</option></select></li>
-	<li>标题名称:<input type="text" id="TitleName" value="球罐信息" size="" ></li>
-	<li>标题字体:<select id="FontName"><option value="1" selected="selected">微软雅黑<option value="2">宋体<option value="3">隶书</select></li>
-	<li>字体颜色:<select id="FontColor"><option value="Red">红色<option value="Green" selected="selected">绿色<option value="Blue">蓝色</select></li>
-	<li>对齐方式:<select id="TextAlign"> <option value="9">左对齐<option value="11">右对齐<option value="10" selected="selected">居中对齐 </select></li>
-	<li>圆角程度:<input id="RoundQuality" type="text" size="10px" value="1" style=""/></li>
-</ul>
--->
-  <p class="header"><span>连云港化工园区  </span></p>
-
-<p>
-<div id="sceneControlDiv" style="position:absolute;top: 0px;bottom: 0px;height:99%;width:99%"></div>
-<iframe id="infoWindow" style="position: absolute;top: 0px; display:none" frameborder="0" scrolling="auto">
-</iframe>
-</body>

BIN
gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/Cylinder.jpg


BIN
gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/ball.jpg


BIN
gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/img.jpg


BIN
gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/jgylogo.png


BIN
gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/level.png


BIN
gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/pangu.jpg


BIN
gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/shuilifang.jpg


BIN
gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/vertical.png


BIN
gkaq/yjpt-java/trunk/yjpt/GettingStarted/images/whiteCircle.png


+ 0 - 1
gkaq/yjpt-java/trunk/yjpt/GettingStarted/json.txt

@@ -1 +0,0 @@
-{"ZTXQ":[{"BASE":"127020.789063","BNAME":"白马变","CHV_OID":"3501","CITY_ORG_NAME":"江苏省电力公司检修分公司","CODENAME":"电压暂升","CODETYPE":"0","DUR":"30.999999","FLAG":"0","INFO":"ID_DISTURB_1159_SHORTDUR_MOMENT_SWELL","IOID":"12318449434","LINENAME":"220kV正母线","MAG":"110.010391","OID":"12318449431","SEQ":"A,B,C","STARTTIME":"2013-09-12 00:05:55.00"},{"BASE":"127020.789063","BNAME":"白马变","CHV_OID":"3396","CITY_ORG_NAME":"江苏省电力公司检修分公司","CODENAME":"电压暂降","CODETYPE":"1","DUR":"30.999999","FLAG":"1","INFO":"ID_DISTURB_1159_SHORTDUR_MOMENT_SWELL","IOID":"12318449434","LINENAME":"220kV正母线","MAG":"111.010391","OID":"12318449431","SEQ":"A,B,C","STARTTIME":"2013-09-12 00:05:55.00"},{"BASE":"127020.789063","BNAME":"白马变","CHV_OID":"3500","CITY_ORG_NAME":"江苏省电力公司检修分公司","CODENAME":"电压暂升","CODETYPE":"2","DUR":"30.999999","FLAG":"0","INFO":"ID_DISTURB_1159_SHORTDUR_MOMENT_SWELL","IOID":"12318449434","LINENAME":"220kV正母线","MAG":"112.010391","OID":"12318449431","SEQ":"A,B,C","STARTTIME":"2013-09-12 00:05:55.00"},{"BASE":"127020.789063","BNAME":"白马变","CHV_OID":"3504","CITY_ORG_NAME":"江苏省电力公司检修分公司","CODENAME":"电压暂升","CODETYPE":"3","DUR":"30.999999","FLAG":"1","INFO":"ID_DISTURB_1159_SHORTDUR_MOMENT_SWELL","IOID":"12318449434","LINENAME":"220kV正母线","MAG":"113.010391","OID":"12318449431","SEQ":"A,B,C","STARTTIME":"2013-09-12 00:05:55.00"},{"BASE":"127020.789063","BNAME":"白马变","CHV_OID":"3503","CITY_ORG_NAME":"江苏省电力公司检修分公司","CODENAME":"电压暂升","CODETYPE":"0","DUR":"30.999999","FLAG":"1","INFO":"ID_DISTURB_1159_SHORTDUR_MOMENT_SWELL","IOID":"12318449434","LINENAME":"220kV正母线","MAG":"114.010391","OID":"12318449431","SEQ":"A,B,C","STARTTIME":"2013-09-12 00:05:55.00"}]}

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 4
gkaq/yjpt-java/trunk/yjpt/GettingStarted/lib_Ajax/MicrosoftAjax.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
gkaq/yjpt-java/trunk/yjpt/GettingStarted/lib_Ajax/SuperMap-7.0.1-11323.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
gkaq/yjpt-java/trunk/yjpt/GettingStarted/lib_Realspace/SuperMap.Web.Realspace.js


+ 0 - 97
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/Lang/en.js

@@ -1,97 +0,0 @@
-/**
- * @requires SuperMap/Lang.js
- */
-
-/**
- * Namespace: SuperMap.Lang["en"]
- * Dictionary for English.  Keys for entries are used in calls to
- *     <SuperMap.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <SuperMap.String.format> calls.
- */
-SuperMap.Lang.en = {
-
-    'unhandledRequest': "Unhandled request return ${statusText}",
-
-    'Permalink': "Permalink",
-
-    'Overlays': "Overlays",
-
-    'Base Layer': "Base Layer",
-
-    'LayerSwitcher': "LayerSwitcher",
-
-    'noFID': "Can't update a feature for which there is no FID.",
-
-    'browserNotSupported':
-        "Your browser does not support vector rendering. Currently supported renderers are:\n${renderers}",
-
-    // console message
-    'minZoomLevelError':
-        "The minZoomLevel property is only intended for use " +
-        "with the FixedZoomLevels-descendent layers. That this " +
-        "wfs layer checks for minZoomLevel is a relic of the" +
-        "past. We cannot, however, remove it without possibly " +
-        " breaking OL based applications that may depend on it." +
-        "Therefore we are deprecating it -- the minZoomLevel." +
-        "Please instead use min/max resolution setting.",
-
-    'commitSuccess': "WFS Transaction: SUCCESS ${response}",
-
-    'commitFailed': "WFS Transaction: FAILED ${response}",
-
-    'googleWarning':
-        "The Google Layer was unable to load correctly.<br><br>" +
-        "To get rid of this message, select a new BaseLayer " +
-        "in the layer switcher in the upper-right corner.<br><br>" +
-        "Most likely, this is because the Google Maps library " +
-        "script was either not included, or does not contain the " +
-        "correct API key for your site.<br><br>",
-
-    'getLayerWarning':
-        "The ${layerType} Layer was unable to load correctly.<br><br>" +
-        "To get rid of this message, select a new BaseLayer " +
-        "in the layer switcher in the upper-right corner.<br><br>" +
-        "Most likely, this is because the ${layerLib} library " +
-        "script was not correctly included.<br><br>",
-
-    'Scale = 1 : ${scaleDenom}': "Scale = 1 : ${scaleDenom}",
-    
-    //labels for the graticule control
-    'W': 'W',
-    'E': 'E',
-    'N': 'N',
-    'S': 'S',
-    'Graticule': 'Graticule',
-
-    // console message
-    'reprojectDeprecated':
-        "You are using the 'reproject' option " +
-        "on the ${layerName} layer. This option is deprecated: " +
-        "its use was designed to support displaying data over commercial " + 
-        "basemaps, but that functionality should now be achieved by using " +
-        "Spherical Mercator support.",
-
-    // console message
-    'methodDeprecated':
-        "This method has been deprecated and will be removed. " +
-        "Please use ${newMethod} instead.",
-
-    'proxyNeeded': "You probably need to set SuperMap.ProxyHost to access ${url}.",
-
-    // **** end ****
-    'end': '',
-    'mi': "mi",
-    'km': "km",
-    'm': "m",
-    'ft': "ft",
-
-    //VectorMapEditor
-    'editorName':"VectorMapEditor",
-    'layerList':"LayerList",
-    'point':"PointLayer",
-    'line':"LineLayer",
-    'region':"PolygonLayer",
-    'text':"TextLayer",
-    'advanceSetting':"advanceSetting"
-    
-};

+ 0 - 164
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/Lang/zh-CN.js

@@ -1,164 +0,0 @@
-/**
- * @requires SuperMap/Lang.js
- */
-
-/**
- * Namespace: SuperMap.Lang["zh-CN"]
- * Dictionary for Simplified Chinese.  Keys for entries are used in calls to
- *     <SuperMap.Lang.translate>.  Entry bodies are normal strings or
- *     strings formatted for use with <SuperMap.String.format> calls.
- */
-SuperMap.Lang["zh-CN"] = {
-
-    'unhandledRequest': "未处理的请求,返回值为 ${statusText}",
-
-    'Permalink': "永久链接",
-
-    'Overlays': "叠加层",
-
-    'Base Layer': "基础图层",
-
-    'LayerSwitcher': "图层选择",
-
-    'noFID': "无法更新feature,缺少FID。",
-
-    'browserNotSupported':
-        "你使用的浏览器不支持矢量渲染。当前支持的渲染方式包括:\n${renderers}",
-
-    // console message
-    'minZoomLevelError':
-        "minZoomLevel属性仅适合用于" +
-        "使用了固定缩放级别的图层。这个 " +
-        "wfs 图层检查 minZoomLevel 是过去遗留下来的。" +
-        "然而,我们不能移除它," +
-        "而破坏依赖于它的基于OL的应用程序。" +
-        "因此,我们废除了它 -- minZoomLevel 。" +
-        "请改用min/max resolution 设置。",
-
-    'commitSuccess': "WFS Transaction: 成功。 ${response}",
-
-    'commitFailed': "WFS Transaction: 失败。 ${response}",
-
-    'googleWarning':
-        "Google图层不能正确加载。<br><br>" +
-        "要消除这个信息,请在右上角的" +
-        "图层控制面板中选择其他的基础图层。<br><br>" +
-        "这种情况很可能是没有正确的包含Google地图脚本库," +
-        "或者是没有在你的站点上" +
-        "使用的正确的Google Maps API密匙。<br><br>",
-
-    'getLayerWarning':
-        "${layerType} 图层不能正确加载。<br><br>" +
-        "要消除这个信息,请在右上角的" +
-        "图层控制面板中选择其他的基础图层。<br><br>" +
-        "这种情况很可能是没有正确的包含" +
-        "${layerLib} 脚本库。<br><br>",
-
-    'Scale = 1 : ${scaleDenom}': "比例尺 = 1 : ${scaleDenom}",
-
-    // console message
-    'reprojectDeprecated':
-        "你正在使用 ${layerName} 图层上的'reproject'选项。" +
-        "这个选项已经不再使用:" +
-        "它是被设计用来支持显示商业的地图数据," + 
-        "不过现在该功能可以通过使用Spherical Mercator来实现。" +
-        "更多信息请参阅帮助文档。",
-
-    // console message
-    'methodDeprecated':
-        "该方法已经不再被支持,将被移除。" +
-        "请使用 ${newMethod} 方法来替代。",
-
-    'end': '',
-    'mi': "英里",
-    'km': "公里",
-    'm': "米",
-    'ft': "英尺",
-
-    //矢量地图编辑器
-    'editorName':"矢量地图编辑器",
-    'layerList':"图层列表",
-    'point':"点图层",
-    'line':"线图层",
-    'region':"面图层",
-    'text':"文本图层",
-    'advanceSetting':"高级设置",
-    'hideAdvanceSetting':"隐藏",
-    "hideEditor":"隐藏编辑器",
-    "showEditor":"打开编辑器",
-    "closeEditor":"关闭编辑器",
-    //point
-    'pointFileLabel':"点图片地址",
-    'pointFileTitle':"点符号的图片的完整URL地址",
-    'pointFillLabel':"矢量点填充色",
-    'pointFillTitle':"矢量点符号的填充颜色值",
-    'pointRadiusLabel':"矢量点半径",
-    'pointRadiusTitle':"矢量点的半径",
-    'pointHaloRadiusLabel':"矢量点边界宽度",
-    'pointHaloRadiusTitle':"矢量点的边界宽度",
-    'pointHaloColorLabel':"矢量点边界颜色值",
-    'pointHaloColorTitle':"矢量点边界颜色值",
-    'pointDxLabel':"横向偏移值",
-    'pointDxTitle':"点符号的横向偏移值",
-    'pointDyLabel':"纵向偏移值",
-    'pointDyTitle':"点符号的纵向偏移值",
-    'pointOpacityLabel':"透明度",
-    'pointOpacityTitle':"点符号的透明度",
-    'pointCompOpLabel':"叠加运算方式",
-    'pointCompOpTitle':"点与点相互叠加里使用的覆盖或者是异或等运算方式",
-    //line
-    'lineColorLabel':"线的颜色",
-    'lineColorTitle':"线的填充颜色",
-    'lineOpacityLabel':"线透明度",
-    'lineOpacityTitle':"线的透明度",
-    'lineWidthLabel':"线宽",
-    'lineWidthTitle':"线的宽度值",
-    'lineCapLabel':"线帽",
-    'lineCapTitle':"线端点的样式",
-    'lineJoinLabel':"线连接处样式",
-    'lineJoinTitle':"线连接处的样式",
-    'lineMiterlimitLabel':"线连接处截留长度",
-    'lineMiterlimitTitle':"线连接处截留的长度",
-    'lineDashOffsetLabel':"虚线模式的偏移值",
-    'lineDashOffsetTitle':"虚线模式的偏移值",
-    'lineDasharrayLabel':"虚线的模式",
-    'lineDasharrayTitle':"虚线的模式,格式为用逗号隔开的数据,比如:10,15,10,25",
-    'lineOffsetLabel':"线偏移值",
-    'lineOffsetTitle':"线的偏移值",
-    'lineCompOpLabel':"叠加方式",
-    'lineCompOpTitle':"线与线之间相互叠加里使用的覆盖或者是异或等运算方式",
-    //region
-    'polygonFillLabel':"填充色",
-    'polygonFillTitle':"面的填充颜色",
-    'polygonDxLabel':"横向偏移值",
-    'polygonDxTitle':"面的横向偏移值",
-    'polygonDyLabel':"纵向偏移值",
-    'polygonDyTitle':"面的纵向偏移值",
-    'polygonOpacityLabel':"填充透明度",
-    'polygonOpacityTitle':"面的透明度",
-    'polygonCompOpLabel':"叠加方式",
-    'polygonCompOpTitle':"面与面之间相互叠加里使用的覆盖或者是异或等运算方式",
-    //text
-    'textSizeLabel':"字体大小",
-    'textSizeTitle':"字体大小",
-    'textFaceNameLabel':"字体",
-    'textFaceNameTitle':"字体",
-    'textAlignLabel':"水平对齐方式",
-    'textAlignTitle':"文本的水平对齐方式",
-    'textVerticalAlignmentLabel':"垂直对齐方式",
-    'textVerticalAlignmentTitle':"文本的垂直对齐方式",
-    'textHaloRadiusLabel':"文本边框宽度",
-    'textHaloRadiusTitle':"文本的外围边框的宽度",
-    'textHaloColorLabel':"文本边框颜色",
-    'textHaloColorTitle':"文本的外围边框的颜色",
-    'textFillLabel':"文本颜色",
-    'textFillTitle':"文本的颜色值",
-    'textOpacityLabel':"透明度",
-    'textOpacityTitle':"文本的透明度",
-    'textDxLabel':"横向偏移",
-    'textDxTitle':"文本的横向偏移值",
-    'textDyLabel':"纵向偏移值",
-    'textDyTitle':"文本的纵向偏移值",
-    'textCompOpLabel':"叠加方式",
-    'textCompOpTitle':"文本之间相互叠加里使用的覆盖或者是异或等运算方式"
-};

+ 0 - 49
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/Scripts/GettingStarted.js

@@ -1,49 +0,0 @@
-var sceneControl = null;
-function onPageLoad() {
-try
-{
-//获取 html 页面中名为 sceneControlDiv 的 div 对象作为场景控件
-sceneControl = new SuperMap.Web.UI.Controls.SceneControl($get("sceneControlDiv"), initCallback,failedCallback);
-}
-catch(e)
-{
-//console.log(e);
- }
-}
-
-var htmlUrl = document.location.host;
-if(htmlUrl == ""){ //判断网页的打开方式是本地打开还是通过网络打开
-htmlUrl = "http://localhost:8090"; }
-else{
-htmlUrl = "http://" + htmlUrl; }
-var sceneUrl = htmlUrl + "/iserver/services/components-rest/rest/realspace";
-//console.log(sceneUrl);
-//控件初始化完成后的回调函数,初始化完成后才能进行数据加载
-function initCallback() {
-//获取 Realspace 控件的场景,控件和场景是一对一关系
-scene = sceneControl.get_scene();
-scene.open(sceneUrl, "scene"); // 打开名称为”scene”的场景
-}
-//控件初始化失败的回调函数
-function failedCallback() {
-alert("Realspace initialized failed!");
-}
-
-function viewEntire()
-{
-scene.viewEntire(); //全局显示整个三维场景
-}
-function setPan()
-{
-var panAction = new SuperMap.Web.UI.Action3Ds.Pan(sceneControl);
-sceneControl.set_sceneAction(panAction); //场景平移
-}
-function setSelect()
-{
-var selectAction = new SuperMap.Web.UI.Action3Ds.Select(sceneControl);
-sceneControl.set_sceneAction(selectAction); //场景选择
-}
-function refresh()
-{
-scene.refresh();//刷新场景
-}

+ 0 - 25
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/Scripts/SuperMap.Include.js

@@ -1,25 +0,0 @@
-
-function _IncludeScript(inc){
-    if(navigator.userAgent.indexOf("MSIE") != -1) {
-        var script='<'+'script type="text/javascript" src="libs/lib_Realspace/'+inc+'"'+'><'+'/script>'; 
-	    document.writeln(script); 
-	}
-}
-
-function _Include2DScript(inc){
-	if(navigator.userAgent.indexOf("MSIE") != -1) {
-		var script='<'+'script type="text/javascript" src="libs/lib_Ajax/'+inc+'"'+'><'+'/script>'; 
-		document.writeln(script); 
-	}
-}
-if(navigator.userAgent.indexOf("MSIE") != -1) {
-	if(!Function.__typeName)
-	{    
-	    _Include2DScript('MicrosoftAjax.js'); 
-
-		//_Include2DScript('SuperMap-7.0.1-11323.js');
-
-	    _IncludeScript('SuperMap.Web.Realspace.js');   
-	                   
-	}
-}

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/Scripts/jquery.min.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/SuperMap-8.0.1-13225.js


+ 0 - 48
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/SuperMap.Include.js

@@ -1,48 +0,0 @@
-(function() {
-    var isWinRT = (typeof Windows === "undefined") ? false : true;
-    var r = new RegExp("(^|(.*?\\/))(SuperMap.Include\.js)(\\?|$)"),
-    s = document.getElementsByTagName('script'),
-    src, m, baseurl = "";
-    for(var i=0, len=s.length; i<len; i++) {
-        src = s[i].getAttribute('src');
-        if(src) {
-            var m = src.match(r);
-            if(m) {
-                baseurl = m[1];
-                break;
-            }
-        }
-    }
-    function inputScript(inc){
-        if (!isWinRT) {
-            var script = '<' + 'script type="text/javascript" src="' + inc + '"' + '><' + '/script>';
-            document.writeln(script);
-        } else {
-            var script = document.createElement("script");
-            script.src = inc;
-            document.getElementsByTagName("HEAD")[0].appendChild(script);
-        }
-    }
-    function inputCSS(style){
-        if (!isWinRT) {
-            var css = '<' + 'link rel="stylesheet" href="theme/default/' + style + '"' + '><' + '/>';
-            document.writeln(css);
-        } else { 
-            var link = document.createElement("link");
-            link.rel = "stylesheet";
-            link.href =  "theme/default/" + style;
-            document.getElementsByTagName("HEAD")[0].appendChild(link);
-        }
-    }
-    //加载类库资源文件
-    function loadSMLibs() {
-        inputScript(baseurl+'SuperMap-8.0.1-13225.js');
-        inputCSS('style.css');
-        inputCSS('google.css');
-    }
-    //引入汉化资源文件
-    function loadLocalization() {
-        inputScript(baseurl + 'Lang/zh-CN.js');
-    }
-    loadSMLibs();loadLocalization();
-})();

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/SuperMap_Basic-8.0.1-13225.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/SuperMap_Cloud-8.0.1-13225.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/SuperMap_IServer-8.0.1-13225.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/SuperMap_OGC-8.0.1-13225.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/SuperMap_Visualization-8.0.1-13225.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 4
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/lib_Ajax/MicrosoftAjax.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/lib_Ajax/SuperMap-7.0.1-11323.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
gkaq/yjpt-java/trunk/yjpt/GettingStarted/libs/lib_Realspace/SuperMap.Web.Realspace.js


+ 0 - 2
gkaq/yjpt-java/trunk/yjpt/GettingStarted/new 13.txt

@@ -1,2 +0,0 @@
-file:///C:/Users/Administrator/Desktop/GettingStarted/GettingStarted/default.html?cameraType=JL
-file:///C:/Users/Administrator/Desktop/GettingStarted/GettingStarted/default.html?cameraType=ZR

+ 0 - 10
gkaq/yjpt-java/trunk/yjpt/GettingStarted/noInfo.htm

@@ -1,10 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-<p>暂无信息。</p>
-</body>
-</html>

+ 0 - 196
gkaq/yjpt-java/trunk/yjpt/GettingStarted/test.html

@@ -1,196 +0,0 @@
-
-<html>
-	<head>
-		<meta http-equiv="X-UA-Compatible" content="IE=8" />	
-		<meta http-equiv="Content-Type" content="text/html; utf-8" />
-		<title>改变矢量图层风格</title>
-		<script type="text/javascript" src="SuperMap.Include.js" ></script>
-		<script type="text/javascript">
-			var scene = null;
-			var sceneControl = null;
-			var htmlUrl = document.location.host;
-			//判断网页的打开方式是本地打开还是通过网络打开
-			//不同的打开方式url赋值不同
-			if(htmlUrl == "")
-			{
-				htmlUrl = "http://localhost:8090";
-			}
-			else
-			{
-				htmlUrl = "http://" + htmlUrl;
-			}
-			var sceneUrl = htmlUrl + "/iserver/services/components-rest/rest/realspace";
-			function onPageLoad() 
-			{
-				//初始化三维场景控件
-				try
-				{
-					//初始化三维场景控件实例,参数为包含控件的HTML元素
-					sceneControl = new SuperMap.Web.UI.Controls.SceneControl($get("sceneControlDiv"), initCallback, failedCallback);
-				}
-				catch(e)
-				{   
-					//若没有安装插件,则抛出该异常
-					if (e.name == SuperMap.Web.Realspace.ExceptionName.PlugInNotInstalled) 
-					{
-						var url = htmlUrl + "/iserver/iClient/for3D/Setup.exe";
-						document.write("<a href='"+url+"'>未检测到 SuperMap iClient3D for  Plugin 插件,请单击此处下载并安装插件。</a>");
-						return;
-					}
-					//若使用非IE浏览器,则抛出该异常
-					else if (e.name == SuperMap.Web.Realspace.ExceptionName.BrowserNotSupport) 
-					{
-						document.write("<p>SuperMap iClient3D for  Plugin 目前仅支持 InternetExplorer 浏览器,请更换浏览器后重新尝试加载本页面。</p>");
-						return;
-					}
-					//抛出其他异常
-					else
-					{
-						alert(e.message);
-					}
-				}	
-			}
-
-			//控件初始化完成后的回调函数,初始化完成之后才能进行数据加载
-			function initCallback() 
-			{
-				//获取地球控件场景,控件和场景是一对一的捆绑关系
-				scene = sceneControl.get_scene();
-				
-				//iServer服务地址
-				serverAddress = sceneUrl;				
-
-				//获取三维图层集合 
-				layer3Ds = scene.get_layer3Ds();
-			}
-
-			//控件初始化失败后的回调函数
-			function failedCallback() 
-			{
-				alert("Realspace initialized failed!");
-			}
-			//获得图层的数据名称
-			function getDataName(layerName)
-			{
-				var layer3DServicesList = sceneControl.get_layer3DServicesList();
-				var bLoad = layer3DServicesList.load(serverAddress, "scene");
-				if(bLoad)
-				{
-					var layer3DServiceInfo = layer3DServicesList.get_item(layerName);
-					var dataName = layer3DServiceInfo.get_dataName();
-					var layer3DType = layer3DServiceInfo.get_type();
-					return dataName;
-				}
-				else
-				{
-					alert("获取图层服务信息失败!");
-				}		
-			}
-			
-			function createVector()
-			{
-				var layerDataName = getDataName("buildings@RealspaceSample");
-				//新建矢量图层
-				var vectorLayer = new SuperMap.Web.Realspace.Layer3D(serverAddress,"buildings@RealspaceSample", layerDataName, SuperMap.Web.Realspace.Layer3DType.VECTOR);
-				if (vectorLayer != null)
-				{
-					layer3Ds.insert(vectorLayer);
-				
-					//飞行到矢量图层的地理范围内
-					var geobound = vectorLayer.get_bounds();   
-					scene.get_flyingOperator().flyToBounds(geobound);
-				}
-				scene.refresh();				
-			}
-			//获得图层的风格
-			function loadStyle()
-			{
-				//获取一个三维图层信息列表对象实例  
-				var layer3DServicesList = sceneControl.get_layer3DServicesList();
-				
-				//从指定的服务器和场景获取该场景的全部图层服务信息,获取成功返回 True  
-				var bLoad = layer3DServicesList.load(serverAddress,"scene");
-				if(bLoad)
-				{
-					//获取指定图层的信息
-					var layer3DServiceInfo = layer3DServicesList.get_item("buildings@RealspaceSample");
-					//构造一个Style3D对象
-					var style3D = new SuperMap.Web.Core.Style3D();
-				
-					//获取图层的风格信息
-					style3D = layer3DServiceInfo.get_style3D();
-					
-					//加载图层默认的风格
-					layer3Ds.get_item("buildings@RealspaceSample").set_style3D(style3D);
-					scene.refresh();
-				}		
-			}
-			function changeStyle()
-			{
-				var regionRed = document.getElementById("regionRed").value;
-				var regionGreen = document.getElementById("regionGreen").value;
-				var regionBlue = document.getElementById("regionBlue").value;
-				var lineRed = document.getElementById("lineRed").value;
-				var lineGreen = document.getElementById("lineGreen").value;
-				var lineBlue = document.getElementById("lineBlue").value;
-				var lineWidth = document.getElementById("lineWidth").value;
-				var extendHeight = document.getElementById("extendHeight").value;
-				var altitudeMode = document.getElementById("altitudeMode").value;
-				//构造一个Style3D对象
-				var regionStyle3D = new SuperMap.Web.Core.Style3D();
-				
-				//设置图层的填充前景色、线颜色、线宽度
-				regionStyle3D.set_fillForeColor(new SuperMap.Web.Core.Color(regionRed,regionGreen,regionBlue,255));
-				regionStyle3D.set_lineColor(new SuperMap.Web.Core.Color(lineRed,lineGreen,lineBlue,255));
-				regionStyle3D.set_lineWidth(lineWidth);
-				regionStyle3D.set_extendHeight(extendHeight);
-				regionStyle3D.set_bottomAltitude("100");
-				regionStyle3D.set_altitudeMode(altitudeMode);
-				
-				//将风格加载到指定的图层上
-				layer3Ds.get_item("buildings@RealspaceSample").set_style3D(regionStyle3D);
-				
-				scene.refresh();
-			}
-			
-		</script>
-	</head>
-
-	<body onLoad="onPageLoad()">  		
-		<div  style="position:absolute;left:5px;top:5px;right:5px;float:left;">
-		<input id="CreateVector" type="button" value="加载矢量图层" onClick="return createVector()" />
-		<input id="LoadStyle" type="button" value="加载默认风格" onClick="return loadStyle()" />
-		<!--设定图层风格-->	
-		<label for="FillColor" >填充颜色</label>
-		<label for="Red" >R</label>  
-		<input id="regionRed" name="Red" type="text" value="0" /> 
-		<label for="Green" >G</label> 
-		<input id="regionGreen" name="Green" type="text" value="0"/>
-		<label for="Blue" >B</label>
-		<input id="regionBlue" name="Blue" type="text" value="0" />
-		<label for="AltitudeMode">高度模式</label>
-		<select id="altitudeMode" name="AltitudeMode">
-		<option value="0">地表层高度模式</option>
-		<option value="1">距地相对高度模式</option>
-		<option value="2">绝对高度模式</option>
-		</select>
-		<label for="ExtendHeight" >拉伸高度</label>
-		<input id="extendHeight" name="extendHeight" type="text" value="0" />
-			
-		<br>
-		<label for="LineColor" >线条颜色</label>
-		<label for="Red" >R</label>  
-		<input id="lineRed" name="Red" type="text" value="0" /> 
-		<label for="Green" >G</label> 
-		<input id="lineGreen" name="Green" type="text" value="0"/>
-		<label for="Blue" >B</label> 
-		<input id="lineBlue" name="Blue" type="text" value="0" />
-		<label for="LineWidth" >线条宽度</label> 
-		<input id="lineWidth" name="LineWidth" type="text" value="1" />
-		<input id="ChangeStyle" type="button" value="更改图层风格" onClick="return changeStyle()" />
-		<br />	
-		</div>	
-		<div id="sceneControlDiv" style="position:absolute;left:5px;top:85px;bottom:5px;right:5px;float:left;"> 
-		</div>
-	</body>
-</html>

+ 0 - 98
gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_1.htm

@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-    <table style="width: 100%; font-size: 16px;" border="1" cellspacing="0">
-        <tr>
-            <td colspan="2">
-                <img alt="" src="images/Cylinder.jpg" style="height: 200px; width: 200px" />
-            </td>
-            <td colspan="2">
-                中国船舶燃料连云港有限公司
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-                设备名称:
-            </td>
-            <td>
-                立式储油罐
-            </td>
-            <td>
-                规格型号:
-            </td>
-            <td>
-                d30m、h14.8m,10000m³
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                制造日期:
-            </td>
-            <td>
-                1994.9
-            </td>
-            <td>
-                生产厂家:
-            </td>
-            <td>
-                南通化工设备制造安装公司
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                设备编号:
-            </td>
-            <td>
-                1#
-            </td>
-
-            <td>
-                用途:
-            </td>
-            <td>
-                储存燃料油
-            </td>
-        </tr>
-
-        <tr>
-            
-            <td>
-                启用时间:
-            </td>
-            <td>
-                1995.01
-            </td>
-
-             <td>
-                大修次数和时间:
-            </td>
-            <td>
-                
-            </td>
-
-        </tr>
-        <tr>
-           
-            <td>
-                备注:
-            </td>
-            <td>
-                380CST 
-            </td>
-            
-            <td>
-                &nbsp;
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-    </table>
-</body>
-</html>

+ 0 - 98
gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_10.htm

@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-    <table style="width: 100%; font-size: 16px;" border="1" cellspacing="0">
-        <tr>
-            <td colspan="2">
-                <img alt="" src="images/ball.jpg" style="height: 200px; width: 200px"  />
-            </td>
-            <td colspan="2">
-                中国船舶燃料连云港有限公司
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-                设备名称:
-            </td>
-            <td>
-                球形储油罐
-            </td>
-            <td>
-                规格型号:
-            </td>
-            <td>
-                d15.8m、h16.1m,2000m³
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                制造日期:
-            </td>
-            <td>
-                1998
-            </td>
-            <td>
-                生产厂家:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                设备编号:
-            </td>
-            <td>
-                10#
-            </td>
-
-            <td>
-                用途:
-            </td>
-            <td>
-                储存轻柴油
-            </td>
-        </tr>
-
-        <tr>
-            
-            <td>
-                启用时间:
-            </td>
-            <td>
-                1998
-            </td>
-
-             <td>
-                大修次数和时间:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-
-        </tr>
-        <tr>
-           
-            <td>
-                备注:
-            </td>
-            <td>
-                0#普柴
-            </td>
-            
-            <td>
-                &nbsp;
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-    </table>
-</body>
-</html>

+ 0 - 98
gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_11.htm

@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-    <table style="width: 100%; font-size: 16px;" border="1" cellspacing="0">
-        <tr>
-            <td colspan="2">
-                <img alt="" src="images/ball.jpg" style="height: 200px; width: 200px" />
-            </td>
-            <td colspan="2">
-                中国船舶燃料连云港有限公司
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-                设备名称:
-            </td>
-            <td>
-                防火墙
-            </td>
-            <td>
-                规格型号:
-            </td>
-            <td>
-               钢混,约:高1.7m*总长900m
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                制造日期:
-            </td>
-            <td>
-                1994.8
-            </td>
-            <td>
-                生产厂家:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                设备编号:
-            </td>
-            <td>
-               &nbsp;
-            </td>
-
-            <td>
-                用途:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-
-        <tr>
-            
-            <td>
-                启用时间:
-            </td>
-            <td>
-                1994.10
-            </td>
-
-             <td>
-                大修次数和时间:
-            </td>
-            <td>
-                重建过
-            </td>
-
-        </tr>
-        <tr>
-           
-            <td>
-                备注:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-            
-            <td>
-                &nbsp;
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-    </table>
-</body>
-</html>

+ 0 - 98
gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_2.htm

@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-    <table style="width: 100%; font-size: 16px;" border="1" cellspacing="0">
-        <tr>
-            <td colspan="2">
-                <img alt="" src="images/Cylinder.jpg" style="height: 200px; width: 200px" />
-            </td>
-            <td colspan="2">
-                中国船舶燃料连云港有限公司
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-                设备名称:
-            </td>
-            <td>
-                立式储油罐
-            </td>
-            <td>
-                规格型号:
-            </td>
-            <td>
-                d30m、h14.8m,10000m³
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                制造日期:
-            </td>
-            <td>
-                1994.9
-            </td>
-            <td>
-                生产厂家:
-            </td>
-            <td>
-                南通化工设备制造安装公司
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                设备编号:
-            </td>
-            <td>
-                2#
-            </td>
-
-            <td>
-                用途:
-            </td>
-            <td>
-                储存燃料油
-            </td>
-        </tr>
-
-        <tr>
-            
-            <td>
-                启用时间:
-            </td>
-            <td>
-                1995.01
-            </td>
-
-             <td>
-                大修次数和时间:
-            </td>
-            <td>
-                
-            </td>
-
-        </tr>
-        <tr>
-           
-            <td>
-                备注:
-            </td>
-            <td>
-                380CST 
-            </td>
-            
-            <td>
-                &nbsp;
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-    </table>
-</body>
-</html>

+ 0 - 98
gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_3.htm

@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-    <table style="width: 100%; font-size: 16px;" border="1" cellspacing="0">
-        <tr>
-            <td colspan="2">
-                <img alt="" src="images/Cylinder.jpg" style="height: 200px; width: 200px" />
-            </td>
-            <td colspan="2">
-                中国船舶燃料连云港有限公司
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-                设备名称:
-            </td>
-            <td>
-                立式储油罐
-            </td>
-            <td>
-                规格型号:
-            </td>
-            <td>
-                d17.6m、h13.7m,3000m³
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                制造日期:
-            </td>
-            <td>
-                1994.9
-            </td>
-            <td>
-                生产厂家:
-            </td>
-            <td>
-                南通化工设备制造安装公司
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                设备编号:
-            </td>
-            <td>
-                3#
-            </td>
-
-            <td>
-                用途:
-            </td>
-            <td>
-                储存轻柴油
-            </td>
-        </tr>
-
-        <tr>
-            
-            <td>
-                启用时间:
-            </td>
-            <td>
-                1995.01
-            </td>
-
-             <td>
-                大修次数和时间:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-
-        </tr>
-        <tr>
-           
-            <td>
-                备注:
-            </td>
-            <td>
-                MGO 
-            </td>
-            
-            <td>
-                &nbsp;
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-    </table>
-</body>
-</html>

+ 0 - 98
gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_4.htm

@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-    <table style="width: 100%; font-size: 16px;" border="1" cellspacing="0">
-        <tr>
-            <td colspan="2">
-                <img alt="" src="images/Cylinder.jpg" style="height: 200px; width: 200px" />
-            </td>
-            <td colspan="2">
-                中国船舶燃料连云港有限公司
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-                设备名称:
-            </td>
-            <td>
-                立式储油罐
-            </td>
-            <td>
-                规格型号:
-            </td>
-            <td>
-                d17.6m、h13.7m,3000m³
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                制造日期:
-            </td>
-            <td>
-                1994.9
-            </td>
-            <td>
-                生产厂家:
-            </td>
-            <td>
-                南通化工设备制造安装公司
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                设备编号:
-            </td>
-            <td>
-                4#
-            </td>
-
-            <td>
-                用途:
-            </td>
-            <td>
-                储存燃料油
-            </td>
-        </tr>
-
-        <tr>
-            
-            <td>
-                启用时间:
-            </td>
-            <td>
-                1995.01
-            </td>
-
-             <td>
-                大修次数和时间:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-
-        </tr>
-        <tr>
-           
-            <td>
-                备注:
-            </td>
-            <td>
-                120CST 
-            </td>
-            
-            <td>
-                &nbsp;
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-    </table>
-</body>
-</html>

+ 0 - 98
gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_5.htm

@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-    <table style="width: 100%; font-size: 16px;" border="1" cellspacing="0">
-        <tr>
-            <td colspan="2">
-                <img alt="" src="images/Cylinder.jpg" style="height: 200px; width: 200px" />
-            </td>
-            <td colspan="2">
-                中国船舶燃料连云港有限公司
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-                设备名称:
-            </td>
-            <td>
-                立式储油罐
-            </td>
-            <td>
-                规格型号:
-            </td>
-            <td>
-                d25m、h14.4m,7000m³
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                制造日期:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-            <td>
-                生产厂家:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                设备编号:
-            </td>
-            <td>
-                5#
-            </td>
-
-            <td>
-                用途:
-            </td>
-            <td>
-                储存轻柴油
-            </td>
-        </tr>
-
-        <tr>
-            
-            <td>
-                启用时间:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-
-             <td>
-                大修次数和时间:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-
-        </tr>
-        <tr>
-           
-            <td>
-                备注:
-            </td>
-            <td>
-                0#普柴
-            </td>
-            
-            <td>
-                &nbsp;
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-    </table>
-</body>
-</html>

+ 0 - 98
gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_6.htm

@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-    <table style="width: 100%; font-size: 16px;" border="1" cellspacing="0">
-        <tr>
-            <td colspan="2">
-                <img alt="" src="images/Cylinder.jpg" style="height: 200px; width: 200px" />
-            </td>
-            <td colspan="2">
-                中国船舶燃料连云港有限公司
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-                设备名称:
-            </td>
-            <td>
-                立式储油罐
-            </td>
-            <td>
-                规格型号:
-            </td>
-            <td>
-                d25m、h13.4m,6000m³
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                制造日期:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-            <td>
-                生产厂家:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                设备编号:
-            </td>
-            <td>
-                6#
-            </td>
-
-            <td>
-                用途:
-            </td>
-            <td>
-                储存燃料油
-            </td>
-        </tr>
-
-        <tr>
-            
-            <td>
-                启用时间:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-
-             <td>
-                大修次数和时间:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-
-        </tr>
-        <tr>
-           
-            <td>
-                备注:
-            </td>
-            <td>
-                180CST
-            </td>
-            
-            <td>
-                &nbsp;
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-    </table>
-</body>
-</html>

+ 0 - 98
gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_7.htm

@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-    <table style="width: 100%; font-size: 16px;" border="1" cellspacing="0">
-        <tr>
-            <td colspan="2">
-                <img alt="" src="images/Cylinder.jpg" style="height: 200px; width: 200px" />
-            </td>
-            <td colspan="2">
-                中国船舶燃料连云港有限公司
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-                设备名称:
-            </td>
-            <td>
-                立式储油罐
-            </td>
-            <td>
-                规格型号:
-            </td>
-            <td>
-                d27.5m、h14.8m,8300m³
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                制造日期:
-            </td>
-            <td>
-                2011.11
-            </td>
-            <td>
-                生产厂家:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                设备编号:
-            </td>
-            <td>
-                7#
-            </td>
-
-            <td>
-                用途:
-            </td>
-            <td>
-                储存轻柴油
-            </td>
-        </tr>
-
-        <tr>
-            
-            <td>
-                启用时间:
-            </td>
-            <td>
-                2011.12
-            </td>
-
-             <td>
-                大修次数和时间:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-
-        </tr>
-        <tr>
-           
-            <td>
-                备注:
-            </td>
-            <td>
-                2015.3 改沥青
-            </td>
-            
-            <td>
-                &nbsp;
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-    </table>
-</body>
-</html>

+ 0 - 98
gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_8.htm

@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-    <table style="width: 100%; font-size: 16px;" border="1" cellspacing="0">
-        <tr>
-            <td colspan="2">
-                <img alt="" src="images/Cylinder.jpg" style="height: 200px; width: 200px" />
-            </td>
-            <td colspan="2">
-                中国船舶燃料连云港有限公司
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-                设备名称:
-            </td>
-            <td>
-                立式储油罐
-            </td>
-            <td>
-                规格型号:
-            </td>
-            <td>
-                d27.5m、h14.8m,8300m³
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                制造日期:
-            </td>
-            <td>
-                2011.11
-            </td>
-            <td>
-                生产厂家:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                设备编号:
-            </td>
-            <td>
-                8#
-            </td>
-
-            <td>
-                用途:
-            </td>
-            <td>
-                储存燃料油
-            </td>
-        </tr>
-
-        <tr>
-            
-            <td>
-                启用时间:
-            </td>
-            <td>
-                2011.12
-            </td>
-
-             <td>
-                大修次数和时间:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-
-        </tr>
-        <tr>
-           
-            <td>
-                备注:
-            </td>
-            <td>
-                180CST
-            </td>
-            
-            <td>
-                &nbsp;
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-    </table>
-</body>
-</html>

+ 0 - 98
gkaq/yjpt-java/trunk/yjpt/GettingStarted/zr_9.htm

@@ -1,98 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title></title>
-</head>
-<body>
-    <table style="width: 100%; font-size: 16px;" border="1" cellspacing="0">
-        <tr>
-            <td colspan="2">
-                <img alt="" src="images/ball.jpg" style="height: 200px; width: 200px" />
-            </td>
-            <td colspan="2">
-                中国船舶燃料连云港有限公司
-            </td>
-
-        </tr>
-        <tr>
-            <td>
-                设备名称:
-            </td>
-            <td>
-                球形储油罐
-            </td>
-            <td>
-                规格型号:
-            </td>
-            <td>
-                d15.8m、h16.1m,2000m³
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                制造日期:
-            </td>
-            <td>
-                1998
-            </td>
-            <td>
-                生产厂家:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-
-        <tr>
-            <td>
-                设备编号:
-            </td>
-            <td>
-                9#
-            </td>
-
-            <td>
-                用途:
-            </td>
-            <td>
-                储存轻柴油
-            </td>
-        </tr>
-
-        <tr>
-            
-            <td>
-                启用时间:
-            </td>
-            <td>
-                1998
-            </td>
-
-             <td>
-                大修次数和时间:
-            </td>
-            <td>
-                &nbsp;
-            </td>
-
-        </tr>
-        <tr>
-           
-            <td>
-                备注:
-            </td>
-            <td>
-                0#普柴
-            </td>
-            
-            <td>
-                &nbsp;
-            </td>
-            <td>
-                &nbsp;
-            </td>
-        </tr>
-    </table>
-</body>
-</html>

+ 1 - 1
gkaq/yjpt-java/trunk/yjpt/iSignature/view/ZysqbpPrintSignature.jsp

@@ -775,7 +775,7 @@ try{
 							style="text-align: center; text-indent: 0px; vertical-align: middle;"
 							colspan="5"><span
 							style="color: rgb(0, 0, 0); line-height: 1.1406; font-family: 宋体; font-size: 20px; font-weight: bold;">
-								危险货物港口作业申请书 </span>
+								港口危险货物作业申请书 </span>
 						</td>
 						<td></td>
 					</tr>

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä