up

潘钊
1 parent d3e348c7
Showing 5 changed files with 52 additions and 20 deletions
src/main/java/com/bsth/vehicle/directive/entity/Directive60.java
src/main/resources/static/login.html
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/pages/control/line/js/main.js
src/main/resources/static/pages/control/line/temps/home_tp.html
@@ -9,6 +9,7 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.SysUser;
 /**
@@ -77,6 +78,12 @@ public class Directive60 {
 	@ManyToOne
 	private ScheduleRealInfo sch;
+	/**
+	 * 发送人
+	 */
+	@ManyToOne
+	private SysUser sender;
+	
 	@Embeddable
 	public static class DirectiveData {
 		// 公司代码
@@ -265,4 +272,12 @@ public class Directive60 {
 	public void setSch(ScheduleRealInfo sch) {
 		this.sch = sch;
 	}
+
+	public SysUser getSender() {
+		return sender;
+	}
+
+	public void setSender(SysUser sender) {
+		this.sender = sender;
+	}
 }
@@ -56,8 +56,8 @@ Login page
 	text-align: center; */
 }
-.loginInput {
-	height: 32px;
+/* .loginInput {
+	height: 35px;
     padding: 6px 12px;
     background-color: #fff;
     border: 1px solid #c2cad8;
@@ -67,7 +67,7 @@ Login page
     -webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
     -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
     transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-}
+} */
 .buttonLogin {
 	cursor: pointer;
@@ -86,13 +86,19 @@ Login page
 	<div class="loginCenter">
 		<form class="login-form" action="/login" method="post">
 			<div class="col-md-12 loginInputDiv">
-				<img src="./assets/img/button_user.png" id="img_user"> 
-				<input class="loginInput" type="text" autocomplete="off" 
-					placeholder="用户名" name="username" value="admin" /> 
-				<img src="./assets/img/button_pwd.png"> 
-				<input class="loginInput" type="password" autocomplete="off" 
-					placeholder="密码" name="password" value="admin" /> 
-				<img src="./assets/img/button_login.png" class="buttonLogin">
+				
+				<div class="input-icon  right" style="display: inline-block;">
+                   <i class="fa fa-user"></i>
+                	<input type="text" class="form-control " placeholder="用户名" name="username" value="admin"> </div>
+					
+				
+				<div class="input-icon  right" style="display: inline-block;">
+                   <i class="fa fa-key"></i>
+                	<input type="password" class="form-control " placeholder="密码" name="password" value="admin"> </div>
+				&nbsp;&nbsp;
+                   <button type="submit" class="btn blue buttonLogin" style="border-radius: 5px !important;
+    font-family: 微软雅黑;">登&nbsp;录</button>
+				
 			</div>
 		</form>
 	</div>
@@ -12,13 +12,13 @@
 		</div>
         <div class="actions col_hide_1280" >
 	        <div class="btn-group">
-	              <button type="button" class="btn btn-default">
+	              <button type="button" class="btn btn-default" disabled>
 	                  <i class="fa fa-calendar-check-o"></i> 计划排班</button>
-	              <button type="button" class="btn btn-default">
+	              <button type="button" class="btn btn-default" disabled>
 	                  <i class="fa fa-history"></i> 轨迹回放</button>
 	              <div class="btn-group">
-	                  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+	                  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" disabled>
 	                      <i class="fa fa-database"></i> 基本信息
 	                      <i class="fa fa-angle-down"></i>
 	                  </button>
@@ -43,7 +43,7 @@
 	              <div class="btn-group">
-	                  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+	                  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" disabled>
 	                      <i class="fa fa-gavel"></i> 系统设置
 	                      <i class="fa fa-angle-down"></i>
 	                  </button>
@@ -57,8 +57,8 @@
 	                  </ul>
 	              </div>
-	              	<button type="button" class="btn btn-danger" style="margin-left: 8px;padding: 6.5px 9px !important;">
-	                  <i class="fa fa-close"></i> 退出系统</button>
+	              	<button id="exitBtn" type="button" class="btn btn-danger" style="margin-left: 8px;padding: 6.5px 9px !important;" >
+	                  <i class="fa fa-close" ></i> 退出系统</button>
 	          </div>
         </div>
     </div>
 !function(){
+	$('#exitBtn').on('click', function(){
+		layer.confirm('确定要退出系统？', {
+			btn : [ '退出', '取消' ],
+			icon : 3,
+			skin : 'layui-layer-cfm-delete'
+		}, function(){
+			layer.closeAll();
+			window.location.href = '/pages/control/lineallot/allot.html';
+		});
+	});
+	
 	var gpsOff = 1000 * 60 * 5;
 	var homeObject = {
@@ -10,7 +10,7 @@
 		<div class="title">
 			发往{{lineObj.startStationName}}方向 <span class="up-number" id="{{lineObj.lineCode}}_0_badge"> 0 </span>
 			<div class="help_text dropdown">
-				<span class=" blue dropdown-toggle col_hide_1440"
+				<!--<span class=" blue dropdown-toggle col_hide_1440"
 					data-toggle="dropdown" aria-expanded="true"
 					style="cursor: pointer;"> <i
 					class="fa fa-ellipsis-horizontal"></i> 全部 <i
@@ -23,7 +23,7 @@
 					<li role="separator" class="divider"></li>
 					<li><a href="javascript:;"> 场内车辆 </a></li>
 					<li><a href="javascript:;"> 非营运车辆</a></li>
-				</ul>
+				</ul>-->
 			</div>
 		</div>
@@ -60,7 +60,7 @@
 		<div class="title">
 			发往{{lineObj.endStationName}}方向 <span class="down-number" id="{{lineObj.lineCode}}_1_badge"> 0 </span>
 			<div class="help_text dropdown">
-				<span class=" blue dropdown-toggle col_hide_1440"
+				<!--<span class=" blue dropdown-toggle col_hide_1440"
 					data-toggle="dropdown" aria-expanded="true"
 					style="cursor: pointer;"> <i
 					class="fa fa-ellipsis-horizontal"></i> 全部 <i
@@ -70,7 +70,7 @@
 					<li><a href="javascript:;"> 下行全部 </a></li>
 					<li><a href="javascript:;"> 下行停靠 </a></li>
 					<li><a href="javascript:;"> 下行在途 </a></li>
-				</ul>
+				</ul>-->
 			</div>
 		</div>
 		<table class="table table-striped table-bordered table-advance"