LK/income_payments_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】全所收入统计 与全速单月统计 去掉合同金额展示

Browse Source
This commit is contained in:
fengachen
2022-09-23 16:43:38 +08:00
parent 71d2b2f479
commit ba35bdf5d2
2 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/dashboard/SingleMonthEcharts.vue
+36 -36
View File
@@ -101,7 +101,7 @@ export default {
},
disableMixinCreated:true,
echartsData:{
allMoney:[],
// allMoney:[],
confirmAmount:[],
billMoney:[],
comeAllMoney:[]
@@ -129,7 +129,7 @@ export default {
let dataSource = res.result
// 树形结构的数据 ，修改成table可以直接展示的数据，默认只有四行数据
let tableData = [
{indexName: '合同金额'},
// {indexName: '合同金额'},
{indexName: '确认收入金额'},
{indexName: '开票金额'},
{indexName: '到账金额'},
@@ -139,10 +139,10 @@ export default {
let keyItem = MonthData.find(ele => Number(ele.value) === (index + 1))
if (keyItem) {
let key = keyItem.key
tableData[0][key] = item.allMoney // 合同金额
tableData[1][key] = item.confirmAmount // 确认收入金额
tableData[2][key] = item.billMoney // 开票金额
tableData[3][key] = item.comeAllMoney // 到账金额
// tableData[0][key] = item.allMoney // 合同金额
tableData[0][key] = item.confirmAmount // 确认收入金额
tableData[1][key] = item.billMoney // 开票金额
tableData[2][key] = item.comeAllMoney // 到账金额
}
})
this.initEchartsData(res.result)
@@ -160,7 +160,7 @@ export default {
// 将后端返回的数据 处理成 echarts需要的数据 格式
initEchartsData(data) {
data.map(item =>{
this.echartsData.allMoney.push(item.allMoney)
// this.echartsData.allMoney.push(item.allMoney)
this.echartsData.confirmAmount.push(item.confirmAmount)
this.echartsData.billMoney.push(item.billMoney)
this.echartsData.comeAllMoney.push(item.comeAllMoney)
@@ -196,7 +196,7 @@ export default {
}
},
legend: {
data: ['合同金额', '确认收入金额', '开票金额', '到账金额'],
data: [ '确认收入金额', '开票金额', '到账金额'],
right: '2%'
},
grid: {
@@ -248,34 +248,34 @@ export default {
},
},
series: [
{
name: '合同金额',
type: 'line',
showSymbol: false,
symbol: 'circle',
symbolSize: 8,
data: this.echartsData.allMoney,
itemStyle: {
emphasis: {
color: '#fff',//拐点颜色
borderColor: '#1BCDC6',//拐点边框颜色
borderWidth: 2//拐点边框大小
}
},
areaStyle: {
opacity: 0.2,
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: '#1BCDC6'
},
{
offset: 1,
color: '#ffffff'
}
])
},
},
// {
// name: '合同金额',
// type: 'line',
// showSymbol: false,
// symbol: 'circle',
// symbolSize: 8,
// data: this.echartsData.allMoney,
// itemStyle: {
// emphasis: {
// color: '#fff',//拐点颜色
// borderColor: '#1BCDC6',//拐点边框颜色
// borderWidth: 2//拐点边框大小
// }
// },
// areaStyle: {
// opacity: 0.2,
// color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
// {
// offset: 0,
// color: '#1BCDC6'
// },
// {
// offset: 1,
// color: '#ffffff'
// }
// ])
// },
// },
{
name: '确认收入金额',
type: 'line',
src/views/dashboard/SingleMonthTotalEcharts.vue
+36 -36
View File
@@ -101,7 +101,7 @@ export default {
},
disableMixinCreated:true,
echartsData:{
allMoney:[],
// allMoney:[],
confirmAmount:[],
billMoney:[],
comeAllMoney:[]
@@ -129,7 +129,7 @@ export default {
let dataSource = res.result
// 树形结构的数据 ，修改成table可以直接展示的数据，默认只有四行数据
let tableData = [
{indexName: '合同金额'},
// {indexName: '合同金额'},
{indexName: '确认收入金额'},
{indexName: '开票金额'},
{indexName: '到账金额'},
@@ -139,10 +139,10 @@ export default {
let keyItem = MonthDataTotal.find(ele => Number(ele.value) === (index + 1))
if (keyItem) {
let key = keyItem.key
tableData[0][key] = item.allMoney // 合同金额
tableData[1][key] = item.confirmAmount // 确认收入金额
tableData[2][key] = item.billMoney // 开票金额
tableData[3][key] = item.comeAllMoney // 到账金额
// tableData[0][key] = item.allMoney // 合同金额
tableData[0][key] = item.confirmAmount // 确认收入金额
tableData[1][key] = item.billMoney // 开票金额
tableData[2][key] = item.comeAllMoney // 到账金额
}
})
this.initEchartsData(res.result)
@@ -161,7 +161,7 @@ export default {
// 将后端返回的数据 处理成 echarts需要的数据 格式
initEchartsData(data) {
data.map(item =>{
this.echartsData.allMoney.push(item.allMoney)
// this.echartsData.allMoney.push(item.allMoney)
this.echartsData.confirmAmount.push(item.confirmAmount)
this.echartsData.billMoney.push(item.billMoney)
this.echartsData.comeAllMoney.push(item.comeAllMoney)
@@ -197,7 +197,7 @@ export default {
}
},
legend: {
data: ['合同金额', '确认收入金额', '开票金额', '到账金额'],
data: ['确认收入金额', '开票金额', '到账金额'],
right: '2%'
},
grid: {
@@ -249,34 +249,34 @@ export default {
},
},
series: [
{
name: '合同金额',
type: 'line',
showSymbol: false,
symbol: 'circle',
symbolSize: 8,
data: this.echartsData.allMoney,
itemStyle: {
emphasis: {
color: '#fff',//拐点颜色
borderColor: '#1BCDC6',//拐点边框颜色
borderWidth: 2//拐点边框大小
}
},
areaStyle: {
opacity: 0.2,
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: '#1BCDC6'
},
{
offset: 1,
color: '#ffffff'
}
])
},
},
// {
// name: '合同金额',
// type: 'line',
// showSymbol: false,
// symbol: 'circle',
// symbolSize: 8,
// data: this.echartsData.allMoney,
// itemStyle: {
// emphasis: {
// color: '#fff',//拐点颜色
// borderColor: '#1BCDC6',//拐点边框颜色
// borderWidth: 2//拐点边框大小
// }
// },
// areaStyle: {
// opacity: 0.2,
// color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
// {
// offset: 0,
// color: '#1BCDC6'
// },
// {
// offset: 1,
// color: '#ffffff'
// }
// ])
// },
// },
{
name: '确认收入金额',
type: 'line',