From 79c2a02466da037c246abdf173725a1a344ce9de Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 10 六月 2025 13:51:20 +0800
Subject: [PATCH] 点检测试修改
---
src/views/dashboard/BranchFactorySignage.vue | 266 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 181 insertions(+), 85 deletions(-)
diff --git a/src/views/dashboard/BranchFactorySignage.vue b/src/views/dashboard/BranchFactorySignage.vue
index 2fc68ac..2cc6394 100644
--- a/src/views/dashboard/BranchFactorySignage.vue
+++ b/src/views/dashboard/BranchFactorySignage.vue
@@ -18,31 +18,11 @@
<div id="warranty_malfunction_chart" style="width:50%;height: 420px;"></div>
</div>
<div class="support-plan-container">
- <div class="support-plan-item" style="background:#5FE0AF">
- <div>鏈湀涓変繚璁″垝</div>
+ <div v-for="(item,index) in supportPlanList" :key="index" class="support-plan-item"
+ :style="{background:item.backgroundColor}" @click="openMaintenanceModal(item)">
+ <div>{{item.planTime}}</div>
<div class="plan-value-container">
- <div class="plan-value">{{thisMonthMaintenancePlanNum}}</div>
- <div>鍙�</div>
- </div>
- </div>
- <div class="support-plan-item" style="background:#409EFF">
- <div>鏈湀瀹屾垚</div>
- <div class="plan-value-container">
- <div class="plan-value">{{thisMonthMaintenanceRealNum}}</div>
- <div>鍙�</div>
- </div>
- </div>
- <div class="support-plan-item" style="background:#D6BC52">
- <div>涓嬫湀涓変繚璁″垝</div>
- <div class="plan-value-container">
- <div class="plan-value">{{nextMonthMaintenancePlanNum}}</div>
- <div>鍙�</div>
- </div>
- </div>
- <div class="support-plan-item" style="background:#58D9F9">
- <div>涓嬩笅鏈堜笁淇濊鍒�</div>
- <div class="plan-value-container">
- <div class="plan-value">{{nextNextMonthMaintenancePlanNum}}</div>
+ <div class="plan-value">{{$data[item.planValueLabel]}}</div>
<div>鍙�</div>
</div>
</div>
@@ -62,6 +42,10 @@
</div>
</dv-border-box-9>
</div>
+
+ <SignageModal :modalVisible="modalVisible" :modalTitle=modalTitle :modalDataApiUrl="modalDataApiUrl"
+ :modalDataApiParams="modalDataApiParams"
+ @closeModal="modalVisible=false"/>
</div>
</div>
</template>
@@ -69,9 +53,11 @@
<script>
import signageApi from '@/api/signage'
import moment from 'moment'
+ import SignageModal from './modules/SignageModal'
export default {
name: 'BranchFactorySignage',
+ components: { SignageModal },
props: {
productionCode: {
type: String,
@@ -83,7 +69,12 @@
},
data() {
return {
+ firstEnterClientWidth: null,
+ pieChartRadius: ['40%', '60%'],
+ normalPieChartRadius: ['40%', '60%'],
+ currentPageProductionId: null,
runningStateChart: '',
+ runningStateChartDataRequireFinished: false,
runningStateData: [
{ value: '0', name: '鍏虫満' },
{ value: '0', name: '鎶ヨ' },
@@ -93,34 +84,68 @@
efficiencyChart: '',
efficiencyData: [],
techConditionChart: '',
+ techConditionChartRequireFinished: false,
techConditionData: [
{ value: '0', name: '鍚堟牸' },
{ value: '0', name: '绂佺敤' },
{ value: '0', name: '闄愮敤' }
],
warrantyMalfunctionChart: '',
+ warrantyMalfunctionChartRequireFinished: false,
warrantyMalfunctionData: [
{ value: '0', name: '鎶ヤ慨' },
{ value: '0', name: '鍋滄満' },
{ value: '0', name: '杩愯' }
],
+ supportPlanList: [
+ {
+ planTime: '鏈湀涓変繚璁″垝',
+ planValueLabel: 'thisMonthMaintenancePlanNum',
+ backgroundColor: '#5FE0AF',
+ apiUrl: '/eam/calibrationOrder/showThisMonthMaintenanceList'
+ },
+ {
+ planTime: '鏈湀瀹屾垚',
+ planValueLabel: 'thisMonthMaintenanceRealNum',
+ backgroundColor: '#409EFF',
+ apiUrl: '/eam/calibrationOrder/showThisMonthMaintenanceFinishList'
+ },
+ {
+ planTime: '涓嬫湀涓変繚璁″垝',
+ planValueLabel: 'nextMonthMaintenancePlanNum',
+ backgroundColor: '#D6BC52',
+ apiUrl: '/eam/calibrationOrder/showNextMonthMaintenanceList'
+ },
+ {
+ planTime: '涓嬩笅鏈堜笁淇濊鍒�',
+ planValueLabel: 'nextNextMonthMaintenancePlanNum',
+ backgroundColor: '#58D9F9',
+ apiUrl: '/eam/calibrationOrder/showNextNextMonthMaintenanceList'
+ }
+ ],
thisMonthMaintenancePlanNum: 0,
thisMonthMaintenanceRealNum: 0,
nextMonthMaintenancePlanNum: 0,
nextNextMonthMaintenancePlanNum: 0,
- twoMaintenanceChartData: [['-', '-', '-']],
+ twoMaintenanceChartData: [],
barChart: '',
barChartData: [],
doubleBarChart: '',
doubleBarChartData: {},
+ workshopProblemChartData: [],
maintenanceConfig: {},
- problemConfig: {}
+ problemConfig: {},
+ modalVisible: false,
+ modalTitle: '',
+ modalDataApiUrl: '',
+ modalTableColumns: [],
+ modalDataApiParams: {}
}
},
mounted() {
+ this.firstEnterClientWidth = document.body.clientWidth || document.documentElement.clientWidth
window.addEventListener('resize', this.handleWindowResize)
this.getChartDataByApi()
- this.drawProblemChart()
},
beforeDestroy() {
window.removeEventListener('resize', this.handleWindowResize)
@@ -136,6 +161,7 @@
this.getTwoMaintenanceChartDataByApi()
this.getBarChartDataByApi()
this.getDoubleBarChartDataByApi()
+ this.getWorkshopProblemChartDataByApi()
},
/* 璋冪敤鎺ュ彛鑾峰彇璁惧杩愯鐘舵�� */
@@ -149,8 +175,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)
+ }
})
},
@@ -165,8 +195,10 @@
})
signageApi.getEquipmentUtilizationStatisticsApi(this.productionCode)
.then(res => {
- if (res.success) this.efficiencyData = res.result
- this.drawEfficiencyChart()
+ if (res.success) {
+ this.efficiencyData = res.result
+ this.drawEfficiencyChart()
+ }
})
},
@@ -183,12 +215,13 @@
.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: '闄愮敤' }
+ { 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.techConditionChartRequireFinished = true
+ this.drawTechConditionChart()
}
- this.drawTechConditionChart()
})
},
@@ -205,12 +238,13 @@
.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: '杩愯' }
+ { value: res.result[0].failurTotalCount, name: '鎶ヤ慨', isStop: '' },
+ { value: res.result[0].stopCount, name: '鍋滄満', isStop: '2' },
+ { value: res.result[0].noStopCount, name: '杩愯', isStop: '1' }
]
+ this.warrantyMalfunctionChartRequireFinished = true
+ this.drawWarrantyMalfunctionChart()
}
- this.drawWarrantyMalfunctionChart()
})
},
@@ -238,7 +272,7 @@
getTwoMaintenanceChartDataByApi() {
signageApi.getTwoMaintenancePlanListApi(this.productionCode)
.then(res => {
- if (res.success && res.result) 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.centerName, item.maintenanceDate, item.content])
this.drawMaintenanceChart()
})
},
@@ -254,8 +288,10 @@
})
signageApi.getEquipmentOEEStatistics(this.productionCode)
.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()
+ }
})
},
@@ -270,8 +306,19 @@
})
signageApi.getEquipmentMonthStatisticsApi(this.productionCode)
.then(res => {
- if (res.success) this.doubleBarChartData = res.result
- this.drawDoubleBarChart()
+ if (res.success) {
+ this.doubleBarChartData = res.result
+ this.drawDoubleBarChart()
+ }
+ })
+ },
+
+ /* 璋冪敤鎺ュ彛鑾峰彇杞﹂棿闂鍒楄〃*/
+ getWorkshopProblemChartDataByApi() {
+ signageApi.getWorkshopProblemListApi(this.productionCode)
+ .then(res => {
+ if (res.success && res.result.length > 0) this.workshopProblemChartData = res.result.map(item => [item.content, item.createTime])
+ this.drawWorkshopProblemChart()
})
},
@@ -322,7 +369,7 @@
type: 'pie',
roseType: 'angle', // 鐜懓鍥�
// selectedMode: "single",
- radius: ['40%', '60%'],
+ radius: this.pieChartRadius,
center: ['53%', '50%'],
color: [
'#8B8B8B',
@@ -499,7 +546,7 @@
data: data
}],
series: [{
- name: '鍒╃敤鐜�',
+ name: 'TEEP',
type: 'bar',
zlevel: 1,
itemStyle: {
@@ -561,7 +608,7 @@
}
]
}
- 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()
@@ -636,7 +683,7 @@
{
type: 'pie',
// selectedMode: "single",
- radius: ['40%', '60%'],
+ radius: this.pieChartRadius,
center: ['50%', '60%'],
color: [
'#0FC61A',
@@ -667,6 +714,16 @@
}
this.techConditionChart.setOption(option, true)
this.techConditionChart.hideLoading()
+
+ this.techConditionChart.on('click', params => {
+ this.modalTitle = `鎶�鏈姸鎬侊紙${params.name}锛塦
+ this.modalDataApiParams = {
+ technologyStatus: this.techConditionData.find(item => item.name === params.name).technologyStatus,
+ productionCode: this.productionCode
+ }
+ this.modalDataApiUrl = '/eam/calibrationOrder/showEquipmentByTechnologyStatus'
+ this.modalVisible = true
+ })
},
/* 缁樺埗璁惧鎶ヤ慨鏁呴殰楗煎浘 */
@@ -715,7 +772,7 @@
{
type: 'pie',
// selectedMode: "single",
- radius: ['40%', '60%'],
+ radius: this.pieChartRadius,
center: ['50%', '60%'],
color: [
'#24F2F5',
@@ -746,6 +803,16 @@
}
this.warrantyMalfunctionChart.setOption(option, true)
this.warrantyMalfunctionChart.hideLoading()
+
+ this.warrantyMalfunctionChart.on('click', params => {
+ this.modalTitle = `鎶ヤ慨鏁呴殰锛�${params.name}锛塦
+ this.modalDataApiParams = {
+ isStop: this.warrantyMalfunctionData.find(item => item.name === params.name).isStop,
+ productionCode: this.productionCode
+ }
+ this.modalDataApiUrl = '/eam/calibrationOrder/showEquipmentByReportRepair'
+ this.modalVisible = true
+ })
},
/* 缁樺埗杞﹂棿淇濆吇婊氬姩琛� */
@@ -767,6 +834,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
@@ -820,11 +888,13 @@
axisLabel: {
show: true, // 鏄惁鏄剧ず鍒诲害鏍囩锛岄粯璁ゆ樉绀�
interval: 0, // 鍧愭爣杞村埢搴︽爣绛剧殑鏄剧ず闂撮殧锛屽湪绫荤洰杞翠腑鏈夋晥锛涢粯璁や細閲囩敤鏍囩涓嶉噸鍙犵殑绛栫暐闂撮殧鏄剧ず鏍囩锛涘彲浠ヨ缃垚0寮哄埗鏄剧ず鎵�鏈夋爣绛撅紱濡傛灉璁剧疆涓�1锛岃〃绀恒�庨殧涓�涓爣绛炬樉绀轰竴涓爣绛俱�忥紝濡傛灉鍊间负2锛岃〃绀洪殧涓や釜鏍囩鏄剧ず涓�涓爣绛撅紝浠ユ绫绘帹銆�
- rotate: this.barChartData.length >= 5 ? -30 : 0, // 鍒诲害鏍囩鏃嬭浆鐨勮搴︼紝鍦ㄧ被鐩酱鐨勭被鐩爣绛炬樉绀轰笉涓嬬殑鏃跺�欏彲浠ラ�氳繃鏃嬭浆闃叉鏍囩涔嬮棿閲嶅彔锛涙棆杞殑瑙掑害浠�-90搴﹀埌90搴�
+ rotate: this.barChartData.length >= 6 ? -30 : 0, // 鍒诲害鏍囩鏃嬭浆鐨勮搴︼紝鍦ㄧ被鐩酱鐨勭被鐩爣绛炬樉绀轰笉涓嬬殑鏃跺�欏彲浠ラ�氳繃鏃嬭浆闃叉鏍囩涔嬮棿閲嶅彔锛涙棆杞殑瑙掑害浠�-90搴﹀埌90搴�
inside: false, // 鍒诲害鏍囩鏄惁鏈濆唴锛岄粯璁ゆ湞澶�
+ margin: 10, // 鍒诲害鏍囩涓庤酱绾夸箣闂寸殑璺濈
formatter: value => {
return `${this.barChartData.find(item => item.productionId === value).name}`
- }
+ },
+ fontSize: 14
},
axisTick: {
show: true,
@@ -838,7 +908,8 @@
interval: yAxisInterval,
axisLabel: {
formatter: '{value}',
- color: '#fff'
+ color: '#fff',
+ fontSize: 14
},
axisTick: {
show: false
@@ -859,37 +930,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()
@@ -910,7 +986,7 @@
/* 缁樺埗鍙屾煴鍥� */
drawDoubleBarChart() {
const option = {
- color: ['#409EFF', '#0FC61A'],
+ color: ['#66DFE2', '#79CEAA'],
tooltip: {
confine: true,
formatter: function(params) {
@@ -942,7 +1018,7 @@
}
}
},
- data: ['OEE', '鍒╃敤鐜�']
+ data: ['OEE', 'TEEP']
},
xAxis: {
type: 'category',
@@ -953,7 +1029,7 @@
}
},
axisLabel: {
- fontSize: 12,
+ fontSize: 14,
color: '#fff'
},
axisTick: {
@@ -983,7 +1059,7 @@
}
},
axisLabel: {
- fontSize: 12,
+ fontSize: 14,
color: '#fff',
fontFamily: 'Bebas'
}
@@ -1000,7 +1076,7 @@
show: false
},
axisLabel: {
- fontSize: 12,
+ fontSize: 14,
formatter: '{value}%', // 鍙充晶Y杞存枃瀛楁樉绀�
fontFamily: 'Bebas',
color: '#6A93B9'
@@ -1012,11 +1088,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 ''
@@ -1031,11 +1107,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 ''
@@ -1055,29 +1131,47 @@
},
/* 缁樺埗闂婊氬姩琛� */
- drawProblemChart() {
+ drawWorkshopProblemChart() {
this.problemConfig = {
indexHeader: '搴忓彿',
- header: ['鏃堕棿', '闂鍐呭'],
+ header: ['闂鍐呭', '鏃堕棿'],
headerBGC: '#86D186',
oddRowBGC: '#7CBF7C',
evenRowBGC: '#7CBF7C',
- data: [
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂']
- ],
+ data: this.workshopProblemChartData,
index: true,
- columnWidth: [100, 300, 300],
+ columnWidth: [100, 300, 150],
align: ['center']
}
+ },
+
+ /**
+ * 鐐瑰嚮涓変繚灞曠ず鏍忓悗鎵撳紑寮圭獥
+ * @param record 鐐瑰嚮褰撳墠涓変繚淇℃伅
+ */
+ openMaintenanceModal(record) {
+ this.modalTitle = record.planTime
+ this.modalDataApiParams = {
+ productionCode: this.productionCode
+ }
+ 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()
+ })
},
/**
@@ -1085,6 +1179,7 @@
* 璋冩暣鍥捐〃灏哄浠ラ�傚簲鍒嗚鲸鐜�
*/
handleWindowResize() {
+ this.re_drawPieChart()
if (this.runningStateChart) this.runningStateChart.resize()
if (this.efficiencyChart) this.efficiencyChart.resize()
if (this.techConditionChart) this.techConditionChart.resize()
@@ -1142,6 +1237,7 @@
padding: 5px 20px;
font-size: 20px;
margin-bottom: 10px;
+ cursor: pointer;
.plan-value-container {
display: flex;
--
Gitblit v1.9.3