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

展示问题 样式问题

上级 18a83d27
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
></el-pagination> ></el-pagination>
</div> </div>
</div> </div>
<div v-if="certFlag != 0">
<div v-if="downloadId == null"> <div v-if="downloadId == null">
<div class="spacing"></div> <div class="spacing"></div>
<div class="chart-title">证历分布情况</div> <div class="chart-title">证历分布情况</div>
...@@ -92,7 +93,8 @@ ...@@ -92,7 +93,8 @@
<div v-if="showRecordChart === false" class="empty-img"> <div v-if="showRecordChart === false" class="empty-img">
<img src="../../assets/image/noData.png" /> <img src="../../assets/image/noData.png" />
</div> </div>
<div v-if="certFlag != 0"> </div>
<!-- <div v-if="certFlag != 0"> -->
<div class="spacing"></div> <div class="spacing"></div>
<div class="chart-title-more"> <div class="chart-title-more">
<p>项目排名情况</p> <p>项目排名情况</p>
...@@ -118,7 +120,7 @@ ...@@ -118,7 +120,7 @@
</div> </div>
<div class="chart-remarks">注:在线培训完成时长=完成项目时间-开始参与项目时间</div> <div class="chart-remarks">注:在线培训完成时长=完成项目时间-开始参与项目时间</div>
</div> </div>
</div> <!-- </div> -->
<div v-if="dataType == 1" class="data-table"> <div v-if="dataType == 1" class="data-table">
<div class="box-list"> <div class="box-list">
<div v-for="(item , index) in cardData" :key="index" class="box-card box-card2" v-bind:class="{ 'box-last': index == 1 }"> <div v-for="(item , index) in cardData" :key="index" class="box-card box-card2" v-bind:class="{ 'box-last': index == 1 }">
...@@ -405,11 +407,13 @@ export default { ...@@ -405,11 +407,13 @@ export default {
if(vm.dataType == 0) { if(vm.dataType == 0) {
//多个机构 //多个机构
setTimeout(function(){ setTimeout(function(){
vm.setRecordChart(vm.timeInfoChild.genSituationModel.eduData);
if(vm.certFlag !== 0) { if(vm.certFlag !== 0) {
vm.setCertificateChart(vm.timeInfoChild.genSituationModel.studyRankMap[0]); vm.setRecordChart(vm.timeInfoChild.genSituationModel.eduData);
vm.setDurationChart(vm.timeInfoChild.genSituationModel.costRank);
} }
// if(vm.certFlag !== 0) {
vm.setCertificateChart(vm.timeInfoChild.genSituationModel.studyRankMap[0]);
vm.setDurationChart(vm.timeInfoChild.genSituationModel.costRank);
// }
},20) },20)
} else { } else {
//单个几个 //单个几个
...@@ -520,12 +524,14 @@ export default { ...@@ -520,12 +524,14 @@ export default {
closeLoading(vm); closeLoading(vm);
if (res.code == "000000") { if (res.code == "000000") {
vm.initCard(res.data.percentData); vm.initCard(res.data.percentData);
vm.setDistributeChart(res.data.certData);
vm.setRecordChart(res.data.eduData);
if(vm.certFlag !== 0) { if(vm.certFlag !== 0) {
vm.setCertificateChart(res.data.studyRank); vm.setDistributeChart(res.data.certData);
vm.setDurationChart(res.data.costRank); vm.setRecordChart(res.data.eduData);
} }
// if(vm.certFlag !== 0) {
vm.setCertificateChart(res.data.studyRank);
vm.setDurationChart(res.data.costRank);
// }
} }
}); });
}, },
...@@ -746,7 +752,7 @@ export default { ...@@ -746,7 +752,7 @@ export default {
value: 0, value: 0,
}, },
] ]
let keyName = ['未获证人数','获优秀人数','获良好人数','获及格人数','获不及格人数']; let keyName = ['未获证人数','获优秀人数','获良好人数','获及格人数','获不及格人数','获证人数'];
let legendData = []; let legendData = [];
let xAxisData = ["博士后","博士", "硕士", "本科", "大专", "中专及以下", "其他"]; let xAxisData = ["博士后","博士", "硕士", "本科", "大专", "中专及以下", "其他"];
for(let i = 0; i<data.length; i++) { for(let i = 0; i<data.length; i++) {
...@@ -968,7 +974,7 @@ export default { ...@@ -968,7 +974,7 @@ export default {
} }
.vertical { .vertical {
position: absolute; position: absolute;
left: 34%; left: 40%;
float: left; float: left;
margin-top: 23px; margin-top: 23px;
width:1px; width:1px;
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册