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

王富生
2 parents aa70db69 7ad8be37
Showing 11 changed files with 84 additions and 93 deletions
home.html
index.html
index/index.html
login/login.html → login.html
resource/js/unit.js
topages/hourscount/hourscount.html
topages/login/login.js
topages/staffmanage/staffmanage.html
topages/topagesTmp.js
topages/workfill/workfill.html
topages/workquery/workquery.html
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
 \ No newline at end of file
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>工时系统</title>
+    <link rel="stylesheet" id="pageCssLink" type="text/css" href=""/>
+    <link rel="stylesheet" href="resource/lib/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="resource/lib/bootstrap-daterangepicker/daterangepicker.css">
+    <link rel="stylesheet" href="resource/lib/bootstrap-datetimepicker/bootstrap-datetimepicker.css">
+    <link rel="stylesheet" href="resource/lib/bootstrap-select/css/bootstrap-select.css">
+    <link rel="stylesheet" href="resource/lib/bootstrap-table/bootstrap-table.min.css">
+    <link rel="stylesheet" href="resource/lib/bootstrap-table/bootstrap-table-fixed-columns.css">
+    <link rel="stylesheet" href="resource/lib/font-awesome/css/font-awesome.min.css">
+    <link rel="stylesheet" href="resource/public/components.min.css?a=2">
+    <link rel="stylesheet" href="resource/public/plugins.min.css?a=2">
+    <link rel="stylesheet" href="resource/public/commoncss.css?a=3">
+
+
+</head>
+<body>
+<!----------------------------------------------头部-->
+<header>
+    <div class="nav-bar-wrap">
+        <div class="float-left login-name">
+            <span id="loginShowName"></span>&nbsp;&nbsp;<a class="cursorpointer" href="login.html">退出</a>
+        </div>
+
+        <nav class="float-right">
+            <ul class="nav-bar-container" id="nav-bar-container">
+                <!--<li class="navbar-active" id="button-workfill"><a href="#/workfill">工时填报</a></li>-->
+                <!--<li id="button-workquery"><a href="#/workquery" >工时查询</a></li>-->
+                <!--<li id="button-hourscount"><a href="#/hourscount" >工时统计</a></li>-->
+                <!--<li id="button-staffmanage"><a href="#/staffmanage" >员工管理</a></li>-->
+            </ul>
+        </nav>
+    </div>
+</header>
+
+<!----------------------------------------------内容-->
+<div id="main-con" class="main-con"></div>
+<script src="resource/lib/jquery/jquery.min.js"></script>
+<script src="resource/lib/bootstrap/js/bootstrap.min.js"></script>
+<script src="resource/lib/bootstrap-daterangepicker/moment.js"></script>
+<script src="resource/lib/bootstrap-daterangepicker/daterangepicker.js"></script>
+<script src="resource/lib/bootstrap-datetimepicker/bootstrap-datetimepicker.js"></script>
+<script src="resource/lib/bootstrap-datetimepicker/bootstrap-datetimepicker.zh-CN.js"></script>
+<script src="resource/lib/bootstrap-select/js/bootstrap-select.js"></script>
+<script src="resource/lib/bootstrap-table/bootstrap-table.min.js"></script>
+<script src="resource/lib/bootstrap-table/bootstrap-table-fixed-columns.js"></script>
+<script src="resource/lib/bootstrap-table/bootstrap-table-zh-CN.js"></script>
+<script src="resource/lib/dateUtils/DateUtils.js"></script>
+<script src="resource/lib/jqueryform/jquery.form.js"></script>
+<script src="resource/js/unit.js"></script>
+<script src="topages/topagesTmp.js?a=1"></script>
+<!--<script src="resource/js/unit.js?a=1"></script>-->
+<!--<script src="../topages/workquery/workquery.js"></script>-->
+</body>
+</html>
 \ No newline at end of file
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>工时系统</title>
-    <link rel="stylesheet" id="pageCssLink" type="text/css" href=""/>
-    <link rel="stylesheet" href="../resource/lib/bootstrap/css/bootstrap.min.css">
-    <link rel="stylesheet" href="../resource/lib/bootstrap-daterangepicker/daterangepicker.css">
-    <link rel="stylesheet" href="../resource/lib/bootstrap-datetimepicker/bootstrap-datetimepicker.css">
-    <link rel="stylesheet" href="../resource/lib/bootstrap-select/css/bootstrap-select.css">
-    <link rel="stylesheet" href="../resource/lib/bootstrap-table/bootstrap-table.min.css">
-    <link rel="stylesheet" href="../resource/lib/bootstrap-table/bootstrap-table-fixed-columns.css">
-    <link rel="stylesheet" href="../resource/lib/font-awesome/css/font-awesome.min.css">
-    <link rel="stylesheet" href="../resource/public/components.min.css?a=2">
-    <link rel="stylesheet" href="../resource/public/plugins.min.css?a=2">
-    <link rel="stylesheet" href="../resource/public/commoncss.css?a=3">
-
-
-</head>
-<body>
-<!----------------------------------------------头部-->
-<header>
-    <div class="nav-bar-wrap">
-        <div class="float-left login-name">
-            <span id="loginShowName"></span>&nbsp;&nbsp;<a class="cursorpointer" href="../login/login.html">退出</a>
-        </div>
-
-        <nav class="float-right">
-            <ul class="nav-bar-container" id="nav-bar-container">
-                <!--<li class="navbar-active" id="button-workfill"><a href="#/workfill">工时填报</a></li>-->
-                <!--<li id="button-workquery"><a href="#/workquery" >工时查询</a></li>-->
-                <!--<li id="button-hourscount"><a href="#/hourscount" >工时统计</a></li>-->
-                <!--<li id="button-staffmanage"><a href="#/staffmanage" >员工管理</a></li>-->
-            </ul>
-        </nav>
-    </div>
-</header>
-
-<!----------------------------------------------内容-->
-<div id="main-con" class="main-con"></div>
-<script src="../resource/lib/jquery/jquery.min.js"></script>
-<script src="../resource/lib/bootstrap/js/bootstrap.min.js"></script>
-<script src="../resource/lib/bootstrap-daterangepicker/moment.js"></script>
-<script src="../resource/lib/bootstrap-daterangepicker/daterangepicker.js"></script>
-<script src="../resource/lib/bootstrap-datetimepicker/bootstrap-datetimepicker.js"></script>
-<script src="../resource/lib/bootstrap-datetimepicker/bootstrap-datetimepicker.zh-CN.js"></script>
-<script src="../resource/lib/bootstrap-select/js/bootstrap-select.js"></script>
-<script src="../resource/lib/bootstrap-table/bootstrap-table.min.js"></script>
-<script src="../resource/lib/bootstrap-table/bootstrap-table-fixed-columns.js"></script>
-<script src="../resource/lib/bootstrap-table/bootstrap-table-zh-CN.js"></script>
-<script src="../resource/lib/dateUtils/DateUtils.js"></script>
-<script src="../resource/lib/jqueryform/jquery.form.js"></script>
-<script src="../resource/js/unit.js"></script>
-<script src="../topages/topagesTmp.js?a=1"></script>
-<script src="../resource/js/unit.js?a=1"></script>
-<!--<script src="../topages/workquery/workquery.js"></script>-->
-</body>
-</html>
 \ No newline at end of file
