用户行为优化1.0.2

src/main/java/com/caimei/modules/user/service/ClubPortraitService.java

@@ -687,9 +687,15 @@ public class ClubPortraitService {
                 Integer unActiveNumber = 0;
                 if (null != activeInfo && activeInfo.size() > 0) {
                     // 活跃数据
-                    activeNumber = activeInfo.stream().filter(ac -> ac.getActiveStatus().equals(0)).collect(Collectors.toList()).get(0).getNumber();
+                    List<clubData> activeClubList = activeInfo.stream().filter(ac -> ac.getActiveStatus().equals(0)).collect(Collectors.toList());
+                    if (null != activeClubList && activeClubList.size() > 0) {
+                        activeNumber = activeClubList.get(0).getNumber();
+                    }
                     // 不活跃数据
-                    unActiveNumber = activeInfo.stream().filter(ac -> ac.getActiveStatus().equals(1)).collect(Collectors.toList()).get(0).getNumber();
+                    List<clubData> unActiveClubList = activeInfo.stream().filter(ac -> ac.getActiveStatus().equals(1)).collect(Collectors.toList());
+                    if (null != unActiveClubList && unActiveClubList.size() > 0) {
+                        unActiveNumber = unActiveClubList.get(0).getNumber();
+                    }
                 }
                 active.add(activeNumber);
                 unActive.add(unActiveNumber);

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageCentreForm.jsp

@@ -82,12 +82,17 @@
                     var $jboxFrame = top.$('#jbox-iframe');
                     var $mainFrame = top.$('#mainFrame');
                     var $isCheckedAll = $jboxFrame[0].contentWindow.handleCheckedAll();
-                    if($isCheckedAll){
+                    if('true'.indexOf($isCheckedAll) != -1){
                         var checkedAllList = $jboxFrame[0].contentWindow.handleClickAllSelect();
                         imageList = imageList.concat(checkedAllList);
                         $('#contentTable').show();
                         $("#del").removeAttr("disabled");
                         batchSaveSort();
+                    } else if ('checkedData'.indexOf($isCheckedAll)) {
+                        var clickSelect = $jboxFrame[0].contentWindow.ClickSelect();
+                        imageList = imageList.concat(clickSelect);
+                        $('#contentTable').show();
+                        $('#del').removeAttr("disabled");
                     }else{
                         if ('1' == v && 1 == $jboxFrame.size() && 1 == $mainFrame.size()) {
                             var items = $jboxFrame[0].contentWindow.getCheckedItems();

src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyList.jsp

@@ -367,8 +367,8 @@
                     <a style="visibility: hidden" href="${ctx}/new/user/agency/remarks?clubId=${newCmClubList.clubID}">咨询记录</a>
                 </shiro:hasPermission>--%>
                 <%--<a href="${ctx}/new/user/agency/recordLinkage?clubId=${newCmClubList.clubID}">生成行为记录链接</a>--%>
-                <a href="javascript: void(0);" onclick="goNewBack(1, ${newCmClubList.addTime}, ${newCmClubList.userIdentity}, ${newCmClubList.name}, ${newCmClubList.linkMan})">访问记录</a>
-                <a href="javascript: void(0);" onclick="goNewBack(2, ${newCmClubList.addTime}, ${newCmClubList.userIdentity}, ${newCmClubList.name}, ${newCmClubList.linkMan})">咨询记录</a>
+                <a href="javascript: void(0);" onclick="goNewBack(1, '${newCmClubList.addTime}', ${newCmClubList.userIdentity}, '${newCmClubList.name}', '${newCmClubList.linkMan}')">访问记录</a>
+                <a href="javascript: void(0);" onclick="goNewBack(2, '${newCmClubList.addTime}', ${newCmClubList.userIdentity}, '${newCmClubList.name}', '${newCmClubList.linkMan}')">咨询记录</a>
             </td>
         </tr>
     </c:forEach>

src/main/webapp/WEB-INF/views/modules/userNew/cmClubSales.jsp

@@ -30,8 +30,8 @@
     <div class="flex-content">
         <div class="flex-box">
             <div class="box-title">
-                <h4 class="H_tag">新注册机构统计</h4>
-                <span id="newClubScopeNum"></span>
+                <H4 class="H_tag">新注册机构统计</H4>
+                &nbsp;&nbsp;<span id="newClubScopeNum"></span>
             </div>
             <div class="box-tabmain">
                 <div class="box-tabs" id="clubTabs">
@@ -61,31 +61,35 @@
         <div class="flex-box">
             <div class="box-title">
                 <H4 class="H_tag">机构咨询记录统计</H4>
-                <span id="clubRemarkScopeNum"></span>
+                &nbsp;&nbsp;<span id="clubRemarkScopeNum"></span>
             </div>
             <div class="box-tabmain">
-                <div class="box-time" id="remarkDate">
-                    <div class="time-input">
-                        <input type="text" placeholder="开始时间" class="input start" id="remarkStartTime">
+                <div class="box-tabmain-t">
+                    <div class="box-time" id="remarkDate">
+                        <div class="time-input">
+                            <input type="text" placeholder="开始时间" class="input start" id="remarkStartTime">
+                        </div>
+                        <span class="line">至</span>
+                        <div class="time-input">
+                            <input type="text" placeholder="结束时间" class="input end" id="remarkEndTime">
+                        </div>
                     </div>
-                    <span class="line">至</span>
-                    <div class="time-input">
-                        <input type="text" placeholder="结束时间" class="input end" id="remarkEndTime">
+                    <div class="box-select">
+                        <select path="spID" id="remarkSelSp" class="input-medium" >
+                            <option value="" label="全部协销"/>
+                            <c:forEach items="${serList}" var="sp">
+                                <option value="${sp.serviceProviderId}">${sp.name}</option>
+                            </c:forEach>
+                        </select>
                     </div>
                 </div>
-                <div class="box-select">
-                    <select path="spID" id="remarkSelSp" class="input-medium" >
-                        <option value="" label="全部协销"/>
-                        <c:forEach items="${serList}" var="sp">
-                            <option value="${sp.serviceProviderId}">${sp.name}</option>
-                        </c:forEach>
-                    </select>
-                </div>
-                <div class="box-tabs" id="clubRemarkTabs">
-                    <a class="box-tabs-li active" href="javascript: void(0);" data-type="4">全年</a>
-                    <a class="box-tabs-li" href="javascript: void(0);" data-type="3">半年</a>
-                    <a class="box-tabs-li" href="javascript: void(0);" data-type="2">月</a>
-                    <a class="box-tabs-li" href="javascript: void(0);" data-type="1">日</a>
+                <div class="box-tabmain-b">
+                    <div class="box-tabs" id="clubRemarkTabs">
+                        <a class="box-tabs-li active" href="javascript: void(0);" data-type="4">全年</a>
+                        <a class="box-tabs-li" href="javascript: void(0);" data-type="3">半年</a>
+                        <a class="box-tabs-li" href="javascript: void(0);" data-type="2">月</a>
+                        <a class="box-tabs-li" href="javascript: void(0);" data-type="1">日</a>
+                    </div>
                 </div>
             </div>
             <div class="box-eachts">
@@ -104,6 +108,14 @@
                 <H4 class="H_tag">机构活跃趋势</H4>
             </div>
             <div class="box-tabmain">
+                <div class="box-select" style="margin-left: 20px;">
+                    <select id="activeSelSp" class="input-medium">
+                        <option value="" label="全部协销"/>
+                        <c:forEach items="${serList}" var="sp">
+                            <option value="${sp.serviceProviderId}">${sp.name}</option>
+                        </c:forEach>
+                    </select>
+                </div>
                 <div class="box-time" id="clubActiveDate">
                     <div class="time-input">
                         <input type="text" placeholder="开始时间" class="input start" id="clubActiveStartTime">
@@ -113,14 +125,6 @@
                         <input type="text" placeholder="结束时间" class="input end" id="clubActiveEndTime">
                     </div>
                 </div>
-                <div class="box-select">
-                    <select id="activeSelSp" class="input-medium">
-                        <option value="" label="全部协销"/>
-                        <c:forEach items="${serList}" var="sp">
-                            <option value="${sp.serviceProviderId}">${sp.name}</option>
-                        </c:forEach>
-                    </select>
-                </div>
             </div>
             <div class="box-eachts">
                 <div class="eachts-data" id="clubActiveEacths" style="">

src/main/webapp/static/modules/cmClubSales/cmClubSales.css

@@ -111,7 +111,7 @@
 .flex-box .box-tabmain .box-time .line{
     line-height: 30px;
     font-size: 12px;
-    color: #FFFFFF;
+    color: #333333;
     margin: 0 5px;
     display: inline-block;
     float: left;
@@ -122,6 +122,17 @@
     padding: 5px 0;
 }
 .H_tag {
+    display: inline;
+    color: #333333;
+}
+#newClubScopeNum {
+    display: inline;
+    size: 30px;
+    color: #333333;
+}
+#clubRemarkScopeNum {
+    display: inline;
+    size: 30px;
     color: #333333;
 }
 .flex-box .box-eachts{
@@ -177,11 +188,29 @@
     width: 100%;
     height: 316px;
     display: none;
+    color: #333333;
 }
 .flex-box .box-eachts .eachts-none p{
     font-size: 24px;
     font-weight: bold;
     text-align: center;
     line-height: 316px;
-    color: #FFFFFF;
+    color: #333333;
+}
+.box-tabmain-t{
+    width: 100%;
+    height: 40px;
+    float: left;
+}
+.box-tabmain-b{
+    width: 100%;
+    height: 40px;
+    float: left;
+}
+.flex-box .box-tabmain .box-tabmain-t .box-time{
+    float: left;
+    margin-right: 20px;
+}
+.flex-box .box-tabmain .box-tabmain-t .box-select{
+    float: right;
 }

src/main/webapp/static/modules/cmClubSales/cmClubSales.js

@@ -33,7 +33,6 @@ $(function(){
     // 点击筛选机构咨询记录选择协销
     $('#remarkSelSp').change( function () {
         let dateType = $('#clubRemarkTabs .active').attr('data-type');
-        debugger;
         remarkSelSp(1,dateType)
     })
 

src/main/webapp/static/modules/cmClubSales/cmClubSalesEachs.js

@@ -377,7 +377,8 @@ const getClubActiveEacths = function (handleFn, id, data, active, unActive) {
             trigger: 'axis'
         },
         legend: {
-            data: ['活跃机构', '不活跃机构']
+            left: '3%',
+            data: ['活跃用户', '不活跃用户']
         },
         grid: {
             left: '3%',