Explorar o código

Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

Lijy hai 1 ano
pai
achega
4727246bc9

+ 17 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -6535,6 +6535,23 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             lastDay = sunday.plusDays(days);
         }
         //如果上周只有2天以内工作日,需要并到这周来
+        LocalDate lastSunday = monday.minusDays(1);
+        LocalDate lastSaturday = lastSunday.with(DayOfWeek.SATURDAY);
+        if (WorkDayCalculateUtils.isWorkDay(lastSunday) && WorkDayCalculateUtils.isWorkDay(lastSaturday)) {
+            //上周周末两天是工作日,并且只有2天以内工作日,需要并到这周来
+            LocalDate lastMonday = lastSunday.with(DayOfWeek.MONDAY);
+            boolean hasMoreWorkDays = false;
+            while (lastMonday.isBefore(lastSaturday)) {
+                if (WorkDayCalculateUtils.isWorkDay(lastMonday)) {
+                    hasMoreWorkDays = true;
+                    break;
+                }
+                lastMonday = lastMonday.plusDays(1);
+            }
+            if (!hasMoreWorkDays) {
+                monday = lastSaturday;
+            }
+        }
 
         String startDate = monday.format(dtf);
         String endDate = lastDay.format(dtf);

+ 10 - 10
fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -4,17 +4,17 @@ var path = require('path')
 //var ip = '47.101.180.183'
 // var ip = '47.100.37.243'
 // var ip = '192.168.10.2'
-var ip = '192.168.2.63' 
+// var ip = '192.168.2.13' 
 
-// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
-// for (var i in ifaces) {
-//     for (var j in ifaces[i]) {
-//         var val = ifaces[i][j]
-//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-//             ip = val.address
-//         }
-//     }
-// }
+var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+for (var i in ifaces) {
+    for (var j in ifaces[i]) {
+        var val = ifaces[i][j]
+        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+            ip = val.address
+        }
+    }
+}
 // 1196735749
 module.exports = {
   build: {

+ 131 - 150
fhKeeper/formulahousekeeper/timesheet/index.html

@@ -1,168 +1,149 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="utf-8" />
-    <!-- 尝试清除打包缓存 -->
-    <!-- <meta http-equiv="pragram" content="no-cache">
+    <head>
+        <meta charset="utf-8">
+        <!-- 尝试清除打包缓存 -->
+        <!-- <meta http-equiv="pragram" content="no-cache">
         <meta http-equiv="cache-control" content="no-cache, no-store, must-revalidate">
         <meta http-equiv="expires" content="0"> -->
-    <!-- 尝试清除打包缓存 -->
-    <title>工时管家</title>
-    <link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
-    <link href="./static/css/public.css" rel="stylesheet" type="text/css" />
-    <!-- 引入样式 -->
-    <link
-      href="https://cdn.staticfile.org/element-ui/2.13.0/theme-chalk/index.css"
-      rel="stylesheet"
-    />
-    <!-- <link rel="stylesheet" href="./static/js/element-uiCss.css"> -->
-    <!-- 接入JQ  -->
-    <script src="https://cdn.staticfile.org/jquery/1.10.2/jquery.min.js"></script>
-    <!-- <script src="./static/js/jquery.min.js"></script> -->
-    <style>
-      /* 滚动条样式修改 */
-      /*滚动条凹槽的颜色,还可以设置边框属性 */
-      ::-webkit-scrollbar-track-piece {
-        background-color: #f8f8f8;
-        -webkit-border-radius: 2em;
-        -moz-border-radius: 2em;
-        border-radius: 2em;
-      }
-      /*滚动条的宽度*/
-      ::-webkit-scrollbar {
-        width: 9px;
-        height: 9px;
-      }
-      /*滚动条的设置*/
-      ::-webkit-scrollbar-thumb {
-        background-color: #dddddd;
-        background-clip: padding-box;
-        -webkit-border-radius: 2em;
-        -moz-border-radius: 2em;
-        border-radius: 2em;
-      }
+        <!-- 尝试清除打包缓存 -->
+        <title>工时管家</title>
+        <link rel="shortcut icon" type="image/x-icon" href="./favicon.ico"/>
+        <link href="./static/css/public.css" rel="stylesheet" type="text/css"/>
+        <!-- 引入样式 -->
+        <link href="https://cdn.staticfile.org/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet">
+        <!-- <link rel="stylesheet" href="./static/js/element-uiCss.css"> -->
+        <!-- 接入JQ  -->
+        <script src="https://cdn.staticfile.org/jquery/1.10.2/jquery.min.js"></script>
+        <!-- <script src="./static/js/jquery.min.js"></script> -->
+        <style>
+            /* 滚动条样式修改 */
+            /*滚动条凹槽的颜色,还可以设置边框属性 */
+            ::-webkit-scrollbar-track-piece {
+                background-color:#f8f8f8;
+                -webkit-border-radius: 2em;
+                -moz-border-radius: 2em;
+                border-radius: 2em;
+            }
+            /*滚动条的宽度*/
+            ::-webkit-scrollbar {
+                width:9px;
+            height: 9px;}
+            /*滚动条的设置*/
+            ::-webkit-scrollbar-thumb {
+                background-color:#dddddd;
+                background-clip:padding-box;
+                -webkit-border-radius: 2em;
+                -moz-border-radius: 2em;
+                border-radius: 2em;}
 
-      /*滚动条鼠标移上去*/
-      ::-webkit-scrollbar-thumb:hover {
-        background-color: #bbb;
-      }
+            /*滚动条鼠标移上去*/
+            ::-webkit-scrollbar-thumb:hover {
+                background-color:#bbb;
+            }
 
-      /*取消消息列表弹出框的内边距*/
-      .popover-self {
-        padding: 0 !important;
-      }
+            /*取消消息列表弹出框的内边距*/
+            .popover-self {
+                padding: 0 !important;
+            }
 
-      /*自定义颜色*/
-      #nprogress .bar {
-        background: #f58220 !important;
-      }
+            /*自定义颜色*/
+            #nprogress .bar {
+                background:#f58220 !important; 
+            }
 
