ylj/ahyd_DIB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
cclu 2023-10-30 16:13:37 +08:00
parent 1d001a6340
commit cf26c2a445
9 changed files with 702 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ahyd_DIB.zip
View File

Binary file not shown.

13
pages/index/index.vue
View File

@ -2038,13 +2038,13 @@ $iphoneHeight: env(safe-area-inset-bottom);
} }
.header { .header {
width: 100%; width: 100%;
//background: linear-gradient(315deg, #FF8670 0%, #FFDCA8 100%); background: linear-gradient(315deg, #FF8670 0%, #FFDCA8 100%);
box-sizing: border-box; box-sizing: border-box;
//padding: 0 16px; //padding: 0 16px;
//position: relative; //position: relative;
.headerTop{ .headerTop{
width: 100%; width: 100%;
//background: linear-gradient(315deg, #FFAF95 0%, #FFD6A6 100%); background: linear-gradient(315deg, #FFAF95 0%, #FFD6A6 100%);
position: fixed; position: fixed;
top: 0;left:0; top: 0;left:0;
box-sizing: border-box; box-sizing: border-box;
@ -3197,7 +3197,12 @@ $iphoneHeight: env(safe-area-inset-bottom);
} }
} }
} }
//.firstHeader{
// background: linear-gradient(315deg, #FF8670 0%, #FFDCA8 100%)!important;
// .headerTop{
// background: linear-gradient(315deg, #FFAF95 0%, #FFD6A6 100%)!important;
// }
//}
.secondHeader{ .secondHeader{
background: linear-gradient(315deg, #69BDE6 0%, #9BE2F5 100%)!important; background: linear-gradient(315deg, #69BDE6 0%, #9BE2F5 100%)!important;
.headerTop{ .headerTop{
@ -3621,7 +3626,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
.topText{ .topText{
font-size: 32rpx; font-size: 32rpx;
//font-family: Alimama ShuHeiTi; font-family: Alimama ShuHeiTi;
font-weight: bold; font-weight: bold;
color: #EC6C00; color: #EC6C00;
line-height: 38rpx; line-height: 38rpx;

5
pages/nationalPage/components/entryCarNumber.vue
View File

@ -36,8 +36,9 @@ export default {
console.log('e',e) console.log('e',e)
uChartsInstance[e.target.id].showToolTip(e, { uChartsInstance[e.target.id].showToolTip(e, {
formatter: (item, category, index, opts) => { formatter: (item, category, index, opts) => {
console.log('item',item)
if (item.data){ if (item.data){
return item.name + ":" + item.data + '万元'; return item.name + ":" + this.$util.fmoney(item.data.value,2) + '万元';
}else{ }else{
return item.name + ":" + 0 + '万元'; return item.name + ":" + 0 + '万元';
} }
@ -85,7 +86,7 @@ export default {
return 5 return 5
}else{ }else{
let sum = Number(value) + Number(value) *0.2 let sum = Number(value) + Number(value) *0.2
return Number((sum / 1000).toFixed(0)) * 1000 return Number((Math.ceil(sum / 1000)).toFixed(0)) * 1000
} }
}, },
drawCharts(id, data,config) { drawCharts(id, data,config) {

4
pages/nationalPage/components/yearRevenue.vue
View File

@ -39,7 +39,7 @@ export default {
uChartsInstance[e.target.id].showToolTip(e, { uChartsInstance[e.target.id].showToolTip(e, {
formatter: (item, category, index, opts) => { formatter: (item, category, index, opts) => {
if (item.data){ if (item.data){
return item.name + ":" + this.$util.noDecimal(item.data) + '辆'; return item.name + ":" + this.$util.noDecimal(item.data.value) + '辆';
}else{ }else{
return item.name + ":" + 0 + '辆'; return item.name + ":" + 0 + '辆';
} }
@ -74,7 +74,7 @@ export default {
return 5 return 5
}else{ }else{
let sum = Number(value) + Number(value) *0.2 let sum = Number(value) + Number(value) *0.2
return Number((sum / 1000).toFixed(0)) * 1000 return Number((Math.round(sum / 10000))*1.2) * 10000
} }
}, },
drawCharts(id, data,config) { drawCharts(id, data,config) {

807
pages/nationalPage/index.vue
View File

@ -1,23 +1,27 @@
<template> <template>
<div class="main"> <div class="main">
<div class="top" :style="{height:menu.height + menu.top+212+'rpx'}"> <div :class="selectTab===1?'top':
selectIndex===1?'top springTop':selectIndex===2?'top labourTop':selectIndex===3?'top summerHolidayTop':selectIndex===4?'top nationalDayTop':''" :style="{
height:menu.height + menu.top+212+'rpx'}">
<!-- <image class="topBg" src="https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/pageBg.png"/>--> <!-- <image class="topBg" src="https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/pageBg.png"/>-->
<div class="header" :style="{height:menu.height + menu.top + 'px',top:0+'px'}"> <div class="header" :style="{height:menu.height + menu.top + 'px',top:0+'px'}">
<image :style="{bottom: ((statusBarHeight-24)/4)+'px' }" class="backArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg" @click="handleBack"/> <image :style="{bottom: ((statusBarHeight-24)/4)+'px' }" class="backArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg" @click="handleBack"/>
</div> </div>
<div class="topContent" :style="{top:200+'rpx'}"> <div class="topContent" :style="{top:200+'rpx'}">
<p class="pageTitle" v-if="selectTab===1">欢度国庆</p> <p class="pageTitle" v-if="selectTab===1">节日特刊</p>
<picker v-else mode="selector" :range="festival" range-key="label" :value="selectIndex-1" @change="handleChangeType" > <picker v-else mode="selector" :range="festivalList" range-key="label" :value="selectIndex-1" @change="handleChangeType" >
<div style="display: flex;align-items: center"> <div style="display: flex;align-items: center">
<p class="pageTitle" style="margin-right: 8px">{{`欢度${festival[selectIndex - 1].label}`}}</p> <p class="pageTitle" :style="{marginRight: '8px'}">{{`${festivalList[selectIndex-1].label}`}}</p>
<img style="width: 20px;height: 20px" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stDownArrow.svg"/> <img style="width: 32rpx;height: 32rpx" src="https://eshangtech.com/ShopICO/ahyd-BID/national/selectIcon.png"/>
</div> </div>
</picker> </picker>
</div> </div>
</div> </div>
<div class="pageContent" :style="{backgroundPositionY:-(menu.height + menu.top+200)+'rpx'}"> <div :class="selectTab===1?'pageContent':
selectIndex===1?'pageContent pageContentSpring':selectIndex===2?'pageContent pageContentLabour':selectIndex===3?'pageContent pageContentSummerHoliday':selectIndex===4?'pageContent pageContentNationalDay':''" :style="{
backgroundPositionY:-(menu.height + menu.top+200)+'rpx'}">
<div class="tabBox" v-if="isUserEnter"> <div class="tabBox" v-if="isUserEnter">
<div :class="selectTab===1?'tabItem selectTab':'tabItem'" @click="changeTab(1)">排行分析</div> <div :class="selectTab===1?'tabItem selectTab':'tabItem'" style="margin-right: 48rpx" @click="changeTab(1)">排行分析</div>
<div :class="selectTab===2?'tabItem selectTab':'tabItem'" @click="changeTab(2)">同比分析</div> <div :class="selectTab===2?'tabItem selectTab':'tabItem'" @click="changeTab(2)">同比分析</div>
</div> </div>
@ -129,48 +133,71 @@
</div> </div>
<div v-if="selectTab===2" class="selectTab2"> <div v-if="selectTab===2" class="selectTab2">
<div class="detail"> <div class="newDetail">
<div class="detailTop"> <div class="newDetailTop">
<p class="tabTitle">营收同比</p> <div class="newDetailTopLeft">
<span class="timeText">{{showTimeText}}</span> <img class="leftIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/national/revenueIcon.svg"/>
<div class="leftTextBox">
<span class="leftBoxTitle">营收同比</span>
<span class="leftTime">{{selectIndex!==1 && selectIndex!==3?timeFrame:revenueCompareDetail.curHoliday}}</span>
</div> </div>
<div class="money">
<div class="moneyTop">
<p class="moneyTitle">2023年对客营收金额：</p>
<!-- -->
<p class="sumMoney">{{ $util.fmoney(currentRevenue,2) }}元</p>
</div> </div>
<div class="moneyTop"> <div class="newDetailRight" v-if="revenueCompareDetail.curRevenue">
<p class="moneyTitle">2022年对客营收金额：</p> {{`${revenueCompareDetail.compareRevenue /revenueCompareDetail.curRevenue>0?'+':'-'}`+((revenueCompareDetail.compareRevenue /revenueCompareDetail.curRevenue)*100).toFixed(2)+'%' }}
<p class="sumMoney">{{ $util.fmoney(compareRevenue,2) }}元</p>
</div> </div>
<div class="moneyTop">
<p class="moneyTitle">同期对比：</p>
<p class="sumMoney">{{add}}%</p>
</div> </div>
<div class="desc">
<div class="descLeft">
<p style="line-height: 36rpx">注:</p>
</div>
<div class="descRight">
<p>{{`2022年${festival[selectIndex - 1].label}假期为${selectIndex===1?'10.1-10.7':selectIndex===2?'4.30-5.4':'1.31-2.09'},共${selectIndex===1?'7':selectIndex===2?'5':'10'}日`}}</p>
<p>{{`2023年${festival[selectIndex - 1].label}假期为${selectIndex===1?'10.1-10.7':selectIndex===2?'4.29-5.5':'1.20-1.29'},共${selectIndex===3?10:7}日`}}</p> <div class="compareBox">
<p></p> <img class="vsIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/national/vs.svg"/>
<div class="compareItem" style="background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/national/compareLeft.svg')">
<span class="compareTitleLeft">{{`${compareYear}年营收/元`}}</span>
<span class="leftValue">{{revenueCompareDetail.compareRevenue?$util.fmoney(revenueCompareDetail.compareRevenue,2):'-'}}</span>
</div>
<div class="compareItem" style="background-image: url('https://eshangtech.com/ShopICO/ahyd-BID/national/compareRight.svg')">
<span class="compareTitleRight ">{{`${curYear}年营收/元`}}</span>
<span class="rightValue">{{ revenueCompareDetail.curRevenue?$util.fmoney(revenueCompareDetail.curRevenue,2):'-' }}</span>
</div>
</div>
<div class="descBox">
<div class="noticeBox">注</div>
<div class="noticeText">
<span class="text">{{ `${compareYear || '-'}年${holidayName || '-'}假期为${carCompareDetail.compareHoliday || '-'}，共${carCompareDetail.compareHolidayDays || '-'}日` }}</span>
<span class="text">{{ `${curYear || '-'}年${holidayName || '-'}假期为${carCompareDetail.curHoliday || '-'}，共${carCompareDetail.curHolidayDays || '-'}日` }}</span>
</div> </div>
</div> </div>
</div> </div>
<div class="newDetail">
<div class="newDetailTop carEntry">
<div class="newDetailTopLeft">
<img class="leftIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/national/carEntry.svg"/>
<div class="leftTextBox">
<span class="leftBoxTitle">入区车流量</span>
<span class="leftTime">{{selectIndex===1?'腊月十五-正月廿五':(selectIndex!==1 && selectIndex!==3?timeFrame:revenueCompareDetail.curHoliday)}}</span>
</div>
</div>
</div> </div>
<div class="detail">
<p class="tabTitle">入区车流量</p>
<span class="unit">单位：辆</span>
<YearRevenue :dataList="carCompareList"/> <YearRevenue :dataList="carCompareList"/>
<p class="descText">注：入区车辆数按当期卡口设备的服务区，计算的平均每日入区数量</p>
<div class="descBox">
<div class="noticeBox">注</div>
<div class="noticeText">
<span class="text">入区车辆数按当期卡口设备的服务区，计算的平均每日入区数量</span>
</div>
</div>
</div> </div>
<div class="detail"> <div class="newDetail">
<p class="tabTitle">营收特征分析</p> <div class="newDetailTop revenueSpecific">
<span class="unit">单位：万元</span> <div class="newDetailTopLeft">
<img class="leftIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/national/revenueSpecific.svg"/>
<div class="leftTextBox">
<span class="leftBoxTitle">营收特征分析</span>
<span class="leftTime">{{selectIndex===1?'腊月十五-正月廿五':(selectIndex!==1 && selectIndex!==3?timeFrame:revenueCompareDetail.curHoliday)}}</span>
</div>
</div>
</div>
<EntryCarNumber :data="compareRevenueList"/> <EntryCarNumber :data="compareRevenueList"/>
</div> </div>
</div> </div>
@ -190,9 +217,18 @@ export default {
components: {EntryCarNumber, YearRevenue}, components: {EntryCarNumber, YearRevenue},
data(){ data(){
return { return {
selectTab:1, selectTab: 1,
statusBarHeight:0, statusBarHeight:0,
festival:[{label:'国庆',value:1},{label:'五一',value:2},{label:'春节',value:3}], festivalList:[
// {label:'元旦',value:1},
{label:'欢度春节',value:1},//2
// {label:'清明',value:3},
{label:'五一劳动节',value:2},//4
// {label:'端午',value:5},
{label:'欢度暑假',value:3},//6
// {label:'中秋',value:7},
{label:'欢度国庆',value:4}//8
],
selectIndex:1, selectIndex:1,
menu:{}, menu:{},
revenueList: [],// 营收排行 revenueList: [],// 营收排行
@ -202,17 +238,19 @@ export default {
addList:[],// 增幅排行 addList:[],// 增幅排行
time:'', time:'',
dayName:'', dayName:'',
showTimeText:'',// 右上角显示的时间
carCompareList:{},// 车流对比 carCompareList:{},// 车流对比
currentRevenue:0,//今年的营收总额
compareRevenue:0,// 去年的营收总额
add:0,// 增幅
compareRevenueList:{},// 营收图表数据 compareRevenueList:{},// 营收图表数据
flagGetRevenue:false,// 拿到营收排行 flagGetRevenue:false,// 拿到营收排行
flagGetCar:false,// 车流排行 flagGetCar:false,// 车流排行
flagGetCarCompare:false,//车流比较 flagGetCarCompare:false,//车流比较
flagGetRevenueCompare:false,// 营收比较 flagGetRevenueCompare:false,// 营收比较
isUserEnter:true isUserEnter:true,
carCompareDetail:{},// 车流比较的详情
revenueCompareDetail:{},// 营收比较的详情
holidayName:'',//假期名称
curYear: '',// 今年
compareYear:'',// 对比年份
timeFrame:''
} }
}, },
onLoad(query){ onLoad(query){
@ -224,6 +262,7 @@ export default {
let userInfo = uni.getStorageSync('vuex') let userInfo = uni.getStorageSync('vuex')
userInfo = JSON.parse(userInfo) userInfo = JSON.parse(userInfo)
this.useInfo = JSON.parse(JSON.stringify(userInfo)) this.useInfo = JSON.parse(JSON.stringify(userInfo))
uni.showLoading({ uni.showLoading({
title: '正在加载...' title: '正在加载...'
}) })
@ -231,21 +270,16 @@ export default {
this.isUserEnter = !(query.type==='true') this.isUserEnter = !(query.type==='true')
this.selectTab = 2 this.selectTab = 2
} }
this.time = query.time this.time = query.time
const date = new Date(query.time) const date = new Date(query.time)
if (new Date(query.time).getTime() > new Date('2023-09-27').getTime()){
const date = new Date(query.time)
let m = date.getMonth()+1
let d = date.getDate()
this.showTimeText = `9.28-10.7`
}else{
this.showTimeText = `9.28-9.28`
}
let y = date.getFullYear() let y = date.getFullYear()
let m = date.getMonth() + 1 let m = date.getMonth() + 1
let d = date.getDate() let d = date.getDate()
this.curYear = y
this.compareYear = y - 1
this.holidayName = this.selectIndex===1?'春运':this.selectIndex===2?'五一':this.selectIndex===3?'暑假':this.selectIndex===4?'国庆':''
// ${y}年 // ${y}年
this.dayName = `${m}月${d}日` this.dayName = `${m}月${d}日`
if (this.selectTab===1){ if (this.selectTab===1){
@ -254,7 +288,6 @@ export default {
// 车流排行 // 车流排行
this.handleGetCar(query.time) this.handleGetCar(query.time)
}else{ }else{
this.showTimeText = this.selectIndex===1?'9.28-10.7':this.selectIndex===2?'4.29-5.5':'1.20-1.29'
this.handleGetCarCompare() this.handleGetCarCompare()
this.handleGetRevenueCompare() this.handleGetRevenueCompare()
} }
@ -263,12 +296,11 @@ export default {
methods:{ methods:{
// 切换节日类型 // 切换节日类型
handleChangeType(e){ handleChangeType(e){
console.log('e',e)
this.selectIndex = Number(e.detail.value) + 1 this.selectIndex = Number(e.detail.value) + 1
uni.showLoading({ uni.showLoading({
title:' 正在加载...' title:' 正在加载...'
}) })
this.showTimeText = this.selectIndex===1?'9.28-10.7':this.selectIndex===2?'4.29-5.5':'1.07-2.15' this.holidayName = this.selectIndex===1?'春运':this.selectIndex===2?'五一':this.selectIndex===3?'暑假':this.selectIndex===4?'国庆':''
this.handleGetCarCompare() this.handleGetCarCompare()
this.handleGetRevenueCompare() this.handleGetRevenueCompare()
}, },
@ -281,6 +313,14 @@ export default {
}) })
this.handleGetCarCompare() this.handleGetCarCompare()
this.handleGetRevenueCompare() this.handleGetRevenueCompare()
}else if (num===1) {
uni.showLoading({
title:' 正在加载...'
})
// 拿到营收排行
this.handleGetRevenue(this.time)
// 车流排行
this.handleGetCar(this.time)
} }
}, },
handleGoMore(type){ handleGoMore(type){
@ -301,7 +341,6 @@ export default {
Revenue_Include:1 Revenue_Include:1
} }
const data = await request.$webGet('CommercialApi/Revenue/GetSPRevenueRank',req) const data = await request.$webGet('CommercialApi/Revenue/GetSPRevenueRank',req)
console.log('拿到营收排行',data)
this.revenueSum = data.Result_Data.OtherData this.revenueSum = data.Result_Data.OtherData
this.revenueList = data.Result_Data.List.slice(0,5) this.revenueList = data.Result_Data.List.slice(0,5)
this.flagGetRevenue = true this.flagGetRevenue = true
@ -333,45 +372,167 @@ export default {
}, },
// 车流比较 // 车流比较
async handleGetCarCompare(){ async handleGetCarCompare(){
const date = new Date()
let year = date.getFullYear()
const req = { const req = {
pushProvinceCode:this.useInfo.userData.ProvinceCode || '340000', pushProvinceCode:this.useInfo.userData.ProvinceCode || '340000',
StatisticsStartDate:this.selectIndex===1?'2023/09/28':this.selectIndex===2?'2023/04/29':'2023/01/20', holidayType:this.selectIndex===1?2:this.selectIndex===2?4:this.selectIndex===3?6:this.selectIndex===4?8:'',
StatisticsEndDate:this.selectIndex===1?'2023/10/07':this.selectIndex===2?'2023/05/05':'2023/01/29', curYear:this.curYear,
ShowDateFormat:this.selectIndex===3?2:1 compareYear:this.compareYear
} }
const data = await request.$webGet('CommercialApi/BigData/GetBayonetCompare',req)
console.log('compare',data) const data = await request.$webGet('CommercialApi/BigData/GetHolidayCompare',req)
this.carCompareDetail = data.Result_Data
let list = data.Result_Data let list = data.Result_Data
let compareList = [] let compareList = []
let curList = [] let curList = []
let max = 0 let max = 0
let dateList = [] let dateList = []
// 春节
if (this.selectIndex===1){
// 去年的
let howGroupNumber = Math.floor(data.Result_Data.compareList.length / 7)
let groupList = []
let resList = []
for (let i=0;i<=howGroupNumber-1;i++){
groupList.push(data.Result_Data.compareList.slice(7*i,7*(i+1)))
}
if (howGroupNumber*7<data.Result_Data.compareList.length){
groupList.push(data.Result_Data.compareList.slice(7*howGroupNumber,data.Result_Data.compareList.length))
}
groupList.forEach((item,index)=>{
if (item && item.length>0){
let sum = 0
item.forEach(subItem=>{
sum+=Number(subItem.value)
})
if (sum>max){
max = sum
}
resList.push({
value:sum,
name:`第${index + 1}周`
})
}
})
// 今年的
let howCurGroupNumber = Math.floor(data.Result_Data.curList.length / 7)
let curGroupList = []
let resCurList = []
for (let i=0;i<=howCurGroupNumber-1;i++){
curGroupList.push(data.Result_Data.curList.slice(7*i,7*(i+1)))
}
if (howCurGroupNumber*7<data.Result_Data.curList.length){
curGroupList.push(data.Result_Data.curList.slice(7*howCurGroupNumber,data.Result_Data.curList.length))
}
curGroupList.forEach((item,index)=>{
if (item && item.length>0){
let sum = 0
item.forEach(subItem=>{
sum+=Number(subItem.value)
})
if (sum>max){
max = sum
}
resCurList.push({
value:sum,
name:`第${index + 1}周`
})
dateList.push(`第${index + 1}周`)
}
})
compareList = resList
curList = resCurList
}
// 暑假
else if(this.selectIndex===3){
// 去年的
let howGroupNumber = Math.floor(data.Result_Data.compareList.length / 7)
let groupList = []
let resList = []
for (let i=0;i<=howGroupNumber-1;i++){
groupList.push(data.Result_Data.compareList.slice(7*i,7*(i+1)))
}
if (howGroupNumber*7<data.Result_Data.compareList.length){
groupList.push(data.Result_Data.compareList.slice(7*howGroupNumber,data.Result_Data.compareList.length))
}
groupList.forEach((item,index)=>{
if (item && item.length>0){
let sum = 0
item.forEach(subItem=>{
sum+=Number(subItem.value)
})
dateList.push(`${index + 1}周`)
if (sum>max){
max = sum
}
resList.push({
value:sum,
name:`${index + 1}周`
})
}
})
// 今年的
let howCurGroupNumber = Math.floor(data.Result_Data.curList.length / 7)
let curGroupList = []
let resCurList = []
for (let i=0;i<=howCurGroupNumber-1;i++){
curGroupList.push(data.Result_Data.curList.slice(7*i,7*(i+1)))
}
if (howCurGroupNumber*7<data.Result_Data.curList.length){
curGroupList.push(data.Result_Data.curList.slice(7*howCurGroupNumber,data.Result_Data.curList.length))
}
curGroupList.forEach((item,index)=>{
if (item && item.length>0){
let sum = 0
item.forEach(subItem=>{
sum+=Number(subItem.value)
})
if (sum>max){
max = sum
}
resCurList.push({
value:sum,
name:`${index + 1}周`
})
if (dateList.length<=0){
dateList.push(`${index + 1}周`)
}
}
})
compareList = resList
curList = resCurList
}
// 其他
else{
data.Result_Data.compareList.forEach(item=>{ data.Result_Data.compareList.forEach(item=>{
if (Number(item.value)>max){ if (Number(item.value)>max){
max = Number(item.value) max = Number(item.value)
} }
compareList.push(Number(item.value)) dateList.push(moment(item.name).format('M.D'))
compareList.push({
name:item.name,
value: Number(item.value)
})
}) })
data.Result_Data.curList.forEach(item=>{ data.Result_Data.curList.forEach(item=>{
if (Number(item.value)>max){ if (Number(item.value)>max){
max = Number(item.value) max = Number(item.value)
} }
curList.push(Number(item.value)) if (dateList.indexOf(moment(item.name).format('M.D'))===-1){
if (this.selectIndex===3){
const date = new Date(item.name)
let year = date.getFullYear()
let month = date.getMonth() + 1
let day = date.getDate()
const lunarDate = getLunar(year, month, day);
dateList.push(lunarDate.dateStr.slice(2,4))
// item.lunarDate = lunarDate.dateStr.slice(2,4)
}else{
dateList.push(moment(item.name).format('M.D')) dateList.push(moment(item.name).format('M.D'))
} }
curList.push({
name:item.name,
value: Number(item.value)
}) })
})
}
if (this.selectIndex!==1 && this.selectIndex!==3){
this.timeFrame = `${dateList[0]}-${dateList[dateList.length - 1]}`
}
let res = { let res = {
categories: dateList, categories: dateList,
series:[ series:[
@ -396,18 +557,14 @@ export default {
async handleGetRevenueCompare(){ async handleGetRevenueCompare(){
const req = { const req = {
pushProvinceCode:this.useInfo.userData.ProvinceCode || '340000', pushProvinceCode:this.useInfo.userData.ProvinceCode || '340000',
StatisticsStartDate:this.selectIndex===1?'2023/09/28':this.selectIndex===2?'2023/04/29':'2023/01/20',
StatisticsEndDate:this.selectIndex===1?'2023/10/07':this.selectIndex===2?'2023/05/05':'2023/01/29',
StatisticsDate:this.time, StatisticsDate:this.time,
ShowDateFormat:this.selectIndex===3?2:1 holidayType:this.selectIndex===1?2:this.selectIndex===2?4:this.selectIndex===3?6:this.selectIndex===4?8:'',
} curYear:this.curYear,
const data = await request.$webGet('CommercialApi/Revenue/GetRevenueYOY',req) compareYear:this.compareYear,
console.log('22222',data)
this.currentRevenue = data.Result_Data.curRevenue
this.compareRevenue = data.Result_Data.compareRevenue
if (data.Result_Data.curRevenue && data.Result_Data.compareRevenue){
this.add = ((data.Result_Data.curRevenue / data.Result_Data.compareRevenue)*100).toFixed(2)
} }
const data = await request.$webGet('CommercialApi/Revenue/GetHolidayCompare',req)
this.revenueCompareDetail = data.Result_Data
let list = data.Result_Data let list = data.Result_Data
let compareList = [] let compareList = []
let realCompareList = [] let realCompareList = []
@ -415,12 +572,132 @@ export default {
let realCurList = [] let realCurList = []
let max =0 let max =0
let dateList = [] let dateList = []
if (this.selectIndex===1){
// 去年的
let howGroupNumber = Math.floor(data.Result_Data.compareList.length / 7)
let groupList = []
let resList = []
for (let i=0;i<=howGroupNumber-1;i++){
groupList.push(data.Result_Data.compareList.slice(7*i,7*(i+1)))
}
if (howGroupNumber*7<data.Result_Data.compareList.length){
groupList.push(data.Result_Data.compareList.slice(7*howGroupNumber,data.Result_Data.compareList.length))
}
groupList.forEach((item,index)=>{
if (item && item.length>0){
let sum = 0
item.forEach(subItem=>{
sum+=Number(subItem.value)/10000
})
if (sum>max){
max = sum
}
resList.push({
value:sum,
name:`第${index + 1}周`
})
}
})
// 今年的
let howCurGroupNumber = Math.floor(data.Result_Data.curList.length / 7)
let curGroupList = []
let resCurList = []
for (let i=0;i<=howCurGroupNumber-1;i++){
curGroupList.push(data.Result_Data.curList.slice(7*i,7*(i+1)))
}
if (howCurGroupNumber*7<data.Result_Data.curList.length){
curGroupList.push(data.Result_Data.curList.slice(7*howCurGroupNumber,data.Result_Data.curList.length))
}
curGroupList.forEach((item,index)=>{
if (item && item.length>0){
let sum = 0
item.forEach(subItem=>{
sum+=Number(subItem.value)/10000
})
if (sum>max){
max = sum
}
resCurList.push({
value:sum,
name:`第${index + 1}周`
})
dateList.push(`第${index + 1}周`)
}
})
compareList = resList
curList = resCurList
}
else if(this.selectIndex===3){
// 去年的
let howGroupNumber = Math.floor(data.Result_Data.compareList.length / 7)
let groupList = []
let resList = []
for (let i=0;i<=howGroupNumber-1;i++){
groupList.push(data.Result_Data.compareList.slice(7*i,7*(i+1)))
}
if (howGroupNumber*7<data.Result_Data.compareList.length){
groupList.push(data.Result_Data.compareList.slice(7*howGroupNumber,data.Result_Data.compareList.length))
}
groupList.forEach((item,index)=>{
if (item && item.length>0){
let sum = 0
item.forEach(subItem=>{
sum+=Number(subItem.value)/10000
})
dateList.push(`${index + 1}周`)
if (sum>max){
max = sum
}
resList.push({
value:sum,
name:`${index + 1}周`
})
}
})
// 今年的
let howCurGroupNumber = Math.floor(data.Result_Data.curList.length / 7)
let curGroupList = []
let resCurList = []
for (let i=0;i<=howCurGroupNumber-1;i++){
curGroupList.push(data.Result_Data.curList.slice(7*i,7*(i+1)))
}
if (howCurGroupNumber*7<data.Result_Data.curList.length){
curGroupList.push(data.Result_Data.curList.slice(7*howCurGroupNumber,data.Result_Data.curList.length))
}
curGroupList.forEach((item,index)=>{
if (item && item.length>0){
let sum = 0
item.forEach(subItem=>{
sum+=Number(subItem.value)/10000
})
if (sum>max){
max = sum
}
resCurList.push({
value:sum,
name:`${index + 1}周`
})
if (dateList.length<=0){
dateList.push(`${index + 1}周`)
}
}
})
compareList = resList
curList = resCurList
}
else{
data.Result_Data.compareList.forEach(item=>{ data.Result_Data.compareList.forEach(item=>{
let number = Number((item.value / 10000).toFixed(2)) let number = Number((item.value / 10000).toFixed(2))
if (number>max){ if (number>max){
max = number max = number
} }
compareList.push(number) compareList.push({
name:item.name,
value:number
})
realCompareList.push(item.value) realCompareList.push(item.value)
}) })
data.Result_Data.curList.forEach(item=>{ data.Result_Data.curList.forEach(item=>{
@ -428,7 +705,10 @@ export default {
if (number>max){ if (number>max){
max = number max = number
} }
curList.push(number) curList.push({
name:item.name,
value:number
})
realCurList.push(item.value) realCurList.push(item.value)
if (this.selectIndex===3){ if (this.selectIndex===3){
@ -443,54 +723,10 @@ export default {
dateList.push(moment(item.name).format('M.D')) dateList.push(moment(item.name).format('M.D'))
} }
}) })
}
// if (this.selectIndex===3){ if (this.selectIndex!==1 && this.selectIndex!==3){
// let smallDateList = [] this.timeFrame = `${dateList[0]}-${dateList[dateList.length - 1]}`
// let smallCompareList = [] }
// let smallCurList = []
// dateList.forEach((item,index)=>{
// if (smallDateList.length>=10){
// return
// }
// if (index%4===0){
// if (smallDateList.length===9){
// smallDateList.push('2.15')
// }else{
// smallDateList.push(item)
// }
// }
// })
//
// compareList.forEach((item,index)=>{
// if (smallCompareList.length>=10){
// return
// }
// if (index%4===0){
// if (smallDateList.length===9){
// smallCompareList.push(compareList[compareList.length-1])
// }else{
// smallCompareList.push(item)
// }
// }
// })
//
// curList.forEach((item,index)=>{
// if (smallCurList.length>=10){
// return
// }
// if (index%4===0){
// if (smallDateList.length===9){
// smallCurList.push(smallCurList[smallCurList.length-1])
// }else{
// smallCurList.push(item)
// }
// }
// })
// dateList = smallDateList
// compareList = smallCompareList
// curList = smallCurList
// }
let res = { let res = {
categories: dateList, categories: dateList,
series:[ series:[
@ -572,6 +808,83 @@ export default {
} }
} }
} }
.springTop{
background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/national/spring.png") !important;
.header{
background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/national/spring.png") !important;
}
.topContent{
.pageTitle{
font-size: 56rpx;
font-family: AlimamaShuHeiTi-Bold, AlimamaShuHeiTi;
font-weight: bold;
color: #FFFFFF;
line-height: 68rpx;
text-shadow: 0px 8px 20px #F66152;
background: linear-gradient(180deg, #FFF3ED 0%, #FF988E 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
}
}
.labourTop{
background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/national/labour.png") !important;
.header{
background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/national/labour.png") !important;
}
.topContent{
.pageTitle{
font-size: 56rpx;
font-family: AlimamaShuHeiTi-Bold, AlimamaShuHeiTi;
font-weight: bold;
color: #FFFFFF;
line-height: 68rpx;
text-shadow: 0px 8px 20px #DAAE04;
background: linear-gradient(180deg, #FFFBEE 0%, #FFD73B 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
}
}
.summerHolidayTop{
background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/national/summerHoliday.png") !important;
.header{
background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/national/summerHoliday.png") !important;
}
.topContent{
.pageTitle{
font-size: 56rpx;
font-family: AlimamaShuHeiTi-Bold, AlimamaShuHeiTi;
font-weight: bold;
color: #FFFFFF;
line-height: 68rpx;
text-shadow: 0px 8px 20px #9CB522;
background: linear-gradient(180deg, #FDFFF1 0%, #C4D844 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
}
}
.nationalDayTop{
background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/national/nationalDay.png") !important;
.header{
background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/national/nationalDay.png") !important;
}
.topContent{
.pageTitle{
font-size: 56rpx;
font-family: AlimamaShuHeiTi-Bold, AlimamaShuHeiTi;
font-weight: bold;
color: #FFFFFF;
line-height: 68rpx;
text-shadow: 0px 8px 20px #FF7915;
background: linear-gradient(180deg, #FFF7F0 0%, #FFB576 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
}
}
.pageContent{ .pageContent{
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
@ -582,25 +895,26 @@ export default {
//transform: translateY(-260rpx); //transform: translateY(-260rpx);
.tabBox{ .tabBox{
width: 100%; display: flex;
height: 76rpx; align-items: center;
background: #F6E8E5; margin-bottom: 20rpx;
border-radius: 8rpx;
margin-bottom: 24rpx;
box-sizing: border-box;
padding: 8rpx;
.tabItem{ .tabItem{
width: 50%;
height: 100%;
display: inline-block; display: inline-block;
text-align: center; font-size: 32rpx;
line-height: 60rpx; font-family: PingFangSC-Semibold, PingFang SC;
color: #786B6C; font-weight: 600;
color: #FEE1DD;
line-height: 44rpx;
box-sizing: border-box;
padding-bottom: 12rpx;
} }
.selectTab{ .selectTab{
background: #fff; font-size: 32rpx;
border-radius: 8rpx; font-family: PingFangSC-Semibold, PingFang SC;
color: #F95222; font-weight: 600;
color: #FFFFFF;
line-height: 44rpx;
border-bottom: 2px solid #FFFFFF;
} }
} }
@ -1042,9 +1356,183 @@ export default {
.selectTab2{ .selectTab2{
box-sizing: border-box; box-sizing: border-box;
padding: 24rpx;
background: #fff;
border-radius: 8rpx; border-radius: 8rpx;
.newDetail{
width: 100%;
box-sizing: border-box;
border-radius: 24rpx;
background: #fff;
padding: 4rpx 4rpx 32rpx 4rpx;
margin-bottom: 24rpx;
.newDetailTop{
width: 100%;
background: linear-gradient(360deg, rgba(255,233,229,0) 0%, rgba(255,248,247,0.7) 34%, #FFEEEC 100%);
border-radius: 20rpx;
box-sizing: border-box;
padding: 32rpx 24rpx;
display: flex;
align-items: center;
justify-content: space-between;
.newDetailTopLeft{
display: flex;
align-items: center;
.leftIcon{
width: 96rpx;
height: 96rpx;
border-radius: 16rpx;
margin-right: 20rpx;
}
.leftTextBox{
display: flex;
flex-direction: column;
.leftBoxTitle{
font-size: 32rpx;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #160002;
line-height: 44rpx;
margin-bottom: 4rpx;
}
.leftTime{
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #786B6C;
line-height: 40rpx;
}
}
}
.newDetailRight{
font-size: 48rpx;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
color: #E83944;
line-height: 48rpx;
}
}
.compareBox{
width: 100%;
box-sizing: border-box;
padding: 0 24rpx;
display: flex;
align-items: center;
position: relative;
margin-bottom: 24rpx;
.compareItem{
width: 50%;
height: 176rpx;
box-sizing: border-box;
padding: 40rpx 24rpx;
background-size: 100% 100%;
background-repeat: no-repeat;
.compareImg{
width: 100%;
height: 100%;
}
.compareTitleLeft{
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0087FA;
line-height: 40rpx;
display: block;
text-align: left;
}
.leftValue{
font-size: 32rpx;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
color: #0087FA;
line-height: 52rpx;
display: block;
text-align: left;
}
.compareTitleRight{
display: block;
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #FFFFFF;
line-height: 40rpx;
text-align: right;
}
.rightValue{
display: block;
font-size: 32rpx;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
color: #FFFFFF;
line-height: 52rpx;
text-align: right;
}
}
.compareItemRight{
display: flex;
flex-direction: column;
align-items: flex-end;
justify-content: flex-end;
}
.compareItemLeft{
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: flex-start;
}
.vsIcon{
position: absolute;
top: 50%;left: 50%;
transform: translate(-50% , -50%);
width: 56rpx;
height: 56rpx;
}
}
.descBox{
width: calc(100% - 48rpx);
margin-left: 24rpx;
box-sizing: border-box;
padding: 24rpx;
background: #F6F7F9;
border-radius: 16rpx;
display: flex;
align-items: flex-start;
.noticeBox{
display: flex;
justify-content: center;
align-items: center;
box-sizing: border-box;
padding: 2rpx 8rpx;
background: #DEE7FA;
border-radius: 4rpx;
font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #160002;
line-height: 36rpx;
margin-right: 12rpx;
}
.noticeText{
.text{
display: block;
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #786B6C;
line-height: 40rpx;
}
}
}
.carEntry{
background: linear-gradient(360deg, rgba(238,242,255,0) 0%, rgba(239,243,255,0.7) 41%, #F0F4FF 100%)!important;
}
.revenueSpecific{
background: linear-gradient(360deg, rgba(236,236,255,0) 0%, rgba(244,244,255,0.7) 39%, #F0F0FF 100%)!important;
}
}
.detail{ .detail{
margin-bottom: 24rpx; margin-bottom: 24rpx;
.tabTitle{ .tabTitle{
@ -1185,6 +1673,19 @@ export default {
} }
} }
.pageContentSpring{
background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/national/spring.png")!important;
} }
.pageContentLabour{
background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/national/labour.png")!important;
}
.pageContentSummerHoliday{
background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/national/summerHoliday.png")!important;
}
.pageContentNationalDay{
background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/national/nationalDay.png")!important;
}
}
</style> </style>

BIN
static/public/font2/AlimamaShuHeiTi-Bold.ttf
View File

Binary file not shown.

BIN
static/public/font2/ArIrHQCiZQwl.woff2
View File

Binary file not shown.

2
static/public/font2/stylesheet.css
View File

@ -1,6 +1,6 @@
@font-face { @font-face {
font-family: 'Alimama ShuHeiTi'; font-family: 'Alimama ShuHeiTi';
src:url("/static/public/font2/EPAg3o21O7iw.woff2"); src:url("/static/public/font2/uj4HAtspu5eH.woff");
font-weight: bold; font-weight: bold;
font-style: normal; font-style: normal;
font-display: swap; font-display: swap;

BIN
static/public/font2/uj4HAtspu5eH.woff Normal file
View File

Binary file not shown.