From ba35bdf5d2d9792670d4556f278dcb005ddc6cca Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Fri, 23 Sep 2022 16:43:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=85=A8?= =?UTF-8?q?=E6=89=80=E6=94=B6=E5=85=A5=E7=BB=9F=E8=AE=A1=20=E4=B8=8E?= =?UTF-8?q?=E5=85=A8=E9=80=9F=E5=8D=95=E6=9C=88=E7=BB=9F=E8=AE=A1=20?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=90=88=E5=90=8C=E9=87=91=E9=A2=9D=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/SingleMonthEcharts.vue | 72 +++++++++---------- .../dashboard/SingleMonthTotalEcharts.vue | 72 +++++++++---------- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/views/dashboard/SingleMonthEcharts.vue b/src/views/dashboard/SingleMonthEcharts.vue index 13ac0a7..e6f8cfb 100644 --- a/src/views/dashboard/SingleMonthEcharts.vue +++ b/src/views/dashboard/SingleMonthEcharts.vue @@ -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', diff --git a/src/views/dashboard/SingleMonthTotalEcharts.vue b/src/views/dashboard/SingleMonthTotalEcharts.vue index dc50a30..8339680 100644 --- a/src/views/dashboard/SingleMonthTotalEcharts.vue +++ b/src/views/dashboard/SingleMonthTotalEcharts.vue @@ -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',