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

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

@@ -84,12 +84,14 @@
 				<td><input id="taskName" name="taskName" value="${taskVo.taskName}" 
 					id="qy" style="width:250px;height:25px;" maxlength="50"/></td>
 			</tr><tr>
-				<td><label style="color:red;cursor:pointer;" onclick="selectUser()">执行终端</label></td>
+				<td><label style="" onclick="">执行终端</label></td>
 				<td>
 					<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"></div>
+					<div id="divUsers" style="width:252px;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>
 			</tr><tr>
 				<td style="width: 90px;">执&ensp;行&ensp;人</td>
@@ -108,7 +110,7 @@
 				<td class="line-search-input">
 					<input type="text" placeholder="请输入起点" autocomplete="off" value="${ljghVo.startName}"
 						style="width:250px;height:25px;" maxlength="200"> 
-					<div style="float:right;padding-top:6px;padding-right:48px;">
+					<div style="float:right;padding-top:6px;padding-right:45px;padding-left:3px;">
 					<img id="imgAddTjd" class="icon-addtjd" style="padding-bottom:2px;" 
 						src="${ctx}/static/xt/images/ljgh/add.png" title="增加途经点" onclick="addPoint()"/>
 					<img id="imgPhone" class="icon-addtjd" style="width:24px;height:24px;"
@@ -122,7 +124,7 @@
 				<td class="line-search-input">
 					<input type="text" placeholder="请输入途经点" autocomplete="off" 
 						style="width:250px;height:25px;" maxlength="200"> 
-					<div style="float:right;padding-top:6px;padding-right:40px;">
+					<div style="float:right;padding-top:6px;padding-right:76px;">
 					<img class="icon-reducetjd" src="${ctx}/static/xt/images/ljgh/reduce.png" onclick="reducePoint(this)">
 					</div>
 					<input type="hidden"><input type="hidden">
@@ -132,7 +134,7 @@
 				<td class="line-search-input">
 					<input type="text" placeholder="请输入途经点" autocomplete="off" 
 						style="width:250px;height:25px;" maxlength="200"> 
-					<div style="float:right;padding-top:6px;padding-right:40px;">
+					<div style="float:right;padding-top:6px;padding-right:76px;">
 					<img class="icon-reducetjd" src="${ctx}/static/xt/images/ljgh/reduce.png" onclick="reducePoint(this)">
 					</div>
 					<input type="hidden"><input type="hidden">
@@ -142,7 +144,7 @@
 				<td class="line-search-input">
 					<input type="text" placeholder="请输入途经点" autocomplete="off" 
 						style="width:250px;height:25px;" maxlength="200"> 
-					<div style="float:right;padding-top:6px;padding-right:40px;">
+					<div style="float:right;padding-top:6px;padding-right:76px;">
 					<img class="icon-reducetjd" src="${ctx}/static/xt/images/ljgh/reduce.png" onclick="reducePoint(this)">
 					</div>
 					<input type="hidden"><input type="hidden">
@@ -160,14 +162,15 @@
 				<td><input id="avoidRoad" name="avoidRoad"  value="${ljghVo.avoidRoad}"
 					id="qy" style="width:250px;height:25px;" maxlength="50"/></td>
 			</tr><tr>
-				<td colspan="2">
-					<div style="padding-top:6px;padding-left:50px;float:left;width:370px;font-size: 20px;color:#1e70bf">
-						<input type="radio" class="radRoute" name="strategy" checked="checked" value="0" /><span style="background-color:#3F7F5F;"><font color="#FFFFFF">速度优先</font></span>
-						<input type="radio" class="radRoute" name="strategy" value="2" /><span style="background-color:#7D37CC;"><font color="#FFFFFF">距离最短</font></span>
-						<input type="radio" class="radRoute" name="strategy" value="4" /><span style="background-color:#BAB6A7;"><font color="#FFFFFF">躲避拥堵</font></span>
+				<td style="width: 90px;">线路规划</td>
+				<td colspan="1">
+					<div style="padding-top:6px;padding-left:0px;float:left;width:250px;font-size: 20px;color:#1e70bf">
+						<input type="radio" class="radRoute" name="strategy" checked="checked" value="0" /><span style="background-color:#3F7F5F;"><font size="2" color="#FFFFFF">速度优先</font></span>
+						<input type="radio" class="radRoute" name="strategy" value="2" /><span style="background-color:#7D37CC;"><font size="2" color="#FFFFFF">距离最短</font></span>
+						<input type="radio" class="radRoute" name="strategy" value="4" /><span style="background-color:#BAB6A7;"><font size="2" color="#FFFFFF">躲避拥堵</font></span>
 					</div>
