Home Explore Help
Sign In
qmx
/
jy
14
0
Fork 0
Files Issues 2 Pull Requests 0 Wiki
Browse Source

feat:市场分析报告明细、全局文案调整

tsz 2 years ago
parent
c61626aa79
commit
92eacaf48c
35 changed files with 733 additions and 75 deletions
Split View Show Diff Stats
  1. 3 0
      .vscode/settings.json
  2. 1 1
      config_formal/publicapply_172.17.148.50/bigmembermenu.json
  3. 1 1
      config_formal/publicapply_172.17.148.50/commonfunctions.json
  4. 1 1
      config_formal/publicapply_172.17.4.183/bigmembermenu.json
  5. 1 1
      config_formal/publicapply_172.17.4.183/commonfunctions.json
  6. 3 8
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/report_detail_month.css
  7. BIN
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/image/icon-infor-blue.png
  8. 1 1
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/main_root_data.js
  9. 1 1
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/report_analysis.js
  10. 1 1
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/report_analysis_history.js
  11. 11 0
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/report_detail_month.js
  12. 0 0
      src/jfw/modules/app/src/web/templates/big-member/page_contrast.html
  13. 15 3
      src/jfw/modules/app/src/web/templates/big-member/page_report_analysis.html
  14. 1 1
      src/jfw/modules/app/src/web/templates/big-member/page_report_analysis_history.html
  15. 59 0
      src/jfw/modules/app/src/web/templates/big-member/page_report_analysis_pro_list.html
  16. 16 8
      src/jfw/modules/app/src/web/templates/big-member/page_report_detail_month.html
  17. 194 3
      src/jfw/modules/app/src/web/templates/big-member/page_report_detail_week.html
  18. 1 1
      src/jfw/modules/app/src/web/templates/weixin/historypush.html
  19. 1 1
      src/jfw/modules/publicapply/src/userbase/bigmembermenu.json
  20. 1 1
      src/jfw/modules/publicapply/src/userbase/commonfunctions.json
  21. 1 1
      src/web/staticres/big-member/js/meauContact.js
  22. 23 0
      src/web/staticres/common-module/filter/css/filter_limit.css
  23. 82 22
      src/web/staticres/common-module/filter/js/filter_limit.js
  24. 1 0
      src/web/staticres/common-module/public/css/empty.css
  25. 16 0
      src/web/staticres/common-module/report-analysis/css/report_analysis.css
  26. BIN
      src/web/staticres/common-module/report-analysis/image/icon/icon-infor-blue.png
  27. 9 2
      src/web/staticres/common-module/report-analysis/js/report_analysis.js
  28. 1 1
      src/web/staticres/common-module/report-analysis/js/report_analysis_history.js
  29. 272 0
      src/web/staticres/common-module/report-analysis/js/report_analysis_pro_list.js
  30. 0 0
      src/web/templates/big-member/wx/page_index.html
  31. 1 1
      src/web/templates/big-member/wx/page_report_analysis.html
  32. 1 1
      src/web/templates/big-member/wx/page_report_analysis_history.html
  33. 1 1
      src/web/templates/frontRouter/pc/serviceSystem/free/index.html
  34. 12 12
      src/web/templates/pc/supsearch.html
  35. 1 1
      src/web/templates/weixin/historypush.html

+ 3 - 0
.vscode/settings.json
View File 

@@ -0,0 +1,3 @@
 
+{
 
+  "git.ignoreLimitWarning": true
 
+}

+ 1 - 1
config_formal/publicapply_172.17.148.50/bigmembermenu.json
View File 

@@ -93,7 +93,7 @@
 
 				"isusable":false
 
 			},
 
 			{
 
-				   "name":"定制化分析报告",
 
+				   "name":"市场分析报告",
 
 				   "url":"/swordfish/page_big_pc/desktop/report_analysis",
 
 				   "isusable":false
 
 			}

+ 1 - 1
config_formal/publicapply_172.17.148.50/commonfunctions.json
View File 

@@ -136,7 +136,7 @@
 
 			}
 
 		},
 
 		{
 
-			   "name":"定制化分析报告",
 
+			   "name":"市场分析报告",
 
 			   "charge":true,
 
 			   "pc":{
 
 			      "url":"/swordfish/page_big_pc/desktop/report_analysis",

+ 1 - 1
config_formal/publicapply_172.17.4.183/bigmembermenu.json
View File 

@@ -93,7 +93,7 @@
 
 				"isusable":false
 
 			},
 
 			{
 
-				   "name":"定制化分析报告",
 
+				   "name":"市场分析报告",
 
 				   "url":"/swordfish/page_big_pc/desktop/report_analysis",
 
 				   "isusable":false
 
 			}

+ 1 - 1
config_formal/publicapply_172.17.4.183/commonfunctions.json
View File 

@@ -136,7 +136,7 @@
 
 			}
 
 		},
 
 		{
 
-			   "name":"定制化分析报告",
 
+			   "name":"市场分析报告",
 
 			   "charge":true,
 
 			   "pc":{
 
 			      "url":"/swordfish/page_big_pc/desktop/report_analysis",

+ 3 - 8
src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/report_detail_month.css
View File 

@@ -186,20 +186,15 @@
 
   background: #fff;
 
 }
 
 
-#report_month .search-filters .filters-title, #report_week .search-filters .filters-title{
 
-  background-color: #fff;
 
-}
 
-
 
 .empty-container{
 
   background-color: #fff;
 
 }
 
-
 
-#report_month .empty-main.tip-text {
 
+ 
+.empty-main.tip-text {
 
   color: #9B9CA3;
 
   font-size: .26rem;
 
 }
 
-
 
