From 26358d4a0cfa9706bc265249e5f7136f134d6f01 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 05 九月 2025 10:05:53 +0800
Subject: [PATCH] mdc首页车间级看板调整样式及功能
---
src/views/dashboard/BranchFactorySignage.vue | 630 +++++++++++++++++++++++-------------------------
src/views/dashboard/IndexSignage.vue | 112 +++----
2 files changed, 353 insertions(+), 389 deletions(-)
diff --git a/src/views/dashboard/BranchFactorySignage.vue b/src/views/dashboard/BranchFactorySignage.vue
index b573df8..e10f398 100644
--- a/src/views/dashboard/BranchFactorySignage.vue
+++ b/src/views/dashboard/BranchFactorySignage.vue
@@ -5,43 +5,43 @@
<div class="back-nav" @click="$emit('backToLastSignage','Index')" v-if="userType===4">
<dv-decoration-7>涓婁竴绾�</dv-decoration-7>
</div>
- <!--<dv-border-box-9 style="padding: 30px 20px 0">-->
- <!--<div id="running_state_chart" style="width:100%;height: 400px;"></div>-->
- <!--<div id="efficiency_chart" style="width: 100%;height: 350px"></div>-->
- <!--</dv-border-box-9>-->
+ <dv-border-box-9 style="padding: 30px 20px 0">
+ <div id="running_state_chart" style="width:100%;height: 400px;"></div>
+ <div id="efficiency_chart" style="width: 100%;height: 350px"></div>
+ </dv-border-box-9>
</div>
- <!--<div style="width: 42%" class="middle-col">-->
- <!--<dv-border-box-9 style="padding: 30px 20px 0">-->
- <!--<div style="display: flex">-->
- <!--<div id="tech_condition_chart" style="width:50%;height: 420px;"></div>-->
- <!--<div id="warranty_malfunction_chart" style="width:50%;height: 420px;"></div>-->
- <!--</div>-->
- <!--<div class="support-plan-container">-->
- <!--<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">{{$data[item.planValueLabel]}}</div>-->
- <!--<div>鍙�</div>-->
- <!--</div>-->
- <!--</div>-->
- <!--</div>-->
- <!--<div style="padding: 0 55px;margin-top: 50px">-->
- <!--<dv-scroll-board :config="maintenanceConfig" style="width:100%;height:80px"/>-->
- <!--</div>-->
- <!--</dv-border-box-9>-->
- <!--</div>-->
+ <div style="width: 42%" class="middle-col">
+ <dv-border-box-9 style="padding: 30px 20px 0">
+ <div style="display: flex">
+ <div id="tech_condition_chart" style="width:50%;height: 420px;"></div>
+ <div id="warranty_malfunction_chart" style="width:50%;height: 420px;"></div>
+ </div>
+ <div class="support-plan-container">
+ <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">{{$data[item.planValueLabel]}}</div>
+ <div>鍙�</div>
+ </div>
+ </div>
+ </div>
+ <div style="padding: 0 55px;margin-top: 50px">
+ <dv-scroll-board :config="maintenanceConfig" style="width:100%;height:80px"/>
+ </div>
+ </dv-border-box-9>
+ </div>
- <!--<div style="width: 32%">-->
- <!--<dv-border-box-9 style="padding: 30px 0 20px">-->
- <!--<div id="bar_chart" style="width:100%;height: 280px;"></div>-->
- <!--<div id="double_bar_chart" style="width:100%;height: 280px;"></div>-->
- <!--<div style="padding: 0 20px;">-->
- <!--<dv-scroll-board :config="problemConfig" style="width:100%;height:220px"/>-->
- <!--</div>-->
- <!--</dv-border-box-9>-->
- <!--</div>-->
+ <div style="width: 32%">
+ <dv-border-box-9 style="padding: 30px 0 20px">
+ <div id="bar_chart" style="width:100%;height: 280px;"></div>
+ <div id="double_bar_chart" style="width:100%;height: 280px;"></div>
+ <div style="padding: 0 20px;">
+ <dv-scroll-board :config="problemConfig" style="width:100%;height:220px"/>
+ </div>
+ </dv-border-box-9>
+ </div>
<SignageModal :modalVisible="modalVisible" :modalTitle=modalTitle :modalDataApiUrl="modalDataApiUrl"
:modalDataApiParams="modalDataApiParams"
@@ -54,6 +54,7 @@
import signageApi from '@/api/signage'
import moment from 'moment'
import SignageModal from './modules/SignageModal'
+ import * as echarts from 'echarts'
export default {
name: 'BranchFactorySignage',
@@ -101,26 +102,26 @@
{
planTime: '鏈湀涓変繚璁″垝',
planValueLabel: 'thisMonthMaintenancePlanNum',
- backgroundColor: '#5FE0AF',
- apiUrl: '/eam/calibrationOrder/showThisMonthMaintenanceList'
+ backgroundColor: '#719D8E',
+ code: 'bysbzs'
},
{
planTime: '鏈湀瀹屾垚',
planValueLabel: 'thisMonthMaintenanceRealNum',
backgroundColor: '#409EFF',
- apiUrl: '/eam/calibrationOrder/showThisMonthMaintenanceFinishList'
+ code: 'bwc'
},
{
planTime: '涓嬫湀涓変繚璁″垝',
planValueLabel: 'nextMonthMaintenancePlanNum',
- backgroundColor: '#D6BC52',
- apiUrl: '/eam/calibrationOrder/showNextMonthMaintenanceList'
+ backgroundColor: '#A8985D',
+ code: 'xysb'
},
{
planTime: '涓嬩笅鏈堜笁淇濊鍒�',
planValueLabel: 'nextNextMonthMaintenancePlanNum',
backgroundColor: '#58D9F9',
- apiUrl: '/eam/calibrationOrder/showNextNextMonthMaintenanceList'
+ code: 'xxysb'
}
],
thisMonthMaintenancePlanNum: 0,
@@ -155,8 +156,7 @@
getChartDataByApi() {
this.getRunningStateDataByApi()
this.getEfficiencyDataByApi()
- this.getTechConditionDataByApi()
- this.getWarrantyMalfunctionDataByApi()
+ this.getTechConditionAndWarrantyMalfunctionDataByApi()
this.getMonthMaintenanceNumByApi()
this.getTwoMaintenanceChartDataByApi()
this.getBarChartDataByApi()
@@ -170,8 +170,7 @@
this.runningStateChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0,0,0,.45)'
})
signageApi.getEquipmentStatusStatisticsApi(this.productionCode)
.then(res => {
@@ -190,8 +189,7 @@
this.efficiencyChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0,0,0,.45)'
})
signageApi.getEquipmentUtilizationStatisticsApi(this.productionCode)
.then(res => {
@@ -202,47 +200,62 @@
})
},
- /* 璋冪敤鎺ュ彛鑾峰彇鎶�鏈姸鎬� */
- getTechConditionDataByApi() {
+ /* 璋冪敤鎺ュ彛鑾峰彇鎶�鏈姸鎬佷笌鏁呴殰鎶ヤ慨 */
+ getTechConditionAndWarrantyMalfunctionDataByApi() {
this.techConditionChart = this.$echarts.init(document.getElementById('tech_condition_chart'))
+ this.warrantyMalfunctionChart = this.$echarts.init(document.getElementById('warranty_malfunction_chart'))
this.techConditionChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)',
+ maskColor: 'transparent' // 閬僵灞�
})
- signageApi.getEquipmentTechnologyStatusListApi(this.productionCode)
- .then(res => {
- if (res.success && res.result) {
- this.techConditionData = [
- { value: res.result[0].qualifiedCount, name: '鍚堟牸', technologyStatus: 'qualified' },
- { value: res.result[0].disabledCount, name: '绂佺敤', technologyStatus: 'disabled' },
- { value: res.result[0].limitedUseCount, name: '闄愮敤', technologyStatus: 'limitedUse' }
- ]
- this.techConditionChartRequireFinished = true
- this.drawTechConditionChart()
- }
- })
- },
-
- /* 璋冪敤鎺ュ彛鑾峰彇璁惧鎶ヤ慨鏁呴殰 */
- getWarrantyMalfunctionDataByApi() {
- this.warrantyMalfunctionChart = this.$echarts.init(document.getElementById('warranty_malfunction_chart'))
this.warrantyMalfunctionChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)',
+ maskColor: 'transparent' // 閬僵灞�
})
- signageApi.getReportRepairEquipmentListApi(this.productionCode)
+ signageApi.getEquipmentTechnologyStatusAndReportRepairEquipmentListApi(this.productionCode)
.then(res => {
if (res.success && res.result) {
- this.warrantyMalfunctionData = [
- { value: res.result[0].failurTotalCount, name: '鎶ヤ慨', isStop: '' },
- { value: res.result[0].stopCount, name: '鍋滄満', isStop: '2' },
- { value: res.result[0].noStopCount, name: '杩愯', isStop: '1' }
+ this.techConditionData = [
+ {
+ value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'QUALIFIED').value : 0,
+ name: '鍚堟牸',
+ technologyStatus: 'QUALIFIED'
+ },
+ {
+ value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'PROHIBITED').value : 0,
+ name: '绂佺敤',
+ technologyStatus: 'PROHIBITED'
+ },
+ {
+ value: res.result.jszt.length > 0 ? res.result.jszt.find(item => item.code === 'RESTRICTED').value : 0,
+ name: '闄愮敤',
+ technologyStatus: 'RESTRICTED'
+ }
]
+ this.warrantyMalfunctionData = [
+ {
+ value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'bx').value : 0,
+ name: '鎶ヤ慨',
+ code: 'bx'
+ },
+ {
+ value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'stop').value : 0,
+ name: '鍋滄満',
+ code: 'stop'
+ },
+ {
+ value: res.result.bxqk.length > 0 ? res.result.bxqk.find(item => item.code === 'run').value : 0,
+ name: '杩愯',
+ code: 'run'
+ }
+ ]
+ this.techConditionChartRequireFinished = true
this.warrantyMalfunctionChartRequireFinished = true
+ this.drawTechConditionChart()
this.drawWarrantyMalfunctionChart()
}
})
@@ -250,21 +263,14 @@
/* 璋冪敤鎺ュ彛鑾峰彇涓変繚璁″垝 */
getMonthMaintenanceNumByApi() {
- signageApi.getThisMonthMaintenanceListApi(this.productionCode)
+ signageApi.getThirdMaintenanceConditionApi(this.productionCode)
.then(res => {
- if (res.success && res.result) this.thisMonthMaintenancePlanNum = res.result[0].totalCount
- })
- signageApi.getThisMonthMaintenanceFinishListApi(this.productionCode)
- .then(res => {
- if (res.success && res.result) this.thisMonthMaintenanceRealNum = res.result[0].totalCount
- })
- signageApi.getNextMonthMaintenanceList(this.productionCode)
- .then(res => {
- if (res.success && res.result) this.nextMonthMaintenancePlanNum = res.result[0].totalCount
- })
- signageApi.getNextNextMonthMaintenanceListApi(this.productionCode)
- .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
+ }
})
},
@@ -272,7 +278,7 @@
getTwoMaintenanceChartDataByApi() {
signageApi.getTwoMaintenancePlanListApi(this.productionCode)
.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()
})
},
@@ -283,12 +289,11 @@
this.barChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0,0,0,.45)'
})
signageApi.getEquipmentOEEStatistics(this.productionCode)
.then(res => {
- if (res.success && res.result && res.result.length > 0) {
+ if (res.success && res.result) {
this.barChartData = res.result
this.drawBarChart()
}
@@ -301,8 +306,7 @@
this.doubleBarChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: '#fff',
- maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ textColor: 'rgba(0,0,0,.45)'
})
signageApi.getEquipmentMonthStatisticsApi(this.productionCode)
.then(res => {
@@ -327,7 +331,7 @@
const option = {
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
- text: '璁惧鐘舵��', // 涓绘爣棰樻枃鏈�
+ text: '璁惧杩愯鐘舵�佺粺璁�', // 涓绘爣棰樻枃鏈�
x: 'center', // 鏍囬姘村钩瀹夋斁浣嶇疆锛屽彲閫夊�间负'left'銆�'center'銆�'right'鎴栧叿浣撶殑姘村钩鍧愭爣鍊�
y: 'top', // 鏍囬鍨傜洿瀹夋斁浣嶇疆锛屽彲閫夊�间负'top'銆�'bottom'銆�'center'鎴栧叿浣撶殑鍨傜洿鍧愭爣鍊�
textStyle: {
@@ -349,13 +353,12 @@
left: 0,
orient: 'vertical',
right: '10%',
- // bottom: "0",
itemWidth: 14,
itemHeight: 14,
icon: 'roundRect',
itemGap: 15,
textStyle: {
- color: 'inherit',
+ color: 'rgba(0,0,0,.45)',
fontSize: 14,
padding: [0, 0, 0, 0]
},
@@ -368,21 +371,18 @@
{
type: 'pie',
roseType: 'angle', // 鐜懓鍥�
- // selectedMode: "single",
radius: this.pieChartRadius,
center: ['53%', '50%'],
color: [
- '#8B8B8B',
- '#F56436',
- '#FFFF40',
- '#0FC61A'
+ '#686869',
+ '#AA6349',
+ '#FFFF88',
+ '#5D975D'
],
label: {
position: 'outside',
show: true,
- color: 'inherit',
- // textBorderColor: 'inherit',
- // textBorderWidth: 1,
+ color: 'rgba(0,0,0,.45)',
fontSize: 16,
formatter: function(params) {
if (params.name !== '') {
@@ -393,7 +393,10 @@
labelLine: {
show: true,
length2: 10,
- length: 10
+ length: 10,
+ lineStyle: {
+ color: 'rgba(0,0,0,.45)'
+ }
},
data: this.runningStateData
}
@@ -416,40 +419,27 @@
const data = this.efficiencyData
const colorArray = [
{
- top: '#79CEAA',
- bottom: '#79CEAA'
+ top: '#EA967B',
+ bottom: '#F8E18B'
},
{
- top: '#F589A2',
- bottom: '#F589A2'
+ top: '#62AC75',
+ bottom: '#A8D07C'
},
{
- top: '#6FBF9D',
- bottom: '#6FBF9D'
+ top: '#32ACBF',
+ bottom: '#7BCAC5'
},
{
- top: '#66DFE2',
- bottom: '#66DFE2'
- }, {
- top: '#A7F0C1',
- bottom: '#A7F0C1'
- },
- {
- top: '#FAE893',
- bottom: '#FAE893'
- },
- {
- top: '#F7B7A0',
- bottom: '#F7B7A0'
+ top: '#7196CE',
+ bottom: '#8DCCEF'
}
]
- const 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鏁撮櫎鐨勬暟瀛�
const yAxisInterval = yAxisMax / 5 // 鍚屾椂灏嗗埢搴﹀�煎垎鎴�5浠�
- data.forEach(item => defaultData.push(yAxisMax))
const option = {
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
@@ -483,34 +473,34 @@
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,
min: 0,
- max: 'dataMax',
+ max: dataMax,
interval: yAxisInterval,
type: 'value',
axisTick: {
show: false
},
splitLine: {
- show: false
+ show: true
}
},
- yAxis: [{
+ yAxis: {
type: 'category',
inverse: true,
triggerEvent: true,
axisLabel: {
show: true,
textStyle: {
- color: '#fff',
+ color: 'rgba(0,0,0,.45)',
fontSize: '14',
fontWeight: 'bolder'
},
@@ -528,29 +518,12 @@
show: false
},
data: data.map(item => item.productionCode)
- }, {
- type: 'category',
- inverse: true,
- axisTick: 'none',
- axisLine: 'none',
- show: true,
- axisLabel: {
- textStyle: {
- color: '#ffffff',
- fontSize: '14'
- },
- formatter: function(value) {
- return `${value}%`
- }
- },
- data: data
- }],
- series: [{
+ },
+ series: {
name: 'TEEP',
type: 'bar',
zlevel: 1,
itemStyle: {
- barBorderRadius: 100,
color: function(params) {
let num = colorArray.length
return {
@@ -592,21 +565,14 @@
}
}
},
- barWidth: 12,
+ label: {
+ show: true,
+ position: 'inside',
+ color: '#fff'
+ },
+ barWidth: 18,
data: data
- },
- {
- name: '鑳屾櫙',
- type: 'bar',
- barWidth: 12,
- barGap: '-100%',
- data: defaultData,
- itemStyle: {
- color: '#11294d',
- barBorderRadius: 100
- }
- }
- ]
+ }
}
option.title.text = `${moment().subtract(1, 'days').format('M鏈圖鏃�')}TEEP`
this.efficiencyChart.setOption(option, true)
@@ -670,7 +636,7 @@
icon: 'roundRect',
itemGap: 15,
textStyle: {
- color: 'inherit',
+ color: 'rgba(0,0,0,.45)',
fontSize: 14,
padding: [0, 0, 0, 0]
},
@@ -682,20 +648,17 @@
series: [
{
type: 'pie',
- // selectedMode: "single",
radius: this.pieChartRadius,
center: ['50%', '60%'],
color: [
- '#0FC61A',
- '#F56436',
- '#8B8B8B'
+ '#0AA012',
+ '#247F49',
+ '#757160'
],
label: {
position: 'outside',
show: true,
- color: 'inherit',
- // textBorderColor: 'inherit',
- // textBorderWidth: 1,
+ color: 'rgba(0,0,0,.45)',
fontSize: 16,
formatter: function(params) {
if (params.name !== '') {
@@ -706,7 +669,10 @@
labelLine: {
show: true,
length2: 15,
- length: 15
+ length: 15,
+ lineStyle: {
+ color: 'rgba(0,0,0,.45)'
+ }
},
data: this.techConditionData
}
@@ -732,7 +698,7 @@
height: 300,
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
- text: '璁惧鎶ヤ慨鏁呴殰', // 涓绘爣棰樻枃鏈�
+ text: '璁惧鎶ヤ慨鏁呴殰鎯呭喌', // 涓绘爣棰樻枃鏈�
x: 'center', // 鏍囬姘村钩瀹夋斁浣嶇疆锛屽彲閫夊�间负'left'銆�'center'銆�'right'鎴栧叿浣撶殑姘村钩鍧愭爣鍊�
y: 'top', // 鏍囬鍨傜洿瀹夋斁浣嶇疆锛屽彲閫夊�间负'top'銆�'bottom'銆�'center'鎴栧叿浣撶殑鍨傜洿鍧愭爣鍊�
textStyle: {
@@ -759,7 +725,7 @@
icon: 'roundRect',
itemGap: 15,
textStyle: {
- color: 'inherit',
+ color: 'rgba(0,0,0,.45)',
fontSize: 14,
padding: [0, 0, 0, 0]
},
@@ -771,20 +737,17 @@
series: [
{
type: 'pie',
- // selectedMode: "single",
radius: this.pieChartRadius,
center: ['50%', '60%'],
color: [
- '#24F2F5',
- '#F56436',
- '#FFFF40'
+ '#00CED1',
+ '#B85B38',
+ '#FFFF88'
],
label: {
position: 'outside',
show: true,
- color: 'inherit',
- // textBorderColor: 'inherit',
- // textBorderWidth: 1,
+ color: 'rgba(0,0,0,.45)',
fontSize: 16,
formatter: function(params) {
if (params.name !== '') {
@@ -795,7 +758,10 @@
labelLine: {
show: true,
length2: 15,
- length: 15
+ length: 15,
+ lineStyle: {
+ color: 'rgba(0,0,0,.45)'
+ }
},
data: this.warrantyMalfunctionData
}
@@ -820,9 +786,9 @@
this.maintenanceConfig = {
indexHeader: '搴忓彿',
header: ['杞﹂棿', '鏃ユ湡', '鍐呭'],
- headerBGC: '#2C8BB2',
- oddRowBGC: '#244B58',
- evenRowBGC: '#295562',
+ headerBGC: '#46B7E3',
+ oddRowBGC: '#0383AF',
+ evenRowBGC: '#0395C9',
rowNum: 1,
data: this.twoMaintenanceChartData,
index: true,
@@ -833,14 +799,8 @@
/* 缁樺埗鍗曟煴鍥� */
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
- else yAxisMax = Math.ceil(dataMax / 5) * 5 // 璁剧疆鏌卞浘鑳屾櫙闃村奖榛樿鍊硷紝鎬濊矾涓烘暟鎹渶澶у�兼渶鎺ヨ繎鐨勮兘琚�5鏁撮櫎鐨勬暟瀛�
- const yAxisInterval = yAxisMax / 5 // 鍚屾椂灏嗗埢搴﹀�煎垎鎴�5浠�
- this.barChartData.forEach(item => defaultData.push(yAxisMax))
+ let barTopColor = ['#EA967B', '#62AC75', '#32ACBF', '#7196CE']
+ let barBottomColor = ['#F8E18B', '#A8D07C', '#7BCAC5', '#8DCCEF']
const option = {
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
@@ -862,107 +822,113 @@
formatter: function(params) {
return '<span style="font-weight:bolder;">' + params[0].name + '</span><br/>' +
'<span style="display:inline-block; width:10px; height:10px; border-radius:100px; margin-right:5px; background:' + params[0].color + '"></span>' + ' OEE: ' + params[0].value + '%'
- },
- // backgroundColor: 'rgba(9, 24, 48, 0.5)',
- borderColor: 'rgba(75, 253, 238, 0.4)',
- textStyle: {
- // color: '#CFE3FC'
- },
- borderWidth: 1
+ }
},
grid: {
top: '15%',
left: '10%'
},
- xAxis: [{
- name: '',
- nameLocation: 'middle',
- nameGap: 40, // x杞磏ame涓庢í鍧愭爣杞寸嚎鐨勯棿璺�
- type: 'category',
- data: this.barChartData.map(item => item.productionId),
+ xAxis: {
+ data: this.barChartData.map(item => item.name),
+ axisTick: {
+ show: false
+ },
axisLine: {
+ show: true,
lineStyle: {
- color: '#FFFFFF'
+ color: 'rgba(0,0,0,.45)'
}
},
axisLabel: {
- show: true, // 鏄惁鏄剧ず鍒诲害鏍囩锛岄粯璁ゆ樉绀�
- interval: 0, // 鍧愭爣杞村埢搴︽爣绛剧殑鏄剧ず闂撮殧锛屽湪绫荤洰杞翠腑鏈夋晥锛涢粯璁や細閲囩敤鏍囩涓嶉噸鍙犵殑绛栫暐闂撮殧鏄剧ず鏍囩锛涘彲浠ヨ缃垚0寮哄埗鏄剧ず鎵�鏈夋爣绛撅紱濡傛灉璁剧疆涓�1锛岃〃绀恒�庨殧涓�涓爣绛炬樉绀轰竴涓爣绛俱�忥紝濡傛灉鍊间负2锛岃〃绀洪殧涓や釜鏍囩鏄剧ず涓�涓爣绛撅紝浠ユ绫绘帹銆�
- 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,
- alignWithLabel: true
- }
- }],
- yAxis: [{
+ rotate: 20,
+ margin: 25,
+ textStyle: {
+ fontSize: 14,
+ color: 'rgba(0,0,0,.45)',
+ align: 'center'
+ }
+ },
+ interval: 0
+ },
+ yAxis: {
name: '%',
- min: 0,
- max: yAxisMax,
- interval: yAxisInterval,
- axisLabel: {
- formatter: '{value}',
- color: '#fff',
- fontSize: 14
+ splitLine: {
+ show: false
},
axisTick: {
show: false
},
axisLine: {
- show: false,
+ show: true,
lineStyle: {
- color: '#FFFFFF'
+ color: 'rgba(0,0,0,.45)'
}
},
- splitLine: {
- show: false,
- lineStyle: {
- color: 'rgba(255,255,255,0.12)'
- }
- }
- }],
- series: [{
- type: 'bar',
- data: this.barChartData,
- barWidth: this.barChartData.length > 5 ? '40%' : 30,
- itemStyle: {
- color: function(params) {
- let num = colorArray.length
- return colorArray[params.dataIndex % num]
- },
- barBorderRadius: 100
- },
- zlevel: 1,
- label: {
- show: false,
- lineHeight: 10,
- formatter: params => {
- if (+params.value === 0) return ''
- else return params.value
- },
- position: 'top',
+ axisLabel: {
+ show: true,
+ margin: 10,
textStyle: {
- color: '#fff',
- fontSize: 16
+ fontSize: 14,
+ color: 'rgba(0,0,0,.45)'
}
}
},
+ series: [
{
- name: '鑳屾櫙',
- type: 'bar',
- barWidth: this.barChartData.length > 5 ? '40%' : 30,
- barGap: '-100%',
- data: defaultData,
+ type: 'pictorialBar',
+ symbolSize: [26, 10],
+ symbolOffset: [0, -5],
+ z: 12,
itemStyle: {
- color: '#11294d',
- barBorderRadius: 100
- }
+ color: function(params) {
+ return barBottomColor[params.dataIndex % barBottomColor.length]
+ }
+ },
+ label: {
+ show: true,
+ position: 'top',
+ fontSize: 12,
+ color: 'rgba(0,0,0,.45)'
+ },
+ symbolPosition: 'end',
+ data: this.barChartData
+ },
+ {
+ type: 'pictorialBar',
+ symbolSize: [26, 10],
+ symbolOffset: [0, 5],
+ z: 12,
+ itemStyle: {
+ color: function(params) {
+ return barTopColor[params.dataIndex % barTopColor.length]
+ }
+ },
+ data: this.barChartData
+ },
+ {
+ type: 'bar',
+ itemStyle: {
+ color: function(params) {
+ return new echarts.graphic.LinearGradient(
+ 0, 0, 0, 1,
+ [{
+ offset: 1,
+ color: barTopColor[params.dataIndex % barTopColor.length]
+ },
+ {
+ offset: 0,
+ color: barBottomColor[params.dataIndex % barBottomColor.length]
+ }
+ ]
+ )
+ },
+ opacity: .9
+ },
+ z: 16,
+ barWidth: 26,
+ barGap: '-100%',
+ data: this.barChartData
}]
}
option.title.text = moment().subtract(1, 'months').format('M鏈�') + `OEE`
@@ -986,7 +952,7 @@
/* 缁樺埗鍙屾煴鍥� */
drawDoubleBarChart() {
const option = {
- color: ['#66DFE2', '#79CEAA'],
+ color: ['#1890FF', '#2EC35C'],
tooltip: {
confine: true,
formatter: function(params) {
@@ -1010,7 +976,7 @@
formatter: ['{a|{name}}'].join('\n'),
textStyle: {
fontSize: 14,
- color: '#fff',
+ color: 'rgba(0, 0, 0, .45)',
height: 8,
rich: {
a: {
@@ -1024,13 +990,14 @@
type: 'category',
data: this.doubleBarChartData.dateList,
axisLine: {
+ show: true,
lineStyle: {
- color: 'rgba(255,255,255,0.45)'
+ color: 'rgba(0,0,0,.45)'
}
},
axisLabel: {
fontSize: 14,
- color: '#fff'
+ color: 'rgba(0,0,0,.45)'
},
axisTick: {
show: true
@@ -1040,13 +1007,16 @@
{
name: '%',
nameTextStyle: {
- color: '#fff'
+ color: 'rgba(0,0,0,.45)'
},
type: 'value',
min: 0,
minInterval: 1,
axisLine: {
- show: true
+ show: true,
+ lineStyle: {
+ color: 'rgba(0,0,0,.45)'
+ }
},
axisTick: {
show: true
@@ -1060,14 +1030,17 @@
},
axisLabel: {
fontSize: 14,
- color: '#fff',
+ color: 'rgba(0,0,0,.45)',
fontFamily: 'Bebas'
}
},
{
type: 'value',
axisLine: {
- show: true
+ show: true,
+ lineStyle: {
+ color: 'rgba(0,0,0,.45)'
+ }
},
axisTick: {
show: false
@@ -1079,51 +1052,55 @@
fontSize: 14,
formatter: '{value}%', // 鍙充晶Y杞存枃瀛楁樉绀�
fontFamily: 'Bebas',
- color: '#6A93B9'
+ color: 'rgba(0,0,0,.45)'
},
splitArea: {
show: false
}
}],
- series: [{
- type: 'bar',
- barWidth: 15,
- itemStyle: { barBorderRadius: 100 },
- name: 'OEE',
- data: this.doubleBarChartData.oeeList,
- label: {
- show: false,
- lineHeight: 10,
- formatter: params => {
- if (+params.value === 0) return ''
- else return params.value
- },
- position: 'inside',
- textStyle: {
- color: '#fff',
- fontSize: 12
+ series: [
+ {
+ type: 'bar',
+ barWidth: 20,
+ barGap: '0%',
+ itemStyle: { barBorderRadius: 4 },
+ name: 'OEE',
+ data: this.doubleBarChartData.oeeList,
+ label: {
+ show: true,
+ lineHeight: 10,
+ formatter: params => {
+ if (+params.value === 0) return ''
+ else return params.value
+ },
+ position: 'top',
+ textStyle: {
+ color: 'rgba(0,0,0,.45)',
+ fontSize: 10
+ }
+ }
+ },
+ {
+ type: 'bar',
+ barWidth: 20,
+ barGap: '0%',
+ itemStyle: { barBorderRadius: 4 },
+ name: 'TEEP',
+ data: this.doubleBarChartData.utilizationList,
+ label: {
+ show: true,
+ lineHeight: 10,
+ formatter: params => {
+ if (+params.value === 0) return ''
+ else return params.value
+ },
+ position: 'inside',
+ textStyle: {
+ color: 'rgba(0,0,0,.45)',
+ fontSize: 10
+ }
}
}
- }, {
- type: 'bar',
- barWidth: 15,
- itemStyle: { barBorderRadius: 100 },
- name: 'TEEP',
- data: this.doubleBarChartData.utilizationList,
- label: {
- show: false,
- lineHeight: 10,
- formatter: params => {
- if (+params.value === 0) return ''
- else return params.value
- },
- position: 'inside',
- textStyle: {
- color: '#fff',
- fontSize: 12
- }
- }
- }
]
}
this.doubleBarChart.setOption(option, true)
@@ -1134,14 +1111,14 @@
drawWorkshopProblemChart() {
this.problemConfig = {
indexHeader: '搴忓彿',
- header: ['闂鍐呭', '鏃堕棿'],
- headerBGC: '#86D186',
- oddRowBGC: '#7CBF7C',
- evenRowBGC: '#7CBF7C',
+ header: ['鏃堕棿', '闂鍐呭'],
+ headerBGC: '#A5CCE6',
+ oddRowBGC: '#6B9FCD',
+ evenRowBGC: '#5A7D9A',
data: this.workshopProblemChartData,
index: true,
- columnWidth: [100, 300, 150],
- align: ['center']
+ columnWidth: [100, 200, 300],
+ align: ['center', 'center', 'center']
}
},
@@ -1152,9 +1129,10 @@
openMaintenanceModal(record) {
this.modalTitle = record.planTime
this.modalDataApiParams = {
- productionCode: this.productionCode
+ productionCode: this.productionCode,
+ code: record.code
}
- this.modalDataApiUrl = record.apiUrl
+ this.modalDataApiUrl = '/eam/home/maintenanceList'
this.modalVisible = true
},
diff --git a/src/views/dashboard/IndexSignage.vue b/src/views/dashboard/IndexSignage.vue
index 949d5f3..0b3598c 100644
--- a/src/views/dashboard/IndexSignage.vue
+++ b/src/views/dashboard/IndexSignage.vue
@@ -160,8 +160,7 @@
this.runningStateChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: 'rgba(0, 0, 0, .45)',
- maskColor: 'transparent' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)'
})
signageApi.getEquipmentStatusStatisticsApi()
.then(res => {
@@ -180,8 +179,7 @@
this.efficiencyChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: 'rgba(0, 0, 0, .45)',
- maskColor: 'transparent' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)'
})
signageApi.getEquipmentUtilizationStatisticsApi()
.then(res => {
@@ -199,14 +197,12 @@
this.techConditionChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: 'rgba(0, 0, 0, .45)',
- maskColor: 'transparent' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)'
})
this.warrantyMalfunctionChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: 'rgba(0, 0, 0, .45)',
- maskColor: 'transparent' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)'
})
signageApi.getEquipmentTechnologyStatusAndReportRepairEquipmentListApi()
.then(res => {
@@ -281,8 +277,7 @@
this.barChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: 'rgba(0, 0, 0, .45)',
- maskColor: 'transparent' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)'
})
signageApi.getEquipmentOEEStatistics()
.then(res => {
@@ -299,8 +294,7 @@
this.doubleBarChart.showLoading({
text: '鏁版嵁鍔犺浇涓� ...',
color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
- textColor: 'rgba(0, 0, 0, .45)',
- maskColor: 'transparent' // 閬僵灞�
+ textColor: 'rgba(0, 0, 0, .45)'
})
signageApi.getEquipmentMonthStatisticsApi()
.then(res => {
@@ -413,6 +407,7 @@
/* 缁樺埗璁惧鍒╃敤鐜囪兌鍥婂浘 */
drawEfficiencyChart() {
+ const data = this.efficiencyData
const colorArray = [
{
top: '#EA967B',
@@ -431,14 +426,11 @@
bottom: '#8DCCEF'
}
]
- const data = this.efficiencyData
- const defaultData = []
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鏁撮櫎鐨勬暟瀛�
const yAxisInterval = yAxisMax / 5 // 鍚屾椂灏嗗埢搴﹀�煎垎鎴�5浠�
- data.forEach(item => defaultData.push(yAxisMax))
const option = {
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
@@ -482,7 +474,7 @@
},
show: true,
min: 0,
- max: 'dataMax',
+ max: dataMax,
interval: yAxisInterval,
type: 'value',
axisTick: {
@@ -795,14 +787,6 @@
/* 缁樺埗鍗曟煴鍥� */
drawBarChart() {
- const defaultData = []
- const dataMax = this.barChartData.length > 0 ? +this.barChartData.sort((x, y) => +y.value - +x.value)[0].value : 0
- let yAxisMax
- if (dataMax === 0) yAxisMax = 1 // 鑻ユ暟鎹腑鏈�澶у�间负0锛屽垯灏嗚儗鏅粯璁ゅ�艰缃负1
- else yAxisMax = Math.ceil(dataMax / 5) * 5 // 璁剧疆鏌卞浘鑳屾櫙闃村奖榛樿鍊硷紝鎬濊矾涓烘暟鎹渶澶у�兼渶鎺ヨ繎鐨勮兘琚�5鏁撮櫎鐨勬暟瀛�
- const yAxisInterval = yAxisMax / 5 // 鍚屾椂灏嗗埢搴﹀�煎垎鎴�5浠�
- this.barChartData.forEach(item => defaultData.push(yAxisMax))
- console.log('bar', this.barChartData)
let barTopColor = ['#EA967B', '#62AC75', '#32ACBF', '#7196CE']
let barBottomColor = ['#F8E18B', '#A8D07C', '#7BCAC5', '#8DCCEF']
const option = {
@@ -1061,47 +1045,49 @@
show: false
}
}],
- series: [{
- type: 'bar',
- barWidth: 20,
- barGap: '0%',
- itemStyle: { barBorderRadius: 4 },
- name: 'OEE',
- data: this.doubleBarChartData.oeeList,
- label: {
- show: true,
- lineHeight: 10,
- formatter: params => {
- if (+params.value === 0) return ''
- else return params.value
- },
- position: 'top',
- textStyle: {
- color: 'rgba(0,0,0,.45)',
- fontSize: 10
+ series: [
+ {
+ type: 'bar',
+ barWidth: 20,
+ barGap: '0%',
+ itemStyle: { barBorderRadius: 4 },
+ name: 'OEE',
+ data: this.doubleBarChartData.oeeList,
+ label: {
+ show: true,
+ lineHeight: 10,
+ formatter: params => {
+ if (+params.value === 0) return ''
+ else return params.value
+ },
+ position: 'top',
+ textStyle: {
+ color: 'rgba(0,0,0,.45)',
+ fontSize: 10
+ }
+ }
+ },
+ {
+ type: 'bar',
+ barWidth: 20,
+ barGap: '0%',
+ itemStyle: { barBorderRadius: 4 },
+ name: 'TEEP',
+ data: this.doubleBarChartData.utilizationList,
+ label: {
+ show: true,
+ lineHeight: 10,
+ formatter: params => {
+ if (+params.value === 0) return ''
+ else return params.value
+ },
+ position: 'inside',
+ textStyle: {
+ color: 'rgba(0,0,0,.45)',
+ fontSize: 10
+ }
}
}
- }, {
- type: 'bar',
- barWidth: 20,
- barGap: '0%',
- itemStyle: { barBorderRadius: 4 },
- name: 'TEEP',
- data: this.doubleBarChartData.utilizationList,
- label: {
- show: true,
- lineHeight: 10,
- formatter: params => {
- if (+params.value === 0) return ''
- else return params.value
- },
- position: 'inside',
- textStyle: {
- color: 'rgba(0,0,0,.45)',
- fontSize: 10
- }
- }
- }
]
}
this.doubleBarChart.setOption(option, true)
--
Gitblit v1.9.3