diff --git a/pages/everdayRenven/AnhuiIndex.vue b/pages/everdayRenven/AnhuiIndex.vue index d47386b..0b2dd35 100644 --- a/pages/everdayRenven/AnhuiIndex.vue +++ b/pages/everdayRenven/AnhuiIndex.vue @@ -480,7 +480,6 @@ totalData.budgetAmount) * 100, 2) : '100' } }); - this.headMsg = totalData // 饼图分析及数据条形分析 const [progressList, pieList] = this.getProgressData(busniessTypePie, totalData.cashPay) diff --git a/pages/everdayRenven/components/anhuiYestodayRevenueData.js b/pages/everdayRenven/components/anhuiYestodayRevenueData.js index de51919..85cdb68 100644 --- a/pages/everdayRenven/components/anhuiYestodayRevenueData.js +++ b/pages/everdayRenven/components/anhuiYestodayRevenueData.js @@ -20,8 +20,8 @@ const methods = { Statistics_Month: obj.month , Province_Code: obj.ProvinceCode , pushProvinceCode: obj.ProvinceCode , - Serverpart_ID: obj.GroupType == 1020 ? '' : obj.ServerpartIds, - SPRegionType_ID: obj.GroupType == 1020 ? obj.ServerpartIds : '' + Serverpart_ID: obj.ServerpartIds ? obj.ServerpartIds : '', + SPRegionType_ID: obj.GroupType == 1020 ? obj.ServerpartIds : '', // Revenue_Include: 1 } this.provinceCode = obj.ProvinceCode @@ -44,8 +44,8 @@ const methods = { // 移动支付分账数据 const mobileShare = await request.$webGet('CommercialApi/Revenue/GetMobileShare', requestParamas) if (mobileShare.Result_Code != 100) return - - // 片区车流量 + + // 片区车流量 const bayonetCount = await request.$webGet('CommercialApi/Revenue/GetSPBayonetList', requestParamas) if (bayonetCount.Result_Code != 100) return @@ -57,6 +57,7 @@ const methods = { tradeData.Result_Data.List, budgetAmount.Result_Data.List, bayonetCount.Result_Data.List, mobileShare.Result_Data) // [reginList, totalData, busniessTypePie, busniessTradePie] + }, getTotalShowData(newData, oldData,index) { // @@ -110,7 +111,6 @@ const methods = { } } - return {...oldData} }, getBusniessPie(typeName, item, list) { // 经营模式数据 @@ -230,13 +230,13 @@ const methods = { totalShow.uploadCount = data.filter(n=>n.Revenue_Upload>0).length totalShow.totalUploadCount = shopCountList.length ? shopCountList[0].SHOP_BUSINESSCOUNT: 0 totalShow.budgetAmount = 0 - if(budgetAmount.length){ totalShow.budgetAmount = budgetAmount[0].BUDGET_AMOUNT } return [ totalShow, busniessTypePie, busniessTradePie,busniessTradeFathPie ] }, getReginList(data, shopCountList,tradeList,budgetAmount,bayonetCount, mobileShare) { + let _this = this let totalShow = {} // 总营收数据统计 let list = [] // 上传营收列表数据 @@ -304,7 +304,7 @@ const methods = { regin.child.sort((a, b) => b.cashpay - a.cashpay) } totalShow = _this.getTotalShowData(n, totalShow,index); // 总营收数据统计 - + busniessTypePie = _this.getBusniessPie('Business_TypeName', n, busniessTypePie) busniessTradePie = _this.getBusniessPie('tradename', n, busniessTradePie) if (this.groupType == 1000){ @@ -312,7 +312,6 @@ const methods = { } }) list.sort((a, b) => b.cashpay - a.cashpay) - if (this.groupType == 1000 && _this.provinceCode == 340000) { // 获取移动支付分账数据 if (mobileShare) {