From 28b621811f9ecc67709410355225ac418e5846c5 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 10 六月 2025 17:40:19 +0800
Subject: [PATCH] 人员修改
---
src/views/dashboard/WorkshopSectionSignage.vue | 660 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 508 insertions(+), 152 deletions(-)
diff --git a/src/views/dashboard/WorkshopSectionSignage.vue b/src/views/dashboard/WorkshopSectionSignage.vue
index e5bf1e1..7523ffb 100644
--- a/src/views/dashboard/WorkshopSectionSignage.vue
+++ b/src/views/dashboard/WorkshopSectionSignage.vue
@@ -14,45 +14,11 @@
<dv-decoration-11 style="width:45%;height:60px;color: #fff;font-size: 20px;align-self: flex-start">涓変繚璁″垝
</dv-decoration-11>
<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:#FCAA29">
- <div>寤舵湡</div>
- <div class="plan-value-container">
- <div class="plan-value">{{maintenanceExtensionNum}}</div>
- <div>鍙�</div>
- </div>
- </div>
- <div class="support-plan-item" style="background:#F56C6C">
- <div>瓒呮湡</div>
- <div class="plan-value-container">
- <div class="plan-value">{{maintenanceOverdueNum}}</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>
@@ -73,19 +39,21 @@
<div style="width: 38%" class="middle-col">
<dv-border-box-9 style="padding: 15px">
<div id="running_state_chart" style="width:100%;height: 400px;"></div>
- <div id="line_chart" style="width:100%;height: 400px;"></div>
+ <div id="first7DaysEfficiency_chart" style="width:100%;height: 400px;"></div>
</dv-border-box-9>
</div>
<div style="width: 30%" class="right-col">
<dv-border-box-9 style="padding: 15px">
<a-form layout="inline"
- @keyup.enter.native="$emit('switchToNextSignage', { signageName: 'Equipment', productionCode: equipmentId })">
+ @keyup.enter.native="switchToEquipmentSignage">
<a-form-item label="璁惧缂栧彿">
<a-auto-complete
- v-model="equipmentId"
+ @select="handleSelectChange"
placeholder="鍥炶溅閿煡璇�"
:allowClear="true"
+ :filter-option="filterOption"
+ :dataSource="first7DaysEfficiencyData.mdcEquipmentList.map(item=>item.equipmentId)"
size="large"
/>
</a-form-item>
@@ -100,15 +68,21 @@
</dv-border-box-9>
</div>
</div>
+
+ <SignageModal :modalVisible="modalVisible" :modalTitle=modalTitle :modalDataApiUrl="modalDataApiUrl"
+ :modalDataApiParams="modalDataApiParams"
+ @closeModal="modalVisible=false"/>
</div>
</template>
<script>
import signageApi from '@/api/signage'
import moment from 'moment'
+ import SignageModal from './modules/SignageModal'
export default {
name: 'WorkshopSectionSignage',
+ components: { SignageModal },
props: {
productionCode: {
type: String,
@@ -120,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: '鎶ヨ' },
@@ -128,16 +107,58 @@
{ 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: '鍋滄満' },
{ value: '0', name: '杩愯' }
+ ],
+ supportPlanList: [
+ {
+ planTime: '鏈湀涓変繚璁″垝',
+ planValueLabel: 'thisMonthMaintenancePlanNum',
+ backgroundColor: '#5FE0AF',
+ apiUrl: '/eam/calibrationOrder/showThisMonthMaintenanceList'
+ },
+
+ {
+ planTime: '鏈湀瀹屾垚閲�',
+ planValueLabel: 'thisMonthMaintenanceRealNum',
+ backgroundColor: '#409EFF',
+ apiUrl: '/eam/calibrationOrder/showThisMonthMaintenanceFinishList'
+ },
+ {
+ planTime: '寤舵湡',
+ planValueLabel: 'maintenanceExtensionNum',
+ backgroundColor: '#FCAA29',
+ apiUrl: '/eam/calibrationOrder/show3MaintenancePostponeList'
+ },
+
+ {
+ planTime: '瓒呮湡',
+ planValueLabel: 'maintenanceOverdueNum',
+ backgroundColor: '#F56C6C',
+ apiUrl: '/eam/calibrationOrder/show3MaintenanceOverdueList'
+ },
+ {
+ planTime: '涓嬫湀璁″垝',
+ planValueLabel: 'nextMonthMaintenancePlanNum',
+ backgroundColor: '#D6BC52',
+ apiUrl: '/eam/calibrationOrder/showNextMonthMaintenanceList'
+ },
+ {
+ planTime: '涓嬩笅鏈堣鍒�',
+ planValueLabel: 'nextNextMonthMaintenancePlanNum',
+ backgroundColor: '#58D9F9',
+ apiUrl: '/eam/calibrationOrder/showNextNextMonthMaintenanceList'
+ }
],
thisMonthMaintenancePlanNum: 0,
thisMonthMaintenanceRealNum: 0,
@@ -145,67 +166,96 @@
maintenanceOverdueNum: 0,
nextMonthMaintenancePlanNum: 0,
nextNextMonthMaintenancePlanNum: 0,
- lineChart: '',
- lineChartData: {},
+ first7DaysEfficiencyChart: '',
+ first7DaysEfficiencyData: {
+ dataList: [],
+ mdcEquipmentList: []
+ },
gaugeChart1: '',
gaugeChart2: '',
gaugeChart3: '',
gaugeChart4: '',
- gaugeChartData1: [],
- gaugeChartData2: [],
- gaugeChartData3: [],
- gaugeChartData4: [],
+ gaugeChartData: {
+ utilizationRate: 0,
+ startRate: 0,
+ openRate: 0,
+ overallEquipmentEfficiency: 0
+ },
barChart: '',
barChartData: [],
- equipmentId: ''
+ equipmentId: '',
+ modalVisible: false,
+ modalTitle: '',
+ modalDataApiUrl: '',
+ modalTableColumns: [],
+ modalDataApiParams: {}
}
},
mounted() {
+ this.firstEnterClientWidth = document.body.clientWidth || document.documentElement.clientWidth
window.addEventListener('resize', this.handleWindowResize)
- this.drawCharts()
this.getChartDataByApi()
},
beforeDestroy() {
window.removeEventListener('resize', this.handleWindowResize)
if (this.barChartCarouselTime) clearInterval(this.barChartCarouselTime)
+ if (this.first7DaysEfficiencyChartCarouselTime) clearInterval(this.first7DaysEfficiencyChartCarouselTime)
},
methods: {
+ /* 璋冪敤鎺ュ彛鑾峰彇鍥捐〃鏁版嵁姹囨�绘柟娉� */
getChartDataByApi() {
this.getTechConditionDataByApi()
this.getWarrantyMalfunctionDataByApi()
this.getRunningStateDataByApi()
this.getMonthMaintenanceNumByApi()
- this.getLineChartDataByApi()
+ this.getFirst7DaysEfficiencyDataByApi()
+ this.getGaugeChartDataByApi()
this.getBarChartDataByApi()
},
/* 璋冪敤鎺ュ彛鑾峰彇鎶�鏈姸鎬� */
getTechConditionDataByApi() {
+ this.techConditionChart = this.$echarts.init(document.getElementById('tech_condition_chart'))
+ this.techConditionChart.showLoading({
+ text: '鏁版嵁鍔犺浇涓� ...',
+ color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
+ textColor: '#fff',
+ maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ })
signageApi.getEquipmentTechnologyStatusListApi(this.productionCode)
.then(res => {
- if (res.success) {
+ 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()
})
},
/* 璋冪敤鎺ュ彛鑾峰彇璁惧鎶ヤ慨鏁呴殰 */
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)' // 閬僵灞�
+ })
signageApi.getReportRepairEquipmentListApi(this.productionCode)
.then(res => {
- if (res.success) {
+ 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()
})
},
@@ -231,50 +281,105 @@
/* 璋冪敤鎺ュ彛鑾峰彇璁惧杩愯鐘舵�� */
getRunningStateDataByApi() {
+ this.runningStateChart = this.$echarts.init(document.getElementById('running_state_chart'))
+ this.runningStateChart.showLoading({
+ text: '鏁版嵁鍔犺浇涓� ...',
+ color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
+ textColor: '#fff',
+ maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ })
signageApi.getEquipmentStatusStatisticsApi(this.productionCode)
.then(res => {
- if (res.success) this.runningStateData = res.result.list
- this.drawRunningStateChart(res.result.producitonId)
+ if (res.success) {
+ this.runningStateData = res.result.list
+ this.currentPageProductionId = res.result.productionId
+ this.runningStateChartDataRequireFinished = true
+ this.drawRunningStateChart(res.result.productionId)
+ }
})
},
/* 璋冪敤鎺ュ彛鑾峰彇鍓�7澶╁埄鐢ㄧ巼 */
- getLineChartDataByApi() {
+ getFirst7DaysEfficiencyDataByApi() {
+ this.first7DaysEfficiencyChart = this.$echarts.init(document.getElementById('first7DaysEfficiency_chart'))
+ this.first7DaysEfficiencyChart.showLoading({
+ text: '鏁版嵁鍔犺浇涓� ...',
+ color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
+ textColor: '#fff',
+ maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ })
signageApi.getEquipmentDayUtilizationStatisticsApi(this.productionCode)
.then(res => {
- if (res.success) this.lineChartData = res.result
- this.drawLineChart()
+ if (res.success) {
+ this.first7DaysEfficiencyData = res.result
+ this.drawFirst7DaysEfficiencyDataChart()
+ }
})
},
+ /* 璋冪敤鎺ュ彛鑾峰彇璁惧鏁堢巼缁熻 */
+ getGaugeChartDataByApi() {
+ this.gaugeChart1 = this.$echarts.init(document.getElementById('gauge_chart1'))
+ this.gaugeChart2 = this.$echarts.init(document.getElementById('gauge_chart2'))
+ this.gaugeChart3 = this.$echarts.init(document.getElementById('gauge_chart3'))
+ this.gaugeChart4 = this.$echarts.init(document.getElementById('gauge_chart4'))
+ this.gaugeChart1.showLoading({
+ text: '鏁版嵁鍔犺浇涓� ...',
+ color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
+ textColor: '#fff',
+ maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ })
+ this.gaugeChart2.showLoading({
+ text: '鏁版嵁鍔犺浇涓� ...',
+ color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
+ textColor: '#fff',
+ maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ })
+ this.gaugeChart3.showLoading({
+ text: '鏁版嵁鍔犺浇涓� ...',
+ color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
+ textColor: '#fff',
+ maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ })
+ this.gaugeChart4.showLoading({
+ text: '鏁版嵁鍔犺浇涓� ...',
+ color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
+ textColor: '#fff',
+ maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ })
+ signageApi.getEquipmentEfficiencyStatisticsApi(this.productionCode)
+ .then(res => {
+ if (res.success) this.gaugeChartData = res.result
+ this.drawGaugeChart()
+ })
+ },
+
+ /* 璋冪敤鎺ュ彛鑾峰彇涓婃湀OEE */
getBarChartDataByApi() {
+ this.barChart = this.$echarts.init(document.getElementById('bar_chart'))
+ this.barChart.showLoading({
+ text: '鏁版嵁鍔犺浇涓� ...',
+ color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
+ textColor: '#fff',
+ maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ })
signageApi.getEquipmentOEEMonthStatisticsApi(this.productionCode)
.then(res => {
- console.log('res=', 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()
- })
- },
- /* 缁樺埗鍥捐〃姹囨�绘柟娉� */
- drawCharts() {
- this.drawRunningStateChart()
- this.drawTechConditionChart()
- this.drawWarrantyMalfunctionChart()
- this.drawGaugeChart()
- this.drawBarChart()
+ })
},
/* 缁樺埗鎶�鏈姸鎬侀ゼ鍥� */
drawTechConditionChart() {
- this.techConditionChart = this.$echarts.init(document.getElementById('tech_condition_chart'))
const option = {
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
@@ -318,11 +423,11 @@
{
type: 'pie',
// selectedMode: "single",
- radius: ['40%', '60%'],
+ radius: this.pieChartRadius,
center: ['50%', '50%'],
color: [
'#0FC61A',
- '#0DAF15',
+ '#F56436',
'#8B8B8B'
],
label: {
@@ -348,11 +453,21 @@
]
}
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
+ })
},
/* 缁樺埗璁惧鎶ヤ慨鏁呴殰楗煎浘 */
drawWarrantyMalfunctionChart() {
- this.warrantyMalfunctionChart = this.$echarts.init(document.getElementById('warranty_malfunction_chart'))
const option = {
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
@@ -396,7 +511,7 @@
{
type: 'pie',
// selectedMode: "single",
- radius: ['40%', '60%'],
+ radius: this.pieChartRadius,
center: ['50%', '50%'],
color: [
'#24F2F5',
@@ -426,11 +541,21 @@
]
}
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
+ })
},
/* 缁樺埗璁惧杩愯鐘舵�佺帿鐟伴ゼ鍥� */
drawRunningStateChart(productionId) {
- this.runningStateChart = this.$echarts.init(document.getElementById('running_state_chart'))
const option = {
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
@@ -475,7 +600,7 @@
type: 'pie',
roseType: 'angle', // 鐜懓鍥�
// selectedMode: "single",
- radius: ['35%', '55%'],
+ radius: this.pieChartRadius,
center: ['50%', '50%'],
color: [
'#8B8B8B',
@@ -506,6 +631,7 @@
]
}
this.runningStateChart.setOption(option, true)
+ this.runningStateChart.hideLoading()
this.runningStateChart.on('click', params => {
this.$router.push({
@@ -515,42 +641,58 @@
})
},
- /* 缁樺埗鎶樼嚎鍥� */
- drawLineChart() {
- this.lineChart = this.$echarts.init(document.getElementById('line_chart'))
+ /* 缁樺埗鍓�7澶╁埄鐢ㄧ巼鏌卞浘 */
+ drawFirst7DaysEfficiencyDataChart() {
+ this.first7DaysEfficiencyData.mdcEquipmentList.forEach(item => {
+ if (!this.first7DaysEfficiencyData.dataList.map(item => item.equipmentId).includes(item)) {
+ const equipmentIdObj = {
+ equipmentId: item.equipmentId,
+ equipmentName: item.equipmentName,
+ openRate: 0,
+ startRate: 0,
+ utilizationRate: 0
+ }
+ this.first7DaysEfficiencyData.dataList.push(equipmentIdObj)
+ }
+ })
+ const equipmentIdList = this.first7DaysEfficiencyData.dataList.map(item => item.equipmentId)
const newData = {
- xAxis: this.lineChartData.dateList,
+ xAxis: equipmentIdList,
yAxis: [
{
- name: '鍒╃敤鐜�',
- value: this.lineChartData.dataList.map(item => item.utilizationRate)
+ name: 'TEEP',
+ value: this.first7DaysEfficiencyData.dataList.map(item => item.utilizationRate)
},
{
name: '寮�鍔ㄧ巼',
- value: this.lineChartData.dataList.map(item => item.startRate)
+ value: this.first7DaysEfficiencyData.dataList.map(item => item.startRate)
},
{
name: '寮�鏈虹巼',
- value: this.lineChartData.dataList.map(item => item.openRate)
+ 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 {
name: item1.name,
- type: 'line',
+ type: 'bar',
symbol: 'circle',
symbolSize: 8,
itemStyle: {
- color: colorArr[index1]
+ color: colorArr[index1],
+ barBorderRadius: 100
},
lineStyle: {
width: 2
+ },
+ markPoint: {
+ show: true
},
yAxisIndex: 1,
data: item1.value // 鎶樼嚎鍥剧殑鏁版嵁
@@ -592,12 +734,11 @@
}
},
xAxis: {
- triggerEvent: true,
data: newData.xAxis || [],
axisLabel: {
interval: 0,
show: true,
- fontSize: 12,
+ fontSize: 14,
color: '#fff'
// rotate: -30,
},
@@ -643,9 +784,11 @@
type: 'value',
position: 'right',
splitNumber: 5,
+ max: 100,
axisLabel: {
show: true,
- color: '#fff'
+ color: '#fff',
+ fontSize: 14
},
axisLine: {
show: true,
@@ -664,14 +807,46 @@
}
}
],
- series: seriesData
- // dataZoom: {
- // show: false,
- // startValue: 0, // 浠庡ご寮�濮嬨��
- // endValue: 5 // 涓�娆℃�у睍绀哄嚑涓�
+ series: seriesData,
+ dataZoom: {
+ show: false,
+ startValue: 0, // 浠庡ご寮�濮嬨��
+ endValue: 6 // 涓�娆℃�у睍绀哄嚑涓�
+ }
+ // toolbox: {
+ // show: true,
+ // feature: {
+ // mark: { show: true },
+ // magicType: { show: true, type: ['line', 'bar'] },
+ // restore: { show: true },
+ // saveAsImage: { show: true, name: '鍓�7澶╁埄鐢ㄧ巼缁熻鍥�', pixelRatio: 1 }
+ // }
// }
}
- this.lineChart.setOption(option, true)
+ this.first7DaysEfficiencyChart.setOption(option, true)
+ this.first7DaysEfficiencyChart.hideLoading()
+
+ this.first7DaysEfficiencyChart.on('click', params => {
+ this.$router.push({
+ name: 'mdc-base-StatisticsChart',
+ params: {
+ isEquipment: true,
+ productionId: params.name,
+ tierName: this.first7DaysEfficiencyData.dataList.find(item => item.equipmentId === params.name).equipmentName
+ }
+ })
+ })
+
+
+ // 璁惧鍒楄〃澶т簬7涓椂寮�鍚嚜鍔ㄨ疆鎾�
+ if (this.first7DaysEfficiencyData.mdcEquipmentList.length <= 7) return
+ this.first7DaysEfficiencyChartCarouselTime = setInterval(() => {
+ newData.xAxis.push(newData.xAxis.shift())
+ newData.yAxis.forEach(item => item.value.push(item.value.shift()))
+ this.$nextTick(() => {
+ this.first7DaysEfficiencyChart.setOption(option, true)
+ })
+ }, 30000)
},
/* 缁樺埗浠〃鐩樺浘琛� */
@@ -686,11 +861,11 @@
// 涓绘爣棰樻枃鏈牱寮�
fontSize: 18,
fontWeight: 'normal',
- color: '#1AD8DE',
- fontWeight: 'bold'
+ color: '#1AD8DE'
}
},
tooltip: {
+ trigger: 'item',
formatter: params => {
return params.seriesName + '锛�' + params.value + '%'
}
@@ -740,8 +915,8 @@
lineStyle: { // 灞炴�ineStyle鎺у埗绾挎潯鏍峰紡
color: [ //琛ㄧ洏棰滆壊
[0.3, '#F56436'],//0-30%澶勭殑棰滆壊
- [0.7, '#FFFF40'],//30%-60%澶勭殑棰滆壊
- [1, '#0FC61A']//90%-100%澶勭殑棰滆壊
+ [0.6, '#FFFF40'],//30%-60%澶勭殑棰滆壊
+ [1, '#0FC61A']//60%-100%澶勭殑棰滆壊
],
width: 15//琛ㄧ洏瀹藉害
}
@@ -768,47 +943,147 @@
/* 缁樺埗鍒╃敤鐜囦华琛ㄧ洏鍥捐〃 */
drawGaugeChart1(opt) {
- this.gaugeChart1 = this.$echarts.init(document.getElementById('gauge_chart1'))
const option = Object.assign({}, opt)
- option.title.text = '鍒╃敤鐜�'
- option.series[0].name = '鍒╃敤鐜�'
- option.series[0].data = [52]
- this.gaugeChart1.setOption(option, true)
+
+ signageApi.getGaugeColorByTypeApi('lyl')
+ .then(res => {
+ if (res.success) {
+ const colorRange = res.result.map(item => item = [+item.maximumRange / 100, item.rateParameterColor])
+ option.series[0].axisLine.lineStyle.color = colorRange
+ }
+ })
+ .finally(() => {
+ 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()
+ })
+
+
+ this.gaugeChart1.getZr().on('click', params => {
+ // 浠呮湁鐐瑰嚮琛ㄧ洏鍖哄煙鎵嶄細鏈変互涓嬪睘鎬э紝topTarget琛ㄧず瑙﹀彂浜嬩欢瀵硅薄锛宻hape琛ㄧず瑙﹀彂浜嬩欢瀵硅薄鐨勫浘鍍忓睘鎬э紝clockwise琛ㄧず琛ㄧ洏鏄惁浠ラ『鏃堕拡鎺掑垪锛岄粯璁や负true
+ if (params.topTarget && params.topTarget.shape && params.topTarget.shape.clockwise !== undefined) {
+ this.$router.push({
+ name: 'mdc-base-StatisticsChart',
+ params: {
+ isEquipment: false,
+ productionId: this.gaugeChartData.productionId,
+ tierName: this.gaugeChartData.productionName
+ }
+ })
+ }
+ })
},
/* 缁樺埗寮�鍔ㄧ巼浠〃鐩樺浘琛� */
drawGaugeChart2(opt) {
- this.gaugeChart2 = this.$echarts.init(document.getElementById('gauge_chart2'))
const option = Object.assign({}, opt)
- option.title.text = '寮�鍔ㄧ巼'
- option.series[0].name = '寮�鍔ㄧ巼'
- option.series[0].data = [21]
- this.gaugeChart2.setOption(option, true)
+
+ signageApi.getGaugeColorByTypeApi('kdl')
+ .then(res => {
+ if (res.success) {
+ const colorRange = res.result.map(item => item = [+item.maximumRange / 100, item.rateParameterColor])
+ option.series[0].axisLine.lineStyle.color = colorRange
+ }
+ })
+ .finally(() => {
+ option.title.text = moment().subtract(1, 'days').format('M鏈圖鏃�') + '寮�鍔ㄧ巼'
+ option.series[0].name = '寮�鍔ㄧ巼'
+ option.series[0].data = [this.gaugeChartData.startRate]
+ this.gaugeChart2.setOption(option, true)
+ this.gaugeChart2.hideLoading()
+ })
+
+ this.gaugeChart2.getZr().on('click', params => {
+ // 浠呮湁鐐瑰嚮琛ㄧ洏鍖哄煙鎵嶄細鏈変互涓嬪睘鎬э紝topTarget琛ㄧず瑙﹀彂浜嬩欢瀵硅薄锛宻hape琛ㄧず瑙﹀彂浜嬩欢瀵硅薄鐨勫浘鍍忓睘鎬э紝clockwise琛ㄧず琛ㄧ洏鏄惁浠ラ『鏃堕拡鎺掑垪锛岄粯璁や负true
+ if (params.topTarget && params.topTarget.shape && params.topTarget.shape.clockwise !== undefined) {
+ this.$router.push({
+ name: 'mdc-base-StatisticsChart',
+ params: {
+ isEquipment: false,
+ productionId: this.gaugeChartData.productionId,
+ tierName: this.gaugeChartData.productionName
+ }
+ })
+ }
+ })
},
/* 缁樺埗寮�鏈虹巼浠〃鐩樺浘琛� */
drawGaugeChart3(opt) {
- this.gaugeChart3 = this.$echarts.init(document.getElementById('gauge_chart3'))
const option = Object.assign({}, opt)
- option.title.text = '寮�鏈虹巼'
- option.series[0].name = '寮�鏈虹巼'
- option.series[0].data = [74]
- this.gaugeChart3.setOption(option, true)
+
+ signageApi.getGaugeColorByTypeApi('kdl')
+ .then(res => {
+ if (res.success) {
+ const colorRange = res.result.map(item => item = [+item.maximumRange / 100, item.rateParameterColor])
+ option.series[0].axisLine.lineStyle.color = colorRange
+ }
+ })
+ .finally(() => {
+ option.title.text = moment().subtract(1, 'days').format('M鏈圖鏃�') + '寮�鏈虹巼'
+ option.series[0].name = '寮�鏈虹巼'
+ option.series[0].data = [this.gaugeChartData.openRate]
+ this.gaugeChart3.setOption(option, true)
+ this.gaugeChart3.hideLoading()
+ })
+
+ this.gaugeChart3.getZr().on('click', params => {
+ // 浠呮湁鐐瑰嚮琛ㄧ洏鍖哄煙鎵嶄細鏈変互涓嬪睘鎬э紝topTarget琛ㄧず瑙﹀彂浜嬩欢瀵硅薄锛宻hape琛ㄧず瑙﹀彂浜嬩欢瀵硅薄鐨勫浘鍍忓睘鎬э紝clockwise琛ㄧず琛ㄧ洏鏄惁浠ラ『鏃堕拡鎺掑垪锛岄粯璁や负true
+ if (params.topTarget && params.topTarget.shape && params.topTarget.shape.clockwise !== undefined) {
+ this.$router.push({
+ name: 'mdc-base-StatisticsChart',
+ params: {
+ isEquipment: false,
+ productionId: this.gaugeChartData.productionId,
+ tierName: this.gaugeChartData.productionName
+ }
+ })
+ }
+ })
},
/* 缁樺埗OEE浠〃鐩樺浘琛� */
drawGaugeChart4(opt) {
- this.gaugeChart4 = this.$echarts.init(document.getElementById('gauge_chart4'))
const option = Object.assign({}, opt)
- option.title.text = 'OEE'
- option.series[0].name = 'OEE'
- option.series[0].data = [88]
- this.gaugeChart4.setOption(option, true)
+
+ signageApi.getGaugeColorByTypeApi('lyl')
+ .then(res => {
+ if (res.success) {
+ const colorRange = res.result.map(item => item = [+item.maximumRange / 100, item.rateParameterColor])
+ option.series[0].axisLine.lineStyle.color = colorRange
+ }
+ })
+ .finally(() => {
+ option.title.text = moment().subtract(1, 'months').format('M鏈�') + `OEE`
+ option.series[0].name = 'OEE'
+ option.series[0].data = [this.gaugeChartData.overallEquipmentEfficiency]
+ this.gaugeChart4.setOption(option, true)
+ this.gaugeChart4.hideLoading()
+ })
+
+ this.gaugeChart4.getZr().on('click', params => {
+ // 浠呮湁鐐瑰嚮琛ㄧ洏鍖哄煙鎵嶄細鏈変互涓嬪睘鎬э紝topTarget琛ㄧず瑙﹀彂浜嬩欢瀵硅薄锛宻hape琛ㄧず瑙﹀彂浜嬩欢瀵硅薄鐨勫浘鍍忓睘鎬э紝clockwise琛ㄧず琛ㄧ洏鏄惁浠ラ『鏃堕拡鎺掑垪锛岄粯璁や负true
+ if (params.topTarget && params.topTarget.shape && params.topTarget.shape.clockwise !== undefined) {
+ this.$router.push({
+ name: 'mdc-base-OEEAnalysis',
+ params: { isEquipment: false, productionId: this.gaugeChartData.productionId }
+ })
+ }
+ })
},
/* 缁樺埗鍗曟煴鍥� */
drawBarChart() {
- this.barChart = this.$echarts.init(document.getElementById('bar_chart'))
+ 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,
@@ -821,8 +1096,7 @@
// 涓绘爣棰樻枃鏈牱寮�
fontSize: 18,
fontWeight: 'normal',
- color: '#1AD8DE',
- fontWeight: 'bold'
+ color: '#1AD8DE'
}
},
tooltip: {
@@ -830,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: {
@@ -859,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,
@@ -868,13 +1143,15 @@
}],
yAxis: [
{
- // name: '鏁伴噺',
- // nameLocation: 'middle',
- // nameGap: 30, // x杞磏ame涓庢í鍧愭爣杞寸嚎鐨勯棿璺�
+ name: '%',
+ min: 0,
+ max: yAxisMax,
+ interval: yAxisInterval,
position: 'left',
axisLabel: {
formatter: '{value}',
- color: '#fff'
+ color: '#fff',
+ fontSize: 14
},
axisTick: {
show: true
@@ -905,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,
@@ -922,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, // 浠庡ご寮�濮嬨��
@@ -932,14 +1224,74 @@
}
option.title.text = `${moment().subtract(1, 'months').format('M')}鏈圤EE`
this.barChart.setOption(option, true)
+ this.barChart.hideLoading()
+
+ this.barChart.on('click', params => {
+ const productionId = params.name
+ this.$router.push({
+ name: 'mdc-base-OEEAnalysis',
+ params: { isEquipment: true, productionId }
+ })
+ })
+
+ // 璁惧鍒楄〃澶т簬6涓椂寮�鍚嚜鍔ㄨ疆鎾�
if (this.barChartData.length <= 6) return
this.barChartCarouselTime = setInterval(() => {
this.barChartData.push(this.barChartData.shift())
xAisData.push(xAisData.shift())
+ colorArray.push(colorArray.shift())
this.$nextTick(() => {
this.barChart.setOption(option, true)
})
}, 3000)
+ },
+
+ handleSelectChange(value) {
+ this.equipmentId = value
+ },
+
+ filterOption(input, option) {
+ return (
+ option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ )
+ },
+
+ switchToEquipmentSignage() {
+ if (this.equipmentId) {
+ this.$emit('switchToNextSignage', {
+ signageName: 'Equipment',
+ productionCode: this.equipmentId
+ })
+ }
+ },
+
+ /**
+ * 鐐瑰嚮涓変繚灞曠ず鏍忓悗鎵撳紑寮圭獥
+ * @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()
+ })
},
/**
@@ -947,15 +1299,14 @@
* 璋冩暣鍥捐〃灏哄浠ラ�傚簲鍒嗚鲸鐜�
*/
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.runningStateChart) this.runningStateChart.resize()
- if (this.lineChart) this.lineChart.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.first7DaysEfficiencyChart) this.first7DaysEfficiencyChart.resize()
if (this.barChart) this.barChart.resize()
+ if (this.doubleBarChart) this.doubleBarChart.resize()
}
}
}
@@ -991,6 +1342,7 @@
width: 30%;
padding: 5px 10px;
margin-bottom: 10px;
+ cursor: pointer;
.plan-value-container {
display: flex;
@@ -1035,6 +1387,10 @@
color: #fff;
}
+ /deep/ .ant-select {
+ color: #fff;
+ }
+
/deep/ .ant-input {
border: 1px solid #689ACA;
color: #fff;
--
Gitblit v1.9.3