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

@ -1,7 +1,7 @@
/*
* @Author: zhp
* @Date: 2024-06-17 09:41:03
* @LastEditTime: 2024-06-19 13:30:14
* @LastEditTime: 2024-06-20 15:39:21
* @LastEditors: zhp
* @Description:
*/
@ -9,11 +9,21 @@ import request from '@/utils/request'
export function getComprehensiveDataPage(data) {
return request({
url: 'ip/comprehensive/data/get/comprehensive/data',
method: 'get',
params: data
method: 'post',
data: data
})
}
export function exportComprehensiveDataPage(data) {
return request({
url: 'ip/comprehensive/data/export/comprehensive/data',
method: 'post',
data: data,
responseType: 'blob',
})
}
export function getProduceTransData(data) {
return request({
url: 'ip/prod-output/queryYCEReportByDateRange',
@ -22,6 +32,15 @@ export function getProduceTransData(data) {
})
}
export function exportProduceTransData(data) {
return request({
url: 'ip/prod-output/queryYCEReportByDateRangeExcel',
method: 'post',
data: data,
responseType: 'blob',
})
}
export function getProduceSituationData(data) {
return request({
@ -31,6 +50,15 @@ export function getProduceSituationData(data) {
})
}
export function exportProduceSituationData(data) {
return request({
url: 'ip/production/situation/export/production/situation',
method: 'post',
data: data,
responseType: 'blob',
})
}
export function getProductionSituationMWData(data) {
return request({
url: 'ip/production/situation/power/get/production/situation',
@ -38,3 +66,30 @@ export function getProductionSituationMWData(data) {
data: data
})
}
export function exportProductionSituationMWData(data) {
return request({
url: 'ip/production/situation/power/export/production/situation',
method: 'post',
data: data,
responseType: 'blob',
})
}
export function getProductionYieldSituationMWData(data) {
return request({
url: 'ip/product/yield/get/production/situation',
method: 'post',
data: data
})
}
export function exportProductionYieldSituationMWData(data) {
return request({
url: 'ip/product/yield/export/production/situation',
method: 'post',
data: data,
responseType: 'blob',
})
}

View File

@ -1,44 +1,26 @@
<!--
* @Author: zhp
* @Date: 2024-06-19 15:28:34
* @LastEditTime: 2024-06-19 15:28:34
* @LastEditTime: 2024-06-20 20:30:35
* @LastEditors: zhp
* @Description:
-->
<template>
<div>
<!-- 暂无数据 -->
<div
class="no-data-bg"
style="position: relative; left: 50%; transform: translateX(-50%)"
v-show="this.chartMsg.series.length === 0"
></div>
<div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
v-show="this.chartMsg.series.length === 0"></div>
<!-- 图例 -->
<div v-show="this.chartMsg.series.length > 0">
<div class="legend">
<span class="item" v-for="item in legendList" :key="item.id">
<span
v-if="item.type === 1"
class="block"
:style="{ backgroundColor: item.color }"
></span>
<span
v-if="item.type === 2"
class="line"
:style="{ backgroundColor: item.color }"
>
<span
class="line-block"
:style="{ backgroundColor: item.color }"
></span>
<div class="legendData" v-if="show">
<span class="itemData" v-for="item in legendList" :key="item.id">
<span v-if="item.type === 1" class="block" :style="{ backgroundColor: item.color }"></span>
<span v-if="item.type === 2" class="line" :style="{ backgroundColor: item.color }">
<span class="line-block" :style="{ backgroundColor: item.color }"></span>
</span>
{{ item.name }}</span
>
{{ item.name }}</span>
</div>
<div
:id="chartId"
:style="{ width: '100%', height: chartHeight + 'px' }"
></div>
<div :id="chartId" :style="{ width: '100%', height: chartHeight + 'px' }"></div>
</div>
</div>
</template>
@ -54,10 +36,11 @@ export default {
color: [],
// color: ["#8EF0AB", "#63BDFF", "#288AFF"],
grid: {
left: 100,
right: 10,
left: 30,
right: 0,
bottom: 30,
top: 30,
containLabel:true,
},
tooltip: {
trigger: "axis",
@ -68,17 +51,20 @@ export default {
},
},
formatter: function (params) {
console.log('params', params);
var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
for (var i = 0, l = params.length; i < l; i++) {
res +=
"<br/>" +
`<span style='display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${params[i].color}'></span>` +
`<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
`<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${
params[i].name === "%"
? (params[i].value ? params[i].value.toFixed(2) : 0.0) +
params[i].name
: params[i].value
`<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].name.search('率') === "综合良率"
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
: params[i].seriesName === "转化效率"
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
: params[i].seriesName.search('总功率') != -1
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "MW"
: params[i].value + "片"
}</span>`;
}
return res;
@ -94,15 +80,53 @@ export default {
type: "shadow",
},
},
yAxis: {
type: "value",
name: "",
nameTextStyle: {
fontSize: 12,
align: "right",
dataZoom: [//
{
//
show: true,
//
type: "slider",
//
backgroundColor: "rgb(19, 63, 100)",
//
fillerColor: "rgb(16, 171, 198)",
//
borderColor: "rgb(19, 63, 100)",
// detail
showDetail: false,
//
startValue: 0,
//
endValue: 5,
// empty
//
filterMode: "empty",
//
width: "50%",
//
height: 8,
//
left: "center",
//
zoomLoxk: true,
//
handleSize: 0,
// dataZoom-slider
bottom: 3,
},
axisLabel: {},
{
//
//
type: "inside",
//
zoomOnMouseWheel: false,
//
moveOnMouseMove: true,
moveOnMouseWheel: true,
},
],
yAxis:undefined,
series: [],
},
};
@ -112,6 +136,14 @@ export default {
type: Number,
default: 300,
},
type: {
type: Number,
default: 2,
},
show: {
type: Boolean,
default: true,
},
legendList: {
type: Array,
default: () => [],
@ -135,6 +167,9 @@ export default {
this.chartHeight = newVal;
},
},
type() {
this.canvasReset();
},
chartNum(val) {
this.canvasReset();
},
@ -162,34 +197,24 @@ export default {
this.myChart = echarts.init(chartDom);
this.option.color = this.chartMsg.color;
this.option.xAxis.data = this.chartMsg.xData;
this.option.yAxis.name = this.chartMsg.yName;
if (
this.chartMsg.series.length > 0 &&
this.chartMsg.series[0].data[0].name === "%"
) {
this.option.yAxis.axisLabel = {
formatter: function (value) {
return value + ".00%";
},
};
} else {
this.option.yAxis.axisLabel = {
formatter: function (value) {
return value;
},
};
}
// this.option.yAxis.name = this.chartMsg.yName;
// this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
this.option.series = this.chartMsg.series;
this.option.yAxis = this.chartMsg.yAxis;
this.myChart.setOption(this.option);
},
},
};
</script>
<style lang="scss" scoped>
.legend {
<style lang="scss">
.legendData {
text-align: right;
.item {
position: relative;
// right: 30;
// top: 10px;
.itemData {
display: inline-block;
margin-right: 10px;
font-size: 14px;

View File

@ -0,0 +1,252 @@
<!--
* @Author: zhp
* @Date: 2024-06-20 16:13:36
* @LastEditTime: 2024-06-20 20:30:50
* @LastEditors: zhp
* @Description:
-->
<!--
* @Author: zhp
* @Date: 2024-06-19 15:28:34
* @LastEditTime: 2024-06-20 16:02:21
* @LastEditors: zhp
* @Description:
-->
<template>
<div>
<!-- 暂无数据 -->
<div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
v-show="this.chartMsg.series.length === 0"></div>
<!-- 图例 -->
<div v-show="this.chartMsg.series.length > 0">
<div class="legendData" v-if="show">
<span class="itemData" v-for="item in legendList" :key="item.id">
<span v-if="item.type === 1" class="block" :style="{ backgroundColor: item.color }"></span>
<span v-if="item.type === 2" class="line" :style="{ backgroundColor: item.color }">
<span class="line-block" :style="{ backgroundColor: item.color }"></span>
</span>
{{ item.name }}</span>
</div>
<div :id="chartId" :style="{ width: '100%', height: chartHeight + 'px' }"></div>
</div>
</div>
</template>
<script>
import * as echarts from "echarts";
import { debounce } from "@/utils/debounce";
export default {
name: "bmLineBar",
data() {
return {
myChart: "",
option: {
color: [],
// color: ["#8EF0AB", "#63BDFF", "#288AFF"],
grid: {
left: -30,
right: 0,
bottom: 30,
top: 30,
containLabel:true,
},
tooltip: {
trigger: "axis",
axisPointer: {
// type: "cross",
crossStyle: {
color: "rgba(237,237,237,0.5)",
},
},
formatter: function (params) {
// console.log('params', params);
var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
for (var i = 0, l = params.length; i < l; i++) {
res +=
"<br/>" +
`<span style='display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${params[i].color}'></span>` +
`<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
`<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName.search('率') === "综合良率"
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
: params[i].seriesName === "转化效率"
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
: params[i].seriesName.search('总功率') != -1
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "MW"
: params[i].value + "片"
}</span>`;
}
return res;
},
},
xAxis: {
type: "category",
data: [],
axisTick: {
show: false,
},
axisPointer: {
type: "shadow",
},
},
dataZoom: [//
{
//
show: true,
//
type: "slider",
//
backgroundColor: "rgb(19, 63, 100)",
//
fillerColor: "rgb(16, 171, 198)",
//
borderColor: "rgb(19, 63, 100)",
// detail
showDetail: false,
//
startValue: 0,
//
endValue: 5,
// empty
//
filterMode: "empty",
//
width: "50%",
//
height: 8,
//
left: "center",
//
zoomLoxk: true,
//
handleSize: 0,
// dataZoom-slider
bottom: 3,
},
{
//
//
type: "inside",
//
zoomOnMouseWheel: false,
//
moveOnMouseMove: true,
moveOnMouseWheel: true,
},
],
yAxis:undefined,
series: [],
},
};
},
props: {
chartHeight: {
type: Number,
default: 300,
},
type: {
type: Number,
default: 2,
},
show: {
type: Boolean,
default: true,
},
legendList: {
type: Array,
default: () => [],
},
chartMsg: {
type: Object,
default: () => { },
},
chartId: {
type: String,
default: "bmChart",
},
chartNum: {
type: Number,
default: 1,
},
},
watch: {
chartHeight: {
handler(newVal) {
this.chartHeight = newVal;
},
},
type() {
this.canvasReset();
},
chartNum(val) {
this.canvasReset();
},
chartMsg: {
handler(newVal) {
this.canvasReset();
},
deep: true,
},
},
mounted() {
this.canvasReset();
},
methods: {
canvasReset() {
debounce(() => {
this.getMes();
}, 500)();
},
getMes() {
if (this.myChart) {
this.myChart.dispose();
}
var chartDom = document.getElementById(this.chartId);
this.myChart = echarts.init(chartDom);
this.option.color = this.chartMsg.color;
this.option.xAxis.data = this.chartMsg.xData;
// this.option.yAxis.name = this.chartMsg.yName;
// this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
this.option.series = this.chartMsg.series;
this.option.yAxis = this.chartMsg.yAxis;
this.myChart.setOption(this.option);
},
},
};
</script>
<style lang="scss">
.legendData {
text-align: right;
position: relative;
// right: 30;
// top: 10px;
.itemData {
display: inline-block;
margin-right: 10px;
font-size: 14px;
color: #8c8c8c;
.block {
width: 10px;
height: 10px;
display: inline-block;
margin-right: 4px;
}
.line {
width: 10px;
height: 10px;
border-radius: 5px;
display: inline-block;
margin-right: 4px;
position: relative;
.line-block {
position: absolute;
width: 20px;
height: 2px;
left: -5px;
top: 4px;
}
}
}
}
</style>

View File

@ -0,0 +1,245 @@
<!--
* @Author: zhp
* @Date: 2024-06-20 16:13:52
* @LastEditTime: 2024-06-20 20:30:53
* @LastEditors: zhp
* @Description:
-->
<template>
<div>
<!-- 暂无数据 -->
<div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
v-show="this.chartMsg.series.length === 0"></div>
<!-- 图例 -->
<div v-show="this.chartMsg.series.length > 0">
<div class="legendData" v-if="show">
<span class="itemData" v-for="item in legendList" :key="item.id">
<span v-if="item.type === 1" class="block" :style="{ backgroundColor: item.color }"></span>
<span v-if="item.type === 2" class="line" :style="{ backgroundColor: item.color }">
<span class="line-block" :style="{ backgroundColor: item.color }"></span>
</span>
{{ item.name }}</span>
</div>
<div :id="chartId" :style="{ width: '100%', height: chartHeight + 'px' }"></div>
</div>
</div>
</template>
<script>
import * as echarts from "echarts";
import { debounce } from "@/utils/debounce";
export default {
name: "bmLineBar",
data() {
return {
myChart: "",
option: {
color: [],
// color: ["#8EF0AB", "#63BDFF", "#288AFF"],
grid: {
left: 30,
right: 0,
bottom: 30,
top: 30,
containLabel:true,
},
tooltip: {
trigger: "axis",
axisPointer: {
// type: "cross",
crossStyle: {
color: "rgba(237,237,237,0.5)",
},
},
formatter: function (params) {
console.log('params', params);
var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
for (var i = 0, l = params.length; i < l; i++) {
res +=
"<br/>" +
`<span style='display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${params[i].color}'></span>` +
`<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
`<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName.search('率') === "综合良率"
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
: params[i].seriesName === "转化效率"
? params[i].value+ "%"
: params[i].seriesName.search('总功率') != -1
? params[i].value + "MW"
: params[i].value + "片"
}</span>`;
}
return res;
},
},
xAxis: {
type: "category",
data: [],
axisTick: {
show: false,
},
axisPointer: {
type: "shadow",
},
},
dataZoom: [//
{
//
show: true,
//
type: "slider",
//
backgroundColor: "rgb(19, 63, 100)",
//
fillerColor: "rgb(16, 171, 198)",
//
borderColor: "rgb(19, 63, 100)",
// detail
showDetail: false,
//
startValue: 0,
//
endValue: 5,
// empty
//
filterMode: "empty",
//
width: "50%",
//
height: 8,
//
left: "center",
//
zoomLoxk: true,
//
handleSize: 0,
// dataZoom-slider
bottom: 3,
},
{
//
//
type: "inside",
//
zoomOnMouseWheel: false,
//
moveOnMouseMove: true,
moveOnMouseWheel: true,
},
],
yAxis:undefined,
series: [],
},
};
},
props: {
chartHeight: {
type: Number,
default: 300,
},
type: {
type: Number,
default: 2,
},
show: {
type: Boolean,
default: true,
},
legendList: {
type: Array,
default: () => [],
},
chartMsg: {
type: Object,
default: () => { },
},
chartId: {
type: String,
default: "bmChart",
},
chartNum: {
type: Number,
default: 1,
},
},
watch: {
chartHeight: {
handler(newVal) {
this.chartHeight = newVal;
},
},
type() {
this.canvasReset();
},
chartNum(val) {
this.canvasReset();
},
chartMsg: {
handler(newVal) {
this.canvasReset();
},
deep: true,
},
},
mounted() {
this.canvasReset();
},
methods: {
canvasReset() {
debounce(() => {
this.getMes();
}, 500)();
},
getMes() {
if (this.myChart) {
this.myChart.dispose();
}
var chartDom = document.getElementById(this.chartId);
this.myChart = echarts.init(chartDom);
this.option.color = this.chartMsg.color;
this.option.xAxis.data = this.chartMsg.xData;
// this.option.yAxis.name = this.chartMsg.yName;
// this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
this.option.series = this.chartMsg.series;
this.option.yAxis = this.chartMsg.yAxis;
this.myChart.setOption(this.option);
},
},
};
</script>
<style lang="scss">
.legendData {
text-align: right;
position: relative;
// right: 30;
// top: 10px;
.itemData {
display: inline-block;
margin-right: 10px;
font-size: 14px;
color: #8c8c8c;
.block {
width: 10px;
height: 10px;
display: inline-block;
margin-right: 4px;
}
.line {
width: 10px;
height: 10px;
border-radius: 5px;
display: inline-block;
margin-right: 4px;
position: relative;
.line-block {
position: absolute;
width: 20px;
height: 2px;
left: -5px;
top: 4px;
}
}
}
}
</style>

View File

@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-06-19 09:35:25
* @LastEditTime: 2024-06-20 15:40:06
* @LastEditors: zhp
* @Description:
-->
@ -76,7 +76,7 @@
<script>
// import { parseTime } from '../../core/mixins/code-filter';
import { getComprehensiveDataPage } from '@/api/report';
import { getComprehensiveDataPage, exportComprehensiveDataPage } from '@/api/report';
// import { getWorkOrderPage, exportExcel, getOverView } from '@/components/buttonNav'
// import inputTable from './inputTable.vue';
// import lineChart from './lineChart';
@ -153,68 +153,7 @@ export default {
id: 2,
},
],
tableProps: [
{
prop: 'factory',
label: '玻璃类型',
fixed:true,
// filter: (val) => factoryList[val],
// minWidth: 200,
// showOverflowtooltip: true
},
{
prop: 'workOrderNumber',
label: '科目/日期',
fixed: true,
// filter: (val) => ['', '', 'BIPV', ''][val]
},
{
prop: 'workOrderType',
label: '单位',
fixed: true,
// filter: publicFormatter('workorder_status')
// filter: (val) => ['', '', '', 'bipv'][val],
},
// {
// prop: 'plannedInvestment',
// label: '',
// },
// {
// prop: 'actualInvestment',
// label: '',
// },
// {
// prop: 'targetProduction',
// label: '',
// },
// {
// prop: 'actualProduction',
// label: '',
// },
// {
// prop: 'productionProgress',
// label: '',
// filter: (val) => (val * 100) + '%'
// },
// {
// prop: 'orderStatus',
// label: '',
// filter: publicFormatter('workorder_status')
// // filter: (val) => ['', '', ''][val],
// },
// {
// prop: 'startTime',
// label: '',
// minWidth: 100,
// showOverflowtooltip: true
// },
// {
// prop: 'endTime',
// label: '',
// minWidth: 100,
// showOverflowtooltip: true
// }
],
otherProps:[],
tableData: [],
xAxis: [],
currentMenu:null,
@ -228,6 +167,32 @@ export default {
weekNum() {
return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1
},
tableProps() {
return [
{
prop: 'type',
label: '玻璃类型',
fixed: true,
// filter: (val) => factoryList[val],
// minWidth: 200,
// showOverflowtooltip: true
},
{
prop: 'item',
label: '科目/日期',
fixed: true,
// filter: (val) => ['', '', 'BIPV', ''][val]
},
{
prop: 'unit',
label: '单位',
fixed: true,
// filter: publicFormatter('workorder_status')
// filter: (val) => ['', '', '', 'bipv'][val],
},
...this.otherProps
]
},
},
// created() {
// const currentMonth = new Date()
@ -348,16 +313,195 @@ export default {
});
},
async getDataList() {
this.otherProps = []
console.log(this.listQuery);
if (this.listQuery.type == 3) {
this.listQuery.startDate = this.listQuery.reportTime[0] + '-01-01 00:00:00'
this.listQuery.endDate = this.listQuery.reportTime[1] + '-12-31 23:59:59'
this.listQuery.startDate = this.listQuery.reportTime[0] + '-01-01'
this.listQuery.endDate = this.listQuery.reportTime[1] + '-12-31'
}
let arr = []
this.currentMenu === '邯郸' ? arr.push(1) : arr.push(2)
this.listQuery.factory = arr
const res = await getComprehensiveDataPage(this.listQuery)
this.tableData = res.data.list
let dataArr = [{
type: '芯片',
item: 'FTO投入',
unit: '片'
},
{
type: '芯片',
item: '芯片产量',
unit: '片'
}, {
type: '芯片',
item: '芯片平均功率',
unit: 'W'
},
{
type: '芯片',
item: '芯片良率',
unit: '%'
}, {
type: '芯片',
item: '芯片产量',
unit: '片'
}, {
type: '芯片',
item: '芯片总功率',
unit: 'MW'
}, {
type: '芯片',
item: 'CSS稼动率',
unit: '%'
}, {
type: '芯片',
item: '芯片段OEE',
unit: '%'
}, {
type: '芯片',
item: '芯片产能利用率',
unit: '%'
}, {
type: '芯片',
item: '芯片人均产量',
unit: '片/人'
}, {
type: '芯片',
item: '芯片BOM',
unit: '元/片'
}, {
type: '标准组件',
item: '标准组件产量',
unit: '片'
}, {
type: '标准组件',
item: '标准组件平均功率',
unit: 'W'
}, {
type: '标准组件',
item: '标准组件良率',
unit: '%'
}, {
type: '标准组件',
item: '标准组件总功率',
unit: 'MW'
}, {
type: '标准组件',
item: '封装线OEE',
unit: '%'
},
{
type: '标准组件',
item: '封装线产能利用率',
unit: '%'
},
{
type: '标准组件',
item: '标准组件人均产量',
unit: '片/人'
},
{
type: '标准组件',
item: '封装BOM',
unit: '元/片'
},
{
type: 'BIPV',
item: '芯片使用量',
unit: '%'
},
{
type: 'BIPV',
item: 'BIPV产量',
unit: 'm2'
},
{
type: 'BIPV',
item: '芯片使用率',
unit: '%'
},
{
type: 'BIPV',
item: '人均产量',
unit: 'm2/人'
},
{
type: 'BIPV',
item: 'OEM及委外材料成本',
unit: '元/片'
},
{
type: 'BIPV',
item: '内部材料成本',
unit: '元/片'
},
{
type: 'BIPV',
item: '综合材料成本',
unit: '元/片'
},
]
res.data.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.forEach((item, 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.chipAveragePower
dataArr[4]['' + m + ''] = item.chipTotalPower
dataArr[5]['' + m + ''] = item.chipCssMarriageRate
dataArr[6]['' + m + ''] = item.chipOee
dataArr[7]['' + m + ''] = item.chipCapacityUtilizationRate
dataArr[8]['' + m + ''] = item.chipAnnualAverageProduction
dataArr[9]['' + m + ''] = item.chipBom
dataArr[10]['' + m + ''] = item.componentYield
dataArr[11]['' + m + ''] = item.componentAveragePower
dataArr[12]['' + m + ''] = item.componentYieldRate
dataArr[13]['' + m + ''] = item.componentTotalPower
dataArr[14]['' + m + ''] = item.componentOee
dataArr[15]['' + m + ''] = item.componentCapacityUtilizationRate
dataArr[16]['' + m + ''] = item.componentAnnualAverageProduction
dataArr[17]['' + m + ''] = item.componentBom
dataArr[18]['' + m + ''] = item.bipvChipUsage
dataArr[19]['' + m + ''] = item.bipvProductOutput
dataArr[20]['' + m + ''] = item.bipvChipUtilizationRate
dataArr[21]['' + m + ''] = item.bipvAnnualAverageProduction
dataArr[22]['' + m + ''] = item.bipvOeeMaterialCost
dataArr[23]['' + m + ''] = item.bipvInsideMaterialCost
dataArr[24]['' + m + ''] = item.bipvComprehensiveMaterialCost
// })
// ele.titleValue
// .push({
// label: ele.titleValue,
// props: 'value' + index + 1,
// })
})
if (res.data.length === 0) {
this.tableData = []
} else {
if (this.currentMenu !== '瑞昌') {
this.tableData = dataArr
} else {
this.tableData = dataArr.filter(function (item) {
return item.type !== "BIPV"
});
}
}
this.listQuery.total = res.data.total
if (this.listQuery.total > 0) {
this.tableData.forEach(item => {
@ -393,6 +537,14 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
let fileName = "综合数据.xls";
exportComprehensiveDataPage(this.listQuery)
.then((response) => {
this.$download.excel(response, fileName);
this.$message.success("导出成功");
})
.catch(() => { });
// this.$modal.confirm('?').then(() => {
// //
// // let params = {...this.listQuery};

View File

@ -4,20 +4,20 @@
<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="请选择">
<el-select size="small" clearable v-model="listQuery.date" placeholder="请选择">
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
<el-form-item v-show="listQuery.date === 0 || listQuery.date === ''" label="时间范围" prop="reportTime">
<el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator=""
start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
<el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime">
<el-date-picker size="small" clearable v-model="start" type="week" format="yyyy 第 WW 周" placeholder="选择周"
style="width: 180px" @change="onValueChange">
</el-date-picker>
@ -29,12 +29,12 @@
{{ date1 }} {{ date2 }} {{ weekNum }}
</span> -->
</el-form-item>
<el-form-item v-show="listQuery.type === 2" label="时间值" prop="reportTime">
<el-form-item v-show="listQuery.date === 2" label="时间值" prop="reportTime">
<el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyy-MM-DD"
range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
</el-date-picker>
</el-form-item>
<el-form-item v-show="listQuery.type === 3" label="时间值" prop="reportTime">
<el-form-item v-show="listQuery.date === 3" label="时间值" prop="reportTime">
<el-date-picker size="small" clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year"
placeholder="开始时间">
</el-date-picker>
@ -63,11 +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" /> -->
</div>
<div class="containerTop">
<el-row v-if="listQuery.date === 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>
@ -78,9 +107,11 @@
</template>
<script>
import { getProduceSituationData } from '@/api/report';
import bmSearchBar from "./components/bmSearchBar.vue";
import BmLineBar from "./components/bmLineBar.vue";
import { getProduceTransData, exportProduceTransData } 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 {
@ -95,11 +126,11 @@ export default {
pageSize: 999,
// size: 10,
// current: 1,
factory: null,
factorys: null,
// total: 0,
type: 2,
startDate: undefined,
endDate: undefined,
date: 2,
beginTime: undefined,
endTime: undefined,
reportTime: []
},
timeList: [
@ -124,35 +155,133 @@ export default {
chartHeight: this.tableHeight(137) / 2 - 111,
tableH: this.tableHeight(137) / 2 - 70,
legendList: [
{ id: 1, name: "2024年4月目标值", type: 2, color: "#FFCE6A" },
{ id: 2, name: "2023年4月", type: 1, color: "#8EF0AB" },
{ id: 3, name: "2024年4月", type: 1, color: "#288AFF" },
{
id: 1, name: "综合良率", type: 2, color: "#FFCE6A"
},
{
id: 2, name: "FTO投入", type: 1, color: "#8EF0AB"
},
{ id: 3, name: "芯片产量", type: 1, color: "#288AFF" },
{
id: 3, name: "标准组件产量", type: 1, color: "#288AFF"
},
],
chartMsgYearTarget: {
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: {},
}
],
chartMsg: {
color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
xData: ["成都", "邯郸", "瑞昌"],
yName: "单位/%",
series: [
{
name: "2024年4月目标值",
name: "",
// yAxisIndex: 0,
data: [
{ name: "%", value: 85 },
{ name: "%", value: 85 },
{ name: "%", value: 85 },
],
type: "line",
symbol: "circle",
symbolSize: 6,
{
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,
color: "#FFAE17",
position: [-18, -16],
color: "#68C483",
formatter: function (params) {
return params.value.toFixed(2) + "%";
return params.value + "片";
},
},
},
{
name: "2023年4月",
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",
name: "单位/%",
nameTextStyle: {
fontSize: 12,
align: "right",
},
axisLabel: {},
}
],
series: [
{
name: "FTO投入",
data: [
{ name: "%", value: 57.5 },
{ name: "%", value: 21.66 },
@ -170,7 +299,7 @@ export default {
},
},
{
name: "2024年4月",
name: "芯片产量",
data: [
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
@ -187,6 +316,44 @@ export default {
},
},
},
{
name: "标准组件产量",
data: [
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
{ name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "#64BDFF",
formatter: function (params) {
return params.value.toFixed(2) + "%";
},
},
},
{
name: "综合良率",
data: [
{ name: "%", value: 85 },
{ name: "%", value: 85 },
{ name: "%", value: 85 },
],
type: "line",
symbol: "circle",
// barWidth: 20,
symbolSize: 6,
yAxisIndex: 1,
label: {
show: true,
color: "#FFAE17",
formatter: function (params) {
return params.value.toFixed(2) + "%";
},
},
},
],
},
chartId: "chipYieldBMChart",
@ -196,6 +363,7 @@ export default {
components: {
bmSearchBar,
BmLineBar,
produceLineBarYearTarget,
ButtonNav
},
computed: {
@ -279,13 +447,13 @@ export default {
this.start = undefined
this.end = undefined
} else {
this.listQuery.startDate = Number(this.start)
this.listQuery.endDate = Number(this.end)
this.listQuery.beginTime = Number(this.start)
this.listQuery.endTime = Number(this.end)
}
}
if (!this.start && !this.end) {
this.listQuery.startDate = undefined
this.listQuery.endDate = undefined
this.listQuery.beginTime = undefined
this.listQuery.endTime = undefined
}
// console.log(e);
},
@ -304,12 +472,12 @@ export default {
});
this.listQuery.reportTime = [];
} else {
this.listQuery.startDate = this.listQuery.reportTime[0]
this.listQuery.endDate = this.listQuery.reportTime[1]
this.listQuery.beginTime = this.listQuery.reportTime[0]
this.listQuery.endTime = this.listQuery.reportTime[1]
}
} else {
this.listQuery.startDate = undefined
this.listQuery.endDate = undefined
this.listQuery.beginTime = undefined
this.listQuery.endTime = undefined
}
},
onValueChange(picker, k) { // k
@ -324,15 +492,15 @@ export default {
type: 'warning'
});
} else {
this.listQuery.startDate = this.date1
this.listQuery.endDate = this.date2
// this.listQuery.startDate = Number(moment(this.start.getTime()).format('YYYYWW'))
// this.listQuery.endDate = Number(moment(this.end.getTime()).format('YYYYWW'))
this.listQuery.beginTime = this.date1
this.listQuery.endTime = this.date2
// this.listQuery.beginTime = Number(moment(this.start.getTime()).format('YYYYWW'))
// this.listQuery.endTime = Number(moment(this.end.getTime()).format('YYYYWW'))
}
}
if (!this.start && !this.end) {
this.listQuery.startDate = undefined
this.listQuery.endDate = undefined
this.listQuery.beginTime = undefined
this.listQuery.endTime = undefined
}
},
changeDayTime() {
@ -345,12 +513,12 @@ export default {
});
this.listQuery.reportTime = [];
} else {
this.listQuery.startDate = this.listQuery.reportTime[0]
this.listQuery.endDate = this.listQuery.reportTime[1]
this.listQuery.beginTime = this.listQuery.reportTime[0]
this.listQuery.endTime = this.listQuery.reportTime[1]
}
} else {
this.listQuery.startDate = undefined
this.listQuery.endDate = undefined
this.listQuery.beginTime = undefined
this.listQuery.endTime = undefined
}
},
getOverView() {
@ -368,65 +536,118 @@ export default {
},
async getDataList() {
this.otherProps = []
this.xData = []
this.chartMsg.xData = []
console.log(this.listQuery);
if (this.listQuery.type == 3) {
this.listQuery.startDate = this.listQuery.reportTime[0]
this.listQuery.endDate = this.listQuery.reportTime[1]
this.listQuery.beginTime = this.listQuery.reportTime[0]
this.listQuery.endTime = this.listQuery.reportTime[1]
}
let arr = []
this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
this.listQuery.factory = arr
const res = await getProduceSituationData(this.listQuery)
this.listQuery.factorys = arr
const res = await getProduceTransData(this.listQuery)
let dataArr = [{
factory: null,
item: 'FTO投入',
unit: ''
item: '芯片总功率',
unit: 'MW'
},
{
factory: null,
item: '芯片产量',
unit: ''
item: '标准组件总功率',
unit: 'MW'
},
{
factory: null,
item: '标准组件产量',
unit: '片'
},
{
factory: null,
item: '综合良率',
item: '转化效率',
unit: '%'
},]
res.data.list.forEach((ele, index) => {
}
]
res.data.forEach(element => {
element.list.forEach((ele, index) => {
let i = index + 1
ele.titleValue
this.xData.push(ele.titleValue)
this.chartMsg.xData.push(ele.reportTimep)
this.otherProps.push({
label: ele.titleValue,
label: ele.reportTimep,
props: 'value' + i
})
})
});
console.log(this.otherProps)
res.data.list.forEach((ele, index) => {
res.data.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
})
ele.list.forEach((item, index) => {
let i = index + 1
let m = 'value' + i
// ele.productionSituationDataVOList.forEach((item) => {
dataArr[0]['' + m + ''] = item.chipTotalPowers
dataArr[0].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
dataArr[1].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
dataArr[2].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
dataArr[3].factory = ele.factory === 1 ? '邯郸' : '瑞昌'
dataArr[1]['' + m + ''] = ele.scTotalPowers
dataArr[2]['' + m + ''] = ele.conversionEfficiency
// dataArr[3]['' + m + ''] = ele.comprehensiveYieldRate
// })
// ele.titleValue
// .push({
// label: ele.titleValue,
// props: 'value' + index + 1,
// })
})
// ele.productionSituationDataVOList.forEach((item) => {
// dataArr[0]['' + m + ''] = item.chipTotalPowers
// dataArr[0].factory = ele.factory === 1 ? '' : ''
// dataArr[1].factory = ele.factory === 1 ? '' : ''
// dataArr[2].factory = ele.factory === 1 ? '' : ''
// dataArr[3].factory = ele.factory === 1 ? '' : ''
// dataArr[1]['' + m + ''] = ele.scTotalPowers
// dataArr[2]['' + m + ''] = ele.conversionEfficiency
// dataArr[3]['' + m + ''] = ele.comprehensiveYieldRate
// })
// ele.titleValue
// .push({
// label: ele.titleValue,
// props: 'value' + index + 1,
// })
})
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'],
name: dataArr[0][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'],
name: 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'],
name: 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'],
name: dataArr[3][i]
})
}
}
// this.tableProps = otherProps
// res.data.list.forEach((ele) => {
// console.log(ele);
@ -442,14 +663,50 @@ export default {
// dataArr.push(obj)
// })
// })
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]) {
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'],
// name: dataArr[3][i]
// })
// }
// }
console.log(dataArr)
this.tableData = dataArr
// this.tableProps.push()
this.listQuery.total = res.data.total
if (this.listQuery.total > 0) {
this.tableData.forEach(item => {
item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
item.beginTime = item.beginTime ? item.beginTime[0] + '-' + item.beginTime[1] + '-' + item.beginTime[2] : '--'
item.endTime = item.endTime ? item.endTime[0] + '-' + item.endTime[1] + '-' + item.endTime[2] : '--'
})
}
},
@ -465,6 +722,13 @@ export default {
console.log("=========================");
},
handleExport() {
let fileName = "产量转化效率.xls";
exportProduceTransData(this.listQuery)
.then((response) => {
this.$download.excel(response, fileName);
this.$message.success("导出成功");
})
.catch(() => { });
console.log("导出");
},
},
@ -477,7 +741,7 @@ export default {
background-color: #fff;
border-radius: 8px;
padding: 16px 16px 0 16px;
margin-bottom: 8px;
margin: 8px 0px;
}
.containerTop {

View File

@ -1,73 +1,105 @@
<template>
<div>
<!-- <div class="search"> -->
<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-form-item label="时间维度" prop="type">
<el-select size="small" clearable v-model="listQuery.type" placeholder="请选择">
<el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
<el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator=""
start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
<el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator=""
start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
<el-date-picker size="small" clearable v-model="start" type="week" format="yyyy 第 WW 周" placeholder="选择周"
style="width: 180px" @change="onValueChange">
<el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
placeholder="选择周" style="width: 180px" @change="onValueChange">
</el-date-picker>
<el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
style="width: 180px" @change="onValueChange">
<el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
placeholder="选择周" style="width: 180px" @change="onValueChange">
</el-date-picker>
<!-- <span v-if="start && end" style="margin-left: 10px">
<!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
{{ date1 }} {{ date2 }} {{ weekNum }}
</span> -->
</el-form-item>
<el-form-item v-show="listQuery.type === 2" label="时间值" prop="reportTime">
<el-date-picker size="small" v-model="listQuery.reportTime" type="monthrange" value-format="yyyy-MM-DD"
range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" @change="changeTime">
<el-form-item v-show="listQuery.type === 2" label="时间范围" prop="reportTime">
<el-date-picker size="small" clearable v-model="listQuery.reportTime" type="monthrange"
value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
@change="changeTime">
</el-date-picker>
</el-form-item>
<el-form-item v-show="listQuery.type === 3" label="时间" prop="reportTime">
<el-date-picker size="small" clearable v-model="listQuery.reportTime[0]" value-format="yyyy" type="year"
<el-form-item v-show="listQuery.type === 3" label="时间范围" prop="reportTime">
<el-date-picker size="small" clearable v-model="listQuery.start" value-format="yyyy-MM-dd" type="year"
placeholder="开始时间">
</el-date-picker>
~
<el-date-picker size="small" clearable v-model="listQuery.reportTime[1]" value-format="yyyy" type="year"
<el-date-picker size="small" clearable v-model="listQuery.end" value-format="yyyy-MM-dd" type="year"
placeholder="结束时间" @change="getYear">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="玻璃类型" prop="type">
<el-select v-model="listQuery.type" placeholder="请选择玻璃类型">
<el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item> -->
<!-- <el-form-item label="玻璃类型" prop="type">
<el-select v-model="listQuery.type" placeholder="请选择玻璃类型">
<el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item> -->
<el-form-item>
<el-button type="primary" size="small" @click="getDataList">查询</el-button>
<el-divider direction="vertical"></el-divider>
<!-- <el-button type="primary" size="small" plain @click="handleImport">导入</el-button> -->
<el-button type="primary" size="small" plain @click="handleExport">导出</el-button>
<!-- <el-button type="success" size="small" plain @click="addFactory">新增</el-button> -->
</el-form-item>
</el-form>
</div>
<div class="containerTop">
<!-- <div class="smallTitle">产量转化效率</div> -->
<!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
<bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
:chartNum="chartNum" />
<el-row v-if="this.listQuery.type === 2">
<el-col :span="12">
<div class="blueTip">
生产情况对比
</div>
<bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
:legendList="legendList" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
</el-col>
<el-col :span="6" style="margin-top: 30px">
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
:chartMsg="chartMsgTarget" :chartId="'chartTarget'" :chartNum="chartNum" />
</el-col>
<el-col :span="6">
<div class="blueTip">
{{ title }}
</div>
<bm-line-bar-year-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
:chartMsg="chartMsgYearTarget" :chartId="'chartYearTarget'" :chartNum="chartNum" />
</el-col>
</el-row>
<el-row v-else-if="this.listQuery.type === 1 || this.listQuery.type === 0">
<el-col :span="18">
<div class="blueTip">
生产情况对比
</div>
<bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
:legendList="legendList" :chartMsg="chartMsg" :chartId="'chartDay'" :chartNum="chartNum" />
</el-col>
<el-col :span="6" style="margin-top: 30px">
<bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
:chartMsg="chartMsgTarget" :chartId="'chartDayTarget'" :chartNum="chartNum" />
</el-col>
<!-- <el-col :span="6">
<div class="blueTip">
{{ title }}
</div>
<bm-line-bar-year-target :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsgYearTarget"
:chartId=" 'chartYearTarget'" :chartNum="chartNum" />
</el-col> -->
</el-row>
<el-row v-else>
<!-- <el-col :span="12"> -->
<bm-line-bar :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg"
:chartId="chartId" :chartNum="chartNum" />
<!-- </el-col> -->
</el-row>
<base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
:max-height="tableH" />
</div>
@ -78,18 +110,22 @@
</template>
<script>
import { getProductionSituationMWData } from '@/api/report';
import { getProductionSituationMWData, exportProductionSituationMWData } from '@/api/report';
import bmSearchBar from "./components/bmSearchBar.vue";
import BmLineBar from "./components/bmLineBar.vue";
import BmLineBar from "./components/produceLineBar.vue";
import BmLineBarTarget from "./components/produceLineBarTarget.vue";
import BmLineBarYearTarget from "./components/produceLineBarYearTarget.vue";
import ButtonNav from '@/components/ButtonNav'
import moment from 'moment'
export default {
name: "ChipYieldBM",
name: "componentTotalPowerBM",
data() {
return {
otherProps: [],
start: undefined,
currentMenu: '邯郸',
end: undefined,
title: '',
listQuery: {
pageNo: 1,
pageSize: 999,
@ -100,7 +136,8 @@ export default {
type: 2,
startDate: undefined,
endDate: undefined,
reportTime: []
start: undefined,
end: undefined,
},
timeList: [
{
@ -124,35 +161,28 @@ export default {
chartHeight: this.tableHeight(137) / 2 - 111,
tableH: this.tableHeight(137) / 2 - 70,
legendList: [
{ id: 1, name: "2024年4月目标值", type: 2, color: "#FFCE6A" },
{ id: 2, name: "2023年4月", type: 1, color: "#8EF0AB" },
{ id: 3, name: "2024年4月", type: 1, color: "#288AFF" },
// { id: 1, name: "FTO", type: 1, color: "#FFCE6A" },
{ id: 2, name: "芯片总功率", type: 1, color: "#8EF0AB" },
{ id: 3, name: "标准组件总功率", type: 1, color: "#288AFF" },
// { id: 4, name: "BIPV", type: 1, color: "#64BDFF" },
],
chartMsg: {
color: ["#FFCE6A", "#8EF0AB", "#288AFF"],
xData: ["成都", "邯郸", "瑞昌"],
yName: "单位/%",
chartMsgYearTarget: {
color: ["#8EF0AB", "#288AFF"],
xData: [],
yName: "单位/MW",
yAxis: {
type: "value",
name: "单位/MW",
show: true,
nameTextStyle: {
fontSize: 12,
align: "right",
},
axisLabel: {},
},
series: [
{
name: "2024年4月目标值",
data: [
{ name: "%", value: 85 },
{ name: "%", value: 85 },
{ name: "%", value: 85 },
],
type: "line",
symbol: "circle",
symbolSize: 6,
label: {
show: true,
color: "#FFAE17",
formatter: function (params) {
return params.value.toFixed(2) + "%";
},
},
},
{
name: "2023年4月",
name: "芯片总功率",
data: [
{ name: "%", value: 57.5 },
{ name: "%", value: 21.66 },
@ -165,12 +195,12 @@ export default {
position: [-18, -16],
color: "#68C483",
formatter: function (params) {
return params.value.toFixed(2) + "%";
return params.value
},
},
},
{
name: "2024年4月",
name: "标准组件总功率",
data: [
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
@ -183,22 +213,109 @@ export default {
position: [0, -16],
color: "#288AFF",
formatter: function (params) {
return params.value.toFixed(2) + "%";
return params.value
},
},
},
],
},
chartId: "chipYieldBMChart",
chartMsgTarget: {
color: [ "#8EF0AB", "#288AFF",'rgba(104, 196, 131, .5)', 'rgba(40, 138, 255, .5)'],
xData: [],
yName: "单位/MW",
yAxis: {
type: "value",
name: "单位/MW",
show: false,
nameTextStyle: {
fontSize: 12,
align: "right",
},
axisLabel: {},
},
series: [
],
},
chartMsg: {
color: ["#8EF0AB", "#288AFF"],
xData: [],
yName: "单位/MW",
yAxis:
{
type: "value",
name: "单位/MW",
nameTextStyle: {
fontSize: 12,
align: "right",
},
axisLabel: {},
},
series: [
{
name: "芯片总功率",
data: [
{ name: "%", value: 57.5 },
{ name: "%", value: 21.66 },
{ name: "%", value: 18.4 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [10, -16],
color: "#68C483",
formatter: function (params) {
return params.value
},
},
},
{
name: "标准组件总功率",
data: [
{ name: "%", value: 23.33 },
{ name: "%", value: 7.02 },
{ name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "#288AFF",
formatter: function (params) {
return params.value
},
},
},
],
},
chartId: "componentTotalPowerBMChart",
chartNum: 1,
};
},
components: {
bmSearchBar,
BmLineBar,
BmLineBarTarget,
BmLineBarYearTarget,
ButtonNav
},
computed: {
dataArr() {
if (this.currentMenu != '瑞昌') {
return [{
factory: null,
item: '芯片总功率',
unit: 'MW'
},
{
factory: null,
item: ' 标准组件总功率',
unit: 'MW'
}]
}
},
tableProps() {
return [
{
@ -234,7 +351,7 @@ export default {
watch: {
//
isOpen(val) {
if (this.$route.name === "ChipYieldBM") {
if (this.$route.name === "productionSituationMW") {
this.chartNum++;
}
},
@ -249,7 +366,7 @@ export default {
},
activated() {
//
if (this.$route.name === "ChipYieldBM") {
if (this.$route.name === "productionSituationMW") {
this.chartNum++;
}
},
@ -262,60 +379,31 @@ export default {
},
methods: {
getYear(e) {
if (this.end && Number(this.end) - Number(this.start) > 10) {
if (this.listQuery.end - this.listQuery.start > 10 * 365 * 24 * 60 * 60 * 1000) {
this.$message({
message: '年份起止时间不能超过十年',
type: 'warning'
});
this.start = undefined
this.end = undefined
this.listQuery.reportTime = []
this.listQuery.start = undefined
this.listQuery.end = undefined
// console.log();
} else {
if (Number(this.end) < Number(this.start)) {
this.$message({
message: '结束年份不能小于开始年份',
type: 'warning'
});
this.start = undefined
this.end = undefined
} else {
this.listQuery.startDate = Number(this.start)
this.listQuery.endDate = Number(this.end)
this.listQuery.startDate = this.listQuery.start
this.listQuery.endDate = this.listQuery.end
}
}
if (!this.start && !this.end) {
if (!this.listQuery.start && !this.listQuery.end) {
this.listQuery.startDate = undefined
this.listQuery.endDate = undefined
}
// console.log(e);
},
changeTime() {
if (this.listQuery.reportTime) {
console.log(this.listQuery.reportTime)
let start = new Date(this.listQuery.reportTime[0])
let end = new Date(this.listQuery.reportTime[1])
// const years = Number(this.listQuery.reportTime[1].slice(0, 4)) - Number(this.listQuery.reportTime[0].slice(0, 4))
// const months = Number(this.listQuery.reportTime[1].slice(4)) - Number(this.listQuery.reportTime[0].slice(4))
// console.log(years);
if ((end - start) > 31104000000) {
this.$message({
message: '时间范围不能超过24个月',
type: 'warning'
});
this.listQuery.reportTime = [];
} else {
this.listQuery.startDate = this.listQuery.reportTime[0]
this.listQuery.endDate = this.listQuery.reportTime[1]
}
} else {
this.listQuery.startDate = undefined
this.listQuery.endDate = undefined
}
},
onValueChange(picker, k) { // k
if (this.start && this.end) {
this.date1 = moment(this.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
// console.log(this.listQuery.reportTime[0], this.listQuery.reportTime[1])
if (this.listQuery.start && this.listQuery.end) {
console.log(this.listQuery.reportTime)
this.date1 = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
this.date2 = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
if (numDays > 168) {
console.log(numDays)
@ -324,20 +412,21 @@ export default {
type: 'warning'
});
} else {
this.listQuery.startDate = this.date1
this.listQuery.endDate = this.date2
// this.listQuery.startDate = Number(moment(this.start.getTime()).format('YYYYWW'))
// this.listQuery.endDate = Number(moment(this.end.getTime()).format('YYYYWW'))
this.listQuery.startDate = moment(this.listQuery.start.getTime() - 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
this.listQuery.endDate = moment(this.listQuery.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
}
}
if (!this.start && !this.end) {
if (!this.listQuery.start && !this.listQuery.end) {
this.listQuery.startDate = undefined
this.listQuery.endDate = undefined
}
},
changeDayTime() {
if (this.listQuery.reportTime) {
const numDays = Number(this.listQuery.reportTime[1]) - Number(this.listQuery.reportTime[0])
// this.createStartDate = moment(new Date(this.listQuery.reportTime[0]), 'yyyy-MM-dd hh:mm:ss');
// this.createEndDate = moment(new Date(this.listQuery.reportTime[1]), 'yyyy-MM-dd hh:mm:ss');
console.log(this.listQuery.reportTime[1])
const numDays = (this.listQuery.reportTime[1] - this.listQuery.reportTime[0]) / (24 * 3600 * 1000);
if (numDays > 30) {
this.$message({
message: '时间范围不能超过30天',
@ -353,42 +442,393 @@ export default {
this.listQuery.endDate = undefined
}
},
getOverView() {
// getOverView().then(res => {
// this.data = res.data
// console.log('aa', res.data)
// })
},
otherMethods(val) {
this.detailOrUpdateVisible = true;
// this.addOrEditTitle = "";
this.$nextTick(() => {
// this.$refs.detailOrUpdate.init(val.data.id);
changeTime(value) {
if (this.listQuery.reportTime) {
const numDays = this.listQuery.reportTime[1] - this.listQuery.reportTime[0];
if (numDays > 2 * 365 * 24 * 60 * 60 * 1000) {
this.$message({
message: '时间范围不能超过24个月',
type: 'warning'
});
},
async getDataList() {
this.otherProps = []
console.log(this.listQuery);
if (this.listQuery.type == 3) {
this.listQuery.reportTime = [];
} else {
this.listQuery.startDate = this.listQuery.reportTime[0]
this.listQuery.endDate = this.listQuery.reportTime[1]
}
} else {
this.listQuery.startDate = undefined
this.listQuery.endDate = undefined
}
},
async getDataList() {
this.otherProps = []
this.chartMsg.xData = []
this.chartMsgTarget.xData = []
this.chartMsgYearTarget.xData = []
console.log(this.listQuery);
let arr = []
this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
this.listQuery.factory = arr
const res = await getProductionSituationMWData(this.listQuery)
let dataArr = [{
factory: null,
item: '芯片总功率',
unit: 'MW'
},
{
factory: null,
item: '标准组件总功率',
unit: 'MW'
}]
if (this.listQuery.type === 2) {
console.log(res.data.list.slice(res.data.list.length - 2, res.data.list.length));
res.data.list.forEach((ele, index) => {
let i = index + 1
// this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
this.otherProps.push({
label: ele.titleValue,
props: 'value' + i
})
})
// res.data.list.forEach((ele) => {
res.data.list.slice(0, res.data.list.length - 2).forEach((ele, index) => {
// let i = index + 1
this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
ele.productionSituationPowerDataVOList.forEach((item) => {
this.chartMsg.series[0].data.push({
name: ele.titleValue,
value: item.chipTotalPower
})
this.chartMsg.series[1].data.push({
name: ele.titleValue,
value: item.componentTotalPower
})
})
})
this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 2].titleValue.replace(/[^\d]/g, " "))
// this.chartMsgTarget.series = [{
// name: "FTO",
// data: [
// // s
// { name: "FTO", value:res,data,list },
// { name: "%", value: 85 },
// { name: "%", value: 85 },
// ],
// type: "bar",
// barWidth: 20,
// barGap: '0',
// label: {
// show: true,
// position: [-18, -16],
// color: "#FFAE17",
// formatter: function (params) {
// return params.value
// },
// },
// },]
let arr = []
res.data.list.slice(res.data.list.length - 3, res.data.list.length - 1).forEach((ele, index) => {
console.log(ele.titleValue.search('目标'));
// let i = index + 1
// this.chartMsgTarget.xData.push(ele.titleValue)
ele.productionSituationPowerDataVOList.forEach((item) => {
if (ele.titleValue.search('目标') != -1) {
arr.push(
{
name: "芯片总功率目标值",
// barGap: '-100%',
stack: 'a',
data: [
{ name: "芯片总功率目标值", value: item.componentTotalPower },
// { name: '', value: 22 },
// { name: "%", value: 21.66 },
// { name: "%", value: 18.4 },
],
type: "bar",
barWidth: 20,
// barGap: '-100%',
label: {
show: true,
position: [-18, -16],
color: "rgba(104,196,131,.5)",
formatter: function (params) {
return params.value
},
},
},
{
name: "标准组件总功率目标值",
stack: 'b',
data: [
{ name: "标准组件总功率目标值", value: item.componentYield },
// { name: '', value: 23 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "rgba(40,138,255,.5)",
formatter: function (params) {
return params.value
},
},
})
} else {
arr.push(
{
name: "芯片总功率完成值",
// barGap: '-100%',
stack: 'a',
data: [
{ name: "芯片总功率完成值", value: item.componentTotalPower },
// { name: '', value: 55 },
// { name: "%", value: 21.66 },
// { name: "%", value: 18.4 },
],
type: "bar",
barWidth: 20,
// barGap: '-100%',
label: {
show: true,
position: [-18, -16],
color: "rgba(104,196,131)",
formatter: function (params) {
return params.value
},
},
},
{
name: "标准组件总功率完成值",
stack: 'b',
data: [
{ name: "标准组件总功率完成值", value: item.componentYield },
// { name: '', value: 23 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "rgba(40,138,255)",
formatter: function (params) {
return params.value
},
},
})
}
// this.chartMsgTarget.series[1].data.push()
// this.chartMsgTarget.series[2].data.push()
// this.chartMsgTarget.series[3].data.push()
})
})
console.log('arr', arr)
this.chartMsgTarget.series = arr
// arr.forEach((ele) => {
// })
res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele, index) => {
// let i = index + 1
this.chartMsgYearTarget.xData.push(ele.titleValue)
this.title = ele.titleValue
ele.productionSituationPowerDataVOList.forEach((item) => {
this.chartMsgYearTarget.series[0].data.push({
name: ele.titleValue,
value: item.chipTotalPower
})
this.chartMsgYearTarget.series[1].data.push({
name: ele.titleValue,
value: item.componentTotalPower
})
})
})
// })
console.log(this.chartMsg.xData)
res.data.list.forEach((ele, index) => {
let i = index + 1
let m = 'value' + i
ele.productionSituationPowerDataVOList.forEach((item) => {
this.dataArr[0]['' + m + ''] = item.chipTotalPower
this.dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
this.dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
// this.dataArr[3].factory = item.factory == 1 ? '' : ''
this.dataArr[1]['' + m + ''] = item.componentTotalPower
// this.dataArr[3]['' + m + ''] = item.bipvProductOutput
})
// ele.titleValue
// .push({
// label: ele.titleValue,
// props: 'value' + index + 1,
// })
})
} else if (this.listQuery.type === 1 || this.listQuery.type === 0) {
console.log(res.data.list.slice(res.data.list.length - 2, res.data.list.length));
res.data.list.forEach((ele, index) => {
let i = index + 1
// this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
this.otherProps.push({
label: ele.titleValue,
props: 'value' + i
})
})
// res.data.list.forEach((ele) => {
res.data.list.slice(0, res.data.list.length - 1).forEach((ele, index) => {
// let i = index + 1
this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
ele.productionSituationPowerDataVOList.forEach((item) => {
this.chartMsg.series[0].data.push({
name: ele.titleValue,
value: item.chipTotalPower
})
this.chartMsg.series[1].data.push({
name: ele.titleValue,
value: item.componentTotalPower
})
})
})
this.chartMsgTarget.xData.push(res.data.list[res.data.list.length - 1].titleValue)
// this.chartMsgTarget.series = [{
// name: "FTO",
// data: [
// // s
// { name: "FTO", value:res,data,list },
// { name: "%", value: 85 },
// { name: "%", value: 85 },
// ],
// type: "bar",
// barWidth: 20,
// barGap: '0',
// label: {
// show: true,
// position: [-18, -16],
// color: "#FFAE17",
// formatter: function (params) {
// return params.value
// },
// },
// },]
let arr = []
res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele, index) => {
console.log(ele.titleValue.search('目标'));
// let i = index + 1
// this.chartMsgTarget.xData.push(ele.titleValue)
ele.productionSituationPowerDataVOList.forEach((item) => {
if (ele.titleValue.search('目标') != -1) {
arr.push(
{
name: "芯片总功率目标值",
// barGap: '-100%',
stack: 'a',
data: [
// { name: "", value: item.componentTotalPower },
{ name: '芯片总功率目标值', value: 22 },
// { name: "%", value: 21.66 },
// { name: "%", value: 18.4 },
],
type: "bar",
barWidth: 20,
// barGap: '-100%',
label: {
show: true,
position: [-18, -16],
color: "rgba(104,196,131,.5)",
formatter: function (params) {
return params.value
},
},
},
{
name: "标准组件总功率目标值",
stack: 'b',
data: [
// { name: "", value: item.componentYield },
{ name: '标准组件总功率目标值', value: 23 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "rgba(40,138,255,.5)",
formatter: function (params) {
return params.value
},
},
})
} else {
arr.push(
{
name: "芯片总功率完成值",
// barGap: '-100%',
stack: 'a',
data: [
// { name: "", value: item.componentTotalPower },
{ name: '芯片总功率完成值', value: 55 },
// { name: "%", value: 21.66 },
// { name: "%", value: 18.4 },
],
type: "bar",
barWidth: 20,
// barGap: '-100%',
label: {
show: true,
position: [-18, -16],
color: "rgba(104,196,131)",
formatter: function (params) {
return params.value
},
},
},
{
name: "标准组件总功率完成值",
stack: 'b',
data: [
// { name: "", value: item.componentYield },
{ name: '标准组件总功率完成值', value: 23 },
// { name: "%", value: 7.02 },
// { name: "%", value: 80.2 },
],
type: "bar",
barWidth: 20,
label: {
show: true,
position: [0, -16],
color: "rgba(40,138,255)",
formatter: function (params) {
return params.value
},
},
})
}
// this.chartMsgTarget.series[1].data.push()
// this.chartMsgTarget.series[2].data.push()
// this.chartMsgTarget.series[3].data.push()
})
})
console.log('arr', arr)
this.chartMsgTarget.series = arr
console.log(this.chartMsg.xData)
res.data.list.forEach((ele, index) => {
let i = index + 1
let m = 'value' + i
ele.productionSituationPowerDataVOList.forEach((item) => {
this.dataArr[0]['' + m + ''] = item.chipTotalPower
this.dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
this.dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
// this.dataArr[3].factory = item.factory == 1 ? '' : ''
this.dataArr[1]['' + m + ''] = item.componentTotalPower
})
// ele.titleValue
// .push({
// label: ele.titleValue,
// props: 'value' + index + 1,
// })
})
} else {
// if (this.currentMenu !== '') {
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
@ -399,10 +839,10 @@ export default {
let i = index + 1
let m = 'value' + i
ele.productionSituationPowerDataVOList.forEach((item) => {
dataArr[0]['' + m + ''] = item.chipTotalPower
dataArr[0].factory = item.factory === 1 ? '邯郸' : '瑞昌'
dataArr[1].factory = item.factory === 1 ? '邯郸' : '瑞昌'
dataArr[1]['' + m + ''] = item.componentTotalPower
this.dataArr[0]['' + m + ''] = item.chipTotalPower
this.dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
this.dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
this.dataArr[1]['' + m + ''] = item.componentTotalPower
})
// ele.titleValue
// .push({
@ -410,36 +850,55 @@ export default {
// props: 'value' + index + 1,
// })
})
for (let i in this.dataArr[0]) {
this.chartMsg.series[0].name = this.dataArr[0]['item']
if (i.search('value') === 0) {
this.chartMsg.series[0].data.push({
name: this.dataArr[0]['item'],
value: this.dataArr[0][i]
})
}
}
for (let i in this.dataArr[1]) {
this.chartMsg.series[1].name = this.dataArr[1]['item']
if (i.search('value') === 0) {
this.chartMsg.series[1].data.push({
name: this.dataArr[1]['item'],
value: this.dataArr[1][i]
})
}
}
}
this.tableData = this.dataArr
// this.tableProps = otherProps
// res.data.list.forEach((ele) => {
// console.log(ele);
// ele.productionSituationDataVOList.forEach((item) => {
// ele.productionSituationPowerDataVOList.forEach((item) => {
// let obj = {
// bipvProductOutput: item.bipvProductOutput,
// chipYield: item.chipYield,
// componentTotalPower: item.componentTotalPower,
// componentYield: item.componentYield,
// factory: item.factory,
// ftoInput: item.ftoInput,
// chipTotalPower: item.chipTotalPower,
// titleValue:ele.titleValue
// }
// dataArr.push(obj)
// })
// })
console.log(dataArr)
this.tableData = dataArr
// console.log(dataArr)
// this.tableProps.push()
this.listQuery.total = res.data.total
if (this.listQuery.total > 0) {
this.tableData.forEach(item => {
item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
})
}
// if (this.listQuery.total > 0) {
// this.tableData.forEach(item => {
// item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
// item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
// })
// }
},
_setTableHeight() {
this.tableH = this.tableHeight(137) / 2 - 70;
this.chartHeight = this.tableHeight(137) / 2 - 111;
if (this.$route.name === "ChipYieldBM") {
if (this.$route.name === "componentTotalPowerBM") {
this.chartNum++;
}
},
@ -448,7 +907,13 @@ export default {
console.log("=========================");
},
handleExport() {
console.log("导出");
let fileName = "生产情况(片).xls";
exportProductionSituationMWData(this.listQuery)
.then((response) => {
this.$download.excel(response, fileName);
this.$message.success("导出成功");
})
.catch(() => { });
},
},
};
@ -460,7 +925,7 @@ export default {
background-color: #fff;
border-radius: 8px;
padding: 16px 16px 0 16px;
margin-bottom: 8px;
margin: 8px 0px;
}
.containerTop {

File diff suppressed because it is too large Load Diff

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" /> -->
</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">
<bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId=" 'yearChart' "
:chartNum="chartNum" />
<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,7 +553,7 @@ export default {
let arr = []
this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
this.listQuery.factory = arr
const res = await getProduceSituationData(this.listQuery)
const res = await getProductionYieldSituationMWData(this.listQuery)
let dataArr = [{
factory: null,
item: 'FTO投入',
@ -424,6 +574,7 @@ export default {
item: '综合良率',
unit: '%'
},]
if (this.listQuery.type == 2) {
res.data.list.forEach((ele, index) => {
let i = index + 1
this.chartMsg.xData.push(ele.titleValue)
@ -432,44 +583,65 @@ export default {
props: 'value' + i
})
})
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
})
})
console.log(this.otherProps)
res.data.list.forEach((ele, index) => {
let i = index + 1
let m = 'value' + i
ele.productionSituationDataVOList.forEach((item) => {
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[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({
@ -477,11 +649,8 @@ export default {
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({
@ -489,11 +658,8 @@ export default {
value: dataArr[1][i]
})
}
// })
}
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({
@ -501,11 +667,8 @@ export default {
value: dataArr[2][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({
@ -513,9 +676,72 @@ export default {
value: dataArr[3][i]
})
}
// })
}
console.log(this.chartMsg.series)
} 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) {
}
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]) {
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(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 {