-					<div class="divbtn" style="margin:3px 3px 3px 120px;background-color:#40A9F7;" onclick="searchWay()">查询路线</div>
-					<div class="divbtn" style="float:left;margin:3px 3px 3px 50px;background-color:#FE0202;" onclick="clearWay()">清除路线</div>
+					<div class="divbtnSmall" style="float:left;margin:3px 3px 3px 8px;background-color:#40A9F7;" onclick="searchWay()">查询</div>
+					<div class="divbtnSmall" style="float:left;margin:3px 3px 3px 5px;background-color:#FE0202;" onclick="clearWay()">清除</div>
 				</td>
 			</tr><tr>
 				<td>备&ensp;&ensp;&ensp;&ensp;注</td>

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

@@ -35,6 +35,10 @@
 		    float:left;margin:0px 0px 10px 8px;padding:5px 0px 0px 0px;color:white;cursor:pointer;
         	width:75px;height:22px;background-color:#FFBF51;text-align:center;border-radius:3px;
 		}
+		.divbtnSmall {
+		    float:left;margin:5px 0px 10px 8px;padding:3px 0px 0px 0px;color:white;cursor:pointer;
+        	width:42px;height:22px;background-color:#FFBF51;text-align:center;border-radius:3px;
+		}
 	</style>
 	<script type="text/javascript" src="${ctx}/static/easyui/jquery.min.js"></script>
 	<script type="text/javascript"
@@ -70,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"></div>
+					<div id="divUsers" style="width:252px;float:left;min-height:28px;border:1px solid #A9A9A9;"></div>
 				</td>
 			</tr><tr>
 				<td style="width: 90px;">执&ensp;行&ensp;人</td>
@@ -89,7 +93,7 @@
 				<td class="line-search-input">
 					<input type="text" placeholder="请输入起点" autocomplete="off" value="${ljghVo.startName}"
 						style="width:250px;height:25px;" maxlength="200"> 
-					<div style="float:right;padding-top:6px;padding-right:40px;">
+					<div style="float:right;padding-top:6px;padding-right:85px;">
 					<img id="imgAddTjd" class="icon-addtjd" src="${ctx}/static/xt/images/ljgh/add.png" title="增加途经点" onclick="addPoint()"/>
 					</div>
 					<input type="hidden" value="${ljghVo.startPoint}">
@@ -100,7 +104,7 @@
 				<td class="line-search-input">
 					<input type="text" placeholder="请输入途经点" autocomplete="off"
 						style="width:250px;height:25px;" maxlength="200"> 
-					<div style="float:right;padding-top:6px;padding-right:40px;">
+					<div style="float:right;padding-top:6px;padding-right:85px;">
 					<img class="icon-reducetjd" src="${ctx}/static/xt/images/ljgh/reduce.png" onclick="reducePoint(this)">
 					</div>
 					<input type="hidden">
@@ -110,7 +114,7 @@
 				<td class="line-search-input">
 					<input type="text" placeholder="请输入途经点" autocomplete="off"
 						style="width:250px;height:25px;" maxlength="200"> 
-					<div style="float:right;padding-top:6px;padding-right:40px;">
+					<div style="float:right;padding-top:6px;padding-right:85px;">
 					<img class="icon-reducetjd" src="${ctx}/static/xt/images/ljgh/reduce.png" onclick="reducePoint(this)">
 					</div>
 					<input type="hidden">
@@ -120,7 +124,7 @@
 				<td class="line-search-input">
 					<input type="text" placeholder="请输入途经点" autocomplete="off"
 						style="width:250px;height:25px;" maxlength="200"> 
-					<div style="float:right;padding-top:6px;padding-right:40px;">
+					<div style="float:right;padding-top:6px;padding-right:85px;">
 					<img class="icon-reducetjd" src="${ctx}/static/xt/images/ljgh/reduce.png" onclick="reducePoint(this)">
 					</div>
 					<input type="hidden">
@@ -138,14 +142,15 @@
 				<td><input id="avoidRoad" name="avoidRoad"  value="${ljghVo.avoidRoad}"
 					id="qy" style="width:250px;height:25px;" maxlength="50"/></td>
 			</tr><tr>
