BJ_web_developers / workreport

Commit 76a9c28e3b57145b27945eb73e000636fb2b01bc

Authored by 王富生
2 parents aa70db69 7ad8be37

Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test

Inline Side-by-side
Showing 11 changed files with 84 additions and 93 deletions
home.html deleted
View file @aa70db6
1   -<!DOCTYPE html>
2   -<html lang="en">
3   -<head>
4   - <meta charset="UTF-8">
5   - <title>Title</title>
6   -</head>
7   -<body>
8   -
9   -</body>
10   -</html>
11 0 \ No newline at end of file
index.html 0 → 100644
  View file @76a9c28
  1 +<!DOCTYPE html>
  2 +<html lang="en">
  3 +<head>
  4 + <meta charset="UTF-8">
  5 + <title>工时系统</title>
  6 + <link rel="stylesheet" id="pageCssLink" type="text/css" href=""/>
  7 + <link rel="stylesheet" href="resource/lib/bootstrap/css/bootstrap.min.css">
  8 + <link rel="stylesheet" href="resource/lib/bootstrap-daterangepicker/daterangepicker.css">
  9 + <link rel="stylesheet" href="resource/lib/bootstrap-datetimepicker/bootstrap-datetimepicker.css">
  10 + <link rel="stylesheet" href="resource/lib/bootstrap-select/css/bootstrap-select.css">
  11 + <link rel="stylesheet" href="resource/lib/bootstrap-table/bootstrap-table.min.css">
  12 + <link rel="stylesheet" href="resource/lib/bootstrap-table/bootstrap-table-fixed-columns.css">
  13 + <link rel="stylesheet" href="resource/lib/font-awesome/css/font-awesome.min.css">
  14 + <link rel="stylesheet" href="resource/public/components.min.css?a=2">
  15 + <link rel="stylesheet" href="resource/public/plugins.min.css?a=2">
  16 + <link rel="stylesheet" href="resource/public/commoncss.css?a=3">
  17 +
  18 +
  19 +</head>
  20 +<body>
  21 +<!----------------------------------------------头部-->
  22 +<header>
  23 + <div class="nav-bar-wrap">
  24 + <div class="float-left login-name">
  25 + <span id="loginShowName"></span>&nbsp;&nbsp;<a class="cursorpointer" href="login.html">退出</a>
  26 + </div>
  27 +
  28 + <nav class="float-right">
  29 + <ul class="nav-bar-container" id="nav-bar-container">
  30 + <!--<li class="navbar-active" id="button-workfill"><a href="#/workfill">工时填报</a></li>-->
  31 + <!--<li id="button-workquery"><a href="#/workquery" >工时查询</a></li>-->
  32 + <!--<li id="button-hourscount"><a href="#/hourscount" >工时统计</a></li>-->
  33 + <!--<li id="button-staffmanage"><a href="#/staffmanage" >员工管理</a></li>-->
  34 + </ul>
  35 + </nav>
  36 + </div>
  37 +</header>
  38 +
  39 +<!----------------------------------------------内容-->
  40 +<div id="main-con" class="main-con"></div>
  41 +<script src="resource/lib/jquery/jquery.min.js"></script>
  42 +<script src="resource/lib/bootstrap/js/bootstrap.min.js"></script>
  43 +<script src="resource/lib/bootstrap-daterangepicker/moment.js"></script>
  44 +<script src="resource/lib/bootstrap-daterangepicker/daterangepicker.js"></script>
  45 +<script src="resource/lib/bootstrap-datetimepicker/bootstrap-datetimepicker.js"></script>
  46 +<script src="resource/lib/bootstrap-datetimepicker/bootstrap-datetimepicker.zh-CN.js"></script>
  47 +<script src="resource/lib/bootstrap-select/js/bootstrap-select.js"></script>
  48 +<script src="resource/lib/bootstrap-table/bootstrap-table.min.js"></script>
  49 +<script src="resource/lib/bootstrap-table/bootstrap-table-fixed-columns.js"></script>
  50 +<script src="resource/lib/bootstrap-table/bootstrap-table-zh-CN.js"></script>
  51 +<script src="resource/lib/dateUtils/DateUtils.js"></script>
  52 +<script src="resource/lib/jqueryform/jquery.form.js"></script>
  53 +<script src="resource/js/unit.js"></script>
  54 +<script src="topages/topagesTmp.js?a=1"></script>
  55 +<!--<script src="resource/js/unit.js?a=1"></script>-->
  56 +<!--<script src="../topages/workquery/workquery.js"></script>-->
  57 +</body>
  58 +</html>
