Home Explore Help
Sign In
caimei365
/
caimei365-manager
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/developerD' into developer

# Conflicts:
#	src/main/webapp/WEB-INF/views/modules/userNew/cmClubPortrait.jsp
huangzhiguo 1 year ago
parent
bb00565918 a3aed2160c
commit
a1aeb83bcd
4 changed files with 51 additions and 13 deletions
Unified View Show Diff Stats
  1. 22 4
      src/main/java/com/caimei/modules/user/service/ClubPortraitService.java
  2. 18 8
      src/main/webapp/WEB-INF/views/modules/userNew/cmClubPortrait.jsp
  3. 10 0
      src/main/webapp/static/modules/cmClubPortrait/cmClubEacths.js
  4. 1 1
      src/main/webapp/static/modules/cmClubPortrait/cmClubPortrait.css

+ 22 - 4
src/main/java/com/caimei/modules/user/service/ClubPortraitService.java
View File 

@@ -198,6 +198,7 @@ public class ClubPortraitService {
 
      * @return
 
      * @return
 
      */
 
      */
 
     public CmPortrait dataList(CmPortrait cmPortrait) {
 
     public CmPortrait dataList(CmPortrait cmPortrait) {
 
+        List<String> labelList = new ArrayList<>();
 
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
         Date date = new Date();
 
         Date date = new Date();
 
         String endTime = "";
 
         String endTime = "";
 
@@ -370,8 +371,16 @@ public class ClubPortraitService {
 
                 for (CmBehaviorRecord record : behaviorRecordList) {
 
                 for (CmBehaviorRecord record : behaviorRecordList) {
 
                     keywordsTotal += record.getNumber();
 
                     keywordsTotal += record.getNumber();
 
                     integers.add(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 {
 
                     } else {
 
                         strings.add("未知");
 
                         strings.add("未知");
 
                     }
 
                     }
 
@@ -457,8 +466,17 @@ public class ClubPortraitService {
 
             ArrayList<String> strings = new ArrayList<>();
 
             ArrayList<String> strings = new ArrayList<>();
 
             if (pageTypeList.size() != 0) {
 
             if (pageTypeList.size() != 0) {
 
                 for (CmBehaviorRecord record : pageTypeList) {
 
                 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.setPageTypeValue(integers);
 
                 cmPortrait.setPageType(strings);
 
                 cmPortrait.setPageType(strings);

+ 18 - 8
src/main/webapp/WEB-INF/views/modules/userNew/cmClubPortrait.jsp
View File 

@@ -1,5 +1,5 @@
 
 <%@ page contentType="text/html;charset=UTF-8" %>
 
 <%@ page contentType="text/html;charset=UTF-8" %>
 
-<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 
+<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 
 <html>
 
 <html>
 
 <head>
 
 <head>
 
     <title>机构画像</title>
 
     <title>机构画像</title>
 
@@ -222,13 +222,16 @@
 
                     <h4 class="H_tag">订单</h4>
 
                     <h4 class="H_tag">订单</h4>
 
                 </div>
 
                 </div>
 
                 <div class="box-title">
 
                 <div class="box-title">
 
-                    <span>所有:<a class="line" href="${ctx}/order/orderList?buyer=${cmPortrait.clubName}">￥<c:if
 
+                    <%--<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}">${portrait.orderTotalAmount}</c:if> <c:if
 
                             test="${empty portrait.orderTotalAmount}">0</c:if>&nbsp;&nbsp;(<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}">${portrait.orderTotal}</c:if><c:if
 
-                            test="${empty portrait.orderTotal}">0</c:if>个)</a></span>
 
+                            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>购买总额:<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>
 
+                    <%----%><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>
 
                 </div>
 
                 </div>
 
                 <div class="box-tabmain">
 
                 <div class="box-tabmain">
 
                     <div class="box-tabs" id="orderTabs">
 
                     <div class="box-tabs" id="orderTabs">
 
@@ -261,9 +264,11 @@
 
                     <H4 class="H_tag">搜索关键词</H4>
 
                     <H4 class="H_tag">搜索关键词</H4>
 
                 </div>
 
                 </div>
 
                 <div class="box-title">
 
                 <div class="box-title">
 
-                    <span>所有:<em><c:if test="${!empty portrait.totalkeywords}">${portrait.totalkeywords}</c:if><c:if
 
+                    <%--<span>所有:<em><c:if test="${!empty portrait.totalkeywords}">${portrait.totalkeywords}</c:if><c:if
 
                             test="${empty portrait.totalkeywords}">0</c:if> 条</em></span>
 
                             test="${empty portrait.totalkeywords}">0</c:if> 条</em></span>
 
-                    <span class="right_span">当前范围:<a id="keyWordsScopeNum" href="javascript:void(0);"></a></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>
 
                 <div class="box-tabmain">
 
                 <div class="box-tabmain">
 
                     <div class="box-tabs" id="keyWordTabs">
 
                     <div class="box-tabs" id="keyWordTabs">
 
@@ -298,10 +303,12 @@
 
                     <H4 class="H_tag">咨询记录</H4>
 
                     <H4 class="H_tag">咨询记录</H4>
 
                 </div>
 
                 </div>
 
                 <div class="box-title">
 
                 <div class="box-title">
 
-                    <span>所有:<a class="line" id="visits" href="javascript:void(0)"><c:if
 
+                    <%--<span>所有:<a class="line" id="visits" href="javascript:void(0)"><c:if
 
                             test="${!empty portrait.remarksTotal}">${portrait.remarksTotal}</c:if><c:if
 
                             test="${!empty portrait.remarksTotal}">${portrait.remarksTotal}</c:if><c:if
 
                             test="${empty portrait.remarksTotal}">0</c:if> 条</a></span>
 
                             test="${empty portrait.remarksTotal}">0</c:if> 条</a></span>
 
                     <span class="right_span">当前范围:<a id="remarksScopeNum" href="javascript:void(0);"></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>
 
                 <div class="box-tabmain">
 
                 <div class="box-tabmain">
 
                     <div class="box-tabs" id="serviceTabs">
 
                     <div class="box-tabs" id="serviceTabs">
 
@@ -334,10 +341,12 @@
 
                     <H4 class="H_tag">访问记录</H4>
 
                     <H4 class="H_tag">访问记录</H4>
 
                 </div>
 
                 </div>
 
                 <div class="box-title">
 
                 <div class="box-title">
 
-                    <span>所有:<a id="visitAll" class="line visit" href="javascript:void(0);"><c:if
 
+                    <%--<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}">${portrait.visitTotal}</c:if><c:if
 
                             test="${empty portrait.visitTotal}">0</c:if> 条</a></span>
 
                             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 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>
 
                 <div class="box-tabmain">
 
                 <div class="box-tabmain">
 
                     <div class="box-tabs" id="visitTabs">
 
                     <div class="box-tabs" id="visitTabs">
 
@@ -374,6 +383,7 @@
 
 <script type="text/javascript" src="${ctxStatic}/modules/cmClubPortrait/cmClubEacths.js"></script>
 
 <script type="text/javascript" src="${ctxStatic}/modules/cmClubPortrait/cmClubEacths.js"></script>
 
 <script type="text/javascript" src="${ctxStatic}/modules/cmClubPortrait/cmClubPortrait.js"></script>
 
 <script type="text/javascript" src="${ctxStatic}/modules/cmClubPortrait/cmClubPortrait.js"></script>
 
 <script>
 
 <script>
 
+    var clubId =  $('#clubId').val();
 
     // 前往新后台
 
     // 前往新后台
 
     $('#visitNum').click(function () {
 
     $('#visitNum').click(function () {
 
         var link = "";
 
         var link = "";

+ 10 - 0
src/main/webapp/static/modules/cmClubPortrait/cmClubEacths.js
View File 

@@ -479,6 +479,16 @@ const getOtherEacths = function (handleFn,id,data) {
 
                 textStyle:{
 
                 textStyle:{
 
                     color: '#FFFFFF',  //更改坐标轴文字颜色
 
                     color: '#FFFFFF',  //更改坐标轴文字颜色
 
                     fontSize : 12      //更改坐标轴文字大小
 
                     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根下
 
             axisTick: {//轴网格,在xAxis或yAxis根下

+ 1 - 1
src/main/webapp/static/modules/cmClubPortrait/cmClubPortrait.css
View File 

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