diff --git a/public/common.css b/public/common.css
index 768c73d..1418741 100644
--- a/public/common.css
+++ b/public/common.css
@@ -206,4 +206,9 @@ a:hover {
.button-import {
background: #73c4a2 !important;
border: solid 1px #73c4a2 !important;
+}
+.el-button--primary:hover, .el-button--primary:focus {
+ background: #116bcc !important;
+ border-color: #116bcc !important;
+ color: #FFFFFF;
}
\ No newline at end of file
diff --git a/src/views/dashboard/AdviseNameChart.vue b/src/views/dashboard/AdviseNameChart.vue
index ede5bb7..2c46503 100644
--- a/src/views/dashboard/AdviseNameChart.vue
+++ b/src/views/dashboard/AdviseNameChart.vue
@@ -77,10 +77,10 @@ export default {
left: "3%",
top: "5%",
textStyle: {
- fontSize: 24,
- fontFamily: "Arial",
+ fontSize: 22,
+ fontFamily: "Microsoft YaHei",
lineHeight: 30,
- color: "rgb(43,97,159)",
+ color: "#116bcc",
fontWeight:"bold"
},
},
@@ -105,7 +105,7 @@ export default {
// top:30,
// },
grid: {
- top: 80,
+ top: 107,
left: '2%',
right: '2%',
bottom: '8%',
@@ -116,25 +116,40 @@ export default {
boundaryGap: [0, 0.01],
axisLabel: {
formatter:'{value}个',
- fontSize:18
+ textStyle: {
+ fontSize:'14',
+ itemSize:'',
+ color: "#a4a4a4"
+ }
},
- axisLine: {
+ axisLine: {//x轴线的颜色以及宽度
+ show: true,
lineStyle: {
- color: "rgb(164, 164, 164)"
+ color: "#eff2f8",
+ width: 0,
+ type: "solid"
}
},
+ axisTick: { show: false },
},
yAxis: {
type: 'category',
- data: this.xAxisDataLeft8, //['后续操作(3%)','完成注册(98%)','点击注册']
+ data: this.xAxisDataLeft8, //['后续操作(3%)','完成注册(98%)','点击注册']
axisLabel: {
- fontSize:18
+ fontSize:14,
+ textStyle: {
+ color: "#a4a4a4",
+ },
},
- axisLine: {
- lineStyle: {
- color: "rgb(164, 164, 164)"
- }
+ axisLine: {//y轴线的颜色以及宽度
+ show: true,
+ lineStyle: {
+ color: "#eff2f8",
+ width: 0,
+ type: "solid"
+ },
},
+ axisTick: { show: false },
},
series: [
{
@@ -153,7 +168,7 @@ export default {
itemStyle:{
normal: {
//这里是重点
- color: 'rgb(84,111,198)'
+ color: '#5470c6'
}
}
diff --git a/src/views/dashboard/BLYiTuoChart.vue b/src/views/dashboard/BLYiTuoChart.vue
index 4d8b52d..896a7c3 100644
--- a/src/views/dashboard/BLYiTuoChart.vue
+++ b/src/views/dashboard/BLYiTuoChart.vue
@@ -69,7 +69,6 @@ export default {
yAxisIndex: 2,
data: [300,200,100,76,99,65]
},
-
]
}
},
@@ -101,7 +100,8 @@ export default {
let arr2=[];
//this.seriesData1=this.dates
if (this.seriesData1.length>0&&this.seriesData1!=null){
- arr=this.seriesData1[0].data;
+ //输出顺序:经费数 实际经费 项目数
+ arr=this.seriesData1[0].data;
arr1=this.seriesData1[1].data
arr2=this.seriesData1[2].data;
if (arr.length>0&&arr2.length>0&&arr1.length>0){
@@ -122,8 +122,6 @@ export default {
maxa=(x+2)*yinterval;
maxb=(y+2)*numYinterval;
}
-
-
}
//let yinterval=maxa/10;
@@ -144,10 +142,10 @@ export default {
left: "1%",
top: "1%",
textStyle: {
- fontSize: 24,
- fontFamily: "Arial",
+ fontSize: 22,
+ fontFamily: "Microsoft YaHei",
lineHeight: 30,
- color: "rgb(43,97,159)",
+ color: "#116bcc",
fontWeight:"bold"
},
},
@@ -166,7 +164,7 @@ export default {
left: 10,
right: 10,
bottom: 30,
- top: 90,
+ top: 107,
containLabel: true
},
// toolbox: {
@@ -193,13 +191,24 @@ export default {
},
axisLabel : {//坐标轴刻度标签的相关设置。
interval:0,
- rotate:"21"
+ rotate:"21",
+ formatter: function (params) {
+ var maxLength = 8;
+ //判断长度,超出使用...代替
+ if (params && params.length > maxLength) {
+ return params.substring(0, maxLength - 1) + '...';
+ } else {
+ return params;
+ }
+ }
},
axisLine: {
+ show: false,
lineStyle: {
color: "rgb(164, 164, 164)"
}
},
+ axisTick: { show: false },
}
],
yAxis: [
@@ -211,9 +220,9 @@ export default {
interval: yinterval,
axisLabel: {
formatter: '{value} 万元',
- lineStyle: {
- color: "rgb(164, 164, 164)"
- }
+ textStyle: {
+ color: "#a4a4a4",
+ },
},
nameTextStyle: {
color: 'rgb(102,102,102)'
@@ -224,8 +233,7 @@ export default {
color: "rgb(164, 164, 164)"
}
},
-
-
+ axisTick: { show: false },
},
{
type: 'value',
@@ -241,13 +249,12 @@ export default {
}
},
axisLine: {
+ show : false,
lineStyle: {
color: "rgb(164, 164, 164)"
}
},
- axisTick: {
- show: true
- }
+ axisTick: { show: false },
},
{
type: 'value',
@@ -259,6 +266,7 @@ export default {
formatter: '{value} ',
},
axisLine: {
+ show : false,
lineStyle: {
color: "rgb(164, 164, 164)"
}
@@ -269,7 +277,7 @@ export default {
axisTick: {
show: false
}
- }
+ },
],
series:
diff --git a/src/views/dashboard/BarChart3.vue b/src/views/dashboard/BarChart3.vue
index 4e93028..d79eba1 100644
--- a/src/views/dashboard/BarChart3.vue
+++ b/src/views/dashboard/BarChart3.vue
@@ -77,10 +77,10 @@ export default {
left: "3%",
top: "5%",
textStyle: {
- fontSize: 24,
- fontFamily: "Arial",
+ fontSize: 22,
+ fontFamily: "Microsoft YaHei",
lineHeight: 30,
- color: "rgb(43,97,159)",
+ color: "#116bcc",
fontWeight:"bold"
},
},
@@ -101,7 +101,7 @@ export default {
// top:30,
// },
grid: {
- top: 90,
+ top: 107,
left: '2%',
right: '2%',
bottom: '8%',
@@ -113,28 +113,39 @@ export default {
axisLabel: {
formatter:'{value}个',
textStyle: {
- fontSize:'18',
- itemSize:''
-
- }
- },
- axisLine: {
- lineStyle: {
- color: "rgb(164, 164, 164)"
+ fontSize:'14',
+ itemSize:'',
+ color: "#a4a4a4",
}
},
+ axisLine: {//x轴线的颜色以及宽度
+ show: true,
+ lineStyle: {
+ color: "#eff2f8",
+ width: 0,
+ type: "solid"
+ }
+ },
+ axisTick: { show: false },
},
yAxis: {
type: 'category',
data: this.xAxisDataLeft8, //['后续操作(3%)','完成注册(98%)','点击注册']
axisLabel: {
- fontSize:18
+ fontSize:14,
+ textStyle: {
+ color: "#a4a4a4",
+ },
},
- axisLine: {
- lineStyle: {
- color: "rgb(164, 164, 164)"
- }
+ axisLine: {//y轴线的颜色以及宽度
+ show: true,
+ lineStyle: {
+ color: "#eff2f8",
+ width: 0,
+ type: "solid"
+ },
},
+ axisTick: { show: false },
},
series: [
{
@@ -146,9 +157,8 @@ export default {
itemStyle:{
normal: {
//这里是重点
- color: 'rgb(84,111,198)'
+ color: '#5470c6'
}
-
}
}
]
diff --git a/src/views/dashboard/BarLineChart.vue b/src/views/dashboard/BarLineChart.vue
index b7f0d7f..6acc67c 100644
--- a/src/views/dashboard/BarLineChart.vue
+++ b/src/views/dashboard/BarLineChart.vue
@@ -87,7 +87,6 @@ export default {
let intervalb=10000;
//this.blSerData=this.dates
-
let as =this.blSerData
if (this.blSerData!=undefined&&this.blSerData!=null&&this.blSerData.length>0){
let arr=this.blSerData[0].data
@@ -122,10 +121,10 @@ export default {
x:'center',
y:'bottom',
textStyle: {
- fontSize: 24,
- fontFamily: "Arial",
+ fontSize: 22,
+ fontFamily: "Microsoft YaHei",
lineHeight: 30,
- color: "rgb(43,97,159)",
+ color: "#116bcc",
fontWeight:"bold"
},
},
@@ -140,7 +139,7 @@ export default {
left: 10,
right: 10,
bottom: 50,
- top: 90,
+ top: 107,
containLabel: true
},
// toolbox: {
@@ -163,24 +162,24 @@ export default {
xAxis: [
{
type: 'category',
- // data: ['2016', '2017', '2018', '2019', '2020', '2021'],
- data: this.blXData,
- axisPointer: {
- type: 'shadow'
- },
- axisLabel: {
- inside: false,
+ data: this.blXData,
+
+ axisLabel: {//x轴文字的配置
+ show: true,
textStyle: {
- fontSize:'16',
- itemSize:''
-
- }
+ color: "#a4a4a4",
+ },
+ fontSize:'14px'
},
- axisLine: {
- lineStyle: {
- color: "rgb(164, 164, 164)"
- }
+ axisLine: {//x轴线的颜色以及宽度
+ show: true,
+ lineStyle: {
+ color: "#eff2f8",
+ width: 0,
+ type: "solid"
+ }
},
+ axisTick: { show: false },
}
],
yAxis: [
@@ -190,18 +189,29 @@ export default {
min: 0,
max: maxa,
interval: intervala,
- axisLabel: {
- formatter: '{value} ',
- fontSize:18,
- },
nameTextStyle: {
color: 'rgb(102,102,102)'
},
- axisLine: {
- lineStyle: {
- color: "rgb(164, 164, 164)"
- }
+ // axisPointer: {
+ // type: 'shadow'
+ // },
+ axisLabel: {
+ formatter: '{value} ',
+ fontSize:14,
+ textStyle: {
+ color: "#a4a4a4",
+ },
+ },
+
+ axisLine: {//y轴线的颜色以及宽度
+ show: true,
+ lineStyle: {
+ color: "#eff2f8",
+ width: 0,
+ type: "solid"
+ },
},
+ axisTick: { show: false },
},
{
type: 'value',
@@ -211,15 +221,20 @@ export default {
interval: intervalb,
axisLabel: {
formatter: '{value}万元 ',
- fontSize:18,
-
+ fontSize:14,
+ textStyle: {
+ color: "#a4a4a4",
+ },
},
nameTextStyle: {
color: 'rgb(102,102,102)'
},
- axisLine: {
+ axisLine: {//y轴线的颜色以及宽度
+ show: true,
lineStyle: {
- color: "rgb(164, 164, 164)"
+ color: "#eff2f8",
+ width: 0,
+ type: "solid"
}
},
}
diff --git a/src/views/dashboard/CircleChart2.vue b/src/views/dashboard/CircleChart2.vue
index 4e9e404..faf6f7c 100644
--- a/src/views/dashboard/CircleChart2.vue
+++ b/src/views/dashboard/CircleChart2.vue
@@ -110,10 +110,10 @@
left: "3%",
top: "5%",
textStyle: {
- fontSize: 24,
- fontFamily: "Arial",
+ fontSize: 22,
+ fontFamily: "Microsoft YaHei",
lineHeight: 30,
- color: "rgb(43,97,159)",
+ color: "#116bcc",
fontWeight:"bold"
},
subtextStyle: {
diff --git a/src/views/dashboard/PieChart.vue b/src/views/dashboard/PieChart.vue
index d2468cb..4f0ab96 100644
--- a/src/views/dashboard/PieChart.vue
+++ b/src/views/dashboard/PieChart.vue
@@ -103,10 +103,10 @@ export default {
left: "1%",
top: "1%",
textStyle: {
- fontSize: 24,
- fontFamily: "Arial",
+ fontSize: 22,
+ fontFamily: "Microsoft YaHei",
lineHeight: 30,
- color: "rgb(43,97,159)",
+ color: "#116bcc",
fontWeight:"bold"
},
},
@@ -120,7 +120,6 @@ export default {
}
},
-
// legend: {
// left: 'center',
// bottom: '10',
@@ -132,17 +131,26 @@ export default {
name: '项目分布',
type: 'pie',
- roseType: 'radius',
+ // roseType: 'radius',
radius: '55%',
center: ['55%', '48%'],
data:this.pieData,
// top: "50%"
- // // data:this.data,
+ labelLine: { //饼形图引导线颜色
+ lineStyle: {
+ color: '#ccc'
+ }
+ },
label: {
-
- normal: {
- textStyle: {
- fontSize: 18
+ fontSize: 16,
+ formatter: function (param) {
+ console.log(param)
+ let text = param.data.name;
+ if (text.length < 6) {
+ // return '{name|{b}}\n{value|{d}%( {c})}'
+ return text
+ } else {
+ return text.substring(0, 8) + '...'
}
},
}
@@ -268,7 +276,7 @@ export default {
// itemStyle = {
// normal: {
// //这里是重点
- // color: 'rgb(222,177,62)'
+ // color: '#ffa200'
//
// }
//
@@ -278,7 +286,7 @@ export default {
// itemStyle = {
// normal: {
// //这里是重点
- // color: 'rgb(222,177,62)'
+ // color: '#ffa200'
//
// }
//
@@ -373,7 +381,7 @@ export default {
itemStyle = {
normal: {
//这里是重点
- color: 'rgb(222,177,62)'
+ color: '#ffa200'
}
};
@@ -391,7 +399,7 @@ export default {
itemStyle = {
normal: {
//这里是重点
- color: 'rgb(222,177,62)'
+ color: '#ffa200'
}
};
diff --git a/src/views/dashboard/SecretPieChart.vue b/src/views/dashboard/SecretPieChart.vue
index 6ccd057..17e1249 100644
--- a/src/views/dashboard/SecretPieChart.vue
+++ b/src/views/dashboard/SecretPieChart.vue
@@ -75,10 +75,10 @@ export default {
x:'center',
y: 'bottom',
textStyle: {
- fontSize: 24,
- fontFamily: "Arial",
+ fontSize: 22,
+ fontFamily: "Microsoft YaHei",
lineHeight: 30,
- color: "rgb(43,97,159)",
+ color: "#116bcc",
fontWeight:"bold"
},
},
@@ -109,24 +109,15 @@ export default {
radius: '55%',
center: ['50%', '50%'],
data: this.secretData,
- // [
- // {
- // name:"非密",
- // value:20
- // },
- // {
- // name:"内部",
- // value:30
- // },
- // {
- // name:"秘密",
- // value:50
- // },
- // {
- // name:"机密",
- // value:80
- // }],
-
+ labelLine: {
+ lineStyle: {
+ color: '#ccc'
+ }
+ },
+ label: {
+ fontSize: 16,
+ color: '#333'
+ },
emphasis: {
itemStyle: {
shadowBlur: 10,
diff --git a/src/views/dashboard/TypePieChart.vue b/src/views/dashboard/TypePieChart.vue
index 621c6f1..888b0e8 100644
--- a/src/views/dashboard/TypePieChart.vue
+++ b/src/views/dashboard/TypePieChart.vue
@@ -78,10 +78,10 @@ export default {
left: "6%",
top: "4%",
textStyle: {
- fontSize: 24,
- fontFamily: "Arial",
+ fontSize: 22,
+ fontFamily: "Microsoft YaHei",
lineHeight: 30,
- color: "rgb(43,97,159)",
+ color: "#116bcc",
fontWeight:"bold"
},
},
@@ -91,7 +91,7 @@ export default {
formatter: '{a}
{b} : {c} ({d}%)'
},
textStyle:{
- fontSize:18,
+
lineOverflow : 'none'
},
@@ -102,6 +102,7 @@ export default {
orient: "vertical",
right: 50,
bottom: 20,
+
// data: ['院士建议', '咨询研究报告', '中央交办', '部委委托', '地方委托','主动报送', '申请', '委托', '交办', '合作']
},
series: [
@@ -113,6 +114,15 @@ export default {
// radius: [15, 95],
center: ['50%', '50%'],
data:this.typeData,
+ labelLine: { //饼形图引导线颜色
+ lineStyle: {
+ color: '#ccc'
+ }
+ },
+ label: {
+ fontSize: 16,
+ color: '#333'
+ },
// data: [
// { value: 320, name: '院士建议' },
// { value: 240, name: '咨询研究报告' },
diff --git a/src/views/project/infoShow/queryList.vue b/src/views/project/infoShow/queryList.vue
index 51aa150..b2d2355 100644
--- a/src/views/project/infoShow/queryList.vue
+++ b/src/views/project/infoShow/queryList.vue
@@ -939,7 +939,7 @@
item.itemStyle={
normal: {
//这里是重点
- color: 'rgb(21,112,198)'
+ color: '#5470c6'
}
};
@@ -952,7 +952,7 @@
item1.itemStyle={
normal: {
//这里是重点
- color: 'rgb(222,177,62)'
+ color: '#ffa200'
}
};
@@ -1000,7 +1000,7 @@
item1.itemStyle={
normal: {
//这里是重点
- color: 'rgb(84,111,198)'
+ color: '#5470c6'
}
};
@@ -1013,7 +1013,7 @@
item2.itemStyle={
normal: {
//这里是重点
- color: 'rgb(222,177,62)'
+ color: '#ffa200'
}
};
diff --git a/src/views/project/instruction/indexShow.vue b/src/views/project/instruction/indexShow.vue
index b9d7474..3124321 100644
--- a/src/views/project/instruction/indexShow.vue
+++ b/src/views/project/instruction/indexShow.vue
@@ -622,7 +622,7 @@ export default {
item.itemStyle={
normal: {
//这里是重点
- color: 'rgb(21,112,198)'
+ color: '#5470c6'
}
};
@@ -635,7 +635,7 @@ export default {
item2.itemStyle={
normal: {
//这里是重点
- color: 'rgb(222,177,62)'
+ color: '#ffa200'
}
};
diff --git a/src/views/project/report/copyInport.vue b/src/views/project/report/copyInport.vue
index d56b8fb..96c62e6 100644
--- a/src/views/project/report/copyInport.vue
+++ b/src/views/project/report/copyInport.vue
@@ -11,14 +11,16 @@
{{ item.name }}
-
{{this.year2}},
- 共承担
+ 共承担
{{item.name}}
@@ -66,7 +67,7 @@
{{item.name}}项目
- {{this.year2}},
+ {{this.year2}},
{{item}}、
@@ -106,7 +109,7 @@
{{item}}。
-
+
{{item.name}}负责联系
@@ -121,12 +124,14 @@
{{this.year2}},作为项目负责人:
-
+
{{item.name}}
@@ -150,7 +155,7 @@
{{this.year2}},咨询项目研究热点领域包括:
-
+