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 * @Author: zhp
* @Date: 2024-06-17 09:41:03 * @Date: 2024-06-17 09:41:03
* @LastEditTime: 2024-06-19 13:30:14 * @LastEditTime: 2024-06-20 15:39:21
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
*/ */
@ -9,11 +9,21 @@ import request from '@/utils/request'
export function getComprehensiveDataPage(data) { export function getComprehensiveDataPage(data) {
return request({ return request({
url: 'ip/comprehensive/data/get/comprehensive/data', url: 'ip/comprehensive/data/get/comprehensive/data',
method: 'get', method: 'post',
params: data 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) { export function getProduceTransData(data) {
return request({ return request({
url: 'ip/prod-output/queryYCEReportByDateRange', 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) { export function getProduceSituationData(data) {
return request({ 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) { export function getProductionSituationMWData(data) {
return request({ return request({
url: 'ip/production/situation/power/get/production/situation', url: 'ip/production/situation/power/get/production/situation',
@ -38,3 +66,30 @@ export function getProductionSituationMWData(data) {
data: 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 * @Author: zhp
* @Date: 2024-06-19 15:28:34 * @Date: 2024-06-19 15:28:34
* @LastEditTime: 2024-06-19 15:28:34 * @LastEditTime: 2024-06-20 20:30:35
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
<template> <template>
<div> <div>
<!-- 暂无数据 --> <!-- 暂无数据 -->
<div <div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
class="no-data-bg" v-show="this.chartMsg.series.length === 0"></div>
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 v-show="this.chartMsg.series.length > 0">
<div class="legend"> <div class="legendData" v-if="show">
<span class="item" v-for="item in legendList" :key="item.id"> <span class="itemData" v-for="item in legendList" :key="item.id">
<span <span v-if="item.type === 1" class="block" :style="{ backgroundColor: item.color }"></span>
v-if="item.type === 1" <span v-if="item.type === 2" class="line" :style="{ backgroundColor: item.color }">
class="block" <span class="line-block" :style="{ backgroundColor: item.color }"></span>
: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> </span>
{{ item.name }}</span {{ item.name }}</span>
>
</div> </div>
<div <div :id="chartId" :style="{ width: '100%', height: chartHeight + 'px' }"></div>
:id="chartId"
:style="{ width: '100%', height: chartHeight + 'px' }"
></div>
</div> </div>
</div> </div>
</template> </template>
@ -54,10 +36,11 @@ export default {
color: [], color: [],
// color: ["#8EF0AB", "#63BDFF", "#288AFF"], // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
grid: { grid: {
left: 100, left: 30,
right: 10, right: 0,
bottom: 30, bottom: 30,
top: 30, top: 30,
containLabel:true,
}, },
tooltip: { tooltip: {
trigger: "axis", trigger: "axis",
@ -68,17 +51,20 @@ export default {
}, },
}, },
formatter: function (params) { formatter: function (params) {
console.log('params', params);
var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`; 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++) { for (var i = 0, l = params.length; i < l; i++) {
res += res +=
"<br/>" + "<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;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='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;'>${ `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].name.search('率') === "综合良率"
params[i].name === "%" ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + : params[i].seriesName === "转化效率"
params[i].name ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
: params[i].value : params[i].seriesName.search('总功率') != -1
? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "MW"
: params[i].value + "片"
}</span>`; }</span>`;
} }
return res; return res;
@ -94,15 +80,53 @@ export default {
type: "shadow", type: "shadow",
}, },
}, },
yAxis: { dataZoom: [//
type: "value", {
name: "", //
nameTextStyle: { show: true,
fontSize: 12, //
align: "right", 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: [], series: [],
}, },
}; };
@ -112,6 +136,14 @@ export default {
type: Number, type: Number,
default: 300, default: 300,
}, },
type: {
type: Number,
default: 2,
},
show: {
type: Boolean,
default: true,
},
legendList: { legendList: {
type: Array, type: Array,
default: () => [], default: () => [],
@ -135,6 +167,9 @@ export default {
this.chartHeight = newVal; this.chartHeight = newVal;
}, },
}, },
type() {
this.canvasReset();
},
chartNum(val) { chartNum(val) {
this.canvasReset(); this.canvasReset();
}, },
@ -162,34 +197,24 @@ export default {
this.myChart = echarts.init(chartDom); this.myChart = echarts.init(chartDom);
this.option.color = this.chartMsg.color; this.option.color = this.chartMsg.color;
this.option.xAxis.data = this.chartMsg.xData; this.option.xAxis.data = this.chartMsg.xData;
this.option.yAxis.name = this.chartMsg.yName; // 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.axisLabel = this.chartMsg.yAxisLabel; // this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
this.option.series = this.chartMsg.series; this.option.series = this.chartMsg.series;
this.option.yAxis = this.chartMsg.yAxis;
this.myChart.setOption(this.option); this.myChart.setOption(this.option);
}, },
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.legend { .legendData {
text-align: right; text-align: right;
.item { position: relative;
// right: 30;
// top: 10px;
.itemData {
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
font-size: 14px; 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 * @Author: zhp
* @Date: 2024-04-15 10:49:13 * @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-06-19 09:35:25 * @LastEditTime: 2024-06-20 15:40:06
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -76,7 +76,7 @@
<script> <script>
// import { parseTime } from '../../core/mixins/code-filter'; // 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 { getWorkOrderPage, exportExcel, getOverView } from '@/components/buttonNav'
// import inputTable from './inputTable.vue'; // import inputTable from './inputTable.vue';
// import lineChart from './lineChart'; // import lineChart from './lineChart';
@ -153,68 +153,7 @@ export default {
id: 2, id: 2,
}, },
], ],
tableProps: [ otherProps:[],
{
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
// }
],
tableData: [], tableData: [],
xAxis: [], xAxis: [],
currentMenu:null, currentMenu:null,
@ -228,6 +167,32 @@ export default {
weekNum() { weekNum() {
return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1 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() { // created() {
// const currentMonth = new Date() // const currentMonth = new Date()
@ -348,16 +313,195 @@ export default {
}); });
}, },
async getDataList() { async getDataList() {
this.otherProps = []
console.log(this.listQuery); console.log(this.listQuery);
if (this.listQuery.type == 3) { if (this.listQuery.type == 3) {
this.listQuery.startDate = this.listQuery.reportTime[0] + '-01-01 00:00:00' this.listQuery.startDate = this.listQuery.reportTime[0] + '-01-01'
this.listQuery.endDate = this.listQuery.reportTime[1] + '-12-31 23:59:59' this.listQuery.endDate = this.listQuery.reportTime[1] + '-12-31'
} }
let arr = [] let arr = []
this.currentMenu === '邯郸' ? arr.push(1) : arr.push(2) this.currentMenu === '邯郸' ? arr.push(1) : arr.push(2)
this.listQuery.factory = arr this.listQuery.factory = arr
const res = await getComprehensiveDataPage(this.listQuery) const res = await getComprehensiveDataPage(this.listQuery)
this.tableData = res.data.list 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 this.listQuery.total = res.data.total
if (this.listQuery.total > 0) { if (this.listQuery.total > 0) {
this.tableData.forEach(item => { this.tableData.forEach(item => {
@ -393,6 +537,14 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
let fileName = "综合数据.xls";
exportComprehensiveDataPage(this.listQuery)
.then((response) => {
this.$download.excel(response, fileName);
this.$message.success("导出成功");
})
.catch(() => { });
// this.$modal.confirm('?').then(() => { // this.$modal.confirm('?').then(() => {
// // // //
// // let params = {...this.listQuery}; // // let params = {...this.listQuery};

View File

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

File diff suppressed because it is too large Load Diff

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 style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
</ButtonNav> </ButtonNav>
<!-- </div> --> <!-- </div> -->
<div class="containerTop"> <div class="search">
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip"> <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
<el-form-item label="时间维度" prop="date"> <el-form-item label="时间维度" prop="date">
<el-select size="small" clearable v-model="listQuery.type" placeholder="请选择"> <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="选择周" <el-date-picker size="small" clearable v-model="end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
style="width: 180px" @change="onValueChange"> style="width: 180px" @change="onValueChange">
</el-date-picker> </el-date-picker>6
<!-- <span v-if="start && end" style="margin-left: 10px"> <!-- <span v-if="start && end" style="margin-left: 10px">
{{ date1 }} {{ date2 }} {{ weekNum }} {{ date1 }} {{ date2 }} {{ weekNum }}
</span> --> </span> -->
@ -63,17 +63,40 @@
<!-- <el-button type="success" size="small" plain @click="addFactory">新增</el-button> --> <!-- <el-button type="success" size="small" plain @click="addFactory">新增</el-button> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- <div class="smallTitle">产量转化效率</div> --> </div>
<div class="containerTop">
<!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> --> <el-row v-if="listQuery.type === 2">
<el-col :span="16"> <el-col :span="16">
<bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId" <div class="blueTip">
:chartNum="chartNum" /> 产量及良率对比
</el-col> </div>
<el-col :span="8"> <bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId"
<bm-line-bar :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg" :chartId=" 'yearChart' " :chartNum="chartNum" />
:chartNum="chartNum" /> </el-col>
</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" <base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
:max-height="tableH" /> :max-height="tableH" />
</div> </div>
@ -84,9 +107,10 @@
</template> </template>
<script> <script>
import { getProduceSituationData } from '@/api/report'; import { getProductionYieldSituationMWData, exportProductionYieldSituationMWData } from '@/api/report';
import bmSearchBar from "./components/produceLineBar.vue"; import bmSearchBar from "./components/bmSearchBar";
import BmLineBar from "./components/bmLineBar.vue"; import BmLineBar from "./components/produceLineBar.vue";
import produceLineBarYearTarget from "./components/produceLineBarYearTarget.vue";
import ButtonNav from '@/components/ButtonNav' import ButtonNav from '@/components/ButtonNav'
import moment from 'moment' import moment from 'moment'
export default { export default {
@ -96,6 +120,7 @@ export default {
otherProps: [], otherProps: [],
start: undefined, start: undefined,
end: undefined, end: undefined,
title: '',
listQuery: { listQuery: {
pageNo: 1, pageNo: 1,
pageSize: 999, pageSize: 999,
@ -131,58 +156,154 @@ export default {
tableH: this.tableHeight(137) / 2 - 70, tableH: this.tableHeight(137) / 2 - 70,
legendList: [ legendList: [
{ {
id: 1, name: "综合良率", type: 2, color: "#FFCE6A" }, id: 1, name: "综合良率", type: 1, color: "#FFCE6A" },
{ id: 2, name: "标准组件产量", type: 1, color: "#8EF0AB" }, {
id: 2, name: "FTO投入", type: 1, color: "#8EF0AB" },
{ id: 3, name: "芯片产量", type: 1, color: "#288AFF" }, { id: 3, name: "芯片产量", type: 1, color: "#288AFF" },
{ id: 3, name: "fto投入", type: 1, color: "#64BDFF" }, {
id: 4, name: "标准组件产量", type: 1, color: "#64BDFF" },
], ],
chartMsg: { chartMsgYearTarget: {
color: ['#64BDFF', "#8EF0AB", "#288AFF", "#FFCE6A",], color: ["#8EF0AB", "#288AFF", '#64BDFF', "#FFCE6A",],
xData: [], 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: [ series: [
{ {
name: "", name: "",
// yAxisIndex: 0,
data: [ data: [
// { name: "%", value: 57.5 }, {
// { name: "%", value: 21.66 }, value: 1,
// { name: "%", value: 18.4 }, 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", type: "bar",
barWidth: 20, barWidth: 20,
label: { label: {
show: true, show: true,
position: [-18, -16], position: [-18, -16],
color: "#64BDFF", color: "#68C483",
formatter: function (params) { formatter: function (params) {
return params.value.toFixed(2) + "%"; return params.value + "片";
}, },
}, },
}, },
{ {
name: "", name: "",
// yAxisIndex: 0,
data: [ data: [
// { name: "%", value: 23.33 }, { name: "%", value: 23.33 },
// { name: "%", value: 7.02 }, { name: "%", value: 7.02 },
// { name: "%", value: 80.2 }, { 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 },
], ],
type: "bar", type: "bar",
barWidth: 20, barWidth: 20,
@ -191,20 +312,42 @@ export default {
position: [0, -16], position: [0, -16],
color: "#288AFF", color: "#288AFF",
formatter: function (params) { 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: "", name: "",
data: [ data: [
// { name: "%", value: 85 }, { name: "%", value: 115 },
// { name: "%", value: 85 }, { name: "%", value: 5 },
// { name: "%", value: 85 }, { name: "%", value: 8 },
], ],
type: "line", type: "line",
// barWidth: 20,
symbol: "circle", symbol: "circle",
symbolSize: 6, symbolSize: 6,
yAxisIndex: 1,
label: { label: {
show: true, show: true,
color: "#FFAE17", color: "#FFAE17",
@ -222,6 +365,7 @@ export default {
components: { components: {
bmSearchBar, bmSearchBar,
BmLineBar, BmLineBar,
produceLineBarYearTarget,
ButtonNav ButtonNav
}, },
computed: { computed: {
@ -256,9 +400,15 @@ export default {
isOpen() { isOpen() {
return this.$store.getters.sidebar.opened; return this.$store.getters.sidebar.opened;
}, },
type() {
return this.listQuery.type
}
}, },
watch: { watch: {
// //
type(val) {
},
isOpen(val) { isOpen(val) {
if (this.$route.name === "ChipYieldBM") { if (this.$route.name === "ChipYieldBM") {
this.chartNum++; this.chartNum++;
@ -275,7 +425,7 @@ export default {
}, },
activated() { activated() {
// //
if (this.$route.name === "ChipYieldBM") { if (this.$route.name === "productionYield") {
this.chartNum++; this.chartNum++;
} }
}, },
@ -403,119 +553,195 @@ export default {
let arr = [] let arr = []
this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0) this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
this.listQuery.factory = arr this.listQuery.factory = arr
const res = await getProduceSituationData(this.listQuery) const res = await getProductionYieldSituationMWData(this.listQuery)
let dataArr = [{ let dataArr = [{
factory: null, factory: null,
item: 'FTO投入', item: 'FTO投入',
unit: '片' unit: '片'
}, },
{ {
factory: null, factory: null,
item: '芯片产量', item: '芯片产量',
unit: '片' unit: '片'
}, },
{ {
factory: null, factory: null,
item: '标准组件产量', item: '标准组件产量',
unit: '片' unit: '片'
}, },
{ {
factory: null, factory: null,
item: '综合良率', item: '综合良率',
unit: '%' unit: '%'
},] },]
res.data.list.forEach((ele, index) => { if (this.listQuery.type == 2) {
let i = index + 1 res.data.list.forEach((ele, index) => {
this.chartMsg.xData.push(ele.titleValue) let i = index + 1
this.otherProps.push({ this.chartMsg.xData.push(ele.titleValue)
label: ele.titleValue, this.otherProps.push({
props: 'value' + i label: ele.titleValue,
props: 'value' + i
})
}) })
}) this.chartMsgYearTarget.xData.push('FTO投入', '芯片产量', '标准组件产量', '综合良率')
console.log(this.otherProps) res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele) => {
res.data.list.forEach((ele, index) => { this.title = ele.titleValue
let i = index + 1 ele.productYieldDataVOList.forEach((item) => {
let m = 'value' + i // this.chartMsgYearTarget.series[0].name = 'FTO',
ele.productionSituationDataVOList.forEach((item) => { // this.chartMsgYearTarget.series[1].name = '',
dataArr[0]['' + m + ''] = item.ftoInput // this.chartMsgYearTarget.series[2].name = '',
dataArr[0].factory = item.factory === 1 ? '邯郸' : '瑞昌' // this.chartMsgYearTarget.series[3].name = '',
dataArr[1].factory = item.factory === 1 ? '邯郸' : '瑞昌' // this.chartMsgYearTarget.series[0].data = [
dataArr[2].factory = item.factory === 1 ? '邯郸' : '瑞昌' // {
dataArr[3].factory = item.factory === 1 ? '邯郸' : '瑞昌' // value: item.ftoInput,
dataArr[1]['' + m + ''] = item.chipYield // itemStyle: {
dataArr[2]['' + m + ''] = item.componentYield // color: '#8EF0AB'
dataArr[3]['' + m + ''] = item.comprehensiveYieldRate // }
// },
// {
// 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 console.log(this.otherProps)
// .push({ res.data.list.forEach((ele, index) => {
// label: ele.titleValue, let i = index + 1
// props: 'value' + index + 1, let m = 'value' + i
// }) ele.productYieldDataVOList.forEach((item) => {
}) dataArr[0]['' + m + ''] = item.ftoInput
// this.tableProps = otherProps dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
// res.data.list.forEach((ele) => { dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
// console.log(ele); dataArr[2].factory = item.factory == 1 ? '邯郸' : '瑞昌'
// ele.productionSituationDataVOList.forEach((item) => { dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
// let obj = { dataArr[1]['' + m + ''] = item.chipYield
// bipvProductOutput: item.bipvProductOutput, dataArr[2]['' + m + ''] = item.componentYield
// chipYield: item.chipYield, dataArr[3]['' + m + ''] = item.comprehensiveYieldRate
// 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]
}) })
})
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']
for (let i in dataArr[1]) { if (i.search('value') === 0) {
// console.log(i.search('value')) this.chartMsg.series[1].data.push({
// dataArr.forEach((ele) => { name: dataArr[1]['item'],
this.chartMsg.series[1].name = dataArr[1]['item'] value: dataArr[1][i]
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) {
} }
// }) res.data.list.forEach((ele, index) => {
} let i = index + 1
for (let i in dataArr[2]) { let m = 'value' + i
// console.log(i.search('value')) ele.productYieldDataVOList.forEach((item) => {
// dataArr.forEach((ele) => { dataArr[0]['' + m + ''] = item.ftoInput
this.chartMsg.series[2].name = dataArr[2]['item'] dataArr[0].factory = item.factory == 1 ? '邯郸' : '瑞昌'
if (i.search('value') === 0) { dataArr[1].factory = item.factory == 1 ? '邯郸' : '瑞昌'
this.chartMsg.series[2].data.push({ dataArr[2].factory = item.factory == 1 ? '邯郸' : '瑞昌'
name: dataArr[2]['item'], dataArr[3].factory = item.factory == 1 ? '邯郸' : '瑞昌'
value: dataArr[2][i] 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']
for (let i in dataArr[3]) { if (i.search('value') === 0) {
// console.log(i.search('value')) this.chartMsg.series[1].data.push({
// dataArr.forEach((ele) => { name: dataArr[1]['item'],
this.chartMsg.series[3].name = dataArr[3]['item'] value: dataArr[1][i]
if (i.search('value') === 0) { })
this.chartMsg.series[3].data.push({ }
name: dataArr[3]['item'], }
value: dataArr[3][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) console.log(dataArr)
this.tableData = dataArr this.tableData = dataArr
// this.tableProps.push() // this.tableProps.push()
@ -539,7 +765,16 @@ export default {
console.log("========================="); console.log("=========================");
}, },
handleExport() { 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; background-color: #fff;
border-radius: 8px; border-radius: 8px;
padding: 16px 16px 0 16px; padding: 16px 16px 0 16px;
margin-bottom: 8px; margin:8px 0 8px 0px;
} }
.containerTop { .containerTop {