@@ -3,11 +3,11 @@
 <head>
     <meta charset="UTF-8">
     <title>登录</title>
-    <link rel="stylesheet" href="../resource/lib/bootstrap/css/bootstrap.min.css">
-    <link rel="stylesheet" href="../resource/public/components.min.css?a=2">
-    <link rel="stylesheet" href="../resource/public/plugins.min.css?a=2">
-    <link rel="stylesheet" href="../resource/public/commoncss.css?a=2">
-    <link rel="stylesheet" href="../topages/login/login.css">
+    <link rel="stylesheet" href="resource/lib/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="resource/public/components.min.css?a=2">
+    <link rel="stylesheet" href="resource/public/plugins.min.css?a=2">
+    <link rel="stylesheet" href="resource/public/commoncss.css?a=2">
+    <link rel="stylesheet" href="topages/login/login.css">
 </head>
@@ -26,9 +26,9 @@
     <div class="float-left login-bg"></div>
-<script src="../resource/lib/jquery/jquery.min.js"></script>
-    <script src="../resource/js/unit.js?a=1"></script>
-<script src="../topages/login/login.js?a=3"></script>
+<script src="resource/lib/jquery/jquery.min.js"></script>
+    <script src="resource/js/unit.js?a=1"></script>
+<script src="topages/login/login.js?a=3"></script>
 <!--<script src="../resource/js/unit.js?a=1"></script>-->
 </body>
 </html>
 \ No newline at end of file
