This commit is contained in:
‘937886381’
2024-06-20 20:38:11 +08:00
parent 15d3b3622c
commit 6be1a83dd8
9 changed files with 3165 additions and 668 deletions

View File

@@ -4,7 +4,7 @@
<ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
</ButtonNav>
<!-- </div> -->
<div class="containerTop">
<div class="search">
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
<el-form-item label="时间维度" prop="date">
<el-select size="small" clearable v-model="listQuery.type" placeholder="请选择">
@@ -24,7 +24,7 @@
<el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
style="width: 180px" @change="onValueChange">
</el-date-picker>
</el-date-picker>6
<!-- <span v-if="start && end" style="margin-left: 10px">
{{ date1 }} {{ date2 }} {{ weekNum }}
</span> -->
@@ -63,17 +63,40 @@
<!-- <el-button type="success" size="small" plain @click="addFactory">新增</el-button> -->
</el-form-item>
</el-form>
<!-- <div class="smallTitle">产量转化效率</div> -->
<!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
<el-col :span="16">
<bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
:chartNum="chartNum" />
</el-col>
<el-col :span="8">
<bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId=" 'yearChart' "
:chartNum="chartNum" />
</el-col>
</div>
<div class="containerTop">
<el-row v-if="listQuery.type === 2">
<el-col :span="16">
<div class="blueTip">
产量及良率对比
</div>
<bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
:chartNum="chartNum" />
</el-col>
<el-col :span="8">
<div class="blueTip">
{{ title }}
</div>
<produce-line-bar-year-target :chartHeight="chartHeight" :legendList="legendList"
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
</el-col>
</el-row>
<el-row v-else>
<!-- <el-col :span="24"> -->
<div class="blueTip">
产量及良率对比
</div>
<bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
:chartNum="chartNum" />
<!-- </el-col> -->
<!-- <el-col :span="8">
<div class="blueTip">
{{ title }}
</div>
<produce-line-bar-year-target :chartHeight="chartHeight" :legendList="legendList"
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
</el-col> -->
</el-row>
<base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
:max-height="tableH" />
</div>
@@ -84,9 +107,10 @@
</template>
<script>
import { getProduceSituationData } from '@/api/report';
import bmSearchBar from "./components/produceLineBar.vue";
import BmLineBar from "./components/bmLineBar.vue";
import { getProductionYieldSituationMWData, exportProductionYieldSituationMWData } from '@/api/report';
import bmSearchBar from "./components/bmSearchBar";
import BmLineBar from "./components/produceLineBar.vue";
import produceLineBarYearTarget from "./components/produceLineBarYearTarget.vue";
import ButtonNav from '@/components/ButtonNav'
import moment from 'moment'
export default {
@@ -96,6 +120,7 @@ export default {
otherProps: [],
start: undefined,
end: undefined,
title: '',
listQuery: {
pageNo: 1,
pageSize: 999,
@@ -131,58 +156,154 @@ export default {
tableH: this.tableHeight(137) / 2 - 70,
legendList: [
{
id: 1, name: "综合良率", type: 2, color: "#FFCE6A" },
{ id: 2, name: "标准组件产量", type: 1, color: "#8EF0AB" },
id: 1, name: "综合良率", type: 1, color: "#FFCE6A" },
{
id: 2, name: "FTO投入", type: 1, color: "#8EF0AB" },
{ id: 3, name: "芯片产量", type: 1, color: "#288AFF" },
{ id: 3, name: "fto投入", type: 1, color: "#64BDFF" },
{
id: 4, name: "标准组件产量", type: 1, color: "#64BDFF" },
],
chartMsg: {
color: ['#64BDFF', "#8EF0AB", "#288AFF", "#FFCE6A",],
chartMsgYearTarget: {
color: ["#8EF0AB", "#288AFF", '#64BDFF', "#FFCE6A",],
xData: [],
yName: "单位/%",
// yName: "单位/%",
yAxis: [
{
type: "value",
name: "单位/片",
nameTextStyle: {
fontSize: 12,
align: "right",
},
axisLabel: {},
},
{
type: 'value',
// inverse: true,
name: "单位/%",
nameTextStyle: {
fontSize: 12,
align: "right",
},
axisLabel: {},
}
],
series: [
{
name: "",
// yAxisIndex: 0,
data: [
// { name: "%", value: 57.5 },
// { name: "%", value: 21.66 },
// { name: "%", value: 18.4 },
{
value: 1,
itemStyle: {
color: '#8EF0AB'
}
},
{
value: 2,
itemStyle: {
color: '#288AFF'
}
},
{
value: 3,
itemStyle: {
color: '#64BDFF'
}
},
{
value: 0,
yAxisIndex: 1,
itemStyle: {
color: '#FFCE6A'
}
}],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [-18, -16],
color: "#68C483",
formatter: function (params) {
return params.value + "片";
},
},
},
// {
// name: '销量折线图',
// type: 'bar',
// data: [ 0,0,0,
// {
// value: 5,
// itemStyle: {
// color: '#FFCE6A'
// }
// }],
// barWith: "40%",
// label: {
// show: true,
// position: "top",
// formatter: "{c}%"
// },
// lineStyle: {
// color: "#ffb122"
// },
// yAxisIndex: 1
// }
],
},
chartMsg: {
color: ["#8EF0AB", "#288AFF", '#64BDFF', "#FFCE6A",],
xData: [],
// yName: "单位/%",
yAxis: [
{
type: "value",
name: "单位/片",
nameTextStyle: {
fontSize: 12,
align: "right",
},
axisLabel: {},
},
{
type: 'value',
// inverse: true,
name: "单位/%",
nameTextStyle: {
fontSize: 12,
align: "right",
},
axisLabel: {},
}
],
series: [
{
name: "",
// yAxisIndex: 0,
data: [
{ name: "%", value: 57.5 },
{ name: "%", value: 21.66 },
{ name: "%", value: 18.4 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [-18, -16],
color: "#64BDFF",
color: "#68C483",
formatter: function (params) {
return params.value.toFixed(2) + "%";
return params.value + "";
},
},
},
{
name: "",
// yAxisIndex: 0,
data: [
// { name: "%", value: 23.33 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "#8EF0AB",
formatter: function (params) {
return params.value.toFixed(2) + "%";
},
},
},
{
name: "",
data: [
// { name: "%", value: 23.33 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
{ name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
@@ -191,20 +312,42 @@ export default {
position: [0, -16],
color: "#288AFF",
formatter: function (params) {
return params.value.toFixed(2) + "%";
return params.value + "";
},
},
},
{
name: "",
// yAxisIndex: 0,
data: [
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
{ name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
stack: '标准组件产量',
color: "#64BDFF",
formatter: function (params) {
return params.value+ "片";
},
},
},
{
name: "",
data: [
// { name: "%", value: 85 },
// { name: "%", value: 85 },
// { name: "%", value: 85 },
{ name: "%", value: 115 },
{ name: "%", value: 5 },
{ name: "%", value: 8 },
],
type: "line",
// barWidth: 20,
symbol: "circle",
symbolSize: 6,
yAxisIndex: 1,
label: {
show: true,
color: "#FFAE17",
@@ -222,6 +365,7 @@ export default {
components: {
bmSearchBar,
BmLineBar,
produceLineBarYearTarget,
ButtonNav
},
computed: {
@@ -256,9 +400,15 @@ export default {
isOpen() {
return this.$store.getters.sidebar.opened;
},
type() {
return this.listQuery.type
}
},
watch: {
// 监听左侧菜单栏是否展开
type(val) {
},
isOpen(val) {
if (this.$route.name === "ChipYieldBM") {
this.chartNum++;
@@ -275,7 +425,7 @@ export default {
},
activated() {
// 图重新加载,为了防止窗口变化后尺寸图显示不佳,数据不更新
if (this.$route.name === "ChipYieldBM") {
if (this.$route.name === "productionYield") {
this.chartNum++;
}
},
@@ -403,119 +553,195 @@ export default {
let arr = []
this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
this.listQuery.factory = arr
const res = await getProduceSituationData(this.listQuery)
let dataArr = [{
factory: null,
item: 'FTO投入',
unit: '片'
},
{
factory: null,
item: '芯片产量',
unit: '片'
},
{
factory: null,
item: '标准组件产量',
unit: '片'
},
{
factory: null,
item: '综合良率',
unit: '%'
},]
res.data.list.forEach((ele, index) => {
let i = index + 1
this.chartMsg.xData.push(ele.titleValue)
this.otherProps.push({
label: ele.titleValue,
props: 'value' + i
const res = await getProductionYieldSituationMWData(this.listQuery)
let dataArr = [{
factory: null,
item: 'FTO投入',
unit: '片'
},
{
factory: null,
item: '芯片产量',
unit: '片'
},
{
factory: null,
item: '标准组件产量',
unit: '片'
},
{
factory: null,
item: '综合良率',
unit: '%'
},]
if (this.listQuery.type == 2) {
res.data.list.forEach((ele, index) => {
let i = index + 1
this.chartMsg.xData.push(ele.titleValue)
this.otherProps.push({
label: ele.titleValue,
props: 'value' + i
})
})
})
console.log(this.otherProps)
res.data.list.forEach((ele, index) => {
let i = index + 1
let m = 'value' + i
ele.productionSituationDataVOList.forEach((item) => {
dataArr[0]['' + m + ''] = item.ftoInput
dataArr[0].factory = item.factory === 1 ? '邯郸' : '瑞昌'
dataArr[1].factory = item.factory === 1 ? '邯郸' : '瑞昌'
dataArr[2].factory = item.factory === 1 ? '邯郸' : '瑞昌'
dataArr[3].factory = item.factory === 1 ? '邯郸' : '瑞昌'
dataArr[1]['' + m + ''] = item.chipYield
dataArr[2]['' + m + ''] = item.componentYield
dataArr[3]['' + m + ''] = item.comprehensiveYieldRate
this.chartMsgYearTarget.xData.push('FTO投入', '芯片产量', '标准组件产量', '综合良率')
res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele) => {
this.title = ele.titleValue
ele.productYieldDataVOList.forEach((item) => {
// this.chartMsgYearTarget.series[0].name = 'FTO投入目标值',
// this.chartMsgYearTarget.series[1].name = '芯片产量目标值',
// this.chartMsgYearTarget.series[2].name = '标准组件产量目标值',
// this.chartMsgYearTarget.series[3].name = '综合良率目标值',
// this.chartMsgYearTarget.series[0].data = [
// {
// value: item.ftoInput,
// itemStyle: {
// color: '#8EF0AB'
// }
// },
// {
// value: item.chipYield,
// itemStyle: {
// color: '#288AFF'
// }
// },
// {
// value: item.componentYield,
// itemStyle: {
// color: '#64BDFF'
// }
// },
// {
// value: item.ftoInput,
// itemStyle: {
// color: '#FFCE6A'
// }
// }]
// dataArr[0]['' + m + ''] = item.ftoInput
// dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
// dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
// dataArr[2].factory = item.factory == 1 ? '邯郸' : '瑞昌'
// dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
// dataArr[1]['' + m + ''] = item.chipYield
// dataArr[2]['' + m + ''] = item.componentYield
// dataArr[3]['' + m + ''] = item.comprehensiveYieldRate
})
})
// ele.titleValue
// .push({
// label: ele.titleValue,
// props: 'value' + index + 1,
// })
})
// this.tableProps = otherProps
// res.data.list.forEach((ele) => {
// console.log(ele);
// ele.productionSituationDataVOList.forEach((item) => {
// let obj = {
// bipvProductOutput: item.bipvProductOutput,
// chipYield: item.chipYield,
// componentYield: item.componentYield,
// factory: item.factory,
// ftoInput: item.ftoInput,
// titleValue:ele.titleValue
// }
// dataArr.push(obj)
// })
// })
for (let i in dataArr[0]) {
// console.log(i.search('value'))
// dataArr.forEach((ele) => {
this.chartMsg.series[0].name = dataArr[0]['item']
if (i.search('value') === 0) {
this.chartMsg.series[0].data.push({
name: dataArr[0]['item'],
value: dataArr[0][i]
console.log(this.otherProps)
res.data.list.forEach((ele, index) => {
let i = index + 1
let m = 'value' + i
ele.productYieldDataVOList.forEach((item) => {
dataArr[0]['' + m + ''] = item.ftoInput
dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
dataArr[2].factory = item.factory == 1 ? '邯郸' : '瑞昌'
dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
dataArr[1]['' + m + ''] = item.chipYield
dataArr[2]['' + m + ''] = item.componentYield
dataArr[3]['' + m + ''] = item.comprehensiveYieldRate
})
})
for (let i in dataArr[0]) {
this.chartMsg.series[0].name = dataArr[0]['item']
if (i.search('value') === 0) {
this.chartMsg.series[0].data.push({
name: dataArr[0]['item'],
value: dataArr[0][i]
})
}
}
// })
}
for (let i in dataArr[1]) {
// console.log(i.search('value'))
// dataArr.forEach((ele) => {
this.chartMsg.series[1].name = dataArr[1]['item']
if (i.search('value') === 0) {
this.chartMsg.series[1].data.push({
name: dataArr[1]['item'],
value: dataArr[1][i]
for (let i in dataArr[1]) {
this.chartMsg.series[1].name = dataArr[1]['item']
if (i.search('value') === 0) {
this.chartMsg.series[1].data.push({
name: dataArr[1]['item'],
value: dataArr[1][i]
})
}
}
for (let i in dataArr[2]) {
this.chartMsg.series[2].name = dataArr[2]['item']
if (i.search('value') === 0) {
this.chartMsg.series[2].data.push({
name: dataArr[2]['item'],
value: dataArr[2][i]
})
}
}
for (let i in dataArr[3]) {
this.chartMsg.series[3].name = dataArr[3]['item']
if (i.search('value') === 0) {
this.chartMsg.series[3].data.push({
name: dataArr[3]['item'],
value: dataArr[3][i]
})
}
}
} else {
res.data.list.slice.forEach((ele, index) => {
let i = index + 1
this.chartMsg.xData.push(ele.titleValue)
this.otherProps.push({
label: ele.titleValue,
props: 'value' + i
})
})
console.log(this.otherProps)
if (this.listQuery.type == 2) {
}
// })
}
for (let i in dataArr[2]) {
// console.log(i.search('value'))
// dataArr.forEach((ele) => {
this.chartMsg.series[2].name = dataArr[2]['item']
if (i.search('value') === 0) {
this.chartMsg.series[2].data.push({
name: dataArr[2]['item'],
value: dataArr[2][i]
res.data.list.forEach((ele, index) => {
let i = index + 1
let m = 'value' + i
ele.productYieldDataVOList.forEach((item) => {
dataArr[0]['' + m + ''] = item.ftoInput
dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
dataArr[2].factory = item.factory == 1 ? '邯郸' : '瑞昌'
dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
dataArr[1]['' + m + ''] = item.chipYield
dataArr[2]['' + m + ''] = item.componentYield
dataArr[3]['' + m + ''] = item.comprehensiveYieldRate
})
})
for (let i in dataArr[0]) {
this.chartMsg.series[0].name = dataArr[0]['item']
if (i.search('value') === 0) {
this.chartMsg.series[0].data.push({
name: dataArr[0]['item'],
value: dataArr[0][i]
})
}
}
// })
}
for (let i in dataArr[3]) {
// console.log(i.search('value'))
// dataArr.forEach((ele) => {
this.chartMsg.series[3].name = dataArr[3]['item']
if (i.search('value') === 0) {
this.chartMsg.series[3].data.push({
name: dataArr[3]['item'],
value: dataArr[3][i]
})
for (let i in dataArr[1]) {
this.chartMsg.series[1].name = dataArr[1]['item']
if (i.search('value') === 0) {
this.chartMsg.series[1].data.push({
name: dataArr[1]['item'],
value: dataArr[1][i]
})
}
}
for (let i in dataArr[2]) {
this.chartMsg.series[2].name = dataArr[2]['item']
if (i.search('value') === 0) {
this.chartMsg.series[2].data.push({
name: dataArr[2]['item'],
value: dataArr[2][i]
})
}
}
for (let i in dataArr[3]) {
this.chartMsg.series[3].name = dataArr[3]['item']
if (i.search('value') === 0) {
this.chartMsg.series[3].data.push({
name: dataArr[3]['item'],
value: dataArr[3][i]
})
}
}
// })
}
console.log(this.chartMsg.series)
console.log(dataArr)
this.tableData = dataArr
// this.tableProps.push()
@@ -539,7 +765,16 @@ export default {
console.log("=========================");
},
handleExport() {
console.log("导出");
// this.listQuery.type = val.type;
// this.listQuery.startDate = val.startDate;
// this.listQuery.factory = val.factory;
let fileName = "产品良率.xls";
exportProductionYieldSituationMWData(this.listQuery)
.then((response) => {
this.$download.excel(response, fileName);
this.$message.success("导出成功");
})
.catch(() => { });
},
},
};
@@ -551,7 +786,7 @@ export default {
background-color: #fff;
border-radius: 8px;
padding: 16px 16px 0 16px;
margin-bottom: 8px;
margin:8px 0 8px 0px;
}
.containerTop {