From 51b9e548b0e533e8a415ce141808f2bb747b381e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 18 三月 2024 16:08:49 +0800
Subject: [PATCH] 1、mdc菜单下除特殊要求外，页面表格最少条数由10条调整为30条，每页最多条数区间由[10,20,30]调整为[30,50,100] 2、OEE基础管理和数据报表模块增加打印按钮，实现打印表格数据功能 3、设备管理、数据报表模块增加按照设备级别和设备类型查询表格数据 4、设备车间管理页面增加车间编码字段 5、修改组件名称以试图解决刷新后进入请求json页面问题
---
src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue b/src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue
index bec9df9..70872cb 100644
--- a/src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue
+++ b/src/views/mdc/base/modules/comparativeAnalysis/conparativeAnalysisPie.vue
@@ -9,17 +9,25 @@
import * as echarts from 'echarts'
export default {
name: 'conparativeAnalysisPie',
- propa:{},
+ props:{ dataList:''},
data(){
return{
closeRate:0,
openRate:0,
usedRate:0,
waitRate:0,
+ RateList:[]
}
},
created(){
+ },
+ watch:{
+ dataList(val){
+ this.RateList = val
+ console.log(val)
+ this.drawTu()
+ },
},
mounted() {
this.drawTu()
@@ -105,6 +113,30 @@
{value: 0, name: '鍏虫満鐜�'}]
}]
};
+ if(this.RateList != null){
+ this.closeRate =[]
+ this.openRate =[]
+ this.usedRate = []
+ this.waitRate = []
+ if(this.RateList.length>0){
+ this.closeRate=this.RateList[0].closeRate
+ this.openRate=this.RateList[0].openRate
+ this.usedRate=this.RateList[0].processRate
+ this.waitRate=this.RateList[0].waitRate
+ pieCompChartOption1.series[0].data = [{value:(this.openRate * 100).toFixed(2), name:'寮�鏈虹巼'},{value:(this.closeRate * 100).toFixed(2), name:'鍏虫満鐜�'}];
+ pieCompChartOption2.series[0].data = [{value:(this.usedRate * 100).toFixed(2), name:'鍔犲伐鐜�'},{value:(this.waitRate * 100).toFixed(2), name:'寰呮満鐜�'},{value:(this.closeRate * 100).toFixed(2), name:'鍏虫満鐜�'}];
+ pieCompChart1.setOption(pieCompChartOption1);
+ pieCompChart2.setOption(pieCompChartOption2);
+ }else{
+ pieCompChart1.setOption(pieCompChartOption1);
+ pieCompChart2.setOption(pieCompChartOption2);
+ }
+
+ }else{
+ pieCompChart1.setOption(pieCompChartOption1);
+ pieCompChart2.setOption(pieCompChartOption2);
+ }
+
pieCompChart1.setOption(pieCompChartOption1);
pieCompChart2.setOption(pieCompChartOption2);
window.addEventListener('resize', function() {
--
Gitblit v1.9.3