Przeglądaj źródła

Merge branch 'dev4.6.2.1' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.1

熊啸云 3 lat temu
rodzic
commit
49557443e1
21 zmienionych plików z 1266 dodań i 1151 usunięć
  1. 20 0
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/analysis_result.css
  2. 1 1
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/unit_portrayal.css
  3. 40 9
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js
  4. 14 16
      src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js
  5. 3 3
      src/jfw/modules/app/src/web/templates/big-member/page_analysis_result.html
  6. 4 0
      src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html
  7. 3 3
      src/jfw/modules/app/src/web/templates/big-member/page_unit_portrayal.html
  8. 1 1
      src/jfw/modules/bigmember/src/entity/portrait.go
  9. 1 1
      src/jfw/modules/bigmember/src/entity/portraitBuyerSearch.go
  10. 1 1
      src/jfw/modules/bigmember/src/entity/portraitWinnerSearch.go
  11. 30 32
      src/jfw/modules/bigmember/src/entity/portrait_screen.go
  12. 2 4
      src/jfw/modules/bigmember/src/service/portrait/memberPortraitAction.go
  13. 4 1
      src/jfw/modules/publicapply/src/subscribe/entity/entity.go
  14. 1 1
      src/web/staticres/big-member/css/unit_portrayal.css
  15. 14 16
      src/web/staticres/big-member/js/unit_portrayal.js
  16. 6 6
      src/web/staticres/common-module/big-member/js/ent_project_news.js
  17. 23 1
      src/web/staticres/common-module/collection/css/index.css
  18. 1087 1048
      src/web/staticres/common-module/collection/js/ent_portrait.js
  19. 2 2
      src/web/templates/big-member/wx/page_free_ent_project_news.html
  20. 3 3
      src/web/templates/big-member/wx/page_unit_portrayal.html
  21. 6 2
      src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

+ 20 - 0
src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/analysis_result.css

@@ -574,4 +574,24 @@
   font-size: .3rem;
   color: #5f5e64;
   margin-right: 0;
+}
+.jy-empty{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin: 0 auto;
+  width: 5rem;
+  text-align: center;
+}
+.jy-empty-img{
+  width: 4rem;
+  height: 4rem;
+  background: url('/common-module/public/image/jy-chagrin.png') no-repeat center center;
+  background-size: contain;
+}
+.jy-empty-text{
+  font-size: .26rem;
+  color: #9B9BA3!important;
+  line-height: .4rem;
+  padding-bottom: .24rem;
 }

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/unit_portrayal.css

@@ -528,4 +528,4 @@
     height: 100%;
     background: linear-gradient(270deg, #2ABED1 0.81%, #8DE0EB 100%);
     border-radius: 0 .28rem .28rem 0;
-}
+}

+ 40 - 9
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -123,7 +123,16 @@ var vNode = {
         visited: false // 是否查看中标信息
       },
       portrait: 'winner',
-      showBaseInfo: false
+      showBaseInfo: false,
+      show: {
+        yearData: true,
+        monthData: true,
+        areaData: true,
+        rate: true,
+        top10: true,
+        topShow: true,
+        dt: true
+      }
     }
   },
   created: function () {
@@ -193,14 +202,6 @@ var vNode = {
                         _this.gotTab2 = true
                         console.log('获取企业中标动态...')
                     }
-                    // if(_this.powerInfo.memberStatus <= 0) {
-                    //     // 不是大会员点击中标信息使用次数加一
-                    //     // if(!_this.entvisit.visited) {
-                    //     //     _this.entvisit.usage++
-                    //     //     _this.entvisit.visited = true
-                    //     // }
-                    // }
-                    // _this.gotTab2 = true
                 }
             });
         }
