From 8a8d1057699eb0f57f1d059bfd41ae3d19a98066 Mon Sep 17 00:00:00 2001
From: zzy <411037547@qq.com>
Date: Thu, 2 Mar 2023 14:14:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=BE=BD=E8=90=A5=E6=94=B6=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=8E=A8=E9=80=81=EF=BC=9A=201=E3=80=81=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E8=BD=A6=E6=B5=81=E5=88=86=E6=9E=90=202=E3=80=81?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=BB=E5=8A=A8=E6=94=AF=E4=BB=98=E5=88=86?=
=?UTF-8?q?=E8=B4=A6=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../shopmobilesummary/components/listUnit.vue | 41 ++--
pages/autoTest/shopmobilesummary/detail.vue | 31 +--
pages/autoTest/shopmobilesummary/index.vue | 40 ++--
pages/everdayRenven/AnhuiIndex.vue | 202 +++++++++++++++---
pages/everdayRenven/components/anhHead.vue | 162 +++++++-------
.../components/anhuiYestodayRevenueData.js | 121 +++++++++--
project.config.json | 2 +-
static/images/authority/fwq.png | Bin 0 -> 1443 bytes
static/images/authority/serverpart.png | Bin 1570 -> 1958 bytes
9 files changed, 447 insertions(+), 152 deletions(-)
create mode 100644 static/images/authority/fwq.png
diff --git a/pages/autoTest/shopmobilesummary/components/listUnit.vue b/pages/autoTest/shopmobilesummary/components/listUnit.vue
index be5e906..8e02d6b 100644
--- a/pages/autoTest/shopmobilesummary/components/listUnit.vue
+++ b/pages/autoTest/shopmobilesummary/components/listUnit.vue
@@ -18,49 +18,66 @@
{{item.SERVERPART_NAME || ''}}
-
- {{item.SERVERPART_ID || ''}}
+
+ {{item.SERVERPART_CODE || ''}}
- {{item.FACT_AMOUNT != null ? item.FACT_AMOUNT : ''}}
+ {{item.FACT_AMOUNT !== null ?
+ item.FACT_AMOUNT : ''}}
+ 元
-
- {{item.SERVERPART_CODE || ''}}
+
+ {{item.FACT_AMOUNT !== null ?
+ item.FACT_AMOUNT : ''}}
-
+
- 微信支付:{{item.TICKETBILL || ''}}
+ 微信支付:{{item.TICKETBILL !== null ?
+ item.TICKETBILL : ''}}
+
+
+ {{item.SERVERPART_ID !== null ?
+ item.SERVERPART_ID : ''}}
-
+
- 支付宝:{{item.OTHERPAY || ''}}
+ 其他支付(支付宝):{{item.OTHERPAY !== null ?
+ item.OTHERPAY : ''}}
+
+
+ {{item.SERVERPART_CODE || ''}}
-
+
-
+
- 到账实差:{{item.SALE_CORRECT || ''}}
+ 行业名称:{{item.SHOPTRADE !== null ?
+ businesstype[item.SHOPTRADE] : ''}}
+
+
+ {{item.SHOPTRADE !== null ?
+ businesstype[item.SHOPTRADE] : ''}}
diff --git a/pages/autoTest/shopmobilesummary/detail.vue b/pages/autoTest/shopmobilesummary/detail.vue
index 38b9ec1..adbab9d 100644
--- a/pages/autoTest/shopmobilesummary/detail.vue
+++ b/pages/autoTest/shopmobilesummary/detail.vue
@@ -7,15 +7,16 @@
门店简称:{{dataDetail.SHOPSHORTNAME || ''}}
- 行业名称:{{dataDetail.SHOPTRADE !== null ?
- businesstype[dataDetail.SHOPTRADE] : ''}}
+ 移动支付金额:{{dataDetail.FACT_AMOUNT !== null ?
+ dataDetail.FACT_AMOUNT : ''}}
服务区名称:{{dataDetail.SERVERPART_NAME || ''}}
- 移动支付金额:{{dataDetail.FACT_AMOUNT || ''}}
+ 到账实差:{{dataDetail.SALE_CORRECT !== null ?
+ dataDetail.SALE_CORRECT : ''}}
@@ -25,17 +26,6 @@
-
-
- 服务区名称:
- {{dataDetail.SERVERPART_NAME || ''}}
-
-
-
- 行业名称:
- {{dataDetail.SHOPTRADE !== null ?
- businesstype[dataDetail.SHOPTRADE] : ''}}
-
服务区编码:
@@ -70,6 +60,17 @@
{{dataDetail.SALE_CORRECT !== null ?
dataDetail.SALE_CORRECT : ''}}
+
+
+ 行业名称:
+ {{dataDetail.SHOPTRADE !== null ?
+ businesstype[dataDetail.SHOPTRADE] : ''}}
+
+
+
+ 服务区名称:
+ {{dataDetail.SERVERPART_NAME || ''}}
+
@@ -95,7 +96,7 @@
* Api接口地址:EShangApiMain/AutoTest/GetShopMobileSummary
*/
getDetail(option) {
- this.$request.$webGet("EShangApiMain/AutoTest/GetShopMobileSummary", {
+ this.$request.$webGetTest("EShangApiMain/AutoTest/GetShopMobileSummary", {
//这里设置接口参数
SearchStatisticsStartDate: option.SearchStatisticsStartDate,
SearchStatisticsEndDate: option.SearchStatisticsEndDate,
diff --git a/pages/autoTest/shopmobilesummary/index.vue b/pages/autoTest/shopmobilesummary/index.vue
index d3beeb2..15dc866 100644
--- a/pages/autoTest/shopmobilesummary/index.vue
+++ b/pages/autoTest/shopmobilesummary/index.vue
@@ -155,25 +155,35 @@
src: '/static/images/expense/type/qb.png',
typeId: -1
},
- {
- name: '特产',
- src: '/static/images/expense/type/qb.png',
- typeId: 1002
- },
- {
- name: '箱包',
- src: '/static/images/expense/type/qb.png',
- typeId: 1004
- },
{
name: '便利店',
src: '/static/images/expense/type/qb.png',
typeId: 1005
},
{
- name: '水果报刊音像',
+ name: '工艺品',
src: '/static/images/expense/type/qb.png',
- typeId: 1006
+ typeId: 1007
+ },
+ {
+ name: '水果',
+ src: '/static/images/expense/type/qb.png',
+ typeId: 1014
+ },
+ {
+ name: '粽子',
+ src: '/static/images/expense/type/qb.png',
+ typeId: 2002
+ },
+ {
+ name: '面食',
+ src: '/static/images/expense/type/qb.png',
+ typeId: 2003
+ },
+ {
+ name: '餐饮',
+ src: '/static/images/expense/type/qb.png',
+ typeId: 3000
},
],
},
@@ -225,7 +235,7 @@
* Api接口地址:EShangApiMain/AutoTest/GetShopMobileSummary
*/
getList() {
- this.$request.$webGet("EShangApiMain/AutoTest/GetShopMobileSummary", {
+ this.$request.$webGetTest("EShangApiMain/AutoTest/GetShopMobileSummary", {
SHOPTRADE: this.activeType === -1 ? '' : this.activeType,
SearchStatisticsStartDate: this.searchTime[0],
SearchStatisticsEndDate: this.searchTime[1],
@@ -280,9 +290,7 @@
* @param {Object} item
*/
goDetail(item) {
- this.$util.toNextRoute('navigateTo', '/pages/autoTest/shopmobilesummary/detail?SHOPSHORTNAME=' +
- item.SHOPSHORTNAME + '&SERVERPART_ID=' + item.SERVERPART_ID + '&SearchStatisticsStartDate=' +
- this.searchTime[0] + '&SearchStatisticsEndDate=' + this.searchTime[1])
+ this.$util.toNextRoute('navigateTo', '/pages/autoTest/shopmobilesummary/detail?SearchStatisticsStartDate=' + this.searchTime[0] + '&SearchStatisticsEndDate=' + this.searchTime[1] + '&SHOPSHORTNAME=' + item.SHOPSHORTNAME + '&SERVERPART_ID=' + item.SERVERPART_ID)
},
reloadList() {
this.showPop = false
diff --git a/pages/everdayRenven/AnhuiIndex.vue b/pages/everdayRenven/AnhuiIndex.vue
index a3e6501..a69c766 100644
--- a/pages/everdayRenven/AnhuiIndex.vue
+++ b/pages/everdayRenven/AnhuiIndex.vue
@@ -2,6 +2,7 @@
@@ -21,9 +22,12 @@
区域营收
+ 车流分析
+
+
+
+
+
+ {{item.name}}
+
+
+
+ {{child.name}}
+ 入区流量/断面流量
+ 大/中/小型车
+
+
+ -
+ {{childItem.name}}区:{{childItem.bili}}%
+ {{childItem.data}}/{{childItem.flow}}
+ {{childItem.LargeVehicle_Count}}/{{childItem.MediumVehicle_Count}}/{{childItem.MinVehicle_Count}}
+
+
+
+
+
+
+
@@ -80,10 +110,10 @@
日结上传
-
- 门店上传 {{headMsg.uploadState}}
+
+ 门店上传 {{headMsg.uploadState}}
+
@@ -205,6 +235,7 @@
regionProgress: null,
tradeType: null,
areaProgress: null,
+ bayonetProgress: null,
modelProgress: null,
isup: true,
wechatPushSalesList: null // 甘肃单品排行数据
@@ -241,8 +272,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
@@ -420,25 +451,33 @@
},
async initData() { // 初始化营收数据
let _this = this
- const [reginList, totalData, busniessTypePie, busniessTradePie, busniessAreaPie] =
- await anhuiYestodayRevenueData.getData(this.theRequest) // 获取实时数据
+ 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((headMsg.diffBudgetTotal /
- totalData.budgetAmount) * 100, 2) : '100' // 预算和实际增长额比例
+ totalData.budgetamoutShow = totalData.budgetAmount ?
+ _this.$util.fmoney(totalData.budgetAmount) : 0.00 // 预算总营收
+
+ 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
// 饼图分析及数据条形分析
@@ -446,7 +485,7 @@
this.modelProgress = progressList
// 经营类型分析
var colors1 = ['#FFAC37', '#6B75B8'];
- console.log(pieList)
+ // console.log(pieList)
this.showPie({
id: 'modelCont',
data: pieList,
@@ -470,15 +509,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
}
@@ -521,6 +565,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,
@@ -968,10 +1062,70 @@
text-align: left;
}
+ /*车流量分析*/
+ .bayonet-cell-area {
+ /* display: none; */
+ max-height: 460rpx;
+ overflow: auto;
+ -webkit-overflow-scrolling: touch;
+ }
+
+ .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: 1rpx;
+ }
+
+ .bayonet-cell-area li:nth-child(2n):before {
+ content: '';
+ background-color: #FE6D67;
+ width: 8rpx;
+ height: 8rpx;
+ border-radius: 8rpx;
+ display: block;
+ position: absolute;
+ left: 1rpx;
+ }
+
+ .bayonet-cell-area li {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 1rpx 1rpx 1rpx 20rpx;
+ 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;
+ }
+
+ .bayonet-c-list div:before {
+ content: '';
+ background: url(/static/images/authority/fwq.png) no-repeat center;
+ width: 35rpx;
+ height: 35rpx;
+ display: block;
+ position: absolute;
+ left: 65rpx;
+ }
+
.modle-title image {
max-width: 36rpx;
max-height: 36rpx;
-
}
.line-tab-unit {
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)}} 元
-
-
+
-
-
-
-
- {{headMsg.totalMoneyShow}}
-
- (元)
-
+
+
-
-
-
计划营收
-
{{headMsg.budgetamoutShow}}
-
-
-
相比计划
-
- {{$util.fmoney(headMsg.diffBudgetTotal) }}
- {{headMsg.diffBili}}%
-
-
+
+
+ {{headMsg.totalMoneyShow}}
+
+ (元)
-
-
+
+
+
+
计划营收
+
{{headMsg.budgetamoutShow}}
-
-
-
-
-
-
-
长款金额
-
{{headMsg.DIFFERENT_PRICE_MORE}} 元
-
-
-
短款金额
-
{{headMsg.DIFFERENT_PRICE_LESS}} 元
-
-
-
客单交易
-
{{headMsg.TICKETCOUNT}} 笔
-
-
-
客单均价
-
{{headMsg.TICKETAVE}} 元
-
-
-
-
-
优惠金额
-
{{headMsg.TOTALOFFAMOUNT}} 元
-
-
-
移动支付
-
{{headMsg.MOBILEPAYMENT}} 元
-
-
-
商品出售
-
{{headMsg.COMMODITY_COUNT}} 件
-
-
-
商品均价
-
{{headMsg.COMMODITYAVE}} 元
+
+
相比计划
+
+ {{$util.fmoney(headMsg.diffBudgetTotal) }}
+ {{headMsg.diffBili}}%
-
+
+
+
+
+
+
+
+
+
+
长款金额
+
{{headMsg.DIFFERENT_PRICE_MORE}} 元
+
+
+
短款金额
+
{{headMsg.DIFFERENT_PRICE_LESS}} 元
+
+
+
客单交易
+
{{headMsg.TICKETCOUNT}} 笔
+
+
+
客单均价
+
{{headMsg.TICKETAVE}} 元
+
+
+
+
+
优惠金额
+
{{headMsg.TOTALOFFAMOUNT}} 元
+
+
+
移动支付
+
{{headMsg.MOBILEPAYMENT}} 元
+
+
+
商品出售
+
{{headMsg.COMMODITY_COUNT}} 件
+
+
+
商品均价
+
{{headMsg.COMMODITYAVE}} 元
+
+
+
-
+