diff --git a/src/views/dashboard/BarChart3.vue b/src/views/dashboard/BarChart3.vue
index ee96cc4..db0425e 100644
--- a/src/views/dashboard/BarChart3.vue
+++ b/src/views/dashboard/BarChart3.vue
@@ -111,6 +111,7 @@ export default {
type: 'value',
boundaryGap: [0, 0.01],
axisLabel: {
+ interval: 0,
formatter:'{value}个',
textStyle: {
fontSize:'14',
@@ -132,6 +133,7 @@ export default {
type: 'category',
data: this.xAxisDataLeft8, //['后续操作(3%)','完成注册(98%)','点击注册']
axisLabel: {
+ interval: 0,
fontSize:14,
textStyle: {
color: "#a4a4a4",
diff --git a/src/views/dashboard/DeptPieChart.vue b/src/views/dashboard/DeptPieChart.vue
index b09c3c6..b87a6a2 100644
--- a/src/views/dashboard/DeptPieChart.vue
+++ b/src/views/dashboard/DeptPieChart.vue
@@ -88,18 +88,23 @@ export default {
y: 'bottom',
left: "1%",
top: "1%",
- textStyle: {
- fontSize: 24,
- fontFamily: "Arial",
+ textStyle: {
+ fontSize: 22,
+ fontFamily: "Microsoft YaHei",
lineHeight: 30,
- color: "rgb(43,97,159)",
+ color: "#116bcc",
fontWeight:"bold"
},
},
tooltip: {
+ top:90,
trigger: 'item',
- formatter: '{a}
{b} : {c} ({d}%)'
+ formatter: '{a}
{b} : {c} ({d}%)',
+ textStyle: {
+ fontSize:'18',
+
+ }
},
// legend: {
// left: 'center',
@@ -112,8 +117,8 @@ export default {
name: '项目分布',
type: 'pie',
roseType: 'radius',
- radius: [15, 95],
- center: ['50%', '55%'],
+ radius: ['30%', '50%'], //饼形图改成中空的
+ center: ['55%', '48%'],
data:this.deptData,
// data: [
// { value: 320, name: '院士建议' },
@@ -128,7 +133,24 @@ export default {
// { value: 78, name: '合作' }
// ],
animationEasing: 'cubicInOut',
- animationDuration: 2600
+ animationDuration: 2600,
+ labelLine: { //饼形图引导线颜色
+ lineStyle: {
+ color: '#ccc'
+ }
+ },
+ label: {
+ fontSize: 16,
+ formatter: function (param) {
+ let text = param.data.name;
+ if (text.length < 7) {
+ // return '{name|{b}}\n{value|{d}%( {c})}'
+ return text
+ } else {
+ return text.substring(0, 6) + '...'
+ }
+ },
+ },
}
]
});
diff --git a/src/views/project/instruction/indexShow.vue b/src/views/project/instruction/indexShow.vue
index 9876da7..be596e6 100644
--- a/src/views/project/instruction/indexShow.vue
+++ b/src/views/project/instruction/indexShow.vue
@@ -375,7 +375,8 @@