-
- 分析
- {{analyseText}}
-
-
-
- 车流画像
-
-
+
-
-
+
+
-
+ 分析
+ {{analyseText}}
-
-
-
-
-
- {{serviceInfo.SERVERPART_NAME}}
-
{{serviceInfo.SPREGIONTYPE_NAME}}
-
+
+
+ 车流画像
+
+
+
+
+
+
+
-
+
-
+
+
+ {{serviceInfo.SERVERPART_NAME}}
+
-
+
{{serviceInfo.SPREGIONTYPE_NAME}}
+
-
-
-
-
- {{item}}
+
+
+
+ {{item}}
+
-
-
-
昨日入区车流
-
- {{time}}
-
+
+
+
-
-
-
+ 车流画像
+
+
+
+
-
-
-
-
-
- 月度车流累计
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
- {{ single }}
-
-
-
- {{thisMonth?thisMonth:'-'}}月车辆归属地
-
-
-
-
-
- {
+ for (let i=0;i<=item.spList.length-1;i++){
+ for (let j=0;j<=item.spList.length - i - 1;j++){
+ if (item.spList[j] && item.spList[j + 1] && item.spList[j].Vehicle_Count && item.spList[j+1].Vehicle_Count){
+ if (item.spList[j].Vehicle_Count < item.spList[j+1].Vehicle_Count){
+ let temp = item.spList[j]
+ item.spList[j] = item.spList[j + 1]
+ item.spList[j + 1] = temp
+ }
+ }
+ }
+ }
+ })
+ this.regionList = bayonetPie
+ uni.hideLoading()
+ },
//车型选择
handleCarType(selectItem){
if (selectItem.value===this.carType){
@@ -337,6 +554,28 @@ export default {
this.tabList = tabList
}
},
+ async changeAllProvinceSearch(e){
+ const date = new Date(e.detail.value)
+ const y = date.getFullYear()
+ let m = date.getMonth() + 1
+ if (m<10){
+ m = '0'+m
+ }
+ let d = date.getDate()
+ if (d<10){
+ d = '0'+d
+ }
+ this.theRequest = {
+ GroupType: 1000,
+ ProvinceCode: 340000,
+ ServerpartIds: "",
+ ShopAnalysisType: 0,
+ month: `${y}${m}`,
+ time: `${y}-${m}-${d}`,
+ }
+ await this.getDetail(this.theRequest)
+ this.searchText = e.detail.value
+ },
// 时间选择器改变的时间
bindDateChange(e){
const date = new Date(e.detail.value)
@@ -1029,6 +1268,43 @@ export default {
}
}
}
+ .headerTop{
+ width: 100vw;
+ position: fixed;
+ top: 0;
+ left: 0;
+ z-index: 9999999999999;
+ background: linear-gradient(180deg, #A2B9E8 0%, #B2C6ED 100%);
+ .box{
+ padding: 0 16px;
+ position: absolute;
+ box-sizing: border-box;
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ transform: translateY(-50%);
+ .icon{
+ width: 24px;
+ height: 24px;
+ .img{
+ width: 100%;
+ height: 100%;
+ }
+ }
+ .title{
+ font-size: 36rpx;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 600;
+ color: #1C2130;
+ line-height: 56rpx;
+ }
+ .seize{
+ width: 24px;
+ height: 24px;
+ }
+ }
+ }
.charts{
width: 100%;
box-sizing: border-box;
@@ -1212,6 +1488,233 @@ export default {
padding-bottom: 32px;
}
}
+ .otherCharts{
+ width: 100%;
+ box-sizing: border-box;
+ /*日结上传*/
+ .chartsTop {
+ width: 100%;
+ box-sizing: border-box;
+ padding: 0 16px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .left{
+ display: flex;
+ justify-content: flex-start;
+ .serviceArea{
+ box-sizing: border-box;
+ .picker{
+ .selectService{
+ display: flex;
+ align-items: center;
+ .img{
+ width: 40px;
+ height: 40px;
+ z-index: 2;
+ }
+ .select{
+ height: 32px;
+ background: #F8F8FA;
+ border-radius: 0 16px 16px 0;
+ transform: translateX(-20px);
+ box-sizing: border-box;
+ padding-left: 25px;
+ display: flex;
+ align-items: center;
+ .content{
+ display: flex;
+ align-items: center;
+ .uni-input{
+ padding: 0;
+ background: transparent;
+ font-size: 14px;
+ font-family: PingFangSC-Semibold, PingFang SC;
+ font-weight: 600;
+ color: #160002;
+ }
+ .area{
+ font-size: 12px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #786B6C;
+ line-height: 40px;
+ margin-left: 4px;
+ }
+ .rightArrow{
+ width: 24px;
+ height: 12px;
+ }
+ }
+
+ }
+ }
+ }
+ }
+
+ }
+ .right{
+ .time {
+ display: flex;
+ align-items: center;
+ margin-right: 4px;
+ .day {
+ font-size: 32rpx;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #782717;
+ line-height: 44rpx;
+ margin-right: 4px;
+ }
+ .uni-input {
+ font-size: 14px;
+ font-family: PingFangSC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #ae664e;
+ line-height: 36rpx;
+ }
+ .icon {
+ width: 24px;
+ height: 16px;
+ }
+ }
+ }
+ }
+ .list{
+ margin-top: 20px;
+ .listItem{
+ width: 100%;
+ box-sizing: border-box;
+ .itemTop{
+ width: 100%;
+ box-sizing: border-box;
+ padding: 0 16px;
+ position: relative;
+ display: flex;
+ .itemLeft{
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ width: 70%;
+ .serverName{
+ color: #929292;
+ }
+ .value{
+ font-weight: 700;
+ }
+ }
+ .itemCenter{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ .serverName{
+ color: #929292;
+ }
+ .value{
+ font-weight: 700;
+ }
+ }
+ .itemRight{
+ display: inline-block;
+ height: 100%;
+ position: absolute;
+ right: 16px;bottom:0;
+ .rightArrow{
+ width: 16px;
+ height: 16px;
+ }
+ }
+ .other{
+ width: 0;
+ }
+ }
+ .serviceItem{
+ width: 100vw;
+ box-sizing: border-box;
+ padding: 4px 16px;
+ .subItemTop{
+ display: flex;
+ align-items: center;
+ .serviceItemLeft{
+ display: inline-block;
+ width: 30%;
+ .leftIcon{
+ width: 18px;
+ height: 18px;
+ }
+ .name{
+ position: relative;
+ }
+ }
+ .serviceItemCenter{
+ display: inline-block;
+ width: 40%;
+ text-align: center;
+ .title{
+ color: #868686;
+ }
+ }
+ .serviceItemRight{
+ display: inline-block;
+ width: 30%;
+ .text{
+ color: #868686;
+ }
+ }
+ }
+ .subItemBottom{
+ .subBottomItem{
+ .subBottomItemTop{
+ width: 100%;
+ .topLeft{
+ display: inline-block;
+ width: 30%;
+ .position0{
+ position: relative;
+ margin-left: 12px;
+ }
+ .position0:before{
+ content:'';
+ position: absolute;
+ width: 4px;
+ height: 4px;
+ left: -8px;top: calc(50% - 2px);
+ border-radius: 50%;
+ background: #5596F9;
+ }
+ .position1{
+ position: relative;
+ margin-left: 12px;
+ }
+ .position1:before{
+ content:'';
+ position: absolute;
+ width: 4px;
+ height: 4px;
+ left: -8px;top: calc(50% - 2px);
+ border-radius: 50%;
+ background: #FE6D67;
+ }
+ .rate{
+ color: #EF884F;
+ }
+ }
+ .topCenter{
+ display: inline-block;
+ width: 40%;
+ text-align: center;
+ }
+ .topRight{
+ display: inline-block;
+ width: 30%;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
.noData{
width: 100%;
diff --git a/pages/everdayRenven/AnhuiIndex.vue b/pages/everdayRenven/AnhuiIndex.vue
index 537d5b3..b5b0c89 100644
--- a/pages/everdayRenven/AnhuiIndex.vue
+++ b/pages/everdayRenven/AnhuiIndex.vue
@@ -184,7 +184,6 @@
-
+
@@ -19,7 +19,10 @@
{{monthAmountAdd?monthAmountAdd:'-'}}({{thisMonth?thisMonth:'-'}}月累计)
+ {{yearAmountAdd?yearAmountAdd:'-'}}(年度累计)
+
@@ -142,27 +145,127 @@
{{ item.name }}
-
-
@@ -156,13 +253,15 @@ import MonthTotal from "./components/car/monthTotal.vue";
import NoData from "./components/noData.vue";
import Analyse from "./components/analyse.vue";
import CommercialType from "./commercialType.vue";
+import shopCell from "../everdayRenven/components/listUnit.vue";
+import anhuiYestodayRevenueData from "../everdayRenven/components/anhuiYestodayRevenueData";
export default {
name: "carPortrait",
data(){
const lastDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD', -1)
return {
menu:{}, //手机参数
- serviceArray:["123465","123465","123465","123465","123465"], // 选择服务区的列表
+ serviceArray:[], // 选择服务区的列表
serviceIndex:0, //选中的服务区列表的第几个
area:'片区', //属于哪个片区
labelList:[], //标签
@@ -188,6 +287,7 @@ export default {
serviceInfo:{}, //当前服务区信息
backType:'',//返回的页面类型
analyseText:'',//分析的文字
+ statusBarHeight:'',
single:'',//显示时间
lastDay:lastDay,
endTime:'',
@@ -200,9 +300,16 @@ export default {
selectProvinceName:'',// 点击的省份名称
selectValue:'',// 点击的省份值
allProvince:true,// 是否选择了全省
+ isShowAllProvince:false,// 是否展示全省的情况
+ regionList: null,
+ theRequest: null,
+ headMsg:null,
+ searchEndTime:'',
+ searchText:'',// 展示全省情況时显示的日期内容
}
},
components: {
+ shopCell,
CommercialType,
Analyse, NoData, PercentEntry, CarTypeTime, HomePlace, EntryZone,timeAnalysis,MonthTotal},
computed:{
@@ -234,12 +341,17 @@ export default {
this.time = storeTime
}
this.single = this.$util.getThisMonthHave(this.time)
- const date = new Date(this.single)
+ this.searchText = this.time
+ const date = new Date(this.time)
//设置日期选择器的开始时间和结束时间
let m = date.getMonth() + 1
if (m<10){
m = '0' + m
}
+ let d = date.getDate()
+ if (d<10){
+ d = '0'+ d
+ }
this.thisMonth = m
let systemInfo = uni.getSystemInfoSync()
// 获取手机参数对页面进行适配
@@ -257,6 +369,20 @@ export default {
}else{
this.serviceInfo = storeServiceInfo
}
+ this.theRequest = {
+ GroupType: 1000,
+ ProvinceCode: 340000,
+ ServerpartIds: "",
+ ShopAnalysisType: 0,
+ month: `${y}${m}`,
+ time: `${y}-${m}-${d}`,
+ }
+ if (this.serviceInfo.SERVERPART_NAME==='安徽驿达'){
+ this.isShowAllProvince = true
+ }
+ if (this.isShowAllProvince === true){
+ this.getDetail(this.theRequest)
+ }else{
//获取服务区基本信息
this.getServiceInfo()
//月累计
@@ -273,9 +399,14 @@ export default {
this.getPercentEntry()
//获得标签
this.getLabelDetail()
+ }
+
},
onReady(){
+ },
+ onHide(){
+ this.isShowAllProvince = false
},
onUnload() {
this.$util.addUserBehavior()
@@ -284,8 +415,94 @@ export default {
})
this.selectProvinceName = ''
this.carType = ''
+ this.searchText=''
},
methods:{
+ handleNoneChild(obj){
+ this.regionList.forEach(item=>{
+ if (item.name === obj.name){
+ item.showChild = !item.showChild
+ }
+ })
+ },
+ async getDetail(obj) {
+ uni.showLoading({
+ title: '正在加载...'
+ })
+ const requestParamas = {
+ Statistics_Date: obj.time ,
+ 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 : '',
+ // Revenue_Include: 1
+ }
+
+ const bayonetCount = await request.$webGet('CommercialApi/Revenue/GetSPBayonetList', requestParamas)
+ const res = bayonetCount.Result_Data.List
+ let bayonetPie = [] // 区域车流饼图统计数据
+ res.map(async (n, index) => {
+ bayonetPie = anhuiYestodayRevenueData.getBayonetPie('Serverpart_Name', n, bayonetPie)
+ })
+ bayonetPie.forEach((item,index)=>{
+ let entryNum = 0 // 该片区总计的入区车流
+ let flowNum = 0 // 该片区总计的断面流量
+ let entryNumNoZero = 0 //
+ let flowNumNoZero = 0 //
+ item.spList.forEach(subItem=>{
+ entryNum+=subItem.Vehicle_Count
+ flowNum+=subItem.SectionFlow_Count
+ if (subItem.regionList && subItem.regionList.length>0){
+ subItem.regionList.forEach(thirdItem=>{
+ if (thirdItem.SectionFlow_Count===0 || thirdItem.Vehicle_Count===0){
+ thirdItem.entryRate = 0
+ }else{
+ thirdItem.entryRate = Number(((thirdItem.Vehicle_Count / thirdItem.SectionFlow_Count)*100).toFixed(2))
+ }
+
+ if (thirdItem.Vehicle_Count
-
+ {{item.name}}
+
+
-
+
+
+
- 昨日入区车流
+
+ {{time}}
+
+
+
+
+
+ 月度车流累计
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+ {{ single }}
+
+
+
+ {{thisMonth?thisMonth:'-'}}月车辆归属地
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+ {{thisMonth?thisMonth:'-'}}月车型停留分析/日均
+
+
+
+
+
+ {{thisMonth?thisMonth:'-'}}月车型停留分布图/日均
+
+
+
+
+
+
+ {{thisMonth?thisMonth:'-'}}月入区车型占比
+
+ {{allEntry?allEntry:'-'}}%
+
+ (较上月)
+ {{addAllEntry?Math.abs(addAllEntry) + '%':'-' + '%'}}
+
+
+
+
+
+
-
+
+
+
+
+
+
+ {{ searchText }}
+
+
+
+
-
+
+
+
+
+
+
+ {{serviceInfo.SERVERPART_NAME}}
+
+
+
+ {{serviceInfo.SPREGIONTYPE_NAME}}
+
-
- {{thisMonth?thisMonth:'-'}}月车型停留分析/日均
-
-
-
-
- {{thisMonth?thisMonth:'-'}}月车型停留分布图/日均
-
-
-
-
-
-
- {{thisMonth?thisMonth:'-'}}月入区车型占比
-
- {{allEntry?allEntry:'-'}}%
-
- (较上月)
- {{addAllEntry?Math.abs(addAllEntry) + '%':'-' + '%'}}
-
+
+
-
+
+
+
+
+
+
+ {{item.name}}
+ {{item.entry}} / {{item.flow}}
+
+
+
+ 入区率
+ {{item.flowRate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 入区流量/断面流量
+
+
+ 大/中/小车型
+
+
+
+
+
+
+
+
+ {{thirdItem.name}}区
+ :
+ {{thirdItem.entryRate}}%
+
+
+ {{thirdItem.Vehicle_Count}}/{{thirdItem.SectionFlow_Count}}
+
+
+ {{thirdItem.LargeVehicle_Count}}/{{thirdItem.MediumVehicle_Count}}/{{thirdItem.MinVehicle_Count}}
+
+
-
-
-
-
- 抱歉,第三方数据未传,无法分析
-对客营收
+
-
-
-
- {{ item.add?Math.abs(item.add):'' }}
- (相比昨日)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -432,6 +439,7 @@ export default {
{ name: '区域经营', value: 3 }],
selectTab:1, // 选项卡的指针
monthAmountAdd:'',//月累计
+ yearAmountAdd:'',//年累计
mobileData :{}, // 移动支付分账接口返回的数据
single:'', // 时间选择器选择的时间
monthAdd:'',//月每天的相对增加
@@ -578,7 +586,6 @@ export default {
m = '0' + m
}
const time = `${y}-${m}`
- console.log('time',time)
howDay = this.$util.getThisMonthDay(time)
this.startDate = `${y}-${m}-${howDay - k}`
}else{
@@ -824,11 +831,9 @@ export default {
}
//判断是否从推送进来
if (option.ProvinceCode) { // 从推送进入
- console.log('推送')
this.theRequest = option
option.time = this.$util.cutDate(option.time, 'YYYY-MM-DD')
option.month = this.$util.cutDate(option.time, 'YYYYMM')
- console.log('type',type)
if (!type){
this.lastDay = this.$util.cutDate(option.time, 'YYYY-MM-DD')
//修改时间选择器里面的时间
@@ -1019,7 +1024,6 @@ export default {
this.detailTypeList[3].yesterValue = this.$util.fmoney(this.lastDayBillCount.Deliver_Price)
flag2 = true
// .then(res=>{
- // console.log('flag2',res)
// // 赋值给data中的这个对象 在请求完之后会进行统一的数据处理
// this.lastDayBillCount = res.Result_Data
// this.detailTypeList[2].value = this.lastDayBillCount.DeliverBill_Count
@@ -1062,14 +1066,15 @@ export default {
const allPriceData = {
pushProvinceCode:'340000',
Statistics_Date:this.lastDay,
- ShowCompareRate: true
+ ShowCompareRate: true,
+ ShowYearRevenue: true
}
request.$webGet('CommercialApi/Revenue/GetSummaryRevenue',allPriceData).then(res=>{
flag3 = true
// 赋值给data中的这个对象 在请求完之后会进行统一的数据处理
let result = res.Result_Data
for(let key in result){
- if (key!=='RevenuePushModel' && key!=='GrowthRate' && key!=='MonthRevenueAmount'){
+ if (key!=='RevenuePushModel' && key!=='GrowthRate' && key!=='MonthRevenueAmount' && key!=='YearRevenueAmount'){
let all = 0
// 先算出全部的总额数量 用来计算百分比
result[key].forEach(item=>{
@@ -1086,6 +1091,7 @@ export default {
}
}
this.monthAmountAdd = this.$util.fmoney(result.MonthRevenueAmount)
+ this.yearAmountAdd = result.YearRevenueAmount?this.$util.fmoney(result.YearRevenueAmount):'-'
this.modelProgress = result.BusinessTypeList
this.regionProgress = result.BusinessTradeList
this.areaProgress = result.SPRegionList
@@ -1122,13 +1128,10 @@ export default {
// 顶部的时间组件切换时间触发的方法
bindDateChange(e){
let isOnRefresh = false
- console.log('this.startDate',this.startDate)
- console.log('this.noChangeLastDay',this.noChangeLastDay)
let startTime = new Date(this.startDate).getTime()
let endTime = new Date(this.noChangeLastDay).getTime() - 8 * 3600 * 1000 //结束时间戳
const date = new Date(e.detail.value).getTime() - 8 * 3600 * 1000
let startDate = new Date(this.startDate)
- console.log('startDate',startDate)
let startMonth = startDate.getMonth() + 1
let startDay = startDate.getDate()
let endDate = new Date(this.noChangeLastDay)
@@ -1140,8 +1143,6 @@ export default {
}else{
isOnRefresh = true
}
- console.log('isOnRefresh',isOnRefresh)
- console.log('timestampToTime(date)',timestampToTime(date))
// 符合要求的时间可以请求数据 不符合的弹出提示
if (isOnRefresh){
this.single = timestampToTime(date)
@@ -1150,8 +1151,6 @@ export default {
this.thisDay = getThisDay(new Date(e.detail.value).getDay())
this.onRefresh(true)
}else{
- console.log('startMonth',startMonth)
- console.log('startDay',startDay)
uni.showModal({
title: `数据看板仅支持查看${startMonth}.${startDay}-${endMonth}.${endDay}的数据,更多数据请登陆商业综合平台查看`,
icon:'none',
@@ -1338,7 +1337,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
width: 100%;
display: flex;
justify-content: space-between;
- align-items: center;
+ align-items: flex-start;
.title {
font-size: 28rpx;
font-family: PingFangSC-Semibold, PingFang SC;
- {{ item.name }}
{{ item.value }}
-{{ item.yesterValue }}
-
+
+
+
+
-
- 本月累计
- {{ item.value }}
+
+
+
+
+
+ 比计划：
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+ 本月自营计划
+
+
+ {{monthNoticeText}}
+
+ {{plan.percentageMonth?plan.percentageMonth + '%':'-'}}
+{{monthAdd?Math.abs(monthAdd) + '%':'-'}}
+
+
+
+
+
+
+
+ 本月已完成
{{plan.RevenueMonth_Amount?plan.RevenueMonth_Amount:'-'}}
+本月计划
{{plan.BudgetMonth_Amount?plan.BudgetMonth_Amount:'-'}}
+
+
+
+
+
+
+
+
+
+ 比计划：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 年度自营计划
+
+
+ {{yearNoticeText}}
+
+ {{plan.percentageYear?plan.percentageYear + '%':'-'}}
+
+
+ {{yearAdd?Math.abs(yearAdd) + '%':''}}
+
+
+
+
+
+ 年度已完成
{{plan.RevenueYear_Amount?plan.RevenueYear_Amount:'-'}}
+年度计划
{{plan.BudgetYear_Amount?plan.BudgetYear_Amount:'-'}}
+营收占比
@@ -247,102 +350,6 @@
-
-
-
-
-
-
-
-
-
- 比计划：
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 本月自营计划
-
-
- {{monthNoticeText}}
-
- {{plan.percentageMonth?plan.percentageMonth + '%':'-'}}
-{{monthAdd?Math.abs(monthAdd) + '%':'-'}}
-
-
-
-
-
-
-
- 本月已完成
{{plan.RevenueMonth_Amount?plan.RevenueMonth_Amount:'-'}}
-本月计划
{{plan.BudgetMonth_Amount?plan.BudgetMonth_Amount:'-'}}
-
-
-
-
-
-
-
-
-
-
- 比计划：
-
-
-
-
-
-
-
-
-
-
-
-
-
- 年度自营计划
-
-
- {{yearNoticeText}}
-
- {{plan.percentageYear?plan.percentageYear + '%':'-'}}
-
-
- {{yearAdd?Math.abs(yearAdd) + '%':''}}
-
-
-
-
-
- 年度已完成
{{plan.RevenueYear_Amount?plan.RevenueYear_Amount:'-'}}
-年度计划
{{plan.BudgetYear_Amount?plan.BudgetYear_Amount:'-'}}
-