From 1e1e70da5288f47d8770ba2e7f22f3362e5b577c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 08 十二月 2023 17:16:35 +0800
Subject: [PATCH] 1、全局修改密码弹窗中的新密码校验长度与数据字典password_length设置保持一致 2、报警分析页面优化过快点击多次表格行时图表内容出现数据残留以及加载图表应设置加载中动画，若不设置用户在查询时短时间内不清楚有无数据 3、车间看板以及设备监控页面设备详情弹窗右上角增加关闭按钮、设备详情弹窗透明度加深、设备详情弹窗图表表盘指针对比色加强、调整设备详情弹窗中描述列表子项标题对齐方式由左对齐改为右对齐，锁定运行数据描述列表子项数值宽度，超出部分隐藏出现省略号，悬浮出现气泡卡片 4、设备利用率、设备开动率、班次利用率页面表格前三列增加表头，依次为公司、车间、工段以及表格有关时间值调整为若小时或分钟为0则不显示 5、设备综合效率分析页面表格数据默认每页最多显示10条改为20条 6、设备加工工件报表页面完成布局及功能实现
---
src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysisGauge.vue | 126 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 124 insertions(+), 2 deletions(-)
diff --git a/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysisGauge.vue b/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysisGauge.vue
index e8334c1..1fa304c 100644
--- a/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysisGauge.vue
+++ b/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysisGauge.vue
@@ -29,20 +29,38 @@
import * as echarts from 'echarts'
export default {
name: 'comparativeAnalysisGauge',
- props:{},
+ props:{dataList:''},
data(){
return{
utilizationRateTopOne:0,
+ utilizationRateTopOneEquipment:0,
utilizationRateTopTwo:0,
+ utilizationRateTopTwoEquipment:0,
utilizationRateTopThree:0,
+ utilizationRateTopThreeEquipment:0,
utilizationRateTopFour:0,
+ utilizationRateTopFourEquipment:0,
utilizationRateTopFive:0,
+ utilizationRateTopFiveEquipment:0,
utilizationRateLastOne:0,
+ utilizationRateLastOneEquipment:0,
utilizationRateLastTwo:0,
+ utilizationRateLastTwoEquipment:0,
utilizationRateLastThree:0,
+ utilizationRateLastThreeEquipment:0,
utilizationRateLastFour:0,
- utilizationRateLastFive:0
+ utilizationRateLastFourEquipment:0,
+ utilizationRateLastFive:0,
+ utilizationRateLastFiveEquipment:0,
+ TopLastList:[]
}
+ },
+ watch:{
+ dataList(val){
+ console.log(val);
+ this.TopLastList = val
+ this.draw()
+ },
},
mounted(){
this.draw();
@@ -679,6 +697,110 @@
}
]
};
+ if(this.TopLastList != null){
+ this.utilizationRateTopOne=0
+ this.utilizationRateTopOneEquipment = 'TOP1'
+ this.utilizationRateTopTwo=0
+ this.utilizationRateTopTwoEquipment = 'TOP2'
+ this.utilizationRateTopThree=0
+ this.utilizationRateTopThreeEquipment = 'TOP3'
+ this.utilizationRateTopFour =0
+ this.utilizationRateTopFourEquipment = 'TOP4'
+ this.utilizationRateTopFive=0
+ this.utilizationRateTopFiveEquipment = 'TOP5'
+ this.utilizationRateLastOne=0
+ this.utilizationRateLastOneEquipment = 'LAST1'
+ this.utilizationRateLastTwo=0
+ this.utilizationRateLastTwoEquipment = 'LAST2'
+ this.utilizationRateLastThree=0
+ this.utilizationRateLastThreeEquipment = 'LAST3'
+ this.utilizationRateLastFour=0
+ this.utilizationRateLastFourEquipment = 'LAST4'
+ this.utilizationRateLastFive=0
+ this.utilizationRateLastFiveEquipment = 'LAST5'
+ if(this.TopLastList.tops){
+ for(var i = 0;i<this.TopLastList.tops.length;i++){
+ if(i == 0){
+ this.utilizationRateTopOneEquipment=this.TopLastList.tops[0].equipmentId
+ this.utilizationRateTopOne=this.TopLastList.tops[0].utilizationRate
+ }else if(i == 1){
+ this.utilizationRateTopTwoEquipment=this.TopLastList.tops[1].equipmentId
+ this.utilizationRateTopTwo=this.TopLastList.tops[1].utilizationRate
+ }else if(i == 2){
+ this.utilizationRateTopThreeEquipment=this.TopLastList.tops[2].equipmentId
+ this.utilizationRateTopThree=this.TopLastList.tops[2].utilizationRate
+ }else if(i == 3){
+ this.utilizationRateTopFourEquipment=this.TopLastList.tops[3].equipmentId
+ this.utilizationRateTopFour=this.TopLastList.tops[3].utilizationRate
+ }else if(i == 4){
+ this.utilizationRateTopFiveEquipment=this.TopLastList.tops[4].equipmentId
+ this.utilizationRateTopFive=this.TopLastList.tops[4].utilizationRate
+ }
+ }
+ }
+ if(this.TopLastList.lasts){
+ for(var j = 0;j<this.TopLastList.lasts.length;j++){
+ if(j == 0){
+ this.utilizationRateLastOneEquipment=this.TopLastList.lasts[0].equipmentId
+ this.utilizationRateLastOne=this.TopLastList.lasts[0].utilizationRate
+ }else if(j == 1){
+ this.utilizationRateLastTwoEquipment=this.TopLastList.lasts[1].equipmentId
+ this.utilizationRateLastTwo=this.TopLastList.lasts[1].utilizationRate
+ }else if(j == 2){
+ this.utilizationRateLastThreeEquipment=this.TopLastList.lasts[2].equipmentId
+ this.utilizationRateLastThree=this.TopLastList.lasts[2].utilizationRate
+ }else if(j == 3){
+ this.utilizationRateLastFourEquipment=this.TopLastList.lasts[3].equipmentId
+ this.utilizationRateLastFour=this.TopLastList.lasts[3].utilizationRate
+ }else if(j == 4){
+ this.utilizationRateLastFiveEquipment=this.TopLastList.lasts[4].equipmentId
+ this.utilizationRateLastFive=this.TopLastList.lasts[4].utilizationRate
+ }
+ }
+ }
+ gaugeTopOption1.title.text = this.utilizationRateTopOneEquipment
+ gaugeTopOption1.series[0].data = [{value : (this.utilizationRateTopOne * 100).toFixed(2), name : '鍒╃敤鐜�'}];
+ gaugeTopOption2.title.text = this.utilizationRateTopTwoEquipment
+ gaugeTopOption2.series[0].data = [{value : (this.utilizationRateTopTwo * 100).toFixed(2), name : '鍒╃敤鐜�'}];
+ gaugeTopOption3.title.text = this.utilizationRateTopThreeEquipment
+ gaugeTopOption3.series[0].data = [{value : (this.utilizationRateTopThree * 100).toFixed(2), name : '鍒╃敤鐜�'}];
+ gaugeTopOption4.title.text = this.utilizationRateTopFourEquipment
+ gaugeTopOption4.series[0].data = [{value : (this.utilizationRateTopFour * 100).toFixed(2), name : '鍒╃敤鐜�'}];
+ gaugeTopOption5.title.text = this.utilizationRateTopFiveEquipment
+ gaugeTopOption5.series[0].data = [{value : (this.utilizationRateTopFive * 100).toFixed(2), name : '鍒╃敤鐜�'}];
+
+ gaugeLessOption1.title.text = this.utilizationRateLastOneEquipment
+ gaugeLessOption1.series[0].data = [{value : (this.utilizationRateLastOne * 100).toFixed(2), name : '鍒╃敤鐜�'}];
+ gaugeLessOption2.title.text = this.utilizationRateLastTwoEquipment
+ gaugeLessOption2.series[0].data = [{value : (this.utilizationRateLastTwo * 100).toFixed(2), name : '鍒╃敤鐜�'}];
+ gaugeLessOption3.title.text = this.utilizationRateLastThreeEquipment
+ gaugeLessOption3.series[0].data = [{value : (this.utilizationRateLastThree * 100).toFixed(2), name : '鍒╃敤鐜�'}];
+ gaugeLessOption4.title.text = this.utilizationRateLastFourEquipment
+ gaugeLessOption4.series[0].data = [{value : (this.utilizationRateLastFour * 100).toFixed(2), name : '鍒╃敤鐜�'}];
+ gaugeLessOption5.title.text = this.utilizationRateLastFiveEquipment
+ gaugeLessOption5.series[0].data = [{value : (this.utilizationRateLastFive * 100).toFixed(2), name : '鍒╃敤鐜�'}];
+ gaugeTopChart1.setOption(gaugeTopOption1);
+ gaugeTopChart2.setOption(gaugeTopOption2);
+ gaugeTopChart3.setOption(gaugeTopOption3);
+ gaugeTopChart4.setOption(gaugeTopOption4);
+ gaugeTopChart5.setOption(gaugeTopOption5);
+ gaugeLastChart1.setOption(gaugeLessOption1);
+ gaugeLastChart2.setOption(gaugeLessOption2);
+ gaugeLastChart3.setOption(gaugeLessOption3);
+ gaugeLastChart4.setOption(gaugeLessOption4);
+ gaugeLastChart5.setOption(gaugeLessOption5);
+ }else{
+ gaugeTopChart1.setOption(gaugeTopOption1);
+ gaugeTopChart2.setOption(gaugeTopOption2);
+ gaugeTopChart3.setOption(gaugeTopOption3);
+ gaugeTopChart4.setOption(gaugeTopOption4);
+ gaugeTopChart5.setOption(gaugeTopOption5);
+ gaugeLastChart1.setOption(gaugeLessOption1);
+ gaugeLastChart2.setOption(gaugeLessOption2);
+ gaugeLastChart3.setOption(gaugeLessOption3);
+ gaugeLastChart4.setOption(gaugeLessOption4);
+ gaugeLastChart5.setOption(gaugeLessOption5);
+ }
gaugeTopChart1.setOption(gaugeTopOption1);
gaugeTopChart2.setOption(gaugeTopOption2);
gaugeTopChart3.setOption(gaugeTopOption3);
--
Gitblit v1.9.3