Home Explore Help
Register Sign In
wutt
/
manHourHousekeeper
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

seyason 2 years ago
parent
e4f8714b8e 03845b5be6
commit
dd51078772
7 changed files with 51 additions and 26 deletions
Split View Show Diff Stats
  1. 1 1
      fhKeeper/formulahousekeeper/inva_4_tivo/css/customer.css
  2. 9 3
      fhKeeper/formulahousekeeper/inva_4_tivo/css/index.css
  3. 8 6
      fhKeeper/formulahousekeeper/inva_4_tivo/customer.html
  4. 12 12
      fhKeeper/formulahousekeeper/inva_4_tivo/index.html
  5. 3 0
      fhKeeper/formulahousekeeper/inva_4_tivo/js/customer.js
  6. 16 2
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/TaskProgressServiceImpl.java
  7. 2 2
      fhKeeper/formulahousekeeper/timesheet/config/index.js

+ 1 - 1
fhKeeper/formulahousekeeper/inva_4_tivo/css/customer.css
View File 

@@ -511,7 +511,7 @@ html {font-size: 10px; -webkit-text-size-adjust:none; -webkit-tap-highlight-colo
 
 }
 
 .specialShowProgressbar span {
 
     display: inline-block;
 
-    width: 13.75rem;
 
+    /* width: 13.75rem; */
 
     height: .1875rem;
 
     background: #20a0ff;
 
     position: absolute;

+ 9 - 3
fhKeeper/formulahousekeeper/inva_4_tivo/css/index.css
View File 

@@ -16,7 +16,9 @@
 
 }
 
 .navigationTitle {
 
     max-width: 81.25rem;
 
-    height: 6.375rem;
 
+    /* height: 6.375rem; */
 
+    /* max-width: 102.25rem; */
 
+    height: 8rem;
 
     margin: auto;
 
     position: relative;
 
     display: flex;
 
@@ -146,15 +148,19 @@
 
     width: 100%;
 
     position: fixed;
 
     z-index: 10;
 
-    top: 6.25rem;
 
+    /* top: 6.25rem; */
 
+    top: 8rem;
 
     left: 0;
 
     background: #fff;
 
-    height: 18.75rem;
 
+    /* height: 18.75rem; */
 
+    height: 23.1rem;
 
     border-top: .0625rem solid rgb(163, 163, 163);
 
 }
 
 .connont {
 
     width: 81.25rem;
 
     margin: auto;
 
+    transform: scale(1.258);
 
+    margin-top: 2rem;
 
 }
 
 
 .tils::before {

+ 8 - 6
fhKeeper/formulahousekeeper/inva_4_tivo/customer.html
View File 

@@ -79,7 +79,7 @@
 
                 ·用高效的客户追踪系统和智能数据处理，节约销售成本，提高企业营收·
 
             </div>
 
             <a href="http://clinic.ttkuaiban.com/#/register">
 
-                <div class="bannBtn">MORE</div>
 
+                <!-- <div class="bannBtn">MORE</div> -->
 
             </a>
 
         </div>
 
     </div>
 
@@ -119,7 +119,7 @@
 
                     <div style="display: inline-block;"> 
                         <h4>数据分析</h4>
 
                         <p>线索分析、来源排行、<br/> 商机分析、任务统计</p>
 
-                        <span>了解更多</span>
 
+                        <!-- <span>了解更多</span> -->
 
                     </div>
 
                 </div>
 
                 <div class="coreFunctionConRihtCon">
 
@@ -127,7 +127,7 @@
 
                     <div style="display: inline-block;"> 
                         <h4>产品管理</h4>
 
                         <p>产品基础信息、销售时间、<br/> 产品描述等</p>
 
-                        <span>了解更多</span>
 
+                        <!-- <span>了解更多</span> -->
 
                     </div>
 
                 </div>
 
                 <div class="coreFunctionConRihtCon">
 
@@ -135,7 +135,7 @@
 
                     <div style="display: inline-block;"> 
                         <h4>个性化</h4>
 
                         <p>自定义组件、个性化UI等</p>
 
-                        <span>了解更多</span>
 
+                        <!-- <span>了解更多</span> -->
 
                     </div>
 
                 </div>
 
             </div>
 
@@ -189,7 +189,7 @@
 
             <div class="specialShowTil">
 
                 <h2><span>特色</span>展示</h2>
 
                 <div class="specialShowProgressbar">
 
-                    <div><span></span><p>90%</p></div>
 
+                    <div><span style="width: 9%;" id="tesSpan"></span><p id="tesTex">1/11</p></div>
 
                 </div>
 
             </div>
 
             <div class="specialShowCon">
 
@@ -284,7 +284,9 @@
 
 
     <!-- 客户评价  -->
 
     <div class="evaluation">
 
-        <div class="evaluationLogo"><img src="./image/customer/hezuo.png" alt=""></div>
 
+        <div class="evaluationLogo">
 
+            <!-- <img src="./image/customer/hezuo.png" alt=""> -->
 
+        </div>
 
         <div class="evaluationC">
 
             <div class="evaluationCon">
 
                 <div class="evaluationConIkun" style="left: 0rem;">

+ 12 - 12
fhKeeper/formulahousekeeper/inva_4_tivo/index.html
View File 

@@ -17,6 +17,16 @@
 
     <!-- 统计文件 -->
 
     <!-- <script charset="UTF-8" id="LA_COLLECT" src="//sdk.51.la/js-sdk-pro.min.js"></script>
 
     <script>LA.init({id: "Jk62Sh8gvUhl1xcU",ck: "Jk62Sh8gvUhl1xcU"})</script> -->
 
+    <script>
 
+        function bodyScale() {
 
+            var devicewidth = document.documentElement.clientWidth;
 
+            var scale = devicewidth / 1920;  // 设计稿的尺寸
 
+            document.body.style.zoom = scale;
 
+        }
 
+        window.onload = window.onresize = function () {
 
+            bodyScale();
 
+        };
 
+    </script>
 
 </head>
 
 
 <body data-spy="scroll" data-target=".fixed-top" id="body">
 
@@ -30,7 +40,7 @@
 
     </div> -->
 
 
     <!-- <nav class="navbar navbar-expand-lg navbar-dark navbar-custom fixed-top"> -->
 
-    <nav class="navbar headers" style="z-index: 9;">
 
+    <nav class="navbar headers" style="z-index: 9;transform: scale(1.258);">
 
         <div class="navigationBar">
 
             <div class="navigationBarBack" id="all"></div>
 
             <div class="navigationTitle abc" id="abc">
 
@@ -69,7 +79,7 @@
 
         <img id="consultigImg" src="./image/ions/kefu2.png" alt="">
 
     </div>
 
     <!-- 产品介绍 -->
 
-    <div class="product" id="product" style="display: none">
 
+    <div class="product" id="product" style="display: none;">
 
         <div class="connont">
 
             <div style="display: flex;">
 
                 <div class="management">
 
@@ -661,15 +671,5 @@
 
 
     <!-- <script src="js/js/scripts.js"></script>  -->
 
     <script src="js/index.js"></script>
 
-    <script>
 
-        function bodyScale() {
 
-            var devicewidth = document.documentElement.clientWidth;
 
-            var scale = devicewidth / 1920;  // 设计稿的尺寸
 
-            document.body.style.zoom = scale;
 
-        }
 
-        window.onload = window.onresize = function () {
 
-            bodyScale();
 
-        };
 
-    </script>
 
 </body>
 
 </html>

+ 3 - 0
fhKeeper/formulahousekeeper/inva_4_tivo/js/customer.js
View File 

@@ -80,6 +80,9 @@ $('#product').hover(function () {
 
 // 特色展示 
 $('#specialShowConLeftUL li').click(function () {
 
     let index = $(this).index()
 
+    // console.log(index, '索引')
 
+    $('#tesTex').html(+index + 1 + '/11')
 
+    $('#tesSpan').css('width', (+index + 1) * 9.09 + '%')
 
     let arr = $('#specialShowConLeftUL li')
 
     // if(index != '1' && index != '7') {
 
        for(let i in arr) {

+ 16 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/TaskProgressServiceImpl.java
View File 

@@ -9,6 +9,7 @@ import com.management.platform.service.TprogressPaticipatorsService;
 
 import com.management.platform.util.HttpRespMsg;
 
 import com.management.platform.util.ListUtil;
 
 import com.management.platform.util.MessageUtils;
 
+import jdk.nashorn.internal.ir.IfNode;
 
 import org.apache.poi.ss.usermodel.Header;
 
 import org.springframework.stereotype.Service;
 
 import org.springframework.transaction.annotation.Transactional;
 
@@ -45,7 +46,6 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
 
     @Resource
 
     private TaskCommentMapper taskCommentMapper;
 
     //String[] statusList = new String[]{"状态正常", "存在风险", "进展逾期"};
 
-    String[] statusList = new String[]{MessageUtils.message("excel.staNormal"), MessageUtils.message("excel.atRisk"), MessageUtils.message("excel.overduePro")};
 
     @Override
 
     public HttpRespMsg addProgress(TaskProgress progress, String participatorIds, HttpServletRequest request) {
 
         HttpRespMsg msg = new HttpRespMsg();
 
@@ -59,8 +59,22 @@ public class TaskProgressServiceImpl extends ServiceImpl<TaskProgressMapper, Tas
 
         comment.setUserId(progress.getCreatorId());
 
         comment.setUserName(creator.getName());
 
         comment.setType(2);
 
+        String status = null;
 
+        switch (progress.getStatus()){
 
+            case 0:
 
+                status = MessageUtils.message("excel.staNormal");
 
+                break;
 
+            case 1:
 
+                status = MessageUtils.message("excel.atRisk");
 
+                break;
 
+            case 2:
 
+                status = MessageUtils.message("excel.overduePro");
 
+                break;
 
+            default:
 
+                status = "";
 
+        }
 
         //String updateStr = creator.getName()+"更新任务进展为 " + statusList[progress.getStatus()];
 
-        String updateStr = creator.getName()+MessageUtils.message("stages.upTask") + statusList[progress.getStatus()];
 
+        String updateStr = creator.getName()+MessageUtils.message("stages.upTask") + status;
 
         comment.setContent(updateStr);
 
         taskCommentMapper.insert(comment);

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet/config/index.js
View File 

@@ -1,10 +1,10 @@
 
 var path = require('path')
 
 
 //  var ip = '127.0.0.1'
 
-var ip = '47.101.180.183'
 
+// var ip = '47.101.180.183'
 
 // var ip = '47.100.37.243'
 
 // var ip = '192.168.2.31'
 
-// var ip = '192.168.2.20'
 
+var ip = '192.168.2.45'
 
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 
 // for (var i in ifaces) {