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

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

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