修改bug

This commit is contained in:
‘937886381’ 2024-07-09 11:10:38 +08:00
parent 6f2f751b0e
commit 9ea2f2dbe3
9 changed files with 42 additions and 44 deletions

View File

@ -1,10 +1,3 @@
<!--
* @Author: zhp
* @Date: 2024-07-08 14:51:47
* @LastEditTime: 2024-07-09 09:34:38
* @LastEditors: zhp
* @Description:
-->
<template>
<div id="chipPowerExpChart" style="width:552px;height:200px;" />
</template>

View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-07-08 14:51:47
* @LastEditTime: 2024-07-09 09:58:43
* @LastEditTime: 2024-07-09 11:07:47
* @LastEditors: zhp
* @Description:
-->
@ -66,7 +66,8 @@ export default {
},
legend: {
bottom: 0,
left: 'center'
left: 'center',
itemGap:40,
},
series: [
{

View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-07-09 10:17:41
* @LastEditTime: 2024-07-09 11:08:43
* @LastEditors: zhp
* @Description:
-->
@ -338,7 +338,7 @@ export default {
}
})
},
async otherMethods(val) {
otherMethods(val) {
console.log(val)
if (val.type === 'detail') {
this.detailOrUpdateVisible = true;
@ -347,9 +347,15 @@ export default {
this.$refs.detailOrUpdate.init(val.data.id);
});
} else {
const res = await getWorkOrderDetail(val.data.id)
getWorkOrderDetail(val.data.id).then((res) => {
if (res.code === 0) {
// this.loading = false
const xAxisList = Object.keys(res.data.inProcessDis)
const yAxisList = Object.values(res.data.inProcessDis)
this.beProcessObj.xAxisList = xAxisList
this.beProcessObj.yAxisList = yAxisList
// console.log(this.beProcessObj)
; const data = res.data.prodWorkOrderDO
const barList = [data.targetProduction, data.plannedInvestment, data.actualInvestment, data.actualProduction, data.wasteNum, data.reworkNum]
const seriesList = []
@ -360,10 +366,6 @@ export default {
})
this.hisObj.seriesList = seriesList
this.hisObj.dateList = dateList
const xAxisList = Object.keys(res.data.inProcessDis)
const yAxisList = Object.values(res.data.inProcessDis)
this.beProcessObj.xAxisList = xAxisList
this.beProcessObj.yAxisList = yAxisList
this.produceData = barList
this.pieList = [
{ value: data.actualProduction ? data.actualProduction : 0, name: '实际产出' },
@ -374,6 +376,8 @@ export default {
this.$nextTick(() => {
this.exportPDF()
})
})
}
},
async getDataList() {

View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-07-08 13:39:32
* @LastEditTime: 2024-07-09 10:35:11
* @LastEditors: zhp
* @Description:
-->
@ -344,7 +344,7 @@ export default {
},
async getDataList() {
console.log(this.listQuery.type);
if (this.listQuery.type == null) {
if (this.listQuery.type == null || this.listQuery.type == '') {
return this.$message('请选择时间维度')
}
if (!this.listQuery.startDate && !this.listQuery.endDate) {

View File

@ -546,7 +546,7 @@ export default {
this.chartMsgYearTarget.series[0].data = []
this.chartMsgYearTarget.series[1].data = []
this.title = ''
if (this.listQuery.date == null) {
if (this.listQuery.date == null || this.listQuery.date == '') {
return this.$message('请选择时间维度')
}
if (!this.listQuery.beginTime && !this.listQuery.endTime) {

View File

@ -517,7 +517,7 @@ export default {
this.chartMsgYearTarget.series[0].data = []
this.chartMsgYearTarget.series[1].data = []
console.log(this.listQuery);
if (this.listQuery.type == null) {
if (this.listQuery.type == null || this.listQuery.type == '') {
return this.$message('请选择时间维度')
}
if (!this.listQuery.startDate && !this.listQuery.endDate) {

View File

@ -649,7 +649,7 @@ export default {
this.chartMsgYearTarget.series[3].data = []
}
// console.log(this.listQuery);
if (this.listQuery.type == null) {
if (this.listQuery.type == null || this.listQuery.type == '') {
return this.$message('请选择时间维度')
}
if (!this.listQuery.startDate && !this.listQuery.endDate) {

View File

@ -567,7 +567,7 @@ export default {
this.chartMsgYearTarget.xData = []
this.chartMsgYearTarget.series[0].data = []
this.chartMsgYearTarget.series[1].data = []
if (this.listQuery.type == null) {
if (this.listQuery.type == null || this.listQuery.type == '') {
return this.$message('请选择时间维度')
}
if (!this.listQuery.startDate && !this.listQuery.endDate) {