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

优化了UI、UE问题、导出pdf

上级 ff6ca643
......@@ -8,14 +8,14 @@ export function dustributeOption(legendData, seriesData) {
trigger: "item",
// formatter: "{b} : {d}%",
formatter:function(data){
let value = data.name + ':' + data.percent.toFixed(1)+"%"
let value = data.name + ':' + parseFloat(data.percent.toFixed(1))+"%"
return value;
}
},
label: {
// formatter: "{d}%",
// color: '#000000',
formatter:function(data){ return data.percent.toFixed(1)+"%";}
formatter:function(data){ return parseFloat(data.percent.toFixed(1))+"%";}
},
color: ['#FF9A4B', '#39AF9A', '#FFB01B', '#3BA0FF', '#5D7092'],
legend: {
......@@ -79,10 +79,10 @@ export function recordOption(legendData, xAxisData, seriesData) {
"<br/>" + divList[k] +
params[j].seriesName +
"占比: " +
(
parseFloat((
(100 * parseFloat(params[j].value)) /
parseFloat(value)
).toFixed(1) +
).toFixed(1)) +
"%";
} else {
relVal +=
......@@ -779,12 +779,12 @@ export function getPicOption(title, legendData, colorData, seriesData) {
trigger: 'item',
// formatter: "{a} <br/>{b} : {c} ({d}%)"
formatter:function(data){
let value = data.name + ':' + data.percent.toFixed(1)+"%"
let value = data.name + ':' + parseFloat(data.percent.toFixed(1))+"%"
return value;
}
},
label: {
formatter:function(data){ return data.percent.toFixed(1)+"%";}
formatter:function(data){ return parseFloat(data.percent.toFixed(1))+"%";}
},
legend: {
orient: "vertical",
......
......@@ -69,6 +69,7 @@
:total="totalRows"
></el-pagination>
</div>
<div class="spacing"></div>
</div>
</template>
<script>
......
......@@ -51,6 +51,7 @@
</div>
</div>
</div>
<div class="spacing"></div>
</div>
</template>
<script>
......@@ -399,6 +400,12 @@ export default {
color: #FF3399;
text-align: center;
}
.spacing {
position: relative;
width: 100%;
height: 20px;
background: #f0f2f5;
}
.chart {
position: relative;
margin: 20px auto 0 auto;
......
......@@ -121,6 +121,7 @@
<img src="../../assets/image/noData.png" />
</div>
<div class="chart-remarks">注:在线培训完成时长=完成项目时间-开始参与项目时间</div>
<div class="spacing"></div>
</div>
<!-- </div> -->
<div v-if="dataType == 1" class="data-table">
......@@ -309,6 +310,7 @@
></el-pagination>
</div>
</div>
<div class="spacing"></div>
</div>
</div>
</template>
......@@ -459,7 +461,11 @@ export default {
vm.setRecordChart(vm.timeInfoChild.genSituationModel.eduData);
}
// if(vm.certFlag !== 0) {
vm.setCertificateChart(vm.timeInfoChild.genSituationModel.studyRankMap[0]);
let certificateChart = vm.timeInfoChild.genSituationModel.studyRankMap[0];
if(certificateChart === undefined) {
certificateChart = [];
}
vm.setCertificateChart(certificateChart);
vm.setDurationChart(vm.timeInfoChild.genSituationModel.costRank);
// }
},20)
......@@ -941,7 +947,7 @@ export default {
let seriesData = [];
for(let i = 0 ; i<data.length ; i++) {
xAxisData.push(data[i].subName);
seriesData.push((data[i].costTime).toFixed(1));
seriesData.push(parseFloat((data[i].costTime).toFixed(1)));
}
setTimeout(function(){
let myChart = echarts.init(vm.$refs.durationChart);
......
......@@ -99,6 +99,7 @@
:total="totalRows"
></el-pagination>
</div>
<div class="spacing"></div>
</div>
</template>
......
......@@ -145,8 +145,8 @@ export default {
let seriesAfter = [];
for(let i = 0; i < data.length ; i++) {
xAxisData.push(data[i].classifyName);
seriesBefore.push((data[i].beforeRate*100).toFixed(1));
seriesAfter.push((data[i].afterRate*100).toFixed(1));
seriesBefore.push(parseFloat((data[i].beforeRate*100).toFixed(1)));
seriesAfter.push(parseFloat((data[i].afterRate*100).toFixed(1)));
}
setTimeout(function(){
let myChart = echarts.init(vm.$refs.education);
......@@ -167,8 +167,8 @@ export default {
let seriesAfter = [];
for(let i = 0; i < data.length ; i++) {
xAxisData.push(data[i].classifyName);
seriesBefore.push((data[i].beforeRate*100).toFixed(1));
seriesAfter.push((data[i].afterRate*100).toFixed(1));
seriesBefore.push(parseFloat((data[i].beforeRate*100).toFixed(1)));
seriesAfter.push(parseFloat((data[i].afterRate*100).toFixed(1)));
}
setTimeout(function(){
let myChart = echarts.init(vm.$refs.learning);
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册