From 8f1df61c8902a35e41205d7cbd9d0763619e6d46 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 22 八月 2025 16:36:47 +0800
Subject: [PATCH] mdc首页设备管理部分功能调整
---
src/views/dashboard/IndexSignage.vue | 523 +++++++++++++++++++++-------------------------------------
1 files changed, 189 insertions(+), 334 deletions(-)
diff --git a/src/views/dashboard/IndexSignage.vue b/src/views/dashboard/IndexSignage.vue
index cd50929..0761ee4 100644
--- a/src/views/dashboard/IndexSignage.vue
+++ b/src/views/dashboard/IndexSignage.vue
@@ -42,7 +42,7 @@
</div>
<SignageModal :modalVisible="modalVisible" :modalTitle=modalTitle :modalDataApiUrl="modalDataApiUrl"
- :modalTableColumns="modalTableColumns"
+ :modalDataApiParams="modalDataApiParams"
@closeModal="modalVisible=false"/>
</div>
</template>
@@ -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,60 +72,69 @@
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'
+ backgroundColor: '#719D8E',
+ apiUrl: '/eam/calibrationOrder/showThisMonthMaintenanceList'
},
{
planTime: '鏈湀瀹屾垚',
planValueLabel: 'thisMonthMaintenanceRealNum',
- backgroundColor: '#409EFF'
+ backgroundColor: '#409EFF',
+ apiUrl: '/eam/calibrationOrder/showThisMonthMaintenanceFinishList'
},
{
planTime: '涓嬫湀涓変繚璁″垝',
planValueLabel: 'nextMonthMaintenancePlanNum',
- backgroundColor: '#D6BC52'
+ backgroundColor: '#A8985D',
+ apiUrl: '/eam/calibrationOrder/showNextMonthMaintenanceList'
},
{
planTime: '涓嬩笅鏈堜笁淇濊鍒�',
planValueLabel: 'nextNextMonthMaintenancePlanNum',
- backgroundColor: '#58D9F9'
+ backgroundColor: '#58D9F9',
+ apiUrl: '/eam/calibrationOrder/showNextNextMonthMaintenanceList'
}
],
thisMonthMaintenancePlanNum: 0,
thisMonthMaintenanceRealNum: 0,
nextMonthMaintenancePlanNum: 0,
nextNextMonthMaintenancePlanNum: 0,
- twoMaintenanceChartData: [['-', '-', '-']],
+ twoMaintenanceChartData: [],
barChart: '',
barChartData: [],
doubleBarChart: '',
doubleBarChartData: {},
- workshopProblemChartData: [['-', '-', '-']],
+ workshopProblemChartData: [],
efficiencyChartConfig: {},
maintenanceConfig: {},
problemConfig: {},
modalVisible: false,
modalTitle: '',
modalDataApiUrl: '',
- modalTableColumns: []
+ modalTableColumns: [],
+ modalDataApiParams: {}
}
},
mounted() {
+ this.firstEnterClientWidth = document.body.clientWidth || document.documentElement.clientWidth
window.addEventListener('resize', this.handleWindowResize)
+ this.re_drawPieChart()
this.getChartDataByApi()
},
beforeDestroy() {
@@ -131,9 +145,10 @@
getChartDataByApi() {
this.getRunningStateDataByApi()
this.getEfficiencyDataByApi()
- this.getTechConditionDataByApi()
- this.getWarrantyMalfunctionDataByApi()
- this.getMonthMaintenanceNumByApi()
+ // this.getTechConditionDataByApi()
+ // this.getWarrantyMalfunctionDataByApi()
+ this.getTechConditionAndWarrantyMalfunctionDataByApi()
+ this.getThirdMaintenanceConditionByApi()
this.getTwoMaintenanceChartDataByApi()
this.getBarChartDataByApi()
this.getDoubleBarChartDataByApi()
@@ -146,13 +161,17 @@
this.runningStateChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)',
+ maskColor: 'rgba(0,0,0,.05)' // 閬僵灞�
})
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)
+ }
})
},
@@ -162,77 +181,77 @@
this.efficiencyChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)',
+ maskColor: 'rgba(0,0,0,.05)' // 閬僵灞�
})
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: 'rgba(0,0,0,.05)' // 閬僵灞�
})
- signageApi.getEquipmentTechnologyStatusListApi()
- .then(res => {
- if (res.success && res.result) {
- this.techConditionData = [
- { value: res.result[0].qualifiedCount, name: '鍚堟牸' },
- { value: res.result[0].disabledCount, name: '绂佺敤' },
- { value: res.result[0].limitedUseCount, name: '闄愮敤' }
- ]
- }
- 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: 'rgba(0,0,0,.05)' // 閬僵灞�
})
- signageApi.getReportRepairEquipmentListApi()
+ signageApi.getEquipmentTechnologyStatusAndReportRepairEquipmentListApi()
.then(res => {
if (res.success && res.result) {
- this.warrantyMalfunctionData = [
- { value: res.result[0].failurTotalCount, name: '鎶ヤ慨' },
- { value: res.result[0].stopCount, name: '鍋滄満' },
- { value: res.result[0].noStopCount, name: '杩愯' }
+ this.techConditionData = [
+ {
+ value: res.result.jszt.find(item => item.code === 'QUALIFIED').value,
+ name: '鍚堟牸',
+ technologyStatus: 'QUALIFIED'
+ },
+ {
+ value: res.result.jszt.find(item => item.code === 'PROHIBITED').value,
+ name: '绂佺敤',
+ technologyStatus: 'PROHIBITED'
+ },
+ {
+ value: res.result.jszt.find(item => item.code === 'RESTRICTED').value,
+ name: '闄愮敤',
+ technologyStatus: 'RESTRICTED'
+ }
]
+ this.warrantyMalfunctionData = [
+ { value: res.result.bxqk.find(item => item.code === 'bx').value, name: '鎶ヤ慨', isStop: '' },
+ { value: res.result.bxqk.find(item => item.code === 'stop').value, name: '鍋滄満', isStop: '2' },
+ { value: res.result.bxqk.find(item => item.code === 'run').value, name: '杩愯', isStop: '1' }
+ ]
+ 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
+ }
})
},
@@ -240,7 +259,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()
})
},
@@ -251,13 +270,15 @@
this.barChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)',
+ maskColor: 'rgba(0,0,0,.05)' // 閬僵灞�
})
signageApi.getEquipmentOEEStatistics()
.then(res => {
- if (res.success) this.barChartData = res.result
- this.drawBarChart()
+ if (res.success && res.result) {
+ this.barChartData = res.result
+ this.drawBarChart()
+ }
})
},
@@ -267,13 +288,15 @@
this.doubleBarChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)',
+ maskColor: 'rgba(0,0,0,.05)' // 閬僵灞�
})
signageApi.getEquipmentMonthStatisticsApi()
.then(res => {
- if (res.success) this.doubleBarChartData = res.result
- this.drawDoubleBarChart()
+ if (res.success) {
+ this.doubleBarChartData = res.result
+ this.drawDoubleBarChart()
+ }
})
},
@@ -281,7 +304,6 @@
getWorkshopProblemChartDataByApi() {
signageApi.getWorkshopProblemListApi()
.then(res => {
- console.log('res', res.result)
if (res.success && res.result.length > 0) this.workshopProblemChartData = res.result.map(item => [item.content, item.createTime])
this.drawWorkshopProblemChart()
})
@@ -293,7 +315,7 @@
height: 300,
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
- text: '璁惧鐘舵��', // 涓绘爣棰樻枃鏈�
+ text: '璁惧杩愯鐘舵�佺粺璁�', // 涓绘爣棰樻枃鏈�
x: 'center', // 鏍囬姘村钩瀹夋斁浣嶇疆锛屽彲閫夊�间负'left'銆�'center'銆�'right'鎴栧叿浣撶殑姘村钩鍧愭爣鍊�
y: 'top', // 鏍囬鍨傜洿瀹夋斁浣嶇疆锛屽彲閫夊�间负'top'銆�'bottom'銆�'center'鎴栧叿浣撶殑鍨傜洿鍧愭爣鍊�
textStyle: {
@@ -315,7 +337,6 @@
left: 0,
orient: 'vertical',
right: '10%',
- // bottom: "0",
itemWidth: 14,
itemHeight: 14,
icon: 'roundRect',
@@ -335,13 +356,13 @@
type: 'pie',
roseType: 'angle', // 鐜懓鍥�
// selectedMode: "single",
- radius: ['40%', '55%'],
+ radius: this.pieChartRadius,
center: ['50%', '60%'],
color: [
- '#8B8B8B',
- '#F56436',
- '#FFFF40',
- '#0FC61A'
+ '#686869',
+ '#AA6349',
+ '#EAEA7C',
+ '#5D975D'
],
label: {
position: 'outside',
@@ -379,37 +400,8 @@
/* 缁樺埗璁惧鍒╃敤鐜囪兌鍥婂浘 */
drawEfficiencyChart() {
const data = this.efficiencyData
- const colorArray = [
- {
- top: '#79CEAA',
- bottom: '#79CEAA'
- },
- {
- top: '#F589A2',
- bottom: '#F589A2'
- },
- {
- top: '#6FBF9D',
- bottom: '#6FBF9D'
- },
- {
- top: '#66DFE2',
- bottom: '#66DFE2'
- }, {
- top: '#A7F0C1',
- bottom: '#A7F0C1'
- },
- {
- top: '#FAE893',
- bottom: '#FAE893'
- },
- {
- top: '#F7B7A0',
- bottom: '#F7B7A0'
- }
- ]
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鏁撮櫎鐨勬暟瀛�
@@ -448,12 +440,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,
@@ -475,7 +467,7 @@
axisLabel: {
show: true,
textStyle: {
- color: '#fff',
+ color: 'rgba(0,0,0,.45)',
fontSize: '14',
fontWeight: 'bolder'
},
@@ -510,77 +502,25 @@
},
data: data
}],
- series: [{
- name: '鍒╃敤鐜�',
+ series: {
+ name: 'TEEP',
type: 'bar',
zlevel: 1,
itemStyle: {
barBorderRadius: 100,
- color: function(params) {
- let num = colorArray.length
- return {
- type: 'linear',
- colorStops: [{
- offset: 0,
- color: colorArray[params.dataIndex % num].bottom
- }, {
- offset: 1,
- color: colorArray[params.dataIndex % num].top
- }, {
- offset: 0,
- color: colorArray[params.dataIndex % num].bottom
- }, {
- offset: 1,
- color: colorArray[params.dataIndex % num].top
- }, {
- offset: 0,
- color: colorArray[params.dataIndex % num].bottom
- }, {
- offset: 1,
- color: colorArray[params.dataIndex % num].top
- }, {
- offset: 0,
- color: colorArray[params.dataIndex % num].bottom
- }, {
- offset: 1,
- color: colorArray[params.dataIndex % num].top
- }, {
- offset: 0,
- color: colorArray[params.dataIndex % num].bottom
- }, {
- offset: 1,
- color: colorArray[params.dataIndex % num].top
- }, {
- offset: 0,
- color: colorArray[params.dataIndex % num].bottom
- }]
- }
- }
+ color: '#5070DD'
},
barWidth: 12,
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 => {
// 鐐瑰嚮瑙﹀彂鐨勪负鏌辩姸浣擄紝闄ゆ闄ゅ鏄爣棰�
if (params.componentType === 'series') {
// 鏌辩姸浣撹烦杞粺璁″垎鏋愰〉闈㈠睍绀哄搴斿眰绾ф暟鎹�
- console.log('seriesParams===========', params)
let productionId
let tierName
// 鐐瑰嚮鐨勬槸鏌变綋鐨勫�硷紝鍚﹀垯鐐瑰嚮鐨勪负鏌变綋鑳屾櫙闃村奖
@@ -591,13 +531,11 @@
productionId = this.efficiencyData.find(item => item.productionCode === params.name).productionId
tierName = this.efficiencyData.find(item => item.productionCode === params.name).name
}
- console.log('productionId', productionId)
this.$router.push({
name: 'mdc-base-StatisticsChart',
params: { isEquipment: false, productionId, tierName }
})
} else {
- console.log('yAxisParams===========', params)
this.$emit('switchToNextSignage', { signageName: 'BranchFactory', productionCode: params.value })
}
})
@@ -649,12 +587,12 @@
{
type: 'pie',
// selectedMode: "single",
- radius: ['40%', '55%'],
+ radius: this.pieChartRadius,
center: ['45%', '60%'],
color: [
- '#0FC61A',
- '#F56436',
- '#8B8B8B'
+ '#0AA012',
+ '#247F49',
+ '#757160'
],
label: {
position: 'outside',
@@ -681,49 +619,14 @@
this.techConditionChart.setOption(option, true)
this.techConditionChart.hideLoading()
- // this.techConditionChart.on('click', params => {
- // console.log('params', params)
- // this.modalTitle = '鎶�鏈姸鎬�'
- // this.modalTableColumns = [
- // {
- // title: '#',
- // dataIndex: '',
- // key: 'rowIndex',
- // width: 60,
- // align: 'center',
- // customRender: function(t, r, index) {
- // return parseInt(index) + 1
- // }
- // },
- // {
- // title: '璁惧缂栧彿',
- // dataIndex: 'equipmentId',
- // key: 'equipmentId'
- // },
- // {
- // title: '璁惧鍚嶇О',
- // dataIndex: 'equipmentName',
- // key: 'equipmentName'
- // },
- // {
- // title: '璁惧鍨嬪彿',
- // dataIndex: 'equipmentModel',
- // key: 'equipmentModel'
- // },
- // {
- // title: '璁惧绫诲瀷',
- // key: 'equipmentType',
- // dataIndex: 'equipmentType'
- // },
- // {
- // title: '椹卞姩绫诲瀷',
- // key: 'driveType',
- // dataIndex: 'driveType'
- // }
- // ]
- // this.modalDataApiUrl = '/mdc/mdcEquipment/list'
- // this.modalVisible = true
- // })
+ 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.modalVisible = true
+ })
},
/* 缁樺埗璁惧鎶ヤ慨鏁呴殰楗煎浘 */
@@ -732,7 +635,7 @@
height: 300,
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
- text: '璁惧鎶ヤ慨鏁呴殰', // 涓绘爣棰樻枃鏈�
+ text: '璁惧鎶ヤ慨鏁呴殰鎯呭喌', // 涓绘爣棰樻枃鏈�
x: 'center', // 鏍囬姘村钩瀹夋斁浣嶇疆锛屽彲閫夊�间负'left'銆�'center'銆�'right'鎴栧叿浣撶殑姘村钩鍧愭爣鍊�
y: 'top', // 鏍囬鍨傜洿瀹夋斁浣嶇疆锛屽彲閫夊�间负'top'銆�'bottom'銆�'center'鎴栧叿浣撶殑鍨傜洿鍧愭爣鍊�
textStyle: {
@@ -772,12 +675,12 @@
{
type: 'pie',
// selectedMode: "single",
- radius: ['40%', '55%'],
+ radius: this.pieChartRadius,
center: ['45%', '60%'],
color: [
- '#24F2F5',
- '#F56436',
- '#FFFF40'
+ '#00CED1',
+ '#B85B38',
+ '#EAEA7C'
],
label: {
position: 'outside',
@@ -804,44 +707,14 @@
this.warrantyMalfunctionChart.setOption(option, true)
this.warrantyMalfunctionChart.hideLoading()
- // this.warrantyMalfunctionChart.on('click', params => {
- // console.log('params', params)
- // this.modalTitle = '鎶ヤ慨鏁呴殰'
- // this.modalTableColumns = [
- // {
- // title: '#',
- // dataIndex: '',
- // key: 'rowIndex',
- // width: 60,
- // align: 'center',
- // customRender: function(t, r, index) {
- // return parseInt(index) + 1
- // }
- // },
- // {
- // title: '绫诲瀷',
- // align: 'center',
- // dataIndex: 'planCloseType'
- // },
- // {
- // title: '鏃堕棿绫诲瀷',
- // align: 'center',
- // dataIndex: 'planCloseTimeType'
- // },
- // {
- // title: '鏃堕暱锛堝垎閽燂級',
- // align: 'center',
- // dataIndex: 'planCloseTimeLong'
- // },
- // {
- // title: '澶囨敞',
- // align: 'center',
- // dataIndex: 'remark'
- // }
- // ]
- // this.modalDataApiUrl = '/mdc/mdcPlanClose/list'
- // this.modalVisible = true
- // })
+ 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.modalVisible = true
+ })
},
/* 缁樺埗杞﹂棿淇濆吇婊氬姩琛� */
@@ -849,9 +722,9 @@
this.maintenanceConfig = {
indexHeader: '搴忓彿',
header: ['杞﹂棿', '鏃ユ湡', '鍐呭'],
- headerBGC: '#2C8BB2',
- oddRowBGC: '#244B58',
- evenRowBGC: '#295562',
+ headerBGC: '#266C86',
+ oddRowBGC: '#0A2732',
+ evenRowBGC: '#003B51',
data: this.twoMaintenanceChartData,
index: true,
columnWidth: [100, 300, 300, 300],
@@ -862,7 +735,7 @@
/* 缁樺埗鍗曟煴鍥� */
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鏁撮櫎鐨勬暟瀛�
@@ -917,10 +790,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,
@@ -934,7 +808,8 @@
interval: yAxisInterval,
axisLabel: {
formatter: '{value}',
- color: '#fff'
+ color: '#fff',
+ fontSize: 14
},
axisTick: {
show: false
@@ -955,29 +830,29 @@
series: [{
type: 'bar',
data: this.barChartData,
- barWidth: '15%',
+ barWidth: this.barChartData.length > 5 ? '40%' : 30,
itemStyle: {
- color: '#55D6A5'
+ color: '#2E8BDA'
},
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: {
@@ -985,18 +860,16 @@
}
}]
}
- 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 => {
- console.log('params', params)
let productionId
// 鐐瑰嚮鐨勬槸鏌变綋鐨勫�硷紝鍚﹀垯鐐瑰嚮鐨勪负鏌变綋鑳屾櫙闃村奖
if (params.seriesIndex === 0) productionId = params.data.productionId
else productionId = params.name
- console.log('productionId', productionId)
this.$router.push({
name: 'mdc-base-OEEAnalysis',
params: { isEquipment: false, productionId }
@@ -1007,7 +880,7 @@
/* 缁樺埗鍙屾煴鍥� */
drawDoubleBarChart() {
const option = {
- color: ['#409EFF', '#0FC61A'],
+ color: ['#4992FF', '#4DC0B1'],
tooltip: {
confine: true,
formatter: function(params) {
@@ -1031,7 +904,7 @@
formatter: ['{a|{name}}'].join('\n'),
textStyle: {
fontSize: 14,
- color: '#fff',
+ color: 'rgba(0, 0, 0, .45)',
height: 8,
rich: {
a: {
@@ -1039,7 +912,7 @@
}
}
},
- data: ['OEE', '鍒╃敤鐜�']
+ data: ['OEE', 'TEEP']
},
xAxis: {
type: 'category',
@@ -1050,7 +923,7 @@
}
},
axisLabel: {
- fontSize: 12,
+ fontSize: 14,
color: '#fff'
},
axisTick: {
@@ -1066,9 +939,6 @@
type: 'value',
min: 0,
minInterval: 1,
- splitArea: {
- show: false
- },
axisLine: {
show: true
},
@@ -1083,7 +953,7 @@
}
},
axisLabel: {
- fontSize: 12,
+ fontSize: 14,
color: '#fff',
fontFamily: 'Bebas'
}
@@ -1100,10 +970,10 @@
show: false
},
axisLabel: {
- fontSize: 12,
+ fontSize: 14,
formatter: '{value}%', // 鍙充晶Y杞存枃瀛楁樉绀�
fontFamily: 'Bebas',
- color: '#fff'
+ color: '#6A93B9'
},
splitArea: {
show: false
@@ -1112,11 +982,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 ''
@@ -1131,11 +1001,11 @@
}, {
type: 'bar',
barWidth: 15,
- itemStyle: { barBorderRadius: [3, 3, 0, 0] },
- name: '鍒╃敤鐜�',
+ itemStyle: { barBorderRadius: 100 },
+ name: 'TEEP',
data: this.doubleBarChartData.utilizationList,
label: {
- show: true,
+ show: false,
lineHeight: 10,
formatter: params => {
if (+params.value === 0) return ''
@@ -1158,10 +1028,10 @@
drawWorkshopProblemChart() {
this.problemConfig = {
indexHeader: '搴忓彿',
- header: [ '闂鍐呭', '鏃堕棿'],
- headerBGC: '#86D186',
- oddRowBGC: '#7CBF7C',
- evenRowBGC: '#7CBF7C',
+ header: ['闂鍐呭', '鏃堕棿'],
+ headerBGC: '#83B883',
+ oddRowBGC: '#556955',
+ evenRowBGC: '#556955',
data: this.workshopProblemChartData,
index: true,
columnWidth: [100, 300, 150],
@@ -1175,40 +1045,23 @@
*/
openMaintenanceModal(record) {
this.modalTitle = record.planTime
- this.modalTableColumns = [
- {
- title: '#',
- dataIndex: '',
- key: 'rowIndex',
- width: 60,
- align: 'center',
- customRender: function(t, r, index) {
- return parseInt(index) + 1
- }
- },
- {
- title: '绫诲瀷',
- align: 'center',
- dataIndex: 'planCloseType'
- },
- {
- title: '鏃堕棿绫诲瀷',
- align: 'center',
- dataIndex: 'planCloseTimeType'
- },
- {
- title: '鏃堕暱锛堝垎閽燂級',
- align: 'center',
- dataIndex: 'planCloseTimeLong'
- },
- {
- title: '澶囨敞',
- align: 'center',
- dataIndex: 'remark'
- }
- ]
- this.modalDataApiUrl = '/mdc/mdcPlanClose/list'
- // this.modalVisible = true
+ this.modalDataApiUrl = record.apiUrl
+ 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()
+ })
},
/**
@@ -1216,6 +1069,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