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

更新Data Success 处理、判断是否登陆失效

jason.lu 6 years ago
parent
c18c5add79
commit
f85c6cbf36
5 changed files with 299 additions and 70 deletions
Split View Show Diff Stats
  1. 221 0
      dapingmu-redesign.html
  2. 1 40
      dapingmu.html
  3. 42 29
      denglu.html
  4. 1 1
      js/dapingmu-display.js
  5. 34 0
      js/timeService.js

+ 221 - 0
dapingmu-redesign.html
View File 

@@ -0,0 +1,221 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+<head>
 
+    <meta charset="UTF-8">
 
+    <title>Title</title>
 
+</head>
 
+<body>
 
+<div class="container-fluid">
 
+    <div class="row-fluid">
 
+        <div class="span12">
 
+            <div class="navbar">
 
+                <div class="navbar-inner">
 
+                    <div class="container-fluid">
 
+                        <a data-target=".navbar-responsive-collapse" data-toggle="collapse" class="btn btn-navbar"><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></a> <a href="#" class="brand">网站名</a>
 
+                        <div class="nav-collapse collapse navbar-responsive-collapse">
 
+                            <ul class="nav">
 
+                                <li class="active">
 
+                                    <a href="#">主页</a>
 
+                                </li>
 
+                                <li>
 
+                                    <a href="#">链接</a>
 
+                                </li>
 
+                                <li>
 
+                                    <a href="#">链接</a>
 
+                                </li>
 
+                                <li class="dropdown">
 
+                                    <a data-toggle="dropdown" class="dropdown-toggle" href="#">下拉菜单<strong class="caret"></strong></a>
 
+                                    <ul class="dropdown-menu">
 
+                                        <li>
 
+                                            <a href="#">下拉导航1</a>
 
+                                        </li>
 
+                                        <li>
 
+                                            <a href="#">下拉导航2</a>
 
+                                        </li>
 
+                                        <li>
 
+                                            <a href="#">其他</a>
 
+                                        </li>
 
+                                        <li class="divider">
 
+                                        </li>
 
+                                        <li class="nav-header">
 
+                                            标签
 
+                                        </li>
 
+                                        <li>
 
+                                            <a href="#">链接1</a>
 
+                                        </li>
 
+                                        <li>
 
+                                            <a href="#">链接2</a>
 
+                                        </li>
 
+                                    </ul>
 
+                                </li>
 
+                            </ul>
 
+                            <ul class="nav pull-right">
 
+                                <li>
 
+                                    <a href="#">右边链接</a>
 
+                                </li>
 
+                                <li class="divider-vertical">
 
+                                </li>
 
+                                <li class="dropdown">
 
+                                    <a data-toggle="dropdown" class="dropdown-toggle" href="#">下拉菜单<strong class="caret"></strong></a>
 
+                                    <ul class="dropdown-menu">
 
+                                        <li>
 
+                                            <a href="#">下拉导航1</a>
 
+                                        </li>
 
+                                        <li>
 
+                                            <a href="#">下拉导航2</a>
 
+                                        </li>
 
+                                        <li>
 
+                                            <a href="#">其他</a>
 
+                                        </li>
 
+                                        <li class="divider">
 
+                                        </li>
 
+                                        <li>
 
+                                            <a href="#">链接3</a>
 
+                                        </li>
 
+                                    </ul>
 
+                                </li>
 
+                            </ul>
 
+                        </div>
 
+
 
+                    </div>
 
+                </div>
 
+
 
+            </div>
 
+            <div class="hero-unit">
 
+                <h1>
 
+                    Hello, world!
 
+                </h1>
 
+                <p>
 
+                    这是一个可视化布局模板, 你可以点击模板里的文字进行修改, 也可以通过点击弹出的编辑框进行富文本修改. 拖动区块能实现排序.
 
+                </p>
 
+                <p>
 
+                    <a class="btn btn-primary btn-large" href="#">参看更多 »</a>
 
+                </p>
 
+            </div>
 
+            <div class="row-fluid">
 
+                <div class="span6">
 
+                    <div class="alert">
 
+                        <button type="button" class="close" data-dismiss="alert">×</button>
 
+                        <h4>
 
+                            提示!
 
+                        </h4> <strong>警告!</strong> 请注意你的个人隐私安全.
 
+                    </div>
 
+                    <table class="table">
 
+                        <thead>
 
+                        <tr>
 
+                            <th>
 
+                                编号
 
+                            </th>
 
+                            <th>
 
+                                产品
 
+                            </th>
 
+                            <th>
 
+                                交付时间
 
+                            </th>
 
+                            <th>
 
+                                状态
 
+                            </th>
 
+                        </tr>
 
+                        </thead>
 
+                        <tbody>
 
+                        <tr>
 
+                            <td>
 
+                                1
 
+                            </td>
 
+                            <td>
 
+                                TB - Monthly
 
+                            </td>
 
+                            <td>
 
+                                01/04/2012
 
+                            </td>
 
