Browse Source

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

xt_mayh 9 years ago
parent
commit
c2a7193e53
28 changed files with 384 additions and 107 deletions
  1. 3 3
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchorPostionApproval.jsp
  2. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchorPostionApprovalDetail.jsp
  3. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchor_position_win.jsp
  4. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchor_space_position_list.jsp
  5. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchorageManger.jsp
  6. 26 26
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchorage_allview.jsp
  7. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchorage_info_edit.jsp
  8. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchorposition_info_edit.jsp
  9. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/chargeList.jsp
  10. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/chargeListDetail.jsp
  11. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/creditMagerDetailInfo.jsp
  12. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/declarUnitInfo.jsp
  13. 3 3
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/declarUnitManger.jsp
  14. 5 5
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/declareUnitAccountInfo.jsp
  15. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/declareUnitAudit.jsp
  16. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/declareUnitCredit.jsp
  17. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/declareUnitCreditRecord.jsp
  18. 33 33
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/index.jsp
  19. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/infostip.jsp
  20. 277 0
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/map_max.jsp
  21. 6 6
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/mooringStatistic.jsp
  22. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/mooring_manager_edit.jsp
  23. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/mooring_record.jsp
  24. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/pendingRepresentationsList.jsp
  25. 4 4
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/preAlarmInfo.jsp
  26. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/shipSearchContent.jsp
  27. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/unberthConfirm.jsp
  28. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/unberthConfirmDetail.jsp

+ 3 - 3
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchorPostionApproval.jsp

@@ -2,11 +2,11 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<link rel="stylesheet" href="<%=basePath%>/css/localAnchorManger/anchorpostionApproval.css?tag=<%=ConfigPro.VERSION%>">
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/anchorpostionApproval.css?tag=<%=ConfigPro.VERSION%>">
 <script
-	src="<%=basePath%>/js/localAnchorageManger/anchorPositionApproal.js?tag=<%=ConfigPro.VERSION%>"></script>
+	src="${pageContext.request.contextPath}/js/localAnchorageManger/anchorPositionApproal.js?tag=<%=ConfigPro.VERSION%>"></script>
 <script type="text/javascript">
-	var expExcelUrl = '<%=basePath%>/service/anchorposition/apply/unaudit?export_type=1&user_key=${UserInfo.ukey}';
+	var expExcelUrl = '${pageContext.request.contextPath}/service/anchorposition/apply/unaudit?export_type=1&user_key=${UserInfo.ukey}';
 </script>
 <div id="swap-content">
 <!-- 	<div class="condition-input"> style="height: 100px;" -->

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchorPostionApprovalDetail.jsp

@@ -3,7 +3,7 @@
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
 <script
