diff --git a/src/views/dashboard/AllMoneyTenEcharts.vue b/src/views/dashboard/AllMoneyTenEcharts.vue index fe3de46..613a823 100644 --- a/src/views/dashboard/AllMoneyTenEcharts.vue +++ b/src/views/dashboard/AllMoneyTenEcharts.vue @@ -175,6 +175,7 @@ export default { name:'合同金额', data: this.echartsData.allMoney, type: 'bar', + barMaxWidth:30, itemStyle:{ borderRadius:[8,8,0,0] } @@ -183,6 +184,7 @@ export default { name:'确认收入金额', data: this.echartsData.confirmAmount, type: 'bar', + barMaxWidth:30, itemStyle:{ borderRadius:[8,8,0,0] } diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index 56ca641..c654fef 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -59,14 +59,14 @@ export default { computed: { // 所领导 部门负责人 还是其他角色 roleCoe() { - return false + return !(this.$store.getters.userInfo.roleCode === 'bmfzr' || this.$store.getters.userInfo.roleCode === 'sld') } }, data() { return {} }, created() { - console.log(this.$store.getters.userInfo.roleCode === 'bmfzr' || this.$store.getters.userInfo.roleCode === 'sld') + console.log() }, mounted() { }, diff --git a/src/views/dashboard/DepartmentTotalEcharts.vue b/src/views/dashboard/DepartmentTotalEcharts.vue index 6657b81..09a39ad 100644 --- a/src/views/dashboard/DepartmentTotalEcharts.vue +++ b/src/views/dashboard/DepartmentTotalEcharts.vue @@ -174,6 +174,7 @@ export default { name:'合同金额', data: this.echartsData.allMoney, type: 'bar', + barMaxWidth:30, itemStyle:{ borderRadius:[8,8,0,0] } @@ -182,6 +183,7 @@ export default { name:'确认收入金额', data: this.echartsData.confirmAmount, type: 'bar', + barMaxWidth:30, itemStyle:{ borderRadius:[8,8,0,0] } diff --git a/src/views/dashboard/IncomeSortEcharts.vue b/src/views/dashboard/IncomeSortEcharts.vue index 53bdb00..eb6b7b6 100644 --- a/src/views/dashboard/IncomeSortEcharts.vue +++ b/src/views/dashboard/IncomeSortEcharts.vue @@ -53,7 +53,7 @@ export default { }) }, initEcharts(data) { - let color = ['#069F99', '#6D7FD0 ', '#A5B3FF', '#A5B3FF', '#BDA79E'] + let color = ['#069F99', '#6D7FD0 ', '#B78571', '#FA9D81', '#BDA79E'] let echartsData = data.reduce( (pre,val) => { return pre.concat({value:val.value,name:val.name_dictText}) },[])