Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	js/lazhang-data.js
Guichuan Yu 6 years ago
parent
commit
c84ee106ac
2 changed files with 5 additions and 4 deletions
  1. 1 0
      js/common.js
  2. 4 4
      sign-in1.html

+ 1 - 0
js/common.js

@@ -97,6 +97,7 @@ function update_all_history(){
     hisrate[0] = get_factor(hispass[0], hisfail[0]);
     hisrate[0] = get_factor(hispass[0], hisfail[0]);
 
 
     if(typeof hisrate[0] == "undefined" || isNaN(hisrate[0])){
     if(typeof hisrate[0] == "undefined" || isNaN(hisrate[0])){
+        send_alert("请重试!");
 
 
     }
     }
 
 

+ 4 - 4
sign-in1.html

@@ -45,20 +45,20 @@
 <body class="login-page ls-closed " style="background-color: #303030 ">
 <body class="login-page ls-closed " style="background-color: #303030 ">
     <div class="login-box text-center" style="">
     <div class="login-box text-center" style="">
         <div class="logo">
         <div class="logo">
-            <a href="javascript:void(0);">生产人员入口 <br>工厂产能监控登陆</a>
+            <a href="javascript:void(0);">生产看板系统</a>
         </div>
         </div>
         <div class="alert alert-warning" id="mpAlert" style="display:none">
         <div class="alert alert-warning" id="mpAlert" style="display:none">
         </div>
         </div>
         <div class="card">
         <div class="card">
             <div class="body">
             <div class="body">
                 <form id="sign_in" method="POST" onsubmit="return false;">
                 <form id="sign_in" method="POST" onsubmit="return false;">
-                    <div class="msg">请使用生产人员信息登陆(不是管理员信息)<br> V170100 </div>
+                    <div class="msg">请使用看板系统账号登录(不是管理员信息)<br> V170100 </div>
                     <div class="input-group">
                     <div class="input-group">
                         <span class="input-group-addon">
                         <span class="input-group-addon">
                             <i class="material-icons">person</i>
                             <i class="material-icons">person</i>
                         </span>
                         </span>
                         <div class="form-line">
                         <div class="form-line">
-                            <input type="text" class="form-control" name="username" placeholder="生产人员登陆名" required autofocus>
+                            <input type="text" class="form-control" name="username" placeholder="系统用户登陆名" required autofocus>
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="input-group">
                     <div class="input-group">
@@ -66,7 +66,7 @@
                             <i class="material-icons">lock</i>
                             <i class="material-icons">lock</i>
                         </span>
                         </span>
                         <div class="form-line">
                         <div class="form-line">
-                            <input type="password" class="form-control" name="password" placeholder="生产人员密码" required>
+                            <input type="password" class="form-control" name="password" placeholder="系统用户密码" required>
                         </div>
                         </div>
                     </div>
                     </div>
                     <div class="row">
                     <div class="row">