From 5b97582cf56a34408a6c8c690cf1cee07efc887c Mon Sep 17 00:00:00 2001
From: fengachen <fengachen@syxysoft.com>
Date: Fri, 2 Sep 2022 17:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BC=80=E5=8F=91=E3=80=91=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/AllMoneyTenEcharts.vue     | 2 ++
 src/views/dashboard/Analysis.vue               | 4 ++--
 src/views/dashboard/DepartmentTotalEcharts.vue | 2 ++
 src/views/dashboard/IncomeSortEcharts.vue      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

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})
       },[])