From d55fef9c7205b412cadc99c2bb2dea9329b7a2c9 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 31 七月 2024 09:39:19 +0800
Subject: [PATCH] 1、公司级与分厂级看板调整OEE图表样式 2、各看板中的饼图图表增加随分辨率变化而改变自身半径功能，从而更清晰的展示内容标题指示箭头 3、OEE综合效率分析页面新增车间字段
---
src/views/dashboard/IndexSignage.vue | 122 +++++++++++++++++++++++++++-------------
1 files changed, 82 insertions(+), 40 deletions(-)
diff --git a/src/views/dashboard/IndexSignage.vue b/src/views/dashboard/IndexSignage.vue
index 6785b75..98c3cd0 100644
--- a/src/views/dashboard/IndexSignage.vue
+++ b/src/views/dashboard/IndexSignage.vue
@@ -57,7 +57,12 @@
components: { SignageModal },
data() {
return {
+ firstEnterClientWidth: null,
+ pieChartRadius: ['40%', '55%'],
+ normalPieChartRadius: ['40%', '55%'],
+ currentPageProductionId: null,
runningStateChart: '',
+ runningStateChartDataRequireFinished: false,
runningStateData: [
{ value: '0', name: '鍏虫満' },
{ value: '0', name: '鎶ヨ' },
@@ -67,16 +72,18 @@
efficiencyChart: '',
efficiencyData: [],
techConditionChart: '',
+ techConditionChartRequireFinished: false,
techConditionData: [
{ value: '0', name: '鍚堟牸' },
{ value: '0', name: '绂佺敤' },
{ value: '0', name: '闄愮敤' }
],
warrantyMalfunctionChart: '',
+ warrantyMalfunctionChartRequireFinished: false,
warrantyMalfunctionData: [
- { value: '12', name: '鎶ヤ慨' },
- { value: '10', name: '鍋滄満' },
- { value: '8', name: '杩愯' }
+ { value: '0', name: '鎶ヤ慨' },
+ { value: '0', name: '鍋滄満' },
+ { value: '0', name: '杩愯' }
],
supportPlanList: [
{
@@ -125,7 +132,9 @@
}
},
mounted() {
+ this.firstEnterClientWidth = document.body.clientWidth || document.documentElement.clientWidth
window.addEventListener('resize', this.handleWindowResize)
+ this.re_drawPieChart()
this.getChartDataByApi()
},
beforeDestroy() {
@@ -156,8 +165,12 @@
})
signageApi.getEquipmentStatusStatisticsApi()
.then(res => {
- if (res.success) this.runningStateData = res.result.list
- this.drawRunningStateChart(res.result.productionId)
+ if (res.success) {
+ this.runningStateData = res.result.list
+ this.currentPageProductionId = res.result.productionId
+ this.runningStateChartDataRequireFinished = true
+ this.drawRunningStateChart(res.result.productionId)
+ }
})
},
@@ -172,8 +185,10 @@
})
signageApi.getEquipmentUtilizationStatisticsApi()
.then(res => {
- if (res.success) this.efficiencyData = res.result
- this.drawEfficiencyChart()
+ if (res.success) {
+ this.efficiencyData = res.result
+ this.drawEfficiencyChart()
+ }
})
},
@@ -194,8 +209,9 @@
{ value: res.result[0].disabledCount, name: '绂佺敤', technologyStatus: 'disabled' },
{ value: res.result[0].limitedUseCount, name: '闄愮敤', technologyStatus: 'limitedUse' }
]
+ this.techConditionChartRequireFinished = true
+ this.drawTechConditionChart()
}
- this.drawTechConditionChart()
})
},
@@ -216,8 +232,9 @@
{ value: res.result[0].stopCount, name: '鍋滄満', isStop: '2' },
{ value: res.result[0].noStopCount, name: '杩愯', isStop: '1' }
]
+ this.warrantyMalfunctionChartRequireFinished = true
+ this.drawWarrantyMalfunctionChart()
}
- this.drawWarrantyMalfunctionChart()
})
},
@@ -261,8 +278,10 @@
})
signageApi.getEquipmentOEEStatistics()
.then(res => {
- if (res.success) this.barChartData = res.result
- this.drawBarChart()
+ if (res.success && res.result && res.result.length > 0) {
+ this.barChartData = res.result
+ this.drawBarChart()
+ }
})
},
@@ -277,8 +296,10 @@
})
signageApi.getEquipmentMonthStatisticsApi()
.then(res => {
- if (res.success) this.doubleBarChartData = res.result
- this.drawDoubleBarChart()
+ if (res.success) {
+ this.doubleBarChartData = res.result
+ this.drawDoubleBarChart()
+ }
})
},
@@ -290,7 +311,6 @@
this.drawWorkshopProblemChart()
})
},
-
/* 缁樺埗璁惧杩愯鐘舵�佺帿鐟伴ゼ鍥� */
drawRunningStateChart(productionId) {
@@ -340,7 +360,7 @@
type: 'pie',
roseType: 'angle', // 鐜懓鍥�
// selectedMode: "single",
- radius: ['40%', '55%'],
+ radius: this.pieChartRadius,
center: ['50%', '60%'],
color: [
'#8B8B8B',
@@ -651,7 +671,7 @@
{
type: 'pie',
// selectedMode: "single",
- radius: ['40%', '55%'],
+ radius: this.pieChartRadius,
center: ['45%', '60%'],
color: [
'#0FC61A',
@@ -739,7 +759,7 @@
{
type: 'pie',
// selectedMode: "single",
- radius: ['40%', '55%'],
+ radius: this.pieChartRadius,
center: ['45%', '60%'],
color: [
'#24F2F5',
@@ -799,6 +819,7 @@
/* 缁樺埗鍗曟煴鍥� */
drawBarChart() {
const defaultData = []
+ const colorArray = ['#79CEAA', '#F589A2', '#6FBF9D', '#66DFE2', '#A7F0C1', '#FAE893', '#F7B7A0']
const dataMax = +this.barChartData.sort((x, y) => +y.value - +x.value)[0].value
let yAxisMax
if (dataMax === 0) yAxisMax = 1 // 鑻ユ暟鎹腑鏈�澶у�间负0锛屽垯灏嗚儗鏅粯璁ゅ�艰缃负1
@@ -854,10 +875,11 @@
interval: 0, // 鍧愭爣杞村埢搴︽爣绛剧殑鏄剧ず闂撮殧锛屽湪绫荤洰杞翠腑鏈夋晥锛涢粯璁や細閲囩敤鏍囩涓嶉噸鍙犵殑绛栫暐闂撮殧鏄剧ず鏍囩锛涘彲浠ヨ缃垚0寮哄埗鏄剧ず鎵�鏈夋爣绛撅紱濡傛灉璁剧疆涓�1锛岃〃绀恒�庨殧涓�涓爣绛炬樉绀轰竴涓爣绛俱�忥紝濡傛灉鍊间负2锛岃〃绀洪殧涓や釜鏍囩鏄剧ず涓�涓爣绛撅紝浠ユ绫绘帹銆�
rotate: this.barChartData.length >= 6 ? -30 : 0, // 鍒诲害鏍囩鏃嬭浆鐨勮搴︼紝鍦ㄧ被鐩酱鐨勭被鐩爣绛炬樉绀轰笉涓嬬殑鏃跺�欏彲浠ラ�氳繃鏃嬭浆闃叉鏍囩涔嬮棿閲嶅彔锛涙棆杞殑瑙掑害浠�-90搴﹀埌90搴�
inside: false, // 鍒诲害鏍囩鏄惁鏈濆唴锛岄粯璁ゆ湞澶�
- margin: 6, // 鍒诲害鏍囩涓庤酱绾夸箣闂寸殑璺濈
+ margin: 10, // 鍒诲害鏍囩涓庤酱绾夸箣闂寸殑璺濈
formatter: value => {
return `${this.barChartData.find(item => item.productionId === value).name}`
- }
+ },
+ fontSize: 14
},
axisTick: {
show: true,
@@ -871,7 +893,8 @@
interval: yAxisInterval,
axisLabel: {
formatter: '{value}',
- color: '#fff'
+ color: '#fff',
+ fontSize: 14
},
axisTick: {
show: false
@@ -892,37 +915,42 @@
series: [{
type: 'bar',
data: this.barChartData,
- barWidth: '15%',
+ barWidth: this.barChartData.length > 5 ? '40%' : 30,
itemStyle: {
- color: '#55D6A5'
+ color: function(params) {
+ let num = colorArray.length
+ return colorArray[params.dataIndex % num]
+ },
+ barBorderRadius: 100
},
zlevel: 1,
label: {
- show: true,
+ show: false,
lineHeight: 10,
formatter: params => {
if (+params.value === 0) return ''
else return params.value
},
- position: 'inside',
+ position: 'top',
textStyle: {
color: '#fff',
- fontSize: 18
+ fontSize: 16
}
}
},
{
name: '鑳屾櫙',
type: 'bar',
- barWidth: '15%',
+ barWidth: this.barChartData.length > 5 ? '40%' : 30,
barGap: '-100%',
data: defaultData,
itemStyle: {
- color: '#11294d'
+ color: '#11294d',
+ barBorderRadius: 100
}
}]
}
- option.title.text = moment().subtract(1, 'months').format('M鏈�') + `OEE杞﹂棿`
+ option.title.text = moment().subtract(1, 'months').format('M鏈�') + `OEE`
this.barChart.setOption(option, true)
this.barChart.hideLoading()
@@ -942,7 +970,7 @@
/* 缁樺埗鍙屾煴鍥� */
drawDoubleBarChart() {
const option = {
- color: ['#409EFF', '#0FC61A'],
+ color: ['#66DFE2', '#79CEAA'],
tooltip: {
confine: true,
formatter: function(params) {
@@ -985,7 +1013,7 @@
}
},
axisLabel: {
- fontSize: 12,
+ fontSize: 14,
color: '#fff'
},
axisTick: {
@@ -1001,9 +1029,6 @@
type: 'value',
min: 0,
minInterval: 1,
- splitArea: {
- show: false
- },
axisLine: {
show: true
},
@@ -1018,7 +1043,7 @@
}
},
axisLabel: {
- fontSize: 12,
+ fontSize: 14,
color: '#fff',
fontFamily: 'Bebas'
}
@@ -1035,10 +1060,10 @@
show: false
},
axisLabel: {
- fontSize: 12,
+ fontSize: 14,
formatter: '{value}%', // 鍙充晶Y杞存枃瀛楁樉绀�
fontFamily: 'Bebas',
- color: '#fff'
+ color: '#6A93B9'
},
splitArea: {
show: false
@@ -1047,11 +1072,11 @@
series: [{
type: 'bar',
barWidth: 15,
- itemStyle: { barBorderRadius: [3, 3, 0, 0] },
+ itemStyle: { barBorderRadius: 100 },
name: 'OEE',
data: this.doubleBarChartData.oeeList,
label: {
- show: true,
+ show: false,
lineHeight: 10,
formatter: params => {
if (+params.value === 0) return ''
@@ -1066,11 +1091,11 @@
}, {
type: 'bar',
barWidth: 15,
- itemStyle: { barBorderRadius: [3, 3, 0, 0] },
+ itemStyle: { barBorderRadius: 100 },
name: '鍒╃敤鐜�',
data: this.doubleBarChartData.utilizationList,
label: {
- show: true,
+ show: false,
lineHeight: 10,
formatter: params => {
if (+params.value === 0) return ''
@@ -1114,11 +1139,28 @@
this.modalVisible = true
},
+ re_drawPieChart() {
+ const clientWidth = document.body.clientWidth || document.documentElement.clientWidth
+ if (this.firstEnterClientWidth != 1920) {
+ this.pieChartRadius = this.normalPieChartRadius.map(item => item = (+item.slice(0, -1) * (clientWidth / 1920)) + '%')
+ } else {
+ this.pieChartRadius = this.normalPieChartRadius.map(item => item = (+item.slice(0, -1) * (clientWidth / this.firstEnterClientWidth)) + '%')
+ }
+ console.log('pieChartRadius', this.pieChartRadius)
+ this.$nextTick(() => {
+ if (this.runningStateChartDataRequireFinished) this.drawRunningStateChart(this.currentPageProductionId)
+ if (this.techConditionChartRequireFinished) this.drawTechConditionChart()
+ if (this.warrantyMalfunctionChartRequireFinished) this.drawWarrantyMalfunctionChart()
+ })
+ },
+
/**
* 绐楀彛灏哄鍙樺寲鏃惰Е鍙�
* 璋冩暣鍥捐〃灏哄浠ラ�傚簲鍒嗚鲸鐜�
*/
handleWindowResize() {
+ this.re_drawPieChart()
+
if (this.runningStateChart) this.runningStateChart.resize()
if (this.efficiencyChart) this.efficiencyChart.resize()
if (this.techConditionChart) this.techConditionChart.resize()
--
Gitblit v1.9.3