提交 3cb4508a 编写于 作者: zhentian.jia's avatar zhentian.jia

fix bug

上级 979eeec0
...@@ -133,6 +133,11 @@ ...@@ -133,6 +133,11 @@
title: '项目列表', title: '项目列表',
icon: 'el-icon-document', icon: 'el-icon-document',
index: 'report-list' index: 'report-list'
},
{
title: '导出下载',
icon: 'el-icon-document',
index: 'export-download'
} }
] ]
}, },
......
...@@ -102,6 +102,9 @@ export default { ...@@ -102,6 +102,9 @@ export default {
let req = { let req = {
projectId: vm.projectId projectId: vm.projectId
}; };
if(req.projectId == null) {
req.projectId = '';
}
vm.reportGET("report/downLoad/getDownloadList", req).then(res => { vm.reportGET("report/downLoad/getDownloadList", req).then(res => {
if (res.code == "000000") { if (res.code == "000000") {
vm.tableData = res.data.data; vm.tableData = res.data.data;
......
...@@ -207,6 +207,7 @@ export default { ...@@ -207,6 +207,7 @@ export default {
.course-analysis-wrap { .course-analysis-wrap {
background: #fff; background: #fff;
overflow: hidden; overflow: hidden;
padding: 10px;
.weight { .weight {
font-weight: bold; font-weight: bold;
} }
......
...@@ -163,9 +163,12 @@ export default { ...@@ -163,9 +163,12 @@ export default {
let educationList = this.crowdData.educationList; let educationList = this.crowdData.educationList;
let legendData = []; let legendData = [];
let seriesData = []; let seriesData = [];
let colorData = ["#FF9F7F", "#FFDB5C", "#E062AE", "#37A2DA", "#67E0E3"]; let colorData = ["#FF9F7F", "#FFDB5C", "#E062AE", "#37A2DA", "#67E0E3", "#8A2BE2", "#8A2BE2"];
for (let i = 0; i < educationList.length; i++) { // for (let i = 0; i < educationList.length; i++) {
legendData[i] = educationList[i].name; // legendData[i] = educationList[i].name;
// }
if(educationList.length > 0) {
legendData = ['博士后','博士','硕士','本科','大专','中专及以下','其他'];
} }
seriesData = educationList; seriesData = educationList;
let option = operationData.getPicOption( let option = operationData.getPicOption(
...@@ -225,6 +228,7 @@ export default { ...@@ -225,6 +228,7 @@ export default {
.crowd-analysis-wrap { .crowd-analysis-wrap {
background: #fff; background: #fff;
overflow: hidden; overflow: hidden;
padding: 10px;
.header-title { .header-title {
padding: 10px 12px; padding: 10px 12px;
font-size: 12px; font-size: 12px;
......
...@@ -203,6 +203,10 @@ export default { ...@@ -203,6 +203,10 @@ export default {
.examination-analysis { .examination-analysis {
background: #fff; background: #fff;
overflow: hidden; overflow: hidden;
padding: 10px;
.weight {
font-weight: bold;
}
.el-card { .el-card {
border-width: 0px; border-width: 0px;
} }
......
...@@ -231,6 +231,7 @@ export default { ...@@ -231,6 +231,7 @@ export default {
.part-in-wrap { .part-in-wrap {
background: #fff; background: #fff;
overflow: hidden; overflow: hidden;
// padding: 10px;
.el-card { .el-card {
border-width: 0px; border-width: 0px;
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册