@@ -127,7 +127,7 @@ var fn ={
     //跳转到登录界面
     toLoginPage: function () {
         sessionStorage.setItem("sys_parkLot", '');
-        window.location.href = '../../login/login.html'
+        window.location.href = 'login.html'
     },
     //登出系统
     loginOut: function () {
@@ -155,7 +155,7 @@ var fn ={
     //跳转到登录界面
     toLoginPage: function () {
         sessionStorage.setItem("sys_parkLot", '');
-        window.location.href = '../login/login.html'
+        window.location.href = 'login.html'
     },
     /**
      * 查询项目信息
@@ -350,11 +350,11 @@ function sysAjax(opts) {
             //成功
             if (res.code=='2003') {
                 //授权令牌不存在或已失效，请重新登录后在尝试
-                window.location.href = '../../workreport/login/login.html'
+                window.location.href = 'login.html'
             } else if (res.code=='2004') {
                 //授权令牌不合法,请重新登录收尝试
                 //alert(res.msg);
-                window.location.href = '../../workreport/login/login.html'
+                window.location.href = 'login.html'
             } else if (res.code=='2005') {
                 //无此权限
                 alert(msg);
@@ -75,5 +75,5 @@
 </ul>
-<script src="../topages/hourscount/hourscount.js"></script>
+<script src="topages/hourscount/hourscount.js"></script>
@@ -45,7 +45,8 @@ var func ={
                     fn.setUserId(res.data.opId);
                     fn.setUserAccount(res.data.loginCode);
                     fn.setRoleId(res.data.roleId);
-                    window.location.href = "../../workreport/index/index.html";
+                    console.log(233)
+                    window.location.href = "index.html";
                 }else{
                     if('1999' == res.code ){
@@ -11,5 +11,5 @@
 <table id="staffmanageTable" class="common-tableh47 bootstrap-table ITD-fix-table fixed-table-container table table-hover table-striped">
 </table>
-<script src="../topages/staffmanage/staffmanage.js"></script>
+<script src="topages/staffmanage/staffmanage.js"></script>
@@ -33,30 +33,30 @@ var res = $(&#39;#main-con&#39;);
 //工时查询
 R.route('/workfill', function() {
-    $("#pageCssLink").attr("href",'../topages/workfill/workfill.css?a=1');
-    res.load('../topages/workfill/workfill.html');
+    $("#pageCssLink").attr("href",'topages/workfill/workfill.css?a=1');
+    res.load('topages/workfill/workfill.html');
     $('.nav-bar-container li').removeClass('navbar-active');
     $('#button-workfill').addClass('navbar-active');
 });
 //工时填报
 R.route('/workquery', function() {
-    $("#pageCssLink").attr("href",'../topages/workquery/workquery.css?a=1');
-    res.load('../topages/workquery/workquery.html');
+    $("#pageCssLink").attr("href",'topages/workquery/workquery.css?a=1');
+    res.load('topages/workquery/workquery.html');
     $('.nav-bar-container li').removeClass('navbar-active');
     $('#button-workquery').addClass('navbar-active');
 });
 //员工管理
 R.route('/staffmanage', function() {
-    $("#pageCssLink").attr("href",'../topages/staffmanage/staffmanage.css');
-    res.load('../topages/staffmanage/staffmanage.html');
+    $("#pageCssLink").attr("href",'topages/staffmanage/staffmanage.css');
+    res.load('topages/staffmanage/staffmanage.html');
     $('.nav-bar-container li').removeClass('navbar-active');
     $('#button-staffmanage').addClass('navbar-active');
 });
 //工时统计
 R.route('/hourscount', function() {
-    $("#pageCssLink").attr("href",'../topages/hourscount/hourscount.css');
-    res.load('../topages/hourscount/hourscount.html');
+    $("#pageCssLink").attr("href",'topages/hourscount/hourscount.css');
+    res.load('topages/hourscount/hourscount.html');
     $('.nav-bar-container li').removeClass('navbar-active');
     $('#button-hourscount').addClass('navbar-active');
 });
 \ No newline at end of file
@@ -368,4 +368,4 @@
     </div>
 </div>
 <!--提示弹窗 end-->
-<script src="../topages/workfill/workfill.js"></script>
 \ No newline at end of file
+<script src="topages/workfill/workfill.js"></script>
 \ No newline at end of file
@@ -449,4 +449,4 @@
 </ul>
-<script src="../topages/workquery/workquery.js"></script>
+<script src="topages/workquery/workquery.js"></script>