@@ -239,6 +240,17 @@ var vNode = {
     },
     isMemberAndSvip: function () {
       return this.powerInfo.memberStatus > 0 || this.powerInfo.vipStatus > 0
+    },
+    allNot: function() {
+      var data = this.show
+      var arr = []
+      for (var key in data) {
+        arr.push(data[key])
+      }
+      var isShow = arr.some(function(item) {
+        return item
+      })
+      return !isShow
     }
   },
   methods: {
@@ -448,6 +460,10 @@ var vNode = {
           if (res.error_code == 0) {
             _this.loading.clear()
             _this.topProject.count = res.data.count
+            if (!res.data.list || res.data.list.length == 0) {
+              // 新加变量 判断中标动态有无数据 用于展示缺省页组件
+              _this.show.dt = false
+            }
             if (res.data.list && $.isArray(res.data.list)) {
               _this.singleTab = false
               _this.topProject.list = res.data.list
@@ -854,6 +870,8 @@ var vNode = {
       // 数据总量为0,不赋值
       if (count != 0) {
         this.annualData.rows = rows;
+      } else {
+        this.show.yearData = false
       }
     },
     // 整理月度项目统计数据
@@ -899,6 +917,8 @@ var vNode = {
       if (count != 0 && maxNum !== 0) {
         this.monthZbData.columns = columns;
         this.monthZbData.rows = rows;
+      } else {
+        this.show.monthData = false
       }
     },
     // 整理主要市场分布(中国地图)数据
@@ -922,6 +942,8 @@ var vNode = {
       // 数据总量为0,不赋值
       if (count != 0) {
         this.mapChartData.rows = mapRows;
+      } else {
+        this.show.areaData = false
       }
     },
     // 整理平均折扣率数据
@@ -958,11 +980,17 @@ var vNode = {
       if (count != 0) {
         this.rateData.columns = columns;
         this.rateData.rows = rows;
+      } else {
+        this.show.rate = false
       }
     },
     // 初始化饼图
     initPieChartData: function (d) {
       if (!d) return
+      if (d && d.length == 0) {
+        // 新增变量 用于判断是否展示缺省页
+        this.show.top10 = false
+      }
       var that = this
       var arr = []
       var data = JSON.parse(JSON.stringify(d))
@@ -1010,6 +1038,9 @@ var vNode = {
     // 整理重要客户数据
     arrangeImportantData: function (data) {
       if (!data) return
+      if (data && data.length == 0) {
+        this.show.topShow = false
+      }
       var arr = []
       if ($.isArray(data)) {
         data.forEach(function (list) {

+ 14 - 16
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js

@@ -122,7 +122,6 @@ var vNode = {
     },
     computed: {
         allNot: function() {
-            var storageSet = JSON.parse(sessionStorage.getItem('buyer_high_set'))
             var show_1 = this.isShow.showDynamic;
             var show_2 = this.isShow.showYearData;
             var show_3 = this.isShow.showMonthScale;
@@ -135,7 +134,7 @@ var vNode = {
             var show_10 = this.isShow.showAge;
             var show_11 = this.isShow.showArea;
             var show_12 = this.isShow.showAgency;
-            if(!show_1 && !show_2 && !show_3 && !show_4 && !show_5 && !show_6 && !show_7 && !show_8 && !show_9 && !show_10 && !show_11 && !show_12 && this.power.indexOf(5) > -1 && storageSet) {
+            if(!show_1 && !show_2 && !show_3 && !show_4 && !show_5 && !show_6 && !show_7 && !show_8 && !show_9 && !show_10 && !show_11 && !show_12 && this.power.indexOf(5) > -1) {
                 return true;
             } else {
                 return false;
@@ -194,7 +193,6 @@ var vNode = {
               type: 'POST',
               url: '/bigmember/use/isAdd?t=' + Date.now(),
               success: function (res) {
-                  _this.chartLoading = false
                   if (res.data) {
                     _this.power = res.data.power
                     _this.bigStatus = res.data.memberStatus
@@ -373,7 +371,6 @@ var vNode = {
         // 获取采购单位画像所有数据
         getChartData: function() {
           var that = this;
-          that.chartLoading = true
           var storageSet = JSON.parse(sessionStorage.getItem('buyer_high_set'))
           var data = {
             buyer: decodeURIComponent(utils.getParam('entName'))
@@ -1275,18 +1272,19 @@ var vNode = {
             return maxIndex
         },
         goHighSet: function() {
-          if (!this.getStatus) {
-            location.href = './free_high_set?header=采购单位高级分析设置&entName=' + decodeURIComponent(utils.getParam('entName'))
-          } else {
-            this.$dialog.confirm({
-              className:'promatch',
-              title: '您暂无使用权限',
-              message: '您未购买此服务,如需使用请联系您的销售人员或客服升级套餐,谢谢!',
-              showCancelButton: false,
-              confirmButtonColor: '#2cb7ca',
-              confirmButtonText: '我知道了'
-            }).then(function () {})
-          }
+          location.href = './free_high_set?header=采购单位高级分析设置&entName=' + decodeURIComponent(utils.getParam('entName'))
+          // if (!this.getStatus) {
+          //   location.href = './free_high_set?header=采购单位高级分析设置&entName=' + decodeURIComponent(utils.getParam('entName'))
+          // } else {
+          //   this.$dialog.confirm({
+          //     className:'promatch',
+          //     title: '您暂无使用权限',
+          //     message: '您未购买此服务,如需使用请联系您的销售人员或客服升级套餐,谢谢!',
+          //     showCancelButton: false,
+          //     confirmButtonColor: '#2cb7ca',
+          //     confirmButtonText: '我知道了'
+          //   }).then(function () {})
+          // }
         }
     }
 }

+ 3 - 3
src/jfw/modules/app/src/web/templates/big-member/page_analysis_result.html

@@ -285,9 +285,9 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="empty" v-else>
-                                    <div class="j-img img-empty empty-img"></div>
-                                    <p class="empty-text" style="padding-bottom: 0.32rem;">暂无明细</p>
+                                <div class="jy-empty" v-else>
+                                    <div class="jy-empty-img"></div>
+                                    <p class="jy-empty-text" style="padding-bottom: 0.32rem;">暂无明细</p>
                                 </div>
                             </div>
                         </van-tab>

+ 4 - 0
src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html

@@ -257,6 +257,10 @@
                 : '至今'}</span>
             </div>
           </div>
+          <div class="jy-empty" v-show="allNot">
+            <div class="jy-empty-img"></div>
+            <p class="jy-empty-text">对不起,没有匹配到相关信息, <br>修改时间范围或换个搜索词试试吧</p>
+          </div>
           <div class="vip_component" v-if="getStatus"
             style="height:2.12rem;background:url('/common-module/collection/image/bg/vip_bg_0.png') no-repeat;background-size:100% 100%">
           </div>

+ 3 - 3
src/jfw/modules/app/src/web/templates/big-member/page_unit_portrayal.html

@@ -123,9 +123,9 @@
               </div>
               <div class="static-scope">数据统计范围:${statistics.start || '-'}-${statistics.end}</div>
             </div>
-            <div class="empty" v-show="allNot">
-                <div class="j-img img-empty empty-img"></div>
-                <p class="empty-text">暂无画像信息</p>
+            <div class="jy-empty" v-show="allNot">
+                <div class="jy-empty-img"></div>
+                <p class="jy-empty-text">对不起,没有匹配到相关信息, <br>修改时间范围或换个搜索词试试吧</p>
             </div>
             <!-- 招标动态 -->
             <div class="dynamic" v-if="isShow.showDynamic">

+ 1 - 1
src/jfw/modules/bigmember/src/entity/portrait.go

@@ -237,7 +237,7 @@ func (this *Portrait) BuyerPortraitData(screen *PortraitScreen, flag string) (ma
 		return nil, errors.New("企业名称异常")
 	}
 	buyerPortraitData := map[string]interface{}{}
-	if !screen.HasPower || screen.IsEmptySearch() { //空查询读缓存
+	if screen.IsEmptySearch() { //空查询读缓存
 		buyerPortraitData = TryFunc(GetPortraitCache, screen.Ent, "buyer", 2)
 	} else {
 		Screen_Thread <- true

+ 1 - 1
src/jfw/modules/bigmember/src/entity/portraitBuyerSearch.go

@@ -73,7 +73,7 @@ func GetBuyerPortraitData(screen *PortraitScreen) (map[string]interface{}, error
 func BuyerPortraitSearch(screen *PortraitScreen) (map[string]interface{}, error) {
 	defer qutil.Catch()
 
-	startTime, endTime := screen.PareTimeSelect()
+	startTime, endTime := screen.PareTimeSelect(false)
 	bidamountTimeRange := getBidamountStatistics(startTime, endTime)
 	comminTimeRange := getCommonYearStatistics(startTime, endTime)
 

+ 1 - 1
src/jfw/modules/bigmember/src/entity/portraitWinnerSearch.go

@@ -106,7 +106,7 @@ func GetProjectContactsMsg(buyerName, entId string) (list []map[string]interface
 func GetWinnerPortraitSearch(screen *PortraitScreen) (map[string]interface{}, error) {
 	defer qutil.Catch()
 
-	startTime, endTime := screen.PareTimeSelect()
+	startTime, endTime := screen.PareTimeSelect(true)
 
 	bidamountTimeRange := getBidamountStatistics(startTime, endTime)
 	comminTimeRange := getCommonYearStatistics(startTime, endTime)

+ 30 - 32
src/jfw/modules/bigmember/src/entity/portrait_screen.go

@@ -100,11 +100,12 @@ func (ps *PortraitScreen) PareMatchType(isBidding ...bool) (items []string) {
 }
 
 //PareTimeSelect 格式筛选时间,默认2年
-func (ps *PortraitScreen) PareTimeSelect() (st, et time.Time) {
+func (ps *PortraitScreen) PareTimeSelect(checkPower bool) (st, et time.Time) {
 	now := time.Now()
 	sYear := now.Year() - 4
 	eYear := now.Year()
-	if yearArr := strings.Split(ps.TimeRange, "_"); ps.HasPower && len(yearArr) == 2 {
+	//需要校验权限时 无权限默认查询两年
+	if yearArr := strings.Split(ps.TimeRange, "_"); (!checkPower || ps.HasPower) && len(yearArr) == 2 {
 		if tYear := qutil.IntAll(yearArr[0]); tYear > sYear { //选择开始时间不得早于4年
 			sYear = tYear
 		}
@@ -191,7 +192,7 @@ func (pwp *PortraitProjectScreen) GetWinnerList() (list []map[string]interface{}
 		}
 	}
 	//按照当前年份,往前推4年,共5个年份可选
-	sTime, eTime := pwp.Screen.PareTimeSelect()
+	sTime, eTime := pwp.Screen.PareTimeSelect(true)
 	mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"range":{"publishtime":{"gte":"%d","lte":"%d"}}}`, sTime.Unix(), eTime.Unix()))
 
 	//地区多选,选项:全部(初始值)、项目地区(省、直辖市)
@@ -271,42 +272,39 @@ func (pwp *PortraitProjectScreen) GetBuyerList() (list []map[string]interface{},
 
 	mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"term":{"buyer":"%s"}}`, pwp.Screen.Ent))
 
-	sTime, eTime := pwp.Screen.PareTimeSelect()
+	sTime, eTime := pwp.Screen.PareTimeSelect(false)
 	mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"range":{"firsttime":{"gte":"%d","lte":"%d"}}}`, sTime.Unix(), eTime.Unix()))
-	if pwp.Screen.HasPower {
-		//文本输入框,字数限制50个字,超过上限不再允许输入内容
-		if pwp.Screen.Match != "" {
-			if pareWord := pwp.Screen.PareMatchWord(); pareWord != "" {
-				findFields := fmt.Sprintf(`"%s"`, strings.Join(pwp.Screen.PareMatchType(false), "\",\""))
-				var keywordArr []string
-				for _, keyword := range strings.Split(pareWord, " ") {
-					if keyword == "" {
-						continue
-					}
-					keywordArr = append(keywordArr, fmt.Sprintf(multi_match, keyword, findFields))
-				}
-				if pwp.Screen.ExactMatch { //精确匹配(必须包含每个关键词)
-					mustQueryArr = append(mustQueryArr, fmt.Sprintf(must_match, strings.Join(keywordArr, ",")))
-				} else { //模糊匹配(只需包含一个关键词)
-					mustQueryArr = append(mustQueryArr, fmt.Sprintf(should_match, strings.Join(keywordArr, ",")))
+
+	//文本输入框,字数限制50个字,超过上限不再允许输入内容
+	if pwp.Screen.Match != "" {
+		if pareWord := pwp.Screen.PareMatchWord(); pareWord != "" {
+			findFields := fmt.Sprintf(`"%s"`, strings.Join(pwp.Screen.PareMatchType(false), "\",\""))
+			var keywordArr []string
+			for _, keyword := range strings.Split(pareWord, " ") {
+				if keyword == "" {
+					continue
 				}
+				keywordArr = append(keywordArr, fmt.Sprintf(multi_match, keyword, findFields))
+			}
+			if pwp.Screen.ExactMatch { //精确匹配(必须包含每个关键词)
+				mustQueryArr = append(mustQueryArr, fmt.Sprintf(must_match, strings.Join(keywordArr, ",")))
+			} else { //模糊匹配(只需包含一个关键词)
+				mustQueryArr = append(mustQueryArr, fmt.Sprintf(should_match, strings.Join(keywordArr, ",")))
 			}
 		}
+	}
 
-		//按照当前年份,往前推4年,共5个年份可选
-		sTime, eTime := pwp.Screen.PareTimeSelect()
-		mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"range":{"firsttime":{"gte":"%d","lte":"%d"}}}`, sTime.Unix(), eTime.Unix()))
-
-		//地区多选,选项:全部(初始值)、项目地区(省、直辖市)
-		if pwp.Screen.Area != "" {
-			mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"area":["%s"]}}`, strings.ReplaceAll(pwp.Screen.Area, ",", "\",\"")))
-		}
+	//地区多选,选项:全部(初始值)、项目地区(省、直辖市)
+	if pwp.Screen.Area != "" {
+		mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"area":["%s"]}}`, strings.ReplaceAll(pwp.Screen.Area, ",", "\",\"")))
+	}
 
-		//行业多选
-		if pwp.Screen.ScopeClass != "" {
-			mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"s_subscopeclass":["%s"]}}`, strings.ReplaceAll(pwp.Screen.ScopeClass, ",", "\",\"")))
-		}
+	//行业多选
+	if pwp.Screen.ScopeClass != "" {
+		mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"s_subscopeclass":["%s"]}}`, strings.ReplaceAll(pwp.Screen.ScopeClass, ",", "\",\"")))
+	}
 
+	if pwp.Screen.HasPower {
 		pwp.PageNum = qutil.If(pwp.PageNum == 0, 1, pwp.PageNum).(int)     //默认第一页
 		pwp.PageSize = qutil.If(pwp.PageSize == 0, 10, pwp.PageSize).(int) //默认每页10条
 	} else { //免费用户可以查看三条

+ 2 - 4
src/jfw/modules/bigmember/src/service/portrait/memberPortraitAction.go

@@ -209,6 +209,7 @@ func (this *EntPortrait) WinnerMiniPortrait() {
 }
 
 //BuyerSelects 采购单位画像可供筛选的条件
+//dev.6.2.1免费用户可筛选画像
 func (this *EntPortrait) BuyerSelects() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	rData, errMsg := func() (interface{}, error) {
@@ -216,13 +217,10 @@ func (this *EntPortrait) BuyerSelects() {
 		if buyer == "" {
 			return nil, fmt.Errorf("企业参数异常")
 		}
-		_, hasPower, err := entity.CreatePortraitManager(userId, "buyerPortrait")
+		_, _, err := entity.CreatePortraitManager(userId, "buyerPortrait")
 		if err != nil {
 			return nil, err
 		}
-		if !hasPower {
-			return nil, fmt.Errorf("非法请求")
-		}
 		pwp := &entity.PortraitScreen{Ent: buyer}
 		return pwp.GetProjectSelectItems(false)
 	}()

+ 4 - 1
src/jfw/modules/publicapply/src/subscribe/entity/entity.go

@@ -76,6 +76,7 @@ type UserSubMsg struct {
 	Matchway    int                    `json:"imatchway"`   //关键词匹配方式
 	Keys        []ViewKeyWord          `json:"keys"`        //关键词
 	Areanum     int                    `json:"areanum"`     //可修改地区次数
+	Basenum     int                    `json:"basenum"`     //基础修改次数
 	Provincenum int                    `json:"provincenum"` //省份流量包购买省份数量
 	Ppstarttime int64                  `json:"ppstart"`     //省份订阅包开始时间
 	Ppendtime   int64                  `json:"ppend"`       //省份订阅包结束时间
@@ -150,7 +151,9 @@ func SubViewDatas(userId, allquery string, pageNum int) (keys []interface{}, lis
 //
 func (pi *ParamInfo) GetSubMsg() UserSubMsg {
 	mData, ok := db.Mgo.FindById("user", pi.UserId, `{"o_jy":1}`)
-	var res = UserSubMsg{}
+	var res = UserSubMsg{
+		Basenum: jy.BaseAreaNum,
+	}
 	if ok && mData != nil && len(*mData) != 0 {
 		o_jy, _ := (*mData)["o_jy"].(map[string]interface{})
 		if o_jy["o_area"] != nil {

+ 1 - 1
src/web/staticres/big-member/css/unit_portrayal.css

@@ -528,4 +528,4 @@
     height: 100%;
     background: linear-gradient(270deg, #2ABED1 0.81%, #8DE0EB 100%);
     border-radius: 0 .28rem .28rem 0;
-}
+}

+ 14 - 16
src/web/staticres/big-member/js/unit_portrayal.js

@@ -122,7 +122,6 @@ var vNode = {
     },
     computed: {
         allNot: function() {
-            var storageSet = JSON.parse(sessionStorage.getItem('buyer_high_set'))
             var show_1 = this.isShow.showDynamic;
             var show_2 = this.isShow.showYearData;
             var show_3 = this.isShow.showMonthScale;
@@ -135,7 +134,7 @@ var vNode = {
             var show_10 = this.isShow.showAge;
             var show_11 = this.isShow.showArea;
             var show_12 = this.isShow.showAgency;
-            if(!show_1 && !show_2 && !show_3 && !show_4 && !show_5 && !show_6 && !show_7 && !show_8 && !show_9 && !show_10 && !show_11 && !show_12 && this.power.indexOf(5) > -1 && storageSet) {
+            if(!show_1 && !show_2 && !show_3 && !show_4 && !show_5 && !show_6 && !show_7 && !show_8 && !show_9 && !show_10 && !show_11 && !show_12 && this.power.indexOf(5) > -1) {
                 return true;
             } else {
                 return false;
@@ -193,7 +192,6 @@ var vNode = {
             type: 'POST',
             url: '/bigmember/use/isAdd?t=' + Date.now(),
             success: function (res) {
-              _this.chartLoading = false
               if (res.data) {
                 _this.power = res.data.power
                 _this.bigStatus = res.data.memberStatus
@@ -376,7 +374,6 @@ var vNode = {
           var data = {
             buyer: decodeURIComponent(utils.getParam('entName'))
           }
-          that.chartLoading = true
           $.ajax({
             type:'POST',
             url:'/bigmember/portrait/buyer/getData',
@@ -1269,18 +1266,19 @@ var vNode = {
             return maxIndex
         },
         goHighSet: function() {
-          if (!this.getStatus) {
-            location.href = '/big/wx/page/free_high_set?header=采购单位高级分析设置&entName=' + decodeURIComponent(utils.getParam('entName'))
-          } else {
-            this.$dialog.confirm({
-              className:'promatch',
-              title: '您暂无使用权限',
-              message: '您未购买此服务,如需使用请联系您的销售人员或客服升级套餐,谢谢!',
-              showCancelButton: false,
-              confirmButtonColor: '#2cb7ca',
-              confirmButtonText: '我知道了'
-            }).then(function () {})
-          }
+          location.href = '/big/wx/page/free_high_set?header=采购单位高级分析设置&entName=' + decodeURIComponent(utils.getParam('entName'))
+          // if (!this.getStatus) {
+          //   location.href = '/big/wx/page/free_high_set?header=采购单位高级分析设置&entName=' + decodeURIComponent(utils.getParam('entName'))
+          // } else {
+          //   this.$dialog.confirm({
+          //     className:'promatch',
+          //     title: '您暂无使用权限',
+          //     message: '您未购买此服务,如需使用请联系您的销售人员或客服升级套餐,谢谢!',
+          //     showCancelButton: false,
+          //     confirmButtonColor: '#2cb7ca',
+          //     confirmButtonText: '我知道了'
+          //   }).then(function () {})
+          // }
         }
     }
 }

+ 6 - 6
src/web/staticres/common-module/big-member/js/ent_project_news.js

@@ -136,7 +136,7 @@ var vConfig = {
     mounted: function () {
         var recover = this.recover()
         if (!recover) {
-            this.getFilterInfo()
+            // this.getFilterInfo()
             this.getEntInfo()
             this.onLoad()
             this.getEntFollowState()
@@ -244,11 +244,11 @@ var vConfig = {
             var url = this.projectNewUrl
             var data = {
               entId: _this.entInfo.eid,
-              match: _this.searchInfo.content,
-              matchType: _this.searchFilters.matchType.join(','),
-              area: _this.searchFilters.area.join(','),
-              infoType: _this.searchFilters.infoType.join(','),
-              pushTime: _this.searchFilters.pushTime.join(','),
+              // match: _this.searchInfo.content,
+              // matchType: _this.searchFilters.matchType.join(','),
+              // area: _this.searchFilters.area.join(','),
+              // infoType: _this.searchFilters.infoType.join(','),
+              // pushTime: _this.searchFilters.pushTime.join(','),
               pageNum: _this.listState.pageNum,
               pageSize: _this.listState.pageSize,
             }

+ 23 - 1
src/web/staticres/common-module/collection/css/index.css

@@ -985,6 +985,7 @@
     line-height: .4rem;
 }
 .history-list .his-contact .contact-bot {
+    margin-top: .12rem;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -992,7 +993,7 @@
     font-size: .22rem;
     font-weight: 500;
     color: #9B9CA3;
-    line-height: .36rem;
+    /* line-height: .36rem; */
 }
 .con-right{
     width: .24rem;
@@ -1006,6 +1007,7 @@
 }
 .contact-phone{
     color: #2ABED1;
+    max-width: 4.8rem;
 }
 .his-deal{
     display: flex;
@@ -1089,3 +1091,23 @@
     margin-bottom: .16rem;
     font-size: .28rem;
 }
+.jy-empty{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin: 0 auto;
+  width: 5rem;
+  text-align: center;
+}
+.jy-empty-img{
+  width: 4rem;
+  height: 4rem;
+  background: url('/common-module/public/image/jy-chagrin.png') no-repeat center center;
+  background-size: contain;
+}
+.jy-empty-text{
+  font-size: .26rem;
+  color: #9B9BA3!important;
+  line-height: .4rem;
+  padding-bottom: .24rem;
+}

+ 1087 - 1048
src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -1,256 +1,191 @@
 var vNode = {
-    delimiters: ['${', '}'],
-    el: '#ent-portrait',
-    components: {
-        vipComponent: vipComponent,
-        hisproComponent: hisproComponent
-    },
-    data () {
-        // 修改柱状条颜色为渐变色
-        this.colorGreen = [new echarts.graphic.LinearGradient(
-            0, 0, 0, 1,
-            [
-                {offset: 1, color: '#2ABED1'},
-                {offset: 0.5, color: '#2ABED1'},
-                {offset: 0, color: '#8DE0EB'}
-            ], false
-        ), '#FF9F40']
+  delimiters: ['${', '}'],
+  el: '#ent-portrait',
+  components: {
+    vipComponent: vipComponent,
+    hisproComponent: hisproComponent
+  },
+  data () {
+    // 修改柱状条颜色为渐变色
+    this.colorGreen = [new echarts.graphic.LinearGradient(
+      0, 0, 0, 1,
+      [
+        { offset: 1, color: '#2ABED1' },
+        { offset: 0.5, color: '#2ABED1' },
+        { offset: 0, color: '#8DE0EB' }
+      ], false
+    ), '#FF9F40']
 
-        return {
-            sessKey: '$data-ent_portrait',
-            conf: {
-                // 权限查询是否完成
-                powerLoaded: false,
-                // 是否只显示完整的企业画像
-                showPortraitAll: true,
-                // 是否显示,企业全景分析
-                _4: false,
-                // 是否显示中标企业动态
-                _13: false,
-                isMember: 0, // 是否是大会员
-                arr: [], // 权限列表
-                vipStatus: 0 // 是否是超级订阅
-            },
-            powerInfo: {},
-            tabActiveName: '',
-            // 企业信息
-            entInfo: {
-                name: '',
-                follow: 0,
-                followSearchFinish: false,
-                entExist: true
-            },
-            // tab1中的企业基础信息
-            entBaseInfo: {
-                type: null,
-                status: null,
-                creditNo: '',
-                capital: '',
-                employeeNo: '',
-                address: '',
-                scope: '',
-                operStart: -1,
-                operEnd: -1,
-                establish: '',
-                showEntChange: false,
-                org_code: '',
-                company_code: '',
-                legal: '',
-                phone: '',
-                taxCode: ''
-            },
-            // tab2中的项目动态
-            topProject: {
-                list: [],
-                count: 0, // 总共多少条数据
-                pageSize: 3,
-                showGetNextButton: true
-            },
-            entPortraitInfo: {},
-            stickyTop: 0,
-            singleTab: true,
-            // 年度项目统计设置
-            annualSetting:{
-                showLine: ['项目金额'],
-                axisSite: { right: ['项目金额'] }
-            },
-            // 地图配置项
-            mapSettings: mapSettings,
-            // 年度项目统计数据
-            annualData: {
-                columns: ["日期","项目数量","项目金额"],
-                rows: []
-            },
-            // 地图数据
-            mapChartData: {
-                columns: ['name', 'value'],
-                rows: []
-            },
-            // 月度中标金额
-            monthZbData: {
-                columns: [],
-                rows: []
-            },
-            // 平均折扣率
-            rateData: {
-                columns: [],
-                rows: []
-            },
-            pieChartSettings: {
-                roseType: 'radius'
-            },
-            importantCustomers: [],
-            scrollTop: 0,
-            getEntPortraitInfoTimes: 0,
-            initEchartsOptions: {
-                renderer: 'svg'
-            },
-            gotTab2: false, // 是否已经获取到tab2的数据了
-            svip: false, // 判断是否是超级订阅的企业画像
-            overlayShow: true, // 弹窗遮罩是否显示
-            isVip: false, // 只是超级订阅
-            bidcollPowerInfo: {
-                vip: 0,
-                text: '开通',
-                btntext: '去开通'
-            },
-            entvisit: {
-                total: 0, // 本月画像次数总量
-                usage: 0, // 本月已使用次数
-                provin: 0, // 购买省份数量
-                visited: false // 是否查看中标信息
-            },
-            portrait:'winner',
-            showBaseInfo: false
-        }
-    },
-    created: function () {
-        // svip是超级订阅企业查询, 如果是超级订阅不能查看企业情报历史记录
-        var svip = utils.getParam('svip')
-        if (svip) {
-            this.svip = true
-        }
-        // 企业名称恢复
-        var eId = utils.getParam('eId')
-        if (eId) {
-          eId = decodeURIComponent(eId)
-        }
-        this.entInfo.id = eId
-        this.entInfo.name = ''
-        this.restore = this.reStoreState()
-        this.getEntVisits()
-        this.getPowerInfo()
-        if (!this.restore) {
-            // 获取企业基本信息
-            this.getEntBaseInfo()
-        }
-        var storageId = sessionStorage.getItem('winner_high_eid')
-        // 判断如果url中的企业id和高级分析设置中存的企业id不一致就清除高级分析设置中存的筛选条件
-        if (storageId && storageId !== eId) {
-          sessionStorage.removeItem('winner_high_set')
-          sessionStorage.removeItem('winner_high_eid')
-        }
+    return {
+      sessKey: '$data-ent_portrait',
+      conf: {
+        // 权限查询是否完成
+        powerLoaded: false,
+        // 是否只显示完整的企业画像
+        showPortraitAll: true,
+        // 是否显示,企业全景分析
+        _4: false,
+        // 是否显示中标企业动态
+        _13: false,
+        isMember: 0, // 是否是大会员
+        arr: [], // 权限列表
+        vipStatus: 0 // 是否是超级订阅
+      },
+      powerInfo: {},
+      tabActiveName: '',
+      // 企业信息
+      entInfo: {
+        name: '',
+        follow: 0,
+        followSearchFinish: false,
+        entExist: true
+      },
+      // tab1中的企业基础信息
+      entBaseInfo: {
+        type: null,
+        status: null,
+        creditNo: '',
+        capital: '',
+        employeeNo: '',
+        address: '',
+        scope: '',
+        operStart: -1,
+        operEnd: -1,
+        establish: '',
+        showEntChange: false,
+        org_code: '',
+        company_code: '',
+        legal: '',
+        phone: '',
+        taxCode: ''
+      },
+      // tab2中的项目动态
+      topProject: {
+        list: [],
+        count: 0, // 总共多少条数据
+        pageSize: 3,
+        showGetNextButton: true
+      },
+      entPortraitInfo: {},
+      stickyTop: 0,
+      singleTab: true,
+      // 年度项目统计设置
+      annualSetting: {
+        showLine: ['项目金额'],
+        axisSite: { right: ['项目金额'] }
+      },
+      // 地图配置项
+      mapSettings: mapSettings,
+      // 年度项目统计数据
+      annualData: {
+        columns: ["日期", "项目数量", "项目金额"],
+        rows: []
+      },
+      // 地图数据
+      mapChartData: {
+        columns: ['name', 'value'],
+        rows: []
+      },
+      // 月度中标金额
+      monthZbData: {
+        columns: [],
+        rows: []
+      },
+      // 平均折扣率
+      rateData: {
+        columns: [],
+        rows: []
+      },
+      pieChartSettings: {
+        roseType: 'radius'
+      },
+      importantCustomers: [],
+      scrollTop: 0,
+      getEntPortraitInfoTimes: 0,
+      initEchartsOptions: {
+        renderer: 'svg'
+      },
+      gotTab2: false, // 是否已经获取到tab2的数据了
+      svip: false, // 判断是否是超级订阅的企业画像
+      overlayShow: true, // 弹窗遮罩是否显示
+      isVip: false, // 只是超级订阅
+      bidcollPowerInfo: {
+        vip: 0,
+        text: '开通',
+        btntext: '去开通'
+      },
+      entvisit: {
+        total: 0, // 本月画像次数总量
+        usage: 0, // 本月已使用次数
+        provin: 0, // 购买省份数量
+        visited: false // 是否查看中标信息
+      },
+      portrait: 'winner',
+      showBaseInfo: false,
+      show: {
+        yearData: true,
+        monthData: true,
+        areaData: true,
+        rate: true,
+        top10: true,
+        topShow: true,
+        dt: true
+      }
+    }
+  },
+  created: function () {
+    // svip是超级订阅企业查询, 如果是超级订阅不能查看企业情报历史记录
+    var svip = utils.getParam('svip')
+    if (svip) {
+      this.svip = true
+    }
+    // 企业名称恢复
+    var eId = utils.getParam('eId')
+    if (eId) {
+      eId = decodeURIComponent(eId)
+    }
+    this.entInfo.id = eId
+    this.entInfo.name = ''
+    this.restore = this.reStoreState()
+    this.getEntVisits()
+    this.getPowerInfo()
+    if (!this.restore) {
+      // 获取企业基本信息
+      this.getEntBaseInfo()
+    }
+    var storageId = sessionStorage.getItem('winner_high_eid')
+    // 判断如果url中的企业id和高级分析设置中存的企业id不一致就清除高级分析设置中存的筛选条件
+    if (storageId && storageId !== eId) {
+      sessionStorage.removeItem('winner_high_set')
+      sessionStorage.removeItem('winner_high_eid')
+    }
 
-    },
-    mounted: function () {
-        var _this = this
-        // 动态调整sticky距离顶部的高度
-        this.getStickyTop()
-        if (this.scrollTop) {
-            setTimeout(function () {
-                $('#ent-portrait').scrollTop(_this.scrollTop)
-            }, 0)
-        }
+  },
+  mounted: function () {
+    var _this = this
+    // 动态调整sticky距离顶部的高度
+    this.getStickyTop()
+    if (this.scrollTop) {
+      setTimeout(function () {
+        $('#ent-portrait').scrollTop(_this.scrollTop)
+      }, 0)
+    }
 
-        window.addEventListener('resize', function() {
-            _this.getStickyTop()
-        })
-    },
-    watch: {
-        tabActiveName: function (newVal, oldVal) {
-            var _this = this
-            if (newVal == '2') {
-                this.$nextTick(function () {
-                    if (_this.gotTab2) {
-                        // 初始化图表
-                        if (_this.entPortraitInfo && _this.conf.showPortraitAll && !_this.singleTab) {
-                            _this.initChartsData();
-                        }
-                    } else {
-                        if (_this.conf._4) {
-                            // 获取企业画像信息-4
-                            _this.getEntPortrait(function () {
-                                _this.initChartsData()
-                            })
-                            _this.gotTab2 = true
-                            console.log('获取企业全景分析...')
-                        }
-                        // 获取企业中标动态-13
-                        if (_this.conf._13) {
-                            _this.getProjectNews()
-                            _this.gotTab2 = true
-                            console.log('获取企业中标动态...')
-                        }
-                        if(_this.powerInfo.memberStatus <= 0) {
-                            // 不是大会员点击中标信息使用次数加一
-                            // if(!_this.entvisit.visited) {
-                            //     _this.entvisit.usage++
-                            //     _this.entvisit.visited = true
-                            // }
-                        }
-                        _this.gotTab2 = true
-                    }
-                });
-            }
-        },
-    },
-    computed: {
-        // 3个权限有1个就为true(取反为3个权限1个都没有)
-        hasOnePower: function () {
-            return this.conf._4 || this.conf._12 || this.conf._13
-        },
-        setShow: function() {
-            // 必须在tab2,并且三个权限都没有,就用显示
-            return this.tabActiveName == '2' && !this.hasOnePower
-        },
-        // 查看次数为零,显示遮罩
-        getStatus: function () {
-            return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited) || (this.entvisit.total <= this.entvisit.usage && !this.showContacts && !this.entvisit.visited)
-        },
-        isMember () {
-          return this.powerInfo.memberStatus <= 0 || !this.conf._4
-        },
-        isShowUpTip () {
-          return this.entvisit.provin == -1 ? false : true && !this.surplus && this.isVip && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited
-        },
-        surplus: function () {
-            return this.entvisit.total > this.entvisit.usage
-        },
-        showContacts: function () {
-          return this.conf.arr.indexOf(4) > -1 && this.powerInfo.memberStatus > 0
-        },
-        // 是否展示升级提示 是新超级订阅用户且购买的不是全国且浏览次数已用完
-        showUpdateTip: function() {
-          return this.isVip && this.entvisit.provin !== -1 && !this.surplus && this.conf._4 && this.powerInfo.memberStatus <= 0
-        },
-        // 是否隐藏动态 显示遮罩
-        hideDt: function() {
-          // 是新超级订阅 且不是大会员且次数已用完   或大会员没有项目动态权限
-          return this.isVip && this.powerInfo.memberStatus <= 0 && this.entvisit.total <= this.entvisit.usage || this.conf.arr.indexOf(13) === -1
-        },
-        isMemberAndSvip: function () {
-          return this.powerInfo.memberStatus > 0 || this.powerInfo.vipStatus > 0
-        }
-    },
-    methods: {
-        getDataFn: function () {
-          var _this = this
-          this.$nextTick(function () {
+    window.addEventListener('resize', function () {
+      _this.getStickyTop()
+    })
+  },
+  watch: {
+    tabActiveName: function (newVal, oldVal) {
+      var _this = this
+      if (newVal == '2') {
+        this.$nextTick(function () {
+          if (_this.gotTab2) {
             // 初始化图表
-            if (_this.entPortraitInfo && _this.conf.showPortraitAll) {
+            if (_this.entPortraitInfo && _this.conf.showPortraitAll && !_this.singleTab) {
               _this.initChartsData();
             }
-    
+          } else {
             if (_this.conf._4) {
               // 获取企业画像信息-4
               _this.getEntPortrait(function () {
@@ -273,857 +208,961 @@ var vNode = {
               // }
             }
             _this.gotTab2 = true
-    
-          });
-        },
-        // 点击去开通记住tab栏下标
-        tabActive: function(data) {
-            this.savePageState()
-        },
-        showToast: function (message) {
-            this.$toast({
-                duration: 1500,
-                forbidClick: true,
-                message: message,
-            })
-        },
-        showLoading: function() {
-            var loading = this.$toast.loading({
-                duration: 0,
-                forbidClick: true,
-                message: '',
-            })
-            return loading
-        },
-        // 超级订阅提示弹窗取消按钮事件
-        beforeClose: function (e, done) {
-            console.log(e)
-            if (e === 'cancel') {
-                this.tabActiveName = '1'
-                done(false)
-                this.overlayShow = true
-            } else if (e === 'confirm') {
-                var isWeiXinBrowser = navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1
-                try {
-                  _hmt.push(['_trackEvent','超级订阅-' + (isWeiXinBrowser ? 'wx' : 'app'), 'click', '企业画像中标信息-去开通']);
-                } catch (e) {
-                  console.log('未初始化百度统计')
-                }
-                // 去开通
-                if(this.bidcollPowerInfo.vip == 1) {
-                    location.href = '/front/vipsubscribe/upgradePage'
-                } else {
-                    location.href = "/front/vipsubscribe/vipsubscribe_new"
-                }
-            }
-            this.overlayShow = true
-        },
-        // 获取画像信息
-        getEntPortrait: function (callback) {
-            var storageSet = JSON.parse(sessionStorage.getItem('winner_high_set'))
-            // if (!storageSet) return
-            var _this = this
-            var data = {
-                entId: _this.entInfo.id
-            }
-            let urls = ''
-            // 如果专家版、智慧版 调大会员接口,如果是专家版、自定义版,同时是超级订阅 根据可查看次数判断 调大会员还是超级订阅接口
-            if (_this.powerInfo.memberStatus > 0 && _this.powerInfo.memberStatus <= 2) {
-              urls = '/bigmember/portrait/winner/getData'
-            } else if (_this.powerInfo.memberStatus > 2) {
-              if ( _this.isVip) { // 超级订阅
-                if(_this.entvisit.total <= _this.entvisit.usage && !_this.entvisit.visited) {
-                  urls = '/bigmember/portrait/winner/getData'
-                } else {
-                  urls = '/bigmember/portrait/subVipPortrait/winner'
-                }
-              } else {
-                urls = '/bigmember/portrait/winner/getData'
-                // 商机版、自定义版
-              }
-            } else {
-              urls = '/bigmember/portrait/subVipPortrait/winner'
-            }
-            _this.getEntPortraitInfoTimes++
-            $.ajax({
-                type: 'POST',
-                url: urls,
-                data: storageSet ? Object.assign(data, storageSet) : data,
-                success: function (res) {
-                    if (res.error_code == 0) {
-                        _this.loading.clear()
-                        if (res.data && Object.keys(res.data).length !== 0) {
-                            _this.singleTab = false
-                            // 将数据保存到data中
-                            for (var key in res.data) {
-                                _this.entPortraitInfo[key] = res.data[key]
-                            }
+          }
+        });
+      }
+    },
+  },
+  computed: {
+    // 3个权限有1个就为true(取反为3个权限1个都没有)
+    hasOnePower: function () {
+      return this.conf._4 || this.conf._12 || this.conf._13
+    },
+    setShow: function () {
+      // 必须在tab2,并且三个权限都没有,就用显示
+      return this.tabActiveName == '2' && !this.hasOnePower
+    },
+    // 查看次数为零,显示遮罩
+    getStatus: function () {
+      return (!this.conf._4 && !this.isVip) || (this.entvisit.total <= this.entvisit.usage && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited) || (this.entvisit.total <= this.entvisit.usage && !this.showContacts && !this.entvisit.visited)
+    },
+    isMember () {
+      return this.powerInfo.memberStatus <= 0 || !this.conf._4
+    },
+    isShowUpTip () {
+      return this.entvisit.provin == -1 ? false : true && !this.surplus && this.isVip && this.powerInfo.memberStatus <= 0 && !this.entvisit.visited
+    },
+    surplus: function () {
+      return this.entvisit.total > this.entvisit.usage
+    },
+    showContacts: function () {
+      return this.conf.arr.indexOf(4) > -1 && this.powerInfo.memberStatus > 0
+    },
+    // 是否展示升级提示 是新超级订阅用户且购买的不是全国且浏览次数已用完
+    showUpdateTip: function () {
+      return this.isVip && this.entvisit.provin !== -1 && !this.surplus && this.conf._4 && this.powerInfo.memberStatus <= 0
+    },
+    // 是否隐藏动态 显示遮罩
+    hideDt: function () {
+      // 是新超级订阅 且不是大会员且次数已用完   或大会员没有项目动态权限
+      return this.isVip && this.powerInfo.memberStatus <= 0 && this.entvisit.total <= this.entvisit.usage || this.conf.arr.indexOf(13) === -1
+    },
+    isMemberAndSvip: function () {
+      return this.powerInfo.memberStatus > 0 || this.powerInfo.vipStatus > 0
+    },
+    allNot: function () {
+      var data = this.show
+      var arr = []
+      for (var key in data) {
+        arr.push(data[key])
+      }
+      var isShow = arr.some(function (item) {
+        return item
+      })
+      return !isShow
+    }
+  },
+  methods: {
+    getDataFn: function () {
+      var _this = this
+      this.$nextTick(function () {
+        // 初始化图表
+        if (_this.entPortraitInfo && _this.conf.showPortraitAll) {
+          _this.initChartsData();
+        }
 
-                            if (res.data.timeRange && res.data.timeRange.start) {
-                                _this.entPortraitInfo.timeRangeStart = res.data.timeRange.start
-                            }
-                            if (res.data.timeRange && res.data.timeRange.end) {
-                                _this.entPortraitInfo.timeRangeEnd = res.data.timeRange.end
-                            }
+        if (_this.conf._4) {
+          // 获取企业画像信息-4
+          _this.getEntPortrait(function () {
+            _this.initChartsData()
+          })
+          _this.gotTab2 = true
+          console.log('获取企业全景分析...')
+        }
+        // 获取企业中标动态-13
+        if (_this.conf._13) {
+          _this.getProjectNews()
+          _this.gotTab2 = true
+          console.log('获取企业中标动态...')
+        }
+        if (_this.powerInfo.memberStatus <= 0) {
+          // 不是大会员点击中标信息使用次数加一
+          // if(!_this.entvisit.visited) {
+          //     _this.entvisit.usage++
+          //     _this.entvisit.visited = true
+          // }
+        }
+        _this.gotTab2 = true
 
-                            callback && callback()
-                        } else {
-                            if (_this.getEntPortraitInfoTimes < 5) {
-                                _this.getEntPortrait()
-                            }
-                        }
-                    }
-                },
-                error: function (error) {
-                    _this.$toast('请求失败')
-                }
-            })
-        },
-        // 企业画像访问量查询
-        getEntVisits: function() {
-            let _this = this
-            $.ajax({
-                type: "POST",
-                url: "/bigmember/portrait/subVipPortrait/usage",
-                data: {
-                    entId: _this.entInfo.id
-                },
-                success: function (res) {
-                    console.log(res)
-                    if(res.error_code == 0) {
-                        if(res.data) {
-                            _this.entvisit = res.data
-                        }
-                    }
-                }
-            });
-        },
-        getProjectNewsUrl: function () {
-            var _this = this
-            var urls = ''
-            // 判断专家版、智慧版; 商机版和自定义版时判断是不是超级订阅 
-            if (_this.powerInfo.memberStatus > 0 && _this.powerInfo.memberStatus <= 2) {
-              urls = '/bigmember/portrait/winner/getNewMsg'
-            } else if (_this.powerInfo.memberStatus > 2) {
-              if (_this.isVip) {
-                if (_this.entvisit.total <= _this.entvisit.usage && !_this.entvisit.visited) {
-                  urls = '/bigmember/portrait/winner/getNewMsg'
-                } else {
-                  urls = '/bigmember/portrait/subVipPortrait/winnerNewMsg'
-                }
-              } else {
-                urls = '/bigmember/portrait/winner/getNewMsg'
+      });
+    },
+    // 点击去开通记住tab栏下标
+    tabActive: function (data) {
+      this.savePageState()
+    },
+    showToast: function (message) {
+      this.$toast({
+        duration: 1500,
+        forbidClick: true,
+        message: message,
+      })
+    },
+    showLoading: function () {
+      var loading = this.$toast.loading({
+        duration: 0,
+        forbidClick: true,
+        message: '',
+      })
+      return loading
+    },
+    // 超级订阅提示弹窗取消按钮事件
+    beforeClose: function (e, done) {
+      console.log(e)
+      if (e === 'cancel') {
+        this.tabActiveName = '1'
+        done(false)
+        this.overlayShow = true
+      } else if (e === 'confirm') {
+        var isWeiXinBrowser = navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1
+        try {
+          _hmt.push(['_trackEvent', '超级订阅-' + (isWeiXinBrowser ? 'wx' : 'app'), 'click', '企业画像中标信息-去开通']);
+        } catch (e) {
+          console.log('未初始化百度统计')
+        }
+        // 去开通
+        if (this.bidcollPowerInfo.vip == 1) {
+          location.href = '/front/vipsubscribe/upgradePage'
+        } else {
+          location.href = "/front/vipsubscribe/vipsubscribe_new"
+        }
+      }
+      this.overlayShow = true
+    },
+    // 获取画像信息
+    getEntPortrait: function (callback) {
+      var storageSet = JSON.parse(sessionStorage.getItem('winner_high_set'))
+      // if (!storageSet) return
+      var _this = this
+      var data = {
+        entId: _this.entInfo.id
+      }
+      let urls = ''
+      // 如果专家版、智慧版 调大会员接口,如果是专家版、自定义版,同时是超级订阅 根据可查看次数判断 调大会员还是超级订阅接口
+      if (_this.powerInfo.memberStatus > 0 && _this.powerInfo.memberStatus <= 2) {
+        urls = '/bigmember/portrait/winner/getData'
+      } else if (_this.powerInfo.memberStatus > 2) {
+        if (_this.isVip) { // 超级订阅
+          if (_this.entvisit.total <= _this.entvisit.usage && !_this.entvisit.visited) {
+            urls = '/bigmember/portrait/winner/getData'
+          } else {
+            urls = '/bigmember/portrait/subVipPortrait/winner'
+          }
+        } else {
+          urls = '/bigmember/portrait/winner/getData'
+          // 商机版、自定义版
+        }
+      } else {
+        urls = '/bigmember/portrait/subVipPortrait/winner'
+      }
+      _this.getEntPortraitInfoTimes++
+      $.ajax({
+        type: 'POST',
+        url: urls,
+        data: storageSet ? Object.assign(data, storageSet) : data,
+        success: function (res) {
+          if (res.error_code == 0) {
+            _this.loading.clear()
+            if (res.data && Object.keys(res.data).length !== 0) {
+              _this.singleTab = false
+              // 将数据保存到data中
+              for (var key in res.data) {
+                _this.entPortraitInfo[key] = res.data[key]
+              }
+
+              if (res.data.timeRange && res.data.timeRange.start) {
+                _this.entPortraitInfo.timeRangeStart = res.data.timeRange.start
+              }
+              if (res.data.timeRange && res.data.timeRange.end) {
+                _this.entPortraitInfo.timeRangeEnd = res.data.timeRange.end
               }
+
+              callback && callback()
             } else {
-              urls = '/bigmember/portrait/subVipPortrait/winnerNewMsg'
+              if (_this.getEntPortraitInfoTimes < 5) {
+                _this.getEntPortrait()
+              }
             }
-            return urls
-          },
-        // 获取项目动态
-        getProjectNews: function () {
-            var storageSet = JSON.parse(sessionStorage.getItem('winner_high_set'))
-            // if (!storageSet) return
-            var _this = this
-            var data = {
-                entId: _this.entInfo.id,
-                pageNum: 1,
-                pageSize: _this.topProject.pageSize
+          }
+        },
+        error: function (error) {
+          _this.$toast('请求失败')
+        }
+      })
+    },
+    // 企业画像访问量查询
+    getEntVisits: function () {
+      let _this = this
+      $.ajax({
+        type: "POST",
+        url: "/bigmember/portrait/subVipPortrait/usage",
+        data: {
+          entId: _this.entInfo.id
+        },
+        success: function (res) {
+          console.log(res)
+          if (res.error_code == 0) {
+            if (res.data) {
+              _this.entvisit = res.data
             }
+          }
+        }
+      });
+    },
+    getProjectNewsUrl: function () {
+      var _this = this
+      var urls = ''
+      // 判断专家版、智慧版; 商机版和自定义版时判断是不是超级订阅 
+      if (_this.powerInfo.memberStatus > 0 && _this.powerInfo.memberStatus <= 2) {
+        urls = '/bigmember/portrait/winner/getNewMsg'
+      } else if (_this.powerInfo.memberStatus > 2) {
+        if (_this.isVip) {
+          if (_this.entvisit.total <= _this.entvisit.usage && !_this.entvisit.visited) {
+            urls = '/bigmember/portrait/winner/getNewMsg'
+          } else {
+            urls = '/bigmember/portrait/subVipPortrait/winnerNewMsg'
+          }
+        } else {
+          urls = '/bigmember/portrait/winner/getNewMsg'
+        }
+      } else {
+        urls = '/bigmember/portrait/subVipPortrait/winnerNewMsg'
+      }
+      return urls
+    },
+    // 获取项目动态
+    getProjectNews: function () {
+      var storageSet = JSON.parse(sessionStorage.getItem('winner_high_set'))
+      // if (!storageSet) return
+      var _this = this
+      var data = {
+        entId: _this.entInfo.id,
+        pageNum: 1,
+        pageSize: _this.topProject.pageSize
+      }
 
-            this.loading = this.showLoading()
+      this.loading = this.showLoading()
 
-            var urls = this.getProjectNewsUrl()
+      var urls = this.getProjectNewsUrl()
 
-            $.ajax({
-                type: 'POST',
-                url: urls,
-                data: storageSet ? Object.assign(data, storageSet) : data,
-                success: function (res) {
-                    if (res.error_code == 0) {
-                        _this.loading.clear()
-                        _this.topProject.count = res.data.count
-                        if (res.data.list && $.isArray(res.data.list)) {
-                            _this.singleTab = false
-                            _this.topProject.list = res.data.list
-                        }
-                    } else {
-                        _this.$toast(res.error_msg)
-                    }
-                },
-                error: function (error) {
-                    _this.$toast('请求失败')
-                }
-            })
-        },
-        // 去中标单位画像
-        toUnitPortrayal: function (item) {
-            this.savePageState()
-            if (item.name) {
-                location.href = '/big/wx/page/unit_portrayal?entName=' + item.name
+      $.ajax({
+        type: 'POST',
+        url: urls,
+        data: storageSet ? Object.assign(data, storageSet) : data,
+        success: function (res) {
+          if (res.error_code == 0) {
+            _this.loading.clear()
+            _this.topProject.count = res.data.count
+            if (!res.data.list || res.data.list.length == 0) {
+              // 新加变量 判断中标动态有无数据 用于展示缺省页组件
+              _this.show.dt = false
             }
+            if (res.data.list && $.isArray(res.data.list)) {
+              _this.singleTab = false
+              _this.topProject.list = res.data.list
+            }
+          } else {
+            _this.$toast(res.error_msg)
+          }
         },
-        // 查询企业基础信息
-        getEntBaseInfo: function () {
-            var _this = this
-            let urls = ''
-            if(_this.powerInfo.memberStatus <= 0 || _this.svip) {
-                urls = '/bigmember/portrait/subVipPortrait/entDetail'
-            } else {
-                urls = '/bigmember/portrait/ent/detail'
+        error: function (error) {
+          _this.$toast('请求失败')
+        }
+      })
+    },
+    // 去中标单位画像
+    toUnitPortrayal: function (item) {
+      this.savePageState()
+      if (item.name) {
+        location.href = '/big/wx/page/unit_portrayal?entName=' + item.name
+      }
+    },
+    // 查询企业基础信息
+    getEntBaseInfo: function () {
+      var _this = this
+      let urls = ''
+      if (_this.powerInfo.memberStatus <= 0 || _this.svip) {
+        urls = '/bigmember/portrait/subVipPortrait/entDetail'
+      } else {
+        urls = '/bigmember/portrait/ent/detail'
+      }
+      $.ajax({
+        type: 'POST',
+        url: urls,
+        data: {
+          entId: _this.entInfo.id
+        },
+        success: function (res) {
+          if (res.error_code == 0) {
+            _this.loading.clear()
+            if (res.data && Object.keys(res.data).length !== 0) {
+              _this.entInfo.name = res.data.entName
+              for (var key in res.data) {
+                _this.entBaseInfo[key] = res.data[key]
+              }
             }
-            $.ajax({
-                type: 'POST',
-                url: urls,
-                data: {
-                    entId: _this.entInfo.id
-                },
-                success: function (res) {
-                    if (res.error_code == 0) {
-                        _this.loading.clear()
-                        if (res.data && Object.keys(res.data).length !== 0) {
-                            _this.entInfo.name = res.data.entName
-                            for (var key in res.data) {
-                                _this.entBaseInfo[key] = res.data[key]
-                            }
-                        }
-                    } else {
-                        // 不显示提示信息
-                        // _this.$toast(res.error_msg)
-                    }
-                },
-                error: function (error) {
-                    console.log(error)
-                }
-            })
+          } else {
+            // 不显示提示信息
+            // _this.$toast(res.error_msg)
+          }
         },
-        // 查询企业是否存在和企业关注状态
-        getEntFollowState: function () {
-            var _this = this
-            _this.entInfo.followSearchFinish = false
-            $.ajax({
-                type: 'POST',
-                url: '/bigmember/follow/ent/followCheck',
-                data: {
-                  entId: _this.entInfo.id
-                },
-                success: function (res) {
-                    if (res.error_code == 0) {
-                        _this.entInfo.followSearchFinish = true
-                        if (res.data) {
-                            _this.entInfo.follow = !!res.data.followed
-                            _this.entInfo.entExist = !!res.data.isShow
-                        } else {
-                            _this.entInfo.entExist = false
-                        }
-                    } else {
-                        _this.$toast(res.error_msg)
-                    }
-                },
-                error: function (error) {
-                    console.log(error)
-                }
-            })
+        error: function (error) {
+          console.log(error)
+        }
+      })
+    },
+    // 查询企业是否存在和企业关注状态
+    getEntFollowState: function () {
+      var _this = this
+      _this.entInfo.followSearchFinish = false
+      $.ajax({
+        type: 'POST',
+        url: '/bigmember/follow/ent/followCheck',
+        data: {
+          entId: _this.entInfo.id
         },
-        changeFollowState: function () {
-            var _this = this
-            if (this.entInfo.follow) {
-                this.$dialog.confirm({
-                    title: '提示信息',
-                    message: '取消对“' + _this.entInfo.name + '”的关注?',
-                    confirmButtonColor: '#2cb7ca'
-                }).then(function () {
-                    _this.changeFollowStateRequest()
-                })
-                .catch(function () {
-                    console.log('取消操作')
-                })
+        success: function (res) {
+          if (res.error_code == 0) {
+            _this.entInfo.followSearchFinish = true
+            if (res.data) {
+              _this.entInfo.follow = !!res.data.followed
+              _this.entInfo.entExist = !!res.data.isShow
             } else {
-                this.changeFollowStateRequest()
+              _this.entInfo.entExist = false
             }
+          } else {
+            _this.$toast(res.error_msg)
+          }
         },
-        // 获取权限信息
-        getPowerInfo: function () {
-            var _this = this
-            this.loading = this.showLoading()
-            $.ajax({
-                type: 'GET',
-                url: '/bigmember/use/isAdd',
-                success: function (res) {
-                    if (res.error_code == 0) {
-                        _this.conf.powerLoaded = true
-                        if (res.data) {
-                            _this.powerInfo = res.data
-                        }
-                        if (res.data && $.isArray(res.data.power)) {
-                            // 显示完整企业画像(不完整的企业画像只有中标动态)
-                            // _this.conf.showPortraitAll = true
-                            // 根据power判断权限,企业画像包含权限(4,12,13)
-                            var power = res.data.power
-                            if (res.data.viper) {
-                                _this.isVip = true
-                            }
-                            if (power.indexOf(4) != -1 || res.data.viper) {
-                                // 获取企业画像信息-4
-                                _this.conf._4 = true
-                            }
-                            if (power.indexOf(13) != -1 || res.data.viper) {
-                                // 获取企业中标动态-13
-                                _this.conf._13 = true
-                            }
-                            if (power.indexOf(12) != -1) {
-                                // 获取企业情报历史记录-12
-                                _this.conf._12 = true
-                            }
-                            // follow的权限:4.12.13只要有一个就可以
-                            if (res.data.memberStatus > 0 && (power.indexOf(4) != -1||power.indexOf(12) != -1||power.indexOf(13) != -1)) {
-                                _this.getEntFollowState()
-                            } else {
-                                _this.entInfo.followSearchFinish = true
-                                _this.entInfo.entExist = false
-                                _this.getEntVisits()
-                                _this.portrait = 'winnerVip'
-                            }
-                            _this.singleTab = false
-                        }
-                        
-                        if (res.data.vipStatus > 0) {
-                            if (!res.data.viper) {
-                                _this.bidcollPowerInfo.text = '升级'
-                                _this.bidcollPowerInfo.btntext = '去升级'
-                                _this.bidcollPowerInfo.vip = 1
-                            }
-                        }
-                        _this.conf.isMember = res.data.memberStatus
-                        _this.conf.arr = res.data.power
-                        _this.conf.vipStatus = res.data.memberStatus
-                        _this.getDataFn()
-                    } else {
-                        _this.$toast(res.error_msg)
-                    }
-                },
-                complete: function () {
-                    if (_this.loading) {
-                        _this.loading.clear()
-                    }
-                },
-                error: function (error) {
-                    console.log(error)
-                }
-            })
-        },
-        // 修改企业关注状态
-        changeFollowStateRequest: function () {
-            var _this = this
-            var loading = this.showLoading()
-            var urls = {
-                addFollow: '/bigmember/follow/ent/addFollow',
-                delFollow: '/bigmember/follow/ent/delFollow'
+        error: function (error) {
+          console.log(error)
+        }
+      })
+    },
+    changeFollowState: function () {
+      var _this = this
+      if (this.entInfo.follow) {
+        this.$dialog.confirm({
+          title: '提示信息',
+          message: '取消对“' + _this.entInfo.name + '”的关注?',
+          confirmButtonColor: '#2cb7ca'
+        }).then(function () {
+          _this.changeFollowStateRequest()
+        })
+          .catch(function () {
+            console.log('取消操作')
+          })
+      } else {
+        this.changeFollowStateRequest()
+      }
+    },
+    // 获取权限信息
+    getPowerInfo: function () {
+      var _this = this
+      this.loading = this.showLoading()
+      $.ajax({
+        type: 'GET',
+        url: '/bigmember/use/isAdd',
+        success: function (res) {
+          if (res.error_code == 0) {
+            _this.conf.powerLoaded = true
+            if (res.data) {
+              _this.powerInfo = res.data
+            }
+            if (res.data && $.isArray(res.data.power)) {
+              // 显示完整企业画像(不完整的企业画像只有中标动态)
+              // _this.conf.showPortraitAll = true
+              // 根据power判断权限,企业画像包含权限(4,12,13)
+              var power = res.data.power
+              if (res.data.viper) {
+                _this.isVip = true
+              }
+              if (power.indexOf(4) != -1 || res.data.viper) {
+                // 获取企业画像信息-4
+                _this.conf._4 = true
+              }
+              if (power.indexOf(13) != -1 || res.data.viper) {
+                // 获取企业中标动态-13
+                _this.conf._13 = true
+              }
+              if (power.indexOf(12) != -1) {
+                // 获取企业情报历史记录-12
+                _this.conf._12 = true
+              }
+              // follow的权限:4.12.13只要有一个就可以
+              if (res.data.memberStatus > 0 && (power.indexOf(4) != -1 || power.indexOf(12) != -1 || power.indexOf(13) != -1)) {
+                _this.getEntFollowState()
+              } else {
+                _this.entInfo.followSearchFinish = true
+                _this.entInfo.entExist = false
+                _this.getEntVisits()
+                _this.portrait = 'winnerVip'
+              }
+              _this.singleTab = false
             }
-            var url = !!this.entInfo.follow ? urls.delFollow : urls.addFollow
-            $.ajax({
-                type: 'POST',
-                url: url,
-                data: {
-                  entId: _this.entInfo.id
-                },
-                success: function (res) {
-                    if (res.error_code == 0) {
-                        // 清除上个页面缓存
-                     sessionStorage.removeItem('$data-ent_follow')
-                        loading.clear()
-                        if (res.data && res.data == 'success') {
-                            _this.entInfo.follow = !_this.entInfo.follow
-                        }
 
-                        if (!_this.entInfo.follow) {
-                            history.back()
-                        }
-                    } else {
-                        _this.showToast(res.error_msg)
-                    }
-                },
-                error: function (error) {
-                    console.log(error)
-                }
-            })
-        },
-        // 初始化图标数据
-        initChartsData: function () {
-            var dataSet = this.entPortraitInfo
-            // 初始化 年度项目统计数据
-            this.arrangeAnnualData(dataSet.yearData)
-            // 初始化 月度统计数据
-            this.arrangeMonthZbData(dataSet.monthData)
-            // 初始化 地图数据
-            this.arrangeMapData(dataSet.areaData)
-            // 初始化 平局折扣率数据
-            this.arrangeRateData(dataSet.rate)
-            // 初始化 饼图 客户类型分布
-            this.initPieChartData(dataSet.top10)
-            // 初始化 重要客户数据
-            this.arrangeImportantData(dataSet.topShow)
+            if (res.data.vipStatus > 0) {
+              if (!res.data.viper) {
+                _this.bidcollPowerInfo.text = '升级'
+                _this.bidcollPowerInfo.btntext = '去升级'
+                _this.bidcollPowerInfo.vip = 1
+              }
+            }
+            _this.conf.isMember = res.data.memberStatus
+            _this.conf.arr = res.data.power
+            _this.conf.vipStatus = res.data.memberStatus
+            _this.getDataFn()
+          } else {
+            _this.$toast(res.error_msg)
+          }
         },
-        getStickyTop: function () {
-            // this.stickyTop = $('.jy-app-header').height() - 1
+        complete: function () {
+          if (_this.loading) {
+            _this.loading.clear()
+          }
         },
-        goToEntHistory: function () {
-            // if (this.powerInfo.isSubCount) {
-            //     return this.showToast('子账号无法使用企业情报监控')
-            // }
-
-            this.savePageState()
-            var info = {
-                anchor: '企业情报监控'
-            }
-            sessionStorage.setItem('landinfo',JSON.stringify(info))
-            location.href = './ent_portrait_change?eId=' + encodeURIComponent(this.entInfo.id)
+        error: function (error) {
+          console.log(error)
+        }
+      })
+    },
+    // 修改企业关注状态
+    changeFollowStateRequest: function () {
+      var _this = this
+      var loading = this.showLoading()
+      var urls = {
+        addFollow: '/bigmember/follow/ent/addFollow',
+        delFollow: '/bigmember/follow/ent/delFollow'
+      }
+      var url = !!this.entInfo.follow ? urls.delFollow : urls.addFollow
+      $.ajax({
+        type: 'POST',
+        url: url,
+        data: {
+          entId: _this.entInfo.id
         },
-        // 修改年度项目统计里点击浮窗显示效果
-        formatter: function (params) {
-            //移除重复的数据
-            for (var i = 0; i < params.length; i++) {
-                for (var j = params.length - 1; j > i; j--) {
-                    if (params[j].data == params[i].data) {
-                        params.splice(j, 1);
-                        break;
-                    }
-                }
+        success: function (res) {
+          if (res.error_code == 0) {
+            // 清除上个页面缓存
+            sessionStorage.removeItem('$data-ent_follow')
+            loading.clear()
+            if (res.data && res.data == 'success') {
+              _this.entInfo.follow = !_this.entInfo.follow
             }
-            var tip = '';
-            for (var i = 0; i < params.length; i++) {
-                // 因柱状图颜色为渐变色,此处获取到的柱状图颜色,css不能识别,需单独设置小圆点的颜色
-                params[0].marker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#2ABED1"></span>'
-                if( i=== 0) {
-                    tip = tip + params[i].marker + params[i].seriesName + ':' + params[i].value + '个' + '<br/>';
-                }else if(i == 1){
-                    tip = tip + params[i].marker + params[i].seriesName + ':' + params[i].value + '万元' + '<br/>';
-                }
+
+            if (!_this.entInfo.follow) {
+              history.back()
             }
-            tip += '<div style="padding-top:2px;text-align:center;color:#9B9CA3;">' + ' - ' + params[0].name + ' - ' + '</div>'
-            return tip;
+          } else {
+            _this.showToast(res.error_msg)
+          }
         },
-        // 1. 年度项目统计图表单独配置
-        annualConfig: function (options) {
-            var that = this;
-            options.grid.bottom = 60
-            options.tooltip.axisPointer.shadowStyle.color = 'rgba(42, 190, 209,0.1)' // 修改点击柱条后背景颜色
-            options.legend.show = true // 显示底部数量、金额、圆点
-            options.yAxis[1].axisLabel.show = true; // 显示右侧y轴刻度
-            options.yAxis[1].axisLabel.formatter = function(value, index) {
-                return value.toString().replace(/,/, '')
-            }  // 去掉右轴逗号分割
-            options.series[1].lineStyle.width = 2 // 折线
-            options.series[1].lineStyle.color = '#FF9F40'
-            // 以下代码为:处理左侧y轴与右侧y轴刻度保持在同一X轴水平线上
-            var maxCountList = this.annualData.rows.map(function(v){
-                return v['项目数量']
-            })
-            var maxPriceList = this.annualData.rows.map(function(v){
-                return v['项目金额']
-            })
+        error: function (error) {
+          console.log(error)
+        }
+      })
+    },
+    // 初始化图标数据
+    initChartsData: function () {
+      var dataSet = this.entPortraitInfo
+      // 初始化 年度项目统计数据
+      this.arrangeAnnualData(dataSet.yearData)
+      // 初始化 月度统计数据
+      this.arrangeMonthZbData(dataSet.monthData)
+      // 初始化 地图数据
+      this.arrangeMapData(dataSet.areaData)
+      // 初始化 平局折扣率数据
+      this.arrangeRateData(dataSet.rate)
+      // 初始化 饼图 客户类型分布
+      this.initPieChartData(dataSet.top10)
+      // 初始化 重要客户数据
+      this.arrangeImportantData(dataSet.topShow)
+    },
+    getStickyTop: function () {
+      // this.stickyTop = $('.jy-app-header').height() - 1
+    },
+    goToEntHistory: function () {
+      // if (this.powerInfo.isSubCount) {
+      //     return this.showToast('子账号无法使用企业情报监控')
+      // }
 
-            var maxCount = Math.ceil(Math.max.apply(null,maxCountList)).toString();// 取出数量中最大值
-            var maxPrice = Math.ceil(Math.max.apply(null,maxPriceList)).toString();// 取出金额中最大值
-            // var minPrice = Math.min.apply(null,maxPriceList);// 去除金额最小值
-            maxPrice = Math.ceil(maxPrice / (Math.pow(10,maxPrice.length -1))) * Math.pow(10,maxPrice.length -1)
-            maxCount = Math.ceil(maxCount / (Math.pow(10,maxCount.length -1))) * Math.pow(10,maxCount.length -1)
-            var item = options.yAxis
-            item[0].min = 0;
-            item[1].min = 0;
-            item[0].max = maxCount;
-            item[0].interval = Math.ceil(maxCount / 5);
-            item[1].max = maxPrice;
-            item[1].interval = Math.ceil((maxPrice - 0) / 5);
+      this.savePageState()
+      var info = {
+        anchor: '企业情报监控'
+      }
+      sessionStorage.setItem('landinfo', JSON.stringify(info))
+      location.href = './ent_portrait_change?eId=' + encodeURIComponent(this.entInfo.id)
+    },
+    // 修改年度项目统计里点击浮窗显示效果
+    formatter: function (params) {
+      //移除重复的数据
+      for (var i = 0; i < params.length; i++) {
+        for (var j = params.length - 1; j > i; j--) {
+          if (params[j].data == params[i].data) {
+            params.splice(j, 1);
+            break;
+          }
+        }
+      }
+      var tip = '';
+      for (var i = 0; i < params.length; i++) {
+        // 因柱状图颜色为渐变色,此处获取到的柱状图颜色,css不能识别,需单独设置小圆点的颜色
+        params[0].marker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#2ABED1"></span>'
+        if (i === 0) {
+          tip = tip + params[i].marker + params[i].seriesName + ':' + params[i].value + '个' + '<br/>';
+        } else if (i == 1) {
+          tip = tip + params[i].marker + params[i].seriesName + ':' + params[i].value + '万元' + '<br/>';
+        }
+      }
+      tip += '<div style="padding-top:2px;text-align:center;color:#9B9CA3;">' + ' - ' + params[0].name + ' - ' + '</div>'
+      return tip;
+    },
+    // 1. 年度项目统计图表单独配置
+    annualConfig: function (options) {
+      var that = this;
+      options.grid.bottom = 60
+      options.tooltip.axisPointer.shadowStyle.color = 'rgba(42, 190, 209,0.1)' // 修改点击柱条后背景颜色
+      options.legend.show = true // 显示底部数量、金额、圆点
+      options.yAxis[1].axisLabel.show = true; // 显示右侧y轴刻度
+      options.yAxis[1].axisLabel.formatter = function (value, index) {
+        return value.toString().replace(/,/, '')
+      }  // 去掉右轴逗号分割
+      options.series[1].lineStyle.width = 2 // 折线
+      options.series[1].lineStyle.color = '#FF9F40'
+      // 以下代码为:处理左侧y轴与右侧y轴刻度保持在同一X轴水平线上
+      var maxCountList = this.annualData.rows.map(function (v) {
+        return v['项目数量']
+      })
+      var maxPriceList = this.annualData.rows.map(function (v) {
+        return v['项目金额']
+      })
 
-            // 处理点击浮窗显示效果
-            options.tooltip.formatter = function(params) {
-                return that.formatter(params)
-            }
-            options.legend.formatter = function (name) {
-                var wnYuan = ['金额', '项目金额']
-                var ge = ['数量', '项目数量']
-                if (wnYuan.indexOf(name) !== -1) {
-                    name += '(万元)-右轴'
-                } else if (ge.indexOf(name) !== -1) {
-                    name += '(个)'
-                }
-                return name;
-            }
-            return options
-        },
-        // 2. 月度中标金额(折线图)
-        lineChartConfig: function (options) {
-            options.yAxis[0].name = '中标金额(万元)';
-            options.legend.itemGap = 20;
-            options.tooltip.formatter = function(params) {
-                var tip = '';
-                for (var i = 0; i < params.length; i++) {
-                    params[i].marker = '<span style="display:inline-block;margin-right:5px;border-radius:8px;width:8px;height:8px;background-color:' + params[i].color + ';"></span>'
-                    if(params[i].value[1] !== undefined && params[i].value[1] !== null && !isNaN(params[i].value[1])) {
-                        tip = tip + params[i].marker + params[i].seriesName + params[i].name + '中标金额:' + params[i].value[1].toString().replace(/,/,'') + '万元' +'<br/>';
-                    }
-                }
-                tip += '<div style="padding-top:2px;text-align:center;color:#9B9CA3;">' + ' - ' + params[0].name + ' - ' + '</div>'
-                return tip;
-            }
-            return options;
-        },
-        // 3. 地图配置项
-        mapConfig: function (options) {
-            var _this = this
-            var arr = this.mapChartData.rows
-            // 最大值、最小值
-            var maxNum = Math.max.apply(Math, arr.map(function(o) {return o.value}))
-            var minNum = Math.min.apply(Math, arr.map(function(o) {return o.value}))
+      var maxCount = Math.ceil(Math.max.apply(null, maxCountList)).toString();// 取出数量中最大值
+      var maxPrice = Math.ceil(Math.max.apply(null, maxPriceList)).toString();// 取出金额中最大值
+      // var minPrice = Math.min.apply(null,maxPriceList);// 去除金额最小值
+      maxPrice = Math.ceil(maxPrice / (Math.pow(10, maxPrice.length - 1))) * Math.pow(10, maxPrice.length - 1)
+      maxCount = Math.ceil(maxCount / (Math.pow(10, maxCount.length - 1))) * Math.pow(10, maxCount.length - 1)
+      var item = options.yAxis
+      item[0].min = 0;
+      item[1].min = 0;
+      item[0].max = maxCount;
+      item[0].interval = Math.ceil(maxCount / 5);
+      item[1].max = maxPrice;
+      item[1].interval = Math.ceil((maxPrice - 0) / 5);
 
-            options.visualMap.min = minNum;
-            options.visualMap.max = maxNum < 100 ? 100 : maxNum;
+      // 处理点击浮窗显示效果
+      options.tooltip.formatter = function (params) {
+        return that.formatter(params)
+      }
+      options.legend.formatter = function (name) {
+        var wnYuan = ['金额', '项目金额']
+        var ge = ['数量', '项目数量']
+        if (wnYuan.indexOf(name) !== -1) {
+          name += '(万元)-右轴'
+        } else if (ge.indexOf(name) !== -1) {
+          name += '(个)'
+        }
+        return name;
+      }
+      return options
+    },
+    // 2. 月度中标金额(折线图)
+    lineChartConfig: function (options) {
+      options.yAxis[0].name = '中标金额(万元)';
+      options.legend.itemGap = 20;
+      options.tooltip.formatter = function (params) {
+        var tip = '';
+        for (var i = 0; i < params.length; i++) {
+          params[i].marker = '<span style="display:inline-block;margin-right:5px;border-radius:8px;width:8px;height:8px;background-color:' + params[i].color + ';"></span>'
+          if (params[i].value[1] !== undefined && params[i].value[1] !== null && !isNaN(params[i].value[1])) {
+            tip = tip + params[i].marker + params[i].seriesName + params[i].name + '中标金额:' + params[i].value[1].toString().replace(/,/, '') + '万元' + '<br/>';
+          }
+        }
+        tip += '<div style="padding-top:2px;text-align:center;color:#9B9CA3;">' + ' - ' + params[0].name + ' - ' + '</div>'
+        return tip;
+      }
+      return options;
+    },
+    // 3. 地图配置项
+    mapConfig: function (options) {
+      var _this = this
+      var arr = this.mapChartData.rows
+      // 最大值、最小值
+      var maxNum = Math.max.apply(Math, arr.map(function (o) { return o.value }))
+      var minNum = Math.min.apply(Math, arr.map(function (o) { return o.value }))
 
-            // 设置最大值
-            options.graphic[options.graphic.length - 1].children[0].style.text = maxNum > 100 ? maxNum : 100
-            options.graphic[options.graphic.length - 1].children[1].style.text = 1;
-            options.visualMap.min = 1;
-            options.visualMap.max = maxNum < 100 ? 100 : maxNum;
-            options.graphic[0].children[0].style.text = '项目数量(个)'
-            options.tooltip.formatter = function (params) {
-                var index = params.dataIndex
-                var item = _this.mapChartData.rows[index]
-                var string = ''
-                if (item) {
-                    if (item.value && item.amount) {
-                        string = item.name + '<br/>项目数量:' + item.value + '个<br/>中标金额:' + item.amount + '万元'
-                    } else if (item.value) {
-                        string = item.name + '<br/>项目数量:' + item.value + '个'
-                    } else if (item.amount) {
-                        string = item.name + '<br/>中标金额:' + item.amount + '万元'
-                    }
-                }
-                return string
-            }
-            return options
-        },
-        // 4. 客户平均折扣率配置
-        rateConfig: function (options) {
-            options.color = ['#FB483D', '#05A6F3', '#0BD991', '#FF9F40','#8E6DF2','#C0C4CC'];
-            options.xAxis[0].axisLabel.margin = 12
-            options.yAxis[0].axisLabel.formatter = '{value}%'
-            options.grid = {
-                top: 20,
-                right: 16,
-                bottom: 70,
-                left: 10
-            }
-            options.legend.textStyle.padding = [0, 18, 0,0];
-            options.legend.left = 16;
-            options.legend.bottom = 10;
-            options.tooltip.formatter = function(params) {
-                var tip = '';
-                for (var i = 0; i < params.length; i++) {
-                    params[i].marker = '<span style="display:inline-block;margin-right:5px;border-radius:8px;width:8px;height:8px;background-color:' + params[i].color + ';"></span>'
-                    if(params[i].value[1] === undefined || params[i].value[1] == null) {
-                        tip = tip + params[i].marker + params[i].seriesName + ':--<br/>';
-                    } else {
-                        tip = tip + params[i].marker + params[i].seriesName + ':' + params[i].value[1] + '%<br/>';
-                    }
-                }
-                tip += '<div style="padding-top:2px;text-align:center;color:#9B9CA3;">' + ' - ' + params[0].name + ' - ' + '</div>'
-                return tip;
-            }
-            return options;
-        },
-        // 整理年度项目统计数据
-        arrangeAnnualData: function (data) {
-            if (!data) return
+      options.visualMap.min = minNum;
+      options.visualMap.max = maxNum < 100 ? 100 : maxNum;
 
-            var rows = [];
-            var count = 0;
-            for (var key in data) {
-                var item = data[key]
-                // 统计数据总数是否为0
-                count += item.Count
-                count += item.Money
-                rows.push({
-                    '日期': parseInt(key),
-                    '项目数量': item.Count,
-                    '项目金额': Math.round(item.Money / 10000)
-                })
-            }
+      // 设置最大值
+      options.graphic[options.graphic.length - 1].children[0].style.text = maxNum > 100 ? maxNum : 100
+      options.graphic[options.graphic.length - 1].children[1].style.text = 1;
+      options.visualMap.min = 1;
+      options.visualMap.max = maxNum < 100 ? 100 : maxNum;
+      options.graphic[0].children[0].style.text = '项目数量(个)'
+      options.tooltip.formatter = function (params) {
+        var index = params.dataIndex
+        var item = _this.mapChartData.rows[index]
+        var string = ''
+        if (item) {
+          if (item.value && item.amount) {
+            string = item.name + '<br/>项目数量:' + item.value + '个<br/>中标金额:' + item.amount + '万元'
+          } else if (item.value) {
+            string = item.name + '<br/>项目数量:' + item.value + '个'
+          } else if (item.amount) {
+            string = item.name + '<br/>中标金额:' + item.amount + '万元'
+          }
+        }
+        return string
+      }
+      return options
+    },
+    // 4. 客户平均折扣率配置
+    rateConfig: function (options) {
+      options.color = ['#FB483D', '#05A6F3', '#0BD991', '#FF9F40', '#8E6DF2', '#C0C4CC'];
+      options.xAxis[0].axisLabel.margin = 12
+      options.yAxis[0].axisLabel.formatter = '{value}%'
+      options.grid = {
+        top: 20,
+        right: 16,
+        bottom: 70,
+        left: 10
+      }
+      options.legend.textStyle.padding = [0, 18, 0, 0];
+      options.legend.left = 16;
+      options.legend.bottom = 10;
+      options.tooltip.formatter = function (params) {
+        var tip = '';
+        for (var i = 0; i < params.length; i++) {
+          params[i].marker = '<span style="display:inline-block;margin-right:5px;border-radius:8px;width:8px;height:8px;background-color:' + params[i].color + ';"></span>'
+          if (params[i].value[1] === undefined || params[i].value[1] == null) {
+            tip = tip + params[i].marker + params[i].seriesName + ':--<br/>';
+          } else {
+            tip = tip + params[i].marker + params[i].seriesName + ':' + params[i].value[1] + '%<br/>';
+          }
+        }
+        tip += '<div style="padding-top:2px;text-align:center;color:#9B9CA3;">' + ' - ' + params[0].name + ' - ' + '</div>'
+        return tip;
+      }
+      return options;
+    },
+    // 整理年度项目统计数据
+    arrangeAnnualData: function (data) {
+      if (!data) return
 
-            // rows = utils.bSort(rows, '日期').reverse()
-            rows = utils.bSort(rows, '日期')
+      var rows = [];
+      var count = 0;
+      for (var key in data) {
+        var item = data[key]
+        // 统计数据总数是否为0
+        count += item.Count
+        count += item.Money
+        rows.push({
+          '日期': parseInt(key),
+          '项目数量': item.Count,
+          '项目金额': Math.round(item.Money / 10000)
+        })
+      }
 
-            // 数据总量为0,不赋值
-            if (count != 0) {
-                this.annualData.rows = rows;
-            }
-        },
-        // 整理月度项目统计数据
-        arrangeMonthZbData: function (data) {
-            if (!data) return
-            var rows = []
-            var columns = ['月份']
-            var count = 0
-            var allNum = []
-            // 1. 先将月份提取出来, 并排序
-            var yearArr = []
-            for (var key in data) {
-                yearArr.push(parseInt(key))
-                for (var n in data[key]) {
-                  allNum.push(data[key][n])
-                }
-            }
-            yearArr.sort(function (a, b) { return a - b })
+      // rows = utils.bSort(rows, '日期').reverse()
+      rows = utils.bSort(rows, '日期')
 
-            // 2. 循环12个月份,并进行处理
-            yearArr.forEach(function (item) {
-                columns.push(item + '年')
-            })
-            for (var i = 1; i <= 12; i++) {
-                var columnsItem = {}
-                columns.forEach(function (item) {
-                    var value = ''
-                    if (item == '月份') {
-                        value = i + '月'
-                    } else if (/年/g.test(item)) {
-                        if (data[item.slice(0, -1)]) {
-                            value = data[item.slice(0, -1)][i]
-                            value = (value / 10000).fixed(2)
-                            count += parseInt(value)
-                        }
-                    }
-                    columnsItem[item] = value
-                })
-                rows.push(columnsItem)
-            }
-            var maxNum = Math.max.apply(Math, allNum.map(function(o) { return o }))
-            // 数据总量为0,不赋值
-            if (count != 0 && maxNum !== 0) {
-                this.monthZbData.columns = columns;
-                this.monthZbData.rows = rows;
+      // 数据总量为0,不赋值
+      if (count != 0) {
+        this.annualData.rows = rows;
+      } else {
+        this.show.yearData = false
+      }
+    },
+    // 整理月度项目统计数据
+    arrangeMonthZbData: function (data) {
+      if (!data) return
+      var rows = []
+      var columns = ['月份']
+      var count = 0
+      var allNum = []
+      // 1. 先将月份提取出来, 并排序
+      var yearArr = []
+      for (var key in data) {
+        yearArr.push(parseInt(key))
+        for (var n in data[key]) {
+          allNum.push(data[key][n])
+        }
+      }
+      yearArr.sort(function (a, b) { return a - b })
+
+      // 2. 循环12个月份,并进行处理
+      yearArr.forEach(function (item) {
+        columns.push(item + '年')
+      })
+      for (var i = 1; i <= 12; i++) {
+        var columnsItem = {}
+        columns.forEach(function (item) {
+          var value = ''
+          if (item == '月份') {
+            value = i + '月'
+          } else if (/年/g.test(item)) {
+            if (data[item.slice(0, -1)]) {
+              value = data[item.slice(0, -1)][i]
+              value = (value / 10000).fixed(2)
+              count += parseInt(value)
             }
-        },
-        // 整理主要市场分布(中国地图)数据
-        arrangeMapData: function(data) {
-            if (!data) return
+          }
+          columnsItem[item] = value
+        })
+        rows.push(columnsItem)
+      }
+      var maxNum = Math.max.apply(Math, allNum.map(function (o) { return o }))
+      // 数据总量为0,不赋值
+      if (count != 0 && maxNum !== 0) {
+        this.monthZbData.columns = columns;
+        this.monthZbData.rows = rows;
+      } else {
+        this.show.monthData = false
+      }
+    },
+    // 整理主要市场分布(中国地图)数据
+    arrangeMapData: function (data) {
+      if (!data) return
 
-            var mapRows = []
-            var count = 0
-            if (data && $.isArray(data)) {
-                data.forEach(function (n) {
-                    count += n.projectCount
+      var mapRows = []
+      var count = 0
+      if (data && $.isArray(data)) {
+        data.forEach(function (n) {
+          count += n.projectCount
 
-                    mapRows.push({
-                        name: n.areaName,
-                        value: n.projectCount,
-                        amount: (n.bidamountCount / 10000).fixed(2)
-                    })
-                })
-            }
+          mapRows.push({
+            name: n.areaName,
+            value: n.projectCount,
+            amount: (n.bidamountCount / 10000).fixed(2)
+          })
+        })
+      }
 
-            // 数据总量为0,不赋值
-            if (count != 0) {
-                this.mapChartData.rows = mapRows;
-            }
-        },
-        // 整理平均折扣率数据
-        arrangeRateData: function (data) {
-            if (!data) return
-            var rows = []
-            var columns = ['日期', '全部客户']
-            var count = 0
+      // 数据总量为0,不赋值
+      if (count != 0) {
+        this.mapChartData.rows = mapRows;
+      } else {
+        this.show.areaData = false
+      }
+    },
+    // 整理平均折扣率数据
+    arrangeRateData: function (data) {
+      if (!data) return
+      var rows = []
+      var columns = ['日期', '全部客户']
+      var count = 0
 
-            for (var c in data) {
-                if (c !== '全部客户') {
-                    columns.push(c)
-                }
-            }
-            // 获取年份数组
-            var yearArr = []
-            for (var key in data['全部客户']) {
-                yearArr.push(key)
-            }
-            yearArr.sort(function (a, b) { return a - b })
+      for (var c in data) {
+        if (c !== '全部客户') {
+          columns.push(c)
+        }
+      }
+      // 获取年份数组
+      var yearArr = []
+      for (var key in data['全部客户']) {
+        yearArr.push(key)
+      }
+      yearArr.sort(function (a, b) { return a - b })
 
-            yearArr.forEach(function (item) {
-                var rowsItem = {
-                    '日期': item + '年'
-                }
-                for (var k in data) {
-                    count += (data[k][item] * 100)
-                    rowsItem[k] = data[k][item] == null  ? null : (data[k][item] * 100).fixed(2)
-                }
-                rows.push(rowsItem)
-            })
+      yearArr.forEach(function (item) {
+        var rowsItem = {
+          '日期': item + '年'
+        }
+        for (var k in data) {
+          count += (data[k][item] * 100)
+          rowsItem[k] = data[k][item] == null ? null : (data[k][item] * 100).fixed(2)
+        }
+        rows.push(rowsItem)
+      })
 
-            // 数据总量为0,不赋值
-            if (count != 0) {
-                this.rateData.columns = columns;
-                this.rateData.rows = rows;
-            }
-        },
-        // 初始化饼图
-        initPieChartData: function (d) {
-            if (!d) return
-            var that = this
-            var arr = []
-            var data = JSON.parse(JSON.stringify(d))
-            // 降序排列
-            data.sort(function (a, b) {
-                return b.bidamount_share - a.bidamount_share
-            })
-            data.forEach(function (item){
-              arr.push(item.buyerClass,item.bidamount_share,item.bidamount_count,item.project_count,item.rate_avg)
-            })
-            var normal =['行业','中标金额占比','中标金额','项目数量','平均折扣率'];
-            var newArr = that.arrTrans(5,arr);
-            newArr.unshift(normal)
-            chartOptions.deformPieChart.dataset.source = newArr;
-            chartOptions.deformPieChart.tooltip.formatter = function(params){
-                var tip = '';
-                var data = params.data;
-                params.marker = '<span style="display:inline-block;margin-right:5px;border-radius:8px;width:8px;height:8px;background-color:' + params.color +'"></span>';
-                var percent = '<span style="padding-left:13px;">中标金额占比:' + (data[1]*100).fixed(2) + '%</span></br>';
-                var scale = '<span style="padding-left:13px;">中标金额:' + utils.moneyUnit(data[2].fixed(2)) + '</span></br>';
-                var count = '<span style="padding-left:13px;">项目数量:' + data[3] + '个</span></br>';
-                var rate = (typeof data[4] === 'number' && !isNaN(data[4])) ? '<span style="padding-left:13px;">平均折扣率:' + (data[4]*100).fixed(2) + '%</span></br>' : '';
-                tip = params.marker + params.name +'<br/>' + percent + scale + count + rate
-                return tip;
-            }
-            chartOptions.deformPieChart.legend.formatter = null
-            that.$nextTick(function(){
-                var ref = that.$refs.pieChart;
-                var pieChart = echarts.init(ref, null, that.initEchartsOptions);
-                pieChart.setOption(chartOptions.deformPieChart);
-                pieChart.resize();
+      // 数据总量为0,不赋值
+      if (count != 0) {
+        this.rateData.columns = columns;
+        this.rateData.rows = rows;
+      } else {
+        this.show.rate = false
+      }
+    },
+    // 初始化饼图
+    initPieChartData: function (d) {
+      if (!d) return
+      if (d && d.length == 0) {
+        // 新增变量 用于判断是否展示缺省页
+        this.show.top10 = false
+      }
+      var that = this
+      var arr = []
+      var data = JSON.parse(JSON.stringify(d))
+      // 降序排列
+      data.sort(function (a, b) {
+        return b.bidamount_share - a.bidamount_share
+      })
+      data.forEach(function (item) {
+        arr.push(item.buyerClass, item.bidamount_share, item.bidamount_count, item.project_count, item.rate_avg)
+      })
+      var normal = ['行业', '中标金额占比', '中标金额', '项目数量', '平均折扣率'];
+      var newArr = that.arrTrans(5, arr);
+      newArr.unshift(normal)
+      chartOptions.deformPieChart.dataset.source = newArr;
+      chartOptions.deformPieChart.tooltip.formatter = function (params) {
+        var tip = '';
+        var data = params.data;
+        params.marker = '<span style="display:inline-block;margin-right:5px;border-radius:8px;width:8px;height:8px;background-color:' + params.color + '"></span>';
+        var percent = '<span style="padding-left:13px;">中标金额占比:' + (data[1] * 100).fixed(2) + '%</span></br>';
+        var scale = '<span style="padding-left:13px;">中标金额:' + utils.moneyUnit(data[2].fixed(2)) + '</span></br>';
+        var count = '<span style="padding-left:13px;">项目数量:' + data[3] + '个</span></br>';
+        var rate = (typeof data[4] === 'number' && !isNaN(data[4])) ? '<span style="padding-left:13px;">平均折扣率:' + (data[4] * 100).fixed(2) + '%</span></br>' : '';
+        tip = params.marker + params.name + '<br/>' + percent + scale + count + rate
+        return tip;
+      }
+      chartOptions.deformPieChart.legend.formatter = null
+      that.$nextTick(function () {
+        var ref = that.$refs.pieChart;
+        var pieChart = echarts.init(ref, null, that.initEchartsOptions);
+        pieChart.setOption(chartOptions.deformPieChart);
+        pieChart.resize();
+      })
+    },
+    arrTrans: function (num, arr) { // 一维数组转换为二维数组
+      var iconsArr = [];
+      arr.forEach(function (item, index) {
+        var page = Math.floor(index / num); // 计算该元素为第几个素组内
+        if (!iconsArr[page]) { // 判断是否存在
+          iconsArr[page] = [];
+        }
+        iconsArr[page].push(item);
+      });
+      return iconsArr;
+    },
+    // 整理重要客户数据
+    arrangeImportantData: function (data) {
+      if (!data) return
+      if (data && data.length == 0) {
+        this.show.topShow = false
+      }
+      var arr = []
+      if ($.isArray(data)) {
+        data.forEach(function (list) {
+          var i1 = {
+            title: list.buyerclass,
+            list: []
+          }
+          if (list.topData && $.isArray(list.topData)) {
+            list.topData.forEach(function (item) {
+              i1.list.push({
+                name: item.BuyerName,
+                money: item.CountMoney,
+                count: item.CountProject,
+                rate: item.AvgRate ? (item.AvgRate * 100).fixed(2) : item.AvgRate,
+                time: new Date(item.lastTime * 1000).pattern('yyyy/MM/dd'),
+                percent: item.CountMoney / list.topData[0].CountMoney * 100 + '%'
+              })
             })
-        },
-        arrTrans: function(num, arr) { // 一维数组转换为二维数组
-            var iconsArr = [];
-            arr.forEach(function(item, index) {
-                var page = Math.floor(index / num); // 计算该元素为第几个素组内
-                if (!iconsArr[page]) { // 判断是否存在
-                    iconsArr[page] = [];
-                }
-                iconsArr[page].push(item);
-            });
-            return iconsArr;
-        },
-        // 整理重要客户数据
-        arrangeImportantData: function (data) {
-            if (!data) return
-            var arr = []
-            if ($.isArray(data)) {
-                data.forEach(function (list) {
-                    var i1 = {
-                        title: list.buyerclass,
-                        list: []
-                    }
-                    if (list.topData && $.isArray(list.topData)) {
-                        list.topData.forEach(function (item) {
-                            i1.list.push({
-                                name: item.BuyerName,
-                                money: item.CountMoney,
-                                count: item.CountProject,
-                                rate: item.AvgRate ? (item.AvgRate*100).fixed(2) : item.AvgRate,
-                                time: new Date(item.lastTime * 1000).pattern('yyyy/MM/dd'),
-                                percent: item.CountMoney / list.topData[0].CountMoney*100 + '%'
-                            })
-                        })
-                    }
+          }
 
-                    if (!list.buyerclass || ($.isArray(list.topData) && list.topData.length === 0)) {
-                        // console.log('此数据为空')
-                    } else {
-                        arr.push(i1)
-                    }
-                })
-            }
-            this.importantCustomers = arr
-        },
-        // 去公告详情页
-        toProjectDetail: function (item) {
-            this.savePageState()
-            if (item.id) {
-                var href = '/article/content/' + item.id + '.html'
-                location.href = href
-            }
-        },
-        goToFilterProjectNews: function () {
-            this.savePageState()
-            var url = this.getProjectNewsUrl()
-            var reqSign = url.indexOf('subVipPortrait') === -1 ? 'bigmember' : 'svip'
-            location.href = '/big/wx/page/free_ent_project_news?eid=' + this.entInfo.id + '&reqSign=' + reqSign
-        },
-        savePageState: function () {
-            this.scrollTop = $('#ent-portrait').scrollTop()
-            var data = {
-                conf: this.conf,
-                tabActiveName: this.tabActiveName,
-                entInfo: this.entInfo,
-                entBaseInfo: this.entBaseInfo,
-                topProject: this.topProject,
-                entPortraitInfo: this.entPortraitInfo,
-                powerInfo: this.powerInfo,
-                singleTab: this.singleTab,
-                scrollTop: this.scrollTop,
-                gotTab2: this.gotTab2
-            }
-            sessionStorage.setItem(this.sessKey, JSON.stringify(data))
-        },
-        reStoreState: function () {
-            var $data = sessionStorage.getItem(this.sessKey)
-            if ($data) {
-                $data = JSON.parse($data)
-                // 如果恢复的企业名称和当前url企业名称不同,则清除缓存,重新请求
-                if (this.entInfo.id !== $data.entInfo.id) {
-                    sessionStorage.removeItem(this.sessKey)
-                    return false
-                }
-                this.tabActiveName = $data.tabActiveName
-                Object.assign(this.conf, $data.conf || {})
-                Object.assign(this.entInfo, $data.entInfo || {})
-                Object.assign(this.entBaseInfo, $data.entBaseInfo || {})
-                Object.assign(this.topProject, $data.topProject || {})
-                Object.assign(this.entPortraitInfo, $data.entPortraitInfo || {})
-                Object.assign(this.powerInfo, $data.powerInfo || {})
-                Object.assign(this.entvisit, $data.entvisit || {})
-                this.singleTab = $data.singleTab
-                this.scrollTop = $data.scrollTop
-                this.gotTab2 = $data.gotTab2
-                sessionStorage.removeItem(this.sessKey)
-            }
-            return !!$data
-        },
-        // 高级分析设置
-        goHighSet () {
-          var url = this.getProjectNewsUrl()
-          var reqSign = url.indexOf('subVipPortrait') === -1 ? 'bigmember' : 'svip'
-          if (this.conf._4) {
-            location.href = '/big/wx/page/free_high_set?header=中标分析高级设置&eid=' + utils.getParam('eId') + '&reqSign=' + reqSign
+          if (!list.buyerclass || ($.isArray(list.topData) && list.topData.length === 0)) {
+            // console.log('此数据为空')
           } else {
-            this.$dialog.confirm({
-              className:'promatch',
-              title: '您暂无使用权限',
-              message: '您未购买此服务,如需使用请联系您的销售人员或客服升级套餐,谢谢!',
-              showCancelButton: false,
-              confirmButtonColor: '#2cb7ca',
-              confirmButtonText: '我知道了'
-            }).then(function () {})
+            arr.push(i1)
           }
+        })
+      }
+      this.importantCustomers = arr
+    },
+    // 去公告详情页
+    toProjectDetail: function (item) {
+      this.savePageState()
+      if (item.id) {
+        var href = '/article/content/' + item.id + '.html'
+        location.href = href
+      }
+    },
+    goToFilterProjectNews: function () {
+      this.savePageState()
+      var url = this.getProjectNewsUrl()
+      var reqSign = url.indexOf('subVipPortrait') === -1 ? 'bigmember' : 'svip'
+      location.href = '/big/wx/page/free_ent_project_news?eid=' + this.entInfo.id + '&reqSign=' + reqSign
+    },
+    savePageState: function () {
+      this.scrollTop = $('#ent-portrait').scrollTop()
+      var data = {
+        conf: this.conf,
+        tabActiveName: this.tabActiveName,
+        entInfo: this.entInfo,
+        entBaseInfo: this.entBaseInfo,
+        topProject: this.topProject,
+        entPortraitInfo: this.entPortraitInfo,
+        powerInfo: this.powerInfo,
+        singleTab: this.singleTab,
+        scrollTop: this.scrollTop,
+        gotTab2: this.gotTab2
+      }
+      sessionStorage.setItem(this.sessKey, JSON.stringify(data))
+    },
+    reStoreState: function () {
+      var $data = sessionStorage.getItem(this.sessKey)
+      if ($data) {
+        $data = JSON.parse($data)
+        // 如果恢复的企业名称和当前url企业名称不同,则清除缓存,重新请求
+        if (this.entInfo.id !== $data.entInfo.id) {
+          sessionStorage.removeItem(this.sessKey)
+          return false
         }
+        this.tabActiveName = $data.tabActiveName
+        Object.assign(this.conf, $data.conf || {})
+        Object.assign(this.entInfo, $data.entInfo || {})
+        Object.assign(this.entBaseInfo, $data.entBaseInfo || {})
+        Object.assign(this.topProject, $data.topProject || {})
+        Object.assign(this.entPortraitInfo, $data.entPortraitInfo || {})
+        Object.assign(this.powerInfo, $data.powerInfo || {})
+        Object.assign(this.entvisit, $data.entvisit || {})
+        this.singleTab = $data.singleTab
+        this.scrollTop = $data.scrollTop
+        this.gotTab2 = $data.gotTab2
+        sessionStorage.removeItem(this.sessKey)
+      }
+      return !!$data
+    },
+    // 高级分析设置
+    goHighSet () {
+      var url = this.getProjectNewsUrl()
+      var reqSign = url.indexOf('subVipPortrait') === -1 ? 'bigmember' : 'svip'
+      if (this.conf._4) {
+        location.href = '/big/wx/page/free_high_set?header=中标分析高级设置&eid=' + utils.getParam('eId') + '&reqSign=' + reqSign
+      } else {
+        this.$dialog.confirm({
+          className: 'promatch',
+          title: '您暂无使用权限',
+          message: '您未购买此服务,如需使用请联系您的销售人员或客服升级套餐,谢谢!',
+          showCancelButton: false,
+          confirmButtonColor: '#2cb7ca',
+          confirmButtonText: '我知道了'
+        }).then(function () { })
+      }
     }
+  }
 }
 var vueComponent = new Vue(vNode)
-$(function () {   
+$(function () {
   var u = navigator.userAgent;
   var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
-  var isPageHide = false;   
-  window.addEventListener('pageshow', function () {   
-      if (isPageHide && isiOS) {   
-      window.location.reload();   
-      }   
-  });   
-  window.addEventListener('pagehide', function () {   
-      isPageHide = true;   
+  var isPageHide = false;
+  window.addEventListener('pageshow', function () {
+    if (isPageHide && isiOS) {
+      window.location.reload();
+    }
+  });
+  window.addEventListener('pagehide', function () {
+    isPageHide = true;
   });
 })

+ 2 - 2
src/web/templates/big-member/wx/page_free_ent_project_news.html

@@ -48,7 +48,7 @@
                     <van-loading v-if="!entInfo.followSearchFinish" size="24px"></van-loading>
                 </div>
             </div>
-            <div class="search-input">
+            <!-- <div class="search-input">
                 <van-search
                     v-model.trim="searchInfo.content"
                     @search="doSearch"
@@ -75,7 +75,7 @@
                         <popup-select-component ref="publishTimeSelector" button-type="button" :data-list="publishTimeList" @confirm="pConfirm($event, 'publishTime')"></popup-select-component>
                     </van-dropdown-item>
                 </van-dropdown-menu>
-            </div>
+            </div> -->
         </div>
         <div class="j-main" ref="jList">
             <div class="list-wrapper">

+ 3 - 3
src/web/templates/big-member/wx/page_unit_portrayal.html

@@ -137,9 +137,9 @@
               </div>
               <div class="static-scope">数据统计范围:${statistics.start || '-'}-${statistics.end}</div>
           </div>
-          <div class="empty" v-show="allNot">
-              <div class="j-img img-empty empty-img"></div>
-              <p class="empty-text">暂无画像信息</p>
+          <div class="jy-empty" v-show="allNot">
+            <div class="jy-empty-img"></div>
+            <p class="jy-empty-text">对不起,没有匹配到相关信息, <br>修改时间范围或换个搜索词试试吧</p>
           </div>
           <!-- 招标动态 -->
           <div class="dynamic" v-if="isShow.showDynamic">

+ 6 - 2
src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -250,6 +250,10 @@
                         <span>${entPortraitInfo.timeRangeEnd ? new Date(entPortraitInfo.timeRangeEnd * 1000).pattern('yyyy/MM/dd') : '至今'}</span>
                     </div>
                 </div>
+                <div class="jy-empty" v-show="allNot">
+                  <div class="jy-empty-img"></div>
+                  <p class="jy-empty-text">对不起,没有匹配到相关信息, <br>修改时间范围或换个搜索词试试吧</p>
+                </div>
                 <div class="vip_component" v-if="getStatus" style="height:2.12rem;background:url('/common-module/collection/image/bg/vip_bg_0.png') no-repeat;background-size:100% 100%"></div>
                 <!-- 项目动态 -->
                 <div class="vip_component test" v-if="getStatus && hideDt" style="height:9.16rem;background:url('/common-module/collection/image/bg/vip_bg_1.png') no-repeat;background-size:100% 100%" key="dt">
@@ -263,10 +267,10 @@
                 <div class="bg-white tab-card cell-list project-news" v-show="conf._13 && topProject.list.length !== 0">
                     <div class="tab-card-title">
                         <span class="t-c-t-l" >项目动态</span>
-                        <span class="t-c-t-r" v-if="isMemberAndSvip" @click="goToFilterProjectNews">
+                        <!-- <span class="t-c-t-r" v-if="isMemberAndSvip" @click="goToFilterProjectNews">
                             <div class="link">高级搜索</div>
                             <div class="preferential-tag">New</div>
-                        </span>
+                        </span> -->
                         <span v-else></span>
                     </div>
                     <div class="tab-card-content">