git-svn-id: https://192.168.57.71/svn/qt@45 12fe181a-e57f-b044-8676-16dc139aa63e

jdc/jdcweb/trunk/src/main/webapp/WEB-INF/view/command/task.jsp

@@ -89,7 +89,7 @@
 					<input type="hidden" name="userIds" id="userIds" value="${taskVo.userIds}"/>
 					<input type="hidden" name="userNames" id="userNames" value="${taskVo.userNames}">
 					<input type="hidden" name="chatIds" id="chatIds" value="${taskVo.chatIds}">
-					<div id="divUsers" style="width:252px;float:left;min-height:28px;border:1px solid #A9A9A9;"></div>
+					<div id="divUsers" style="width:252px;padding-top:5px;float:left;min-height:28px;border:1px solid #A9A9A9;"></div>
 					<div class="divbtnSmall" style="background-color: #FFBF51;margin:3px 0px 3px 8px;"
 						onclick="selectUser();">选择</div>
 				</td>

jdc/jdcweb/trunk/src/main/webapp/WEB-INF/view/command/taskview.jsp

@@ -74,7 +74,7 @@
 					<input type="hidden" name="userIds" id="userIds" value="${taskVo.userIds}"/>
 					<input type="hidden" name="userNames" id="userNames" value="${taskVo.userNames}">
 					<input type="hidden" name="chatIds" id="chatIds" value="${taskVo.chatIds}">
-					<div id="divUsers" style="width:252px;float:left;min-height:28px;border:1px solid #A9A9A9;"></div>
+					<div id="divUsers" style="width:252px;padding-top:5px;float:left;min-height:28px;border:1px solid #A9A9A9;"></div>
 				</td>
 			</tr><tr>
 				<td style="width: 90px;">执&ensp;行&ensp;人</td>

jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/basic_info.js

@@ -1713,7 +1713,15 @@ function getAisInfo(obj) {
     itemdir += '<div class="item"> <div class="header">船舶IMO：' + nullToEmpty(obj.imo) + '</div></div>';
     itemdir += '<div class="item"> <div class="header">船舶呼号：' + nullToEmpty(obj.callsign) + '</div></div>';
     itemdir += '<div class="item"> <div class="header">船舶状态：' + $.getShipStatus(obj.status) + '</div></div>';
-    itemdir += '<div class="item"> <div class="header">船舶速度：' + nullToEmpty(obj.speed) + '公里/小时</div></div>';
+    var speed = 0;
+    if(null == obj.speed) {
+    	speed = 0;
+    } else if (typeof(obj.speed) == "string") {
+    	speed = parseFloat(obj.speed);
+    } else if(typeof(obj.speed) == "number") {
+    	speed = obj.speed;
+    }
+    itemdir += '<div class="item"> <div class="header">船舶速度：' + speed.toFixed(2) + '公里/小时</div></div>';
     itemdir += '<div class="item"> <div class="header">航迹向：' + nullToEmpty(obj.course) + '度</div></div>';
     itemdir += '<div class="item"> <div class="header">目的地港：' + nullToEmpty(obj.dest) + '</div></div>';
     itemdir += '<div class="item"> <div class="header">船旗：' + nullToEmpty(obj.flag) + '</div></div>';

jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/common_waterway.js

@@ -222,6 +222,8 @@ function initWaterWayBasicInfoEvent(name, basicType) {
             boweiVectorLayer.display(true);
         }
     }  else if (name == "chuanbo") {
+        singleShipFlg = false; 
+        singleShipMmsi =""; 
         addAisData(6);
     } else {
         $.get(basePath + "/basicInfo", {type: name}, function (result) {

jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/home.js

@@ -106,7 +106,7 @@ function openSubPage(code, url, pcode) {
 	if(code == "skyView") {
 		$("#aLink").attr("href", url);
 		$("#spanId").click();
-	} if(code == "adsb") {
+	} else if(code == "adsb") {
 		$("#aLink").attr("href", url);
 		$("#spanId").click();
 	} else if(code == "cxw") {

jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/login.js

@@ -13,6 +13,7 @@ $(function () {
 });
 
 function adjustBlock() {
+	$("#username")[0].focus();
 	// 调整高度和宽度
     var height = $(document).height();
     var width = $(document).width();
@@ -43,10 +44,12 @@ function dl(){
     var pwd = $("#password").val();
     if(uname==null||uname.trim()==""){
         alert("请输入用户名");
+        $("#username")[0].focus();
         return ;
     }
     if(pwd==null||pwd.trim()==""){
         alert("请输入密码");
+        $("#password")[0].focus();
         return ;
     }
    /* $.get(basePath + "/login", {username:uname, password:pwd, _type:'web'}, function (result) {