+                            <td>
 
+                                Default
 
+                            </td>
 
+                        </tr>
 
+                        <tr class="success">
 
+                            <td>
 
+                                1
 
+                            </td>
 
+                            <td>
 
+                                TB - Monthly
 
+                            </td>
 
+                            <td>
 
+                                01/04/2012
 
+                            </td>
 
+                            <td>
 
+                                Approved
 
+                            </td>
 
+                        </tr>
 
+                        <tr class="error">
 
+                            <td>
 
+                                2
 
+                            </td>
 
+                            <td>
 
+                                TB - Monthly
 
+                            </td>
 
+                            <td>
 
+                                02/04/2012
 
+                            </td>
 
+                            <td>
 
+                                Declined
 
+                            </td>
 
+                        </tr>
 
+                        <tr class="warning">
 
+                            <td>
 
+                                3
 
+                            </td>
 
+                            <td>
 
+                                TB - Monthly
 
+                            </td>
 
+                            <td>
 
+                                03/04/2012
 
+                            </td>
 
+                            <td>
 
+                                Pending
 
+                            </td>
 
+                        </tr>
 
+                        <tr class="info">
 
+                            <td>
 
+                                4
 
+                            </td>
 
+                            <td>
 
+                                TB - Monthly
 
+                            </td>
 
+                            <td>
 
+                                04/04/2012
 
+                            </td>
 
+                            <td>
 
+                                Call in to confirm
 
+                            </td>
 
+                        </tr>
 
+                        </tbody>
 
+                    </table>
 
+                </div>
 
+                <div class="span6">
 
+                    <h2>
 
+                        标题
 
+                    </h2>
 
+                    <p>
 
+                        本可视化布局程序在HTML5浏览器上运行更加完美, 能实现自动本地化保存, 即使关闭了网页, 下一次打开仍然能恢复上一次的操作.
 
+                    </p>
 
+                    <p>
 
+                        <a class="btn" href="#">查看更多 »</a>
 
+                    </p>
 
+                    <ul class="nav nav-pills">
 
+                        <li>
 
+                            <a href="#">工厂大屏幕</a>
 
+                        </li>
 
+                        <li>
 
+                            <a href="#">产线页面</a>
 
+                        </li>
 
+                    </ul>
 
+                    <p>
 
+                        <em>Git</em>是一个分布式的版本控制系统，最初由<strong>Linus Torvalds</strong>编写，用作Linux内核代码的管理。在推出后，Git在其它项目中也取得了很大成功，尤其是在Ruby社区中。
 
+                    </p>
 
+                </div>
 
+            </div>
 
+        </div>
 
+    </div>
 
+</div>
 
+</body>
 
+</html>

+ 1 - 40
dapingmu.html
View File 

@@ -8,10 +8,6 @@
 
     <!-- Favicon-->
 
     <link rel="icon" href="favicon.ico" type="image/x-icon">
 
 
-    <!-- Google Fonts -->
 
-    <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
 
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
 
-
 
     <!-- Bootstrap Core Css -->
 
     <link rel="stylesheet" href="css/third/bootstrap.min.css" >
 
 
@@ -51,41 +47,7 @@
 
     <script src="css/third/exporting.js"></script>
 
     <script src="css/third/cn.js"></script>
 
     <script src="css/third/dark.js"></script>
 
-    <script language="JavaScript">
 
-        function startTime()
 
-        {
 
-            var today=new Date();//定义日期对象
 
-            var yyyy = today.getFullYear();//通过日期对象的getFullYear()方法返回年
 
-            var MM = today.getMonth()+1;//通过日期对象的getMonth()方法返回年
 
-            var dd = today.getDate();//通过日期对象的getDate()方法返回年
 
-            var hh=today.getHours();//通过日期对象的getHours方法返回小时
 
-            var mm=today.getMinutes();//通过日期对象的getMinutes方法返回分钟
 
-            var ss=today.getSeconds();//通过日期对象的getSeconds方法返回秒
 
-            // 如果分钟或小时的值小于10，则在其值前加0，比如如果时间是下午3点20分9秒的话，则显示15：20：09
 
-            MM=checkTime(MM);
 
-            dd=checkTime(dd);
 
-            mm=checkTime(mm);
 
-            ss=checkTime(ss);
 
-            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()方法
 
-        }
 
-
 
-        function checkTime(i)
 
-        {
 
-            if (i<10){
 
-                i="0" + i;
 
-            }
 
-            return i;
 
-        }
 
-    </script>
 
+    <script src="js/timeService.js"></script>
 
 
 </head>
 
 
@@ -155,7 +117,6 @@
 
                             <th>良品数</th>
 
                             <th>人员</th>
 
                             <th>不良率</th>
 
-
 
                         </tr>
 
                         </thead>
 
                         <tbody id="rank-three">

+ 42 - 29
denglu.html
View File 

@@ -93,40 +93,53 @@
 
         </div>
 
     </nav>
 
     <div class="container-fluid" style="margin-top: 10em">
 
