diff --git a/src/views/dashboard/AllMoneyTenEcharts.vue b/src/views/dashboard/AllMoneyTenEcharts.vue
index 3918ea3..f30d2da 100644
--- a/src/views/dashboard/AllMoneyTenEcharts.vue
+++ b/src/views/dashboard/AllMoneyTenEcharts.vue
@@ -137,6 +137,15 @@ export default {
* 处理表头
* */
initColumns(data) {
+ this.columns = [
+ {
+ title: '',
+ align: 'center',
+ width: 100,
+ dataIndex: 'indexName',
+ scopedSlots: {customRender: 'text'}
+ },
+ ]
data.map((item, index) => {
let dataIndex = 'key' + index
this.columns.push({
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 3e6b490..b892ac7 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -15,19 +15,24 @@
-
+
-
+
+
+
+
+
@@ -46,6 +51,7 @@ import SingleMonthTotalEcharts from '@views/dashboard/SingleMonthTotalEcharts'
import DepartmentTotalEcharts from '@views/dashboard/DepartmentTotalEcharts'
import IncomeSortEcharts from '@views/dashboard/IncomeSortEcharts'
import AllMoneyTenEcharts from '@views/dashboard/AllMoneyTenEcharts'
+import ThreeYearEcharts from '@views/dashboard/ThreeYearEcharts'
export default {
name: 'Analysis',
@@ -55,12 +61,13 @@ export default {
SingleMonthTotalEcharts,
DepartmentTotalEcharts,
IncomeSortEcharts,
- AllMoneyTenEcharts
+ AllMoneyTenEcharts,
+ ThreeYearEcharts
},
computed: {
// 所领导 部门负责人 还是其他角色
roleCoe() {
- return !(this.$store.getters.userInfo.roleCode.includes('bmfzr') || this.$store.getters.userInfo.roleCode.includes('sld') || this.$store.getters.userInfo.roleCode.includes('admin'))
+ return !(this.$store.getters.userInfo.roleCode.includes('bmfzr') || this.$store.getters.userInfo.roleCode.includes('sld') || this.$store.getters.userInfo.roleCode.includes('admin'))
}
},
data() {
@@ -82,15 +89,20 @@ export default {
\ No newline at end of file