2
0

2 Ревизии ef3d2e06e8 ... 6371210a5c

Автор SHA1 Съобщение Дата
  Guichuan Yu 6371210a5c Merge remote-tracking branch 'origin/master' преди 6 години
  Guichuan Yu 769a7f1f58 Change stuff and realtime JS made преди 6 години
променени са 4 файла, в които са добавени 112 реда и са изтрити 5 реда
  1. BIN
      images/logo.jpg
  2. 1 2
      js/basic.js
  3. 3 3
      lazhang.html
  4. 108 0
      sign-in1.html

BIN
images/logo.jpg


+ 1 - 2
js/basic.js

@@ -150,8 +150,7 @@ function second_success(obj, sta) {
 
        }
        if(history.length!=1){
-        hisrate[t]=hisfail[t]/(hispass[t]+hisfail[t]);
-
+        hisrate[t]=Math.floor(hisfail[t]/(hispass[t]+hisfail[t])*10000)/100;
     }
     if(hispass[t]+hisfail[t]==0){
         hisrate[t]=0;

+ 3 - 3
lazhang.html

@@ -613,7 +613,7 @@
                                             <td>${hispass[i]}</td>
                                             <td>${hisfail[i]}</td>
                                             <td>${hisstack[i]}</td>
-                                            <td>${hisrate[i]}</td>
+                                            <td>${hisrate[i]+'%'}</td>
                                         </tr>`;
         htmlbody += "</tr>";
         return htmlbody;
@@ -624,7 +624,7 @@
                                             <td>${goodid[i]}</td>
                                             <td>${goodpass[i]}</td>
                                             <td>${goodid[i]}</td>
-                                            <td>${goodfailrate[i]}</td>
+                                            <td>${goodfailrate[i]+'%'}</td>
                                         </tr>`;
         htmlbody += "</tr>";
         return htmlbody;
@@ -635,7 +635,7 @@
                                             <td>${badid[i]}</td>
                                             <td>${badpass[i]}</td>
                                             <td>${badid[i]}</td>
-                                            <td>${badfailrate[i]}</td>
+                                            <td>${badfailrate[i]+'%'}</td>
                                         </tr>`;
         htmlbody += "</tr>";
         return htmlbody;

+ 108 - 0
sign-in1.html

@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+    <title>流水线管理页</title>
+    <!-- Favicon-->
+    <link rel="icon" href="favicon.ico" type="image/x-icon">
+
+    <!-- Google Fonts -->
+    <link href="css/cyllic.css" rel="stylesheet" type="text/css">
+    <link href="css/mateial.css" rel="stylesheet" type="text/css">
+
+    <!-- Bootstrap Core Css -->
+    <link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/4.0.0/css/bootstrap.min.css"
+          integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+    <!-- Waves Effect Css -->
+    <link href="plugins/node-waves/waves.css" rel="stylesheet"/>
+
+    <!-- Animation Css -->
+    <link href="plugins/animate-css/animate.css" rel="stylesheet"/>
+
+    <!-- Morris Chart Css-->
+    <link href="plugins/morrisjs/morris.css" rel="stylesheet"/>
+
+    <!-- Custom Css -->
+    <link href="css/style.css" rel="stylesheet">
+
+    <!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes -->
+    <link href="css/themes/all-themes.css" rel="stylesheet"/>
+
+    <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+    <script src="https://cdn.bootcss.com/popper.js/1.12.9/umd/popper.min.js"
+            integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
+            crossorigin="anonymous"></script>
+    <script src="https://cdn.bootcss.com/bootstrap/4.0.0/js/bootstrap.min.js"
+            integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
+            crossorigin="anonymous"></script>
+
+    <link rel="icon" href="https://static.jianshukeji.com/highcharts/images/favicon.ico">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style>
+        /* css 代码  */
+    </style>
+    <script src="https://img.hcharts.cn/highcharts/highcharts.js"></script>
+    <script src="https://img.hcharts.cn/highcharts/modules/exporting.js"></script>
+    <script src="https://img.hcharts.cn/highcharts-plugins/highcharts-zh_CN.js"></script>
+    <script src="https://img.hcharts.cn/highcharts/themes/dark-unica.js"></script>
+</head>
+
+<body class="login-page ls-closed " style="background-color: #303030 ">
+    <div class="login-box text-center" style="">
+        <div class="logo">
+            <a href="javascript:void(0);">工厂产能监控登陆</a>
+        </div>
+        <div class="card">
+            <div class="body">
+                <form id="sign_in" method="POST">
+                    <div class="msg">登录开始</div>
+                    <div class="input-group">
+                        <span class="input-group-addon">
+                            <i class="material-icons">person</i>
+                        </span>
+                        <div class="form-line">
+                            <input type="text" class="form-control" name="username" placeholder="用户名" required autofocus>
+                        </div>
+                    </div>
+                    <div class="input-group">
+                        <span class="input-group-addon">
+                            <i class="material-icons">lock</i>
+                        </span>
+                        <div class="form-line">
+                            <input type="password" class="form-control" name="password" placeholder="密码" required>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-8"></div>
+                        <div class="col-4" style="float: right">
+                            <button class="btn btn-block bg-pink waves-effect" type="submit">登陆</button>
+                        </div>
+                    </div>
+
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <!-- Jquery Core Js -->
+    <script src="../../plugins/jquery/jquery.min.js"></script>
+
+    <!-- Bootstrap Core Js -->
+    <script src="../../plugins/bootstrap/js/bootstrap.js"></script>
+
+    <!-- Waves Effect Plugin Js -->
+    <script src="../../plugins/node-waves/waves.js"></script>
+
+    <!-- Validation Plugin Js -->
+    <script src="../../plugins/jquery-validation/jquery.validate.js"></script>
+
+    <!-- Custom Js -->
+    <script src="../../js/admin.js"></script>
+    <script src="../../js/pages/examples/sign-in.js"></script>
+</body>
+
+</html>