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-08-03 19:12:44 +08:00
parent 50641c7795
commit 2a491b9775
11 changed files with 223 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pages/commercialBI/carPortrait.vue
View File

@ -401,6 +401,7 @@ export default {
if (storeTime){ if (storeTime){
this.time = storeTime this.time = storeTime
} }
console.log(' this.time', this.time)
this.single = this.$util.getThisMonthHave(this.time) this.single = this.$util.getThisMonthHave(this.time)
this.searchText = this.time this.searchText = this.time
const date = new Date(this.time) const date = new Date(this.time)

32
pages/commercialBI/components/bussiness/transactionAnalysis.vue
View File

@ -16,22 +16,22 @@
</div> </div>
</div> </div>
</div> </div>
<div class="month"> <!-- <div class="month">-->
<div class="top"> <!-- <div class="top">-->
<image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/converRate.svg"></image> <!-- <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/converRate.svg"></image>-->
<p class="title">消费转化率<text class="unit">/%</text></p> <!-- <p class="title">消费转化率<text class="unit">/%</text></p>-->
</div> <!-- </div>-->
<div class="bottom"> <!-- <div class="bottom">-->
<div class="item"> <!-- <div class="item">-->
<p class="price">{{ info.ConvertRate?info.ConvertRate:'-' }}</p> <!-- <p class="price">{{ info.ConvertRate?info.ConvertRate:'-' }}</p>-->
<p class="text">该服务区</p> <!-- <p class="text">该服务区</p>-->
</div> <!-- </div>-->
<div class="item"> <!-- <div class="item">-->
<p class="price">{{ info.ConvertProvinceRate?info.ConvertProvinceRate:'-'}}</p> <!-- <p class="price">{{ info.ConvertProvinceRate?info.ConvertProvinceRate:'-'}}</p>-->
<p class="text">省级平均</p> <!-- <p class="text">省级平均</p>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</div> </div>
</template> </template>

33
pages/commercialBI/managePortrait.vue
View File

@ -105,8 +105,8 @@
<view class="right"> <view class="right">
<text class="comparePlan">比计划： </text> <text class="comparePlan">比计划： </text>
<view class="box2"> <view class="box2">
<image class="addIcon" :src="Number(monthAdd)>0?'https://eshangtech.com/ShopICO/ahyd-BID/index/addIcon.svg':'https://eshangtech.com/ShopICO/ahyd-BID/index/reduce.svg'"></image> <image class="addIcon" :src="plan.MonthGrowth_Rate>0?'https://eshangtech.com/ShopICO/ahyd-BID/index/addIcon.svg':'https://eshangtech.com/ShopICO/ahyd-BID/index/reduce.svg'"></image>
<p class="text">{{monthAdd?Math.abs(monthAdd) + '%':'-'}}</p> <p class="text">{{monthAdd?monthAdd + '%':'-'}}</p>
</view> </view>
</view> </view>
</view> </view>
@ -154,8 +154,8 @@
<view class="right"> <view class="right">
<text class="comparePlan">比计划： </text> <text class="comparePlan">比计划： </text>
<div class="box2"> <div class="box2">
<image class="addIcon" :src="Number(yearAdd)>0?'https://eshangtech.com/ShopICO/ahyd-BID/index/addIcon.svg':'https://eshangtech.com/ShopICO/ahyd-BID/index/reduce.svg'"></image> <image class="addIcon" :src="plan.YearGrowth_Rate>0?'https://eshangtech.com/ShopICO/ahyd-BID/index/addIcon.svg':'https://eshangtech.com/ShopICO/ahyd-BID/index/reduce.svg'"></image>
<p class="text">{{yearAdd?Math.abs(yearAdd) + '%':''}}</p> <p class="text">{{yearAdd?yearAdd + '%':''}}</p>
</div> </div>
</view> </view>
</view> </view>
@ -463,7 +463,7 @@ export default {
ServerpartId:this.serviceInfo.Serverpart_ID || '' ServerpartId:this.serviceInfo.Serverpart_ID || ''
} }
const data = await request.$webGet('CommercialApi/Revenue/GetRevenueCompare',req) const data = await request.$webGet('CommercialApi/Revenue/GetRevenueCompare',req)
let RevenueAmount = [] //营收金额 let RevenueAmount = [] //营收金额 除以10000的金额
let normalAmount = [] //不除以10000的金额 let normalAmount = [] //不除以10000的金额
let compareWordDay = [] //对比工作日 let compareWordDay = [] //对比工作日
let RevenueMax = 0 let RevenueMax = 0
@ -513,6 +513,7 @@ export default {
}) })
AvgTicketAmountList.push({name:item.name,data:list,qoqAdd:qoqAddList,holiday: item.value}) AvgTicketAmountList.push({name:item.name,data:list,qoqAdd:qoqAddList,holiday: item.value})
}) })
// 因为有三个选项卡 把三种情况要展示的内容 放在一个对象里面 三个对象放一个数组里面 点击选项卡切换显示的对象就可以了
this.revenueAll = [ this.revenueAll = [
{ {
data:this.$util.fmoney(data.Result_Data.RevenueAmount), data:this.$util.fmoney(data.Result_Data.RevenueAmount),
@ -569,6 +570,7 @@ export default {
async getTrendsList(){ async getTrendsList(){
let date = new Date(this.time) let date = new Date(this.time)
let y = date.getFullYear() let y = date.getFullYear()
// 查今年去年两年的数据
let req = { let req = {
ProvinceCode:'340000', ProvinceCode:'340000',
StatisticsDate:y, StatisticsDate:y,
@ -656,16 +658,17 @@ export default {
this.plan.percentageMonth = (res.Result_Data.RevenueMonth_Amount / res.Result_Data.BudgetMonth_Amount*100).toFixed(2) this.plan.percentageMonth = (res.Result_Data.RevenueMonth_Amount / res.Result_Data.BudgetMonth_Amount*100).toFixed(2)
// this.plan.percentageMonth = 80 // this.plan.percentageMonth = 80
this.plan.percentageYear = (res.Result_Data.RevenueYear_Amount / res.Result_Data.BudgetYear_Amount*100).toFixed(2) this.plan.percentageYear = (res.Result_Data.RevenueYear_Amount / res.Result_Data.BudgetYear_Amount*100).toFixed(2)
let date = new Date(this.time) // let date = new Date(this.time)
let nowDay = date.getDate() // let nowDay = date.getDate()
let day = this.$util.getThisMonthDay(this.time) // let day = this.$util.getThisMonthDay(this.time)
//一天应该的增长率 // //一天应该的增长率
let oneDay = 100/day // let oneDay = 100/day
// 到了当天的应该有的百分比 // // 到了当天的应该有的百分比
let thisDayShould= oneDay*nowDay // let thisDayShould= oneDay*nowDay
this.monthAdd = (this.plan.percentageMonth - thisDayShould).toFixed(2) // 由于显示的时候 正负号由图片表示 所以要区绝对值展现在页面上
this.yearAdd = (((res.Result_Data.RevenueYear_Amount - res.Result_Data.RevenueYear_PlanAmount)/res.Result_Data.BudgetYear_Amount)*100).toFixed(2) this.monthAdd = Math.abs(this.plan.MonthGrowth_Rate)
//处理数据 this.yearAdd = Math.abs(this.plan.YearGrowth_Rate)
//处理数据 保留小数
this.plan.RevenueMonth_Amount = this.$util.fmoney(res.Result_Data.RevenueMonth_Amount) this.plan.RevenueMonth_Amount = this.$util.fmoney(res.Result_Data.RevenueMonth_Amount)
this.plan.BudgetMonth_Amount = this.$util.fmoney(res.Result_Data.BudgetMonth_Amount) this.plan.BudgetMonth_Amount = this.$util.fmoney(res.Result_Data.BudgetMonth_Amount)
this.plan.RevenueYear_Amount = this.$util.fmoney(res.Result_Data.RevenueYear_Amount) this.plan.RevenueYear_Amount = this.$util.fmoney(res.Result_Data.RevenueYear_Amount)

34
pages/commercialBI/specialCase.vue
View File

@ -15,9 +15,10 @@
</div> </div>
</div> </div>
<div class="topBox"> <div class="topBox">
<div class="boxLeft"> <div class="boxLeft" style="width: 100%">
<div class="headerTitle">实时分析</div> <div class="headerTitle">实时分析</div>
<span class="notice">注: 1个小时入区流量比5月同一时间流量增幅150%以上且每小时入区车辆超过100辆</span> <!-- 注: 1个小时入区流量比5月同一时间流量增幅150%以上且每小时入区车辆超过100辆-->
<span class="notice"></span>
</div> </div>
<div class="boxRight"> <div class="boxRight">
<span class="day">{{showDay}}</span> <span class="day">{{showDay}}</span>
@ -39,8 +40,8 @@
<div class="contentList" v-if="selectTab===1"> <div class="contentList" v-if="selectTab===1">
<div class="contentItem" :style="{borderBottom:index + 1===tableList.length?'0px solid #EEEEEE':'1px solid #EEEEEE'}" v-for="(item,index) in tableList" :key="index"> <div class="contentItem" :style="{borderBottom:index + 1===tableList.length?'0px solid #EEEEEE':'1px solid #EEEEEE'}" v-for="(item,index) in tableList" :key="index">
<div class="index"> <div class="index">
<div class="boxBg"></div> <div class="boxBg" v-if="index<=2"></div>
<span class="indexText" :style="{fontWeight:index<=2?'bold':'normal'}">{{index + 1}}</span> <span class="indexText" :style="{fontWeight:index<=2?'bold':'normal',color:index<=2?'#160002':'#786B6C'}">{{index + 1}}</span>
</div> </div>
<div class="serviceBox"> <div class="serviceBox">
<span class="name">{{item.name}}</span> <span class="name">{{item.name}}</span>
@ -51,7 +52,7 @@
<span class="unit">/辆</span> <span class="unit">/辆</span>
</div> </div>
<div class="addBox"> <div class="addBox">
<image class="addIcon" :src="Number(item.VEHICLE_RATE)>100?'https://eshangtech.com/ShopICO/ahyd-BID/index/addIcon.svg':Number(item.VEHICLE_RATE)===100?'':'https://eshangtech.com/ShopICO/ahyd-BID/index/reduce.svg'"/> <image class="addIcon" :src="Number(item.VEHICLE_RATE)>100?'/static/images/examine/add.svg':Number(item.VEHICLE_RATE)===100?'':'/static/images/examine/reduce.svg'"/>
<span class="add">{{item.VEHICLE_RATE}}%</span> <span class="add">{{item.VEHICLE_RATE}}%</span>
</div> </div>
</div> </div>
@ -168,10 +169,22 @@ export default {
this.statusBarHeight = Number(systemInfo.statusBarHeight) this.statusBarHeight = Number(systemInfo.statusBarHeight)
this.menu = uni.getMenuButtonBoundingClientRect() this.menu = uni.getMenuButtonBoundingClientRect()
let storeTime = uni.getStorageSync('lastDay') // let storeTime = uni.getStorageSync('lastDay')
if (storeTime){ // if (storeTime){
this.time = storeTime // this.time = storeTime
// }
const currentDate = new Date()
// 拿到当前小时的前一小时
let y = currentDate.getFullYear()
let nowM = currentDate.getMonth() + 1
if (nowM<10){
nowM = '0'+nowM
} }
let nowD = currentDate.getDate()
if (nowD<10){
nowD = '0'+nowD
}
this.time = `${y}-${nowM}-${nowD}`
this.searchText = this.time this.searchText = this.time
// this.searchText = '2023-06-21' // this.searchText = '2023-06-21'
const date = new Date(this.time) const date = new Date(this.time)
@ -184,7 +197,10 @@ export default {
this.showDay = d this.showDay = d
const nowDate = new Date() const nowDate = new Date()
let h = nowDate.getHours() let h = nowDate.getHours()
this.startTime = h - 1 this.startTime = h-1
if (this.startTime===0){
this.searchText = `${y}-${nowM}-${nowD-1}`
}
// this.startTime = 19 // this.startTime = 19
//传入的时间用在最上面的选择器上 //传入的时间用在最上面的选择器上
this.handleTab(1) this.handleTab(1)

7
pages/everdayRenven/AnhuiIndex.vue
View File

@ -664,9 +664,16 @@ export default {
} else { // 默认 } else { // 默认
if (this.PushAuthority.length > 0) { if (this.PushAuthority.length > 0) {
console.log('11111')
this.theRequest = this.defaultMsg() || {} this.theRequest = this.defaultMsg() || {}
let storeTime = uni.getStorageSync('lastDay')
if (storeTime){
this.theRequest.time = storeTime
this.theRequest.month = this.$util.cutDate(storeTime, 'YYYYMM')
}else{
this.theRequest.time = this.lastDay this.theRequest.time = this.lastDay
this.theRequest.month = this.$util.cutDate(this.lastDay, 'YYYYMM') this.theRequest.month = this.$util.cutDate(this.lastDay, 'YYYYMM')
}
this.initData() this.initData()
} else { } else {
uni.hideLoading() uni.hideLoading()

2
pages/everdayRenven/components/ServiceRevenuePie.vue
View File

@ -106,7 +106,7 @@
background-color: #fff; background-color: #fff;
} */ } */
.uni-ec-canvas{ .uni-ec-canvas{
width: 750rpx; width: 690rpx;
height: 526rpx; height: 526rpx;
margin-top: 40rpx; margin-top: 40rpx;
display:block; display:block;

58
pages/examine/index.vue
View File

@ -107,7 +107,8 @@
<span class="type">{{subItem.REGION_NAME}}区</span> <span class="type">{{subItem.REGION_NAME}}区</span>
<span class="number">({{subItem.SERVERPARTList.length}})</span> <span class="number">({{subItem.SERVERPARTList.length}})</span>
</view> </view>
<image v-if="subItem.SERVERPARTList[0].COMPLETE_STATE === 1" class="right" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/success.svg"></image> <image class="right" :src="subItem.warning===true?'https://eshangtech.com/ShopICO/ahyd-BID/examine/success.svg':'/static/images/examine/warning.svg'"></image>
<!-- <image v-if="subItem.SERVERPARTList[0].COMPLETE_STATE === 0" class="right" src="/static/images/examine/warning.svg"></image>-->
</view> </view>
<view class="detailMessage"> <view class="detailMessage">
<view class="person"> <view class="person">
@ -203,7 +204,7 @@
<view class="tab"> <view class="tab">
<view :class="popupTabSelect===item.value?'tabItem selectTabItem':'tabItem'" v-for="(item,index) in popupTab" :key="index" @click="handleChangePopupTab(item.value)">{{item.label}}</view> <view :class="popupTabSelect===item.value?'tabItem selectTabItem':'tabItem'" v-for="(item,index) in popupTab" :key="index" @click="handleChangePopupTab(item.value)">{{item.label}}</view>
</view> </view>
<view class="assessmentTable" v-if="popupServiceShowList.DetailList && popupServiceShowList.DetailList.length>0"> <scroll-view scroll-y="true" class="assessmentTable" v-if="popupServiceShowList.DetailList && popupServiceShowList.DetailList.length>0">
<view class="bigBox" v-for="(item,index) in popupServiceShowList.DetailList" :key="index" > <view class="bigBox" v-for="(item,index) in popupServiceShowList.DetailList" :key="index" >
<view class="assessmentItem" @click="handleNoShow(item)" :style="{borderBottomWidth:!item.showChild?'0px':'1px'}"> <view class="assessmentItem" @click="handleNoShow(item)" :style="{borderBottomWidth:!item.showChild?'0px':'1px'}">
<view class="left">{{item.PATROL_POSITION}}</view> <view class="left">{{item.PATROL_POSITION}}</view>
@ -233,26 +234,26 @@
<view class="detailLabel">整改结果</view> <view class="detailLabel">整改结果</view>
</view> </view>
</view> </view>
<view class="itemBox" v-else> <!-- <view class="itemBox" v-else>-->
<view class="detailItem" > <!-- <view class="detailItem" >-->
<view class="detailValue"> <!-- <view class="detailValue">-->
<view class="detailValue"><image class="right" src="/static/images/examine/gou.svg"/></view> <!-- <view class="detailValue"><image class="right" src="/static/images/examine/gou.svg"/></view>-->
</view> <!-- </view>-->
<view class="detailLabel">情况及问题</view> <!-- <view class="detailLabel">情况及问题</view>-->
</view> <!-- </view>-->
<view class="detailItem"> <!-- <view class="detailItem">-->
<view class="detailValue"><image class="right" src="/static/images/examine/gou.svg"/></view> <!-- <view class="detailValue"><image class="right" src="/static/images/examine/gou.svg"/></view>-->
<view class="detailLabel">整改期限</view> <!-- <view class="detailLabel">整改期限</view>-->
</view> <!-- </view>-->
<view class="detailItem"> <!-- <view class="detailItem">-->
<view class="detailValue"><image class="right" src="/static/images/examine/gou.svg"/></view> <!-- <view class="detailValue"><image class="right" src="/static/images/examine/gou.svg"/></view>-->
<view class="detailLabel">整改结果</view> <!-- <view class="detailLabel">整改结果</view>-->
</view> <!-- </view>-->
</view> <!-- </view>-->
</view>
</view> </view>
</view> </view>
</view> </view>
</scroll-view>
<view class="list" v-else> <view class="list" v-else>
<view class="item" v-for="(item,index) in popupServiceShowList.SERVERPARTList" :key="index"> <view class="item" v-for="(item,index) in popupServiceShowList.SERVERPARTList" :key="index">
<view class="person"> <view class="person">
@ -446,7 +447,7 @@ export default {
subItem.showChild = true subItem.showChild = true
}) })
// 反转给的考核列表 让时间从小到大 // 反转给的考核列表 让时间从小到大
item.DetailList.reverse() // item.DetailList.reverse()
}) })
// 页面上展示的数组 // 页面上展示的数组
this.popupServiceShowList = this.popupServiceList[0] this.popupServiceShowList = this.popupServiceList[0]
@ -727,6 +728,23 @@ export default {
Serverpart_ID:'',// 服务区内码，多个服务区用","隔开 Serverpart_ID:'',// 服务区内码，多个服务区用","隔开
}) })
this.inspectionList = res.Result_Data this.inspectionList = res.Result_Data
this.inspectionList.forEach(item=>{
item.list.forEach(subItem=>{
let i = 0
subItem.SERVERPARTList.forEach(thirdItem=>{
if (thirdItem.COMPLETE_STATE===0){
i++
}
})
if (i>0){
subItem.warning=false
}else{
subItem.warning=true
}
})
})
console.log('inspectionList',this.inspectionList) console.log('inspectionList',this.inspectionList)
uni.hideLoading() uni.hideLoading()
}, },

74
pages/index/index.vue
View File

@ -16,7 +16,7 @@
</view> </view>
</div> </div>
<div class="storeDetail" :style="{ top: menu.bottom + 13 + 'px',height:loadMore?'200px':'38px'}"> <div class="storeDetail" :style="{ top: menu.bottom + 13 + 'px',height:loadMore?'200px':'38px'}">
<p class="storeName">门店上传<span class="num">{{showTableData.Revenue_Upload?showTableData.Revenue_Upload:'-'}}</span>/{{allShopCount?allShopCount:'-'}}</p> <p class="storeName">门店上传<span class="num">{{showTableData.Revenue_Upload?showTableData.Revenue_Upload:'-'}}</span>/{{showTableData.TotalShopCount?showTableData.TotalShopCount:'-'}}</p>
<div class="detailBox"> <div class="detailBox">
<div class="detailTop"> <div class="detailTop">
<div class="top"> <div class="top">
@ -66,10 +66,10 @@
<p class="itemName">优惠金额<text class="itemUnit">/元</text></p> <p class="itemName">优惠金额<text class="itemUnit">/元</text></p>
</view> </view>
<view class="detailItem"> <view class="detailItem">
<p class="price" :style="{color:isBig?'red':''}">{{showTableData.Revenue_Upload?showTableData.Revenue_Upload:'-'}}/{{allShopCount?allShopCount:'-'}}</p> <p class="price" :style="{color:isBig?'red':''}">{{showTableData.Revenue_Upload?showTableData.Revenue_Upload:'-'}}/{{showTableData.TotalShopCount?showTableData.TotalShopCount:'-'}}</p>
<div class="itemName" style="display: flex;align-items: center"> <div class="itemName" style="display: flex;align-items: center">
<text>门店上传</text> <text>门店上传</text>
<div v-if="Number(showTableData.Revenue_Upload)<Number(allShopCount)" class="prompt" style="margin-left: 5px" @click="handleStoreUpload">!</div> <div v-if="Number(showTableData.Revenue_Upload)<Number(showTableData.TotalShopCount)" class="prompt" style="margin-left: 5px" @click="handleStoreUpload">!</div>
</div> </div>
</view> </view>
<view class="detailItem"> <view class="detailItem">
@ -150,8 +150,8 @@
<div class="contentList" > <div class="contentList" >
<div class="contentItem" v-for="(item,index) in warningList" :key="index"> <div class="contentItem" v-for="(item,index) in warningList" :key="index">
<div class="index"> <div class="index">
<div class="boxBg"></div> <div class="boxBg" v-if="index<=2"></div>
<span class="indexText">{{index + 1}}</span> <span class="indexText" :style="{fontWeight:index<=2?'bold':'normal',color:index<=2?'#160002':'#786B6C'}">{{index + 1}}</span>
</div> </div>
<div class="serviceBox"> <div class="serviceBox">
<span class="name">{{item.name}}</span> <span class="name">{{item.name}}</span>
@ -162,7 +162,7 @@
<span class="unit">/辆</span> <span class="unit">/辆</span>
</div> </div>
<div class="addBox"> <div class="addBox">
<image class="addIcon" :src="Number(item.VEHICLE_RATE)>100?'https://eshangtech.com/ShopICO/ahyd-BID/index/addIcon.svg':Number(item.VEHICLE_RATE)===100?'':'https://eshangtech.com/ShopICO/ahyd-BID/index/reduce.svg'"/> <image class="addIcon" :src="Number(item.VEHICLE_RATE)>100?'/static/images/examine/add.svg':Number(item.VEHICLE_RATE)===100?'':'/static/images/examine/reduce.svg'"/>
<span class="add">{{item.VEHICLE_RATE}}%</span> <span class="add">{{item.VEHICLE_RATE}}%</span>
</div> </div>
</div> </div>
@ -750,7 +750,7 @@
<div class="bodyList"> <div class="bodyList">
<div class="item" v-for="(item,index) in bodyList" :key="index"> <div class="item" v-for="(item,index) in bodyList" :key="index">
<div class="index">{{index + 1<10 ? '0' + (index + 1):index + 1}}</div> <div class="index">{{index + 1<10 ? '0' + (index + 1):index + 1}}</div>
<div class="title">{{item.Serverpart_Name}}{{item.ShopName}}</div> <div class="title">{{item.Serverpart_Name}}{{item.ServerpartShop_Name}}</div>
</div> </div>
</div> </div>
</div> </div>
@ -1320,7 +1320,7 @@ export default {
//月度计划、年度计划 //月度计划、年度计划
this.monthYearPlan() this.monthYearPlan()
//拿到未上传门点列表 //拿到未上传门点列表
this.getUnUpLoadList() // this.getUnUpLoadList()
// 拿到车流数据 // 拿到车流数据
this.handleGetTrafficList() this.handleGetTrafficList()
// 预警信息 有值会显示车流预警 // 预警信息 有值会显示车流预警
@ -1343,7 +1343,7 @@ export default {
//月度计划、年度计划 //月度计划、年度计划
this.monthYearPlan() this.monthYearPlan()
//拿到未上传门点列表 //拿到未上传门点列表
this.getUnUpLoadList() // this.getUnUpLoadList()
// 拿到车流数据 // 拿到车流数据
this.handleGetTrafficList() this.handleGetTrafficList()
// 是否显示预警信息 // 是否显示预警信息
@ -1365,9 +1365,18 @@ export default {
const date = new Date() const date = new Date()
// 拿到当前小时的前一小时 // 拿到当前小时的前一小时
let h = date.getHours() - 1 let h = date.getHours() - 1
let y = date.getFullYear()
let m = date.getMonth() + 1
if (m<10){
m = '0'+m
}
let d = date.getDate()
if (d<10){
d = '0'+d
}
const req= { const req= {
// this.single // this.single
StatisticsDate: this.single, StatisticsDate: `${y}-${m}-${d}`,
StatisticsHour:h, StatisticsHour:h,
StatisticsType:1, StatisticsType:1,
ShowCount:20 ShowCount:20
@ -1487,6 +1496,7 @@ export default {
const lastData = await request.$webGet('CommercialApi/Revenue/GetSummaryRevenue',allPriceData) const lastData = await request.$webGet('CommercialApi/Revenue/GetSummaryRevenue',allPriceData)
flag3 = true flag3 = true
let result = lastData.Result_Data let result = lastData.Result_Data
// 接口返回的数据中有三个数组的结构 排除掉不是数组的几项 对数组进行操作
for(let key in result){ for(let key in result){
if (key!=='RevenuePushModel' && key!=='GrowthRate' && key!=='MonthRevenueAmount' && key!=='YearRevenueAmount'){ if (key!=='RevenuePushModel' && key!=='GrowthRate' && key!=='MonthRevenueAmount' && key!=='YearRevenueAmount'){
let all = 0 let all = 0
@ -1658,6 +1668,7 @@ export default {
// //
// }) // })
console.log(55555) console.log(55555)
// 只有当前面的接口通了 才能一起处理数据的方法
if (flag2 && flag3 ){ if (flag2 && flag3 ){
// uni.hideLoading() // uni.hideLoading()
this.todayAmount() this.todayAmount()
@ -1696,7 +1707,27 @@ export default {
let endMonth = endDate.getMonth() + 1 let endMonth = endDate.getMonth() + 1
let endDay = endDate.getDate() let endDay = endDate.getDate()
// 判断是否是在限制的时间内 // 判断是否是在限制的时间内
if (date > endTime || date < startTime){ // isOnRefresh 是判断有没有限制条件的关键参数
// if (date > endTime || date < startTime){
// isOnRefresh = false
// }else{
// isOnRefresh = true
// }
const nowDate = new Date()
let y = nowDate.getFullYear()
let m = nowDate.getMonth() +1
if (m<10){
m= '0'+m
}
let d = nowDate.getDate()
if (d<10){
d= '0'+d
}
let nowDay = new Date(`${y}-${m}-${d}`).getTime()- 8 * 3600 * 1000
console.log('11111',nowDay)
console.log('22222',date)
if (nowDay<=date){
isOnRefresh = false isOnRefresh = false
}else{ }else{
isOnRefresh = true isOnRefresh = true
@ -1710,7 +1741,8 @@ export default {
this.onRefresh(true) this.onRefresh(true)
}else{ }else{
uni.showModal({ uni.showModal({
title: `数据看板仅支持查看${startMonth}.${startDay}-${endMonth}.${endDay}的数据,更多数据请登陆商业综合平台查看`, title: `数据看板仅支持查看${endMonth}.${endDay+1}之前的数据,更多数据请登陆商业综合平台查看`,
// title: `数据看板仅支持查看${startMonth}.${startDay}-${endMonth}.${endDay}的数据,更多数据请登陆商业综合平台查看`,
icon:'none', icon:'none',
showCancel: false, showCancel: false,
duration:3000 duration:3000
@ -1755,7 +1787,7 @@ export default {
setTimeout(()=>{ setTimeout(()=>{
// 由于页面大部分的内容采用渲染的格式 这样的方法是最快的对原数据进行赋值 对照data里面的几个主要的数组看就能看明白 // 由于页面大部分的内容采用渲染的格式 这样的方法是最快的对原数据进行赋值 对照data里面的几个主要的数组看就能看明白
// 门店上传的前后数字计算来决定样式 // 门店上传的前后数字计算来决定样式
if(this.showTableData.Revenue_Upload >= this.allShopCount){ if(this.showTableData.Revenue_Upload >= this.showTableData.TotalShopCount){
this.isBig = false this.isBig = false
}else{ }else{
this.isBig = true this.isBig = true
@ -1767,8 +1799,21 @@ export default {
// 商品均价 // 商品均价
this.showTableData.countave = (Number(this.showTableData.CashPay) / Number(this.showTableData.TotalCount)).toFixed(2) this.showTableData.countave = (Number(this.showTableData.CashPay) / Number(this.showTableData.TotalCount)).toFixed(2)
// 处理所有数据 变成有千分号和小数点的数据 // 处理所有数据 变成有千分号和小数点的数据
console.log('this.showTableData',this.showTableData)
let list =[]
this.showTableData.UnUpLoadShopList.forEach(item=>{
if (item.Revenue_Upload === 0 || !item.Revenue_Upload){
list.push(item)
}
})
this.bodyList = list
for (let key in this.showTableData){ for (let key in this.showTableData){
if (key==='uploadState' || key==='Revenue_Upload'){ if (this.showTableData[key]){
// 在有值的前提下
// 是第一个if里面的参数 不会被处理 是第二个if里面的参数 会被处理千分号 但是没有小数点 不在第一第二个if里面的字段会被处理 保留两位小数
if (key==='uploadState' || key==='Revenue_Upload' || key==='TotalShopCount' || key==='UnUpLoadShopList'){
this.showTableData[key] = this.showTableData[key] this.showTableData[key] = this.showTableData[key]
}else if(key ==='TicketCount'){ }else if(key ==='TicketCount'){
this.showTableData[key] = this.$util.noDecimal(this.showTableData[key],0) this.showTableData[key] = this.$util.noDecimal(this.showTableData[key],0)
@ -1776,6 +1821,7 @@ export default {
this.showTableData[key] = this.$util.fmoney(this.showTableData[key], 2) this.showTableData[key] = this.$util.fmoney(this.showTableData[key], 2)
} }
} }
}
uni.hideLoading() uni.hideLoading()
this.isSuccess = true this.isSuccess = true
_this.$forceUpdate() _this.$forceUpdate()

16
static/images/examine/add.svg Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>计划图标/上升@2x</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="车流分析0706" transform="translate(-172.000000, -1661.000000)">
<g id="编组-10" transform="translate(172.000000, 1661.000000)">
<circle id="椭圆形" fill="#E83944" cx="7" cy="7" r="7"></circle>
<g id="编组-9" transform="translate(4.000000, 3.000000)" fill="#FFFFFF">
<rect id="矩形" x="2.56066017" y="1.06066017" width="1" height="6" rx="0.5"></rect>
<rect id="矩形备份-6" transform="translate(4.121320, 2.000000) rotate(-225.000000) translate(-4.121320, -2.000000) " x="3.62132034" y="0" width="1" height="4" rx="0.5"></rect>
<rect id="矩形" transform="translate(2.000000, 2.000000) rotate(-225.000000) translate(-2.000000, -2.000000) " x="0" y="1.5" width="4" height="1" rx="0.5"></rect>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

16
static/images/examine/reduce.svg Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>计划图标/上升@2x</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="车流分析0706" transform="translate(-202.000000, -1661.000000)">
<g id="编组-10" transform="translate(202.000000, 1661.000000)">
<circle id="椭圆形" fill="#049E77" cx="7" cy="7" r="7"></circle>
<g id="编组-9" transform="translate(7.000000, 7.000000) scale(1, -1) translate(-7.000000, -7.000000) translate(4.000000, 3.000000)" fill="#FFFFFF">
<rect id="矩形" x="2.56066017" y="1.06066017" width="1" height="6" rx="0.5"></rect>
<rect id="矩形备份-6" transform="translate(4.121320, 2.000000) rotate(-225.000000) translate(-4.121320, -2.000000) " x="3.62132034" y="0" width="1" height="4" rx="0.5"></rect>
<rect id="矩形" transform="translate(2.000000, 2.000000) rotate(-225.000000) translate(-2.000000, -2.000000) " x="0" y="1.5" width="4" height="1" rx="0.5"></rect>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

11
static/images/examine/warning.svg Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>图标/更多备份_9@2x</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="考评考核0515" transform="translate(-388.000000, -2623.000000)" fill="#E83944" fill-rule="nonzero">
<g id="close-circle-fill" transform="translate(388.000000, 2623.000000)">
<path d="M10,20 C4.47715,20 0,15.5228 0,10 C0,4.47715 4.47715,0 10,0 C15.5228,0 20,4.47715 20,10 C20,15.5228 15.5228,20 10,20 Z M10,8.5858 L7.17157,5.75736 L5.75736,7.17157 L8.5858,10 L5.75736,12.8284 L7.17157,14.2426 L10,11.4142 L12.8284,14.2426 L14.2426,12.8284 L11.4142,10 L14.2426,7.17157 L12.8284,5.75736 L10,8.5858 Z" id="形状"></path>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 922 B