mt-fe-group/yudao-init
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

projects/mescc/zhp #71

Merged
juzi merged 2 commits from projects/mescc/zhp into projects/mescc/develop 2024-06-27 16:56:15 +08:00
Conversation 0 Commits 2 Files Changed 2 +133 -73
3 changed files with 133 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 445ebe339d - Show all commits

4
src/views/produce/data/add-or-updata.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-11-06 15:15:30 * @Date: 2023-11-06 15:15:30
* @LastEditTime: 2024-06-25 08:59:33 * @LastEditTime: 2024-06-26 13:39:22
* @LastEditors: DY * @LastEditors: DY
* @Description: * @Description:
--> -->
@ -116,6 +116,8 @@
<p class="title">标准组件平均功率(W)</p> <p class="title">标准组件平均功率(W)</p>
<p class="text">{{ dataForm.componentAveragePower }}</p> <p class="text">{{ dataForm.componentAveragePower }}</p>
</el-col> </el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="6"> <el-col :span="6">
<p class="title">标准组件转化效率</p> <p class="title">标准组件转化效率</p>
<p class="text">{{ dataForm.componentTransRate }}</p> <p class="text">{{ dataForm.componentTransRate }}</p>

6
src/views/produce/data/index.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-04-15 10:49:13 * @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-06-26 11:00:11 * @LastEditTime: 2024-06-27 14:56:20
* @LastEditors: zhp * @LastEditors: DY
* @Description: * @Description:
--> -->
<template> <template>
@ -210,7 +210,7 @@ export default {
{ {
prop: 'factory', prop: 'factory',
label: '工厂名称', label: '工厂名称',
filter: (val) => [val], filter: (val) => factoryList[val],
minWidth: 180, minWidth: 180,
showOverflowtooltip: true showOverflowtooltip: true
}, },

190
src/views/produce/workOrder/add-or-updata.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-11-06 15:15:30 * @Date: 2023-11-06 15:15:30
* @LastEditTime: 2024-06-17 17:03:17 * @LastEditTime: 2024-06-27 14:50:21
* @LastEditors: DY * @LastEditors: DY
* @Description: * @Description:
--> -->
@ -76,15 +76,44 @@
<p class="text">{{ dataForm.endDate?.length > 0 ? dataForm.endDate[0] + '-' + dataForm.endDate[1] + '-' + dataForm.endDate[2] : '' }}</p> <p class="text">{{ dataForm.endDate?.length > 0 ? dataForm.endDate[0] + '-' + dataForm.endDate[1] + '-' + dataForm.endDate[2] : '' }}</p>
</el-col> </el-col>
</el-row> </el-row>
<el-divider></el-divider> <div style="width: 100%; padding: 0 32px"><el-divider style="margin: 0"></el-divider></div>
<div class="chartDiv"> <el-row :gutter="0" style="margin: 20px 32px">
<div ref="bar" :style="{ height: '30vh', width: '40vw' }" /> <el-col :span="8">
<div ref="pie" :style="{ height: '30vh', width: '40vw' }" /> <div>
<small-title slot="title" :no-padding="true">
产品良率
</small-title>
<div ref="pie" :style="{ height: '40vh', width: '100%' }" />
</div> </div>
<div class="chartDiv"> </el-col>
<div ref="equipmentLine" :style="{ height: '30vh', width: '40vw' }" /> <el-col :span="16">
<div ref="line" v-show="dataForm.orderStatus === 2" :style="{ height: '30vh', width: '40vw' }" /> <div style="border-left: 1px solid #d1d3d8; width: 100%; padding-left: 32px">
<small-title slot="title" :no-padding="true">
历史趋势
</small-title>
<div ref="line" v-show="dataForm.orderStatus === 2" :style="{ height: '40vh', width: '50vw' }" />
</div> </div>
</el-col>
</el-row>
<div style="width: 100%; padding: 0 32px"><el-divider style="margin: 0"></el-divider></div>
<el-row :gutter="0" style="margin: 20px 32px">
<el-col :span="8">
<div>
<small-title slot="title" :no-padding="true">
生产明细
</small-title>
<div ref="bar" :style="{ height: '40vh', width: '100%' }" />
</div>
</el-col>
<el-col :span="16">
<div style="border-left: 1px solid #d1d3d8; width: 100%; padding-left: 32px">
<small-title slot="title" :no-padding="true">
待制品分布
</small-title>
<div ref="equipmentLine" :style="{ height: '40vh', width: '50vw' }" />
</div>
</el-col>
</el-row>
</div> </div>
</el-drawer> </el-drawer>
@ -118,7 +147,8 @@ export default {
barChart: null, barChart: null,
equipmentLineChart: null, equipmentLineChart: null,
visible: false, visible: false,
dataForm: {} dataForm: {},
colorList: ['#3E8EF7', '#69E6D8', '#F7C739'] // pie颜色
} }
}, },
beforeDestroy() { beforeDestroy() {
@ -227,38 +257,47 @@ export default {
initChart(barData) { initChart(barData) {
this.barChart = echarts.init(this.$refs['bar']) this.barChart = echarts.init(this.$refs['bar'])
this.barChart.setOption({ this.barChart.setOption({
title: { // title: {
text: '生产明细', // text: '生产明细',
left: 'center' // left: 'center'
// subtext: 'Fake Data' // // subtext: 'Fake Data'
}, // },
color: ['#3E8EF7'],
tooltip: { tooltip: {
trigger: 'axis' trigger: 'axis'
}, },
grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true }, grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
calculable: true, calculable: true,
grid: { grid: {
top: '20%', top: '15%',
left: "1%", left: 0,
right: "3%", right: '10%',
bottom: "1%", bottom: 0,
containLabel: true containLabel: true
}, },
xAxis: { xAxis: {
type: 'category', type: 'category',
data: ['目标产量', '计划投入量', '实际投入', '实际产出', '废品数量', '待再加工数量'], data: ['目标产量', '计划投入量', '实际投入', '实际产出', '废品数量', '待再加工数量'],
axisLabel: { axisLabel: {
rotate:45 rotate: 25
} }
}, },
yAxis: { yAxis: {
type: 'value' type: 'value',
name: '单位/片',
axisLine: {
show: true
}
}, },
series: [ series: [
{ {
data: barData, data: barData,
type: 'bar', type: 'bar',
barWidth: '40%' barWidth: '40%',
label: {
show: true,
position: 'top'
}
} }
] ]
}, true) }, true)
@ -266,8 +305,9 @@ export default {
initPieChart(pieData) { initPieChart(pieData) {
this.pieChart = echarts.init(this.$refs['pie']) this.pieChart = echarts.init(this.$refs['pie'])
this.pieChart.setOption({ this.pieChart.setOption({
color: ['#3E8EF7', '#69E6D8', '#F7C739'],
title: { title: {
text: !isNaN((pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100) ? ( '产品良率 ' + (pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100 + '%') : '产品良率 -', // text: !isNaN((pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100) ? ( '产品良率 ' + (pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100 + '%') : '产品良率 -',
left: 'center' left: 'center'
// subtext: 'Fake Data' // subtext: 'Fake Data'
}, },
@ -275,31 +315,31 @@ export default {
trigger: 'item' trigger: 'item'
}, },
legend: { legend: {
top: '5%', bottom: 0,
left: 'right', left: 'center'
orient: 'vertical'
}, },
series: [ series: [
{ {
// name: 'Access From', // name: 'Access From',
type: 'pie', type: 'pie',
radius: ['40%', '70%'], radius: ['50%', '70%'],
avoidLabelOverlap: false, avoidLabelOverlap: false,
data: pieData,
label: { label: {
show: false, show: true,
position: 'center' position: 'outside',
formatter: '{d|{d}%} \n {b|{b}}',
rich: {
d: {
color: 'inherit', // 系列色
verticalAlign: 'top'
}, },
emphasis: { b: {
label: { color: '#8C8C8C',
show: false, verticalAlign: 'top'
fontSize: 40, }
fontWeight: 'bold' }
} }
},
labelLine: {
show: false
},
data: pieData
} }
] ]
}, true) }, true)
@ -307,39 +347,48 @@ export default {
initEqLineChart(xAxisList, yAxisList) { initEqLineChart(xAxisList, yAxisList) {
this.equipmentLineChart = echarts.init(this.$refs['equipmentLine']) this.equipmentLineChart = echarts.init(this.$refs['equipmentLine'])
this.equipmentLineChart.setOption({ this.equipmentLineChart.setOption({
title: { // title: {
text: '待制品分布', // text: '待制品分布',
left: 'center' // left: 'center'
// subtext: 'Fake Data' // // subtext: 'Fake Data'
}, // },
color: ['#3E8EF7'],
tooltip: { tooltip: {
trigger: 'axis' trigger: 'axis'
}, },
grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true }, grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
calculable: true, calculable: true,
grid: { grid: {
top: '20%', top: '15%',
left: "1%", left: 0,
right: "3%", right: 0,
bottom: "1%", bottom: 0,
containLabel: true containLabel: true
}, },
xAxis: { xAxis: {
type: 'category', type: 'category',
data: xAxisList, data: xAxisList,
axisLabel: { axisLabel: {
rotate:45, rotate: 25
// width: '10%' // width: '10%'
} }
}, },
yAxis: { yAxis: {
type: 'value' type: 'value',
name: '单位/片',
axisLine: {
show: true
}
}, },
series: [ series: [
{ {
data: yAxisList, data: yAxisList,
type: 'bar', type: 'bar',
barWidth: '50%' barWidth: '50%',
label: {
show: true,
position: 'top'
}
} }
] ]
}, true) }, true)
@ -347,27 +396,39 @@ export default {
initLineChart(xAxisList, seriesList) { initLineChart(xAxisList, seriesList) {
this.lineChart = echarts.init(this.$refs['line']) this.lineChart = echarts.init(this.$refs['line'])
this.lineChart.setOption({ this.lineChart.setOption({
title: { color: ['#3E8EF7'],
text: '历史趋势',
left: 'center' // 设置标题居中
},
tooltip: { tooltip: {
trigger: 'item' trigger: 'item'
}, },
grid: {
top: '15%',
left: 0,
right: 0,
bottom: 0,
containLabel: true
},
xAxis: { xAxis: {
type: 'category', type: 'category',
data: xAxisList, data: xAxisList,
axisLabel: { axisLabel: {
rotate:45 rotate: 25
} }
}, },
yAxis: { yAxis: {
type: 'value' type: 'value',
name: '单位/片',
axisLine: {
show: true
}
}, },
series: [ series: [
{ {
data: seriesList, data: seriesList,
type: 'line' type: 'line',
label: {
show: true,
position: 'top'
}
} }
] ]
}, true) }, true)
@ -381,14 +442,8 @@ export default {
}, },
}; };
</script> </script>
<style scoped> <style scoped>
.chartDiv {
display: flex;
justify-content: space-between;
width: 100%;
padding: 5px;
padding-left: 30px;
}
.drawer >>> .el-drawer { .drawer >>> .el-drawer {
border-radius: 8px 0 0 8px; border-radius: 8px 0 0 8px;
} }
@ -405,7 +460,8 @@ export default {
} }
.detailBox p { .detailBox p {
margin: 0; margin: 0;
padding: 0 32px; padding-left: 32px;
/* padding: 0 32px; */
} }
.detailBox .title { .detailBox .title {
/* width: 56px; */ /* width: 56px; */
@ -427,6 +483,8 @@ export default {
} }
.detailBox { .detailBox {
padding-top: 30px; padding-top: 30px;
width: 99%; overflow-x: hidden;
overflow-y: auto;
/* width: 99%; */
} }
</style> </style>