From e14a9fe0a8437184738e8a0214dab7129099856c Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Mon, 21 Nov 2022 13:44:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E3=80=81=E7=BB=9F=E8=AE=A1--?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E3=80=90=E5=90=88=E5=90=8C=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E3=80=91=20=E4=BF=AE=E6=94=B9=E6=88=90=20=E3=80=90?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E5=BE=85=E7=A1=AE=E6=94=B6=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/AllMoneyTenEcharts.vue | 8 ++++---- src/views/dashboard/Analysis.vue | 8 ++++---- src/views/dashboard/DepartmentTotalEcharts.vue | 6 +++--- src/views/dashboard/IncomeSortEcharts.vue | 9 ++++++++- src/views/dashboard/SingleMonthEcharts.vue | 6 +++--- src/views/dashboard/SingleMonthTotalEcharts.vue | 6 +++--- src/views/dashboard/ThreeYearEcharts.vue | 2 +- .../statisticalReport/WholeInstituteStatisticsList.vue | 2 +- src/views/statisticalReport/WholePaymentsStatistics.vue | 2 +- .../departmentAllStatistics/DepartmentAllStatistics.vue | 2 +- .../IndividualPaymentStatisticsDetail.vue | 2 +- .../IndividualPaymentStatisticsList.vue | 2 +- .../ProjectPaymentStatisticsList.vue | 2 +- .../EnterprisePaymentStatisticsDetail.vue | 2 +- .../EnterprisePaymentStatisticsList.vue | 2 +- .../WorkingGroupPaymentStatisticsDetail.vue | 2 +- .../WorkingGroupPaymentStatisticsList.vue | 2 +- 17 files changed, 36 insertions(+), 29 deletions(-) diff --git a/src/views/dashboard/AllMoneyTenEcharts.vue b/src/views/dashboard/AllMoneyTenEcharts.vue index 374a1f7..abf42e1 100644 --- a/src/views/dashboard/AllMoneyTenEcharts.vue +++ b/src/views/dashboard/AllMoneyTenEcharts.vue @@ -1,7 +1,7 @@ diff --git a/src/views/dashboard/DepartmentTotalEcharts.vue b/src/views/dashboard/DepartmentTotalEcharts.vue index 3e11f13..4973696 100644 --- a/src/views/dashboard/DepartmentTotalEcharts.vue +++ b/src/views/dashboard/DepartmentTotalEcharts.vue @@ -111,7 +111,7 @@ export default { this.initEcharts(res.result) // 将接口数据 转化成表格数据形式 let tableData = [ - {indexName: '合同金额'}, + {indexName: '年度待确收金额'}, {indexName: '确认收入金额'}, {indexName: '完成比例'} ] @@ -274,7 +274,7 @@ export default { }, series: [ { - name: '合同金额', + name: '年度待确收金额', data: this.echartsData.allMoney, type: 'bar', barMaxWidth: 30, @@ -302,7 +302,7 @@ export default { /** * 计算百分比 * @param num1 确收金额 - * @param num2 合同金额 + * @param num2 年度待确收金额 * */ calcPercent(num1,num2){ let pointNo = Number(num1) / Number(num2) * 100 diff --git a/src/views/dashboard/IncomeSortEcharts.vue b/src/views/dashboard/IncomeSortEcharts.vue index 1893f03..4758114 100644 --- a/src/views/dashboard/IncomeSortEcharts.vue +++ b/src/views/dashboard/IncomeSortEcharts.vue @@ -165,7 +165,7 @@ export default { this.initEcharts(res.result) // 将接口数据 转化成表格数据形式 let tableData = [ - {indexName: typeEnum[this.activeIndex] !== 2 ? '合同金额' : '确收金额'}, + {indexName: typeEnum[this.activeIndex] !== 2 ? '年度待确收金额' : '确收金额'}, {indexName: '百分比'} ] dataSource.map((item, index) => { @@ -403,4 +403,11 @@ export default { font-weight: bold; background: rgb(245, 245, 246); } + +/*列表自适应超出隐藏*/ +.table-text { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} \ No newline at end of file diff --git a/src/views/dashboard/SingleMonthEcharts.vue b/src/views/dashboard/SingleMonthEcharts.vue index b9f2261..0cb7bc2 100644 --- a/src/views/dashboard/SingleMonthEcharts.vue +++ b/src/views/dashboard/SingleMonthEcharts.vue @@ -137,7 +137,7 @@ export default { let dataSource = res.result // 树形结构的数据 ，修改成table可以直接展示的数据，默认只有四行数据 let tableData = [ - // {indexName: '合同金额'}, + // {indexName: '年度待确收金额'}, {indexName: '确认收入金额'}, {indexName: '开票金额'}, {indexName: '到账金额'}, @@ -147,7 +147,7 @@ export default { let keyItem = MonthData.find(ele => Number(ele.value) === (index + 1)) if (keyItem) { let key = keyItem.key - // tableData[0][key] = item.allMoney // 合同金额 + // tableData[0][key] = item.allMoney // 年度待确收金额 tableData[0][key] = item.confirmAmount // 确认收入金额 tableData[1][key] = item.billMoney // 开票金额 tableData[2][key] = item.comeAllMoney // 到账金额 @@ -264,7 +264,7 @@ export default { }, series: [ // { - // name: '合同金额', + // name: '年度待确收金额', // type: 'line', // showSymbol: false, // symbol: 'circle', diff --git a/src/views/dashboard/SingleMonthTotalEcharts.vue b/src/views/dashboard/SingleMonthTotalEcharts.vue index 8339680..b420257 100644 --- a/src/views/dashboard/SingleMonthTotalEcharts.vue +++ b/src/views/dashboard/SingleMonthTotalEcharts.vue @@ -129,7 +129,7 @@ export default { let dataSource = res.result // 树形结构的数据 ，修改成table可以直接展示的数据，默认只有四行数据 let tableData = [ - // {indexName: '合同金额'}, + // {indexName: '年度待确收金额'}, {indexName: '确认收入金额'}, {indexName: '开票金额'}, {indexName: '到账金额'}, @@ -139,7 +139,7 @@ export default { let keyItem = MonthDataTotal.find(ele => Number(ele.value) === (index + 1)) if (keyItem) { let key = keyItem.key - // tableData[0][key] = item.allMoney // 合同金额 + // tableData[0][key] = item.allMoney // 年度待确收金额 tableData[0][key] = item.confirmAmount // 确认收入金额 tableData[1][key] = item.billMoney // 开票金额 tableData[2][key] = item.comeAllMoney // 到账金额 @@ -250,7 +250,7 @@ export default { }, series: [ // { - // name: '合同金额', + // name: '年度待确收金额', // type: 'line', // showSymbol: false, // symbol: 'circle', diff --git a/src/views/dashboard/ThreeYearEcharts.vue b/src/views/dashboard/ThreeYearEcharts.vue index b723d07..53878d4 100644 --- a/src/views/dashboard/ThreeYearEcharts.vue +++ b/src/views/dashboard/ThreeYearEcharts.vue @@ -1,7 +1,7 @@