Sfoglia il codice sorgente

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

xt_mayh 9 anni fa
parent
commit
223cce7af4
20 ha cambiato i file con 386 aggiunte e 95 eliminazioni
  1. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/accountDetail.jsp
  2. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/accountList.jsp
  3. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/anchor_space_position_list.jsp
  4. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/anchorageDetail.jsp
  5. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/anchorageList.jsp
  6. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/anchorageSpaceAuditList.jsp
  7. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/anchorpositionDetail.jsp
  8. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/announcementDetail.jsp
  9. 6 6
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/announcementEdit.jsp
  10. 3 3
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/announcementList.jsp
  11. 1 1
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/auditDetail.jsp
  12. 3 3
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/auditList.jsp
  13. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/auditListRecord.jsp
  14. 29 29
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/index.jsp
  15. 3 3
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/infostip.jsp
  16. 291 0
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/map_max.jsp
  17. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/mooring_record.jsp
  18. 28 28
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/overview.jsp
  19. 2 2
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/pilotageList.jsp
  20. 3 3
      gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/unDepoyAnnouncementList.jsp

+ 2 - 2
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/accountDetail.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/anchorpostionApproval.css?tag=<%=ConfigPro.VERSION%>"> 
-<script src="<%=basePath%>/js/controlCenter/accountDetail.js?tag=<%=ConfigPro.VERSION%>" ></script>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/anchorpostionApproval.css?tag=<%=ConfigPro.VERSION%>"> 
+<script src="${pageContext.request.contextPath}/js/controlCenter/accountDetail.js?tag=<%=ConfigPro.VERSION%>" ></script>
 	<p class="top-sub-nav">
 <!-- 		<a class="link-to"><span class="icon-mail-reply-all"></span> 返回</a> -->
 		<span>账号信息编辑</span>

+ 2 - 2
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/accountList.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/anchorpostionApproval.css?tag=<%=ConfigPro.VERSION%>"> 
-<script src="<%=basePath%>/js/controlCenter/accountList.js?tag=<%=ConfigPro.VERSION%>" ></script>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/anchorpostionApproval.css?tag=<%=ConfigPro.VERSION%>"> 
+<script src="${pageContext.request.contextPath}/js/controlCenter/accountList.js?tag=<%=ConfigPro.VERSION%>" ></script>
 <script>
 
 </script>

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/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/controlCenter/anchor_space_position_list.js?tag=<%=ConfigPro.VERSION%>"></script>
+<script src="${pageContext.request.contextPath}/js/controlCenter/anchor_space_position_list.js?tag=<%=ConfigPro.VERSION%>"></script>
 
 <p class="top-sub-nav">
 <!-- 	<span>锚位信息</span> -->