-	src="<%=basePath%>/js/localAnchorageManger/anchorPositionApproalDetail.js?tag=<%=ConfigPro.VERSION%>"></script>
+	src="${pageContext.request.contextPath}/js/localAnchorageManger/anchorPositionApproalDetail.js?tag=<%=ConfigPro.VERSION%>"></script>
 <script>
 	/**
 	 * 取出可用锚位数量

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchor_position_win.jsp

@@ -7,7 +7,7 @@
 <html>
 <head>
 	<%@ include  file="../common.jsp"%>
- 	<link rel="stylesheet" href="<%=basePath%>/css/common_style.css" /> 
+ 	<link rel="stylesheet" href="${pageContext.request.contextPath}/css/common_style.css" /> 
 	<title>船舶信息</title>
  </head>
 <body>

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchor_space_position_list.jsp

@@ -2,7 +2,7 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<script src="<%=basePath%>/js/localAnchorageManger/anchor_space_position_list.js?tag=<%=ConfigPro.VERSION%>"></script>
+<script src="${pageContext.request.contextPath}/js/localAnchorageManger/anchor_space_position_list.js?tag=<%=ConfigPro.VERSION%>"></script>
 <p class="top-sub-nav">
 <!-- 	<a><span class="icon-mail-reply-all"></span> 返回锚地信息管理</a> -->
 	<span>锚位信息列表</span>

+ 2 - 2
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchorageManger.jsp

@@ -2,8 +2,8 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<link rel="stylesheet" href="<%=basePath%>/css/localAnchorManger/anchorManger.css?tag=<%=ConfigPro.VERSION%>">
-<script src="<%=basePath%>/js/localAnchorageManger/anchorageManger.js?tag=<%=ConfigPro.VERSION%>"></script>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/anchorManger.css?tag=<%=ConfigPro.VERSION%>">
+<script src="${pageContext.request.contextPath}/js/localAnchorageManger/anchorageManger.js?tag=<%=ConfigPro.VERSION%>"></script>
 
 <div class="condition-input">
 	<span>锚地名称</span>

+ 26 - 26
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchorage_allview.jsp

@@ -3,10 +3,10 @@
 <%@ page import="com.loygra.mooring.cfg.ConfigPro"%>
 <%@ include  file="../base_common.jsp"%>
 <link rel="stylesheet"
-	href="<%=basePath%>/css/localAnchorManger/anchorage_allview.css?tag=<%=ConfigPro.VERSION%>">
-<script type="text/javascript" src="<%=basePath%>/js/ais.js?tag=<%=ConfigPro.VERSION%>"></script>  
-<script type="text/javascript" src="<%=basePath%>/js/common-ais.js?tag=<%=ConfigPro.VERSION%>"></script>
-<script type="text/javascript" src="<%=basePath%>/js/localAnchorageManger/anchorage_allview.js?tag=<%=ConfigPro.VERSION%>"></script>
+	href="${pageContext.request.contextPath}/css/localAnchorManger/anchorage_allview.css?tag=<%=ConfigPro.VERSION%>">
+<script type="text/javascript" src="${pageContext.request.contextPath}/js/ais.js?tag=<%=ConfigPro.VERSION%>"></script>  
+<script type="text/javascript" src="${pageContext.request.contextPath}/js/common-ais.js?tag=<%=ConfigPro.VERSION%>"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath}/js/localAnchorageManger/anchorage_allview.js?tag=<%=ConfigPro.VERSION%>"></script>
 
 <div class="swap-content" style="position: relative"> 
 	<div id="map" style="position:absolute;left:0px;right:0px;width:100%;min-width:500px;min-height: 500px;"></div>
@@ -14,32 +14,32 @@
 	<div style="position: absolute;right:20px;top:20px;width:385px;">
 		<div style="height: 34px;padding: 4px 0;background: white;">
 			<div id="search-ship" class="tab-style" style="border-right: 1px solid #e2e2e2;width: 115px;">
-				<img class="imgcommon" src="<%=basePath%>/img/ship_icon_map.png">
-				<img class="imgactive" src="<%=basePath%>/img/ship_icon_map_active.png">
+				<img class="imgcommon" src="${pageContext.request.contextPath}/img/ship_icon_map.png">
+				<img class="imgactive" src="${pageContext.request.contextPath}/img/ship_icon_map_active.png">
 				<span style="margin-left: 8px;">搜索船舶</span>
-				<img class="imgcommon" style="margin-bottom:10px;margin-left: 6px;" src="<%=basePath%>/img/arrow_icon.png">
-				<img class="imgactive" style="margin-bottom:10px;margin-left: 6px;" src="<%=basePath%>/img/arrow_icon_active.png">
+				<img class="imgcommon" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon.png">
+				<img class="imgactive" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon_active.png">
 			</div>
 			<div id="paint-sample" class="tab-style" style="border-right: 1px solid #e2e2e2;width: 90px;">
-				<img class="imgcommon"  src="<%=basePath%>/img/paint_icon.png">
-				<img class="imgactive" src="<%=basePath%>/img/paint_icon_active.png">
+				<img class="imgcommon"  src="${pageContext.request.contextPath}/img/paint_icon.png">
+				<img class="imgactive" src="${pageContext.request.contextPath}/img/paint_icon_active.png">
 				<span style="margin-left: 8px;">图例</span>
-				<img class="imgcommon" style="margin-bottom:10px;margin-left: 6px;" src="<%=basePath%>/img/arrow_icon.png">
-				<img class="imgactive" style="margin-bottom:10px;margin-left: 6px;" src="<%=basePath%>/img/arrow_icon_active.png">
+				<img class="imgcommon" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon.png">
+				<img class="imgactive" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon_active.png">
 			</div>
 			<div id="img-layer" class="tab-style" style="border-right: 1px solid #e2e2e2;width: 90px;">
-				<img class="imgcommon" src="<%=basePath%>/img/img_layer_icon.png">
-				<img class="imgactive"  src="<%=basePath%>/img/img_layer_icon_active.png">
+				<img class="imgcommon" src="${pageContext.request.contextPath}/img/img_layer_icon.png">
+				<img class="imgactive"  src="${pageContext.request.contextPath}/img/img_layer_icon_active.png">
 				<span style="margin-left: 8px;">图层</span>
-				<img class="imgcommon" style="margin-bottom:10px;margin-left: 6px;" src="<%=basePath%>/img/arrow_icon.png">
-				<img class="imgactive" style="margin-bottom:10px;margin-left: 6px;" src="<%=basePath%>/img/arrow_icon_active.png">
+				<img class="imgcommon" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon.png">
+				<img class="imgactive" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon_active.png">
 			</div>
 			<div id="tool-btn" class="tab-style" style="width: 90px;">
-				<img class="imgcommon" src="<%=basePath%>/img/tool_map_icon.png">
-				<img class="imgactive"  src="<%=basePath%>/img/tool_map_icon_active.png">
+				<img class="imgcommon" src="${pageContext.request.contextPath}/img/tool_map_icon.png">
+				<img class="imgactive"  src="${pageContext.request.contextPath}/img/tool_map_icon_active.png">
 				<span style="margin-left: 8px;">工具</span>
-				<img class="imgcommon" style="margin-bottom:10px;margin-left: 6px;" src="<%=basePath%>/img/arrow_icon.png">
-				<img class="imgactive" style="margin-bottom:10px;margin-left: 6px;" src="<%=basePath%>/img/arrow_icon_active.png">
+				<img class="imgcommon" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon.png">
+				<img class="imgactive" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon_active.png">
 			</div>
 		</div>
 		<div style="margin-top: 3px;">
@@ -49,11 +49,11 @@
 				</div>
 				<div id="paint-sample-tab" style="height:36px;width:385px;background: white;line-height: 36px;display: none;" class="divsearch">
 					<span style="padding: 12px;font-size:12px;padding-left: 55px;">空闲</span>
-					<img style="margin: 0 30px 10px 0" src="<%=basePath%>/img/anchor_icon_kongxian.png">
+					<img style="margin: 0 30px 10px 0" src="${pageContext.request.contextPath}/img/anchor_icon_kongxian.png">
 					<span style="padding: 12px;font-size:12px;">预置</span>
-					<img style="margin: 0 30px 10px 0" src="<%=basePath%>/img/anchor_icon_yuliu.png">
+					<img style="margin: 0 30px 10px 0" src="${pageContext.request.contextPath}/img/anchor_icon_yuliu.png">
 					<span style="padding: 12px;font-size:12px;">占用</span>
-					<img style="margin-bottom: 10px;" src="<%=basePath%>/img/anchor_icon_zhanyong.png">
+					<img style="margin-bottom: 10px;" src="${pageContext.request.contextPath}/img/anchor_icon_zhanyong.png">
 				</div>
 				<div id="img-layer-tab" style="height:50px;width:385px;background: white;line-height: 25px;display: none;" class="divsearch">
 					<ul class="ul-layer-sel">
@@ -79,11 +79,11 @@
 				</div>
 				<div id="tool-btn-tab" style="height:73px;width:90px;background: white;line-height: 36px;display: none;float: right;" class="divsearch">
 					<div style="cursor: pointer;" id="measure-distance">
-						<img style="margin: 0 10px 11px 15px;" src="<%=basePath%>/img/distance_map_icon.png">
+						<img style="margin: 0 10px 11px 15px;" src="${pageContext.request.contextPath}/img/distance_map_icon.png">
 						<span style="font-size: 12px;">测距</span>
 					</div>
 					<div style="border-top: 1px solid #e2e2e2;cursor: pointer;" id="measure-area">
-						<img style="margin: 0 10px 11px 15px;" src="<%=basePath%>/img/measure_area.png">
+						<img style="margin: 0 10px 11px 15px;" src="${pageContext.request.contextPath}/img/measure_area.png">
 						<span  style="font-size: 12px;">测面积</span>
 					</div>
 				</div>
@@ -93,7 +93,7 @@
 <!-- 	<div id="anchorposition-tips"></div> -->
 	
 <!-- 	<div style="height:42px;width:340px;background: white;" class="divsearch"> -->
-<%-- 		<img src="<%=basePath%>/img/search_ship.png" style="margin-bottom : 4px;margin-left: 3px;"> --%>
+<%-- 		<img src="${pageContext.request.contextPath}/img/search_ship.png" style="margin-bottom : 4px;margin-left: 3px;"> --%>
 <!-- 		<input class="searchbtn" id="search_key_word" style="height: 42px;width: 240px;display: inline;border: white;margin-left: 10px;" placeholder="搜索船舶"> -->
 <!-- 		<span class="searchfindbtn" onclick="searchShip()" ></span> -->
 <!-- 	</div> -->

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchorage_info_edit.jsp

@@ -2,7 +2,7 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<script src="<%=basePath%>/js/localAnchorageManger/anchorage_info_edit.js?tag=<%=ConfigPro.VERSION%>"></script>
+<script src="${pageContext.request.contextPath}/js/localAnchorageManger/anchorage_info_edit.js?tag=<%=ConfigPro.VERSION%>"></script>
 <p class="top-sub-nav">
 	<span class="changeinfo">新建锚地信息</span>
 	<button id="save-btn" class="button button-main-border">

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/anchorposition_info_edit.jsp

@@ -2,7 +2,7 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<script src="<%=basePath%>/js/localAnchorageManger/anchorposition_info_edit.js?tag=<%=ConfigPro.VERSION%>"></script>
+<script src="${pageContext.request.contextPath}/js/localAnchorageManger/anchorposition_info_edit.js?tag=<%=ConfigPro.VERSION%>"></script>
 <p class="top-sub-nav">
 	<span>锚位信息编辑</span>
 	<button id="save-btn" class="button-main-border button">

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/chargeList.jsp

@@ -3,7 +3,7 @@
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
 <script
-	src="<%=basePath%>/js/localAnchorageManger/chargeList.js?tag=<%=ConfigPro.VERSION%>"></script>
+	src="${pageContext.request.contextPath}/js/localAnchorageManger/chargeList.js?tag=<%=ConfigPro.VERSION%>"></script>
 <!-- <div id="sub-nav"> -->
 <!-- 	<ul> -->
 <!-- 		<li> -->

+ 2 - 2
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/chargeListDetail.jsp

@@ -3,8 +3,8 @@
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
 <script
-	src="<%=basePath%>/js/localAnchorageManger/chargeListDetail.js?tag=<%=ConfigPro.VERSION%>"></script>
-<link rel="stylesheet" href="<%=basePath%>/css/localAnchorManger/unberthConfirmDetail.css?tag=<%=ConfigPro.VERSION%>"> 
+	src="${pageContext.request.contextPath}/js/localAnchorageManger/chargeListDetail.js?tag=<%=ConfigPro.VERSION%>"></script>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/unberthConfirmDetail.css?tag=<%=ConfigPro.VERSION%>"> 
 
 <p class="top-sub-nav">
 	<span>收费规则设置</span>

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/creditMagerDetailInfo.jsp

@@ -3,7 +3,7 @@
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
 <script
-	src="<%=basePath%>/js/localAnchorageManger/creditMagerDetailInfo.js?tag=<%=ConfigPro.VERSION%>"></script>
+	src="${pageContext.request.contextPath}/js/localAnchorageManger/creditMagerDetailInfo.js?tag=<%=ConfigPro.VERSION%>"></script>
 
 <p class="top-sub-nav">
 	<span>诚信行为详细信息</span>

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/declarUnitInfo.jsp

@@ -2,7 +2,7 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<link rel="stylesheet" href="<%=basePath%>/css/localAnchorManger/declareUnitInfoEdit.css?tag=<%=ConfigPro.VERSION%>">
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/declareUnitInfoEdit.css?tag=<%=ConfigPro.VERSION%>">
 	<p class="top-sub-nav">
 		<a><span class="icon-mail-reply-all"></span> 返回申报单位列表</a>
 		<input type="button" class="btn-style" value="拒绝" style="float:right ;margin-right: 70px;margin-top: 5px;">

+ 3 - 3
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/declarUnitManger.jsp

@@ -2,10 +2,10 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<link rel="stylesheet" href="<%=basePath%>/css/localAnchorManger/declarUnitManger.css?tag=<%=ConfigPro.VERSION%>">
-<script src="<%=basePath%>/js/localAnchorageManger/declareUnitMager.js?tag=<%=ConfigPro.VERSION%>"></script>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/declarUnitManger.css?tag=<%=ConfigPro.VERSION%>">
+<script src="${pageContext.request.contextPath}/js/localAnchorageManger/declareUnitMager.js?tag=<%=ConfigPro.VERSION%>"></script>
 <script type="text/javascript">
-	var localUrl="<%=basePath%>/service";
+	var localUrl="${pageContext.request.contextPath}/service";
 	$(function(){
 		$("#sub-nav li div").click(function(){
 			if($(this).hasClass("active")) {

+ 5 - 5
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/declareUnitAccountInfo.jsp

@@ -3,8 +3,8 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<link rel="stylesheet" href="<%=basePath%>/css/localAnchorManger/declareUnitAccountInfo.css?tag=<%=ConfigPro.VERSION%>">
-<script src="<%=basePath%>/js/localAnchorageManger/declareUnitAccountInfo.js?tag=<%=ConfigPro.VERSION%>"></script>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/declareUnitAccountInfo.css?tag=<%=ConfigPro.VERSION%>">
+<script src="${pageContext.request.contextPath}/js/localAnchorageManger/declareUnitAccountInfo.js?tag=<%=ConfigPro.VERSION%>"></script>
 <div class="sub-info-contain">
 	<p class="top-sub-nav">
 		<span>账号详情信息</span>
@@ -54,11 +54,11 @@
 				<tr>
 					<td class="td-head-column">组织机构代码证</td>
 					<td>
-						<img id="occ-photo" style="cursor: pointer;" class="photo-li" src="<%=basePath%>/img/default.png">
+						<img id="occ-photo" style="cursor: pointer;" class="photo-li" src="${pageContext.request.contextPath}/img/default.png">
 					</td>
 					<td class="td-head-column">营业执照</td>
 					<td>
-						<img id="license-photo" style="cursor: pointer;" class="photo-li" src="<%=basePath%>/img/default.png">
+						<img id="license-photo" style="cursor: pointer;" class="photo-li" src="${pageContext.request.contextPath}/img/default.png">
 					</td>
 				</tr>
 			</tbody>
@@ -85,7 +85,7 @@
 	</div>
 	
 	<div class="dialog-mask" style="display: none;"></div>
-	<img class="prePhoto self-img" src="<%=basePath%>/img/default.png">
+	<img class="prePhoto self-img" src="${pageContext.request.contextPath}/img/default.png">
 	<div  class="dialog self-dialog refuse-dialog">
 		<div class="dialog-body">
 			<p  style="margin-left: 0px;">确定拒绝该申报单位的核准?</p>

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/declareUnitAudit.jsp

@@ -2,7 +2,7 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<script src="<%=basePath%>/js/localAnchorageManger/declareUnitAudit.js?tag=<%=ConfigPro.VERSION%>"></script>
+<script src="${pageContext.request.contextPath}/js/localAnchorageManger/declareUnitAudit.js?tag=<%=ConfigPro.VERSION%>"></script>
 <div class="condition-input" style="height: 100px;">
 		<span>法人姓名</span>
 		<input type="text" id="legal-person-name" class="input sub-input">

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/declareUnitCredit.jsp

@@ -3,7 +3,7 @@
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
 <script
-	src="<%=basePath%>/js/localAnchorageManger/declareUnitCredit.js?tag=<%=ConfigPro.VERSION%>"></script>
+	src="${pageContext.request.contextPath}/js/localAnchorageManger/declareUnitCredit.js?tag=<%=ConfigPro.VERSION%>"></script>
 <div class="condition-input">
 	<span>公司名称</span>
 	<input type="text" class="input sub-input" id="agent_user_name">

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/declareUnitCreditRecord.jsp

@@ -2,7 +2,7 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<script src="<%=basePath%>/js/localAnchorageManger/declareUnitCreditRecord.js?tag=<%=ConfigPro.VERSION%>"></script>
+<script src="${pageContext.request.contextPath}/js/localAnchorageManger/declareUnitCreditRecord.js?tag=<%=ConfigPro.VERSION%>"></script>
 <p class="top-sub-nav">
 	<span>诚信记录</span>
 <!-- 	<a><span class="icon-mail-reply-all"></span> 返回诚信管理列表</a> -->

+ 33 - 33
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/index.jsp

@@ -5,24 +5,24 @@
 <html>
 <head>
 	<%@ include  file="../common.jsp"%>
-	<link type="text/css" href="<%=basePath%>/lib/datetimepicker/jquery-ui.css" rel="stylesheet" />
-    <link type="text/css" href="<%=basePath%>/lib/datetimepicker/jquery-ui-timepicker-addon.css" rel="stylesheet" />
-    <script type="text/javascript" src="<%=basePath%>/lib/jqueryPaginator/jqPaginator.min.js?tag=<%=ConfigPro.VERSION%>"></script>
-	<script type="text/javascript" src="<%=basePath%>/lib/datetimepicker/jquery-ui-1.8.17.custom.min.js"></script>
-	<script type="text/javascript" src="<%=basePath%>/lib/datetimepicker/jquery-ui-timepicker-addon.js"></script>
-    <script type="text/javascript" src="<%=basePath%>/lib/datetimepicker/jquery-ui-timepicker-zh-CN.js"></script>
-	<script src="<%=basePath%>/lib/highcharts/highcharts.js?tag=<%=ConfigPro.VERSION%>"></script>
+	<link type="text/css" href="${pageContext.request.contextPath}/lib/datetimepicker/jquery-ui.css" rel="stylesheet" />
+    <link type="text/css" href="${pageContext.request.contextPath}/lib/datetimepicker/jquery-ui-timepicker-addon.css" rel="stylesheet" />
+    <script type="text/javascript" src="${pageContext.request.contextPath}/lib/jqueryPaginator/jqPaginator.min.js?tag=<%=ConfigPro.VERSION%>"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath}/lib/datetimepicker/jquery-ui-1.8.17.custom.min.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath}/lib/datetimepicker/jquery-ui-timepicker-addon.js"></script>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/lib/datetimepicker/jquery-ui-timepicker-zh-CN.js"></script>
+	<script src="${pageContext.request.contextPath}/lib/highcharts/highcharts.js?tag=<%=ConfigPro.VERSION%>"></script>
 	<!-- your css and js -->
-	<link rel="stylesheet" href="<%=basePath%>/css/localAnchorManger/index.css?tag=<%=ConfigPro.VERSION%>">
-	<link rel="stylesheet" type="text/css" href="<%=basePath%>/lib/webUploader/webuploader.css">
-	<script type="text/javascript" src="<%=basePath%>/lib/webUploader/webuploader.min.js"></script>
-	<script src="<%=basePath%>/lib/notify/jquery.notify.js?tag=<%=ConfigPro.VERSION%>"></script> 
-	<script src="<%=basePath%>/js/websocket.js?tag=<%=ConfigPro.VERSION%>"></script> 
+	<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/index.css?tag=<%=ConfigPro.VERSION%>">
+	<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/lib/webUploader/webuploader.css">
+	<script type="text/javascript" src="${pageContext.request.contextPath}/lib/webUploader/webuploader.min.js"></script>
+	<script src="${pageContext.request.contextPath}/lib/notify/jquery.notify.js?tag=<%=ConfigPro.VERSION%>"></script> 
+	<script src="${pageContext.request.contextPath}/js/websocket.js?tag=<%=ConfigPro.VERSION%>"></script> 
 	
 	<script type="text/javascript">
-		var requestFileUrl = "<%=basePath%>";
-   		var localUrladdress = "<%=basePath%>";
-   		var vedio_url = "<%=basePath%>";
+		var requestFileUrl = "${pageContext.request.contextPath}";
+   		var localUrladdress = "${pageContext.request.contextPath}";
+   		var vedio_url = "${pageContext.request.contextPath}";
    		var user_key = "${UserInfo.ukey}";
    		var img_url = "<%=ConfigPro.IMAGE_DOMAIN%>/";
    		var user_name = "${UserInfo.name}" ;
@@ -31,11 +31,11 @@
    		var self_harbour_id = "${harbour_code}"; 		//本港口的code
    		var locationInterval = null, aisInterval = null;
 	 </script>
-	<link rel="stylesheet" href="<%=basePath%>/css/common_style.css?tag=<%=ConfigPro.VERSION%>">
-	<script src="<%=basePath%>/js/base_config.js?tag=<%=ConfigPro.VERSION%>" ></script>
-	<script src="<%=basePath%>/js/localAnchorageManger/index.js?tag=<%=ConfigPro.VERSION%>"></script>
-	<script type="text/javascript" src="<%=basePath%>/map/lib/SuperMap.Include.js"></script>
-	<script src="<%=basePath%>/lib/respond.js"></script>
+	<link rel="stylesheet" href="${pageContext.request.contextPath}/css/common_style.css?tag=<%=ConfigPro.VERSION%>">
+	<script src="${pageContext.request.contextPath}/js/base_config.js?tag=<%=ConfigPro.VERSION%>" ></script>
+	<script src="${pageContext.request.contextPath}/js/localAnchorageManger/index.js?tag=<%=ConfigPro.VERSION%>"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath}/map/lib/SuperMap.Include.js"></script>
+	<script src="${pageContext.request.contextPath}/lib/respond.js"></script>
 	<title><%=ConfigPro.TITLE%></title>
 </head>
 	<body>
@@ -44,7 +44,7 @@
 			<span class="tooltipsContent">请按照要求填写内容</span>
 		</div>
 		<div class="dialog-floor loadingstyle"></div>
-		<img class="loading-icon loadingstyle" src="<%=basePath%>/img/loading.gif">
+		<img class="loading-icon loadingstyle" src="${pageContext.request.contextPath}/img/loading.gif">
 		
 		<div class="suspendedBall closeicon">
 		</div>
@@ -62,7 +62,7 @@
 				
 				<div style="float: left;color:white;line-height: 90px;padding-left: 15px;  " >
 			 	 ${weather.city_name} ${weather.cond}  
-			 	 <img src="<%=basePath%>/img/weather/${weather.cond_code}.png" 
+			 	 <img src="${pageContext.request.contextPath}/img/weather/${weather.cond_code}.png" 
 			 	 style="margin-bottom: 33px;" width="30">	${weather.wind_direction} ${weather.wind_level}级  ${weather.temperature}°C
 	<!-- 				<iframe style="margin-top: 33px;margin-left: 20px;" width="158" scrolling="no" height="18" frameborder="0" allowtransparency="true" src="http://i.tianqi.com/index.php?c=code&id=1&color=%23FFFFFF&icon=1&wind=1&num=1"></iframe> -->
 				</div>
@@ -71,7 +71,7 @@
 <!-- 					<iframe style="margin-top: 33px;margin-left: 20px;" width="158" scrolling="no" height="18" frameborder="0" allowtransparency="true" src="http://i.tianqi.com/index.php?c=code&id=1&color=%23FFFFFF&icon=1&wind=1&num=1"></iframe> -->
 <!-- 				</div> -->
 				<div class="right-header">
-					<a href="<%=basePath%>/service/user/logout" style="display: block;color: white;padding-left:26px;">退出</a>
+					<a href="${pageContext.request.contextPath}/service/user/logout" style="display: block;color: white;padding-left:26px;">退出</a>
 				</div>
 			</div>
 			<span style="display: none;" id="status"></span>
@@ -80,7 +80,7 @@
 					<ul class="first-nav-bar">
 						<li class="nav-bar-li active">
 							<div id="mooring-exam-agree">
-								<img src="<%=basePath%>/img/maoweishenpi.png">
+								<img src="${pageContext.request.contextPath}/img/maoweishenpi.png">
 								<a>锚位核准管理</a>
 							</div>
 							<ul class="second-nar-bar" id="second-mooring-exam-agree" style="display: block;">
@@ -91,7 +91,7 @@
 						</li>
 						<li class="nav-bar-li">
 							<div  id="mooring-mager">
-								<img src="<%=basePath%>/img/maodiguanli.png">
+								<img src="${pageContext.request.contextPath}/img/maodiguanli.png">
 								<a>锚地管理</a>
 							</div>
 							<ul class="second-nar-bar" id="second-mooring-mager">
@@ -101,7 +101,7 @@
 						</li>
 						<li class="nav-bar-li">
 							<div  id="report-mager">
-								<img src="<%=basePath%>/img/shenbaodanweiguanli.png">
+								<img src="${pageContext.request.contextPath}/img/shenbaodanweiguanli.png">
 								<a>申报单位管理</a>
 							</div>
 							<ul class="second-nar-bar" id="second-report-mager">
@@ -111,7 +111,7 @@
 						</li>
 						<li class="nav-bar-li">
 							<div id="announcement-mager">
-								<img src="<%=basePath%>/img/gonggaoguanli.png">
+								<img src="${pageContext.request.contextPath}/img/gonggaoguanli.png">
 								<a>公告管理</a>
 							</div>
 							<ul class="second-nar-bar" id="second-announcement-mager">
@@ -122,7 +122,7 @@
 						</li>
 						<li class="nav-bar-li">
 							<div id="pilotage-manger">
-								<img src="<%=basePath%>/img/yinhang.png">
+								<img src="${pageContext.request.contextPath}/img/yinhang.png">
 								<a>引航计划</a>
 							</div>
 							<ul class="second-nar-bar" id="second-pilotage-manger">
@@ -131,7 +131,7 @@
 						</li>
 						<li class="nav-bar-li">
 							<div id="statistical-analysis">
-								<img src="<%=basePath%>/img/tongjifenxi.png">
+								<img src="${pageContext.request.contextPath}/img/tongjifenxi.png">
 								<a>统计分析</a>
 							</div>
 							<ul class="second-nar-bar" id="second-statistical-analysis">
@@ -141,7 +141,7 @@
 						</li>
 						<li class="nav-bar-li">
 							<div id="fee-mager">
-								<img src="<%=basePath%>/img/shoufeiguizeguanli.png">
+								<img src="${pageContext.request.contextPath}/img/shoufeiguizeguanli.png">
 								<a>收费管理</a>
 							</div>
 							<ul class="second-nar-bar" id="second-fee-mager">
@@ -162,14 +162,14 @@
 				            		<span style="margin-left: 12px;" class="icon-search"></span>
 				            		<span>申报计划表</span>
 				            	</div>
-				            	<img style="display: none;" src="<%=basePath%>/img/close_btn.png" class="close-btn">
+				            	<img style="display: none;" src="${pageContext.request.contextPath}/img/close_btn.png" class="close-btn">
 				            </li>
 				        </ul>
 <!-- 				        <div id="buttonLeft"  class="buttonLeft buttonStutas"> -->
-<%-- 				              <img alt="" src="<%=basePath%>/img/left.png"> --%>
+<%-- 				              <img alt="" src="${pageContext.request.contextPath}/img/left.png"> --%>
 <!-- 				        </div> -->
 <!-- 				        <div id="buttonRight" class="buttonRight buttonStutas"> -->
-<%-- 				              <img alt="" src="<%=basePath%>/img/right.png"> --%>
+<%-- 				              <img alt="" src="${pageContext.request.contextPath}/img/right.png"> --%>
 <!-- 				        </div> -->
 					</div>
 			        <div id="body-content">

+ 2 - 2
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/infostip.jsp

@@ -13,8 +13,8 @@
     		var self_harbour_id = "${harbour_code}"; 		//本港口的code
 	 </script>
 	 <link rel="stylesheet" href="<%=ConfigPro.LOCAL_DOMAIN%>/css/common_style.css" />
- 	<script type="text/javascript" src="<%=basePath%>/lib/jqueryPaginator/jqPaginator.min.js?tag=<%=ConfigPro.VERSION%>"></script>
- 	<script src="<%=basePath%>/js/localAnchorageManger/infostip.js?tag=<%=ConfigPro.VERSION%>" ></script>
+ 	<script type="text/javascript" src="${pageContext.request.contextPath}/lib/jqueryPaginator/jqPaginator.min.js?tag=<%=ConfigPro.VERSION%>"></script>
+ 	<script src="${pageContext.request.contextPath}/js/localAnchorageManger/infostip.js?tag=<%=ConfigPro.VERSION%>" ></script>
 </head>
 <body>
 	<div style="padding: 0px 20px;">

+ 277 - 0
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/map_max.jsp

@@ -0,0 +1,277 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%@ page import="com.loygra.mooring.cfg.ConfigPro"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<!DOCTYPE html>
+<html>
+<head>
+	<%@ include  file="../common.jsp"%>
+ 	<link rel="stylesheet" href="${pageContext.request.contextPath}/css/common_style.css" />
+ 	<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/anchorage_allview.css?tag=<%=ConfigPro.VERSION%>">
+	<script src="${pageContext.request.contextPath}/js/controlCenter/overview.js"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath}/js/common-ais.js?tag=<%=ConfigPro.VERSION%>"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath}/js/ais.js?tag=<%=ConfigPro.VERSION%>"></script>
+	<script src="${pageContext.request.contextPath}/lib/notify/jquery.notify.js?tag=<%=ConfigPro.VERSION%>"></script> 
+<%-- 	<script src="${pageContext.request.contextPath}/js/websocket.js?tag=<%=ConfigPro.VERSION%>"></script> --%>
+	<script src="${pageContext.request.contextPath}/js/base_config.js?tag=<%=ConfigPro.VERSION%>" ></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath}/map/lib/SuperMap.Include.js"></script>
+ 	 <script type="text/javascript">
+ 		var user_key = "${UserInfo.ukey}";
+		var user_name = "${UserInfo.name}" ;
+		var user_id = "${UserInfo.id}";
+		var img_url = "<%=ConfigPro.IMAGE_DOMAIN%>/";
+		var vedio_url = "${pageContext.request.contextPath}";
+		var localUrladdress = "${pageContext.request.contextPath}";
+		var relate_type = "${UserInfo.relate_type}";
+  		var self_harbour_id = "${harbour_code}"; 		//本港口的code
+		var locationInterval = null, aisInterval = null;
+	  	$(function(){
+	  		if(relate_type == 3){
+	  			self_harbour_id = '321000';
+	  		}
+	  	})
+	 </script>
+	<title>地图最大化</title>
+</head>
+<body>
+<div class="swap-content" style="position: relative">  <!-- id="swap-content" -->
+	<div id="map" style="position:absolute;left:0px;right:0px;width:100%;"></div>
+	
+	<div style="position: absolute;right:20px;top:20px;width:385px;">
+		<div style="height: 34px;padding: 4px 0;background: white;">
+			<div id="search-ship" class="tab-style" style="border-right: 1px solid #e2e2e2;width: 115px;">
+				<img class="imgcommon" src="${pageContext.request.contextPath}/img/ship_icon_map.png">
+				<img class="imgactive" src="${pageContext.request.contextPath}/img/ship_icon_map_active.png">
+				<span style="margin-left: 8px;">搜索船舶</span>
+				<img class="imgcommon" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon.png">
+				<img class="imgactive" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon_active.png">
+			</div>
+			<div id="paint-sample" class="tab-style" style="border-right: 1px solid #e2e2e2;width: 90px;">
+				<img class="imgcommon"  src="${pageContext.request.contextPath}/img/paint_icon.png">
+				<img class="imgactive" src="${pageContext.request.contextPath}/img/paint_icon_active.png">
+				<span style="margin-left: 8px;">图例</span>
+				<img class="imgcommon" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon.png">
+				<img class="imgactive" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon_active.png">
+			</div>
+			<div id="img-layer" class="tab-style" style="border-right: 1px solid #e2e2e2;width: 90px;">
+				<img class="imgcommon" src="${pageContext.request.contextPath}/img/img_layer_icon.png">
+				<img class="imgactive"  src="${pageContext.request.contextPath}/img/img_layer_icon_active.png">
+				<span style="margin-left: 8px;">图层</span>
+				<img class="imgcommon" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon.png">
+				<img class="imgactive" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon_active.png">
+			</div>
+			<div id="tool-btn" class="tab-style" style="width: 90px;">
+				<img class="imgcommon" src="${pageContext.request.contextPath}/img/tool_map_icon.png">
+				<img class="imgactive"  src="${pageContext.request.contextPath}/img/tool_map_icon_active.png">
+				<span style="margin-left: 8px;">工具</span>
+				<img class="imgcommon" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon.png">
+				<img class="imgactive" style="margin-bottom:10px;margin-left: 6px;" src="${pageContext.request.contextPath}/img/arrow_icon_active.png">
+			</div>
+		</div>
+		<div style="margin-top: 3px;">
+				<div id="search-ship-tab" style="height:36px;width:385px;background: white;display: none;" class="divsearch">
+					<input class="searchbtn" id="search_key_word" style="height: 36px;width: 240px;display: inline;border: white;margin-left: 10px;" placeholder="搜索船舶">
+					<span class="searchfindbtn" onclick="searchShip()" ></span>
+				</div>
+				<div id="paint-sample-tab" style="height:36px;width:385px;background: white;line-height: 36px;display: none;" class="divsearch">
+					<span style="padding: 12px;font-size:12px;padding-left: 55px;">空闲</span>
+					<img style="margin: 0 30px 10px 0" src="${pageContext.request.contextPath}/img/anchor_icon_kongxian.png">
+					<span style="padding: 12px;font-size:12px;">预置</span>
+					<img style="margin: 0 30px 10px 0" src="${pageContext.request.contextPath}/img/anchor_icon_yuliu.png">
+					<span style="padding: 12px;font-size:12px;">占用</span>
+					<img style="margin-bottom: 10px;" src="${pageContext.request.contextPath}/img/anchor_icon_zhanyong.png">
+				</div>
+				<div id="img-layer-tab" style="height:50px;width:385px;background: white;line-height: 25px;display: none;" class="divsearch">
+					<ul class="ul-layer-sel">
+						<li>
+							<input id="shipCheck" checked="checked" type="checkbox"> 船舶图层
+						</li>
+						<li>
+							<input id="mwCheck" checked="checked" type="checkbox"> 锚位图层
+						</li>
+						<li>
+							<input id="mdCheck" checked="checked"  type="checkbox"> 锚地图层
+						</li>
+						<li>
+							<input id="alarmCheck" type="checkbox"> 启动预警
+						</li>
+						<li>
+							<input id="planShipCheck" type="checkbox"> 计划船舶
+						</li>
+						<li>
+							<span class="click-active">清除所有图层</span>
+						</li>
+					</ul>
+				</div>
+				<div id="tool-btn-tab" style="height:73px;width:90px;background: white;line-height: 36px;display: none;float: right;" class="divsearch">
+					<div style="cursor: pointer;" id="measure-distance">
+						<img style="margin: 0 10px 11px 15px;height: 36px;" src="${pageContext.request.contextPath}/img/distance_map_icon.png">
+						<span style="font-size: 12px;">测距</span>
+					</div>
+					<div style="border-top: 1px solid #e2e2e2;cursor: pointer;" id="measure-area">
+						<img style="margin: 0 10px 9px 15px;height: 36px;" src="${pageContext.request.contextPath}/img/measure_area.png">
+						<span  style="font-size: 12px;">测面积</span>
+					</div>
+				</div>
+		</div>
+	</div>
+
+	<div style="top:156px;" class="tip-style" >
+		<div class="max-btn active" value="maxbtn">
+		</div>
+	</div>
+	
+	<div class="map-mode-change">
+	</div>
+
+	<div id="ship-info-wrap" style="width: 480px;height: 234px;display: none">
+	 	<div>  
+			<div class="ship-info-block" style="font-size: 12px;">
+				<p class="info-line">
+					<span style="display: inline-block; padding-left: 20px;margin-bottom: 3px;"> <span>船舶名称:</span> <span id="ship-name"></span></span>
+				</p>
+				<p class="info-line">
+					<span class="info-block"> <span>船舶MMSI:</span> <span id="mmsi-id"></span></span>
+					 <span class="info-block"> <span>船首向:</span> <span id="csx"></span>
+					</span>
+				</p>
+				<p class="info-line">
+					 <span class="info-block"> <span>船 长(米):</span> <span id="ship-length"></span></span>
+					 <span class="info-block"> <span>船 宽(米):</span> <span id="ship-width"></span></span>
+				</p>
+				
+				<p class="info-line">
+					<span class="info-block"> <span>实时时间:</span> <span id="realtime"></span>
+					</span> <span class="info-block"> <span>船舶类型:</span> <span id="ship-type"></span>
+					</span>
+				</p>
+				<p class="info-line">
+					<span class="info-block"> <span>船舶IMO:</span> <span id="cbimo"></span>
+					</span> <span class="info-block"> <span>航行状态:</span> <span id="direct-status"></span>
+					</span>
+				</p>
+				<p class="info-line">
+					<span class="info-block"> <span>航行速度(节):</span> <span id="ship-speed"></span>
+					</span> <span class="info-block"> <span>预计到港时间:</span><span id="park-time"></span>
+					</span>
+				</p>
+				<p class="info-line">
+					<span class="info-block"> <span>航迹向:</span> <span id="ship-course"></span></span>
+					</span> <span class="info-block"> <span>呼号:</span> <span id="callsign"></span>
+					</span>
+				</p>
+			 
+				<div align="center">
+					<a onclick="getShipDetail()" class="ship-track-info">船舶详情</a>
+					<a onclick="getShipTrack(3)" class="ship-track-info">3天轨迹</a>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div id="anchorage-info"  style="width: 480px;height: 200px;;display: none">
+	 	<div> 
+			<div class="ship-info-block" style="font-size: 12px;">
+				<p class="info-line">
+					<span id="anchorage-id" style="display: none;"></span>
+					<span class="info-block"> <span>锚地名称:</span> <span id="anchorage-name"></span>
+					</span> <span class="info-block"> <span>所属港口:</span> <span id="harbour-name"></span>
+					</span>
+				</p>
+				<p class="info-line">
+					<span class="info-block"> <span>长度(米):</span> <span id="anchorage-length"></span>
+					</span> <span class="info-block"> <span>宽度(米):</span> <span id="anchorage-width"></span>
+					</span>
+				</p>
+				<p class="info-line">
+					<span class="info-block"> <span>面  积:</span> <span id="anchorage-square"></span>
+					</span> <span class="info-block"> <span>材  质:</span> <span id="geology"></span>
+					</span>
+				</p>
+				<p class="info-line">
+				 <span class="info-block">	<span>目  的:</span> <span id="anchorage-purpose"></span>
+					</span>
+					<span class="info-block"> <span>锚位数量:</span> <span id="anchorposition-num" class="element-active"></span>
+					</span>
+				</p>
+				<p class="info-line">
+					 <p style="padding-left: 20px;margin-bottom: 3px;"><span>位  置:</span><span id="anchorage-position"></span></p>
+				</p>
+				<p class="info-line">
+					 <p style="padding-left: 20px;margin-bottom: 3px;"><span>备  注:</span><span id="annchorage-capacity"></span></p>
+				</p>
+			</div>
+		</div>
+	</div>
+	<div id="anchorposition-info" style="width: 200px;height: 200px;display: none">
+	 	<div> 
+			<div class="ship-info-block" style="font-size: 12px;">
+				<p class="info-line">
+					<span id="status-id" style="display: none"></span>
+					<span id="anchorposition-id" style="display: none"></span>
+					<span class="info-block"> <span>名  称:</span> <span id="anchorposition-name"></span>
+					</span> 
+					<span class="info-block"> <span>当前状态:</span> <span id="anchor-status" style="cursor:pointer"></span>
+									</span>
+					<span class="info-block"> <span>锚位坐标:</span> <span id="anchor-lonlat"></span>
+					</span>
+					<span class="info-block"> <span>锚泊方式:</span> <span id="anchor-ship-type"></span>
+					</span>
+					<span class="info-block"> <span>锚位用途:</span> <span id="anchor-using"></span></span> 
+				</p> 
+				<p class="info-line type-show-4" style="border-top: 1px solid #d9d9d9;padding-top: 2px;display: none;">
+					<span class="info-block"> <span>船舶名称:</span> <span id="ship-name-en-zh"></span></span>
+					<span class="info-block"> <span>计划锚泊时间:</span> <span id="plan-mooring-time"></span></span>
+					<span class="info-block"> <span>计划离泊时间:</span> <span id="plan-level-time"></span></span>
+				</p>
+				<p class="info-line type-show-3" style="border-top: 1px solid #d9d9d9;padding-top: 2px;display: none;">
+					<span class="info-block"> <span>船舶名称:</span> <span id="ship-name-en-zh2"></span></span>
+					<span class="info-block"> <span>计划锚泊时间:</span> <span id="plan-mooring-time2"></span></span>
+					<span class="info-block"> <span>计划离泊时间:</span> <span id="plan-level-time2"></span></span>
+					<span class="info-block"> <span>当前坐标:</span> <span id="actual-latlon"></span></span>
+<!-- 					<span class="info-block"> <span>靠泊坐标偏移:</span> <span id="actual-cha"></span></span> -->
+				</p>
+			</div>
+		</div>
+	</div>
+	<div id="ship-detail-info" style="display: none">
+		<table class="ui celled table">
+			<tr><td class="center">船舶编号</td><td><span id="ship-cbbh"></span></td></tr>
+			<tr><td class="center">船舶登记号</td><td><span id="ship-cbdjh"></span></td></tr>
+			<tr><td class="center">船舶分类</td><td><span id="ship-cbfl"></span></td></tr> 
+		    <tr><td class="center">中文船名</td><td><span id="ship-zwcm"></span></td></tr> 
+		    <tr><td class="center">英文船名</td><td><span id="ship-ywcm"></span></td></tr> 
+		    <tr><td class="center">IMO编号</td><td><span id="ship-imobh"></span></td></tr> 
+		    <tr><td class="center">船舶呼号</td><td><span id="ship-cbhh"></span></td></tr> 
+		    <tr><td class="center">船籍港</td><td><span id="ship-cjg"></span></td></tr> 
+		    <tr><td class="center">船舶经营人</td><td><span id="ship-cbjyr"></span></td></tr> 
+		    <tr><td class="center">船舶所有人</td><td><span id="ship-cbsyr"></span></td></tr> 
+		    <tr><td class="center">造船厂</td><td><span id="ship-zcc"></span></td></tr> 
+		    <tr><td class="center">建成日期</td><td><span id="ship-jcrq"></span></td></tr> 
+		    <tr><td class="center">初次登记号</td><td><span id="ship-ccdjh"></span></td></tr> 
+		    <tr><td class="center">船检登记号</td><td><span id="ship-cjdjh"></span></td></tr> 
+		    <tr><td class="center">航线</td><td><span id="ship-hx"></span></td></tr> 
+		    <tr><td class="center">航区代码</td><td><span id="ship-hqdm"></span></td></tr> 
+		    <tr><td class="center">船舶长度(米)</td><td><span id="ship-cbcd"></span></td></tr> 
+		    <tr><td class="center">船舶型宽(米)</td><td><span id="ship-cbxk"></span></td></tr> 
+		    <tr><td class="center">船舶型深(米)</td><td><span id="ship-cbxs"></span></td></tr> 
+		    <tr><td class="center">总吨</td><td><span id="ship-zd"></span></td></tr> 
+		    <tr><td class="center">净吨</td><td><span id="ship-jd"></span></td></tr> 
+		    <tr><td class="center">总载重吨</td><td><span id="ship-zzzd"></span></td></tr> 
+		    <tr><td class="center">船舶标识号</td><td><span id="ship-cbbsh"></span></td></tr> 
+		    <tr><td class="center">主机种类代码</td><td><span id="ship-zjzldm"></span></td></tr> 
+		    <tr><td class="center">主机数量(个)</td><td><span id="ship-zjsl"></span></td></tr> 
+		    <tr><td class="center">主机功率(kw)</td><td><span id="ship-zjgl"></span></td></tr> 
+		    <tr><td class="center">夏季满载吃水</td><td><span id="ship-xjmzcs"></span></td></tr> 
+		    <tr><td class="center">核定抗风等级</td><td><span id="ship-hdkfdj"></span></td></tr> 
+		    <tr><td class="center">最小干舷</td><td><span id="ship-zxgx"></span></td></tr> 
+		    <tr><td class="center">箱位</td><td><span id="ship-xw"></span></td></tr> 
+		    <tr><td class="center">车位</td><td><span id="ship-cw"></span></td></tr> 
+		    <tr><td class="center">客位</td><td><span id="ship-gw"></span></td></tr> 
+		    <tr><td class="center">最低安全配员人数</td><td><span id="ship-zdaqpyrs"></span></td></tr> 
+		    <tr><td class="center">救生设备最大人数</td><td><span id="ship-jssbzdrs"></span></td></tr> 
+		    <tr><td class="center">牌簿号</td><td><span id="ship-pbh"></span></td></tr> 
+		</table>
+	</div>
+</div>
+</body>
+</html>

+ 6 - 6
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/mooringStatistic.jsp

@@ -2,9 +2,9 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<link rel="stylesheet" href="<%=basePath%>/css/localAnchorManger/mooringStatistic.css?tag=<%=ConfigPro.VERSION%>">
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/mooringStatistic.css?tag=<%=ConfigPro.VERSION%>">
 <script type="text/javascript">
-var localUrladdress = "<%=basePath%>";
+var localUrladdress = "${pageContext.request.contextPath}";
 var user_key = "${UserInfo.ukey}";
 var today = new Date();
 $("#stime-1").datepicker({
@@ -443,26 +443,26 @@ $(function(){
          <div class="chartsSun borderBottomChart borderRightChart" style="width:50%;float:left;">
               <div class="chartsTitle"><span>船舶类型</span></div>
               <div class="chartPar" id="shipType" style="width: 100%; height: 300px;position: relative; overflow: hidden; text-align: left; line-height: normal; z-index: 0; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);" >
-                   <img alt="" src="<%=basePath%>/img/common/no_stat_data.png"style=" width: 163px; height: 144px;display:none;margin:78px auto;">
+                   <img alt="" src="${pageContext.request.contextPath}/img/common/no_stat_data.png"style=" width: 163px; height: 144px;display:none;margin:78px auto;">
               </div>  
          </div>
           <div class="chartsSun borderBottomChart" style="width:50%;float:left;">
               <div class="chartsTitle"><span>各港口锚泊次数</span></div>
               <div class="chartPar" id ="shipTime" style=" width: 100%; height: 300px;position: relative; overflow: hidden; text-align: left; line-height: normal; z-index: 0; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"> 
-                   <img alt="" src="<%=basePath%>/img/common/no_stat_data.png" style=" width: 163px; height: 144px;display:none;margin:78px auto;">
+                   <img alt="" src="${pageContext.request.contextPath}/img/common/no_stat_data.png" style=" width: 163px; height: 144px;display:none;margin:78px auto;">
               </div>
          </div>
          
           <div class="chartsSun borderRightChart " style="width:50%;float:left;">
               <div class="chartsTitle"><span>船舶等级统计</span></div>
               <div class="chartPar" id ="shipCount" style="width: 100%; height: 300px;position: relative; overflow: hidden; text-align: left; line-height: normal; z-index: 0; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);">
-                    <img alt="" src="<%=basePath%>/img/common/no_stat_data.png" style="width: 163px; height: 144px;display:none;margin:78px auto;">
+                    <img alt="" src="${pageContext.request.contextPath}/img/common/no_stat_data.png" style="width: 163px; height: 144px;display:none;margin:78px auto;">
               </div>
          </div>
           <div class="chartsSun" style="width:50%;float:left;">
               <div class="chartsTitle"><span>锚泊次数统计</span></div>
               <div class="chartPar" id="anchorageTime"  style="width: 100%; height: 300px;position: relative; overflow: hidden; text-align: left; line-height: normal; z-index: 0; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);">
-                         <img alt="" src="<%=basePath%>/img/common/no_stat_data.png" style=" width: 163px; height: 144px;display:none;margin:78px auto;">
+                         <img alt="" src="${pageContext.request.contextPath}/img/common/no_stat_data.png" style=" width: 163px; height: 144px;display:none;margin:78px auto;">
               </div>
          </div>
     </div> 

+ 2 - 2
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/mooring_manager_edit.jsp

@@ -2,8 +2,8 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<link rel="stylesheet" href="<%=basePath%>/css/anchorApply/anchor_info_add.css?tag=<%=ConfigPro.VERSION%>"> 
-<script src="<%=basePath%>/js/localAnchorageManger/mooring_manager_edit.js?tag=<%=ConfigPro.VERSION%>" ></script>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/anchorApply/anchor_info_add.css?tag=<%=ConfigPro.VERSION%>"> 
+<script src="${pageContext.request.contextPath}/js/localAnchorageManger/mooring_manager_edit.js?tag=<%=ConfigPro.VERSION%>" ></script>
 
 <p class="top-sub-nav" style="margin-top: 0;">
 	<a><span class="icon-mail-reply-all"></span> 返回锚泊管理</a>

+ 2 - 2
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/mooring_record.jsp

@@ -3,9 +3,9 @@
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
 <script
-	src="<%=basePath%>/js/localAnchorageManger/mooring_record.js?tag=<%=ConfigPro.VERSION%>"></script>
+	src="${pageContext.request.contextPath}/js/localAnchorageManger/mooring_record.js?tag=<%=ConfigPro.VERSION%>"></script>
 <script type="text/javascript">
-	var expExcelUrl = '<%=basePath%>/service/anchorposition/apply/manage?export_type=1&user_key=${UserInfo.ukey}';
+	var expExcelUrl = '${pageContext.request.contextPath}/service/anchorposition/apply/manage?export_type=1&user_key=${UserInfo.ukey}';
 </script>
 
 <!-- <div class="condition-input"> -->

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/pendingRepresentationsList.jsp

@@ -3,7 +3,7 @@
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
 <script
-	src="<%=basePath%>/js/localAnchorageManger/pendingRepresenationsList.js?tag=<%=ConfigPro.VERSION%>"></script>
+	src="${pageContext.request.contextPath}/js/localAnchorageManger/pendingRepresenationsList.js?tag=<%=ConfigPro.VERSION%>"></script>
 <div class="condition-input">
 	<span>公司名称</span>
 	<input type="text" class="input sub-input" id="agent_user_name">

+ 4 - 4
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/preAlarmInfo.jsp

@@ -6,14 +6,14 @@
 <html>
 <head>
 	<%@ include  file="../common.jsp"%>
- 	<link rel="stylesheet" href="<%=basePath%>/css/common_style.css" />
+ 	<link rel="stylesheet" href="${pageContext.request.contextPath}/css/common_style.css" />
  	 <script type="text/javascript">
     		var user_key = "${UserInfo.ukey}";
     		var self_harbour_id = "${harbour_code}"; 		//本港口的code
 	 </script>
- 	<link rel="stylesheet" href="<%=basePath%>/css/localAnchorManger/anchorage_allview.css?tag=<%=ConfigPro.VERSION%>">
- 	<script type="text/javascript" src="<%=basePath%>/lib/jqueryPaginator/jqPaginator.min.js?tag=<%=ConfigPro.VERSION%>"></script>
- 	<script src="<%=basePath%>/js/localAnchorageManger/preAlarmInfo.js?tag=<%=ConfigPro.VERSION%>" ></script>
+ 	<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/anchorage_allview.css?tag=<%=ConfigPro.VERSION%>">
+ 	<script type="text/javascript" src="${pageContext.request.contextPath}/lib/jqueryPaginator/jqPaginator.min.js?tag=<%=ConfigPro.VERSION%>"></script>
+ 	<script src="${pageContext.request.contextPath}/js/localAnchorageManger/preAlarmInfo.js?tag=<%=ConfigPro.VERSION%>" ></script>
 	<title>预警信息</title>
 </head>
 <body>

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/shipSearchContent.jsp

@@ -6,7 +6,7 @@
 <html>
 <head>
 	<%@ include  file="../common.jsp"%>
- 	<link rel="stylesheet" href="<%=ConfigPro.LOCAL_DOMAIN%>/css/common_style.css" />
+ 	<link rel="stylesheet" href="${pageContext.request.contextPath}/css/common_style.css" />
 	<title>船舶信息</title>
 </head>
 <body>

+ 2 - 2
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/unberthConfirm.jsp

@@ -3,9 +3,9 @@
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
 <script
-	src="<%=basePath%>/js/localAnchorageManger/unberthConfirm.js?tag=<%=ConfigPro.VERSION%>"></script>
+	src="${pageContext.request.contextPath}/js/localAnchorageManger/unberthConfirm.js?tag=<%=ConfigPro.VERSION%>"></script>
 <script type="text/javascript">
-var expExcelUrl = '<%=basePath%>/service/anchorposition/apply/leave?export_type=1&user_key=${UserInfo.ukey}';
+var expExcelUrl = '${pageContext.request.contextPath}/service/anchorposition/apply/leave?export_type=1&user_key=${UserInfo.ukey}';
  </script>
 	<div class="condition-input">
 		<span>船舶名称</span>

+ 2 - 2
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/localAnchorageManger/unberthConfirmDetail.jsp

@@ -2,9 +2,9 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<link rel="stylesheet" href="<%=basePath%>/css/localAnchorManger/unberthConfirmDetail.css?tag=<%=ConfigPro.VERSION%>"> 
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/unberthConfirmDetail.css?tag=<%=ConfigPro.VERSION%>"> 
 <script
-	src="<%=basePath%>/js/localAnchorageManger/unberthConfirmDetail.js?tag=<%=ConfigPro.VERSION%>"/>
+	src="${pageContext.request.contextPath}/js/localAnchorageManger/unberthConfirmDetail.js?tag=<%=ConfigPro.VERSION%>"/>
 <p class="top-sub-nav">
 	<span>锚泊记录信息</span>
 	 <a class="button-main-border button link-back" >