Home Explore Help
Register Sign In
factory18
/
fronend
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Changed Stuff

Fruit of Eden 6 years ago
parent
6371210a5c
commit
d3b71fd56e
4 changed files with 81 additions and 40 deletions
Unified View Show Diff Stats
  1. 56 35
      denglu.html
  2. 14 0
      js/getparam.js
  3. 3 3
      lazhang.html
  4. 8 2
      sign-in1.html

+ 56 - 35
denglu.html
View File 

@@ -50,36 +50,34 @@
 
     <script src="https://img.hcharts.cn/highcharts-plugins/highcharts-zh_CN.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>
 
     <script src="https://img.hcharts.cn/highcharts/themes/dark-unica.js"></script>
 
     <script language="JavaScript">
 
     <script language="JavaScript">
 
-        function startTime()
 
-        {
 
-            var today=new Date();//定义日期对象
 
+        function startTime() {
 
+            var today = new Date();//定义日期对象
 
             var yyyy = today.getFullYear();//通过日期对象的getFullYear()方法返回年
 
             var yyyy = today.getFullYear();//通过日期对象的getFullYear()方法返回年
 
-            var MM = today.getMonth()+1;//通过日期对象的getMonth()方法返回年
 
+            var MM = today.getMonth() + 1;//通过日期对象的getMonth()方法返回年
 
             var dd = today.getDate();//通过日期对象的getDate()方法返回年
 
             var dd = today.getDate();//通过日期对象的getDate()方法返回年
 
-            var hh=today.getHours();//通过日期对象的getHours方法返回小时
 
-            var mm=today.getMinutes();//通过日期对象的getMinutes方法返回分钟
 
-            var ss=today.getSeconds();//通过日期对象的getSeconds方法返回秒
 
+            var hh = today.getHours();//通过日期对象的getHours方法返回小时
 
+            var mm = today.getMinutes();//通过日期对象的getMinutes方法返回分钟
 
+            var ss = today.getSeconds();//通过日期对象的getSeconds方法返回秒
 
             // 如果分钟或小时的值小于10，则在其值前加0，比如如果时间是下午3点20分9秒的话，则显示15：20：09
 
             // 如果分钟或小时的值小于10，则在其值前加0，比如如果时间是下午3点20分9秒的话，则显示15：20：09
 
-            MM=checkTime(MM);
 
-            dd=checkTime(dd);
 
-            mm=checkTime(mm);
 
-            ss=checkTime(ss);
 
+            MM = checkTime(MM);
 
+            dd = checkTime(dd);
 
+            mm = checkTime(mm);
 
+            ss = checkTime(ss);
 
             var day; //用于保存星期（getDay()方法得到星期编号）
 
             var day; //用于保存星期（getDay()方法得到星期编号）
 
-            if(today.getDay()==0)   day   =   "星期日 "
 
-            if(today.getDay()==1)   day   =   "星期一 "
 
-            if(today.getDay()==2)   day   =   "星期二 "
 
-            if(today.getDay()==3)   day   =   "星期三 "
 
-            if(today.getDay()==4)   day   =   "星期四 "
 
-            if(today.getDay()==5)   day   =   "星期五 "
 
-            if(today.getDay()==6)   day   =   "星期六 "
 
-            document.getElementById('nowDateTimeSpan').innerHTML=yyyy+"-"+MM +"-"+ dd +"   " + day+" " + hh+":"+mm+":"+ss;
 
-            setTimeout('startTime()',1000);//每一秒中重新加载startTime()方法
 
+            if (today.getDay() == 0) day = "星期日 "
 
+            if (today.getDay() == 1) day = "星期一 "
 
+            if (today.getDay() == 2) day = "星期二 "
 
+            if (today.getDay() == 3) day = "星期三 "
 
+            if (today.getDay() == 4) day = "星期四 "
 
+            if (today.getDay() == 5) day = "星期五 "
 
+            if (today.getDay() == 6) day = "星期六 "
 
+            document.getElementById('nowDateTimeSpan').innerHTML = yyyy + "-" + MM + "-" + dd + "   " + day + " " + hh + ":" + mm + ":" + ss;
 
+            setTimeout('startTime()', 1000);//每一秒中重新加载startTime()方法
 
         }
 
         }
 
 
 
-        function checkTime(i)
 
-        {
 
-            if (i<10){
 
-                i="0" + i;
 
+        function checkTime(i) {
 
+            if (i < 10) {
 
+                i = "0" + i;
 
             }
 
             }
 
             return i;
 
             return i;
 
         }
 
         }
 
@@ -87,7 +85,7 @@
 
 </head>
 
 </head>
 
 
 
 <body class="" style="background-color: #17253f !important;" onload="startTime()">
 
 <body class="" style="background-color: #17253f !important;" onload="startTime()">
 
-<div >
 
+<div class="text-center">
 
     <nav class="navbar" style="background-color: red">
 
     <nav class="navbar" style="background-color: red">
 
         <div class="container-fluid">
 
         <div class="container-fluid">
 
             <div class="navbar-header">
 
             <div class="navbar-header">
 
@@ -98,19 +96,42 @@
 
         </div>
 
         </div>
 
     </nav>
 
     </nav>
 
     <div class="container-fluid" style="margin-top: 20em">
 
     <div class="container-fluid" style="margin-top: 20em">
 
-        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="width: 30%">
 
-            拉 <span class="caret"></span>
 
-        </button>
 
-        <ul class="dropdown-menu">
 
-            <li><a href="#">生产线1</a></li>
 
-            <li><a href="#">生产线2</a></li>
 
-        </ul>
 
-        <button type="button" class="btn btn-primary btn-lg btn-block" style="float: right;width: 30%">Block level button</button>
 
+        <div class="row">
 
+            <div class="col-6">
 