-				<td colspan="2">
-					<div style="padding-top:6px;padding-left:50px;float:left;width:370px;font-size: 20px;color:#1e70bf">
-						<input type="radio" class="radRoute" name="strategy" checked="checked" value="0" /><span style="background-color:#3F7F5F;"><font color="#FFFFFF">速度优先</font></span>
-						<input type="radio" class="radRoute" name="strategy" value="2" /><span style="background-color:#7D37CC;"><font color="#FFFFFF">距离最短</font></span>
-						<input type="radio" class="radRoute" name="strategy" value="4" /><span style="background-color:#BAB6A7;"><font color="#FFFFFF">躲避拥堵</font></span>
+				<td style="width: 90px;">线路规划</td>
+				<td colspan="1">
+					<div style="padding-top:6px;padding-left:0px;float:left;width:250px;font-size: 20px;color:#1e70bf">
+						<input type="radio" class="radRoute" name="strategy" checked="checked" value="0" /><span style="background-color:#3F7F5F;"><font size="2" color="#FFFFFF">速度优先</font></span>
+						<input type="radio" class="radRoute" name="strategy" value="2" /><span style="background-color:#7D37CC;"><font size="2" color="#FFFFFF">距离最短</font></span>
+						<input type="radio" class="radRoute" name="strategy" value="4" /><span style="background-color:#BAB6A7;"><font size="2" color="#FFFFFF">躲避拥堵</font></span>
 					</div>
-					<div class="divbtn" style="margin:3px 3px 3px 120px;background-color:#40A9F7;" onclick="searchWay()">查询路线</div>
-					<div class="divbtn" style="float:left;margin:3px 3px 3px 50px;background-color:#FE0202;" onclick="clearWay()">清除路线</div>
+					<div class="divbtnSmall" style="float:left;margin:3px 3px 3px 8px;background-color:#40A9F7;" onclick="searchWay()">查询</div>
+					<div class="divbtnSmall" style="float:left;margin:3px 3px 3px 5px;background-color:#FE0202;" onclick="clearWay()">清除</div>
 				</td>
 			</tr><tr>
 				<td>备&ensp;&ensp;&ensp;&ensp;注</td>

jdc/jdcweb/trunk/src/main/webapp/WEB-INF/view/sys/login.jsp

@@ -18,7 +18,7 @@
 	<script type="text/javascript" src="${ctx}/static/easyui/jquery.min.js"></script>
 	<script type="text/javascript" src="${ctx}/static/xt/js/sys/login.js"></script>
 </head>
-<body class="l_bg">
+<body onkeydown="keyLogin()" class="l_bg">
 <form id="loginForm" action="${ctx}/login" method="post" >
 	<div class="l_all">
 	<div class="l_boock">

jdc/jdcweb/trunk/src/main/webapp/static/xt/css/login.css

@@ -18,22 +18,18 @@
 .l_headdiv {
 	width:1148px;
 	text-align:center;
-	height:27%;
 }
 
 .l_centerdiv {
-	height:50%;
 }
 
 .l_logindiv {
-	height:15%;
 	padding:20px 0px 20px 0px;
 	text-align:center;
 }
 
 .bottomdiv {
-	padding:20px 0px 0px 0px;
-	height:8%;
+	padding:0px 0px 0px 0px;
 }
 
 .imgsalute {
@@ -67,8 +63,8 @@
 }
 
 .imgunit {
-	width:768px;
-	height:19.2px;
+	width:500px;
+	height:45px;
 }
 
 .tablogin {

jdc/jdcweb/trunk/src/main/webapp/static/xt/css/main.css

@@ -489,8 +489,8 @@ body .demo-class iframe{border-bottom-left-radius:0px;border-bottom-right-radius
 /**Ô²»·²Ëµ¥*/
 
 .radRoute {
-	width: 16px;
-	height: 16px;
+	width: 10px;
+	height: 10px;
 }
 
 /** ÊÖ·çÇٲ˵¥ */

jdc/jdcweb/trunk/src/main/webapp/static/xt/js/air/flightInfo.js

@@ -23,7 +23,7 @@ function getDate(){
     }
     str += montStr + "-";
     var day = mydate.getDate();
-    var dateStr = "";
+    var dateStr = day;
     if(day <10) {
     	dateStr = "0"+day;
     }

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

@@ -22,7 +22,7 @@ function adjustBlock() {
         $(".l_all").css("padding-left", minus+"px");
         $(".l_all").css("padding-right", minus+"px");
     }
-    var blockHeight = 719;
+    var blockHeight = 728;
     if(height > blockHeight) {
     	var minus = (height - blockHeight)/2;
         $(".l_all").css("padding-top", minus+"px");
@@ -56,4 +56,10 @@ function dl(){
         }
     }, 'json');*/
     $("#loginForm").submit();
+}
+
+function keyLogin(){  
+    if (event.keyCode==13) {
+        dl();
+    }
 }