-      .selectworktime .el-dialog__header {
-        padding-top: 0;
-        padding-bottom: 0;
-      }
-      .selectworktime .el-dialog__body {
-        padding-top: 15px;
-      }
-      .el-dialog__headerbtn {
-        z-index: 2002;
-      }
-      .selecteorktime_datapick_popper {
-        left: 12vh !important;
-      }
-      .customsalary .el-input__inner {
-        height: 35px;
-        line-height: 35px;
-      }
-      .projectSelectPopperClass {
-        max-width: 1000px;
-      }
-      .projectSelectPopperClass li {
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-      }
-      .projectSelectPopperClass .el-select-dropdown__item span:nth-child(1) {
-        font-size: 13px;
-        height: 34px;
-        max-width: 350px;
-      }
-      .projectSelectPopperClass .el-select-dropdown__item span:nth-child(2) {
-        font-size: 13px;
-        height: 34px;
-        max-width: 650px;
+            .selectworktime .el-dialog__header{
+                padding-top:0;
+                padding-bottom:0;
+            }
+            .selectworktime .el-dialog__body{
+                padding-top:15px;
+            }
+            .el-dialog__headerbtn{
+                z-index: 2002;
+            }
+            .selecteorktime_datapick_popper{
+                left: 12vh !important;
+            }
+            .customsalary .el-input__inner{
+                height: 35px;
+                line-height: 35px;
+            }
+            .projectSelectPopperClass{
+                max-width: 1000px;
+            }
+            .projectSelectPopperClass li{
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+            .projectSelectPopperClass .el-select-dropdown__item span:nth-child(1){
+                font-size: 13px;
+                height: 34px;
+                max-width: 350px;
+            }
+            .projectSelectPopperClass .el-select-dropdown__item span:nth-child(2){
+                font-size: 13px;
+                height: 34px;
+                max-width: 650px;
+                
+                text-align: right;
+            }
 
-        text-align: right;
-      }
-
-      /* 清除浮动 */
-      .clearfix:after {
-        content: "";
-        display: block;
-        height: 0;
-        clear: both;
-        visibility: hidden;
-      }
-      .clearfix {
-        /* 触发 hasLayout */
-        zoom: 1;
-      }
-      .fillWeekCustom {
-        .el-dialog__body {
-          padding: 10px 20px !important;
-        }
-      }
-    </style>
-    <!-- <meta name="wpk-bid" content="dta_2_71020"> <script>var isDingtalk = navigator && /DingTalk/.test(navigator.userAgent);var isProductEnv = window &&window.location &&window.location.host 
+            /* 清除浮动 */
+	.clearfix:after{
+		content: ""; 
+		display: block; 
+		height: 0; 
+		clear: both; 
+		visibility: hidden;  
+	}
+	.clearfix {
+		/* 触发 hasLayout */ 
+		zoom: 1; 
+	}
+        </style>
+        <!-- <meta name="wpk-bid" content="dta_2_71020"> <script>var isDingtalk = navigator && /DingTalk/.test(navigator.userAgent);var isProductEnv = window &&window.location &&window.location.host 
             && window.location.host.indexOf('//127.0.0.1')===-1
             && window.location.host.indexOf('//localhost')===-1
             && window.location.host.indexOf('//192.168.')===-1
             // 如果有其它测试域名,请一起排掉,减少测试环境对生产环境监控的干扰
         if (isProductEnv) {    !(function(c,i,e,b){var h=i.createElement("script");var f=i.getElementsByTagName("script")[0];h.type="text/javascript";h.crossorigin=true;h.onload=function(){c[b]||(c[b]=new c.wpkReporter({bid:"dta_2_71020"}));c[b].installAll()};f.parentNode.insertBefore(h,f);h.src=e})(window,document,"https://g.alicdn.com/woodpeckerx/jssdk??wpkReporter.js","__wpk"); }</script> -->
-  </head>
-  <!-- 接入飞书 -->
-  <script
-    type="text/javascript"
-    src="https://lf1-cdn-tos.bytegoofy.com/goofy/lark/op/h5-js-sdk-1.5.16.js"
-  ></script>
-  <!-- <script src="./static/js/goofy.js"></script> -->
-  <!-- <script src="https://unpkg.com/vconsole/dist/vconsole.min.js"></script>
+    </head>
+    <!-- 接入飞书 -->
+    <script type="text/javascript" src="https://lf1-cdn-tos.bytegoofy.com/goofy/lark/op/h5-js-sdk-1.5.16.js"></script>
+    <!-- <script src="./static/js/goofy.js"></script> -->
+    <!-- <script src="https://unpkg.com/vconsole/dist/vconsole.min.js"></script>
     <script>
         var vConsole = new window.VConsole();
     </script> -->
-  <body>
-    <div id="app"></div>
-    <script>
-      document.body.ondrop = function (event) {
-        event.preventDefault();
-        event.stopPropagation();
-      };
-    </script>
-    <!-- 引入Vue.js -->
-    <script src="https://cdn.staticfile.org/vue/2.6.10/vue.min.js"></script>
-    <!-- <script src="./static/js/vue.min.js"></script> -->
-    <!-- 引入vuex.js -->
-    <script src="https://cdn.staticfile.org/vuex/3.0.0/vuex.min.js"></script>
-    <!-- <script src="./static/js/vuex.min.js"></script> -->
-    <!-- 引入vue-router -->
-    <script src="https://cdn.staticfile.org/vue-router/3.0.0/vue-router.min.js"></script>
-    <!-- <script src="./static/js/vue-router.min.js"></script> -->
-    <!-- 引入组件库 -->
-    <script src="https://cdn.staticfile.org/element-ui/2.13.0/index.js"></script>
-    <!-- <script src="./static/js/element-ui.js"></script> -->
-    <!-- 引入echarts -->
-    <script src="https://cdn.staticfile.org/echarts/3.8.5/echarts.min.js"></script>
-    <!-- <script src="./static/js/echarts.min.js"></script> -->
-    <!-- 引入企业微信js -->
-    <script
-      src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"
-      referrerpolicy="origin"
-    ></script>
-    <script
-      src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js"
-      referrerpolicy="origin"
-    ></script>
-    <!-- <script src="./static/js/jweixin-1.2.0.js"></script>
+    <body>
+        <div id="app"></div>
+        <script>
+            document.body.ondrop = function(event) {
+            event.preventDefault()
+            event.stopPropagation()
+            }
+        </script>
+        <!-- 引入Vue.js -->
+        <script src="https://cdn.staticfile.org/vue/2.6.10/vue.min.js"></script>
+        <!-- <script src="./static/js/vue.min.js"></script> -->
+        <!-- 引入vuex.js -->
+        <script src="https://cdn.staticfile.org/vuex/3.0.0/vuex.min.js"></script>
+        <!-- <script src="./static/js/vuex.min.js"></script> -->
+        <!-- 引入vue-router -->
+        <script src="https://cdn.staticfile.org/vue-router/3.0.0/vue-router.min.js"></script>
+        <!-- <script src="./static/js/vue-router.min.js"></script> -->
+        <!-- 引入组件库 -->
+        <script src="https://cdn.staticfile.org/element-ui/2.13.0/index.js"></script>
+        <!-- <script src="./static/js/element-ui.js"></script> -->
+        <!-- 引入echarts -->
+        <script src="https://cdn.staticfile.org/echarts/3.8.5/echarts.min.js"></script>
+        <!-- <script src="./static/js/echarts.min.js"></script> -->
+        <!-- 引入企业微信js -->
+        <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js" referrerpolicy="origin"></script>
+        <script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js" referrerpolicy="origin"></script>
+        <!-- <script src="./static/js/jweixin-1.2.0.js"></script>
         <script src="./static/js/jwxwork-1.0.0.js"></script> -->
-  </body>
-</html>
+    </body>
+</html>