@@ -208,6 +236,7 @@
regionProgress: null,
tradeType: null,
areaProgress: null,
+ bayonetProgress: null,
modelProgress: null,
isup: true,
wechatPushSalesList: null // 甘肃单品排行数据
@@ -244,8 +273,8 @@
if (selectT <= new Date(this.lastDay)) {
this.theRequest.time = e.detail.value
this.theRequest.month = this.$util.cutDate(e.detail.value, 'YYYYMM')
- this.sevenDate = [this.$util.cutDate(selectT, 'MM.DD', -13), this.$util.cutDate(
- selectT, 'MM.DD', -7)]
+ this.sevenDate = [this.$util.cutDate(selectT, 'MM.DD', -13),
+ this.$util.cutDate(selectT, 'MM.DD', -7)]
uni.showLoading({
title: '正在加载...',
mask: true
@@ -270,6 +299,7 @@
let canToSeverpartIndex = !provinceId ? this.hasSeverpartIndexAuthority : this.PushAuthority.some(n => {
return n.ProvinceCode == provinceId && n.ShopAnalysisType == 1
})
+
this.$util.toNextRoute('navigateTo', canToSeverpartIndex ? severpartIndexPath : serverpartUploadPath)
item.visited = true
@@ -423,33 +453,41 @@
},
async initData() { // 初始化营收数据
let _this = this
- const [reginList, totalData, busniessTypePie, busniessTradePie, busniessAreaPie] =
- await anhuiYestodayRevenueData.getData(this.theRequest) // 获取实时数据
- if (this.theRequest.GroupType !== 1010) {
+ const [reginList, totalData, busniessTypePie, busniessTradePie, busniessAreaPie, bayonetPie] =
+ await anhuiYestodayRevenueData.getData(this.theRequest) // 获取实时数据
+ if (this.theRequest.GroupType !== 1010) {
this.regionList = reginList // 营收上传列表 reginListModel[]
}
// 组合及格式化 头部卡片总营收数据。
- totalData.tickave = totalData.ticketCount > 0 ? this.$util.fmoney(totalData.cashPay / totalData
- .ticketCount, 2) : 0
- totalData.countave = totalData.totalCount > 0 ? this.$util.fmoney(totalData.cashPay / totalData
- .totalCount, 2) : 0
+ totalData.tickave = totalData.ticketCount > 0 ? this.$util.fmoney(
+ totalData.cashPay / totalData.ticketCount, 2) : 0
+ totalData.countave = totalData.totalCount > 0 ? this.$util.fmoney(
+ totalData.cashPay / totalData.totalCount, 2) : 0
totalData.totalMoneyShow = this.$util.fmoney(totalData.cashPay) // 营收总数据格式化
totalData.dayOfShow = this.$util.cutDate(this.theRequest.time, 'MM月DD日') // 当前日期
- totalData.budgetamoutShow = totalData.budgetAmount ? _this.$util.fmoney(totalData.budgetAmount) :
- 0.00 // 预算总营收
- totalData.diffBudgetTotal = Math.abs(totalData.budgetAmount - totalData.cashPay) // 预算和实际差额
- totalData.diffBili = totalData.budgetAmount > 0 ? this.$util.fmoney(( totalData.diffBudgetTotal /
- totalData.budgetAmount) * 100, 2) : '100' // 预算和实际增长额比例
+ totalData.budgetamoutShow = totalData.budgetAmount ?
+ _this.$util.fmoney(totalData.budgetAmount) : 0.00 // 预算总营收
- _this.headMsg = totalData
+ busniessTypePie.forEach((n, i) => {
+ if (n.name === '自营') {
+ // 预算和实际差额
+ totalData.diffBudgetTotal = Math.abs(totalData.budgetAmount - n.data)
+ // 预算和实际增长额比例
+ totalData.diffBili = totalData.budgetAmount > 0 ?
+ this.$util.fmoney((totalData.diffBudgetTotal /
+ totalData.budgetAmount) * 100, 2) : '100'
+ }
+ });
+
+ this.headMsg = totalData
// 饼图分析及数据条形分析
const [progressList, pieList] = this.getProgressData(busniessTypePie, totalData.cashPay)
this.modelProgress = progressList
// 经营类型分析
var colors1 = ['#FFAC37', '#6B75B8'];
- console.log(pieList)
+ // console.log(pieList)
this.showPie({
id: 'modelCont',
data: pieList,
@@ -473,15 +511,20 @@
const [aprogressList, apieList] = this.getProgressData(busniessAreaPie, totalData.cashPay)
this.areaProgress = aprogressList
// 区域营收分析
- var colors3 = ['#FFAC37', '#d8ece9', '#f7f5f6', '#b2b7e3', '#F4B27A', '#F3B1C9', '#e0e3f7', '#FFE886',
- '#f7f5f6'
- ];
+ var colors3 = ['#FFAC37', '#d8ece9', '#f7f5f6', '#b2b7e3', '#F4B27A', '#F3B1C9', '#e0e3f7', '#FFE886', '#f7f5f6'];
this.showPie({
id: 'areaCont',
data: apieList,
colors: colors3,
});
+ // 安徽省本级显示的内容
+ if (this.theRequest.GroupType == 1000 && this.theRequest.ProvinceCode == 340000) {
+ // 显示片区车流量数据分析
+ const [bayonetList] = this.getBayonetData(bayonetPie)
+ this.bayonetProgress = bayonetList
+ }
+
if (reginList.length) {
this.showPage = true
}
@@ -524,6 +567,56 @@
})
return [_data2, _data1];
},
+ getBayonetData(data) {
+ var _data1 = [];
+ let _this = this
+
+ data.forEach((n, i) => {
+ var childData = [];
+ n.spList.forEach((m, i) => {
+ // 获取服务区各个方位的入区信息
+ var _list = [];
+ m.regionList.forEach((o, i) => {
+ _list.push({
+ name: o.name,
+ data: o.Vehicle_Count,
+ flow: o.SectionFlow_Count,
+ bili: o.SectionFlow_Count == 0 ? 100 : _this.$util.fmoney(
+ (o.Vehicle_Count / o.SectionFlow_Count) * 100, 2),
+ MinVehicle_Count: o.MinVehicle_Count,
+ MediumVehicle_Count: o.MediumVehicle_Count,
+ LargeVehicle_Count: o.LargeVehicle_Count
+ });
+ });
+ _list.sort(function(a, b) {
+ return b.bili - a.bili
+ })
+
+ childData.push({
+ name: m.name,
+ data: m.Vehicle_Count, //+Number(data2[n[0]])
+ flow: m.SectionFlow_Count,
+ bili: m.SectionFlow_Count == 0 ? 0 : _this.$util.fmoney(
+ (m.Vehicle_Count / m.SectionFlow_Count) * 100, 2),
+ list: _list
+ });
+ });
+ childData.sort(function(a, b) {
+ return b.bili - a.bili
+ })
+
+ _data1.push({
+ name: n.name,
+ index: n.index,
+ list: childData
+ });
+ });
+ _data1.sort(function(a, b) {
+ return a.index - b.index
+ })
+
+ return [_data1];
+ },
async getRankContent() { // 甘肃需要单品排行显示
const {
ProvinceCode,
@@ -555,6 +648,7 @@
this.opacity = (options.scrollTop - 30) / 68
},
onLoad(option) {
+
uni.showLoading({
title: '正在加载...'
})
@@ -569,8 +663,6 @@
if (this.PushAuthority.length > 0) {
this.theRequest = this.defaultMsg() || {}
- console.log('theRequest',this.theRequest)
-
this.theRequest.time = this.lastDay
this.theRequest.month = this.$util.cutDate(this.lastDay, 'YYYYMM')
this.initData()
@@ -972,10 +1064,86 @@
text-align: left;
}
+ /*车流量分析*/
+ .bayonet-cell-area {
+ /* display: none; */
+ max-height: 460rpx;
+ overflow: auto;
+ -webkit-overflow-scrolling: touch;
+ }
+ .bayonet-cell-area li{
+ width: 100%;
+ }
+ .bayonet-cell-area li .server,.bayonet-cell-area li .carType{
+ width: 30%;
+ display: inline-block;
+ text-align: center;
+ }
+ .bayonet-cell-area li .type{
+ width: 40%;
+ display: inline-block;
+ text-align: center;
+ }
+
+
+ .bayonet-cell-area li:nth-child(2n+1):before {
+ content: '';
+ background-color: #5596F9;
+ width: 8rpx;
+ height: 8rpx;
+ border-radius: 8rpx;
+ display: block;
+ position: absolute;
+ left: 0;top: 40%;
+ }
+
+ .bayonet-cell-area li:nth-child(2n):before {
+ content: '';
+ background-color: #FE6D67;
+ width: 8rpx;
+ height: 8rpx;
+ border-radius: 8rpx;
+ display: block;
+ position: absolute;
+ left: 0;top: 40%;
+ }
+
+ .bayonet-cell-area li {
+ width: 100%;
+ /*display: flex;*/
+ /*align-items: center;*/
+ /*justify-content: space-around;*/
+ position: relative;
+ }
+
+ .bayonet-cell-area li>div {
+ flex: 2;
+ }
+
+ .bayonet-cell-area li>div:nth-child(1) {
+ flex: 3;
+ text-align: left;
+ }
+
+ .bayonet-c-list {
+ padding: 16rpx 32rpx;
+ width: 100%;
+ position: relative;
+ }
+
+ .bayonet-c-list div:before {
+ content: '';
+ background: url(/static/images/authority/fwq.png) no-repeat center;
+ width: 35rpx;
+ height: 35rpx;
+ display: inline-block;
+ position: absolute;
+ left: 0;top: 7px;
+ }
+
.modle-title image {
max-width: 36rpx;
max-height: 36rpx;
-
}
.line-tab-unit {
@@ -1177,12 +1345,22 @@
padding: 16rpx 32rpx;
}
- .operation-cl-unit {
- display: flex;
- align-items: center;
- justify-content: space-between;
+ .operation-cl-unit1 {
+ width: 100%;
font-size: 26rpx;
+ display: flex;
+ justify-content: space-between;
}
+ .operation-cl-unit1 .type{
+ width: 40%;
+ display: inline-block;
+ text-align: center;
+ }
+ .operation-cl-unit1 .server,.operation-cl-unit1 .carType{
+ width: 30%;
+ display: inline-block;
+ text-align: center;
+ }
.operation-c-list .progress {
width: 288rpx;
diff --git a/pages/everdayRenven/components/anhHead.vue b/pages/everdayRenven/components/anhHead.vue
index 0ad3b54..c0b8867 100644
--- a/pages/everdayRenven/components/anhHead.vue
+++ b/pages/everdayRenven/components/anhHead.vue
@@ -49,6 +49,28 @@
+
+
+
+ 分润门店
+
+ {{headMsg.shareShopCount}}个
+
+
+
+
+
+ 驿达分润
+
+ {{ $util.fmoney(headMsg.royaltyPrice) }}元
+
+
+
+
+
@@ -56,7 +78,6 @@
-
商超营收
{{$util.fmoney(headMsg.scCashPay,2)}} 元
@@ -110,7 +131,6 @@
商品均价
{{$util.fmoney(headMsg.countave,2)}} 元
-
-
+