From d6803b83a827a62fa29737c31104c3ee9bc194d8 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 08 四月 2024 10:18:41 +0800
Subject: [PATCH] 1、全局菜单栏新增点击父级菜单标题后在导航栏展开父级所有下一级菜单功能 2、登录页面按照新需求调整整体布局及样式 3、优化首页看板页面图表视图
---
src/views/dashboard/WorkshopSectionSignage.vue | 766 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 413 insertions(+), 353 deletions(-)
diff --git a/src/views/dashboard/WorkshopSectionSignage.vue b/src/views/dashboard/WorkshopSectionSignage.vue
index be246d0..e5bf1e1 100644
--- a/src/views/dashboard/WorkshopSectionSignage.vue
+++ b/src/views/dashboard/WorkshopSectionSignage.vue
@@ -2,16 +2,19 @@
<div class="page-container">
<div class="content-container">
<div style="width: 30%" class="left-col">
- <slot name="back_nav"></slot>
- <dv-border-box-9 style="padding: 15px">
- <div id="tech_condition_chart" style="width:100%;height: 230px;"></div>
- <div id="warranty_malfunction_chart" style="width:100%;height: 230px;"></div>
- <div style="display: flex;">
+ <div class="back-nav" @click="$emit('backToLastSignage','BranchFactory')" v-if="userType>=3">
+ <dv-decoration-7>涓婁竴绾�</dv-decoration-7>
+ </div>
- <div style="flex:0.5;display: flex;flex-direction:column;align-items: center">
- <dv-decoration-11 style="width:90%;height:60px;color: #ccc;font-size: 20px">涓変繚璁″垝</dv-decoration-11>
+ <dv-border-box-9 style="padding: 15px 15px 0">
+ <div id="tech_condition_chart" style="width:100%;height: 240px;"></div>
+ <div id="warranty_malfunction_chart" style="width:100%;height: 240px;"></div>
+ <div>
+ <div style="display: flex;flex-direction:column;align-items: center">
+ <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:#67C23A">
+ <div class="support-plan-item" style="background:#5FE0AF">
<div>涓変繚鏈湀璁″垝</div>
<div class="plan-value-container">
<div class="plan-value">{{thisMonthMaintenancePlanNum}}</div>
@@ -25,24 +28,24 @@
<div>鍙�</div>
</div>
</div>
- <div class="support-plan-item" style="background:#E6A23C">
+ <div class="support-plan-item" style="background:#FCAA29">
<div>寤舵湡</div>
<div class="plan-value-container">
- <div class="plan-value">{{nextMonthMaintenancePlanNum}}</div>
+ <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">{{nextNextMonthMaintenancePlanNum}}</div>
+ <div class="plan-value">{{maintenanceOverdueNum}}</div>
<div>鍙�</div>
</div>
</div>
- <div class="support-plan-item" style="background:#719D8E">
+ <div class="support-plan-item" style="background:#D6BC52">
<div>涓嬫湀璁″垝</div>
<div class="plan-value-container">
- <div class="plan-value">{{nextNextMonthMaintenancePlanNum}}</div>
+ <div class="plan-value">{{nextMonthMaintenancePlanNum}}</div>
<div>鍙�</div>
</div>
</div>
@@ -56,8 +59,12 @@
</div>
</div>
- <div style="flex:0.5;display: flex;justify-content: center">
- <dv-decoration-11 style="width:90%;height:60px;color: #ccc;font-size: 20px">浜屼繚璁″垝</dv-decoration-11>
+ <div style="display: flex;margin-top: 10px;justify-content: space-between;align-items: center;">
+ <dv-decoration-11 style="width:45%;height:60px;font-size: 20px;color: #fff">浜屼繚璁″垝</dv-decoration-11>
+ <div
+ style="flex:1;text-align:center;font-size: 25px;color: #9BD890;overflow: hidden;text-overflow: ellipsis;white-space: nowrap">
+ 2024骞�4鏈�1鏃ュぇ淇�
+ </div>
</div>
</div>
</dv-border-box-9>
@@ -69,13 +76,27 @@
<div id="line_chart" style="width:100%;height: 400px;"></div>
</dv-border-box-9>
</div>
- <div style="width: 30%">
- <dv-border-box-9 style="padding: 30px 0">
- <div id="bar_chart" style="width:100%;height: 250px;"></div>
- <div id="double_bar_chart" style="width:100%;height: 300px;"></div>
- <div style="padding: 0 20px;">
- <dv-scroll-board :config="problemConfig" style="width:100%;height:220px"/>
+
+ <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 })">
+ <a-form-item label="璁惧缂栧彿">
+ <a-auto-complete
+ v-model="equipmentId"
+ placeholder="鍥炶溅閿煡璇�"
+ :allowClear="true"
+ size="large"
+ />
+ </a-form-item>
+ </a-form>
+ <div style="display: flex;flex-wrap: wrap">
+ <div id="gauge_chart1" class="gauge-chart"></div>
+ <div id="gauge_chart2" class="gauge-chart"></div>
+ <div id="gauge_chart3" class="gauge-chart"></div>
+ <div id="gauge_chart4" class="gauge-chart"></div>
</div>
+ <div id="bar_chart" style="width:100%;height: 330px;"></div>
</dv-border-box-9>
</div>
</div>
@@ -84,6 +105,7 @@
<script>
import signageApi from '@/api/signage'
+ import moment from 'moment'
export default {
name: 'WorkshopSectionSignage',
@@ -91,6 +113,9 @@
productionCode: {
type: String,
default: ''
+ },
+ userType: {
+ type: Number
}
},
data() {
@@ -116,38 +141,23 @@
],
thisMonthMaintenancePlanNum: 0,
thisMonthMaintenanceRealNum: 0,
+ maintenanceExtensionNum: 0,
+ maintenanceOverdueNum: 0,
nextMonthMaintenancePlanNum: 0,
nextNextMonthMaintenancePlanNum: 0,
lineChart: '',
- lineChartData: [],
+ lineChartData: {},
+ gaugeChart1: '',
+ gaugeChart2: '',
+ gaugeChart3: '',
+ gaugeChart4: '',
+ gaugeChartData1: [],
+ gaugeChartData2: [],
+ gaugeChartData3: [],
+ gaugeChartData4: [],
barChart: '',
barChartData: [],
- doubleBarChart: '',
- doubleBarChartData: {},
- supportPlanList: [
- {
- label: '鏈湀涓変繚璁″垝',
- value: 299,
- background: '#719D8E'
- },
- {
- label: '鏈湀瀹屾垚',
- value: 229,
- background: '#409EFF'
- },
- {
- label: '涓嬫湀涓変繚璁″垝',
- value: 319,
- background: '#A8985D'
- },
- {
- label: '涓嬩笅鏈堜笁淇濊鍒�',
- value: 329,
- background: '#58D9F9'
- }
- ],
- maintenanceConfig: {},
- problemConfig: {}
+ equipmentId: ''
}
},
mounted() {
@@ -155,25 +165,18 @@
this.drawCharts()
this.getChartDataByApi()
},
- activated() {
- console.log('瑙﹀彂activated')
- this.handleWindowResize()
- },
beforeDestroy() {
window.removeEventListener('resize', this.handleWindowResize)
+ if (this.barChartCarouselTime) clearInterval(this.barChartCarouselTime)
},
methods: {
- backToLastSignage() {
- console.log('瑙﹀彂涓婁竴绾�')
- },
-
getChartDataByApi() {
this.getTechConditionDataByApi()
this.getWarrantyMalfunctionDataByApi()
this.getRunningStateDataByApi()
this.getMonthMaintenanceNumByApi()
+ this.getLineChartDataByApi()
this.getBarChartDataByApi()
- this.getDoubleBarChartDataByApi()
},
/* 璋冪敤鎺ュ彛鑾峰彇鎶�鏈姸鎬� */
@@ -206,15 +209,6 @@
})
},
- /* 璋冪敤鎺ュ彛鑾峰彇璁惧杩愯鐘舵�� */
- getRunningStateDataByApi() {
- signageApi.getEquipmentStatusStatisticsApi(this.productionCode)
- .then(res => {
- if (res.success) this.runningStateData = res.result
- this.drawRunningStateChart()
- })
- },
-
/* 璋冪敤鎺ュ彛鑾峰彇涓変繚璁″垝 */
getMonthMaintenanceNumByApi() {
signageApi.getThisMonthMaintenanceListApi(this.productionCode)
@@ -235,21 +229,37 @@
})
},
- /* 璋冪敤鎺ュ彛鑾峰彇璁惧OEE缁熻 */
- getBarChartDataByApi() {
- signageApi.getEquipmentOEEStatistics(this.productionCode)
+ /* 璋冪敤鎺ュ彛鑾峰彇璁惧杩愯鐘舵�� */
+ getRunningStateDataByApi() {
+ signageApi.getEquipmentStatusStatisticsApi(this.productionCode)
.then(res => {
- if (res.success) this.barChartData = res.result
- this.drawBarChart()
+ if (res.success) this.runningStateData = res.result.list
+ this.drawRunningStateChart(res.result.producitonId)
})
},
- /* 璋冪敤鎺ュ彛鑾峰彇璁惧OEE鍜屽埄鐢ㄧ巼瀵规瘮 */
- getDoubleBarChartDataByApi() {
- signageApi.getEquipmentMonthStatisticsApi(this.productionCode)
+ /* 璋冪敤鎺ュ彛鑾峰彇鍓�7澶╁埄鐢ㄧ巼 */
+ getLineChartDataByApi() {
+ signageApi.getEquipmentDayUtilizationStatisticsApi(this.productionCode)
.then(res => {
- if (res.success) this.doubleBarChartData = res.result
- this.drawDoubleBarChart()
+ if (res.success) this.lineChartData = res.result
+ this.drawLineChart()
+ })
+ },
+
+ getBarChartDataByApi() {
+ signageApi.getEquipmentOEEMonthStatisticsApi(this.productionCode)
+ .then(res => {
+ console.log('res=', res)
+ if (res.success) {
+ this.barChartData = res.result.map(item => {
+ return {
+ name: item.equipmentId,
+ value: item.overallEquipmentEfficiency
+ }
+ })
+ }
+ this.drawBarChart()
})
},
@@ -258,10 +268,8 @@
this.drawRunningStateChart()
this.drawTechConditionChart()
this.drawWarrantyMalfunctionChart()
- this.drawLineChart()
+ this.drawGaugeChart()
this.drawBarChart()
- this.drawDoubleBarChart()
- this.drawProblemChart()
},
/* 缁樺埗鎶�鏈姸鎬侀ゼ鍥� */
@@ -272,20 +280,19 @@
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
text: '鎶�鏈姸鎬�', // 涓绘爣棰樻枃鏈�
x: 'left', // 鏍囬姘村钩瀹夋斁浣嶇疆锛屽彲閫夊�间负'left'銆�'center'銆�'right'鎴栧叿浣撶殑姘村钩鍧愭爣鍊�
- y: 'top', // 鏍囬鍨傜洿瀹夋斁浣嶇疆锛屽彲閫夊�间负'top'銆�'bottom'銆�'center'鎴栧叿浣撶殑鍨傜洿鍧愭爣鍊�
+ y: this.userType >= 3 ? '25' : 'top', // 鏍囬鍨傜洿瀹夋斁浣嶇疆锛屽彲閫夊�间负'top'銆�'bottom'銆�'center'鎴栧叿浣撶殑鍨傜洿鍧愭爣鍊�
textStyle: {
// 涓绘爣棰樻枃鏈牱寮�
fontSize: 18,
fontWeight: 'normal',
- color: '#00A8AC'
+ color: '#1AD8DE'
}
},
tooltip: {
trigger: 'item',
formatter: function(params) {
- if (params.name !== '') {
- return `${params.name}:${params.value}(${params.percent}%)`
- }
+ return '<span style="font-weight:bolder;">' + params.name + '</span><br/>' +
+ '<span style="display:inline-block; width:10px; height:10px; border-radius:100px; margin-right:5px; background:' + params.color + '"></span>' + `${params.value}锛�${params.percent}%锛塦
}
},
legend: {
@@ -311,12 +318,12 @@
{
type: 'pie',
// selectedMode: "single",
- radius: ['30%', '50%'],
+ radius: ['40%', '60%'],
center: ['50%', '50%'],
color: [
- '#0AA012',
- '#237E48',
- '#757160'
+ '#0FC61A',
+ '#0DAF15',
+ '#8B8B8B'
],
label: {
position: 'outside',
@@ -356,15 +363,14 @@
// 涓绘爣棰樻枃鏈牱寮�
fontSize: 18,
fontWeight: 'normal',
- color: '#00A8AC'
+ color: '#1AD8DE'
}
},
tooltip: {
trigger: 'item',
formatter: function(params) {
- if (params.name !== '') {
- return `${params.name}:${params.value}(${params.percent}%)`
- }
+ return '<span style="font-weight:bolder;">' + params.name + '</span><br/>' +
+ '<span style="display:inline-block; width:10px; height:10px; border-radius:100px; margin-right:5px; background:' + params.color + '"></span>' + `${params.value}锛�${params.percent}%锛塦
}
},
legend: {
@@ -390,12 +396,12 @@
{
type: 'pie',
// selectedMode: "single",
- radius: ['30%', '50%'],
+ radius: ['40%', '60%'],
center: ['50%', '50%'],
color: [
- '#00CED1',
- '#B85B38',
- '#A8985D'
+ '#24F2F5',
+ '#F56436',
+ '#FFFF40'
],
label: {
position: 'outside',
@@ -423,7 +429,7 @@
},
/* 缁樺埗璁惧杩愯鐘舵�佺帿鐟伴ゼ鍥� */
- drawRunningStateChart() {
+ drawRunningStateChart(productionId) {
this.runningStateChart = this.$echarts.init(document.getElementById('running_state_chart'))
const option = {
title: {
@@ -435,15 +441,14 @@
// 涓绘爣棰樻枃鏈牱寮�
fontSize: 18,
fontWeight: 'normal',
- color: '#00A8AC'
+ color: '#1AD8DE'
}
},
tooltip: {
trigger: 'item',
formatter: function(params) {
- if (params.name !== '') {
- return `${params.name}:${params.value}(${params.percent}%)`
- }
+ return '<span style="font-weight:bolder;">' + params.name + '</span><br/>' +
+ '<span style="display:inline-block; width:10px; height:10px; border-radius:100px; margin-right:5px; background:' + params.color + '"></span>' + `${params.value}锛�${params.percent}%锛塦
}
},
legend: {
@@ -470,13 +475,13 @@
type: 'pie',
roseType: 'angle', // 鐜懓鍥�
// selectedMode: "single",
- radius: ['30%', '70%'],
+ radius: ['35%', '55%'],
center: ['50%', '50%'],
color: [
- '#686869',
- '#AA6349',
- '#968A5E',
- '#5D975D'
+ '#8B8B8B',
+ '#F56436',
+ '#FFFF40',
+ '#0FC61A'
],
label: {
position: 'outside',
@@ -484,7 +489,7 @@
color: 'inherit',
// textBorderColor: 'inherit',
// textBorderWidth: 1,
- fontSize: 16,
+ fontSize: 30,
formatter: function(params) {
if (params.name !== '') {
return `${params.name}:${params.value}`
@@ -493,36 +498,43 @@
},
labelLine: {
show: true,
- length2: 10,
- length: 10
+ length2: 20,
+ length: 30
},
data: this.runningStateData
}
]
}
this.runningStateChart.setOption(option, true)
+
+ this.runningStateChart.on('click', params => {
+ this.$router.push({
+ name: 'mdc-base-DeviceBaseInfo',
+ params: { signageData: params.data, productionId }
+ })
+ })
},
/* 缁樺埗鎶樼嚎鍥� */
drawLineChart() {
this.lineChart = this.$echarts.init(document.getElementById('line_chart'))
const newData = {
- xAxis: ['2640221', '2640223', '2640224', '2640225', '2640226', '2640227', '2640228', '2640229', '12640220', '12640221', '12640222'],
+ xAxis: this.lineChartData.dateList,
yAxis: [
{
name: '鍒╃敤鐜�',
- value: [20, 60, 55, 36, 52, 52, 63, 78, 23, 42, 65]
+ value: this.lineChartData.dataList.map(item => item.utilizationRate)
},
{
name: '寮�鍔ㄧ巼',
- value: [23, 63, 44, 40, 74, 80, 60, 90, 70, 40, 70]
+ value: this.lineChartData.dataList.map(item => item.startRate)
},
{
name: '寮�鏈虹巼',
- value: [90, 70, 40, 70, 80, 65, 73, 60, 70, 90, 40]
+ value: this.lineChartData.dataList.map(item => item.openRate)
}
],
- yAxisName: '鍓�7澶╁埄鐢ㄧ巼'
+ yAxisName: '鍓�7澶╁埄鐢ㄧ巼(%)'
}
let legendData = []
let seriesData = []
@@ -544,7 +556,6 @@
data: item1.value // 鎶樼嚎鍥剧殑鏁版嵁
}
})
-
const option = {
grid: {
containLabel: true,
@@ -557,6 +568,17 @@
trigger: 'axis',
axisPointer: {
type: 'shadow'
+ },
+ formatter: function(params) {
+ let result = ''
+ params.forEach((item, index) => {
+ let dom = `<span style="display:inline-block;width:10px;height:10px;border-radius:100px;margin-right:5px;background:${item.color}"></span>${item.seriesName}锛�${item.value}%`
+ if (index === 0) {
+ result = `<span style="font-weight:bolder;">${item.name}</span>`
+ }
+ result += '<br />' + dom
+ })
+ return result
}
},
legend: {
@@ -565,45 +587,46 @@
data: legendData,
itemGap: 10,
textStyle: {
- fontSize: 16,
- color: '#ccc'
+ fontSize: 14,
+ color: '#fff'
}
},
xAxis: {
triggerEvent: true,
data: newData.xAxis || [],
axisLabel: {
- interval: 1,
+ interval: 0,
show: true,
fontSize: 12,
- color: '#50729A',
+ color: '#fff'
// rotate: -30,
},
axisLine: {
show: true,
lineStyle: {
- color: '#50729A'
+ color: '#fff'
}
},
axisTick: {
show: true,
- alignWithLabel:true,
+ alignWithLabel: true
}
},
yAxis: [
{
name: newData.yAxisName,
nameTextStyle: {
- color: '#00A8AC',
+ color: '#1AD8DE',
fontSize: 18,
- padding: [0, 0, 0, 80]
+ padding: [0, 0, 0, 110]
},
+ nameGap: 30,
type: 'value',
position: 'left',
axisLine: {
show: true,
lineStyle: {
- color: '#50729A'
+ color: '#fff'
}
},
axisTick: {
@@ -612,7 +635,7 @@
splitLine: {
show: false,
lineStyle: {
- color: '#3E4A82'
+ color: '#fff'
}
}
},
@@ -622,13 +645,12 @@
splitNumber: 5,
axisLabel: {
show: true,
- fontSize: 16,
- color: '#50729A'
+ color: '#fff'
},
axisLine: {
show: true,
lineStyle: {
- color: '#50729A'
+ color: '#fff'
}
},
axisTick: {
@@ -637,21 +659,172 @@
splitLine: {
show: false,
lineStyle: {
- color: '#3E4A82'
+ color: '#fff'
}
}
}
],
series: seriesData
+ // dataZoom: {
+ // show: false,
+ // startValue: 0, // 浠庡ご寮�濮嬨��
+ // endValue: 5 // 涓�娆℃�у睍绀哄嚑涓�
+ // }
}
this.lineChart.setOption(option, true)
+ },
+ /* 缁樺埗浠〃鐩樺浘琛� */
+ drawGaugeChart() {
+ const option = {
+ title: {
+ show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
+ text: '', // 涓绘爣棰樻枃鏈�
+ x: 'center', // 鏍囬姘村钩瀹夋斁浣嶇疆锛屽彲閫夊�间负'left'銆�'center'銆�'right'鎴栧叿浣撶殑姘村钩鍧愭爣鍊�
+ y: 'top', // 鏍囬鍨傜洿瀹夋斁浣嶇疆锛屽彲閫夊�间负'top'銆�'bottom'銆�'center'鎴栧叿浣撶殑鍨傜洿鍧愭爣鍊�
+ textStyle: {
+ // 涓绘爣棰樻枃鏈牱寮�
+ fontSize: 18,
+ fontWeight: 'normal',
+ color: '#1AD8DE',
+ fontWeight: 'bold'
+ }
+ },
+ tooltip: {
+ formatter: params => {
+ return params.seriesName + '锛�' + params.value + '%'
+ }
+ },
+ grid: {
+ left: '1%',
+ top: '1%',
+ right: '10%',
+ bottom: '1%'
+ },
+ series: [
+ {
+ name: '',
+ type: 'gauge',
+ radius: '80%',
+ center: ['50%', '60%'], // 榛樿鍏ㄥ眬灞呬腑
+ pointer: {
+ width: 6,
+ length: '50%',
+ itemStyle: {
+ color: 'inherit'
+ }
+ },
+ splitLine: {
+ show: true,
+ length: 10,
+ lineStyle: {
+ color: '#fff',
+ width: 2
+ }
+ },
+ axisTick: {
+ length: 5,
+ lineStyle: {
+ color: '#fff',
+ width: 1
+ }
+ },
+ axisLabel: {
+ show: false,
+ fontSize: 18,
+ formatter: function(value) {
+ return value + '%'
+ }
+ },
+ axisLine: {
+ lineStyle: { // 灞炴�ineStyle鎺у埗绾挎潯鏍峰紡
+ color: [ //琛ㄧ洏棰滆壊
+ [0.3, '#F56436'],//0-30%澶勭殑棰滆壊
+ [0.7, '#FFFF40'],//30%-60%澶勭殑棰滆壊
+ [1, '#0FC61A']//90%-100%澶勭殑棰滆壊
+ ],
+ width: 15//琛ㄧ洏瀹藉害
+ }
+ },
+ detail: {
+ formatter: '{score|{value}%}',
+ offsetCenter: [0, '50%'],
+ height: 30,
+ rich: {
+ score: {
+ fontSize: 20
+ }
+ }
+ },
+ data: []
+ }
+ ]
+ }
+ this.drawGaugeChart1(option)
+ this.drawGaugeChart2(option)
+ this.drawGaugeChart3(option)
+ this.drawGaugeChart4(option)
+ },
+
+ /* 缁樺埗鍒╃敤鐜囦华琛ㄧ洏鍥捐〃 */
+ 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)
+ },
+
+ /* 缁樺埗寮�鍔ㄧ巼浠〃鐩樺浘琛� */
+ 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)
+ },
+
+ /* 缁樺埗寮�鏈虹巼浠〃鐩樺浘琛� */
+ 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)
+ },
+
+ /* 缁樺埗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)
},
/* 缁樺埗鍗曟煴鍥� */
drawBarChart() {
this.barChart = this.$echarts.init(document.getElementById('bar_chart'))
+ const xAisData = this.barChartData.map(item => item.name)
const option = {
+ height: 260,
+ title: {
+ show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
+ text: '', // 涓绘爣棰樻枃鏈�
+ x: 'center', // 鏍囬姘村钩瀹夋斁浣嶇疆锛屽彲閫夊�间负'left'銆�'center'銆�'right'鎴栧叿浣撶殑姘村钩鍧愭爣鍊�
+ y: 'top', // 鏍囬鍨傜洿瀹夋斁浣嶇疆锛屽彲閫夊�间负'top'銆�'bottom'銆�'center'鎴栧叿浣撶殑鍨傜洿鍧愭爣鍊�
+ textStyle: {
+ // 涓绘爣棰樻枃鏈牱寮�
+ fontSize: 18,
+ fontWeight: 'normal',
+ color: '#1AD8DE',
+ fontWeight: 'bold'
+ }
+ },
tooltip: {
trigger: 'axis',
axisPointer: {
@@ -666,62 +839,79 @@
},
grid: {
top: '15%',
- left: '10%'
+ left: '6%',
+ right: '3%'
},
- xAxis: [{
- name: 'OEE杞﹂棿',
- nameLocation: 'middle',
- nameGap: 30, // x杞磏ame涓庢í鍧愭爣杞寸嚎鐨勯棿璺�
- type: 'category',
- data: this.barChartData.map(item => item.name),
- axisLine: {
- lineStyle: {
- color: '#FFFFFF'
+ xAxis: [
+ {
+ // name: '涓婁釜鏈圤EE',
+ // nameLocation: 'middle',
+ // nameGap: 40, // x杞磏ame涓庢í鍧愭爣杞寸嚎鐨勯棿璺�
+ type: 'category',
+ data: xAisData,
+ axisLine: {
+ lineStyle: {
+ color: '#fff'
+ }
+ },
+ axisLabel: {
+ show: true, // 鏄惁鏄剧ず鍒诲害鏍囩锛岄粯璁ゆ樉绀�
+ interval: 0, // 鍧愭爣杞村埢搴︽爣绛剧殑鏄剧ず闂撮殧锛屽湪绫荤洰杞翠腑鏈夋晥锛涢粯璁や細閲囩敤鏍囩涓嶉噸鍙犵殑绛栫暐闂撮殧鏄剧ず鏍囩锛涘彲浠ヨ缃垚0寮哄埗鏄剧ず鎵�鏈夋爣绛撅紱濡傛灉璁剧疆涓�1锛岃〃绀恒�庨殧涓�涓爣绛炬樉绀轰竴涓爣绛俱�忥紝濡傛灉鍊间负2锛岃〃绀洪殧涓や釜鏍囩鏄剧ず涓�涓爣绛撅紝浠ユ绫绘帹銆�
+ // rotate: this.barChartData.length >= 5 ? -30 : 0, // 鍒诲害鏍囩鏃嬭浆鐨勮搴︼紝鍦ㄧ被鐩酱鐨勭被鐩爣绛炬樉绀轰笉涓嬬殑鏃跺�欏彲浠ラ�氳繃鏃嬭浆闃叉鏍囩涔嬮棿閲嶅彔锛涙棆杞殑瑙掑害浠�-90搴﹀埌90搴�
+ inside: false, // 鍒诲害鏍囩鏄惁鏈濆唴锛岄粯璁ゆ湞澶�
+ margin: 6 // 鍒诲害鏍囩涓庤酱绾夸箣闂寸殑璺濈
+ },
+ axisTick: {
+ show: true,
+ alignWithLabel: true
+ }
+ }],
+ yAxis: [
+ {
+ // name: '鏁伴噺',
+ // nameLocation: 'middle',
+ // nameGap: 30, // x杞磏ame涓庢í鍧愭爣杞寸嚎鐨勯棿璺�
+ position: 'left',
+ axisLabel: {
+ formatter: '{value}',
+ color: '#fff'
+ },
+ axisTick: {
+ show: true
+ },
+ axisLine: {
+ show: true,
+ lineStyle: {
+ color: '#fff'
+ }
+ },
+ splitLine: {
+ show: false,
+ lineStyle: {
+ color: 'rgba(255,255,255,0.12)'
+ }
}
},
- axisLabel: {
- margin: 10,
- color: '#e2e9ff',
- textStyle: {
- fontSize: 12
- }
- },
- axisTick: {
- show: false
- }
- }],
- yAxis: [{
- name: '鏁伴噺',
- nameLocation: 'middle',
- nameGap: 30, // x杞磏ame涓庢í鍧愭爣杞寸嚎鐨勯棿璺�
- axisLabel: {
- formatter: '{value}',
- color: '#e2e9ff'
- },
- axisTick: {
- show: false
- },
- axisLine: {
- show: false,
- lineStyle: {
- color: '#FFFFFF'
- }
- },
- splitLine: {
- lineStyle: {
- color: 'rgba(255,255,255,0.12)'
+ {
+ position: 'right',
+ axisLine: {
+ show: true,
+ lineStyle: {
+ color: '#fff'
+ }
}
}
- }],
+ ],
series: [{
type: 'bar',
data: this.barChartData,
- barWidth: '15%',
+ barWidth: '25%',
itemStyle: {
- color: '#7DB17F'
+ color: '#17C1F0',
+ barBorderRadius: [10, 10, 10, 10]
},
label: {
- show: true,
+ show: false,
lineHeight: 10,
formatter: params => {
if (+params.value === 0) return ''
@@ -733,168 +923,23 @@
fontSize: 18
}
}
- }]
- }
- this.barChart.setOption(option, true)
- },
-
- /* 缁樺埗鍙屾煴鍥� */
- drawDoubleBarChart() {
- this.doubleBarChart = this.$echarts.init(document.getElementById('double_bar_chart'))
- const option = {
- color: ['#4992FF', '#4DC0B1'],
- tooltip: {
- confine: true,
- formatter: function(params) {
- return '<span style="font-weight:bolder;">' + params.name + '</span><br/>' +
- '<span style="display:inline-block; width:10px; height:10px; border-radius:100px; margin-right:5px; background:' + params.color + '"></span>' + params.seriesName + ' : ' + params.value + '%'
- }
- },
- grid: {
- left: '5%',
- right: '4%',
- bottom: '10%',
- top: '20%',
- containLabel: true
- },
- legend: {
- icon: 'roundRect',
- orient: 'horizontal',
- left: 'center',
- itemWidth: 14,
- itemHeight: 14,
- formatter: ['{a|{name}}'].join('\n'),
- textStyle: {
- fontSize: 14,
- color: '#6A93B9',
- height: 8,
- rich: {
- a: {
- verticalAlign: 'bottom'
- }
- }
- },
- data: ['OEE', '鍒╃敤鐜�']
- },
- xAxis: {
- type: 'category',
- data: this.doubleBarChartData.dateList,
- axisLine: {
- lineStyle: {
- color: 'rgba(255,255,255,0.45)'
- }
- },
- axisLabel: {
- fontSize: 12,
- color: '#6A93B9'
- },
- axisTick: {
- show: false
- }
- },
- yAxis: [{
- name: '%',
- type: 'value',
- min: 0,
- minInterval: 1,
- splitArea: {
- show: false
- },
- axisLine: {
- show: false
- },
- axisTick: {
- show: false
- },
- splitLine: {
- lineStyle: {
- color: 'rgba(255, 255, 255, 0.15)'
- // type: 'dashed', // dotted 铏氱嚎
- }
- },
- axisLabel: {
- fontSize: 12,
- color: '#6A93B9',
- fontFamily: 'Bebas'
- }
- }, {
- type: 'value',
- axisLine: {
- show: false
- },
- axisTick: {
- show: false
- },
- splitLine: {
- show: false
- },
- axisLabel: {
- fontSize: 12,
- formatter: '{value}%', // 鍙充晶Y杞存枃瀛楁樉绀�
- fontFamily: 'Bebas',
- color: '#6A93B9'
- },
- splitArea: {
- show: false
- }
}],
- series: [{
- type: 'bar',
- barWidth: 15,
- itemStyle: { barBorderRadius: [3, 3, 0, 0] },
- name: 'OEE',
- data: this.doubleBarChartData.oeeList,
- label: {
- show: true,
- lineHeight: 10,
- formatter: params => {
- if (+params.value === 0) return ''
- else return params.value
- },
- position: 'inside',
- textStyle: {
- color: '#fff',
- fontSize: 12
- }
- }
- }, {
- type: 'bar',
- barWidth: 15,
- itemStyle: { barBorderRadius: [3, 3, 0, 0] },
- name: '鍒╃敤鐜�',
- data: this.doubleBarChartData.utilizationList,
- label: {
- show: true,
- lineHeight: 10,
- formatter: params => {
- if (+params.value === 0) return ''
- else return params.value
- },
- position: 'inside',
- textStyle: {
- color: '#fff',
- fontSize: 12
- }
- }
+ dataZoom: {
+ show: false,
+ startValue: 0, // 浠庡ご寮�濮嬨��
+ endValue: 5 // 涓�娆℃�у睍绀哄嚑涓�
}
- ]
}
- this.doubleBarChart.setOption(option, true)
- },
-
- /* 缁樺埗闂婊氬姩琛� */
- drawProblemChart() {
- this.problemConfig = {
- indexHeader: '搴忓彿',
- header: ['鏃堕棿', '闂鍐呭'],
- headerBGC: '#83B883',
- oddRowBGC: '#556955',
- evenRowBGC: '#556955',
- data: [],
- index: true,
- columnWidth: [100, 300, 300],
- align: ['center']
- }
+ option.title.text = `${moment().subtract(1, 'months').format('M')}鏈圤EE`
+ this.barChart.setOption(option, true)
+ if (this.barChartData.length <= 6) return
+ this.barChartCarouselTime = setInterval(() => {
+ this.barChartData.push(this.barChartData.shift())
+ xAisData.push(xAisData.shift())
+ this.$nextTick(() => {
+ this.barChart.setOption(option, true)
+ })
+ }, 3000)
},
/**
@@ -902,12 +947,15 @@
* 璋冩暣鍥捐〃灏哄浠ラ�傚簲鍒嗚鲸鐜�
*/
handleWindowResize() {
- 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.barChart) this.barChart.resize()
- if (this.doubleBarChart) this.doubleBarChart.resize()
}
}
}
@@ -922,12 +970,6 @@
color: #fff;
margin-bottom: 10px;
- .workshop-nav {
- width: 120px;
- height: 40px;
- font-size: 12px;
- cursor: pointer;
- }
}
.content-container {
@@ -942,11 +984,11 @@
justify-content: space-around;
flex-wrap: wrap;
color: #fff;
- padding-top: 5px;
+ padding-top: 20px;
.support-plan-item {
border-radius: 3px;
- width: 45%;
+ width: 30%;
padding: 5px 10px;
margin-bottom: 10px;
@@ -965,19 +1007,37 @@
}
}
- .middle-col {
- .first-title {
- color: #00A8AC;
- font-size: 20px;
- text-align: center;
- font-weight: bold;
+ .right-col {
+ .gauge-chart {
+ width: 50%;
+ height: 200px;
}
-
}
}
}
- /deep/ .dv-scroll-board .header {
- height: 35px;
+ /deep/ .ant-form.ant-form-inline {
+ text-align: center;
+ margin-bottom: 20px;
+ }
+
+ /deep/ .ant-form .ant-form-item-label label {
+ color: #fff;
+ font-size: 18px;
+ }
+
+ /deep/ .ant-select-selection {
+ background: transparent !important;
+ }
+
+ /deep/ .ant-select-selection__clear {
+ background: transparent !important;
+ color: #fff;
+ }
+
+ /deep/ .ant-input {
+ border: 1px solid #689ACA;
+ color: #fff;
+ background: transparent !important;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3