+                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
 
+                        aria-haspopup="true" aria-expanded="false" style="width: 30%">
 
+                    拉 <span class="caret"></span>
 
+                </button>
 
+            </div>
 
+            <div class="col-6">
 
+                <div class="bootstrap-select">
 
+                    <select class="" tabindex="-98">
 
+                        <option value="">-- Please select --</option>
 
+                        <option value="10">10</option>
 
+                        <option value="20">20</option>
 
+                        <option value="30">30</option>
 
+                        <option value="40">40</option>
 
+                        <option value="50">50</option>
 
+                    </select>
 
+                    <select class="selectpicker">
 
+                        <option>Mustard</option>
 
+                        <option>Ketchup</option>
 
+                        <option>Relish</option>
 
+                    </select>
 
+
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <div class="col-12 row">
 
+            <button type="button" class="btn btn-primary btn-lg btn-block" style="float: right;width: 30%">Block level
 
+                button
 
+            </button>
 
+        </div>
 
     </div>
 
     </div>
 
 
 
-    <div class="text-center" style="width: 30%;padding-top: 10em;margin: 0 auto" >
 
+    <div class="text-center" style="width: 30%;padding-top: 10em;margin: 0 auto">
 
 
 
-        <button class="btn btn-block bg-pink waves-effect" type="submit" style="">登陆</button>
 
+        <button class="btn btn-block bg-pink waves-effect" type="submit" style="">上班</button>
 
 
 
     </div>
 
     </div>
 
 </div>
 
 </div>

+ 14 - 0
js/getparam.js
View File 

@@ -10,4 +10,18 @@ var flowId = utils_get_param("flowId");
 
 
 
 if(flowId == null || scheduleId == null){
 
 if(flowId == null || scheduleId == null){
 
     alert("出错啦！请检查参数完整性");
 
     alert("出错啦！请检查参数完整性");
 
+}
 
+
 
+
 
+// 去除实际名字
 
+function getNames(workerIdList, chart){
 
+    // return "张三";
 
+}
 
+
 
+function on_load_name_success(obj){
 
+
 
+}
 
+
 
+function reloadPage(){
 
+    location.reload()
 
 }
 
 }

+ 3 - 3
lazhang.html
View File 

@@ -605,7 +605,7 @@
 
 <script src="js/basic.js"></script>
 
 <script src="js/basic.js"></script>
 
 
 
 <script>
 
 <script>
 
-    var timeday=new Array("今日" ,"昨日" ,"本周" ,"本月");
 
+    var timeday=["今日" ,"昨日" ,"本周" ,"本月"];
 
     function getSpotHtml(htmlbody,  i) {
 
     function getSpotHtml(htmlbody,  i) {
 
         htmlbody += "<tr>";
 
         htmlbody += "<tr>";
 
         htmlbody += `<tr>
 
         htmlbody += `<tr>
 
@@ -923,7 +923,7 @@
 
         $('[style-height="30-8"]').height(window.innerHeight * 0.4 - 220);
 
         $('[style-height="30-8"]').height(window.innerHeight * 0.4 - 220);
 
         $('[style-height="30-1"]').each(function(one,items){$(items).height(window.innerHeight * 0.3)});
 
         $('[style-height="30-1"]').each(function(one,items){$(items).height(window.innerHeight * 0.3)});
 
         $('[style-height="30-2"]').each(function(one,items){$(items).height(window.innerHeight * 0.2)});
 
         $('[style-height="30-2"]').each(function(one,items){$(items).height(window.innerHeight * 0.2)});
 
-       var graph = $("#graph-1");
 
+        var graph = $("#graph-1");
 
         graph.width(window.innerWidth - 35);
 
         graph.width(window.innerWidth - 35);
 
         graph.height(window.innerHeight / 3.333);
 
         graph.height(window.innerHeight / 3.333);
 
         if (graph.highcharts !== undefined) {
 
         if (graph.highcharts !== undefined) {
 
@@ -951,7 +951,7 @@
 
 
 
 
 
 
 
-
 
+    init_names(flowId);

+ 8 - 2
sign-in1.html
View File 

@@ -58,7 +58,7 @@
 
         </div>
 
         </div>
 
         <div class="card">
 
         <div class="card">
 
             <div class="body">
 
             <div class="body">
 
-                <form id="sign_in" method="POST">
 
+                <form id="sign_in" method="POST" onsubmit="return false;">
 
                     <div class="msg">登录开始</div>
 
                     <div class="msg">登录开始</div>
 
                     <div class="input-group">
 
                     <div class="input-group">
 
                         <span class="input-group-addon">
 
                         <span class="input-group-addon">
 
@@ -79,7 +79,7 @@
 
                     <div class="row">
 
                     <div class="row">
 
                         <div class="col-8"></div>
 
                         <div class="col-8"></div>
 
                         <div class="col-4" style="float: right">
 
                         <div class="col-4" style="float: right">
 
-                            <button class="btn btn-block bg-pink waves-effect" type="submit">登陆</button>
 
+                            <button class="btn btn-block bg-pink waves-effect" type="submit" onclick="gotoLogin()">登陆</button>
 
                         </div>
 
                         </div>
 
                     </div>
 
                     </div>
 
 
 
@@ -103,6 +103,12 @@
 
     <!-- Custom Js -->
 
     <!-- Custom Js -->
 
     <script src="../../js/admin.js"></script>
 
     <script src="../../js/admin.js"></script>
 
     <script src="../../js/pages/examples/sign-in.js"></script>
 
     <script src="../../js/pages/examples/sign-in.js"></script>
 
+
 
+    <script>
 
+        function gotoLogin(){
 
+
 
+    }
 
+    </script>
 
 </body>
 
 </body>
 
 
 
 </html>
 
 </html>