From a892616db370b2185bc546a11c873df1137cc7e0 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 01 九月 2025 09:44:01 +0800
Subject: [PATCH] 1、设备事故登记表以及三不放过原则分析报表导出及批量打印功能 2、调整首页看板及图表样式
---
src/views/dashboard/IndexSignage.vue | 606 +++++++++++++++++++++++++++++-------------------------
1 files changed, 321 insertions(+), 285 deletions(-)
diff --git a/src/views/dashboard/IndexSignage.vue b/src/views/dashboard/IndexSignage.vue
index 6785b75..949d5f3 100644
--- a/src/views/dashboard/IndexSignage.vue
+++ b/src/views/dashboard/IndexSignage.vue
@@ -24,7 +24,7 @@
</div>
</div>
</div>
- <div style="padding: 0 55px;margin-top: 10px">
+ <div style="padding: 0 55px;margin-top : 10px">
<dv-scroll-board :config="maintenanceConfig" style="width:100%;height:220px"/>
</div>
</dv-border-box-9>
@@ -51,13 +51,19 @@
import signageApi from '@/api/signage'
import moment from 'moment'
import SignageModal from './modules/SignageModal'
+ import * as echarts from 'echarts'
export default {
name: 'IndexSignage',
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,41 +73,43 @@
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: [
{
planTime: '鏈湀涓変繚璁″垝',
planValueLabel: 'thisMonthMaintenancePlanNum',
- backgroundColor: '#5FE0AF',
- apiUrl: '/eam/calibrationOrder/showThisMonthMaintenanceList'
+ backgroundColor: '#719D8E',
+ code: 'bysbzs'
},
{
planTime: '鏈湀瀹屾垚',
planValueLabel: 'thisMonthMaintenanceRealNum',
backgroundColor: '#409EFF',
- apiUrl: '/eam/calibrationOrder/showThisMonthMaintenanceFinishList'
+ code: 'bwc'
},
{
planTime: '涓嬫湀涓変繚璁″垝',
planValueLabel: 'nextMonthMaintenancePlanNum',
- backgroundColor: '#D6BC52',
- apiUrl: '/eam/calibrationOrder/showNextMonthMaintenanceList'
+ backgroundColor: '#A8985D',
+ code: 'xysb'
},
{
planTime: '涓嬩笅鏈堜笁淇濊鍒�',
planValueLabel: 'nextNextMonthMaintenancePlanNum',
backgroundColor: '#58D9F9',
- apiUrl: '/eam/calibrationOrder/showNextNextMonthMaintenanceList'
+ code: 'xxysb'
}
],
thisMonthMaintenancePlanNum: 0,
@@ -125,7 +133,9 @@
}
},
mounted() {
+ this.firstEnterClientWidth = document.body.clientWidth || document.documentElement.clientWidth
window.addEventListener('resize', this.handleWindowResize)
+ this.re_drawPieChart()
this.getChartDataByApi()
},
beforeDestroy() {
@@ -136,9 +146,8 @@
getChartDataByApi() {
this.getRunningStateDataByApi()
this.getEfficiencyDataByApi()
- this.getTechConditionDataByApi()
- this.getWarrantyMalfunctionDataByApi()
- this.getMonthMaintenanceNumByApi()
+ this.getTechConditionAndWarrantyMalfunctionDataByApi()
+ this.getThirdMaintenanceConditionByApi()
this.getTwoMaintenanceChartDataByApi()
this.getBarChartDataByApi()
this.getDoubleBarChartDataByApi()
@@ -151,13 +160,17 @@
this.runningStateChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)',
+ maskColor: 'transparent' // 閬僵灞�
})
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)
+ }
})
},
@@ -167,77 +180,89 @@
this.efficiencyChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)',
+ maskColor: 'transparent' // 閬僵灞�
})
signageApi.getEquipmentUtilizationStatisticsApi()
.then(res => {
- if (res.success) this.efficiencyData = res.result
- this.drawEfficiencyChart()
+ if (res.success) {
+ this.efficiencyData = res.result
+ this.drawEfficiencyChart()
+ }
})
},
- /* 璋冪敤鎺ュ彛鑾峰彇鎶�鏈姸鎬� */
- getTechConditionDataByApi() {
+ /* 璋冪敤鎺ュ彛鑾峰彇鎶�鏈姸鎬佷笌鏁呴殰鎶ヤ慨 */
+ getTechConditionAndWarrantyMalfunctionDataByApi() {
this.techConditionChart = this.$echarts.init(document.getElementById('tech_condition_chart'))
+ this.warrantyMalfunctionChart = this.$echarts.init(document.getElementById('warranty_malfunction_chart'))
this.techConditionChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)',
+ maskColor: 'transparent' // 閬僵灞�
})
- signageApi.getEquipmentTechnologyStatusListApi()
- .then(res => {
- if (res.success && res.result) {
- this.techConditionData = [
- { value: res.result[0].qualifiedCount, name: '鍚堟牸', technologyStatus: 'qualified' },
- { value: res.result[0].disabledCount, name: '绂佺敤', technologyStatus: 'disabled' },
- { value: res.result[0].limitedUseCount, name: '闄愮敤', technologyStatus: 'limitedUse' }
- ]
- }
- this.drawTechConditionChart()
- })
- },
-
- /* 璋冪敤鎺ュ彛鑾峰彇璁惧鎶ヤ慨鏁呴殰 */
- getWarrantyMalfunctionDataByApi() {
- this.warrantyMalfunctionChart = this.$echarts.init(document.getElementById('warranty_malfunction_chart'))
this.warrantyMalfunctionChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)',
+ maskColor: 'transparent' // 閬僵灞�
})
- signageApi.getReportRepairEquipmentListApi()
+ signageApi.getEquipmentTechnologyStatusAndReportRepairEquipmentListApi()
.then(res => {
if (res.success && res.result) {
- this.warrantyMalfunctionData = [
- { value: res.result[0].failurTotalCount, name: '鎶ヤ慨', isStop: '' },
- { value: res.result[0].stopCount, name: '鍋滄満', isStop: '2' },
- { value: res.result[0].noStopCount, name: '杩愯', isStop: '1' }
+ this.techConditionData = [
+ {
+ value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'QUALIFIED').value : 0,
+ name: '鍚堟牸',
+ technologyStatus: 'QUALIFIED'
+ },
+ {
+ value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'PROHIBITED').value : 0,
+ name: '绂佺敤',
+ technologyStatus: 'PROHIBITED'
+ },
+ {
+ value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'RESTRICTED').value : 0,
+ name: '闄愮敤',
+ technologyStatus: 'RESTRICTED'
+ }
]
+ this.warrantyMalfunctionData = [
+ {
+ value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'bx').value : 0,
+ name: '鎶ヤ慨',
+ code: 'bx'
+ },
+ {
+ value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'stop').value : 0,
+ name: '鍋滄満',
+ code: 'stop'
+ },
+ {
+ value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'run').value : 0,
+ name: '杩愯',
+ code: 'run'
+ }
+ ]
+ this.techConditionChartRequireFinished = true
+ this.warrantyMalfunctionChartRequireFinished = true
+ this.drawTechConditionChart()
+ this.drawWarrantyMalfunctionChart()
}
- this.drawWarrantyMalfunctionChart()
})
},
- /* 璋冪敤鎺ュ彛鑾峰彇涓変繚璁″垝 */
- getMonthMaintenanceNumByApi() {
- signageApi.getThisMonthMaintenanceListApi()
+ /* 璋冪敤鎺ュ彛鑾峰彇涓変繚鎯呭喌 */
+ getThirdMaintenanceConditionByApi() {
+ signageApi.getThirdMaintenanceConditionApi()
.then(res => {
- if (res.success && res.result) this.thisMonthMaintenancePlanNum = res.result[0].totalCount
- })
- signageApi.getThisMonthMaintenanceFinishListApi()
- .then(res => {
- if (res.success && res.result) this.thisMonthMaintenanceRealNum = res.result[0].totalCount
- })
- signageApi.getNextMonthMaintenanceList()
- .then(res => {
- if (res.success && res.result) this.nextMonthMaintenancePlanNum = res.result[0].totalCount
- })
- signageApi.getNextNextMonthMaintenanceListApi()
- .then(res => {
- if (res.success && res.result) this.nextNextMonthMaintenancePlanNum = res.result[0].totalCount
+ if (res.success && res.result) {
+ this.thisMonthMaintenancePlanNum = res.result.find(item => item.code === 'bysbzs').value
+ this.thisMonthMaintenanceRealNum = res.result.find(item => item.code === 'bwc').value
+ this.nextMonthMaintenancePlanNum = res.result.find(item => item.code === 'xysb').value
+ this.nextNextMonthMaintenancePlanNum = res.result.find(item => item.code === 'xxysb').value
+ }
})
},
@@ -245,7 +270,7 @@
getTwoMaintenanceChartDataByApi() {
signageApi.getTwoMaintenancePlanListApi()
.then(res => {
- if (res.success && res.result.length > 0) this.twoMaintenanceChartData = res.result.map(item => [item.centerName, item.maintenanceDate, item.content])
+ if (res.success && res.result.length > 0) this.twoMaintenanceChartData = res.result.map(item => [item.factoryName, item.monthPlan, '浜岀骇淇濆吇'])
this.drawMaintenanceChart()
})
},
@@ -256,13 +281,15 @@
this.barChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)',
+ maskColor: 'transparent' // 閬僵灞�
})
signageApi.getEquipmentOEEStatistics()
.then(res => {
- if (res.success) this.barChartData = res.result
- this.drawBarChart()
+ if (res.success && res.result) {
+ this.barChartData = res.result
+ this.drawBarChart()
+ }
})
},
@@ -272,13 +299,15 @@
this.doubleBarChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)',
+ maskColor: 'transparent' // 閬僵灞�
})
signageApi.getEquipmentMonthStatisticsApi()
.then(res => {
- if (res.success) this.doubleBarChartData = res.result
- this.drawDoubleBarChart()
+ if (res.success) {
+ this.doubleBarChartData = res.result
+ this.drawDoubleBarChart()
+ }
})
},
@@ -286,11 +315,10 @@
getWorkshopProblemChartDataByApi() {
signageApi.getWorkshopProblemListApi()
.then(res => {
- if (res.success && res.result.length > 0) this.workshopProblemChartData = res.result.map(item => [item.content, item.createTime])
+ if (res.success && res.result.length > 0) this.workshopProblemChartData = res.result.map(item => [item.createTime, item.content])
this.drawWorkshopProblemChart()
})
},
-
/* 缁樺埗璁惧杩愯鐘舵�佺帿鐟伴ゼ鍥� */
drawRunningStateChart(productionId) {
@@ -298,7 +326,7 @@
height: 300,
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
- text: '璁惧鐘舵��', // 涓绘爣棰樻枃鏈�
+ text: '璁惧杩愯鐘舵�佺粺璁�', // 涓绘爣棰樻枃鏈�
x: 'center', // 鏍囬姘村钩瀹夋斁浣嶇疆锛屽彲閫夊�间负'left'銆�'center'銆�'right'鎴栧叿浣撶殑姘村钩鍧愭爣鍊�
y: 'top', // 鏍囬鍨傜洿瀹夋斁浣嶇疆锛屽彲閫夊�间负'top'銆�'bottom'銆�'center'鎴栧叿浣撶殑鍨傜洿鍧愭爣鍊�
textStyle: {
@@ -320,13 +348,12 @@
left: 0,
orient: 'vertical',
right: '10%',
- // bottom: "0",
itemWidth: 14,
itemHeight: 14,
icon: 'roundRect',
itemGap: 15,
textStyle: {
- color: 'inherit',
+ color: 'rgba(0,0,0,.45)',
fontSize: 14,
padding: [0, 0, 0, 0]
},
@@ -340,18 +367,18 @@
type: 'pie',
roseType: 'angle', // 鐜懓鍥�
// selectedMode: "single",
- radius: ['40%', '55%'],
+ radius: this.pieChartRadius,
center: ['50%', '60%'],
color: [
- '#8B8B8B',
- '#F56436',
- '#FFFF40',
- '#0FC61A'
+ '#686869',
+ '#AA6349',
+ '#FFFF88',
+ '#5D975D'
],
label: {
position: 'outside',
show: true,
- color: 'inherit',
+ color: 'rgba(0,0,0,.45)',
// textBorderColor: 'inherit',
// textBorderWidth: 1,
fontSize: 16,
@@ -364,7 +391,10 @@
labelLine: {
show: true,
length2: 10,
- length: 10
+ length: 10,
+ lineStyle: {
+ color: 'rgba(0,0,0,.45)'
+ }
},
data: this.runningStateData
}
@@ -383,38 +413,27 @@
/* 缁樺埗璁惧鍒╃敤鐜囪兌鍥婂浘 */
drawEfficiencyChart() {
- const data = this.efficiencyData
const colorArray = [
{
- top: '#79CEAA',
- bottom: '#79CEAA'
+ top: '#EA967B',
+ bottom: '#F8E18B'
},
{
- top: '#F589A2',
- bottom: '#F589A2'
+ top: '#62AC75',
+ bottom: '#A8D07C'
},
{
- top: '#6FBF9D',
- bottom: '#6FBF9D'
+ top: '#32ACBF',
+ bottom: '#7BCAC5'
},
{
- top: '#66DFE2',
- bottom: '#66DFE2'
- }, {
- top: '#A7F0C1',
- bottom: '#A7F0C1'
- },
- {
- top: '#FAE893',
- bottom: '#FAE893'
- },
- {
- top: '#F7B7A0',
- bottom: '#F7B7A0'
+ top: '#7196CE',
+ bottom: '#8DCCEF'
}
]
+ const data = this.efficiencyData
const defaultData = []
- const dataMax = +data.sort((x, y) => +y.value - +x.value)[0].value
+ const dataMax = data.length > 0 ? +data.sort((x, y) => +y.value - +x.value)[0].value : 0
let yAxisMax
if (dataMax === 0) yAxisMax = 1 // 鑻ユ暟鎹腑鏈�澶у�间负0锛屽垯灏嗚儗鏅粯璁ゅ�艰缃负1
else yAxisMax = Math.ceil(dataMax / 5) * 5 // 璁剧疆鏌卞浘鑳屾櫙闃村奖榛樿鍊硷紝鎬濊矾涓烘暟鎹渶澶у�兼渶鎺ヨ繎鐨勮兘琚�5鏁撮櫎鐨勬暟瀛�
@@ -453,12 +472,12 @@
xAxis: {
name: '',
nameTextStyle: {
- color: '#fff'
+ color: 'rgba(0,0,0,.45)'
},
axisLabel: {
margin: 20,
textStyle: {
- color: '#fff'
+ color: 'rgba(0,0,0,.45)'
}
},
show: true,
@@ -470,17 +489,17 @@
show: false
},
splitLine: {
- show: false
+ show: true
}
},
- yAxis: [{
+ yAxis: {
type: 'category',
inverse: true,
triggerEvent: true,
axisLabel: {
show: true,
textStyle: {
- color: '#fff',
+ color: 'rgba(0,0,0,.45)',
fontSize: '14',
fontWeight: 'bolder'
},
@@ -498,29 +517,12 @@
show: false
},
data: data.map(item => item.productionCode)
- }, {
- type: 'category',
- inverse: true,
- axisTick: 'none',
- axisLine: 'none',
- show: true,
- axisLabel: {
- textStyle: {
- color: '#ffffff',
- fontSize: '14'
- },
- formatter: function(value) {
- return `${value}%`
- }
- },
- data: data
- }],
- series: [{
- name: '鍒╃敤鐜�',
+ },
+ series: {
+ name: 'TEEP',
type: 'bar',
zlevel: 1,
itemStyle: {
- barBorderRadius: 100,
color: function(params) {
let num = colorArray.length
return {
@@ -562,23 +564,16 @@
}
}
},
- barWidth: 12,
+ label: {
+ show: true,
+ position: 'inside',
+ color: '#fff'
+ },
+ barWidth: 18,
data: data
- },
- {
- name: '鑳屾櫙',
- type: 'bar',
- barWidth: 12,
- barGap: '-100%',
- data: defaultData,
- itemStyle: {
- color: '#11294d',
- barBorderRadius: 100
- }
- }
- ]
+ }
}
- option.title.text = `${moment().subtract(1, 'days').format('M鏈圖鏃�')}鍒╃敤鐜嘸
+ option.title.text = `${moment().subtract(1, 'days').format('M鏈圖鏃�')}TEEP`
this.efficiencyChart.setOption(option, true)
this.efficiencyChart.hideLoading()
this.efficiencyChart.on('click', params => {
@@ -638,7 +633,7 @@
icon: 'roundRect',
itemGap: 15,
textStyle: {
- color: 'inherit',
+ color: 'rgba(0,0,0,.45)',
fontSize: 14,
padding: [0, 0, 0, 0]
},
@@ -651,17 +646,17 @@
{
type: 'pie',
// selectedMode: "single",
- radius: ['40%', '55%'],
+ radius: this.pieChartRadius,
center: ['45%', '60%'],
color: [
- '#0FC61A',
- '#F56436',
- '#8B8B8B'
+ '#0AA012',
+ '#247F49',
+ '#757160'
],
label: {
position: 'outside',
show: true,
- color: 'inherit',
+ color: 'rgba(0,0,0,.45)',
// textBorderColor: 'inherit',
// textBorderWidth: 1,
fontSize: 16,
@@ -674,7 +669,10 @@
labelLine: {
show: true,
length2: 10,
- length: 10
+ length: 10,
+ lineStyle: {
+ color: 'rgba(0,0,0,.45)'
+ }
},
data: this.techConditionData
}
@@ -685,10 +683,8 @@
this.techConditionChart.on('click', params => {
this.modalTitle = `鎶�鏈姸鎬侊紙${params.name}锛塦
- this.modalDataApiParams = {
- technologyStatus: this.techConditionData.find(item => item.name === params.name).technologyStatus
- }
- this.modalDataApiUrl = '/eam/calibrationOrder/showEquipmentByTechnologyStatus'
+ this.modalDataApiParams = { technologyStatus: this.techConditionData.find(item => item.name === params.name).technologyStatus }
+ this.modalDataApiUrl = '/eam/equipment/list'
this.modalVisible = true
})
},
@@ -699,7 +695,7 @@
height: 300,
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
- text: '璁惧鎶ヤ慨鏁呴殰', // 涓绘爣棰樻枃鏈�
+ text: '璁惧鎶ヤ慨鏁呴殰鎯呭喌', // 涓绘爣棰樻枃鏈�
x: 'center', // 鏍囬姘村钩瀹夋斁浣嶇疆锛屽彲閫夊�间负'left'銆�'center'銆�'right'鎴栧叿浣撶殑姘村钩鍧愭爣鍊�
y: 'top', // 鏍囬鍨傜洿瀹夋斁浣嶇疆锛屽彲閫夊�间负'top'銆�'bottom'銆�'center'鎴栧叿浣撶殑鍨傜洿鍧愭爣鍊�
textStyle: {
@@ -726,7 +722,7 @@
icon: 'roundRect',
itemGap: 15,
textStyle: {
- color: 'inherit',
+ color: 'rgba(0,0,0,.45)',
fontSize: 14,
padding: [0, 0, 0, 0]
},
@@ -739,17 +735,17 @@
{
type: 'pie',
// selectedMode: "single",
- radius: ['40%', '55%'],
+ radius: this.pieChartRadius,
center: ['45%', '60%'],
color: [
- '#24F2F5',
- '#F56436',
- '#FFFF40'
+ '#00CED1',
+ '#B85B38',
+ '#FFFF88'
],
label: {
position: 'outside',
show: true,
- color: 'inherit',
+ color: 'rgba(0,0,0,.45)',
// textBorderColor: 'inherit',
// textBorderWidth: 1,
fontSize: 16,
@@ -762,7 +758,10 @@
labelLine: {
show: true,
length2: 10,
- length: 10
+ length: 10,
+ lineStyle: {
+ color: 'rgba(0,0,0,.45)'
+ }
},
data: this.warrantyMalfunctionData
}
@@ -773,10 +772,8 @@
this.warrantyMalfunctionChart.on('click', params => {
this.modalTitle = `鎶ヤ慨鏁呴殰锛�${params.name}锛塦
- this.modalDataApiParams = {
- isStop: this.warrantyMalfunctionData.find(item => item.name === params.name).isStop
- }
- this.modalDataApiUrl = '/eam/calibrationOrder/showEquipmentByReportRepair'
+ this.modalDataApiParams = { code: this.warrantyMalfunctionData.find(item => item.name === params.name).code }
+ this.modalDataApiUrl = '/eam/home/repairList'
this.modalVisible = true
})
},
@@ -786,9 +783,9 @@
this.maintenanceConfig = {
indexHeader: '搴忓彿',
header: ['杞﹂棿', '鏃ユ湡', '鍐呭'],
- headerBGC: '#2C8BB2',
- oddRowBGC: '#244B58',
- evenRowBGC: '#295562',
+ headerBGC: '#46B7E3',
+ oddRowBGC: '#0383AF',
+ evenRowBGC: '#0395C9',
data: this.twoMaintenanceChartData,
index: true,
columnWidth: [100, 300, 300, 300],
@@ -799,12 +796,15 @@
/* 缁樺埗鍗曟煴鍥� */
drawBarChart() {
const defaultData = []
- const dataMax = +this.barChartData.sort((x, y) => +y.value - +x.value)[0].value
+ const dataMax = this.barChartData.length > 0 ? +this.barChartData.sort((x, y) => +y.value - +x.value)[0].value : 0
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))
+ console.log('bar', this.barChartData)
+ let barTopColor = ['#EA967B', '#62AC75', '#32ACBF', '#7196CE']
+ let barBottomColor = ['#F8E18B', '#A8D07C', '#7BCAC5', '#8DCCEF']
const option = {
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
@@ -826,111 +826,124 @@
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 + '%'
- },
- // backgroundColor: 'rgba(9, 24, 48, 0.5)',
- borderColor: 'rgba(75, 253, 238, 0.4)',
- textStyle: {
- // color: '#CFE3FC'
- },
- borderWidth: 1
+ }
},
grid: {
top: '15%',
left: '10%'
},
- xAxis: [{
- name: '',
- nameLocation: 'middle',
- nameGap: 40, // x杞磏ame涓庢í鍧愭爣杞寸嚎鐨勯棿璺�
- type: 'category',
- data: this.barChartData.map(item => item.productionId),
- axisLine: {
- lineStyle: {
- color: '#FFFFFF'
- }
- },
- axisLabel: {
- show: true, // 鏄惁鏄剧ず鍒诲害鏍囩锛岄粯璁ゆ樉绀�
- interval: 0, // 鍧愭爣杞村埢搴︽爣绛剧殑鏄剧ず闂撮殧锛屽湪绫荤洰杞翠腑鏈夋晥锛涢粯璁や細閲囩敤鏍囩涓嶉噸鍙犵殑绛栫暐闂撮殧鏄剧ず鏍囩锛涘彲浠ヨ缃垚0寮哄埗鏄剧ず鎵�鏈夋爣绛撅紱濡傛灉璁剧疆涓�1锛岃〃绀恒�庨殧涓�涓爣绛炬樉绀轰竴涓爣绛俱�忥紝濡傛灉鍊间负2锛岃〃绀洪殧涓や釜鏍囩鏄剧ず涓�涓爣绛撅紝浠ユ绫绘帹銆�
- rotate: this.barChartData.length >= 6 ? -30 : 0, // 鍒诲害鏍囩鏃嬭浆鐨勮搴︼紝鍦ㄧ被鐩酱鐨勭被鐩爣绛炬樉绀轰笉涓嬬殑鏃跺�欏彲浠ラ�氳繃鏃嬭浆闃叉鏍囩涔嬮棿閲嶅彔锛涙棆杞殑瑙掑害浠�-90搴﹀埌90搴�
- inside: false, // 鍒诲害鏍囩鏄惁鏈濆唴锛岄粯璁ゆ湞澶�
- margin: 6, // 鍒诲害鏍囩涓庤酱绾夸箣闂寸殑璺濈
- formatter: value => {
- return `${this.barChartData.find(item => item.productionId === value).name}`
- }
- },
+ xAxis: {
+ data: this.barChartData.map(item => item.name),
axisTick: {
+ show: false
+ },
+ axisLine: {
show: true,
- alignWithLabel: true
- }
- }],
- yAxis: [{
- name: '%',
- min: 0,
- max: yAxisMax,
- interval: yAxisInterval,
+ lineStyle: {
+ color: 'rgba(0,0,0,.45)'
+ }
+ },
axisLabel: {
- formatter: '{value}',
- color: '#fff'
+ show: true,
+ rotate: 20,
+ margin: 25,
+ textStyle: {
+ fontSize: 14,
+ color: 'rgba(0,0,0,.45)',
+ align: 'center'
+ }
+ },
+ interval: 0
+ },
+ yAxis: {
+ name: '%',
+ splitLine: {
+ show: false
},
axisTick: {
show: false
},
axisLine: {
- show: false,
- lineStyle: {
- color: '#FFFFFF'
- }
- },
- splitLine: {
- show: false,
- lineStyle: {
- color: 'rgba(255,255,255,0.12)'
- }
- }
- }],
- series: [{
- type: 'bar',
- data: this.barChartData,
- barWidth: '15%',
- itemStyle: {
- color: '#55D6A5'
- },
- zlevel: 1,
- label: {
show: true,
- lineHeight: 10,
- formatter: params => {
- if (+params.value === 0) return ''
- else return params.value
- },
- position: 'inside',
+ lineStyle: {
+ color: 'rgba(0,0,0,.45)'
+ }
+ },
+ axisLabel: {
+ show: true,
+ margin: 10,
textStyle: {
- color: '#fff',
- fontSize: 18
+ fontSize: 14,
+ color: 'rgba(0,0,0,.45)'
}
}
},
+ series: [
{
- name: '鑳屾櫙',
- type: 'bar',
- barWidth: '15%',
- barGap: '-100%',
- data: defaultData,
+ type: 'pictorialBar',
+ symbolSize: [26, 10],
+ symbolOffset: [0, -5],
+ z: 12,
itemStyle: {
- color: '#11294d'
- }
+ color: function(params) {
+ return barBottomColor[params.dataIndex % barBottomColor.length]
+ }
+ },
+ label: {
+ show: true,
+ position: 'top',
+ fontSize: 12,
+ color: 'rgba(0,0,0,.45)'
+ },
+ symbolPosition: 'end',
+ data: this.barChartData
+ },
+ {
+ type: 'pictorialBar',
+ symbolSize: [26, 10],
+ symbolOffset: [0, 5],
+ z: 12,
+ itemStyle: {
+ color: function(params) {
+ return barTopColor[params.dataIndex % barTopColor.length]
+ }
+ },
+ data: this.barChartData
+ },
+ {
+ type: 'bar',
+ itemStyle: {
+ color: function(params) {
+ return new echarts.graphic.LinearGradient(
+ 0, 0, 0, 1,
+ [{
+ offset: 1,
+ color: barTopColor[params.dataIndex % barTopColor.length]
+ },
+ {
+ offset: 0,
+ color: barBottomColor[params.dataIndex % barBottomColor.length]
+ }
+ ]
+ )
+ },
+ opacity: .9
+ },
+ z: 16,
+ barWidth: 26,
+ barGap: '-100%',
+ data: this.barChartData
}]
}
- 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()
this.barChart.on('click', params => {
let productionId
- // 鐐瑰嚮鐨勬槸鏌变綋鐨勫�硷紝鍚﹀垯鐐瑰嚮鐨勪负鏌变綋鑳屾櫙闃村奖
- if (params.seriesIndex === 0) productionId = params.data.productionId
- else productionId = params.name
+ console.log('params', params)
+ productionId = params.data.productionId
this.$router.push({
name: 'mdc-base-OEEAnalysis',
@@ -942,7 +955,7 @@
/* 缁樺埗鍙屾煴鍥� */
drawDoubleBarChart() {
const option = {
- color: ['#409EFF', '#0FC61A'],
+ color: ['#1890FF', '#2EC35C'],
tooltip: {
confine: true,
formatter: function(params) {
@@ -966,7 +979,7 @@
formatter: ['{a|{name}}'].join('\n'),
textStyle: {
fontSize: 14,
- color: '#fff',
+ color: 'rgba(0, 0, 0, .45)',
height: 8,
rich: {
a: {
@@ -974,19 +987,20 @@
}
}
},
- data: ['OEE', '鍒╃敤鐜�']
+ data: ['OEE', 'TEEP']
},
xAxis: {
type: 'category',
data: this.doubleBarChartData.dateList,
axisLine: {
+ show: true,
lineStyle: {
- color: 'rgba(255,255,255,0.45)'
+ color: 'rgba(0,0,0,.45)'
}
},
axisLabel: {
- fontSize: 12,
- color: '#fff'
+ fontSize: 14,
+ color: 'rgba(0,0,0,.45)'
},
axisTick: {
show: true
@@ -996,16 +1010,16 @@
{
name: '%',
nameTextStyle: {
- color: '#fff'
+ color: 'rgba(0,0,0,.45)'
},
type: 'value',
min: 0,
minInterval: 1,
- splitArea: {
- show: false
- },
axisLine: {
- show: true
+ show: true,
+ lineStyle: {
+ color: 'rgba(0,0,0,.45)'
+ }
},
axisTick: {
show: true
@@ -1018,15 +1032,18 @@
}
},
axisLabel: {
- fontSize: 12,
- color: '#fff',
+ fontSize: 14,
+ color: 'rgba(0,0,0,.45)',
fontFamily: 'Bebas'
}
},
{
type: 'value',
axisLine: {
- show: true
+ show: true,
+ lineStyle: {
+ color: 'rgba(0,0,0,.45)'
+ }
},
axisTick: {
show: false
@@ -1035,10 +1052,10 @@
show: false
},
axisLabel: {
- fontSize: 12,
+ fontSize: 14,
formatter: '{value}%', // 鍙充晶Y杞存枃瀛楁樉绀�
fontFamily: 'Bebas',
- color: '#fff'
+ color: 'rgba(0,0,0,.45)'
},
splitArea: {
show: false
@@ -1046,8 +1063,9 @@
}],
series: [{
type: 'bar',
- barWidth: 15,
- itemStyle: { barBorderRadius: [3, 3, 0, 0] },
+ barWidth: 20,
+ barGap: '0%',
+ itemStyle: { barBorderRadius: 4 },
name: 'OEE',
data: this.doubleBarChartData.oeeList,
label: {
@@ -1057,17 +1075,18 @@
if (+params.value === 0) return ''
else return params.value
},
- position: 'inside',
+ position: 'top',
textStyle: {
- color: '#fff',
- fontSize: 12
+ color: 'rgba(0,0,0,.45)',
+ fontSize: 10
}
}
}, {
type: 'bar',
- barWidth: 15,
- itemStyle: { barBorderRadius: [3, 3, 0, 0] },
- name: '鍒╃敤鐜�',
+ barWidth: 20,
+ barGap: '0%',
+ itemStyle: { barBorderRadius: 4 },
+ name: 'TEEP',
data: this.doubleBarChartData.utilizationList,
label: {
show: true,
@@ -1078,8 +1097,8 @@
},
position: 'inside',
textStyle: {
- color: '#fff',
- fontSize: 12
+ color: 'rgba(0,0,0,.45)',
+ fontSize: 10
}
}
}
@@ -1093,14 +1112,14 @@
drawWorkshopProblemChart() {
this.problemConfig = {
indexHeader: '搴忓彿',
- header: ['闂鍐呭', '鏃堕棿'],
- headerBGC: '#86D186',
- oddRowBGC: '#7CBF7C',
- evenRowBGC: '#7CBF7C',
+ header: ['鏃堕棿', '闂鍐呭'],
+ headerBGC: '#A5CCE6',
+ oddRowBGC: '#6B9FCD',
+ evenRowBGC: '#5A7D9A',
data: this.workshopProblemChartData,
index: true,
- columnWidth: [100, 300, 150],
- align: ['center']
+ columnWidth: [100, 200, 300],
+ align: ['center', 'center', 'center']
}
},
@@ -1110,8 +1129,23 @@
*/
openMaintenanceModal(record) {
this.modalTitle = record.planTime
- this.modalDataApiUrl = record.apiUrl
+ this.modalDataApiParams = { code: record.code }
+ this.modalDataApiUrl = '/eam/home/maintenanceList'
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)) + '%')
+ }
+ this.$nextTick(() => {
+ if (this.runningStateChartDataRequireFinished) this.drawRunningStateChart(this.currentPageProductionId)
+ if (this.techConditionChartRequireFinished) this.drawTechConditionChart()
+ if (this.warrantyMalfunctionChartRequireFinished) this.drawWarrantyMalfunctionChart()
+ })
},
/**
@@ -1119,6 +1153,8 @@
* 璋冩暣鍥捐〃灏哄浠ラ�傚簲鍒嗚鲸鐜�
*/
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