潘钊 / bsth_control · Commits

Commit 7b8181250f2b204b647d39a6c92ecd190bf8ca1f

Authored by 潘钊
1 parent 6bf41958

update...

Inline Side-by-side
Showing 3 changed files with 53 additions and 7 deletions
src/main/resources/ms-jdbc.properties
  View file @7b81812
1 ms.mysql.driver= com.mysql.jdbc.Driver 1 ms.mysql.driver= com.mysql.jdbc.Driver
2 -ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8 2 +ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8
3 ms.mysql.username= root 3 ms.mysql.username= root
4 -ms.mysql.password= panzhao 4 +ms.mysql.password= 123456
5 5
6 #ms.mysql.driver= com.mysql.jdbc.Driver 6 #ms.mysql.driver= com.mysql.jdbc.Driver
7 #ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8 7 #ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
src/main/resources/static/login.html
  View file @7b81812
@@ -160,10 +160,23 @@ h3.logo-text{ @@ -160,10 +160,23 @@ h3.logo-text{
160 font-family: 华文楷体,华文细黑; 160 font-family: 华文楷体,华文细黑;
161 font-size: 28px; 161 font-size: 28px;
162 } 162 }
  163 +
  164 +.warn-note{
  165 + width: 100%;
  166 + position: absolute;
  167 + top: 0;
  168 + z-index: 2;
  169 + text-align: center;
  170 + background: #ff4646;
  171 + color: white;
  172 + padding: 12px;
  173 + display: none;
  174 +}
163 </style> 175 </style>
164 </head> 176 </head>
165 177
166 <body> 178 <body>
  179 + <div class="warn-note">警告！系统目前仅在 WebKit 内核下完成兼容性测试，请使用 Google Chrome 浏览器进入系统。</div>
167 <div class="wrapper ng-scope"> 180 <div class="wrapper ng-scope">
168 <div id="loginPanel" class="dialog dialog-shadow"> 181 <div id="loginPanel" class="dialog dialog-shadow">
169 <br> 182 <br>
@@ -211,6 +224,11 @@ h3.logo-text{ @@ -211,6 +224,11 @@ h3.logo-text{
211 <script src="/metronic_v4.5.4/plugins/jquery.min.js" ></script> 224 <script src="/metronic_v4.5.4/plugins/jquery.min.js" ></script>
212 <script src="/assets/plugins/jsencrypt.min.js" ></script> 225 <script src="/assets/plugins/jsencrypt.min.js" ></script>
213 <script> 226 <script>
  227 +window.onload=function(){
  228 + var body=document.getElementsByTagName("body")[0];
  229 + if(typeof body.style.WebkitAnimation=="undefined")
  230 + $('.warn-note').fadeIn();
  231 +}
214 !function(){ 232 !function(){
215 var form = $('#loginPanel form') 233 var form = $('#loginPanel form')
216 ,nameInput = $('input[name=userName]', form) 234 ,nameInput = $('input[name=userName]', form)
src/main/resources/static/pages/control/line/index.html
  View file @7b81812
@@ -25,11 +25,39 @@ @@ -25,11 +25,39 @@
25 </div> 25 </div>
26 <div class="actions col_hide_1280" > 26 <div class="actions col_hide_1280" >
27 <div class="btn-group"> 27 <div class="btn-group">
28 - <button type="button" class="btn btn-default" id="deviceReport">  
29 - <i class="fa fa-code-fork"></i> 设备上报</button>  
30 -  
31 - <button type="button" class="btn btn-default" id="msgAndDirect">  
32 - <i class="fa fa-bell"></i> 调度指令</button> 28 +
  29 + <div class="btn-group">
  30 + <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" >
  31 + <i class="fa fa-database"></i> &nbsp;基础数据
  32 + <i class="fa fa-angle-down"></i>
  33 + </button>
  34 + <ul class="dropdown-menu">
  35 + <li>
  36 + <a href="javascript:;" id=""> 车辆配置 </a>
  37 + </li>
  38 + <li>
  39 + <a href="javascript:;" id=""> 人员配置 </a>
  40 + </li>
  41 + </ul>
  42 + </div>
  43 +
  44 + <div class="btn-group">
  45 + <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" >
  46 + <i class="fa fa-bus"></i> &nbsp;车载设备
  47 + <i class="fa fa-angle-down"></i>
  48 + </button>
  49 + <ul class="dropdown-menu">
  50 + <li>
  51 + <a href="javascript:;" id="deviceConfig"> 设备管理 </a>
  52 + </li>
  53 + <li>
  54 + <a href="javascript:;" id="deviceReport"> 设备上报记录 </a>
  55 + </li>
  56 + <li>
  57 + <a href="javascript:;" id="msgAndDirect"> 指令下发记录 </a>
  58 + </li>
  59 + </ul>
  60 + </div>
33 61
34 <div class="btn-group"> 62 <div class="btn-group">
35 <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" > 63 <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" >