+ 2 - 2
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/anchorageDetail.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/common_style.css?tag=<%=ConfigPro.VERSION%>">
-<link rel="stylesheet" href="<%=basePath%>/css/localAnchorManger/anchorageMangerAddOrEdit.css?tag=<%=ConfigPro.VERSION%>">
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/common_style.css?tag=<%=ConfigPro.VERSION%>">
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/anchorageMangerAddOrEdit.css?tag=<%=ConfigPro.VERSION%>">
 
 <script type="text/javascript">
 	$(function(){

+ 2 - 2
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/anchorageList.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/controlCenter/anchorageList.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/controlCenter/anchorageList.js?tag=<%=ConfigPro.VERSION%>"></script>
 
 <div class="condition-input">
 		<span>港 口</span>

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/anchorageSpaceAuditList.jsp

@@ -2,7 +2,7 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<script src="<%=basePath%>/js/controlCenter/anchorageSpaceAuditList.js?tag=<%=ConfigPro.VERSION%>"></script>
+<script src="${pageContext.request.contextPath}/js/controlCenter/anchorageSpaceAuditList.js?tag=<%=ConfigPro.VERSION%>"></script>
 <div class="condition-input">
 	<span>港口</span>
 	<select id="control-harbour-info" class="sub-input">

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/anchorpositionDetail.jsp

@@ -3,7 +3,7 @@
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
 <script 
-	src="<%=basePath%>/js/controlCenter/anchorpositionDetail.js?tag=<%=ConfigPro.VERSION%>" ></script>
+	src="${pageContext.request.contextPath}/js/controlCenter/anchorpositionDetail.js?tag=<%=ConfigPro.VERSION%>" ></script>
 <p class="top-sub-nav">
 	<span>锚位详细信息</span>
 	<button id="agree-btn" class="button button-main-border" style="display: none;">

+ 2 - 2
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/announcementDetail.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/controlCenter/announcementDetail.css?tag=<%=ConfigPro.VERSION%>">
-<script src="<%=basePath%>/js/controlCenter/announcementDetail.js?tag=<%=ConfigPro.VERSION%>"></script>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/controlCenter/announcementDetail.css?tag=<%=ConfigPro.VERSION%>">
+<script src="${pageContext.request.contextPath}/js/controlCenter/announcementDetail.js?tag=<%=ConfigPro.VERSION%>"></script>
 
 <p class="top-sub-nav" style="border-bottom : none;">
 <!-- 	<span>公告详情</span> -->

+ 6 - 6
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/announcementEdit.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/controlCenter/announcementEdit.css?tag=<%=ConfigPro.VERSION%>">
-<link href="<%=basePath%>/umeditor/themes/default/css/umeditor.min.css" type="text/css" rel="stylesheet">
-<script type="text/javascript" charset="utf-8" src="<%=basePath%>/umeditor/umeditor.config.js"></script>
-<script type="text/javascript" charset="utf-8" src="<%=basePath%>/umeditor/umeditor.min.js"></script>
-<script type="text/javascript" src="<%=basePath%>/umeditor/lang/zh-cn/zh-cn.js"></script>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/controlCenter/announcementEdit.css?tag=<%=ConfigPro.VERSION%>">
+<link href="${pageContext.request.contextPath}/umeditor/themes/default/css/umeditor.min.css" type="text/css" rel="stylesheet">
+<script type="text/javascript" charset="utf-8" src="${pageContext.request.contextPath}/umeditor/umeditor.config.js"></script>
+<script type="text/javascript" charset="utf-8" src="${pageContext.request.contextPath}/umeditor/umeditor.min.js"></script>
+<script type="text/javascript" src="${pageContext.request.contextPath}/umeditor/lang/zh-cn/zh-cn.js"></script>
 <p class="top-sub-nav">
 	<span>公告信息编辑</span>
 	<button class="button-main-border button btn-style" id="submit-btn">
@@ -59,4 +59,4 @@
 	<!-- 		</p> -->
 	</div>
 </div>
-<script src="<%=basePath%>/js/controlCenter/announcementEdit.js?tag=<%=ConfigPro.VERSION%>"></script>
+<script src="${pageContext.request.contextPath}/js/controlCenter/announcementEdit.js?tag=<%=ConfigPro.VERSION%>"></script>

+ 3 - 3
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/announcementList.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/controlCenter/announcementList.css?tag=<%=ConfigPro.VERSION%>">
-<script src="<%=basePath%>/js/controlCenter/announcementList.js?tag=<%=ConfigPro.VERSION%>"></script>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/controlCenter/announcementList.css?tag=<%=ConfigPro.VERSION%>">
+<script src="${pageContext.request.contextPath}/js/controlCenter/announcementList.js?tag=<%=ConfigPro.VERSION%>"></script>
 
 <span style="display: none;" id="status"></span>
 <div id="sub_swap_content">
@@ -42,4 +42,4 @@
 </div>
 
 <div class="dialog-mask" style="display: none;"></div>
-<img class="prePhotoView self-img" src="<%=basePath%>/img/default.png">
+<img class="prePhotoView self-img" src="${pageContext.request.contextPath}/img/default.png">

+ 1 - 1
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/auditDetail.jsp

@@ -3,7 +3,7 @@
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
 <script
-	src="<%=basePath%>/js/controlCenter/auditDetail.js?tag=<%=ConfigPro.VERSION%>"></script>
+	src="${pageContext.request.contextPath}/js/controlCenter/auditDetail.js?tag=<%=ConfigPro.VERSION%>"></script>
 <script>
 	/**
 	 * 拒绝按钮事件

+ 3 - 3
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/auditList.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/anchorpostionApproval.css?tag=<%=ConfigPro.VERSION%>"> 
-<script src="<%=basePath%>/js/controlCenter/auditList.js?tag=<%=ConfigPro.VERSION%>"></script>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/anchorpostionApproval.css?tag=<%=ConfigPro.VERSION%>"> 
+<script src="${pageContext.request.contextPath}/js/controlCenter/auditList.js?tag=<%=ConfigPro.VERSION%>"></script>
 <script type="text/javascript">
-	var expExcelUrl = '<%=basePath%>/service/anchorposition/apply/dep/unaudit?export_type=1&user_key=${UserInfo.ukey}';
+	var expExcelUrl = '${pageContext.request.contextPath}/service/anchorposition/apply/dep/unaudit?export_type=1&user_key=${UserInfo.ukey}';
 </script>
 
 <div id="swap-content">

+ 2 - 2
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/auditListRecord.jsp

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

+ 29 - 29
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/index.jsp

@@ -5,27 +5,27 @@
 <html>
 <head>
 	<%@ include  file="../common.jsp"%>
-	<script type="text/javascript" src="<%=basePath%>/lib/jqueryPaginator/jqPaginator.min.js?tag=<%=ConfigPro.VERSION%>"></script>
+	<script type="text/javascript" src="${pageContext.request.contextPath}/lib/jqueryPaginator/jqPaginator.min.js?tag=<%=ConfigPro.VERSION%>"></script>
 	<!-- your css and js -->
-	<link rel="stylesheet" href="<%=basePath%>/css/controlCenter/index.css?tag=<%=ConfigPro.VERSION%>">
-	<link rel="stylesheet" href="<%=basePath%>/css/common_style.css?tag=<%=ConfigPro.VERSION%>">
-	<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/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 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/controlCenter/index.css?tag=<%=ConfigPro.VERSION%>">
+	<link rel="stylesheet" href="${pageContext.request.contextPath}/css/common_style.css?tag=<%=ConfigPro.VERSION%>">
+	<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/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>
+	<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 user_key = "${UserInfo.ukey}";
        		var user_name = "${UserInfo.name}" ;
        		var user_id = "${UserInfo.id}";
        		var img_url = "<%=ConfigPro.IMAGE_DOMAIN%>/";
-       		var vedio_url = "<%=basePath%>";
-       		var localUrladdress = "<%=basePath%>";
+       		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;
@@ -35,10 +35,10 @@
           		}
           	})
 	 </script>
-	 <script src="<%=basePath%>/js/controlCenter/index.js?tag=<%=ConfigPro.VERSION%>" ></script>
-	<script src="<%=basePath%>/js/base_config.js?tag=<%=ConfigPro.VERSION%>" ></script>
-	<script type="text/javascript" src="<%=basePath%>/map/lib/SuperMap.Include.js"></script>
-	<script src="<%=basePath%>/lib/respond.js"></script>
+	 <script src="${pageContext.request.contextPath}/js/controlCenter/index.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 src="${pageContext.request.contextPath}/lib/respond.js"></script>
 	<title><%=ConfigPro.TITLE%></title>
 </head>
 	<body>
@@ -47,7 +47,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>
@@ -65,7 +65,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
 				</div>
 				
@@ -73,7 +73,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>
 			<div id="body-container">
@@ -81,7 +81,7 @@
 						<ul class="first-nav-bar">
 							<li class="nav-bar-li active">
 								<div id="audit-list">
-									<img src="<%=basePath%>/img/maoweishenpi.png">
+									<img src="${pageContext.request.contextPath}/img/maoweishenpi.png">
 									<a>锚位核准管理</a>
 								</div>
 								<ul class="second-nar-bar" id="second-audit-list" style="display: block;">
@@ -92,7 +92,7 @@
 							</li>
 							<li class="nav-bar-li">
 								<div id="anchage-overview">
-									<img src="<%=basePath%>/img/maodiguanli.png">
+									<img src="${pageContext.request.contextPath}/img/maodiguanli.png">
 									<a>锚地管理</a>
 								</div>
 								<ul class="second-nar-bar" id="second-anchage-overview">
@@ -103,7 +103,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">
@@ -114,7 +114,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">
@@ -123,7 +123,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">
@@ -133,7 +133,7 @@
 							</li>
 							<li class="nav-bar-li">
 								<div id="account-managerment">
-									<img src="<%=basePath%>/img/zhanghaoguanli.png">
+									<img src="${pageContext.request.contextPath}/img/zhanghaoguanli.png">
 									<a>港口管理</a>
 								</div>
 								<ul class="second-nar-bar" id="second-account-managerment">
@@ -153,7 +153,7 @@
 					            	<span style="margin-left: 12px;" class="icon-anchor"></span>
 					            	<span style="margin-left: 3px;">锚位申请列表</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>

+ 3 - 3
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/infostip.jsp

@@ -6,13 +6,13 @@
 <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>
- 	<script type="text/javascript" src="<%=basePath%>/lib/jqueryPaginator/jqPaginator.min.js?tag=<%=ConfigPro.VERSION%>"></script>
- 	<script src="<%=basePath%>/js/controlCenter/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/controlCenter/infostip.js?tag=<%=ConfigPro.VERSION%>" ></script>
 	<title>消息</title>
 </head>
 <body>

+ 291 - 0
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/map_max.jsp

@@ -0,0 +1,291 @@
+<%@ 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>
+<!-- 	<span style="display: none;" id="status"></span> -->
+<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>
+	<div style="position: absolute;right:20px;top:20px;width:460px;">
+		<div style="height: 34px;padding: 4px 0;background: white;">
+			<div id="change2harbour" class="tab-style" style="border-right: 1px solid #e2e2e2;width: 75px;">
+				<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="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:460px;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:460px;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;padding-left: 35px;">预置</span>
+					<img style="margin: 0 30px 10px 0" src="${pageContext.request.contextPath}/img/anchor_icon_yuliu.png">
+					<span style="padding: 12px;font-size:12px;padding-left: 35px;">占用</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:460px;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;height: 36px;" id="measure-distance">
+						<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;height: 36px;" id="measure-area">
+						<img style="margin: 0 10px 11px 15px;" src="${pageContext.request.contextPath}/img/measure_area.png">
+						<span  style="font-size: 12px;">测面积</span>
+					</div>
+				</div>
+				<div id="change2harbour-tab" style="width:460px;height:114px;background: white;line-height: 36px;display: none;" class="divsearch">
+						<p style="margin :0 16px;border-bottom: 1px solid #d9d9d9;line-height: 43px;height: 43px;font-size: 14px;">
+							<strong><span>当前港口:</span><span id="copy-harbour-val">南京港</span></strong>
+						</p>
+						<P class="harbournameindex" style="margin :0 16px;line-height: 35px;">      
+							<span value="321000">南京港</span> <span value="321001">镇江港</span><span value="321002">扬州港</span><span value="321003">泰州港</span> <span value="321004">常州港</span>
+							<span value="321005">江阴港</span><span value="321006">张家港港</span> <br>
+							 <span value="321007">南通港</span>
+							<span value="321008">常熟港</span><span value="321009">太仓港</span> 
+						</P>
+			  </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"  style="cursor:pointer"></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 type-show-1">
+					<span id="status-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>

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

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

+ 28 - 28
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/overview.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/anchorage_allview.css?tag=<%=ConfigPro.VERSION%>">
-<script src="<%=basePath%>/js/controlCenter/overview.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/ais.js?tag=<%=ConfigPro.VERSION%>"></script>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/localAnchorManger/anchorage_allview.css?tag=<%=ConfigPro.VERSION%>">
+<script src="${pageContext.request.contextPath}/js/controlCenter/overview.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/ais.js?tag=<%=ConfigPro.VERSION%>"></script>
 
 <span style="display: none;" id="status"></span>
 <div class="swap-content" style="position: relative;">  
@@ -31,36 +31,36 @@
 		<div style="height: 34px;padding: 4px 0;background: white;">
 			<div id="change2harbour" class="tab-style" style="border-right: 1px solid #e2e2e2;width: 75px;">
 				<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="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;">
@@ -70,11 +70,11 @@
 				</div>
 				<div id="paint-sample-tab" style="height:36px;width:460px;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;padding-left: 35px;">预置</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;padding-left: 35px;">占用</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:460px;background: white;line-height: 25px;display: none;" class="divsearch">
 					<ul class="ul-layer-sel">
@@ -100,11 +100,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;height: 36px;" 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;height: 36px;" id="measure-area">
-						<img style="margin: 0 10px 9px 15px;" src="<%=basePath%>/img/measure_area.png">
+						<img style="margin: 0 10px 9px 15px;" src="${pageContext.request.contextPath}/img/measure_area.png">
 						<span  style="font-size: 12px;">测面积</span>
 					</div>
 				</div>
@@ -149,7 +149,7 @@
 	</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> -->

+ 2 - 2
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/pilotageList.jsp

@@ -2,9 +2,9 @@
     pageEncoding="UTF-8"%>
 <%@ page import="com.loygra.mooring.cfg.ConfigPro" %>
 <%@ include  file="../base_common.jsp"%>
-<script src="<%=basePath%>/js/controlCenter/pilotagelist.js?tag=<%=ConfigPro.VERSION%>"></script>
+<script src="${pageContext.request.contextPath}/js/controlCenter/pilotagelist.js?tag=<%=ConfigPro.VERSION%>"></script>
 <script type="text/javascript">
-	var localUrl="<%=basePath%>/service";
+	var localUrl="${pageContext.request.contextPath}/service";
 </script>
 
 <div class="table-head-s">

+ 3 - 3
gkmb/trunk/Mooring/src/main/webapp/WEB-INF/jsp/controlCenter/unDepoyAnnouncementList.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/controlCenter/announcementList.css?tag=<%=ConfigPro.VERSION%>">
-<script src="<%=basePath%>/js/controlCenter/undepoyannouncementList.js?tag=<%=ConfigPro.VERSION%>"></script>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/css/controlCenter/announcementList.css?tag=<%=ConfigPro.VERSION%>">
+<script src="${pageContext.request.contextPath}/js/controlCenter/undepoyannouncementList.js?tag=<%=ConfigPro.VERSION%>"></script>
 
 <span style="display: none;" id="status"></span>
 <div id="sub_swap_content">
@@ -41,4 +41,4 @@
 </div>
 </div>
 <div class="dialog-mask" style="display: none;"></div>
-<img class="prePhotoView self-img" src="<%=basePath%>/img/default.png">
+<img class="prePhotoView self-img" src="${pageContext.request.contextPath}/img/default.png">