From 31d936f4ad29c481c7b80fff1621a29805314486 Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Tue, 18 Apr 2023 13:37:30 +0800
Subject: [PATCH] update

---
 .../components/format/fillingDegree.vue       | 19 +++++++++------
 pages/commercialBI/formatPortrait.vue         | 23 +++++++++++++++----
 pages/index/index.vue                         |  2 +-
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/pages/commercialBI/components/format/fillingDegree.vue b/pages/commercialBI/components/format/fillingDegree.vue
index 7c9a05f..d3349e7 100644
--- a/pages/commercialBI/components/format/fillingDegree.vue
+++ b/pages/commercialBI/components/format/fillingDegree.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="fillingDegree">
         <div class="item">
-            <canvas  class="fillDegree" canvas-id="fillDegree" id="fillDegree" @tap="tap" @click.stop="handleChange('')"/>
+            <canvas  class="fillDegree" canvas-id="fillDegree" id="fillDegree" @tap.stop="tap"  @click.stop="handleChange('')"/>
 <!--            <image v-if="fillDegreePath" class="fillDegree" :src="fillDegreePath"></image>-->
         </div>
     </div>
@@ -17,7 +17,8 @@ export default {
           width:0,
           fillDegreePath:'',
           selectIndex: 0,
-          dataList : []
+          dataList : [],
+          isTap:false,//判断是否走了tap
         }
     },
     props: {
@@ -35,10 +36,9 @@ export default {
         }
     },
     methods: {
-        handleChange(type){
-          console.log('type组件里面',type)
-            if (type==='canvas'){
-                this.$emit('handleChangeBandLevel',this.selectIndex)
+        handleChange(){
+            if (this.isTap){
+                this.isTap = false
             }else{
                 this.$emit('handleChangeBandLevel',false)
             }
@@ -47,7 +47,12 @@ export default {
             uChartsInstance[e.target.id].showToolTip(e,{
                 formatter: (item, category, index, opts) =>{
                     this.selectIndex = opts.series[index].key
-                    this.handleChange('canvas')
+                    if (this.selectIndex){
+                        this.$emit('handleChangeBandLevel',this.selectIndex)
+                    }else{
+                        this.$emit('handleChangeBandLevel',false)
+                    }
+                    this.isTap = true
                     return item.name;
                 }
             });
diff --git a/pages/commercialBI/formatPortrait.vue b/pages/commercialBI/formatPortrait.vue
index d91a08c..4374874 100644
--- a/pages/commercialBI/formatPortrait.vue
+++ b/pages/commercialBI/formatPortrait.vue
@@ -10,7 +10,7 @@
             <div class="chartsItem">
                 <p class="title">业态充盈度</p>
                 <div v-if="fillDegreeList.result.series[0].data.length>0">
-                    <filling-degree  :data="fillDegreeList" @handleChangeBandLevel="handleChangeBandLevel"/>
+                    <filling-degree  :data="fillDegreeList" @handleChangeBandLevel="handleChangeBandLevel" :isClick="isClick"/>
                     <analyse :analyseInfo="{analysisins_type: 1502,analysisins_format: 2000}" />
                 </div>
                 <no-data v-else/>
@@ -75,14 +75,17 @@ export default {
             bandLevelList:[],//品牌消费水平
             consumLevelList:[],//业态消费水平
             brandLabelList:[],//品牌指数标签列表
+            brandLabelListNoChange:[],//把第一次进来请求到的标签列表存起来
             brandInfoList:[],//品牌指数列表
+            brandInfoListNoChange:[],//把第一次请求到的全部品牌指数列表存起来
             serviceInfo:{}, //当前服务区信息
             backType:'',//返回的页面类型
             analyseInfo:{
                 analysisins_type: 1501
             },
-          selectKey:'',//有数据的话
-          str:''
+            selectKey:'',//有数据的话
+            str:'',
+            isClick:true,//图表是否能点击
         }
     },
     onLoad(option) {
@@ -218,6 +221,9 @@ export default {
       },
         // 业态充盈的改变事件
         async handleChangeBandLevel(key){
+            uni.showLoading({
+                title: '加载中...'
+            })
             let req
             if (key===false){
                 req = {
@@ -236,8 +242,12 @@ export default {
               this.selectKey = key
             }
             let totalData = await request.$webGet('CommercialApi/BaseInfo/GetBrandAnalysis',req)
-            this.brandLabelList = totalData.Result_Data.BrandTag
-            this.brandInfoList =totalData.Result_Data.ShopBrandList
+            if (totalData.Result_Data){
+                this.brandLabelList = totalData.Result_Data.BrandTag
+                this.brandInfoList =totalData.Result_Data.ShopBrandList
+                uni.hideLoading()
+            }
+
         },
         async nearestService(){
             let seat = uni.getStorageSync('seatInfo');
@@ -378,7 +388,10 @@ export default {
             }
             let totalData = await request.$webGet('CommercialApi/BaseInfo/GetBrandAnalysis',req)
             this.brandLabelList = totalData.Result_Data.BrandTag
+            this.brandLabelListNoChange = totalData.Result_Data.BrandTag
             this.brandInfoList =totalData.Result_Data.ShopBrandList
+            this.brandInfoListNoChange = totalData.Result_Data.ShopBrandList
+            console.log('this.brandInfoList',this.brandInfoList)
 
             // let res = [{icon:'',name:'老娘舅',company:'老娘舅餐饮股份有限公司',type:0,time:'2019.03-2022.03',label:["中式快餐","30-40岁男性"],info:[9,8,8]},
             //     {icon:'',name:'老乡鸡',company:'老乡鸡餐饮股份有限公司',type:1,time:'2019.03-2022.03',label:["中式快餐","30-40岁男性"],info:[9,9,9]},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6182dd0..5418781 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -989,7 +989,7 @@ export default {
          //   StatisticsEndDate:this.lastDay
          // }
          // request.$webGet('CommercialApi/Revenue/GetMallDeliver',buyPrice).then(res=>{
-         //   // 赋值给data中的这个对象 在请求完之后会进行统一的数据处理
+         //   // 赋值给data中的这个对象 在请求完之后会进行统一f的数据处理
          //   this.buyPriceMonth = res.Result_Data.Deliver_Price
          // })
          // 获取营收推送汇总数据