From 3a8181119526dd55814fc69ac0566f93009fa71f Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 23 七月 2025 17:31:07 +0800
Subject: [PATCH] 1、各类审批状态提至列表靠前位置 2、新增二保、技术鉴定状态申请以及技术鉴定工单变更流程驳回时的审批节点展示条件
---
src/views/dashboard/WorkshopSectionSignage.vue | 135 +++++++++++++++++++++++++++++++++------------
1 files changed, 99 insertions(+), 36 deletions(-)
diff --git a/src/views/dashboard/WorkshopSectionSignage.vue b/src/views/dashboard/WorkshopSectionSignage.vue
index 09783e4..7523ffb 100644
--- a/src/views/dashboard/WorkshopSectionSignage.vue
+++ b/src/views/dashboard/WorkshopSectionSignage.vue
@@ -94,7 +94,12 @@
},
data() {
return {
+ firstEnterClientWidth: null,
+ pieChartRadius: ['40%', '60%'],
+ normalPieChartRadius: ['40%', '60%'],
+ currentPageProductionId: null,
runningStateChart: '',
+ runningStateChartDataRequireFinished: false,
runningStateData: [
{ value: '0', name: '鍏虫満' },
{ value: '0', name: '鎶ヨ' },
@@ -102,12 +107,14 @@
{ value: '0', name: '杩愯' }
],
techConditionChart: '',
+ techConditionChartRequireFinished: false,
techConditionData: [
{ value: '0', name: '鍚堟牸' },
{ value: '0', name: '绂佺敤' },
{ value: '0', name: '闄愮敤' }
],
warrantyMalfunctionChart: '',
+ warrantyMalfunctionChartRequireFinished: false,
warrantyMalfunctionData: [
{ value: '0', name: '鎶ヤ慨' },
{ value: '0', name: '鍋滄満' },
@@ -185,6 +192,7 @@
}
},
mounted() {
+ this.firstEnterClientWidth = document.body.clientWidth || document.documentElement.clientWidth
window.addEventListener('resize', this.handleWindowResize)
this.getChartDataByApi()
},
@@ -222,8 +230,9 @@
{ value: res.result[0].disabledCount, name: '绂佺敤', technologyStatus: 'disabled' },
{ value: res.result[0].limitedUseCount, name: '闄愮敤', technologyStatus: 'limitedUse' }
]
+ this.techConditionChartRequireFinished = true
+ this.drawTechConditionChart()
}
- this.drawTechConditionChart()
})
},
@@ -244,8 +253,9 @@
{ value: res.result[0].stopCount, name: '鍋滄満', isStop: '2' },
{ value: res.result[0].noStopCount, name: '杩愯', isStop: '1' }
]
+ this.warrantyMalfunctionChartRequireFinished = true
+ this.drawWarrantyMalfunctionChart()
}
- this.drawWarrantyMalfunctionChart()
})
},
@@ -280,8 +290,12 @@
})
signageApi.getEquipmentStatusStatisticsApi(this.productionCode)
.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)
+ }
})
},
@@ -296,8 +310,10 @@
})
signageApi.getEquipmentDayUtilizationStatisticsApi(this.productionCode)
.then(res => {
- if (res.success) this.first7DaysEfficiencyData = res.result
- this.drawFirst7DaysEfficiencyDataChart()
+ if (res.success) {
+ this.first7DaysEfficiencyData = res.result
+ this.drawFirst7DaysEfficiencyDataChart()
+ }
})
},
@@ -349,15 +365,16 @@
})
signageApi.getEquipmentOEEMonthStatisticsApi(this.productionCode)
.then(res => {
- if (res.success) {
+ if (res.success && res.result && res.result.length > 0) {
this.barChartData = res.result.map(item => {
return {
name: item.equipmentId,
value: item.overallEquipmentEfficiency
}
})
+ this.drawBarChart()
}
- this.drawBarChart()
+
})
},
@@ -406,7 +423,7 @@
{
type: 'pie',
// selectedMode: "single",
- radius: ['40%', '60%'],
+ radius: this.pieChartRadius,
center: ['50%', '50%'],
color: [
'#0FC61A',
@@ -494,7 +511,7 @@
{
type: 'pie',
// selectedMode: "single",
- radius: ['40%', '60%'],
+ radius: this.pieChartRadius,
center: ['50%', '50%'],
color: [
'#24F2F5',
@@ -583,7 +600,7 @@
type: 'pie',
roseType: 'angle', // 鐜懓鍥�
// selectedMode: "single",
- radius: ['35%', '55%'],
+ radius: this.pieChartRadius,
center: ['50%', '50%'],
color: [
'#8B8B8B',
@@ -643,7 +660,7 @@
xAxis: equipmentIdList,
yAxis: [
{
- name: '鍒╃敤鐜�',
+ name: 'TEEP',
value: this.first7DaysEfficiencyData.dataList.map(item => item.utilizationRate)
},
{
@@ -655,11 +672,11 @@
value: this.first7DaysEfficiencyData.dataList.map(item => item.openRate)
}
],
- yAxisName: '鍓�7澶╁埄鐢ㄧ巼(%)'
+ yAxisName: '鍓�7澶㏕EEP(%)'
}
let legendData = []
let seriesData = []
- let colorArr = ['#09F39E', '#A5F10D', '#09B3F6']
+ let colorArr = ['#A7F0C1', '#FAE893', '#66DFE2']
legendData = newData.yAxis.map((item) => item.name)
seriesData = newData.yAxis.map((item1, index1) => {
return {
@@ -668,7 +685,8 @@
symbol: 'circle',
symbolSize: 8,
itemStyle: {
- color: colorArr[index1]
+ color: colorArr[index1],
+ barBorderRadius: 100
},
lineStyle: {
width: 2
@@ -720,7 +738,7 @@
axisLabel: {
interval: 0,
show: true,
- fontSize: 12,
+ fontSize: 14,
color: '#fff'
// rotate: -30,
},
@@ -769,7 +787,8 @@
max: 100,
axisLabel: {
show: true,
- color: '#fff'
+ color: '#fff',
+ fontSize: 14
},
axisLine: {
show: true,
@@ -934,8 +953,8 @@
}
})
.finally(() => {
- option.title.text = moment().subtract(1, 'days').format('M鏈圖鏃�') + `鍒╃敤鐜嘸
- option.series[0].name = '鍒╃敤鐜�'
+ option.title.text = moment().subtract(1, 'days').format('M鏈圖鏃�') + `TEEP`
+ option.series[0].name = 'TEEP'
option.series[0].data = [this.gaugeChartData.utilizationRate]
this.gaugeChart1.setOption(option, true)
this.gaugeChart1.hideLoading()
@@ -1057,6 +1076,14 @@
/* 缁樺埗鍗曟煴鍥� */
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
+ else yAxisMax = Math.ceil(dataMax / 5) * 5 // 璁剧疆鏌卞浘鑳屾櫙闃村奖榛樿鍊硷紝鎬濊矾涓烘暟鎹渶澶у�兼渶鎺ヨ繎鐨勮兘琚�5鏁撮櫎鐨勬暟瀛�
+ const yAxisInterval = yAxisMax / 5 // 鍚屾椂灏嗗埢搴﹀�煎垎鎴�5浠�
+ this.barChartData.forEach(item => defaultData.push(yAxisMax))
const xAisData = this.barChartData.map(item => item.name)
const option = {
height: 260,
@@ -1077,11 +1104,11 @@
axisPointer: {
type: 'shadow'
},
- // backgroundColor: 'rgba(9, 24, 48, 0.5)',
- borderColor: 'rgba(75, 253, 238, 0.4)',
- textStyle: {
- // color: '#CFE3FC'
+ formatter: function(params) {
+ return '<span style="font-weight:bolder;">' + params[0].name + '</span><br/>' +
+ '<span style="display:inline-block; width:10px; height:10px; border-radius:100px; margin-right:5px; background:' + params[0].color + '"></span>' + ' OEE: ' + params[0].value + '%'
},
+ borderColor: 'rgba(75, 253, 238, 0.4)',
borderWidth: 1
},
grid: {
@@ -1106,7 +1133,8 @@
interval: 0, // 鍧愭爣杞村埢搴︽爣绛剧殑鏄剧ず闂撮殧锛屽湪绫荤洰杞翠腑鏈夋晥锛涢粯璁や細閲囩敤鏍囩涓嶉噸鍙犵殑绛栫暐闂撮殧鏄剧ず鏍囩锛涘彲浠ヨ缃垚0寮哄埗鏄剧ず鎵�鏈夋爣绛撅紱濡傛灉璁剧疆涓�1锛岃〃绀恒�庨殧涓�涓爣绛炬樉绀轰竴涓爣绛俱�忥紝濡傛灉鍊间负2锛岃〃绀洪殧涓や釜鏍囩鏄剧ず涓�涓爣绛撅紝浠ユ绫绘帹銆�
// rotate: this.barChartData.length >= 5 ? -30 : 0, // 鍒诲害鏍囩鏃嬭浆鐨勮搴︼紝鍦ㄧ被鐩酱鐨勭被鐩爣绛炬樉绀轰笉涓嬬殑鏃跺�欏彲浠ラ�氳繃鏃嬭浆闃叉鏍囩涔嬮棿閲嶅彔锛涙棆杞殑瑙掑害浠�-90搴﹀埌90搴�
inside: false, // 鍒诲害鏍囩鏄惁鏈濆唴锛岄粯璁ゆ湞澶�
- margin: 6 // 鍒诲害鏍囩涓庤酱绾夸箣闂寸殑璺濈
+ margin: 6, // 鍒诲害鏍囩涓庤酱绾夸箣闂寸殑璺濈
+ fontSize: 14
},
axisTick: {
show: true,
@@ -1116,12 +1144,14 @@
yAxis: [
{
name: '%',
- // nameLocation: 'middle',
- // nameGap: 30, // x杞磏ame涓庢í鍧愭爣杞寸嚎鐨勯棿璺�
+ min: 0,
+ max: yAxisMax,
+ interval: yAxisInterval,
position: 'left',
axisLabel: {
formatter: '{value}',
- color: '#fff'
+ color: '#fff',
+ fontSize: 14
},
axisTick: {
show: true
@@ -1152,10 +1182,13 @@
series: [{
type: 'bar',
data: this.barChartData,
- barWidth: '25%',
+ barWidth: this.barChartData.length > 5 ? '40%' : 30,
itemStyle: {
- color: '#17C1F0',
- barBorderRadius: [10, 10, 10, 10]
+ color: function(params) {
+ let num = colorArray.length
+ return colorArray[params.dataIndex % num]
+ },
+ barBorderRadius: 100
},
label: {
show: false,
@@ -1169,8 +1202,20 @@
color: '#fff',
fontSize: 18
}
- }
- }],
+ },
+ zlevel: 1
+ },
+ {
+ name: '鑳屾櫙',
+ type: 'bar',
+ barWidth: this.barChartData.length > 5 ? '40%' : 30,
+ barGap: '-100%',
+ data: defaultData,
+ itemStyle: {
+ color: '#11294d',
+ barBorderRadius: 100
+ }
+ }],
dataZoom: {
show: false,
startValue: 0, // 浠庡ご寮�濮嬨��
@@ -1194,6 +1239,7 @@
this.barChartCarouselTime = setInterval(() => {
this.barChartData.push(this.barChartData.shift())
xAisData.push(xAisData.shift())
+ colorArray.push(colorArray.shift())
this.$nextTick(() => {
this.barChart.setOption(option, true)
})
@@ -1232,18 +1278,35 @@
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()
+ if (this.warrantyMalfunctionChart) this.warrantyMalfunctionChart.resize()
if (this.first7DaysEfficiencyChart) this.first7DaysEfficiencyChart.resize()
- if (this.gaugeChart1) this.gaugeChart1.resize()
- if (this.gaugeChart2) this.gaugeChart2.resize()
- if (this.gaugeChart3) this.gaugeChart3.resize()
- if (this.gaugeChart4) this.gaugeChart4.resize()
if (this.barChart) this.barChart.resize()
+ if (this.doubleBarChart) this.doubleBarChart.resize()
}
}
}
--
Gitblit v1.9.3