From 1d79d3950a3d8c489ca9ee2c88a50b01e2b5ab6e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 09 五月 2024 14:54:32 +0800
Subject: [PATCH] 新增首页看板点击图表出现的弹窗组件
---
src/views/dashboard/IndexSignage.vue | 334 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 243 insertions(+), 91 deletions(-)
diff --git a/src/views/dashboard/IndexSignage.vue b/src/views/dashboard/IndexSignage.vue
index ff2faab..8681db6 100644
--- a/src/views/dashboard/IndexSignage.vue
+++ b/src/views/dashboard/IndexSignage.vue
@@ -15,39 +15,11 @@
<div id="warranty_malfunction_chart" style="width:50%;height: 340px;"></div>
</div>
<div class="support-plan-container">
- <!--<div v-for="item in supportPlanList" class="support-plan-item"-->
- <!--:style="{background:item.background}">-->
- <!--<div>{{item.label}}</div>-->
- <!--<div class="plan-value-container">-->
- <!--<div class="plan-value">{{item.value}}</div>-->
- <!--<div>鍙�</div>-->
- <!--</div>-->
- <!--</div>-->
- <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>
@@ -68,15 +40,21 @@
</dv-border-box-9>
</div>
</div>
+
+ <SignageModal :modalVisible="modalVisible" :modalTitle=modalTitle :modalDataApiUrl="modalDataApiUrl"
+ :modalTableColumns="modalTableColumns"
+ @closeModal="modalVisible=false"/>
</div>
</template>
<script>
import signageApi from '@/api/signage'
import moment from 'moment'
+ import SignageModal from './modules/SignageModal'
export default {
name: 'IndexSignage',
+ components: { SignageModal },
data() {
return {
runningStateChart: '',
@@ -100,54 +78,56 @@
{ value: '10', name: '鍋滄満' },
{ value: '8', name: '杩愯' }
],
+ supportPlanList: [
+ {
+ planTime: '鏈湀涓変繚璁″垝',
+ planValueLabel: 'thisMonthMaintenancePlanNum',
+ backgroundColor: '#5FE0AF'
+ },
+ {
+ planTime: '鏈湀瀹屾垚',
+ planValueLabel: 'thisMonthMaintenanceRealNum',
+ backgroundColor: '#409EFF'
+ },
+ {
+ planTime: '涓嬫湀涓変繚璁″垝',
+ planValueLabel: 'nextMonthMaintenancePlanNum',
+ backgroundColor: '#D6BC52'
+ },
+ {
+ planTime: '涓嬩笅鏈堜笁淇濊鍒�',
+ planValueLabel: 'nextNextMonthMaintenancePlanNum',
+ backgroundColor: '#58D9F9'
+ }
+ ],
thisMonthMaintenancePlanNum: 0,
thisMonthMaintenanceRealNum: 0,
nextMonthMaintenancePlanNum: 0,
nextNextMonthMaintenancePlanNum: 0,
twoMaintenanceChartData: [['-', '-', '-']],
barChart: '',
- barChartData: [
- {
- 'value': '32',
- 'name': '401',
- 'productionCode': '125487318',
- 'productionId': '1729419336207761409'
- },
- {
- 'value': '23',
- 'name': '406',
- 'productionCode': '4212152142',
- 'productionId': '1729419361201618945'
- },
- {
- 'value': '11',
- 'name': '407',
- 'productionCode': '321321345',
- 'productionId': '1729419381665628161'
- },
- {
- 'value': '44',
- 'name': '408',
- 'productionCode': '536341343',
- 'productionId': '1729670118396067842'
- }
- ],
+ barChartData: [],
doubleBarChart: '',
doubleBarChartData: {},
efficiencyChartConfig: {},
maintenanceConfig: {},
- problemConfig: {}
+ problemConfig: {},
+ modalVisible: false,
+ modalTitle: '',
+ modalDataApiUrl: '',
+ modalTableColumns: []
}
},
mounted() {
window.addEventListener('resize', this.handleWindowResize)
- this.drawCharts()
this.getChartDataByApi()
+ this.drawProblemChart()
},
beforeDestroy() {
window.removeEventListener('resize', this.handleWindowResize)
},
methods: {
+ /* 璋冪敤鎺ュ彛鑾峰彇鍥捐〃鏁版嵁姹囨�绘柟娉� */
getChartDataByApi() {
this.getRunningStateDataByApi()
this.getEfficiencyDataByApi()
@@ -155,21 +135,35 @@
this.getWarrantyMalfunctionDataByApi()
this.getMonthMaintenanceNumByApi()
this.getTwoMaintenanceChartDataByApi()
- // this.getBarChartDataByApi()
+ this.getBarChartDataByApi()
this.getDoubleBarChartDataByApi()
},
/* 璋冪敤鎺ュ彛鑾峰彇璁惧杩愯鐘舵�� */
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()
.then(res => {
if (res.success) this.runningStateData = res.result.list
- this.drawRunningStateChart(res.result.producitonId)
+ this.drawRunningStateChart(res.result.productionId)
})
},
/* 璋冪敤鎺ュ彛鑾峰彇璁惧鍒╃敤鐜� */
getEfficiencyDataByApi() {
+ this.efficiencyChart = this.$echarts.init(document.getElementById('efficiency_chart'))
+ this.efficiencyChart.showLoading({
+ text: '鏁版嵁鍔犺浇涓� ...',
+ color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
+ textColor: '#fff',
+ maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ })
signageApi.getEquipmentUtilizationStatisticsApi()
.then(res => {
if (res.success) this.efficiencyData = res.result
@@ -179,9 +173,16 @@
/* 璋冪敤鎺ュ彛鑾峰彇鎶�鏈姸鎬� */
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()
.then(res => {
- if (res.success) {
+ if (res.success && res.result) {
this.techConditionData = [
{ value: res.result[0].qualifiedCount, name: '鍚堟牸' },
{ value: res.result[0].disabledCount, name: '绂佺敤' },
@@ -194,9 +195,16 @@
/* 璋冪敤鎺ュ彛鑾峰彇璁惧鎶ヤ慨鏁呴殰 */
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()
.then(res => {
- if (res.success) {
+ if (res.success && res.result) {
this.warrantyMalfunctionData = [
{ value: res.result[0].failurTotalCount, name: '鎶ヤ慨' },
{ value: res.result[0].stopCount, name: '鍋滄満' },
@@ -238,6 +246,13 @@
/* 璋冪敤鎺ュ彛鑾峰彇璁惧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.getEquipmentOEEStatistics()
.then(res => {
if (res.success) this.barChartData = res.result
@@ -247,6 +262,13 @@
/* 璋冪敤鎺ュ彛鑾峰彇璁惧OEE鍜屽埄鐢ㄧ巼瀵规瘮 */
getDoubleBarChartDataByApi() {
+ this.doubleBarChart = this.$echarts.init(document.getElementById('double_bar_chart'))
+ this.doubleBarChart.showLoading({
+ text: '鏁版嵁鍔犺浇涓� ...',
+ color: '#0696e1', // 鍔犺浇鍔ㄧ敾棰滆壊
+ textColor: '#fff',
+ maskColor: 'rgba(1, 25, 75, 0.2)' // 閬僵灞�
+ })
signageApi.getEquipmentMonthStatisticsApi()
.then(res => {
if (res.success) this.doubleBarChartData = res.result
@@ -254,21 +276,8 @@
})
},
- /* 缁樺埗鍥捐〃姹囨�绘柟娉� */
- drawCharts() {
- this.drawRunningStateChart()
- this.drawEfficiencyChart()
- this.drawTechConditionChart()
- this.drawWarrantyMalfunctionChart()
- this.drawMaintenanceChart()
- this.drawBarChart()
- this.drawDoubleBarChart()
- this.drawProblemChart()
- },
-
/* 缁樺埗璁惧杩愯鐘舵�佺帿鐟伴ゼ鍥� */
drawRunningStateChart(productionId) {
- this.runningStateChart = this.$echarts.init(document.getElementById('running_state_chart'))
const option = {
height: 300,
title: {
@@ -346,6 +355,7 @@
]
}
this.runningStateChart.setOption(option, true)
+ this.runningStateChart.hideLoading()
this.runningStateChart.on('click', params => {
this.$router.push({
@@ -357,7 +367,6 @@
/* 缁樺埗璁惧鍒╃敤鐜囪兌鍥婂浘 */
drawEfficiencyChart() {
- this.efficiencyChart = this.$echarts.init(document.getElementById('efficiency_chart'))
const data = this.efficiencyData
const colorArray = [
{
@@ -388,7 +397,13 @@
bottom: '#F7B7A0'
}
]
- const defaultData = [100, 100, 100, 100, 100, 100, 100, 100, 100, 100]
+ const defaultData = []
+ const dataMax = +data.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浠�
+ data.forEach(item => defaultData.push(yAxisMax))
const option = {
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
@@ -420,7 +435,7 @@
}
},
xAxis: {
- name: '鍗曚綅',
+ name: '',
nameTextStyle: {
color: '#fff'
},
@@ -431,6 +446,9 @@
}
},
show: true,
+ min: 0,
+ max: 'dataMax',
+ interval: yAxisInterval,
type: 'value',
axisTick: {
show: false
@@ -544,9 +562,9 @@
}
]
}
- option.title.text = `${moment().format('M鏈圖鏃�')}鍒╃敤鐜嘸
+ option.title.text = `${moment().subtract(1, 'days').format('M鏈圖鏃�')}鍒╃敤鐜嘸
this.efficiencyChart.setOption(option, true)
-
+ this.efficiencyChart.hideLoading()
this.efficiencyChart.on('click', params => {
// 鐐瑰嚮瑙﹀彂鐨勪负鏌辩姸浣擄紝闄ゆ闄ゅ鏄爣棰�
if (params.componentType === 'series') {
@@ -576,7 +594,6 @@
/* 缁樺埗鎶�鏈姸鎬侀ゼ鍥� */
drawTechConditionChart() {
- this.techConditionChart = this.$echarts.init(document.getElementById('tech_condition_chart'))
const option = {
height: 300,
title: {
@@ -625,7 +642,7 @@
center: ['45%', '60%'],
color: [
'#0FC61A',
- '#0DAF15',
+ '#F56436',
'#8B8B8B'
],
label: {
@@ -651,11 +668,55 @@
]
}
this.techConditionChart.setOption(option, true)
+ this.techConditionChart.hideLoading()
+
+ // this.techConditionChart.on('click', params => {
+ // console.log('params', params)
+ // this.modalTitle = '鎶�鏈姸鎬�'
+ // this.modalTableColumns = [
+ // {
+ // title: '#',
+ // dataIndex: '',
+ // key: 'rowIndex',
+ // width: 60,
+ // align: 'center',
+ // customRender: function(t, r, index) {
+ // return parseInt(index) + 1
+ // }
+ // },
+ // {
+ // title: '璁惧缂栧彿',
+ // dataIndex: 'equipmentId',
+ // key: 'equipmentId'
+ // },
+ // {
+ // title: '璁惧鍚嶇О',
+ // dataIndex: 'equipmentName',
+ // key: 'equipmentName'
+ // },
+ // {
+ // title: '璁惧鍨嬪彿',
+ // dataIndex: 'equipmentModel',
+ // key: 'equipmentModel'
+ // },
+ // {
+ // title: '璁惧绫诲瀷',
+ // key: 'equipmentType',
+ // dataIndex: 'equipmentType'
+ // },
+ // {
+ // title: '椹卞姩绫诲瀷',
+ // key: 'driveType',
+ // dataIndex: 'driveType'
+ // }
+ // ]
+ // this.modalDataApiUrl = '/mdc/mdcEquipment/list'
+ // this.modalVisible = true
+ // })
},
/* 缁樺埗璁惧鎶ヤ慨鏁呴殰楗煎浘 */
drawWarrantyMalfunctionChart() {
- this.warrantyMalfunctionChart = this.$echarts.init(document.getElementById('warranty_malfunction_chart'))
const option = {
height: 300,
title: {
@@ -730,6 +791,46 @@
]
}
this.warrantyMalfunctionChart.setOption(option, true)
+ this.warrantyMalfunctionChart.hideLoading()
+
+ // this.warrantyMalfunctionChart.on('click', params => {
+ // console.log('params', params)
+ // this.modalTitle = '鎶ヤ慨鏁呴殰'
+ // this.modalTableColumns = [
+ // {
+ // title: '#',
+ // dataIndex: '',
+ // key: 'rowIndex',
+ // width: 60,
+ // align: 'center',
+ // customRender: function(t, r, index) {
+ // return parseInt(index) + 1
+ // }
+ // },
+ // {
+ // title: '绫诲瀷',
+ // align: 'center',
+ // dataIndex: 'planCloseType'
+ // },
+ // {
+ // title: '鏃堕棿绫诲瀷',
+ // align: 'center',
+ // dataIndex: 'planCloseTimeType'
+ // },
+ // {
+ // title: '鏃堕暱锛堝垎閽燂級',
+ // align: 'center',
+ // dataIndex: 'planCloseTimeLong'
+ // },
+ // {
+ // title: '澶囨敞',
+ // align: 'center',
+ // dataIndex: 'remark'
+ // }
+ // ]
+ // this.modalDataApiUrl = '/mdc/mdcPlanClose/list'
+ // this.modalVisible = true
+ // })
},
/* 缁樺埗杞﹂棿淇濆吇婊氬姩琛� */
@@ -742,15 +843,20 @@
evenRowBGC: '#295562',
data: this.twoMaintenanceChartData,
index: true,
- columnWidth: [100],
+ columnWidth: [100, 300, 300, 300],
align: ['center', 'center', 'center', 'center']
}
},
/* 缁樺埗鍗曟煴鍥� */
drawBarChart() {
- this.barChart = this.$echarts.init(document.getElementById('bar_chart'))
- const defaultData = [100, 100, 100, 100, 100, 100, 100, 100, 100, 100]
+ const defaultData = []
+ 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 option = {
title: {
show: true, // 鏄惁鏄剧ず鏍囬锛岄粯璁や负true
@@ -812,10 +918,12 @@
}],
yAxis: [{
name: '%',
- max: 100,
+ min: 0,
+ max: yAxisMax,
+ interval: yAxisInterval,
axisLabel: {
formatter: '{value}',
- color: '#e2e9ff'
+ color: '#fff'
},
axisTick: {
show: false
@@ -868,6 +976,7 @@
}
option.title.text = moment().subtract(1, 'months').format('M鏈�') + `OEE杞﹂棿`
this.barChart.setOption(option, true)
+ this.barChart.hideLoading()
this.barChart.on('click', params => {
console.log('params', params)
@@ -886,7 +995,6 @@
/* 缁樺埗鍙屾煴鍥� */
drawDoubleBarChart() {
- this.doubleBarChart = this.$echarts.init(document.getElementById('double_bar_chart'))
const option = {
color: ['#409EFF', '#0FC61A'],
tooltip: {
@@ -1032,6 +1140,7 @@
]
}
this.doubleBarChart.setOption(option, true)
+ this.doubleBarChart.hideLoading()
},
/* 缁樺埗闂婊氬姩琛� */
@@ -1058,6 +1167,48 @@
columnWidth: [100, 300, 300],
align: ['center']
}
+ },
+
+ /**
+ * 鐐瑰嚮涓変繚灞曠ず鏍忓悗鎵撳紑寮圭獥
+ * @param record 鐐瑰嚮褰撳墠涓変繚淇℃伅
+ */
+ openMaintenanceModal(record) {
+ this.modalTitle = record.planTime
+ this.modalTableColumns = [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ }
+ },
+ {
+ title: '绫诲瀷',
+ align: 'center',
+ dataIndex: 'planCloseType'
+ },
+ {
+ title: '鏃堕棿绫诲瀷',
+ align: 'center',
+ dataIndex: 'planCloseTimeType'
+ },
+ {
+ title: '鏃堕暱锛堝垎閽燂級',
+ align: 'center',
+ dataIndex: 'planCloseTimeLong'
+ },
+ {
+ title: '澶囨敞',
+ align: 'center',
+ dataIndex: 'remark'
+ }
+ ]
+ this.modalDataApiUrl = '/mdc/mdcPlanClose/list'
+ // this.modalVisible = true
},
/**
@@ -1105,6 +1256,7 @@
padding: 5px 20px;
font-size: 20px;
margin-bottom: 10px;
+ cursor: pointer;
.plan-value-container {
display: flex;
--
Gitblit v1.9.3