+
{{detail.MerchantName || ''}}
@@ -181,12 +181,12 @@ export default {
},
handleShopDetail(item){
console.log('item',item)
- // if (item.COOPMERCHANTS_ID && item.COOPMERCHANTS_ID!=='-1'){
- // uni.navigateTo({
- // url:`/pages/commercialBI/shopDetail?id=${item.COOPMERCHANTS_ID}&COOPMERCHANTSID=${item.COOPMERCHANTS_ID_Encrypted}`
- // })
- // }
- }
+ if (item.MerchantID && item.MerchantID!=='-1'){
+ uni.navigateTo({
+ url:`/pages/commercialBI/shopDetail?id=${item.MerchantID}&COOPMERCHANTSID=${item.MerchantID_Encrypt}`
+ })
+ }
+ },
}
}
diff --git a/pages/commercialBI/formatPortrait.vue b/pages/commercialBI/formatPortrait.vue
index 01be0d6..ee53553 100644
--- a/pages/commercialBI/formatPortrait.vue
+++ b/pages/commercialBI/formatPortrait.vue
@@ -66,7 +66,9 @@
- {{item.MerchantName || ''}}
+
+ {{item.MerchantName || ''}}
+
@@ -611,6 +613,9 @@ export default {
}
.suggest{
display: inline-block;
+ box-sizing: border-box;
+ width: 100%;
+ //width: 80%;
min-height: 25px;
padding: 0 8px;
background: linear-gradient(90deg, RGBA(222, 231, 255, 1) 0%, RGBA(241, 246, 255, 1) 100%);
diff --git a/pages/commercialBI/shopDetail.vue b/pages/commercialBI/shopDetail.vue
index 9bf838e..1102d9c 100644
--- a/pages/commercialBI/shopDetail.vue
+++ b/pages/commercialBI/shopDetail.vue
@@ -78,7 +78,7 @@
经营项目
- ({{`${serviceList.length}`}})
+ ({{projectLong}})
@@ -185,7 +185,8 @@ export default {
4: '特产、工艺品等其他类',
5: '汽修类',
},
- personList:[]
+ personList:[],
+ projectLong: 0
}
},
onLoad(query){
@@ -251,6 +252,7 @@ export default {
console.log('list',data)
this.serviceList = data.Result_Data.AccountReceivablesList
if (this.serviceList && this.serviceList.length>0){
+ this.projectLong = this.serviceList.length
this.serviceList.forEach(item=>{
const nowDay = new Date().getTime()
const startDay = new Date(item.PROJECT_STARTDATE).getTime()
diff --git a/pages/examine/index.vue b/pages/examine/index.vue
index f59eb78..a8338f0 100644
--- a/pages/examine/index.vue
+++ b/pages/examine/index.vue
@@ -1,35 +1,35 @@
-
-
-
-
-
-
-
-
- 考评考核
-
-
-
+
+
+
+
+
+
+
+
+ 考评考核
+
+
+
-
-
-
-
-
-
- {{selectAreaName}}
- 片区
-
-
-
-
-
+
+
+
+ {{selectAreaName}}
+ 片区
+
+
+
+
+
{{item.label}}
-
+
@@ -234,22 +234,6 @@
整改结果
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 863726f..6c13c95 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -166,14 +166,14 @@
- 126.32
+ {{showTableData.allRevenueYear?showTableData.allRevenueYear:''}}
年度累计/亿元
-
- 11.07%
+
+ {{showTableData.yearYoY?showTableData.yearYoY+'%':''}}
同比
@@ -182,60 +182,60 @@
对客营收/环比
- +19.54%
+ {{showTableData.customerQoQ?showTableData.customerQoQ:''}}
自营收入/环比
- +19.54%
+ {{typeList[0].addQOQ?typeList[0].addQOQ:''}}
外租收入/环比
- +19.54%
+ {{typeList[1].addQOQ?typeList[1].addQOQ:''}}
-
+
入区车流
- +198.54%
+ {{trafficYOYObj.Vehicle_GrowthRate?trafficYOYObj.Vehicle_GrowthRate>0?'+'+trafficYOYObj.Vehicle_GrowthRate+'%':trafficYOYObj.Vehicle_GrowthRate+'%':'-'}}
/同比
- +198.54%
+ {{trafficQOQObj.Vehicle_GrowthRate?trafficQOQObj.Vehicle_GrowthRate>0?'+'+trafficQOQObj.Vehicle_GrowthRate+'%':trafficQOQObj.Vehicle_GrowthRate+'%':'-'}}
/环比
-
+
入区率
- +198.54%
+ {{trafficYOYObj.Entry_GrowthRate?trafficYOYObj.Entry_GrowthRate>0?'+'+trafficYOYObj.Entry_GrowthRate+'%':trafficYOYObj.Entry_GrowthRate+'%':'-'}}
/同比
- +198.54%
+ {{trafficQOQObj.Entry_GrowthRate?trafficQOQObj.Entry_GrowthRate>0?'+'+trafficQOQObj.Entry_GrowthRate+'%':trafficQOQObj.Entry_GrowthRate+'%':'-'}}
/环比
-
+
停留时长
- +198.54%
+ {{trafficYOYObj.StayTimes_GrowthRate?trafficYOYObj.StayTimes_GrowthRate>0?'+'+trafficYOYObj.StayTimes_GrowthRate+'%':trafficYOYObj.StayTimes_GrowthRate+'%':'-'}}
/同比
- +198.54%
+ {{trafficQOQObj.StayTimes_GrowthRate?trafficQOQObj.StayTimes_GrowthRate>0?'+'+trafficQOQObj.StayTimes_GrowthRate+'%':trafficQOQObj.StayTimes_GrowthRate+'%':'-'}}
/环比
@@ -340,7 +340,7 @@
-
+
财务报表
@@ -804,6 +804,8 @@ export default {
phoneWidth:0,// 手机的宽度
progressObj:{},//自营和外租的占比
showHaveNotice:false,// 显示月份详情卡片的进度条点击显示的内容
+ trafficQOQObj:{},// 环比对象
+ trafficYOYObj:{},// 同比对象
}
},
watch:{
@@ -1180,6 +1182,8 @@ export default {
this.handleGetExamine()
// 获取巡检数据
this.handleGetDailyPatrol()
+ // 获取全省平均车流量
+ this.handleGetAllCarTraffic()
} else if (this.user.Membership_Id){ // 默认
// 不是从推送进来 走正常的请求方法
// if (!this.PushAuthority){return}
@@ -1202,6 +1206,8 @@ export default {
this.handleGetExamine()
// 获取巡检数据
this.handleGetDailyPatrol()
+ // 获取全省平均车流量
+ this.handleGetAllCarTraffic()
}
// 老代码 不知道干啥用的
@@ -1271,6 +1277,9 @@ export default {
this.$util.toNextRoute('navigateTo', `/pages/commercialBI/formatPortrait?time=${this.lastDay}&serviceInfo=${JSON.stringify(this.nearServiceInfo)}`)
// uni.showToast({title: '栏目建设中', icon: 'none'})
},
+ handleMoney(){
+ this.$util.toNextRoute('navigateTo', `/pages/revenue/index`)
+ },
handleSearch(type){
if (type ==='special'){
if(!this.isReturn){
@@ -1542,6 +1551,7 @@ export default {
progressAll+=Number(item.value)
let index = (item.value /10000).toString().indexOf('.')
item.showValue =(item.value /10000).toString().substring(0,index+3)
+ // 同比
if (item.data){
let number = ((item.value - item.data)/item.data)*100
if (number>0){
@@ -1552,6 +1562,17 @@ export default {
item.add = null
}
}
+ // 环比
+ if(item.key){
+ let number = ((item.value - item.key)/item.key)*100
+ if (number>0){
+ item.addQOQ ='+'+number.toFixed(2)+'%'
+ }else if(number<0){
+ item.addQOQ =number.toFixed(2)+'%'
+ }else{
+ item.addQOQ = null
+ }
+ }
})
this.typeList = result.BusinessTypeList
@@ -1585,12 +1606,29 @@ export default {
this.showTableData.add = Number(((this.showTableData.CashPay-this.showTableData.RevenueYOY)/this.showTableData.RevenueYOY*100).toFixed(2))
this.showTableData.add = this.showTableData.add>0?'+'+this.showTableData.add:this.showTableData.add
}
+ if (this.showTableData.YearRevenueAmount){
+ console.log('result.MonthRevenueModel',result.MonthRevenueModel)
+ // 不四舍五入的截取年度累计
+ let index = (result.MonthRevenueModel.YearRevenueAmount / 100000000).toString().indexOf('.')
+ this.showTableData.allRevenueYear = (result.MonthRevenueModel.YearRevenueAmount / 100000000).toString().substring(0,index+3)
+ // 同比去年的年度累计
+ let yearYoY = (((result.MonthRevenueModel.YearRevenueAmount - result.MonthRevenueModel.YearRevenueYOY) / result.MonthRevenueModel.YearRevenueYOY)*100).toFixed(2)
+ console.log('yearYoY',yearYoY)
+ this.showTableData.yearYoY = Number(yearYoY)
+ }
+ if (this.showTableData.RevenueQOQ){
+ // 对客的环比
+ let customerQoQ = (((result.MonthRevenueModel.CashPay - result.MonthRevenueModel.RevenueQOQ) / result.MonthRevenueModel.RevenueQOQ)*100).toFixed(2)
+ console.log('customerQoQ',customerQoQ)
+ this.showTableData.customerQoQ = Number(customerQoQ)>0?'+'+customerQoQ+'%':Number(customerQoQ)<0?'-'+customerQoQ+'%':''
+ }
this.yesObj = result.RevenuePushModel
if (this.yesObj){
let indexYes = (result.RevenuePushModel.CashPay / 10000).toString().indexOf('.')
this.yesObj.CashPay = (result.RevenuePushModel.CashPay / 10000).toString().substring(0,indexYes+3)
+
}
if (result.GrowthRate){
@@ -1627,7 +1665,36 @@ export default {
// this.yearAmountAdd = result.YearRevenueAmount?this.$util.fmoney(result.YearRevenueAmount):'-'
// this.modelProgress = result.BusinessTypeList
// 只有当前面的接口通了 才能一起处理数据的方法
-
+ },
+ //获取全省平均车流量
+ handleGetAllCarTraffic(){
+ const date = new Date(this.lastDay)
+ let time
+ if (this.selectMonth === date.getMonth()+1){
+ time = this.lastDay
+ }else{
+ const date = new Date(this.single)
+ let y = date.getFullYear()
+ let m = date.getMonth() + 1
+ if(m<10){
+ m='0'+m
+ }
+ time = `${y}${m}`
+ }
+ const req = {
+ Province_Code:this.useInfo.userData.ProvinceCode || '340000',
+ Statistics_Date:time
+ }
+ request.$webGet('CommercialApi/Revenue/GetProvinceAvgBayonetAnalysis',req).then(res=>{
+ console.log('res',res)
+ res.Result_Data.List.forEach(item=>{
+ if (item.Serverpart_Name==='QOQ'){
+ this.trafficQOQObj = item
+ }else if(item.Serverpart_Name==='YOY'){
+ this.trafficYOYObj = item
+ }
+ })
+ })
},
defaultMsg() {
let option = null
diff --git a/pages/newamine/index.vue b/pages/newamine/index.vue
new file mode 100644
index 0000000..541f46a
--- /dev/null
+++ b/pages/newamine/index.vue
@@ -0,0 +1,1703 @@
+
+
+
+
+
+
+
+
+
+
+ 考评考核
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 整改前
+
+ 整改后
+
+ 暂未整改完成
+
+
+
+
+
+
+
diff --git a/pages/revenue/component/yearCharts.vue b/pages/revenue/component/yearCharts.vue
new file mode 100644
index 0000000..4c10cea
--- /dev/null
+++ b/pages/revenue/component/yearCharts.vue
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/revenue/index.vue b/pages/revenue/index.vue
new file mode 100644
index 0000000..d80e4aa
--- /dev/null
+++ b/pages/revenue/index.vue
@@ -0,0 +1,364 @@
+
+
+
+
+
+
+
+ 年度累计利润
+
+
+
+ 完成率
+ 34.63%
+
+
+
+
+
+
+
+
+ 119.01
+ 2022年完成/万元
+
+
+
+ 300.00
+ 2023年预计/万元
+
+
+
+ 12.84%
+ 计划比
+
+
+
+
+
+
+
+
+
+
diff --git a/static/images/revenueBox/revenyeBg.png b/static/images/revenueBox/revenyeBg.png
new file mode 100644
index 0000000..f8fe786
Binary files /dev/null and b/static/images/revenueBox/revenyeBg.png differ