-        <div class="alert alert-warning" id="mpAlert" style="display:none">
 
-        </div>
 
-        <div class="alert alert-link" id="mpRemain" style="display:none">
 
-        </div>
 
-        <div class="card">
 
-            <h5 class="card-header">
 
-                生产线模式 :
 
-                <select name="select" id="pro_areaCode">
 
-                    <option value="0" selected="selected">生产拉线数据读取中</option>
 
-                </select>
 
-            </h5>
 
-
 
-            <div class="card-body">
 
-                <h5 class="card-title">您可以看到生产线内部的实时状况</h5>
 
-                <p class="card-text">
 
-                    班次 :
 
-                    <select id="period_ID">
 
-                        <option value="1">加载中</option>
 
-                    </select>
 
-                </p>
 
-                <a href="#" class="btn btn-primary" onclick="moveToStart(this)">开始班次</a>
 
+        <div class="row">
 
+            <div class="col-lg-4 col-md-6">
 
+                <div class="card">
 
+                    <h5 class="card-header">
 
+                        生产线模式 :
 
+                        <select name="select" id="pro_areaCode">
 
+                            <option value="0" selected="selected">生产拉线数据读取中</option>
 
+                        </select>
 
+                    </h5>
 
+                    <div class="card-body">
 
+                        <h5 class="card-title">您可以看到生产线内部的实时状况</h5>
 
+                        <p class="card-text">
 
+                            班次 :
 
+                            <select id="period_ID">
 
+                                <option value="1">加载中</option>
 
+                            </select>
 
+                        </p>
 
+                        <a href="#" class="btn btn-primary" onclick="moveToStart(this)">开始班次</a>
 
+                    </div>
 
+                </div>
 
             </div>
 
-        </div>
 
-        <div class="card">
 
-            <h5 class="card-header">大屏模式</h5>
 
-            <div class="card-body">
 
-                <h5 class="card-title">您可以看到全厂实时状况</h5>
 
-                <p class="card-text">点击下面按钮，打开大屏幕</p>
 
-                <a href="#" class="btn btn-primary" onclick="location.href='dapingmu.html'">前往大屏幕</a>
 
+            <div class="col-lg-4 col-md-6">
 
+                <div class="card">
 
+                    <h5 class="card-header">大屏模式</h5>
 
+                    <div class="card-body">
 
+                        <h5 class="card-title">您可以看到全厂实时状况</h5>
 
+                        <p class="card-text">点击下面按钮，打开大屏幕</p>
 
+                        <a href="#" class="btn btn-primary" onclick="location.href='dapingmu.html'">前往大屏幕</a>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+
 
+            <div class="col-lg-4 col-md-6">
 
+                <div class="card">
 
+                    <h5 class="card-header">
 
+                        正在进行的生产
 
+                    </h5>
 
+                    <div class="card-body">
 
+                        <h5 class="card-title">需要关闭相关班次才能进行班次结算、报表生成操作。</h5>
 
+                        <div class="alert alert-warning" id="mpAlert" style="display:none"></div>
 
+                        <div class="alert alert-link" id="mpRemain" style="display:none"></div>
 
+                    </div>
 
+                </div>
 
             </div>
 
         </div>
 
     </div>
 
 </div>
 
-
 
 <script src="js/basic.js"></script>
 
 <script src="js/getparam.js"></script>
 
 <script src="js/entrance.js"></script>

+ 1 - 1
js/dapingmu-display.js
View File 

@@ -76,7 +76,7 @@ function showChart() {
 
             title: {
 
 
                 style: {
 
-                    color: Highcharts.gestOptions().colors[0],
 
+                    color: Highcharts.getOptions().colors[0],
 
                     fontSize: '1em'
 
                 },
 
                 rotation: 270,

+ 34 - 0
js/timeService.js
View File 

@@ -0,0 +1,34 @@
 
+
 
+function startTime()
 
+{
 
+    var today=new Date();//定义日期对象
 
+    var yyyy = today.getFullYear();//通过日期对象的getFullYear()方法返回年
 
+    var MM = today.getMonth()+1;//通过日期对象的getMonth()方法返回年
 
+    var dd = today.getDate();//通过日期对象的getDate()方法返回年
 
+    var hh=today.getHours();//通过日期对象的getHours方法返回小时
 
+    var mm=today.getMinutes();//通过日期对象的getMinutes方法返回分钟
 
+    var ss=today.getSeconds();//通过日期对象的getSeconds方法返回秒
 
+    // 如果分钟或小时的值小于10，则在其值前加0，比如如果时间是下午3点20分9秒的话，则显示15：20：09
 
+    MM=checkTime(MM);
 
+    dd=checkTime(dd);
 
+    mm=checkTime(mm);
 
+    ss=checkTime(ss);
 
+    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()方法
 
+}
 
+
 
+function checkTime(i)
 
+{
 
+    if (i<10){
 
+        i="0" + i;
 
+    }
 
+    return i;
 
+}