修改bug
This commit is contained in:
parent
6f2f751b0e
commit
9ea2f2dbe3
@ -57,7 +57,7 @@ export default {
|
|||||||
},
|
},
|
||||||
beProcessObj: {
|
beProcessObj: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => { }
|
default: () => {}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
|
@ -1,10 +1,3 @@
|
|||||||
<!--
|
|
||||||
* @Author: zhp
|
|
||||||
* @Date: 2024-07-08 14:51:47
|
|
||||||
* @LastEditTime: 2024-07-09 09:34:38
|
|
||||||
* @LastEditors: zhp
|
|
||||||
* @Description:
|
|
||||||
-->
|
|
||||||
<template>
|
<template>
|
||||||
<div id="chipPowerExpChart" style="width:552px;height:200px;" />
|
<div id="chipPowerExpChart" style="width:552px;height:200px;" />
|
||||||
</template>
|
</template>
|
||||||
@ -18,7 +11,7 @@ export default {
|
|||||||
props: {
|
props: {
|
||||||
beProcessObj: {
|
beProcessObj: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => {}
|
default: () => { }
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2024-07-08 14:51:47
|
* @Date: 2024-07-08 14:51:47
|
||||||
* @LastEditTime: 2024-07-09 09:58:43
|
* @LastEditTime: 2024-07-09 11:07:47
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -66,7 +66,8 @@ export default {
|
|||||||
},
|
},
|
||||||
legend: {
|
legend: {
|
||||||
bottom: 0,
|
bottom: 0,
|
||||||
left: 'center'
|
left: 'center',
|
||||||
|
itemGap:40,
|
||||||
},
|
},
|
||||||
series: [
|
series: [
|
||||||
{
|
{
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2024-04-15 10:49:13
|
* @Date: 2024-04-15 10:49:13
|
||||||
* @LastEditTime: 2024-07-09 10:17:41
|
* @LastEditTime: 2024-07-09 11:08:43
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -338,7 +338,7 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
async otherMethods(val) {
|
otherMethods(val) {
|
||||||
console.log(val)
|
console.log(val)
|
||||||
if (val.type === 'detail') {
|
if (val.type === 'detail') {
|
||||||
this.detailOrUpdateVisible = true;
|
this.detailOrUpdateVisible = true;
|
||||||
@ -347,10 +347,16 @@ export default {
|
|||||||
this.$refs.detailOrUpdate.init(val.data.id);
|
this.$refs.detailOrUpdate.init(val.data.id);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
const res = await getWorkOrderDetail(val.data.id)
|
getWorkOrderDetail(val.data.id).then((res) => {
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
// this.loading = false
|
// this.loading = false
|
||||||
;const data = res.data.prodWorkOrderDO
|
|
||||||
|
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 barList = [data.targetProduction, data.plannedInvestment, data.actualInvestment, data.actualProduction, data.wasteNum, data.reworkNum]
|
||||||
const seriesList = []
|
const seriesList = []
|
||||||
const dateList = []
|
const dateList = []
|
||||||
@ -360,10 +366,6 @@ export default {
|
|||||||
})
|
})
|
||||||
this.hisObj.seriesList = seriesList
|
this.hisObj.seriesList = seriesList
|
||||||
this.hisObj.dateList = dateList
|
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.produceData = barList
|
||||||
this.pieList = [
|
this.pieList = [
|
||||||
{ value: data.actualProduction ? data.actualProduction : 0, name: '实际产出' },
|
{ value: data.actualProduction ? data.actualProduction : 0, name: '实际产出' },
|
||||||
@ -374,6 +376,8 @@ export default {
|
|||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.exportPDF()
|
this.exportPDF()
|
||||||
})
|
})
|
||||||
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async getDataList() {
|
async getDataList() {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2024-04-15 10:49:13
|
* @Date: 2024-04-15 10:49:13
|
||||||
* @LastEditTime: 2024-07-08 13:39:32
|
* @LastEditTime: 2024-07-09 10:35:11
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -344,7 +344,7 @@ export default {
|
|||||||
},
|
},
|
||||||
async getDataList() {
|
async getDataList() {
|
||||||
console.log(this.listQuery.type);
|
console.log(this.listQuery.type);
|
||||||
if (this.listQuery.type == null) {
|
if (this.listQuery.type == null || this.listQuery.type == '') {
|
||||||
return this.$message('请选择时间维度')
|
return this.$message('请选择时间维度')
|
||||||
}
|
}
|
||||||
if (!this.listQuery.startDate && !this.listQuery.endDate) {
|
if (!this.listQuery.startDate && !this.listQuery.endDate) {
|
||||||
|
@ -546,7 +546,7 @@ export default {
|
|||||||
this.chartMsgYearTarget.series[0].data = []
|
this.chartMsgYearTarget.series[0].data = []
|
||||||
this.chartMsgYearTarget.series[1].data = []
|
this.chartMsgYearTarget.series[1].data = []
|
||||||
this.title = ''
|
this.title = ''
|
||||||
if (this.listQuery.date == null) {
|
if (this.listQuery.date == null || this.listQuery.date == '') {
|
||||||
return this.$message('请选择时间维度')
|
return this.$message('请选择时间维度')
|
||||||
}
|
}
|
||||||
if (!this.listQuery.beginTime && !this.listQuery.endTime) {
|
if (!this.listQuery.beginTime && !this.listQuery.endTime) {
|
||||||
|
@ -517,7 +517,7 @@ export default {
|
|||||||
this.chartMsgYearTarget.series[0].data = []
|
this.chartMsgYearTarget.series[0].data = []
|
||||||
this.chartMsgYearTarget.series[1].data = []
|
this.chartMsgYearTarget.series[1].data = []
|
||||||
console.log(this.listQuery);
|
console.log(this.listQuery);
|
||||||
if (this.listQuery.type == null) {
|
if (this.listQuery.type == null || this.listQuery.type == '') {
|
||||||
return this.$message('请选择时间维度')
|
return this.$message('请选择时间维度')
|
||||||
}
|
}
|
||||||
if (!this.listQuery.startDate && !this.listQuery.endDate) {
|
if (!this.listQuery.startDate && !this.listQuery.endDate) {
|
||||||
|
@ -649,7 +649,7 @@ export default {
|
|||||||
this.chartMsgYearTarget.series[3].data = []
|
this.chartMsgYearTarget.series[3].data = []
|
||||||
}
|
}
|
||||||
// console.log(this.listQuery);
|
// console.log(this.listQuery);
|
||||||
if (this.listQuery.type == null) {
|
if (this.listQuery.type == null || this.listQuery.type == '') {
|
||||||
return this.$message('请选择时间维度')
|
return this.$message('请选择时间维度')
|
||||||
}
|
}
|
||||||
if (!this.listQuery.startDate && !this.listQuery.endDate) {
|
if (!this.listQuery.startDate && !this.listQuery.endDate) {
|
||||||
|
@ -567,7 +567,7 @@ export default {
|
|||||||
this.chartMsgYearTarget.xData = []
|
this.chartMsgYearTarget.xData = []
|
||||||
this.chartMsgYearTarget.series[0].data = []
|
this.chartMsgYearTarget.series[0].data = []
|
||||||
this.chartMsgYearTarget.series[1].data = []
|
this.chartMsgYearTarget.series[1].data = []
|
||||||
if (this.listQuery.type == null) {
|
if (this.listQuery.type == null || this.listQuery.type == '') {
|
||||||
return this.$message('请选择时间维度')
|
return this.$message('请选择时间维度')
|
||||||
}
|
}
|
||||||
if (!this.listQuery.startDate && !this.listQuery.endDate) {
|
if (!this.listQuery.startDate && !this.listQuery.endDate) {
|
||||||
|
Loading…
Reference in New Issue
Block a user