0 59 \ No newline at end of file
... ...
index/index.html deleted
View file @aa70db6
1   -<!DOCTYPE html>
2   -<html lang="en">
3   -<head>
4   - <meta charset="UTF-8">
5   - <title>工时系统</title>
6   - <link rel="stylesheet" id="pageCssLink" type="text/css" href=""/>
7   - <link rel="stylesheet" href="../resource/lib/bootstrap/css/bootstrap.min.css">
8   - <link rel="stylesheet" href="../resource/lib/bootstrap-daterangepicker/daterangepicker.css">
9   - <link rel="stylesheet" href="../resource/lib/bootstrap-datetimepicker/bootstrap-datetimepicker.css">
10   - <link rel="stylesheet" href="../resource/lib/bootstrap-select/css/bootstrap-select.css">
11   - <link rel="stylesheet" href="../resource/lib/bootstrap-table/bootstrap-table.min.css">
12   - <link rel="stylesheet" href="../resource/lib/bootstrap-table/bootstrap-table-fixed-columns.css">
13   - <link rel="stylesheet" href="../resource/lib/font-awesome/css/font-awesome.min.css">
14   - <link rel="stylesheet" href="../resource/public/components.min.css?a=2">
15   - <link rel="stylesheet" href="../resource/public/plugins.min.css?a=2">
16   - <link rel="stylesheet" href="../resource/public/commoncss.css?a=3">
17   -
18   -
19   -</head>
20   -<body>
21   -<!----------------------------------------------头部-->
22   -<header>
23   - <div class="nav-bar-wrap">
24   - <div class="float-left login-name">
25   - <span id="loginShowName"></span>&nbsp;&nbsp;<a class="cursorpointer" href="../login/login.html">退出</a>
26   - </div>
27   -
28   - <nav class="float-right">
29   - <ul class="nav-bar-container" id="nav-bar-container">
30   - <!--<li class="navbar-active" id="button-workfill"><a href="#/workfill">工时填报</a></li>-->
31   - <!--<li id="button-workquery"><a href="#/workquery" >工时查询</a></li>-->
32   - <!--<li id="button-hourscount"><a href="#/hourscount" >工时统计</a></li>-->
33   - <!--<li id="button-staffmanage"><a href="#/staffmanage" >员工管理</a></li>-->
34   - </ul>
35   - </nav>
36   - </div>
37   -</header>
38   -
39   -<!----------------------------------------------内容-->
40   -<div id="main-con" class="main-con"></div>
41   -<script src="../resource/lib/jquery/jquery.min.js"></script>
42   -<script src="../resource/lib/bootstrap/js/bootstrap.min.js"></script>
43   -<script src="../resource/lib/bootstrap-daterangepicker/moment.js"></script>
44   -<script src="../resource/lib/bootstrap-daterangepicker/daterangepicker.js"></script>
45   -<script src="../resource/lib/bootstrap-datetimepicker/bootstrap-datetimepicker.js"></script>
46   -<script src="../resource/lib/bootstrap-datetimepicker/bootstrap-datetimepicker.zh-CN.js"></script>
47   -<script src="../resource/lib/bootstrap-select/js/bootstrap-select.js"></script>
48   -<script src="../resource/lib/bootstrap-table/bootstrap-table.min.js"></script>
49   -<script src="../resource/lib/bootstrap-table/bootstrap-table-fixed-columns.js"></script>
50   -<script src="../resource/lib/bootstrap-table/bootstrap-table-zh-CN.js"></script>
51   -<script src="../resource/lib/dateUtils/DateUtils.js"></script>
52   -<script src="../resource/lib/jqueryform/jquery.form.js"></script>
53   -<script src="../resource/js/unit.js"></script>
54   -<script src="../topages/topagesTmp.js?a=1"></script>
55   -<script src="../resource/js/unit.js?a=1"></script>
56   -<!--<script src="../topages/workquery/workquery.js"></script>-->
57   -</body>
58   -</html>
59 0 \ No newline at end of file
login/login.html renamed to login.html
  View file @76a9c28