-.van-tabs__line{
 
+#report_week .van-tabs__line, #report_month .van-tabs__line{
 
   background: linear-gradient(270.04deg, #25BEEE 0.03%, #2ABED1 74.46%);;
 
   width: .48rem;
 
   border-radius: .02rem;

BIN
src/jfw/modules/app/src/web/staticres/jyapp/big-member/image/icon-infor-blue.png
View File


+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/main_root_data.js
View File 

@@ -194,7 +194,7 @@ var staticData = [
 
                 dis_url:'javascript:;',
 
                 b_gray_icon:'icon-gray-dingzhi',
 
                 b_gold_icon:'icon-gold-dingzhi',
 
-                b_high:'定制化市场分析报告',
 
+                b_high:'市场分析报告',
 
                 b_content:'您可自定义时间范围，自动生成多维度市场分析报告。'
 
             },
 
             {

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/report_analysis.js
View File 

@@ -25,7 +25,7 @@ var vm = new Vue({
 
     tabActiveName: 'analysis', // analysis/history
 
     tabList: [
 
       {
 
-        label: '定制化市场分析',
 
+        label: '市场分析报告',
 
         name: 'analysis'
 
       },
 
       {

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/report_analysis_history.js
View File 

@@ -9,7 +9,7 @@ var vm = new Vue({
 
     tabActiveName: 'history', // analysis/history
 
     tabList: [
 
       {
 
-        label: '定制化市场分析',
 
+        label: '市场分析报告',
 
         name: 'analysis'
 
       },
 
       {

+ 11 - 0
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/report_detail_month.js
View File 

@@ -130,6 +130,10 @@ var vNode = {
 
         bigStatus: 0,
 
         tabActive: '0',
 
         projectInfo: {},
 
+        vanlistParams: {
 
+          loading: false,
 
+          finished: false
 
+        },
 
         listParams: {
 
           sortType: 0, // 项目明细排序方式
 
           pageSize: 10,
 
@@ -208,12 +212,18 @@ var vNode = {
 
       },
 
       // 查询项目明细
 
       confirm (data) {
 
+        this.filterData = data
 
         const params = {
 
           ...this.listParams,
 
           ...data
 
         }
 
         this.getProjectInfo(params)
 
       },
 
+      onListLoad: function () {
 
+        this.listParams.pageNum++
 
+        this.vanlistParams.loading = true
 
+        this.confirm(this.filterData)
 
+      },
 
       getProjectInfo: function (params) {
 
         const loading = this.showLoading()
 
         $.ajax({
 
@@ -222,6 +232,7 @@ var vNode = {
 
           data: JSON.stringify(params),
 
           contentType: 'application/json',
 
           success: function(res) {
 
+            this.vanlistParams.loading = false
 
             if (res && res.error_code === 0 && res.data) {
 
               if (this.listParams.pageNum === 1) {
 
                 this.projectInfo = res.data

File diff suppressed because it is too large
+ 0 - 0
src/jfw/modules/app/src/web/templates/big-member/page_contrast.html


+ 15 - 3
src/jfw/modules/app/src/web/templates/big-member/page_report_analysis.html
View File 

@@ -3,7 +3,7 @@
 
 <head>
 
     <!--引入公共资源头部-->
 
     {{include "/big-member/meta.html"}}
 
-    <title>定制化市场分析报告</title>
 
+    <title>市场分析报告</title>
 
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
 
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
 
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 
@@ -145,7 +145,13 @@
 
                         </section>
 
                         <!-- 市场概况 -->
 
                         <section class="section bg-white market-overview" id="market" v-if="getStatus">
 
-                            <div class="section-title pd-16">市场概况</div>
 
+                            <div class="section-title add-pro-list-inlet pd-16">
 
+                              <span>市场概况</span>
 
+                              <div class="pro_list_inlet" @click="inProList">
 
+                                <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/report-analysis/image/icon/icon-infor-blue.png?v={{Msg "seo" "version"}}" alt="">
 
+                                <span>项目明细</span>
 
+                              </div>
 
+                            </div>
 
                             <div class="section-content market-overview-list">
 
                                 <div
 
                                     class="market-overview-item"
 
@@ -174,7 +180,13 @@
 
                         <div class="vip_component"
 
                           v-if="!getStatus"
 
                           style="height:8.84rem">
 
-                          <p class="example-title">市场概况</p>
 
+                          <p class="example-title add-pro-list-inlet">
 
+                            <span>市场概况</span>
 
+                            <div class="pro_list_inlet" @click="inProList">
 
+                              <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/report-analysis/image/icon/icon-infor-blue.png?v={{Msg "seo" "version"}}" alt="">
 
+                              <span>项目明细</span>
 
+                            </div>
 
+                          </p>
 
                           <div class="chart_com" style="background:url('{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/report-analysis/image/01-bg.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%">
 
                             <chart-example type="item_1" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/report-analysis/image/01.png?v={{Msg "seo" "version"}}'>
 
                             </chart-example>

+ 1 - 1
src/jfw/modules/app/src/web/templates/big-member/page_report_analysis_history.html
View File 

@@ -3,7 +3,7 @@
 
 <head>
 
     <!--引入公共资源头部-->
 
     {{include "/big-member/meta.html"}}
 
-    <title>定制化市场分析报告</title>
 
+    <title>市场分析报告</title>
 
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
 
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
 
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />

+ 59 - 0
src/jfw/modules/app/src/web/templates/big-member/page_report_analysis_pro_list.html
View File 

@@ -0,0 +1,59 @@
 
+<!DOCTYPE html>
 
+<html lang="zh-CN">
 
+<head>
 
+    <!--引入公共资源头部-->
 
+    {{include "/big-member/meta.html"}}
 
+    <title>市场分析报告项目明细</title>
 
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
 
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
 
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
 
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
 
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/css/empty.css?v={{Msg "seo" "version"}}' />
 
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/filter/css/filter_limit.css?v={{Msg "seo" "version"}}' />
 
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/filter/css/project_cell.css?v={{Msg "seo" "version"}}' />
 
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/filter/css/project_header.css?v={{Msg "seo" "version"}}' />
 
+</head>
 
+
 
+<body>
 
+<div class="j-container">
 
+    {{include "/big-member/header.html"}}
 
+    <div class="j-main" id="analysisList" v-cloak>
 
+      <filter-component :show-tip="false" :show-select="false" :filters="filters"  @confirm="confirm"></filter-component>
 
+      <div class="project-detail-list" v-if="Object.keys(projectInfo).length != 0 && projectInfo.list.length > 0">
 
+        <project-header @setsort-type="setsortType"></project-header>
 
+        <van-list
 
+          v-model:loading="vanlistParams.loading"
 
+          :finished="vanlistParams.finished"
 
+          finished-text="没有更多了"
 
+          @load="onListLoad"
 
+        >
 
+          <project-cell @set-winner-link="setWinnerLink" @set-buyer-link="setBuyerLink(item)" @set-link-url="setLinkUrl" :item="item" v-for="item in projectInfo.list" :key="item.id">
 
+            <div class="update-time">
 
+              <div class="update-time-label">
 
+                本月项目更新时间：
 
+              </div>
 
+              <div class="update-time-content">${item.lastTime?utils.dateFromNow(item.lastTime*1000):'--'}</div>
 
+            </div>
 
+          </project-cell>
 
+        </van-list>
 
+      </div>
 
+      <empty v-else>暂无数据</empty>
 
+    </div>
 
+</div>
 
+
 
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 
+<script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 
+<script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
 
+{{include "/big-member/commonjs.html"}}
 
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>
 
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/keyword-mobile.js?v={{Msg "seo" "version"}}'></script>
 
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/area-city-mobile.js?v={{Msg "seo" "version"}}'></script>
 
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/industry-mobile.js?v={{Msg "seo" "version"}}'></script>
 
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/cate-mobile.js?v={{Msg "seo" "version"}}'></script>
 
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/filter/js/filter_limit.js?v={{Msg "seo" "version"}}'></script>
 
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/filter/js/project_cell.js?v={{Msg "seo" "version"}}'></script>
 
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/filter/js/project_header.js?v={{Msg "seo" "version"}}'></script>
 
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/empty.js?v={{Msg "seo" "version"}}'></script>
 
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/report-analysis/js/report_analysis_pro_list.js?v={{Msg "seo" "version"}}'></script>
 
+</body>
 
+</html>

+ 16 - 8
src/jfw/modules/app/src/web/templates/big-member/page_report_detail_month.html
View File 

@@ -20,6 +20,7 @@
 
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/v-charts/1.19.0/style.min.css />
 
     <!--E-当前页面的css资源-->
 
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
 
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/filter/css/filter_limit.css?v={{Msg "seo" "version"}}' />
 
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/filter/css/project_header.css?v={{Msg "seo" "version"}}' />
 
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/filter/css/project_cell.css?v={{Msg "seo" "version"}}' />
 
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/css/empty.css?v={{Msg "seo" "version"}}' />
 
@@ -871,17 +872,24 @@
 
             </div>
 
           </van-tab>
 
           <van-tab name="1" title="本月项目明细">
 
-            <filter-component :arealist="area" :keyphraseslist="keywordsList" keyformat="phrases" @confirm="confirm"></filter-component>
 
+            <filter-component :show-tip="false" :show-select="false" :arealist="area" :keyphraseslist="keywordsList" keyformat="phrases" @confirm="confirm"></filter-component>
 
             <div class="project-detail-list" v-if="Object.keys(projectInfo).length != 0 && projectInfo.list.length > 0">
 
               <project-header @setsort-type="setsortType"></project-header>
 
-              <project-cell @set-winner-link="setWinnerLink" @set-link-url="setLinkUrl" :item="item" v-for="item in projectInfo.list" :key="item.id">
 
-                <div class="update-time">
 
-                  <div class="update-time-label">
 
-                    本月项目更新时间：
 
+              <van-list
 
+                v-model:loading="vanlistParams.loading"
 
+                :finished="vanlistParams.finished"
 
+                finished-text="没有更多了"
 
+                @load="onListLoad"
 
+              >
 
+                <project-cell @set-winner-link="setWinnerLink" @set-buyer-link="setBuyerLink(item)" @set-link-url="setLinkUrl" :item="item" v-for="item in projectInfo.list" :key="item.id">
 
+                  <div class="update-time">
 
+                    <div class="update-time-label">
 
+                      本月项目更新时间：
 
+                    </div>
 
+                    <div class="update-time-content">${item.lastTime?utils.dateFromNow(item.lastTime*1000):'--'}</div>
 
                   </div>
 
-                  <div class="update-time-content">${item.lastTime?utils.dateFromNow(item.lastTime*1000):'--'}</div>
 
-                </div>
 
-              </project-cell>
 
+                </project-cell>
 
+              </van-list>
 
             </div>
 
             <empty v-else>暂无数据</empty>
 
           </van-tab>

+ 194 - 3
src/jfw/modules/app/src/web/templates/big-member/page_report_detail_week.html
View File 

@@ -20,6 +20,7 @@
 
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/v-charts/1.19.0/style.min.css />
 
     <!--E-当前页面的css资源-->
 
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/css/index.css?v={{Msg "seo" "version"}}' />
 
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/filter/css/filter_limit.css?v={{Msg "seo" "version"}}' />
 
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/filter/css/project_header.css?v={{Msg "seo" "version"}}' />
 
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/filter/css/project_cell.css?v={{Msg "seo" "version"}}' />
 
     <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/css/empty.css?v={{Msg "seo" "version"}}' />
 
@@ -133,9 +134,199 @@
 
             <p>项目预算/项目规模：少量预算金额、中标金额未公开或为空的项目，在计算项目总预算、总规模时不参与统计；</p>
 
             <p>项目重复统计：一个招标项目可能同属于多个关键词组，故各关键词组的数据统计之和可能大于整体市场的统计。</p>
 
         </div>
 
-        <!-- 本周新增招标项目数量 -->
 
-        <van-tabs v-model:active="tabActive" sticky>
 
+        <div v-if="utils.getParam('type')!='member'">
 
+          <!-- 本周新增招标项目数量 -->
 
+          <div class="chart" v-if="showCurWeekAdd">
 
+            <div class="chart_title">本周新增招标项目数量</div>
 
+            <div class="progress-bar-container">
 
+                <div class="progress-bar-item" v-for="(item,index) in curWeekAddBirds" :key="index">
 
+                    <div class="item-label">
 
+                        <span class="item-name">${item.item}</span>
 
+                        <span class="item-count">${item.count}个</span>
 
+                    </div>
 
+                    <div class="item-progress">
 
+                        <span class="item-progress-count" :class="index > 2 ? 'blue-progress' : 'yellow-progress'" :style="{width: item.parent}"></span>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="mark-words" @click="goCollect('week_project_seek_count')">全面获取关注项目的新增数量，挖掘商机！<em class="mark-icon-right"></em></div>
 
+          </div>
 
+          <!-- 本周新增招标项目预算 -->
 
+          <div class="chart" v-if="showBudget">
 
+              <div class="chart_title">本周新增招标项目预算</div>
 
+              <div>
 
+                  <ve-histogram
 
+                      height="284px"
 
+                      :init-options="initRendererSvg"
 
+                      :data="addCountData"
 
+                      :after-config="addCountConfig"
 
+                      :settings="addCountSettings"
 
+                      :extend="barChart.chartExtend">
 
+                  </ve-histogram>
 
+              </div>
 
+              <div class="mark-words" @click="goCollect('week_project_seek_budget')">提前获取关注项目的市场动向，挖掘潜在客户！<em class="mark-icon-right"></em></div>
 
+          </div>
 
+          <!-- 本周新增开标项目数量 -->
 
+          <div class="chart" v-if="showCurWeekOpen">
 
+              <div class="chart_title">本周新增开标项目数量</div>
 
+              <div class="progress-bar-container">
 
+                  <div class="progress-bar-item" v-for="(item,index) in curWeekOpenBirds" :key="index">
 
+                      <div class="item-label">
 
+                          <span class="item-name">${item.item}</span>
 
+                          <span class="item-count">${item.count}个</span>
 
+                      </div>
 
+                      <div class="item-progress">
 
+                          <span class="item-progress-count" :class="index > 2 ? 'blue-progress' : 'yellow-progress'" :style="{width: item.parent}"></span>
 
+                      </div>
 
+                  </div>
 
+              </div>
 
+              <div class="mark-words" @click="goCollect('week_project_open_count')">获取新项目的全部开标统计，帮助企业寻找客户！<em class="mark-icon-right"></em></div>
 
+          </div>
 
+          <!-- 本周新增招标项目规模 -->
 
+          <div class="chart" v-if="showScale">
 
+              <div class="chart_title">本周新增开标项目规模</div>
 
+              <div>
 
+                  <ve-histogram
 
+                      height="284px"
 
+                      :init-options="initRendererSvg"
 
+                      :data="curWeekAddScaleData"
 
+                      :after-config="curWeekAddScaleConfig"
 
+                      :settings="curWeekAddScaleSettings"
 
+                      :extend="barChart.chartExtend">
 
+                  </ve-histogram>
 
+              </div>
 
+              <div class="mark-words" @click="goCollect('week_project_seek_bidamount')">全面获取关注项目的规模，分析市场容量，寻找客户！<em class="mark-icon-right"></em></div>
 
+          </div>
 
+          <!-- 项目金额排行榜 -->
 
+          <div class="chart" v-if="showItemAmount">
 
+              <div class="chart_title">项目金额排行榜</div>
 
+              <div>
 
+                  <div class="current-list" v-for="(item,index) in amountWinArr">
 
+                      <div class="win-name">
 
+                          <span v-if="index === 0" class="index first-index">${index + 1}</span>
 
+                          <span v-else-if="index === 1" class="index second-index">${index + 1}</span>
 
+                          <span v-else-if="index === 2" class="index third-index">${index + 1}</span>
 
+                          <span v-else class="index ">${index + 1}</span>
 
+                          <span class="title">${item.projectname || '--'}</span>
 
+                      </div>
 
+                      <div class="item-double">
 
+                          <div class="item-single">
 
+                              <span class="i-label">采购单位</span>
 
+                              <span class="i-value mosaic-text-for-check">${item.buyer || '--'}</span>
 
+                          </div>
 
+                      </div>
 
+                      <div class="item-double">
 
+                          <div class="item-single">
 
+                              <span class="i-label">中标单位</span>
 
+                              <span class="i-value mosaic-text-for-check">${item.winner || '--'}</span>
 
+                          </div>
 
+                      </div>
 
+                      <div class="item-double">
 
+                          <div class="item-single">
 
+                              <span class="i-label">预算金额(亿)</span>
 
+                              <span class="i-value mosaic-text-for-check">${item.budget || '--'}</span>
 
+                          </div>
 
+                          <div class="item-single">
 
+                              <span class="i-label">中标金额(亿)</span>
 
+                              <span class="i-value mosaic-text-for-check">${item.bidamount || '--'}</span>
 
+                          </div>
 
+                      </div>
 
+                  </div>
 
+              </div>
 
+              <div v-if="itemAmount.list.length > 5 && !itemAmount.showAll">
 
+                  <div class="more">
 
+                      <span @click="itemAmount.showAll = true">查看更多</span>
 
+                  </div>
 
+              </div>
 
+              <div class="mark-words" @click="goCollect('week_project_money_list')">提供你关注的top项目榜单，帮你分析市场动向！<em class="mark-icon-right"></em></div>
 
+          </div>
 
+          <!-- 下周开标提醒 -->
 
+          <div class="chart" v-if="showBidOpen">
 
+              <div class="chart_title">下周开标提醒</div>
 
+              <div class="emphasis">
 
+                  <div class="emphasis-list" v-for="item in bidOpenList">
 
+                      <p class="emphasis-p">
 
+                          <span class="e-l-label">开标时间</span>
 
+                          <span class="e-l-value">${item.bidopentime || '--'}</span>
 
+                      </p>
 
+                      <p class="emphasis-p">
 
+                          <span class="e-l-label">省市</span>
 
+                          <span class="e-l-value">${item.area || '--'} ${item.city}</span>
 
+                      </p>
 
+                      <p class="emphasis-p">
 
+                          <span class="e-l-label">项目名称</span>
 
+                          <span class="e-l-value mosaic-text-for-check">${item.projectname || '--'}</span>
 
+                      </p>
 
+                      <p class="emphasis-p">
 
+                          <span class="e-l-label">采购单位</span>
 
+                          <span class="e-l-value mosaic-text-for-check">${item.buyer || '--'}</span>
 
+                      </p>
 
+                      <p class="emphasis-p">
 
+                          <span class="e-l-label">项目预算(万)</span>
 
+                          <span class="e-l-value mosaic-text-for-check">${item.budget || '--'}</span>
 
+                      </p>
 
+                  </div>
 
+              </div>
 
+              <div class="mark-words" @click="goCollect('week_next_remind')">实时跟踪全部关注项目的开标详情，不遗漏商机！<em class="mark-icon-right"></em></div>
 
+          </div>
 
+          <!-- 重点关注项目 -->
 
+          <div class="chart" v-if="showFollowProject">
 
+              <div class="chart_title">重点关注项目</div>
 
+              <div class="emphasis">
 
+                  <div class="emphasis-list" v-for="fp in followProject">
 
+                      <p class="emphasis-p">
 
+                          <span class="e-l-label">项目名称</span>
 
+                          <span class="e-l-value">${fp.projectname || '--'}</span>
 
+                      </p>
 
+                      <p class="emphasis-p">
 
+                          <span class="e-l-label">项目状态</span>
 
+                          <span class="e-l-value">${fp.bidstatus || '--'}</span>
 
+                      </p>
 
+                      <p class="emphasis-p">
 
+                          <span class="e-l-label">采购单位</span>
 
+                          <span class="e-l-value">${fp.buyer || '--'}</span>
 
+                      </p>
 
+                      <p class="emphasis-p">
 
+                          <span class="e-l-label">项目预算(万)</span>
 
+                          <span class="e-l-value">${fp.budget || '--'}</span>
 
+                      </p>
 
+                  </div>
 
+              </div>
 
+              <div class="mark-words" @click="goCollect('week_important_project')">实时跟踪关注项目的最新动态，不遗漏任何商机！<em class="mark-icon-right"></em></div>
 
+          </div>
 
+          <!-- 重点关注企业 -->
 
+          <div class="chart" v-if="showFollowEnt">
 
+              <div class="chart_title">重点关注企业</div>
 
+              <div class="emphasis">
 
+                  <div class="emphasis-list" v-for="fi in followEnt">
 
+                      <p class="emphasis-p">
 
+                          <span class="e-l-label">企业名称</span>
 
+                          <span class="e-l-value">${fi.entname || '--'}</span>
 
+                      </p>
 
+                      <p class="emphasis-p">
 
+                          <span class="e-l-label">注册省市</span>
 
+                          <span class="e-l-value">${fi.area || '--'} ${fi.city}</span>
 
+                      </p>
 
+                      <p class="emphasis-p">
 
+                          <span class="e-l-label">中标项目</span>
 
+                          <span class="e-l-value">${fi.projectname || '--'}</span>
 
+                      </p>
 
+                      <p class="emphasis-p">
 
+                          <span class="e-l-label">中标日期</span>
 
+                          <span class="e-l-value">${fi.jgtime || '--'}</span>
 
+                      </p>
 
+                      <p class="emphasis-p">
 
+                          <span class="e-l-label">中标金额(万)</span>
 
+                          <span class="e-l-value">${fi.bidamount || '--'}</span>
 
+                      </p>
 
+                  </div>
 
+              </div>
 
+              <div class="mark-words" @click="goCollect('week_important_ent')">动态跟踪关注企业的最新中标项目，实时监控友商！<em class="mark-icon-right"></em></div>
 
+          </div>
 
+        </div>
 
+        <van-tabs v-else v-model:active="tabActive" sticky>
 
           <van-tab name="0" title="本周分析">
 
+            <!-- 本周新增招标项目数量 -->
 
             <div class="chart" v-if="showCurWeekAdd">
 
                 <div class="chart_title">本周新增招标项目数量</div>
 
                 <div class="progress-bar-container">
 
@@ -325,7 +516,7 @@
 
             </div>
 
           </van-tab>
 
           <van-tab name="1" title="本周项目明细">
 
-            <filter-component :arealist="area" :keyphraseslist="keywordsList" keyformat="phrases" @confirm="confirm"></filter-component>
 
+            <filter-component :show-tip="false" :show-select="false" :arealist="area" :keyphraseslist="keywordsList" keyformat="phrases" @confirm="confirm"></filter-component>
 
             <div class="project-detail-list" v-if="Object.keys(projectInfo).length != 0 && projectInfo.list.length > 0">
 
               <project-header @setsort-type="setsortType"></project-header>
 
               <van-list

+ 1 - 1
src/jfw/modules/app/src/web/templates/weixin/historypush.html
View File 

@@ -297,7 +297,7 @@
 
         <!-- <div class="analysis-module"> -->
 
           <!-- 超前项目推荐 -->
 
           <!-- <recommend-com  ref="recommendRef"  @toggle="onToggleStatus"></recommend-com> -->
 
-          <!-- 定制化分析报告 -->
 
+          <!-- 市场分析报告 -->
 
           <!-- <div v-show="collapseStatus"> -->
 
             <!-- <CustomReport :chartData="chartData"></CustomReport> -->
 
           <!-- </div>

+ 1 - 1
src/jfw/modules/publicapply/src/userbase/bigmembermenu.json
View File 

@@ -98,7 +98,7 @@
 
 				"isusable":false
 
 			},
 
 			{
 
-				"name":"定制化分析报告",
 
+				"name":"市场分析报告",
 
 				"url":"/swordfish/page_big_pc/desktop/report_analysis",
 
 				"isusable":false
 
 			}

+ 1 - 1
src/jfw/modules/publicapply/src/userbase/commonfunctions.json
View File 

@@ -162,7 +162,7 @@
 
 			}
 
 		},
 
 		{
 
-			"name":"定制化分析报告",
 
+			"name":"市场分析报告",
 
 			"charge":true,
 
 			"pc":{
 
 				"url":"/swordfish/page_big_pc/desktop/report_analysis",

+ 1 - 1
src/web/staticres/big-member/js/meauContact.js
View File 

@@ -439,7 +439,7 @@ var SCFX = [
 
         ]
 
       },
 
       {
 
-        two:"定制化市场分析报告",
 
+        two:"市场分析报告",
 
         three:[
 
           {
 
             threein:"可自定义分析条件，包含：分析内容、时间、地区、行业和采购单位类型。",

+ 23 - 0
src/web/staticres/common-module/filter/css/filter_limit.css
View File 

@@ -0,0 +1,23 @@
 
+.search-filters .filters-title, .search-filters .filters-title{
 
+  background-color: #fff;
 
+}
 
+
 
+.search-filters .van-collapse-item__content{
 
+  padding: 0;
 
+}
 
+.search-filters .van-collapse-item__title .van-cell__title{
 
+  font-size: .36rem;
 
+  color: #171826;
 
+}
 
+.search-filters .no-show-select .van-cell__value{
 
+  color: #2ABED1;
 
+}
 
+
 
+.search-filters .van-collapse-item__content .van-cell .van-cell__title{
 
+  font-size: .32rem;
 
+  color: #171826;
 
+}
 
+
 
+.search-filters .van-collapse-item__content .van-cell .van-cell__value {
 
+  font-size: .28rem;
 
+}

+ 82 - 22
src/web/staticres/common-module/filter/js/filter_limit.js
View File 

@@ -1,22 +1,23 @@
 
 var filterTemp = `
 
-<div class="j-container search-filters">
 
-  <div class="j-main">
 
-      <div class="filters-title pd-lr16">
 
-          <span>{{title}}</span>
 
+<div class="search-filters">
 
+  <van-collapse v-model="activeNames">
 
+    <van-collapse-item :title="title" name="1">
 
+      <div class="j-main">
 
+        <van-cell-group class="filters-list">
 
+            <van-cell center :class="{'no-show-select': colorEdit.keys}"  v-if="filterAction.keyModule.isShow" :title="filterAction.keyModule.label" is-link value-class="ellipsis" :value="resolveSelected('keys')" @click="clickCell('keys')"></van-cell>
 
+            <van-cell center :class="{'no-show-select': colorEdit.area}" v-if="filterAction.areaModule.isShow" :title="filterAction.areaModule.label" is-link value-class="ellipsis" :value="resolveSelected('area')" @click="clickCell('area')"></van-cell>
 
+            <van-cell center :class="{'no-show-select': colorEdit.buyerclass}" v-if="filterAction.buyerModule.isShow" :title="filterAction.buyerModule.label" value-class="ellipsis" is-link :value="resolveSelected('buyerclass')" @click="clickCell('buyerclass')"></van-cell>
 
+            <van-cell center :class="{'no-show-select': colorEdit.industry}" v-if="filterAction.industryModule.isShow" :title="filterAction.industryModule.label" is-link value-class="ellipsis" :value="resolveSelected('industry')" @click="clickCell('industry')"></van-cell>
 
+            <van-field type="textarea" rows="1" autosize v-model="filters.winnerUnit" label="中标单位" placeholder="请输入中标单位"></van-field>
 
+            <van-field type="textarea" rows="1" autosize v-model="filters.buyerUnit" label="采购单位" placeholder="请输入采购单位"></van-field>
 
+        </van-cell-group>
 
       </div>
 
-      <van-cell-group class="filters-list">
 
-          <van-cell center v-if="filterAction.keyModule.isShow" :title="filterAction.keyModule.label" is-link value-class="ellipsis" :value="resolveSelected('keys')" @click="clickCell('keys')"></van-cell>
 
-          <van-cell center v-if="filterAction.areaModule.isShow" :title="filterAction.areaModule.label" is-link value-class="ellipsis" :value="resolveSelected('area')" @click="clickCell('area')"></van-cell>
 
-          <van-cell center v-if="filterAction.buyerModule.isShow" :title="filterAction.buyerModule.label" value-class="ellipsis" is-link :value="resolveSelected('buyerclass')" @click="clickCell('buyerclass')"></van-cell>
 
-          <van-cell center v-if="filterAction.industryModule.isShow" :title="filterAction.industryModule.label" is-link value-class="ellipsis" :value="resolveSelected('industry')" @click="clickCell('industry')"></van-cell>
 
-          <van-field type="textarea" rows="1" autosize v-model="filters.winnerUnit" label="中标单位" placeholder="请输入中标单位"></van-field>
 
-          <van-field type="textarea" rows="1" autosize v-model="filters.buyerUnit" label="采购单位" placeholder="请输入采购单位"></van-field>
 
-      </van-cell-group>
 
-  </div>
 
-  <div class="j-footer j-button-group">
 
-      <button class="j-button-cancel" @click="resetAllFilters">{{cancelText}}</button>
 
-      <button class="j-button-confirm" @click="startAnalysis">{{confirmText}}</button>
 
-  </div>
 
+      <div class="j-footer j-button-group">
 
+          <button class="j-button-cancel" @click="resetAllFilters">{{cancelText}}</button>
 
+          <button class="j-button-confirm" @click="startAnalysis">{{confirmText}}</button>
 
+      </div>
 
+    </van-collapse-item>
 
+  </van-collapse>
 
   <van-popup
 
   v-model="filterDialogShow.keys"
 
   closeable
 
@@ -32,9 +33,9 @@ var filterTemp = `
 
       <div class="popup-header">
 
           <div class="header-top">
 
               <div class="header-title">选择分析内容</div>
 
-              <div class="header-action" @click="toSubManageButtonClick">订阅管理</div>
 
+              <div v-if="showTip" class="header-action" @click="toSubManageButtonClick">订阅管理</div>
 
           </div>
 
-          <div class="header-bottom">注：如需新增分析内容，请完善您的订阅关键词</div>
 
+          <div v-if="showTip" class="header-bottom">注：如需新增分析内容，请完善您的订阅关键词</div>
 
       </div>
 
       <div class="j-main">
 
           <keyword-component
 
@@ -163,6 +164,33 @@ var filterComponent = {
 
       type: String,
 
       default: '确定'
 
     },
 
+    showTip: {
 
+      type: Boolean,
 
+      default: true
 
+    },
 
+    showSelect: {
 
+      type: Boolean,
 
+      default: true
 
+    },
 
+    // 筛选条件回显
 
+    filters: {
 
+      type: Object,
 
+      default () {
 
+        return {
 
+          selectKeysArr: [], // 关键词简单数组，用于恢复选择状态
 
+          keys: [], // 关键词详细数组，用于提交数据
 
+          area: {},
 
+          industry: [],
 
+          industryDetail: {},
 
+          buyerclass: [],
 
+          rangeTime: {
 
+            start: '',
 
+            end: '',
 
+            exact: 'sinceYearBeforeLast',
 
+          }
 
+        }
 
+      }
 
+    },
 
     filterAction: {
 
       type: Object,
 
       default () {
 
@@ -195,6 +223,24 @@ var filterComponent = {
 
       }
 
     }
 
   },
 
+  watch: {
 
+    'filters.industry': {
 
+      handler (newVal) {
 
+        if (!newVal.length) {
 
+          if (newVal && newVal !== '{}') {
 
+            var industry = []
 
+            for (var key in this.filters.industryDetail) {
 
+              this.filters.industryDetail[key].forEach(function (item) {
 
+                industry.push(key + '_' + item)
 
+              })
 
+            }
 
+            newVal = industry
 
+          }
 
+        }
 
+      },
 
+      immediate: true
 
+    }
 
+  },
 
   data () {
 
     return {
 
       filters: {
 
@@ -218,16 +264,26 @@ var filterComponent = {
 
         industry: false,
 
         buyerclass: false,
 
         rangeTime: false
 
+      },
 
+      activeNames: ['0'],
 
+      colorEdit: {
 
+        keys: false,
 
+        area: false,
 
+        industry: false,
 
+        buyerclass: false
 
       }
 
     }
 
   },
 
   mounted () {
 
-    this.$refs.areaCitySelector.getData(this.arealist)
 
+    if (Object.keys(this.arealist).length > 0) {
 
+      this.$refs.areaCitySelector.getData(this.arealist)
 
+    }
 
   },
 
   methods: {
 
     cancel: function (e, key) {
 
       var dialog = this.filterDialogShow
 
       this.resetFilter(key)
 
+      this.colorEdit[key] = false
 
       dialog[key] = false
 
     },
 
     confirm: function (e, key) {
 
@@ -245,6 +301,7 @@ var filterComponent = {
 
         filters.buyerclass = e.data
 
         console.log(e.data)
 
       } 
+      this.colorEdit[key] = true
 
       dialog[key] = false
 
     },
 
     showLoading: function () {
 
@@ -318,7 +375,11 @@ var filterComponent = {
 
       } else if (type === 'buyerclass') {
 
         text = this.resolveSelectBuyerclassText(filters.buyerclass)
 
       }
 
-      return prefix + text
 
+      if ((text != '全部' && text != '全国') && !this.showSelect) {
 
+        return text
 
+      } else {
 
+        return prefix + text
 
+      }
 
     },
 
     resolveSelectKeysText: function (keys) {
 
       if (Array.isArray(keys)) {
 
@@ -377,7 +438,6 @@ var filterComponent = {
 
       return buyerclass.join('，')
 
     },
 
     resetAllFilters: function () {
 
-      this.analysis.loaded = false
 
       this.resetFilter('all')
 
     },
 
     getSelectedKeys () {

+ 1 - 0
src/web/staticres/common-module/public/css/empty.css
View File 

@@ -7,6 +7,7 @@
 
   min-height: 6.4rem;
 
   padding: 16px;
 
   box-sizing: border-box;
 
+  background: #fff;
 
 }
 
 
 .empty-container .empty-content-position {

+ 16 - 0
src/web/staticres/common-module/report-analysis/css/report_analysis.css
View File 

@@ -582,3 +582,19 @@
 
   transform: translateX(-50%);
 
   background-color: #2ABDD1;
 
 }
 
+.add-pro-list-inlet {
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: space-between;
 
+}
 
+.add-pro-list-inlet .pro_list_inlet{
 
+  display: flex;
 
+  align-items: center;
 
+  font-size: .28rem;
 
+  color: #2ABDD1;
 
+}
 
+.pro_list_inlet>img{
 
+  width: .32rem;
 
+  height: .32rem;
 
+  margin-right: .08rem;
 
+}

BIN
src/web/staticres/common-module/report-analysis/image/icon/icon-infor-blue.png
View File


+ 9 - 2
src/web/staticres/common-module/report-analysis/js/report_analysis.js
View File 

@@ -25,7 +25,7 @@ var vm = new Vue({
 
     tabActiveName: 'analysis', // analysis/history
 
     tabList: [
 
       {
 
-        label: '定制化市场分析',
 
+        label: '市场分析报告',
 
         name: 'analysis'
 
       },
 
       {
 
@@ -331,13 +331,20 @@ var vm = new Vue({
 
     utils.iosBackRefresh()
 
   },
 
   methods: {
 
+    inProList () {
 
+      this.saveState()
 
+      if(utils.$envs.inWX){
 
+        window.location.href='/big/wx/page/report_analysis_pro_list?id=' + this.rid
 
+       } else {
 
+        window.location.href='/jyapp/big/page/report_analysis_pro_list?id=' + this.rid
 
+       }
 
+    },
 
     gotable () {
 
       this.saveState()
 
        if(utils.$envs.inWX){
 
         window.location.href='/big/wx/page/report_table?source=analysis'+'&flag=3'+'&rid='+this.rid+'&header=客户类型分布详情'
 
        } else {
 
         window.location.href='/jyapp/big/page/report_table?source=analysis'+'&flag=3'+'&rid='+this.rid+'&header=客户类型分布详情'
 
-
 
        }
 
 
     },

+ 1 - 1
src/web/staticres/common-module/report-analysis/js/report_analysis_history.js
View File 

@@ -9,7 +9,7 @@ var vm = new Vue({
 
     tabActiveName: 'history', // analysis/history
 
     tabList: [
 
       {
 
-        label: '定制化市场分析',
 
+        label: '市场分析报告',
 
         name: 'analysis'
 
       },
 
       {

+ 272 - 0
src/web/staticres/common-module/report-analysis/js/report_analysis_pro_list.js
View File 

@@ -0,0 +1,272 @@
 
+var vm = new Vue({
 
+  delimiters: ['${', '}'],
 
+  el: '#analysisList',
 
+  components: {
 
+    filterComponent: filterComponent,
 
+    projectHeader: projectHeaderComponent,
 
+    projectCell: projectCellComponent,
 
+    empty: emptyComponent
 
+  },
 
+  data: {
 
+    sessStorageKey: '$data-report_analysis_history',
 
+    vanlistParams: {
 
+      loading: false,
 
+      finished: false
 
+    },
 
+    filters: {
 
+      selectKeysArr: [], // 关键词简单数组，用于恢复选择状态
 
+      keys: [], // 关键词详细数组，用于提交数据
 
+      area: {},
 
+      industry: [],
 
+      industryDetail: {},
 
+      buyerclass: [],
 
+      rangeTime: {
 
+        start: '',
 
+        end: '',
 
+        exact: 'sinceYearBeforeLast',
 
+      },
 
+    },
 
+    listParams: {
 
+      sortType: 0, // 项目明细排序方式
 
+      pageSize: 10,
 
+      pageNum: 1
 
+    },
 
+    filterData: {},
 
+    projectInfo: {}
 
+  },
 
+  computed: {
 
+  },
 
+  created: function () {
 
+    this.getFilterData()
 
+  },
 
+  mounted: function () {
 
+    this.reStoreState()
 
+    utils.iosBackRefresh()
 
+  },
 
+  methods: {
 
+    // 获取筛选条件并回显
 
+    getFilterData () {
 
+      $.ajax({
 
+        type:'POST',
 
+        url: '/bigmember/marketAnalysis/getAnalysisResult',
 
+        data: {
 
+          rid: utils.getParam('id'),
 
+          flag: 0
 
+        },
 
+        success: function(res) {
 
+          if (res.error_code === 0) {
 
+            this.sortReportFilters(res.data)
 
+          } else {
 
+            this.$toast(res.error_msg)
 
+          }
 
+        }.bind(this)
 
+      })
 
+    },
 
+    // 整理数据，并赋值给filters
 
+    sortReportFilters (data) {
 
+      if (data.keysItems && data.keysItems !== '[]') {
 
+        this.filters.keys = JSON.parse(data.keysItems)
 
+        var keyArr = []
 
+        this.filters.keys.forEach(function (classify) {
 
+          if(Array.isArray(classify.a_key)) {
 
+            classify.a_key.forEach(function (item) {
 
+              keyArr.push(item.key.join(' '))
 
+            })
 
+          }
 
+        })
 
+        this.filters.selectKeysArr = keyArr
 
+      }
 
+      if (data.rangeTime) {
 
+        var arr = data.rangeTime.split('-')
 
+        this.filters.rangeTime.start = arr[0] * 1000
 
+        this.filters.rangeTime.end = arr[1] * 1000
 
+        if (this.filters.rangeTime.exact === 'exact') {
 
+          var date = new Date(this.filters.rangeTime.end)
 
+          var timeString = date.pattern('yyyy/MM/dd')
 
+          this.filters.rangeTime.end = new Date(timeString).getTime()
 
+        }
 
+      }
 
+      if (data.area && data.area !== '{}') {
 
+        this.filters.area = JSON.parse(data.area)
 
+      }
 
+      if (data.industry && data.industry !== '{}') {
 
+        this.$set(this.filters, 'industryDetail', JSON.parse(data.industry))
 
+        var industry = []
 
+        for (var key in this.filters.industryDetail) {
 
+          this.filters.industryDetail[key].forEach(function (item) {
 
+            industry.push(key + '_' + item)
 
+          })
 
+        }
 
+        this.filters.industry = industry
 
+      }
 
+      if (data.buyerclass) {
 
+        this.filters.buyerclass = data.buyerclass.split(',')
 
+      }
 
+    },
 
+    // 点击项目
 
+    setLinkUrl () {
 
+      location.href = '/jyapp/big/page/pro_follow_detail'
 
+    },
 
+    setBuyerLink (data) {
 
+      location.href = '/jyapp/big/page/unit_portrayal?entName=' + data.buyer
 
+    },
 
+    setWinnerLink (id) {
 
+      location.href = '/jyapp/big/page/ent_portrait?eId=' + id
 
+    },
 
+    // 设置排序方式
 
+    setsortType (data) {
 
+      this.sortType = data
 
+    },
 
+    onListLoad: function () {
 
+      this.listParams.pageNum++
 
+      this.vanlistParams.loading = true
 
+      this.confirm(this.filterData)
 
+    },
 
+    // 查询项目明细
 
+    confirm (data) {
 
+      this.filterData = data
 
+      const { items, area, industry, buyerclass, buyer, winner } = data
 
+      this.filters.keys = items
 
+      this.filters.area = area
 
+      this.filters.industry = industry
 
+      this.filters.buyerclass = buyerclass
 
+      this.filters.buyer = buyer
 
+      this.filters.winner = winner
 
+      const params = {
 
+        ...this.listParams,
 
+        keysItems: JSON.stringify(items),
 
+        area: JSON.stringify(area),
 
+        industry: JSON.stringify(industry),
 
+        buyerclass: JSON.stringify(buyerclass),
 
+        buyer: buyer,
 
+        winner: winner,
 
+        sort: this.listParams.sortType,
 
+        rangeTime: parseInt(this.filters.rangeTime.start / 1000)+'-'+parseInt(this.filters.rangeTime.end / 1000),
 
+        rangeTimeExtra: this.filters.rangeTimeExtra
 
+      }
 
+      this.getProjectInfo(params)
 
+    },
 
+    getProjectInfo: function (params) {
 
+      const loading = this.showLoading()
 
+      $.ajax({
 
+        type: 'POST',
 
+        url: '/bigmember/marketAnalysis/projectInfo',
 
+        data: params,
 
+        // contentType: 'application/json',
 
+        success: function(res) {
 
+          this.vanlistParams.loading = false
 
+          if (res && res.error_code === 0 && res.data) {
 
+            if (this.listParams.pageNum === 1) {
 
+              this.projectInfo = res.data
 
+            } else {
 
+              this.projectInfo.list = this.projectInfo.list.concat(res.data.list)
 
+            }
 
+            res.data.total = res.data.total > 5000 ? 5000 : res.data.total
 
+            const pageTotalNum = res.data.total / this.listParams.pageSize
 
+            const pageResidue = res.data.total % this.listParams.pageSize
 
+            if (pageResidue > 0) {
 
+              if (this.listParams.pageNum > pageTotalNum) {
 
+                this.vanlistParams.finished = true
 
+              } else {
 
+                this.vanlistParams.finished = false
 
+              }
 
+            } else {
 
+              if (this.listParams.pageNum >= pageTotalNum) {
 
+                this.vanlistParams.finished = true
 
+              } else {
 
+                this.vanlistParams.finished = false
 
+              }
 
+            }
 
+          } else {
 
+            this.$toast(res.error_msg)
 
+          }
 
+          if(loading) {
 
+            loading.clear()
 
+          }
 
+        }.bind(this)
 
+      })
 
+    },
 
+    showLoading: function () {
 
+      return this.$toast.loading({
 
+        duration: 0,
 
+        forbidClick: true,
 
+        message: 'loading...',
 
+      })
 
+    },
 
+    showToast: function (message) {
 
+      return this.$toast({
 
+        duration: 1500,
 
+        forbidClick: true,
 
+        message: message,
 
+      })
 
+    },
 
+    showDialog: function (conf) {
 
+      var defaultConf = {
 
+        title: '提示',
 
+        message: 'message',
 
+        className: 'j-confirm-dialog',
 
+        showConfirmButton: true,
 
+        showCancelButton: true,
 
+        confirmButtonText: '确定',
 
+        confirmButtonColor: '#2abed1'
 
+      }
 
+      if (conf) {
 
+        Object.assign(defaultConf, conf)
 
+      }
 
+      return this.$dialog.confirm(defaultConf)
 
+    },
 
+    setScrollTop: function (scrollTop) {
 
+      this.$nextTick(function () {
 
+        var wrapper = document.querySelector('.van-tabs__content')
 
+        wrapper.scrollTop = scrollTop
 
+      })
 
+    },
 
+    saveScrollTop: function () {
 
+      var wrapper = document.querySelector('.van-tabs__content')
 
+      if (wrapper.scrollTop) {
 
+        this.historyPageState.listState.scrollTop = parseInt(wrapper.scrollTop)
 
+      }
 
+    },
 
+    // 重置列表数据
 
+    resetHistoryState: function () {
 
+      var rState = {
 
+        refreshing: false,
 
+        loaded: false,
 
+        loading: false,
 
+        finished: false,
 
+        pageNum: 1,
 
+        pageSize: 10,
 
+        list: []
 
+      }
 
+
 
+      this.historyPageState.scrollTop = 0
 
+      Object.assign(this.historyPageState.listState, rState)
 
+    },
 
+    // 保存页面状态
 
+    saveState: function () {
 
+      this.saveScrollTop()
 
+      var $data = {
 
+        historyPageState: this.historyPageState
 
+      }
 
+      sessionStorage.setItem(this.sessStorageKey, JSON.stringify($data))
 
+    },
 
+    reStoreState: function () {
 
+      var $data = sessionStorage.getItem(this.sessStorageKey)
 
+      if ($data) {
 
+        $data = JSON.parse($data)
 
+        Object.assign(this.historyPageState, $data.historyPageState)
 
+
 
+        if (this.tabActiveName === 'history') {
 
+          setTimeout(function () {
 
+            // 恢复滚动高度
 
+            this.setScrollTop(this.historyPageState.scrollTop)
 
+          }.bind(this), 0)
 
+        }
 
+
 
+        sessionStorage.removeItem(this.sessStorageKey)
 
+      }
 
+
 
+      return $data
 
+    }
 
+  }
 
+})

File diff suppressed because it is too large
+ 0 - 0
src/web/templates/big-member/wx/page_index.html


+ 1 - 1
src/web/templates/big-member/wx/page_report_analysis.html
View File 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <html lang="zh-CN" style="font-size: 50px;">
 
 <head>
 
-    <title>定制化市场分析报告 </title>
 
+    <title>市场分析报告 </title>
 
     <meta charset="UTF-8">
 
     <meta name="viewport"
 
         content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />

+ 1 - 1
src/web/templates/big-member/wx/page_report_analysis_history.html
View File 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <html lang="zh-CN" style="font-size: 50px;">
 
 <head>
 
-    <title>定制化市场分析报告 </title>
 
+    <title>市场分析报告 </title>
 
     <meta charset="UTF-8">
 
     <meta name="viewport"
 
         content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />

+ 1 - 1
src/web/templates/frontRouter/pc/serviceSystem/free/index.html
View File 

@@ -1941,7 +1941,7 @@
 
                                 <div class="table_content_r_item cell_wite">
 
                                     <div class="table_content_longcell">
 
                                         <p class="tit">
 
-                                            定制化市场分析报告，精准分析客户、竞对、市场
 
+                                            市场分析报告，精准分析客户、竞对、市场
 
                                         </p>
 
                                         <p class="text">
 
                                             自定义分析范围（分析内容、区域、行业、采购单位类型、时间），对市场规模、采购单位、中标单位进行分析，包含细分业务市场的项目数量、金额分布情况、以及各细分业务市场的重点中标单位中标数量明细等。

+ 12 - 12
src/web/templates/pc/supsearch.html
View File 

@@ -1172,7 +1172,7 @@
 
         <i class="icon-arrow"></i>
 
       </div>
 
     </div>
 
-    <!-- 超前项目推荐&&定制化分析报告 -->
 
+    <!-- 超前项目推荐&&市场分析报告 -->
 
     <div id="jyChartCom" class="w">
 
       <div class="advanced-pro-rec" v-show="advancedInfo.show">
 
         <div class="p-lr-32">
 
@@ -1187,8 +1187,8 @@
 
               </div>
 
             </div>
 
             <div class="c-a-r-option">
 
-              <div v-if="nowModuleName === '定制化分析报告'" class="c-view-report c-view-common" @click="goToReport">查看完整报告</div>
 
-              <div class="c-view-interest c-view-common" @click="onClickInterested(nowModuleName === '定制化分析报告' ? 'B' : 'A')">感兴趣点我</div>
 
+              <div v-if="nowModuleName === '市场分析报告'" class="c-view-report c-view-common" @click="goToReport">查看完整报告</div>
 
+              <div class="c-view-interest c-view-common" @click="onClickInterested(nowModuleName === '市场分析报告' ? 'B' : 'A')">感兴趣点我</div>
 
               <div class="c-up-or-down" @click="toggleAdvancedContent()">
 
                 <el-button type="text">
 
                   ${ advancedInfo.showContent ? '收起' : '展开'}
 
@@ -1217,12 +1217,12 @@
 
                 </div>
 
               </div>
 
             </div>
 
-            <!-- 定制化分析报告 -->
 
-            <!-- 定制化分析报告 -->
 
+            <!-- 市场分析报告 -->
 
+            <!-- 市场分析报告 -->
 
             <div class="custom-analysis-report">
 
               <div class="c-a-r-top" v-if="nowModuleName === '超前项目推荐'">
 
                 <div class="c-a-r-title">
 
-                  <div class="r-title-text">定制化分析报告</div>
 
+                  <div class="r-title-text">市场分析报告</div>
 
                   <div class="r-title-tip">
 
                     量身定制个性化报告，分析市场竞争格局，为企业找准市场机会！
 
                   </div>
 
@@ -2591,8 +2591,8 @@ function checkTagDisabled () {
 
               title: '超前项目推荐',
 
               desc: '提前推送超前项目，优先对接项目负责人'
 
             },
 
-            定制化分析报告: {
 
-              title: '定制化分析报告',
 
+            市场分析报告: {
 
+              title: '市场分析报告',
 
               desc: '量身定制个性化报告，分析市场竞争格局，为企业找准市场机会！'
 
             }
 
           },
 
@@ -2619,7 +2619,7 @@ function checkTagDisabled () {
 
         if (this.advancedInfo.briefList.length || this.advancedInfo.projectList.length) {
 
           return '超前项目推荐'
 
         } else {
 
-          return '定制化分析报告'
 
+          return '市场分析报告'
 
         }
 
       },
 
       // 保存显示排除词
 
@@ -2638,7 +2638,7 @@ function checkTagDisabled () {
 
           return true
 
         }
 
       },
 
-      // 是否展示定制化分析报告模块
 
+      // 是否展示市场分析报告模块
 
       getShowChart () {
 
         return Object.keys(this.chartCustomData).length
 
       },
 
@@ -2793,7 +2793,7 @@ function checkTagDisabled () {
 
       getInterested () {
 
         vm.isNeedSubmit('pc_search_dzhfxbg')
 
       },
 
-      // 定制化分析报告&&超前项目推荐数据请求
 
+      // 市场分析报告&&超前项目推荐数据请求
 
       getCustomReportData () {
 
         $('#customerChart').hide()
 
         $('#winnerChart').hide()
 
@@ -2818,7 +2818,7 @@ function checkTagDisabled () {
 
                   })
 
                   _this.advancedInfo.projectList = res.data.ahead.projectTop2 || []
 
                 }
 
-                //定制化分析报告
 
+                //市场分析报告
 
                 _this.chartCustomData = res.data.custom || {}
 
                 if (_this.advancedInfo.briefList.length || _this.advancedInfo.projectList.length || Object.keys(_this.chartCustomData).length) {
 
                   _this.advancedInfo.show = true

+ 1 - 1
src/web/templates/weixin/historypush.html
View File 

@@ -305,7 +305,7 @@
 
     <!-- <div class="analysis-module"> -->
 
       <!-- 超前项目推荐 -->
 
       <!-- <recommend-com  ref="recommendRef"  @toggle="onToggleStatus"></recommend-com> -->
 
-      <!-- 定制化分析报告 -->
 
+      <!-- 市场分析报告 -->
 
       <!-- <div v-show="collapseStatus"> -->
 
         <!-- <CustomReport :chartData="chartData"></CustomReport> -->
 
       <!-- </div>

Some files were not shown because too many files changed in this diff