潘钊 / bsth_control · Commits

Commit 2c484d5fdb69fb64d373a205c6c4e90d2f4b7469

Authored by 潘钊
1 parent d3e348c7

up

Inline Side-by-side
Showing 5 changed files with 52 additions and 20 deletions
src/main/java/com/bsth/vehicle/directive/entity/Directive60.java
  View file @2c484d5
... ... @@ -9,6 +9,7 @@ import javax.persistence.Table;
9 9 import javax.persistence.Transient;
10 10  
11 11 import com.bsth.entity.realcontrol.ScheduleRealInfo;
  12 +import com.bsth.entity.sys.SysUser;
12 13  
13 14  
14 15 /**
... ... @@ -77,6 +78,12 @@ public class Directive60 {
77 78 @ManyToOne
78 79 private ScheduleRealInfo sch;
79 80  
  81 + /**
  82 + * 发送人
  83 + */
  84 + @ManyToOne
  85 + private SysUser sender;
  86 +
80 87 @Embeddable
81 88 public static class DirectiveData {
82 89 // 公司代码
... ... @@ -265,4 +272,12 @@ public class Directive60 {
265 272 public void setSch(ScheduleRealInfo sch) {
266 273 this.sch = sch;
267 274 }
  275 +
  276 + public SysUser getSender() {
  277 + return sender;
  278 + }
  279 +
  280 + public void setSender(SysUser sender) {
  281 + this.sender = sender;
  282 + }
268 283 }
... ...
src/main/resources/static/login.html
  View file @2c484d5
... ... @@ -56,8 +56,8 @@ Login page
56 56 text-align: center; */
57 57 }
58 58  
59   -.loginInput {
60   - height: 32px;
  59 +/* .loginInput {
  60 + height: 35px;
61 61 padding: 6px 12px;
62 62 background-color: #fff;
63 63 border: 1px solid #c2cad8;
... ... @@ -67,7 +67,7 @@ Login page
67 67 -webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
68 68 -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
69 69 transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
70   -}
  70 +} */
71 71  
72 72 .buttonLogin {
73 73 cursor: pointer;
... ... @@ -86,13 +86,19 @@ Login page
86 86 <div class="loginCenter">
87 87 <form class="login-form" action="/login" method="post">
88 88 <div class="col-md-12 loginInputDiv">
89   - <img src="./assets/img/button_user.png" id="img_user">
90   - <input class="loginInput" type="text" autocomplete="off"
91   - placeholder="用户名" name="username" value="admin" />
92   - <img src="./assets/img/button_pwd.png">
93   - <input class="loginInput" type="password" autocomplete="off"
94   - placeholder="密码" name="password" value="admin" />
95   - <img src="./assets/img/button_login.png" class="buttonLogin">
  89 +
  90 + <div class="input-icon right" style="display: inline-block;">
  91 + <i class="fa fa-user"></i>
  92 + <input type="text" class="form-control " placeholder="用户名" name="username" value="admin"> </div>
  93 +
  94 +
  95 + <div class="input-icon right" style="display: inline-block;">
  96 + <i class="fa fa-key"></i>
  97 + <input type="password" class="form-control " placeholder="密码" name="password" value="admin"> </div>
  98 + &nbsp;&nbsp;
  99 + <button type="submit" class="btn blue buttonLogin" style="border-radius: 5px !important;
  100 + font-family: 微软雅黑;">登&nbsp;录</button>
  101 +
96 102 </div>
97 103 </form>
98 104 </div>
... ...
src/main/resources/static/pages/control/line/index.html
  View file @2c484d5
... ... @@ -12,13 +12,13 @@
12 12 </div>
13 13 <div class="actions col_hide_1280" >
14 14 <div class="btn-group">
15   - <button type="button" class="btn btn-default">
  15 + <button type="button" class="btn btn-default" disabled>
16 16 <i class="fa fa-calendar-check-o"></i> 计划排班</button>
17   - <button type="button" class="btn btn-default">
  17 + <button type="button" class="btn btn-default" disabled>
18 18 <i class="fa fa-history"></i> 轨迹回放</button>
19 19  
20 20 <div class="btn-group">
21   - <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
  21 + <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" disabled>
22 22 <i class="fa fa-database"></i> 基本信息
23 23 <i class="fa fa-angle-down"></i>
24 24 </button>
... ... @@ -43,7 +43,7 @@
43 43  
44 44  
45 45 <div class="btn-group">
46   - <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
  46 + <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" disabled>
47 47 <i class="fa fa-gavel"></i> 系统设置
48 48 <i class="fa fa-angle-down"></i>
49 49 </button>
... ... @@ -57,8 +57,8 @@
57 57 </ul>
58 58 </div>
59 59  
60   - <button type="button" class="btn btn-danger" style="margin-left: 8px;padding: 6.5px 9px !important;">
61   - <i class="fa fa-close"></i> 退出系统</button>
  60 + <button id="exitBtn" type="button" class="btn btn-danger" style="margin-left: 8px;padding: 6.5px 9px !important;" >
  61 + <i class="fa fa-close" ></i> 退出系统</button>
62 62 </div>
63 63 </div>
64 64 </div>
... ...
src/main/resources/static/pages/control/line/js/main.js
  View file @2c484d5
1 1 !function(){
2 2  
  3 + $('#exitBtn').on('click', function(){
  4 + layer.confirm('确定要退出系统？', {
  5 + btn : [ '退出', '取消' ],
  6 + icon : 3,
  7 + skin : 'layui-layer-cfm-delete'
  8 + }, function(){
  9 + layer.closeAll();
  10 + window.location.href = '/pages/control/lineallot/allot.html';
  11 + });
  12 + });
  13 +
3 14 var gpsOff = 1000 * 60 * 5;
4 15  
5 16 var homeObject = {
... ...
src/main/resources/static/pages/control/line/temps/home_tp.html
  View file @2c484d5
... ... @@ -10,7 +10,7 @@
10 10 <div class="title">
11 11 发往{{lineObj.startStationName}}方向 <span class="up-number" id="{{lineObj.lineCode}}_0_badge"> 0 </span>
12 12 <div class="help_text dropdown">
13   - <span class=" blue dropdown-toggle col_hide_1440"
  13 + <!--<span class=" blue dropdown-toggle col_hide_1440"
14 14 data-toggle="dropdown" aria-expanded="true"
15 15 style="cursor: pointer;"> <i
16 16 class="fa fa-ellipsis-horizontal"></i> 全部 <i
... ... @@ -23,7 +23,7 @@
23 23 <li role="separator" class="divider"></li>
24 24 <li><a href="javascript:;"> 场内车辆 </a></li>
25 25 <li><a href="javascript:;"> 非营运车辆</a></li>
26   - </ul>
  26 + </ul>-->
27 27  
28 28 </div>
29 29 </div>
... ... @@ -60,7 +60,7 @@
60 60 <div class="title">
61 61 发往{{lineObj.endStationName}}方向 <span class="down-number" id="{{lineObj.lineCode}}_1_badge"> 0 </span>
62 62 <div class="help_text dropdown">
63   - <span class=" blue dropdown-toggle col_hide_1440"
  63 + <!--<span class=" blue dropdown-toggle col_hide_1440"
64 64 data-toggle="dropdown" aria-expanded="true"
65 65 style="cursor: pointer;"> <i
66 66 class="fa fa-ellipsis-horizontal"></i> 全部 <i
... ... @@ -70,7 +70,7 @@
70 70 <li><a href="javascript:;"> 下行全部 </a></li>
71 71 <li><a href="javascript:;"> 下行停靠 </a></li>
72 72 <li><a href="javascript:;"> 下行在途 </a></li>
73   - </ul>
  73 + </ul>-->
74 74 </div>
75 75 </div>
76 76 <table class="table table-striped table-bordered table-advance"
... ...