... ... @@ -3,11 +3,11 @@
3 3 <head>
4 4 <meta charset="UTF-8">
5 5 <title>登录</title>
6   - <link rel="stylesheet" href="../resource/lib/bootstrap/css/bootstrap.min.css">
7   - <link rel="stylesheet" href="../resource/public/components.min.css?a=2">
8   - <link rel="stylesheet" href="../resource/public/plugins.min.css?a=2">
9   - <link rel="stylesheet" href="../resource/public/commoncss.css?a=2">
10   - <link rel="stylesheet" href="../topages/login/login.css">
  6 + <link rel="stylesheet" href="resource/lib/bootstrap/css/bootstrap.min.css">
  7 + <link rel="stylesheet" href="resource/public/components.min.css?a=2">
  8 + <link rel="stylesheet" href="resource/public/plugins.min.css?a=2">
  9 + <link rel="stylesheet" href="resource/public/commoncss.css?a=2">
  10 + <link rel="stylesheet" href="topages/login/login.css">
11 11  
12 12  
13 13 </head>
... ... @@ -26,9 +26,9 @@
26 26 <div class="float-left login-bg"></div>
27 27  
28 28  
29   -<script src="../resource/lib/jquery/jquery.min.js"></script>
30   - <script src="../resource/js/unit.js?a=1"></script>
31   -<script src="../topages/login/login.js?a=3"></script>
  29 +<script src="resource/lib/jquery/jquery.min.js"></script>
  30 + <script src="resource/js/unit.js?a=1"></script>
  31 +<script src="topages/login/login.js?a=3"></script>
32 32 <!--<script src="../resource/js/unit.js?a=1"></script>-->
33 33 </body>
34 34 </html>
35 35 \ No newline at end of file
... ...
resource/js/unit.js
  View file @76a9c28
