diff --git a/pages/revenue/component/otherCharts.vue b/pages/revenue/component/otherCharts.vue
index d123d9a..7392c5f 100644
--- a/pages/revenue/component/otherCharts.vue
+++ b/pages/revenue/component/otherCharts.vue
@@ -1,7 +1,7 @@
-
-
+
+
@@ -30,11 +30,6 @@ export default {
default: ''
}
},
- onUnload(){
- let canvas = document.getElementById('month');
- let context = uni.createCanvasContext(this.name,this);
- context.clearRect(0, 0, canvas.width, canvas.height);
- },
watch:{
success:{
handler(value){
@@ -63,49 +58,53 @@ export default {
},
methods:{
drawCharts(id,data){
- const ctx = uni.createCanvasContext(id, this);
- let _this = this
- uChartsInstance[id] = new uCharts({
- type: "ring",
- context: ctx,
- width: 64,
- height: 64,
- series: data.series,
- animation: false,
- rotate: false,
- rotateLock: false,
- background: "#FFFFFF",
- color: _this.colorList,
- padding: [0,0,0,0],
- dataLabel: false,
- enableScroll: false,
- legend: {
- show: false,
- position: "right",
- lineHeight: 25
- },
- title: {
- name: "完成率",
- fontSize: 10,
- color: "#A69E9F"
- },
- extra: {
- ring: {
- ringWidth: 8,
- activeOpacity: 0.5,
- activeRadius: 10,
- offsetAngle: -90,
- labelWidth: 0,
- border: false,
- borderWidth: 3,
- customRadius: 32,
- borderColor: "#FFFFFF"
+ if (this.name){
+ console.log('this.name',this.name)
+ const ctx = uni.createCanvasContext(id, this);
+ let _this = this
+ uChartsInstance[id] = new uCharts({
+ type: "ring",
+ context: ctx,
+ width: 64,
+ height: 64,
+ series: data.series,
+ animation: false,
+ rotate: false,
+ rotateLock: false,
+ background: "#FFFFFF",
+ color: _this.colorList,
+ padding: [0,0,0,0],
+ dataLabel: false,
+ enableScroll: false,
+ legend: {
+ show: false,
+ position: "right",
+ lineHeight: 25
+ },
+ title: {
+ name: "完成率",
+ fontSize: 10,
+ color: "#A69E9F"
+ },
+ extra: {
+ ring: {
+ ringWidth: 8,
+ activeOpacity: 0.5,
+ activeRadius: 10,
+ offsetAngle: -90,
+ labelWidth: 0,
+ border: false,
+ borderWidth: 3,
+ customRadius: 32,
+ borderColor: "#FFFFFF"
+ }
}
- }
- });
- setTimeout( ()=>{
- this.canvasToTempImage(this.name)
- },500)
+ });
+ setTimeout( ()=>{
+ this.canvasToTempImage(this.name)
+ },500)
+ }
+
},
canvasToTempImage(id){
uni.canvasToTempFilePath({
@@ -133,6 +132,5 @@ export default {
.main{
width: 128rpx;
height: 128rpx;
- position: relative;
}
diff --git a/pages/revenue/component/yearCharts.vue b/pages/revenue/component/yearCharts.vue
index f31f558..def5a83 100644
--- a/pages/revenue/component/yearCharts.vue
+++ b/pages/revenue/component/yearCharts.vue
@@ -1,7 +1,7 @@
-
-
-
+
+
+
@@ -28,11 +28,6 @@ export default {
default: ''
}
},
- onUnload(){
- let canvas = document.getElementById('month');
- let context = uni.createCanvasContext(this.name,this);
- context.clearRect(0, 0, canvas.width, canvas.height);
- },
watch: {
success: {
handler(value) {
@@ -71,50 +66,49 @@ export default {
},
methods: {
drawCharts(id, data) {
-
- const ctx = uni.createCanvasContext(id, this);
- let _this = this
- uChartsInstance[id] = new uCharts({
- type: "ring",
- context: ctx,
- width: 34,
- height: 34,
- series: data.series,
- animation: false,
- rotate: false,
- rotateLock: false,
- background: "#FFFFFF",
- color: ["#018ABD", "#CCE8F2"],
- padding: [0,0,0,0],
- dataLabel: false,
- enableScroll: false,
- legend: {
- show: false,
- position: "right",
- lineHeight: 25
- },
- extra: {
- ring: {
- ringWidth: 4,
- activeOpacity: 0.5,
- activeRadius: 10,
- offsetAngle: -90,
- labelWidth: 0,
- border: false,
- borderWidth: 3,
- customRadius: 17,
- borderColor: "#FFFFFF"
+ if (this.name){
+ const ctx = uni.createCanvasContext(id, this);
+ let _this = this
+ uChartsInstance[id] = new uCharts({
+ type: "ring",
+ context: ctx,
+ width: 34,
+ height: 34,
+ series: data.series,
+ animation: false,
+ rotate: false,
+ rotateLock: false,
+ background: "#FFFFFF",
+ color: ["#018ABD", "#CCE8F2"],
+ padding: [0,0,0,0],
+ dataLabel: false,
+ enableScroll: false,
+ legend: {
+ show: false,
+ position: "right",
+ lineHeight: 25
+ },
+ extra: {
+ ring: {
+ ringWidth: 4,
+ activeOpacity: 0.5,
+ activeRadius: 10,
+ offsetAngle: -90,
+ labelWidth: 0,
+ border: false,
+ borderWidth: 3,
+ customRadius: 17,
+ borderColor: "#FFFFFF"
+ }
}
- }
- });
- console.log('_this.hide',_this.hide)
- setTimeout( ()=>{
- console.log('this.name',this.name)
- this.canvasToTempImage(this.name)
- },500)
+ });
+ setTimeout( ()=>{
+ this.canvasToTempImage(this.name)
+ },500)
+ }
},
canvasToTempImage(id){
- wx.canvasToTempFilePath({
+ uni.canvasToTempFilePath({
canvasId:id,
complete:(res)=>{
console.log('res',res)
@@ -126,7 +120,6 @@ export default {
let base64 = 'data:image/png;base64,' + res.data;
this.preferPath = base64
this.hide = false
- console.log('this.hide ',this.hide )
}
})
}
diff --git a/pages/revenue/index.vue b/pages/revenue/index.vue
index 6bd7fc4..03c98cf 100644
--- a/pages/revenue/index.vue
+++ b/pages/revenue/index.vue
@@ -40,16 +40,16 @@
成本比：本月成本 / 本月收入
本月收入：营业收入 + 营业外收入
- 支出比：累积支出/支出预计
- 本月支出=管理费用 + 销售费用 + 财务费用 + 营业外支出
+ 支出比：累积支出 / 支出预计
+ 本月支出=管理费用 + 销售费用 + 财务费用 + 营业外支出 + 税金及附加
-
+
-
+
@@ -74,7 +74,7 @@
{{
`${currentResult.costYear||'-'}%`
}}
- 同比
+ 收入同比
@@ -82,7 +82,7 @@
-
+
@@ -109,7 +109,7 @@
{{
`${currentResult.expendYear||'-'}%`
}}
- 同比
+ 成本同比
@@ -211,7 +211,7 @@
不包含营业外收入
完成率=本年累计 / 年度预算
(472,356,021.71/725,370,000.00)
成本比=本年成本/本年累计收入
(180,563,832.50/472,356,021.71)
- 年度预算同比：本年累计营收的同比值
+ 年度累计收入同比：本年累计收入的同比值
@@ -255,7 +255,7 @@
+47.81%
- 同比
+ 收入同比
@@ -283,7 +283,7 @@
完成率=本年累计收入 / 年度预算
{{ `(${currentResult.inComeThisYearReal||'-'} / ${currentResult.thisYearInComeBudgetReal||'-'})` }}
- 成本比=本年累计成本/本年累计收入
{{ `${currentResult.costReal||'-'} /${currentResult.inComeThisYearReal||'-'})` }}
+ 成本比=本年累计成本/本年累计收入
{{ `(${currentResult.costReal||'-'} /${currentResult.inComeThisYearReal||'-'})` }}
年度预算：年度预算包含营业外
年度预算同比： 本年累计收入的同比值
@@ -292,7 +292,7 @@
-
+
{{`${currentResult.inComeSuccess || '-'}%`}}
@@ -364,7 +364,7 @@
-
+
{{ `${currentResult.selfRate||'-'}%` }}
@@ -462,7 +462,7 @@
-
+
{{ `${currentResult.otherRate || '-'}%` }}
@@ -528,23 +528,23 @@
-
+
支出合计
-
+
- {{`77.09%`}}
+ {{`${currentResult.expenditureRatio}%`}}
- {{'61,611.98'}}
- 2023年完成/万元
+ {{currentResult.expenditureThisYear}}
+ 本年累计/万元
@@ -552,15 +552,15 @@
- {{`100.79%` }}
+ {{`${currentResult.expenditureOutRatio}%` }}
支出比
- {{'79,924.00'}}
- 2023年预计/万元
+ {{currentResult.expenditureThisYearBudget}}
+ 年度预计/万元
@@ -572,13 +572,13 @@
-
+
- {{ `营业成本小计` }}
+ {{ item.name }}
查看更多
@@ -589,22 +589,22 @@
-
- {{`84.13%`}}
+
+ {{`${item.expenditureCostRate}%`}}
- {{ '24,393.60' }}
- 2023年完成/万元
+ {{ item.expenditureCostThisYear }}
+ 本年累计/万元
- {{`2,999.00`}}
+ {{ item.expenditureCostThisMonth }}
{{ `${thisMonth}月累计` }}/万元
@@ -612,11 +612,11 @@
- {{ '28,994.00' }}
- 2023年预计/万元
+ {{ item.expenditureCostThisYearBudget }}
+ 年度预计/万元
- {{`12.29%`}}
+ {{ item.expenditureCostThisRate }}
本月占比
@@ -628,159 +628,159 @@
-
-
-
-
-
-
- {{ `管理费用小计` }}
-
-
- 查看更多
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- {{`64.57%`}}
-
-
-
-
-
- {{ '2,783.01' }}
- 2023年完成/万元
-
-
-
-
-
-
-
- {{`220.00`}}
- {{ `${thisMonth}月累计` }}/万元
-
-
-
-
-
- {{ '4,310.00' }}
- 2023年预计/万元
-
-
- {{`7.91%`}}
- 本月占比
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{ `销售费用小计` }}
-
-
- 查看更多
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- {{`74.54%`}}
-
-
-
-
-
- {{ '33,998.37' }}
- 2023年完成/万元
-
-
-
-
-
-
-
- {{`3,548.00`}}
- {{ `${thisMonth}月累计` }}/万元
-
-
-
-
-
- {{ '45,611.00' }}
- 2023年预计/万元
-
-
- {{`10.44%`}}
- 本月占比
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
- {{ `其他费用小计` }}
-
-
- 查看更多
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- {{`59.46%`}}
-
-
-
-
-
- {{ '437.00' }}
- 2023年完成/万元
-
-
-
-
-
-
-
- {{`-36.00`}}
- {{ `${thisMonth}月累计` }}/万元
-
-
-
-
- {{ '735.00' }}
- 2023年预计/万元
-
-
- {{`-8.24%`}}
- 本月占比
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -847,8 +847,8 @@ export default {
childrenShow:false,// 收入合计的显示框
CostInRate:44.36,
InOutRate:56.29,
- monthList:[7,8,9],// 月份列表
- selectMonth:0,// 当前选中的月份
+ monthList:[7,8,9,10],// 月份列表
+ selectMonth: 0,// 当前选中的月份
monthResult:[
// 7月
{
@@ -898,9 +898,11 @@ export default {
otherThisMonthRate:'15.14',//其他收入预算本月占比
leaseRate:'35.99',// 租赁完成率
propertyRate:'',//物业及受托代管
+ showExpenditure:false,// 是否显示支出
},
{
month:8,// 月份
+ showExpenditure:false,// 是否显示支出
},
{
month:9,// 月份
@@ -949,8 +951,134 @@ export default {
otherThisMonthRate:'9.91',//其他收入预算本月占比
leaseRate:'63.83',// 租赁完成率
propertyRate:'67.83',//物业及受托代管
+ showExpenditure:true,// 是否显示支出
+ expenditureRatio:77.09,//支出完成率
+ expenditureOutRatio:77.09,//支出比
+ expenditureThisYear:'61,611.98',// 本年累计支出
+ expenditureThisYearBudget:'79,924.00',// 本年预计支出
+ outList:[
+ {
+ name:'营业成本小计',// 名称
+ expenditureCostRate:84.13,// 营业成本小计完成率
+ expenditureCostThisYear:'24,393.60',// 营业成本小计本年累计
+ expenditureCostThisMonth:'2,999.00',// 营业成本小计本月累计
+ expenditureCostThisYearBudget:'28,994.00',// 营业成本小计年度预计
+ expenditureCostThisRate:'12.29%',// 营业成本小计本月占比
+ },
+ {
+ name:'管理费用小计',// 名称
+ expenditureCostRate:64.57,// 营业成本小计完成率
+ expenditureCostThisYear:'2,783.01',// 营业成本小计本年累计
+ expenditureCostThisMonth:'220.00',// 营业成本小计本月累计
+ expenditureCostThisYearBudget:'4,310.00',// 营业成本小计年度预计
+ expenditureCostThisRate:'7.91%',// 营业成本小计本月占比
+ },
+ {
+ name:'销售费用小计',// 名称
+ expenditureCostRate:74.54,// 营业成本小计完成率
+ expenditureCostThisYear:'33,998.37',// 营业成本小计本年累计
+ expenditureCostThisMonth:'3,548.00',// 营业成本小计本月累计
+ expenditureCostThisYearBudget:'45,611.00',// 营业成本小计年度预计
+ expenditureCostThisRate:'10.44%',// 营业成本小计本月占比
+ },
+ {
+ name:'其他费用小计',// 名称
+ expenditureCostRate:59.46,// 营业成本小计完成率
+ expenditureCostThisYear:'437.00',// 营业成本小计本年累计
+ expenditureCostThisMonth:'-36.00',// 营业成本小计本月累计
+ expenditureCostThisYearBudget:'735.00',// 营业成本小计年度预计
+ expenditureCostThisRate:'-8.24%',// 营业成本小计本月占比
+ }
+ ]
+ },
+ {
+ month:10,// 月份
+ costRatio:43.08,// 成本比
+ expendRatio:82.00,// 支出比
+ thisMonthInCome:'7,535.00',// 本月收入
+ thisMonthExpend:'4,188.30',// 本月支出
+ costYear:'46.82',// 成本同比
+ expendYear:'71.38',// 支出同比
+ profitRate:99.47,// 累计利润完成率
+ profitThisYear:'547.00',// 本年累计
+ profitThisYearReal:'547.00',// 本年累计详情
+ profitBudgetThisYear:'550.00',// 年度预算
+ profitBudgetThisYearReal:'550.00',// 年度预算详情
+ profitYOY:'+105.14',// 累计利润同比
+ thisYearNetProfit:'407.00',// 净利润
+ thisYearNetProfitReal:'407.00',// 净利润详情
+ thisYearNetProfitBudget:'356.00',// 净利润预算
+ thisYearNetProfitBudgetReal:'356.00',// 净利润预算详情
+ thisYearNetProfitSuccess:'114.35',// 净利润完成度
+ inComeSuccess:86.74,// 收入完成率
+ inComeThisYear:'69,438.38',// 本年收入累计
+ inComeThisYearReal:'694,383,825.61',// 本年收入累计详情
+ thisYearCostRatio:39.81,// 本年成本比
+ thisYearInComeBudget:'80,050',// 年度收入预算
+ thisYearInComeBudgetReal:'800,500,000.00',// 年度收入预算详情
+ costReal:'289,940,000.00',// 累计成本详情
+ thisYearInComeYOY:'44.08',// 年度收入同比
+ selfRate:93.96,// 自营收入小计完成率
+ selfThisYear:'50,563.57',// 自营收入小计本年累计
+ selfThisYearReal:'505,635,722.50',// 自营收入小计本年累计详情
+ selfThisMonth:'5,570.84',// 自营收入小计本月
+ selfThisMonthReal:'55,708,375.34',// 自营收入小计本月详情
+ selfThisYearBudget:'53,814',// 自营收入小计年度预算
+ selfThisYearBudgetReal:'538,140,000.00',// 自营收入小计年度预算详情
+ selfThisMonthRate:'11.02',// 自营收入小计本月占比
+ selfStoreRate:'93.24',// 便利店完成率
+ selfRoomRate:'97.81',// 餐饮客房完成率
+ otherRate:'71.94',// 其他收入小计完成率
+ otherThisYear:'18,874.81',// 其他收入小计本年累计
+ otherThisYearReal:'188,748,102.96',// 其他收入小计本年累计详情
+ otherThisMonth:'196.21',// 其他收入小计本月
+ otherThisMonthReal:'19,642,084.33',// 其他收入小计本月详情
+ otherThisYearBudget:'26,236.00',//其他收入小计年度预算
+ otherThisYearBudgetReal:'262,360,000.00',//其他收入小计年度预算详情
+ otherThisMonthRate:'10.41',//其他收入预算本月占比
+ leaseRate:'70.85',// 租赁完成率
+ propertyRate:'75.36',//物业及受托代管
+ showExpenditure:true,// 是否显示支出
+ expenditureRatio:86.72,//支出完成率
+ expenditureOutRatio:86.72,//支出比
+ expenditureThisYear:'69,089.29',// 本年累计支出
+ expenditureThisYearBudget:'79,670.00',// 本年预计支出
+ outList:[
+ {
+ name:'营业成本小计',// 名称
+ expenditureCostRate:95.33,// 营业成本小计完成率
+ expenditureCostThisYear:'27,639.61',// 营业成本小计本年累计
+ expenditureCostThisMonth:'3,246.00',// 营业成本小计本月累计
+ expenditureCostThisYearBudget:'28,994.00',// 营业成本小计年度预计
+ expenditureCostThisRate:'11.74%',// 营业成本小计本月占比
+ },
+ {
+ name:'管理费用小计',// 名称
+ expenditureCostRate:75.58,// 营业成本小计完成率
+ expenditureCostThisYear:'3,257.43',// 营业成本小计本年累计
+ expenditureCostThisMonth:'474.41',// 营业成本小计本月累计
+ expenditureCostThisYearBudget:'4,310.00',// 营业成本小计年度预计
+ expenditureCostThisRate:'14.56%',// 营业成本小计本月占比
+ },
+ {
+ name:'销售费用小计',// 名称
+ expenditureCostRate:82.73,// 营业成本小计完成率
+ expenditureCostThisYear:'37,736.25',// 营业成本小计本年累计
+ expenditureCostThisMonth:'3,737.88',// 营业成本小计本月累计
+ expenditureCostThisYearBudget:'45,611.00',// 营业成本小计年度预计
+ expenditureCostThisRate:'9.91%',// 营业成本小计本月占比
+ },
+ {
+ name:'其他费用小计',// 名称
+ expenditureCostRate:60.40,// 营业成本小计完成率
+ expenditureCostThisYear:'456.00',// 营业成本小计本年累计
+ expenditureCostThisMonth:'18.00',// 营业成本小计本月累计
+ expenditureCostThisYearBudget:'735.00',// 营业成本小计年度预计
+ expenditureCostThisRate:'3.95%',// 营业成本小计本月占比
+ }
+ ]
}
- ],// 789月份的数据
+ ],// 78910月份的数据
currentResult:{},// 选择的数据
}
},
@@ -978,12 +1106,14 @@ export default {
let m = date.getMonth()+1
this.thisYear = y
this.startDate = `${y}-07`
- this.endData = `${y}-09`
+ this.endData = `${y}-10`
this.single = `${y}-07`
this.thisMonth = '07'
// 请求的方法
- this.handleGetData()
- this.currentResult = this.monthResult[this.selectMonth]
+ // this.handleGetData()
+ // this.selectMonth = 0
+ this.handleChangeSwiper({target:{current:3}})
+ // this.currentResult = this.monthResult[this.selectMonth]
},
methods:{
// 点击出现备注
@@ -1201,6 +1331,7 @@ export default {
.main{
width: 100%;
min-height: 100vh;
+ overflow: hidden;
.meng{
width: 100vw;
height: 100vh;