From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 三月 2024 10:09:04 +0800
Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分，与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw
---
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