... ... @@ -127,7 +127,7 @@ var fn ={
127 127 //跳转到登录界面
128 128 toLoginPage: function () {
129 129 sessionStorage.setItem("sys_parkLot", '');
130   - window.location.href = '../../login/login.html'
  130 + window.location.href = 'login.html'
131 131 },
132 132 //登出系统
133 133 loginOut: function () {
... ... @@ -155,7 +155,7 @@ var fn ={
155 155 //跳转到登录界面
156 156 toLoginPage: function () {
157 157 sessionStorage.setItem("sys_parkLot", '');
158   - window.location.href = '../login/login.html'
  158 + window.location.href = 'login.html'
159 159 },
160 160 /**
161 161 * 查询项目信息
... ... @@ -350,11 +350,11 @@ function sysAjax(opts) {
350 350 //成功
351 351 if (res.code=='2003') {
352 352 //授权令牌不存在或已失效，请重新登录后在尝试
353   - window.location.href = '../../workreport/login/login.html'
  353 + window.location.href = 'login.html'
354 354 } else if (res.code=='2004') {
355 355 //授权令牌不合法,请重新登录收尝试
356 356 //alert(res.msg);
357   - window.location.href = '../../workreport/login/login.html'
  357 + window.location.href = 'login.html'
358 358 } else if (res.code=='2005') {
359 359 //无此权限
360 360 alert(msg);
... ...
topages/hourscount/hourscount.html
  View file @76a9c28
... ... @@ -75,5 +75,5 @@
75 75  
76 76 </ul>
77 77  
78   -<script src="../topages/hourscount/hourscount.js"></script>
  78 +<script src="topages/hourscount/hourscount.js"></script>
79 79  
... ...
topages/login/login.js
  View file @76a9c28
... ... @@ -45,7 +45,8 @@ var func ={
45 45 fn.setUserId(res.data.opId);
46 46 fn.setUserAccount(res.data.loginCode);
47 47 fn.setRoleId(res.data.roleId);
48   - window.location.href = "../../workreport/index/index.html";
  48 + console.log(233)
  49 + window.location.href = "index.html";
49 50  
50 51 }else{
51 52 if('1999' == res.code ){
... ...
topages/staffmanage/staffmanage.html
  View file @76a9c28
... ... @@ -11,5 +11,5 @@
11 11 <table id="staffmanageTable" class="common-tableh47 bootstrap-table ITD-fix-table fixed-table-container table table-hover table-striped">
12 12 </table>
13 13  
14   -<script src="../topages/staffmanage/staffmanage.js"></script>
  14 +<script src="topages/staffmanage/staffmanage.js"></script>
15 15  
... ...
topages/topagesTmp.js
  View file @76a9c28
... ... @@ -33,30 +33,30 @@ var res = $(&#39;#main-con&#39;);
33 33 //工时查询
34 34  
35 35 R.route('/workfill', function() {
36   - $("#pageCssLink").attr("href",'../topages/workfill/workfill.css?a=1');
37   - res.load('../topages/workfill/workfill.html');
  36 + $("#pageCssLink").attr("href",'topages/workfill/workfill.css?a=1');
  37 + res.load('topages/workfill/workfill.html');
38 38  
39 39 $('.nav-bar-container li').removeClass('navbar-active');
40 40 $('#button-workfill').addClass('navbar-active');
41 41 });
42 42 //工时填报
43 43 R.route('/workquery', function() {
44   - $("#pageCssLink").attr("href",'../topages/workquery/workquery.css?a=1');
45   - res.load('../topages/workquery/workquery.html');
  44 + $("#pageCssLink").attr("href",'topages/workquery/workquery.css?a=1');
  45 + res.load('topages/workquery/workquery.html');
46 46 $('.nav-bar-container li').removeClass('navbar-active');
47 47 $('#button-workquery').addClass('navbar-active');
48 48 });
49 49 //员工管理
50 50 R.route('/staffmanage', function() {
51   - $("#pageCssLink").attr("href",'../topages/staffmanage/staffmanage.css');
52   - res.load('../topages/staffmanage/staffmanage.html');
  51 + $("#pageCssLink").attr("href",'topages/staffmanage/staffmanage.css');
  52 + res.load('topages/staffmanage/staffmanage.html');
53 53 $('.nav-bar-container li').removeClass('navbar-active');
54 54 $('#button-staffmanage').addClass('navbar-active');
55 55 });
56 56 //工时统计
57 57 R.route('/hourscount', function() {
58   - $("#pageCssLink").attr("href",'../topages/hourscount/hourscount.css');
59   - res.load('../topages/hourscount/hourscount.html');
  58 + $("#pageCssLink").attr("href",'topages/hourscount/hourscount.css');
  59 + res.load('topages/hourscount/hourscount.html');
60 60 $('.nav-bar-container li').removeClass('navbar-active');
61 61 $('#button-hourscount').addClass('navbar-active');
62 62 });
63 63 \ No newline at end of file
... ...
topages/workfill/workfill.html
  View file @76a9c28
... ... @@ -368,4 +368,4 @@
368 368 </div>
369 369 </div>
370 370 <!--提示弹窗 end-->
371   -<script src="../topages/workfill/workfill.js"></script>
372 371 \ No newline at end of file
  372 +<script src="topages/workfill/workfill.js"></script>
373 373 \ No newline at end of file
... ...
topages/workquery/workquery.html
  View file @76a9c28
... ... @@ -449,4 +449,4 @@
449 449  
450 450 </ul>
451 451  
452   -<script src="../topages/workquery/workquery.js"></script>
  452 +<script src="topages/workquery/workquery.js"></script>
... ...