From 90964e8f07b9ad3cb2c5f34c8784d7e2c32974fd Mon Sep 17 00:00:00 2001
From: zhaowei
Date: 星期一, 08 七月 2024 14:57:55 +0800
Subject: [PATCH] 1、标准加工时间页面取消设备层面字段展示以及取消选择左侧设备树 2、加工数量管理页面新增添加表格记录时的设备选择功能
---
src/views/dashboard/IndexSignage.vue | 203 +++++++++++++-------------------------------------
1 files changed, 53 insertions(+), 150 deletions(-)
diff --git a/src/views/dashboard/IndexSignage.vue b/src/views/dashboard/IndexSignage.vue
index 8681db6..6785b75 100644
--- a/src/views/dashboard/IndexSignage.vue
+++ b/src/views/dashboard/IndexSignage.vue
@@ -42,7 +42,7 @@
</div>
<SignageModal :modalVisible="modalVisible" :modalTitle=modalTitle :modalDataApiUrl="modalDataApiUrl"
- :modalTableColumns="modalTableColumns"
+ :modalDataApiParams="modalDataApiParams"
@closeModal="modalVisible=false"/>
</div>
</template>
@@ -82,46 +82,51 @@
{
planTime: '鏈湀涓変繚璁″垝',
planValueLabel: 'thisMonthMaintenancePlanNum',
- backgroundColor: '#5FE0AF'
+ backgroundColor: '#5FE0AF',
+ apiUrl: '/eam/calibrationOrder/showThisMonthMaintenanceList'
},
{
planTime: '鏈湀瀹屾垚',
planValueLabel: 'thisMonthMaintenanceRealNum',
- backgroundColor: '#409EFF'
+ backgroundColor: '#409EFF',
+ apiUrl: '/eam/calibrationOrder/showThisMonthMaintenanceFinishList'
},
{
planTime: '涓嬫湀涓変繚璁″垝',
planValueLabel: 'nextMonthMaintenancePlanNum',
- backgroundColor: '#D6BC52'
+ backgroundColor: '#D6BC52',
+ apiUrl: '/eam/calibrationOrder/showNextMonthMaintenanceList'
},
{
planTime: '涓嬩笅鏈堜笁淇濊鍒�',
planValueLabel: 'nextNextMonthMaintenancePlanNum',
- backgroundColor: '#58D9F9'
+ backgroundColor: '#58D9F9',
+ apiUrl: '/eam/calibrationOrder/showNextNextMonthMaintenanceList'
}
],
thisMonthMaintenancePlanNum: 0,
thisMonthMaintenanceRealNum: 0,
nextMonthMaintenancePlanNum: 0,
nextNextMonthMaintenancePlanNum: 0,
- twoMaintenanceChartData: [['-', '-', '-']],
+ twoMaintenanceChartData: [],
barChart: '',
barChartData: [],
doubleBarChart: '',
doubleBarChartData: {},
+ workshopProblemChartData: [],
efficiencyChartConfig: {},
maintenanceConfig: {},
problemConfig: {},
modalVisible: false,
modalTitle: '',
modalDataApiUrl: '',
- modalTableColumns: []
+ modalTableColumns: [],
+ modalDataApiParams: {}
}
},
mounted() {
window.addEventListener('resize', this.handleWindowResize)
this.getChartDataByApi()
- this.drawProblemChart()
},
beforeDestroy() {
window.removeEventListener('resize', this.handleWindowResize)
@@ -137,6 +142,7 @@
this.getTwoMaintenanceChartDataByApi()
this.getBarChartDataByApi()
this.getDoubleBarChartDataByApi()
+ this.getWorkshopProblemChartDataByApi()
},
/* 璋冪敤鎺ュ彛鑾峰彇璁惧杩愯鐘舵�� */
@@ -184,9 +190,9 @@
.then(res => {
if (res.success && res.result) {
this.techConditionData = [
- { value: res.result[0].qualifiedCount, name: '鍚堟牸' },
- { value: res.result[0].disabledCount, name: '绂佺敤' },
- { value: res.result[0].limitedUseCount, name: '闄愮敤' }
+ { value: res.result[0].qualifiedCount, name: '鍚堟牸', technologyStatus: 'qualified' },
+ { value: res.result[0].disabledCount, name: '绂佺敤', technologyStatus: 'disabled' },
+ { value: res.result[0].limitedUseCount, name: '闄愮敤', technologyStatus: 'limitedUse' }
]
}
this.drawTechConditionChart()
@@ -206,9 +212,9 @@
.then(res => {
if (res.success && res.result) {
this.warrantyMalfunctionData = [
- { value: res.result[0].failurTotalCount, name: '鎶ヤ慨' },
- { value: res.result[0].stopCount, name: '鍋滄満' },
- { value: res.result[0].noStopCount, name: '杩愯' }
+ { value: res.result[0].failurTotalCount, name: '鎶ヤ慨', isStop: '' },
+ { value: res.result[0].stopCount, name: '鍋滄満', isStop: '2' },
+ { value: res.result[0].noStopCount, name: '杩愯', isStop: '1' }
]
}
this.drawWarrantyMalfunctionChart()
@@ -239,7 +245,7 @@
getTwoMaintenanceChartDataByApi() {
signageApi.getTwoMaintenancePlanListApi()
.then(res => {
- if (res.success && res.result) this.twoMaintenanceChartData = res.result.map(item => [item.centerName, item.maintenanceDate, item.content])
+ if (res.success && res.result.length > 0) this.twoMaintenanceChartData = res.result.map(item => [item.centerName, item.maintenanceDate, item.content])
this.drawMaintenanceChart()
})
},
@@ -275,6 +281,16 @@
this.drawDoubleBarChart()
})
},
+
+ /* 璋冪敤鎺ュ彛鑾峰彇杞﹂棿闂鍒楄〃*/
+ getWorkshopProblemChartDataByApi() {
+ signageApi.getWorkshopProblemListApi()
+ .then(res => {
+ if (res.success && res.result.length > 0) this.workshopProblemChartData = res.result.map(item => [item.content, item.createTime])
+ this.drawWorkshopProblemChart()
+ })
+ },
+
/* 缁樺埗璁惧杩愯鐘舵�佺帿鐟伴ゼ鍥� */
drawRunningStateChart(productionId) {
@@ -569,7 +585,6 @@
// 鐐瑰嚮瑙﹀彂鐨勪负鏌辩姸浣擄紝闄ゆ闄ゅ鏄爣棰�
if (params.componentType === 'series') {
// 鏌辩姸浣撹烦杞粺璁″垎鏋愰〉闈㈠睍绀哄搴斿眰绾ф暟鎹�
- console.log('seriesParams===========', params)
let productionId
let tierName
// 鐐瑰嚮鐨勬槸鏌变綋鐨勫�硷紝鍚﹀垯鐐瑰嚮鐨勪负鏌变綋鑳屾櫙闃村奖
@@ -580,13 +595,11 @@
productionId = this.efficiencyData.find(item => item.productionCode === params.name).productionId
tierName = this.efficiencyData.find(item => item.productionCode === params.name).name
}
- console.log('productionId', productionId)
this.$router.push({
name: 'mdc-base-StatisticsChart',
params: { isEquipment: false, productionId, tierName }
})
} else {
- console.log('yAxisParams===========', params)
this.$emit('switchToNextSignage', { signageName: 'BranchFactory', productionCode: params.value })
}
})
@@ -670,49 +683,14 @@
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
- // })
+ this.techConditionChart.on('click', params => {
+ this.modalTitle = `鎶�鏈姸鎬侊紙${params.name}锛塦
+ this.modalDataApiParams = {
+ technologyStatus: this.techConditionData.find(item => item.name === params.name).technologyStatus
+ }
+ this.modalDataApiUrl = '/eam/calibrationOrder/showEquipmentByTechnologyStatus'
+ this.modalVisible = true
+ })
},
/* 缁樺埗璁惧鎶ヤ慨鏁呴殰楗煎浘 */
@@ -793,44 +771,14 @@
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
- // })
+ this.warrantyMalfunctionChart.on('click', params => {
+ this.modalTitle = `鎶ヤ慨鏁呴殰锛�${params.name}锛塦
+ this.modalDataApiParams = {
+ isStop: this.warrantyMalfunctionData.find(item => item.name === params.name).isStop
+ }
+ this.modalDataApiUrl = '/eam/calibrationOrder/showEquipmentByReportRepair'
+ this.modalVisible = true
+ })
},
/* 缁樺埗杞﹂棿淇濆吇婊氬姩琛� */
@@ -979,13 +927,11 @@
this.barChart.hideLoading()
this.barChart.on('click', params => {
- console.log('params', params)
let productionId
// 鐐瑰嚮鐨勬槸鏌变綋鐨勫�硷紝鍚﹀垯鐐瑰嚮鐨勪负鏌变綋鑳屾櫙闃村奖
if (params.seriesIndex === 0) productionId = params.data.productionId
else productionId = params.name
- console.log('productionId', productionId)
this.$router.push({
name: 'mdc-base-OEEAnalysis',
params: { isEquipment: false, productionId }
@@ -1144,27 +1090,16 @@
},
/* 缁樺埗闂婊氬姩琛� */
- drawProblemChart() {
+ drawWorkshopProblemChart() {
this.problemConfig = {
indexHeader: '搴忓彿',
- header: ['鏃堕棿', '闂鍐呭'],
+ header: ['闂鍐呭', '鏃堕棿'],
headerBGC: '#86D186',
oddRowBGC: '#7CBF7C',
evenRowBGC: '#7CBF7C',
- data: [
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂'],
- // ['2024骞�3鏈�23鍙�', '澶у娉ㄦ剰瀹夊叏闂']
- ],
+ data: this.workshopProblemChartData,
index: true,
- columnWidth: [100, 300, 300],
+ columnWidth: [100, 300, 150],
align: ['center']
}
},
@@ -1175,40 +1110,8 @@
*/
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
+ this.modalDataApiUrl = record.apiUrl
+ this.modalVisible = true
},
/**
--
Gitblit v1.9.3