机构画像调整

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

@@ -198,6 +198,7 @@ public class ClubPortraitService {
      * @return
      */
     public CmPortrait dataList(CmPortrait cmPortrait) {
+        List<String> labelList = new ArrayList<>();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date date = new Date();
         String endTime = "";
@@ -370,8 +371,16 @@ public class ClubPortraitService {
                 for (CmBehaviorRecord record : behaviorRecordList) {
                     keywordsTotal += record.getNumber();
                     integers.add(record.getNumber());
-                    if (!ObjectUtils.isEmpty(record.getPageLabel())) {
-                        strings.add(record.getPageLabel());
+                    if (StringUtils.isNotBlank(record.getPageLabel())) {
+                        labelList = new ArrayList<>();
+                        integers.add(record.getNumbers());
+                        if (record.getPageLabel().contains(",")) {
+                            String[] split = record.getPageLabel().split(",");
+                            labelList.addAll(Arrays.asList(split));
+                            strings.add(StringUtils.strip(labelList.toString(), "[]"));
+                        } else {
+                            strings.add(record.getPageLabel());
+                        }
                     } else {
                         strings.add("未知");
                     }
@@ -457,8 +466,17 @@ public class ClubPortraitService {
             ArrayList<String> strings = new ArrayList<>();
             if (pageTypeList.size() != 0) {
                 for (CmBehaviorRecord record : pageTypeList) {
-                    integers.add(record.getNumbers());
-                    strings.add(record.getPageLabel());
+                    if (StringUtils.isNotBlank(record.getPageLabel())) {
+                        labelList = new ArrayList<>();
+                        integers.add(record.getNumbers());
+                        if (record.getPageLabel().contains(",")) {
+                            String[] split = record.getPageLabel().split(",");
+                            labelList.addAll(Arrays.asList(split));
+                            strings.add(StringUtils.strip(labelList.toString(), "[]"));
+                        } else {
+                            strings.add(record.getPageLabel());
+                        }
+                    }
                 }
                 cmPortrait.setPageTypeValue(integers);
                 cmPortrait.setPageType(strings);

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

@@ -218,9 +218,9 @@
                     <h4 class="H_tag">订单</h4>
                 </div>
                 <div class="box-title">
-                    <span>所有:<a class="line" href="${ctx}/order/orderList?buyer=${cmPortrait.clubName}">￥<c:if test="${!empty portrait.orderTotalAmount}">${portrait.orderTotalAmount}</c:if> <c:if test="${empty portrait.orderTotalAmount}">0</c:if>&nbsp;&nbsp;(<c:if test="${!empty portrait.orderTotal}">${portrait.orderTotal}</c:if><c:if test="${empty portrait.orderTotal}">0</c:if>个)</a></span>
+                    <%----%><span>所有:<a class="line" href="${ctx}/order/orderList?buyer=${cmPortrait.clubName}">￥<c:if test="${!empty portrait.orderTotalAmount}">${portrait.orderTotalAmount}</c:if> <c:if test="${empty portrait.orderTotalAmount}">0</c:if>&nbsp;&nbsp;(<c:if test="${!empty portrait.orderTotal}">${portrait.orderTotal}</c:if><c:if test="${empty portrait.orderTotal}">0</c:if>个)</a></span>
 <%--                    <span>购买总额:<a href="javascript: void(0);">￥<c:if test="${!empty portrait.orderTotalAmount}">${portrait.orderTotalAmount}</c:if><c:if test="${empty portrait.orderTotalAmount}">0</c:if></a></span>--%>
-                    <span class="right_span">当前范围:<a id="orderScopeNum" href="javascript:void(0);"></a></span>
+                    <span class="right_span">订单数量:<a id="orderScopeNum" href="javascript:void(0);"></a></span>
                 </div>
                 <div class="box-tabmain">
                     <div class="box-tabs" id="orderTabs">
@@ -253,8 +253,8 @@
                     <H4 class="H_tag">搜索关键词</H4>
                 </div>
                 <div class="box-title">
-                    <span>所有:<em><c:if test="${!empty portrait.totalkeywords}">${portrait.totalkeywords}</c:if><c:if test="${empty portrait.totalkeywords}">0</c:if> 条</em></span>
-                    <span class="right_span">当前范围:<a id="keyWordsScopeNum" href="javascript:void(0);"></a></span>
+                    <%----%><span>所有:<em><c:if test="${!empty portrait.totalkeywords}">${portrait.totalkeywords}</c:if><c:if test="${empty portrait.totalkeywords}">0</c:if> 条</em></span>
+                    <span class="right_span">关键词数量:<a id="keyWordsScopeNum" href="javascript:void(0);"></a></span>
                 </div>
                 <div class="box-tabmain">
                     <div class="box-tabs" id="keyWordTabs">
@@ -289,8 +289,8 @@
                     <H4 class="H_tag">咨询记录</H4>
                 </div>
                 <div class="box-title">
-                    <span>所有:<a class="line" href="${ctx}/new/user/agency/regist?clubId=${cmPortrait.clubID}&clubName=${cmPortrait.clubName}"><c:if test="${!empty portrait.remarksTotal}">${portrait.remarksTotal}</c:if><c:if test="${empty portrait.remarksTotal}">0</c:if> 条</a></span>
-                    <span class="right_span">当前范围:<a id="remarksScopeNum" href="javascript:void(0);"></a></span>
+                    <<%----%>span>所有:<a class="line" href="${ctx}/new/user/agency/regist?clubId=${cmPortrait.clubID}&clubName=${cmPortrait.clubName}"><c:if test="${!empty portrait.remarksTotal}">${portrait.remarksTotal}</c:if><c:if test="${empty portrait.remarksTotal}">0</c:if> 条</a></span>
+                    <span class="right_span">咨询数量:<a id="remarksScopeNum" href="javascript:void(0);"></a></span>
                 </div>
                 <div class="box-tabmain">
                     <div class="box-tabs" id="serviceTabs">
@@ -323,8 +323,8 @@
                     <H4 class="H_tag">访问记录</H4>
                 </div>
                 <div class="box-title">
-                    <span>所有:<a id="visitAll" class="line visit" href="javascript:void(0);"><c:if test="${!empty portrait.visitTotal}">${portrait.visitTotal}</c:if><c:if test="${empty portrait.visitTotal}">0</c:if> 条</a></span>
-                    <span class="right_span">当前范围:<a id="visitNum" class="visit" href="javascript:void(0);"></a></span>
+                    <%----%><span>所有:<a id="visitAll" class="line visit" href="javascript:void(0);"><c:if test="${!empty portrait.visitTotal}">${portrait.visitTotal}</c:if><c:if test="${empty portrait.visitTotal}">0</c:if> 条</a></span>
+                    <span class="right_span">访问数量:<a id="visitNum" class="visit" href="javascript:void(0);"></a></span>
                 </div>
                 <div class="box-tabmain">
                     <div class="box-tabs" id="visitTabs">
@@ -361,6 +361,7 @@
 <script type="text/javascript" src="${ctxStatic}/modules/cmClubPortrait/cmClubEacths.js"></script>
 <script type="text/javascript" src="${ctxStatic}/modules/cmClubPortrait/cmClubPortrait.js"></script>
 <script>
+    var clubId =  $('#clubId').val();
     // 前往新后台
     $('#visitNum').click(function () {
         var link = "";
@@ -368,7 +369,7 @@
         var endTime = $('#visitTimeEnd').val()
         var name = "${statistics.name}"
         $.get("${ctx}/jump/link", function (data) {
-            link = "https://manager.caimei365.com/#/user/record-list?type=second&corporateName="+name+"&startTime="+startTime+"&endTime="+endTime+"&token=" + data;
+            link = "https://manager.caimei365.com/#/user/record-list?type=second&"+"&clubId="+clubId"&corporateName="+name+"&startTime="+startTime+"&endTime="+endTime+"&token=" + data;
             window.open(link, "_blank");
         });
     })
@@ -377,7 +378,7 @@
         var link = "";
         var name = "${statistics.name}"
         $.get("${ctx}/jump/link", function (data) {
-            link = "https://manager.caimei365.com/#/user/record-list?type=second&corporateName="+name+"&startTime=&endTime="+"&token=" + data;
+            link = "https://manager.caimei365.com/#/user/record-list?type=second"+"&clubId="+clubId"&corporateName="+name+"&startTime=&endTime="+"&token=" + data;
             window.open(link, "_blank");
         });
     })

src/main/webapp/static/modules/cmClubPortrait/cmClubEacths.js

@@ -479,6 +479,16 @@ const getOtherEacths = function (handleFn,id,data) {
                 textStyle:{
                     color: '#FFFFFF',  //更改坐标轴文字颜色
                     fontSize : 12      //更改坐标轴文字大小
+                },
+                margin: 8,
+                formatter: function (params) {
+                    var val = "";
+                    if (params.length > 6) {
+                        val = params.substr(0, 6) + '...';
+                        return val;
+                    } else {
+                        return params;
+                    }
                 }
             },
             axisTick: {//轴网格,在xAxis或yAxis根下

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

@@ -193,7 +193,7 @@
     color: #40E0D0;
 }
 .flex-box .box-title span a.line{
-    text-decoration: underline;
+    /*text-decoration: underline;*/
 }
 .flex-box .box-tabmain{
     width: 100%;