Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/inva_4_tivo/css/index.css

@@ -442,20 +442,51 @@
 .kehu {
     width: 100%;
     max-width: 120rem;
-    height: 61.1875rem;
+    /* height: 61.1875rem; */
+    height: 1000px;
     margin: auto;
     background: url(../image/rke.jpg) no-repeat center;
-    background-size: 120rem 61.1875rem;
+    background-size: 120rem 62.5rem;
 }
 .kehu h2, .pricings h2 {
     font-size: 2.625rem;
     color: #333;
-    padding: 8.875rem 5rem 5rem 5rem;
+    padding: 6.25rem 5rem 4rem 5rem;
 }
+.kehusab {
+    width: 160px;
+    margin: auto;
+    padding: 40px 0 0 0;
+    display: flex;
+    justify-content: space-between;
+}
+.kehuLefts, .kehuRights {
+    width: 3.75rem;
+    height: 3.75rem;
+    border-radius: 50%;
+    background: #fff;
+    text-align: center;
+    line-height: 4.375rem;
+    display: inline-block;
+    position: relative;
+    cursor:pointer;
+}
+.kehusab img {
+    width: 1.25rem;
+    height: 1.25rem;
+}
+.kehusab .zhis {
+    cursor: not-allowed !important;
+}
+
+
+
 .conImg {
-    width: 100%;
+    /* width: 100%; */
+    width: 4100px;
     display: flex;
     justify-content: space-between;
+    position: relative;
 }
 .conImg img {
     width: 31.25rem;

fhKeeper/formulahousekeeper/inva_4_tivo/index.html

@@ -43,6 +43,7 @@
                         </ul>
                     </div>
                 </div>
+
                 <div class="flexs">
                     <ul class="navigationUl fonsColorBai auss">
                         <!-- <li class="til"><a href="#">咨询客服</a></li> -->
@@ -247,8 +248,8 @@
     <div class="convenient">
         <div class="connonst">
             <div class="cvit">
-                <h2><span>强大</span>的功能，便捷的使用</h2>
-                <p>提供便携强大的工时填报、审核、统计功能，围绕企业成本提供一站式解决方案。</p>
+                <h2><span>强大</span>的功能，轻松的管理</h2>
+                <p>提供便捷且全面的工时填报、审核和统计功能，围绕企业成本管理提供一站式解决方案</p>
             </div>
             <ul class="tablTab" id="tablTabUl">
                 <li class="tabOn"><img src="./image/ions/1.png" alt="" style="margin-right: 10px;">工时填报</li>
@@ -283,25 +284,26 @@
     <div class="kehu" id="customer">
         <div class="connonst">
             <h2>来自客户的认可</h2>
-            <div class="conImg">
+            <div class="conImg" style="left: 0;">
+                <!-- 重庆美莱德生物科技 -->
                 <div class="conImgCon">
                     <div class="mengban"></div>
-                    <img src="./image/kehu1.jpg" alt="">
-                    <div class="conImgConImg">
-                        <img src="./image/ions/chengdu.png" alt="">
+                    <img src="./image/kehu5.jpg" alt="">
+                    <div class="conImgConImg" style="width: 120px;">
+                        <img src="./image/ions/mld.png" alt="">
                     </div>
                     <div class="conImgFiz">
-                        我们是做建筑工程设计的<br />
-                        需要把控每个项目的投入成本<br />
-                        工时管家系统提供了面向工程专业的系统化<br />
-                        标准化的工时统计，我们得以进行更好的<br />
-                        财务核算及人力成本控制!
+                        我们是做生物科技的<br />
+                        由于员经常出差流动，需要掌握人员闲忙情况<br />
+                        工时管家提供了资源分配<br />
+                        人员的工时，出差，休假在甘特图上直接可视，轻松实现人力资源安排
                     </div>
                     <div class="conIngFoot">
-                        <p>成都中为工程科技</p>
-                        <span>项目主管</span>
+                        <p>重庆美莱德生物科技</p>
+                        <span>李经理</span>
                     </div>
                 </div>
+                <!-- 芯传汇 -->
                 <div class="conImgCon">
                     <div class="mengban"></div>
                     <img src="./image/kehu2.jpg" alt="">
@@ -319,6 +321,25 @@
                         <span>财务总监</span>
                     </div>
                 </div>
+                <!-- 成都中为工程科技 -->
+                <div class="conImgCon">
+                    <div class="mengban"></div>
+                    <img src="./image/kehu1.jpg" alt="">
+                    <div class="conImgConImg">
+                        <img src="./image/ions/chengdu.png" alt="">
+                    </div>
+                    <div class="conImgFiz">
+                        我们是做建筑工程设计的<br />需要把控每个项目的投入成本<br />
+                        工时管家系统提供了面向工程专业的系统化<br />
+                        标准化的工时统计，我们得以进行更好的<br />
+                        财务核算及人力成本控制!
+                    </div>
+                    <div class="conIngFoot">
+                        <p>成都中为工程科技</p>
+                        <span>项目主管</span>
+                    </div>
+                </div>
+                <!-- 唐古信息科技 -->
                 <div class="conImgCon">
                     <div class="mengban"></div>
                     <img src="./image/kehu3.jpg" alt="">
@@ -326,7 +347,7 @@
                         <img src="./image/ions/tanggu.png" alt="">
                     </div>
                     <div class="conImgFiz">
-                        财比多家供应商后，我们选择了工时管家<br />
+                        对比多家供应商后，我们选择了工时管家<br />
                         事实证明我们的选择是正确的<br />
                         制药生产车间的各个环节人工成本得队数据化<br />
                         我们实现了远程的成本把控
@@ -336,8 +357,82 @@
                         <span>总经理</span>
                     </div>
                 </div>
-                <!-- <img src="./image/kehu2.jpg" alt="">
-                <img src="./image/kehu3.jpg" alt=""> -->
+                <!-- 晶易医药科技 -->
+                <div class="conImgCon">
+                    <div class="mengban"></div>
+                    <img src="./image/kehu4.jpg" alt="">
+                    <div class="conImgConImg" style="width: 100px;">
+                        <img src="./image/ions/jinli.png" alt="">
+                    </div>
+                    <div class="conImgFiz">
+                        我们是药学至临床一站式CRO服务企业<br />
+                        项目需要跨部门协作项目进展需要信息传达不及时<br />
+                        工时管家系统提供了项目管理专业版<br />
+                        建立项目内的部门分组， 任务看板清晰明了，里程碑事件全员送达
+                    </div>
+                    <div class="conIngFoot">
+                        <p>晶易医药科技</p>
+                        <span>王经理</span>
+                    </div>
+                </div>
+                <!-- 盛立安元科技 -->
+                <div class="conImgCon">
+                    <div class="mengban"></div>
+                    <img src="./image/kehu6.jpg" alt="">
+                    <div class="conImgConImg" style="width: 100px;">
+                        <img src="./image/ions/shenli.png" alt="">
+                    </div>
+                    <div class="conImgFiz">
+                        对比多家供应商后，我们选择了工时管家<br />
+                        事实证明我们的选择是正确的<br />
+                        审计上要求得做到工时填报审批真实有效
+                    </div>
+                    <div class="conIngFoot">
+                        <p>盛立安元科技</p>
+                        <span>闵经理</span>
+                    </div>
+                </div>
+                <!-- 深圳市环保科技 -->
+                <div class="conImgCon">
+                    <div class="mengban"></div>
+                    <img src="./image/kehu7.jpg" alt="">
+                    <div class="conImgConImg" style="width: 40px;">
+                        <img src="./image/ions/haotian.png" alt="">
+                    </div>
+                    <div class="conImgFiz">
+                        对比多家供应商后，我们选择了工时管家<br />
+                        有些项目担心信息有泄露的风险<br />
+                        工时管家系统提供了私有化部署<br />
+                        应用和数据都在企业自己的服务器上，由自己的IT团队管理更放心
+                    </div>
+                    <div class="conIngFoot">
+                        <p>深环科技</p>
+                        <span>闫经理</span>
+                    </div>
+                </div>
+                <!-- 深圳市法本信息技术 -->
+                <div class="conImgCon">
+                    <div class="mengban"></div>
+                    <img src="./image/kehu8.jpg" alt="">
+                    <div class="conImgConImg" style="width: 100px;">
+                        <img src="./image/ions/faben.png" alt="">
+                    </div>
+                    <div class="conImgFiz">
+                        工时管家系统提供了强大的填报，核算功能<br />
+                        平常项目研发周期长，每天填报太麻烦<br />
+                        工时管家系统提供了一次填报一周工时方便快捷<br />
+                        项目经理也可代填，工时一点不漏
+                    </div>
+                    <div class="conIngFoot">
+                        <p>深圳市法本信息技术</p>
+                        <span>刘经理</span>
+                    </div>
+                </div>
+            </div>
+
+            <div class="kehusab">
+                <div class="kehuLefts" id="kehuLeft"><img src="./image/ions/zuo.png" alt=""></div>
+                <div class="kehuRights" id="kehuRight"><img src="./image/ions/you.png" alt=""></div>
             </div>
         </div>
     </div>

fhKeeper/formulahousekeeper/inva_4_tivo/js/index.js

@@ -132,3 +132,52 @@ $('#consulting').hover(function () {
     $("#zhixun").hide()
     $("#consultigImg").attr("src", './image/ions/kefu2.png')
 })
+
+let nums = 0
+// 客户点击
+$(function() {
+    kehuFlg()
+    $('#kehuLeft').click(function() {
+        if(nums > 0 ) {
+            nums--
+            let conImgLeft = $('.conImg').css('left')
+            let num = conImgLeft.replace("px","");
+            console.log(num, '值')
+            $('.conImg').animate({
+                'left': (+num + 510) + 'px'
+            }, 400)
+            kehuFlg()
+        }
+    })
+    $('#kehuRight').click(function() {
+        if(nums < 5) {
+            nums++
+            console.log('执行')
+            let conImgLeft = $('.conImg').css('left')
+            let num = conImgLeft.replace("px","");
+            console.log(num, '值')
+            $('.conImg').animate({
+                'left': (+num - 510) + 'px'
+            }, 400)
+            kehuFlg()
+        }
+    })
+})
+
+function kehuFlg() {
+    console.log(nums)
+    if(nums == 0) {
+        $('#kehuLeft').find('img').attr("src", './image/ions/zuos.png')
+        $('#kehuLeft').addClass("zhis")
+    } else {
+        $('#kehuLeft').find('img').attr("src", './image/ions/zuo.png')
+        $('#kehuLeft').removeClass("zhis")
+    }
+    if(nums >= 5) {
+        $('#kehuRight').find('img').attr("src", './image/ions/yous.png')
+        $('#kehuRight').addClass("zhis")
+    } else {
+        $('#kehuRight').find('img').attr("src", './image/ions/you.png')
+        $('#kehuRight').removeClass("zhis")
+    }
+} 

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -2,17 +2,17 @@ var path = require('path')
 
 //  var ip = '127.0.0.1'
 // var ip = '47.100.37.243'
-// var ip = '192.168.2.30'
+var ip = '192.168.2.7'
 
-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
+//         }
+//     }
+// }
 
 module.exports = {
   build: {