报表
This commit is contained in:
@@ -7,17 +7,17 @@
|
||||
<div class="containerTop">
|
||||
<el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
|
||||
<el-form-item label="时间维度" prop="date">
|
||||
<el-select size="small" clearable v-model="listQuery.date" placeholder="请选择">
|
||||
<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.date === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
|
||||
<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 HH:mm:ss" @change="changeDayTime" end-placeholder="结束日期">
|
||||
start-placeholder="开始日期" value-format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime">
|
||||
<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>
|
||||
@@ -29,13 +29,12 @@
|
||||
{{ date1 }} 至 {{ date2 }},共 {{ weekNum }} 周
|
||||
</span> -->
|
||||
</el-form-item>
|
||||
<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 HH:mm:ss" range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份"
|
||||
@change="changeTime">
|
||||
<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-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="listQuery.date === 3" label="时间值" prop="reportTime">
|
||||
<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"
|
||||
placeholder="开始时间">
|
||||
</el-date-picker>
|
||||
@@ -79,65 +78,28 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getProduceSituationData } from '@/api/report';
|
||||
import bmSearchBar from "./components/bmSearchBar.vue";
|
||||
import BmLineBar from "./components/bmLineBar.vue";
|
||||
import ButtonNav from '@/components/ButtonNav'
|
||||
import moment from 'moment'
|
||||
import { getProduceTransData } from '@/api/report';
|
||||
const tableProps = [
|
||||
{
|
||||
prop: "factory",
|
||||
label: "玻璃类型",
|
||||
// filter: (val) => factoryList[val],
|
||||
minWidth: 200,
|
||||
showOverflowtooltip: true,
|
||||
},
|
||||
{
|
||||
prop: "name",
|
||||
label: "科目",
|
||||
minWidth: 120,
|
||||
showOverflowtooltip: true,
|
||||
},
|
||||
{
|
||||
prop: "unit",
|
||||
label: "单位",
|
||||
minWidth: 80,
|
||||
showOverflowtooltip: true,
|
||||
},
|
||||
{
|
||||
prop: "time1",
|
||||
label: "时间1",
|
||||
minWidth: 150,
|
||||
showOverflowtooltip: true,
|
||||
},
|
||||
{
|
||||
prop: "time2",
|
||||
label: "时间2",
|
||||
minWidth: 150,
|
||||
showOverflowtooltip: true,
|
||||
},
|
||||
{
|
||||
prop: "mubiao",
|
||||
label: "目标值",
|
||||
minWidth: 150,
|
||||
showOverflowtooltip: true,
|
||||
},
|
||||
];
|
||||
export default {
|
||||
name: "ChipYieldBM",
|
||||
data() {
|
||||
return {
|
||||
tableProps,
|
||||
otherProps: [],
|
||||
start: undefined,
|
||||
end: undefined,
|
||||
listQuery: {
|
||||
pageNo: 1,
|
||||
pageSize: 999,
|
||||
// size: 10,
|
||||
// current: 1,
|
||||
factorys: null,
|
||||
factory: null,
|
||||
// total: 0,
|
||||
date: 2,
|
||||
beginTime: undefined,
|
||||
endTime: undefined,
|
||||
type: 2,
|
||||
startDate: undefined,
|
||||
endDate: undefined,
|
||||
reportTime: []
|
||||
},
|
||||
timeList: [
|
||||
@@ -158,35 +120,7 @@ export default {
|
||||
label: '年'
|
||||
}
|
||||
],
|
||||
tableData: [
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
{ factory: "工厂1" },
|
||||
],
|
||||
tableData: [],
|
||||
chartHeight: this.tableHeight(137) / 2 - 111,
|
||||
tableH: this.tableHeight(137) / 2 - 70,
|
||||
legendList: [
|
||||
@@ -265,6 +199,31 @@ export default {
|
||||
ButtonNav
|
||||
},
|
||||
computed: {
|
||||
tableProps() {
|
||||
return [
|
||||
{
|
||||
prop: "factory",
|
||||
label: "工厂名称",
|
||||
// filter: (val) => factoryList[val],
|
||||
minWidth: 200,
|
||||
showOverflowtooltip: true,
|
||||
},
|
||||
{
|
||||
prop: "item",
|
||||
label: "科目",
|
||||
// filter: (val) => factoryList[val],
|
||||
minWidth: 200,
|
||||
showOverflowtooltip: true,
|
||||
},
|
||||
{
|
||||
prop: "unit",
|
||||
label: "单位",
|
||||
minWidth: 120,
|
||||
showOverflowtooltip: true,
|
||||
},
|
||||
...this.otherProps
|
||||
]
|
||||
},
|
||||
weekNum() {
|
||||
return Math.round((this.end - this.start) / (24 * 60 * 60 * 1000 * 7)) + 1
|
||||
},
|
||||
@@ -297,7 +256,7 @@ export default {
|
||||
mounted() {
|
||||
// this.getOverView()
|
||||
const currentMonth = new Date()
|
||||
this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD HH:mm:ss'), moment(currentMonth).format('yyyy-MM-DD HH:mm:ss')]
|
||||
this.listQuery.reportTime = [moment(currentMonth).format('yyyy-MM-DD'), moment(currentMonth).format('yyyy-MM-DD')]
|
||||
this.changeTime()
|
||||
this.getDataList()
|
||||
},
|
||||
@@ -320,13 +279,13 @@ export default {
|
||||
this.start = undefined
|
||||
this.end = undefined
|
||||
} else {
|
||||
this.listQuery.beginTime = Number(this.start)
|
||||
this.listQuery.endTime = Number(this.end)
|
||||
this.listQuery.startDate = Number(this.start)
|
||||
this.listQuery.endDate = Number(this.end)
|
||||
}
|
||||
}
|
||||
if (!this.start && !this.end) {
|
||||
this.listQuery.beginTime = undefined
|
||||
this.listQuery.endTime = undefined
|
||||
this.listQuery.startDate = undefined
|
||||
this.listQuery.endDate = undefined
|
||||
}
|
||||
// console.log(e);
|
||||
},
|
||||
@@ -345,18 +304,18 @@ export default {
|
||||
});
|
||||
this.listQuery.reportTime = [];
|
||||
} else {
|
||||
this.listQuery.beginTime = this.listQuery.reportTime[0]
|
||||
this.listQuery.endTime = this.listQuery.reportTime[1]
|
||||
this.listQuery.startDate = this.listQuery.reportTime[0]
|
||||
this.listQuery.endDate = this.listQuery.reportTime[1]
|
||||
}
|
||||
} else {
|
||||
this.listQuery.beginTime = undefined
|
||||
this.listQuery.endTime = undefined
|
||||
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 HH:mm:ss')
|
||||
this.date2 = moment(this.end.getTime() + 5 * 24 * 60 * 60 * 1000).format('YYYY-MM-DD HH:mm:ss')
|
||||
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')
|
||||
const numDays = (new Date(this.date2).getTime() - new Date(this.date1).getTime()) / (24 * 3600 * 1000);
|
||||
if (numDays > 168) {
|
||||
console.log(numDays)
|
||||
@@ -365,15 +324,15 @@ export default {
|
||||
type: 'warning'
|
||||
});
|
||||
} else {
|
||||
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'))
|
||||
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'))
|
||||
}
|
||||
}
|
||||
if (!this.start && !this.end) {
|
||||
this.listQuery.beginTime = undefined
|
||||
this.listQuery.endTime = undefined
|
||||
this.listQuery.startDate = undefined
|
||||
this.listQuery.endDate = undefined
|
||||
}
|
||||
},
|
||||
changeDayTime() {
|
||||
@@ -386,12 +345,12 @@ export default {
|
||||
});
|
||||
this.listQuery.reportTime = [];
|
||||
} else {
|
||||
this.listQuery.beginTime = this.listQuery.reportTime[0]
|
||||
this.listQuery.endTime = this.listQuery.reportTime[1]
|
||||
this.listQuery.startDate = this.listQuery.reportTime[0]
|
||||
this.listQuery.endDate = this.listQuery.reportTime[1]
|
||||
}
|
||||
} else {
|
||||
this.listQuery.beginTime = undefined
|
||||
this.listQuery.endTime = undefined
|
||||
this.listQuery.startDate = undefined
|
||||
this.listQuery.endDate = undefined
|
||||
}
|
||||
},
|
||||
getOverView() {
|
||||
@@ -408,21 +367,89 @@ export default {
|
||||
});
|
||||
},
|
||||
async getDataList() {
|
||||
this.otherProps = []
|
||||
this.xData = []
|
||||
console.log(this.listQuery);
|
||||
if (this.listQuery.date == 3) {
|
||||
this.listQuery.beginTime = this.listQuery.reportTime[0] + '-01-01 00:00:00'
|
||||
this.listQuery.endTime = this.listQuery.reportTime[1] + '-12-31 23:59:59'
|
||||
if (this.listQuery.type == 3) {
|
||||
this.listQuery.startDate = this.listQuery.reportTime[0]
|
||||
this.listQuery.endDate = this.listQuery.reportTime[1]
|
||||
}
|
||||
let arr = []
|
||||
this.currentMenu === '邯郸' ? arr.push(1) : arr.push(2)
|
||||
this.listQuery.factorys = arr
|
||||
const res = await getProduceTransData(this.listQuery)
|
||||
this.tableData = res.data.list
|
||||
this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
|
||||
this.listQuery.factory = arr
|
||||
const res = await getProduceSituationData(this.listQuery)
|
||||
let dataArr = [{
|
||||
factory: null,
|
||||
item: 'FTO投入',
|
||||
unit: '片'
|
||||
},
|
||||
{
|
||||
factory: null,
|
||||
item: '芯片产量',
|
||||
unit: '片'
|
||||
},
|
||||
{
|
||||
factory: null,
|
||||
item: '标准组件产量',
|
||||
unit: '片'
|
||||
},
|
||||
{
|
||||
factory: null,
|
||||
item: '综合良率',
|
||||
unit: '%'
|
||||
},]
|
||||
res.data.list.forEach((ele, index) => {
|
||||
let i = index + 1
|
||||
ele.titleValue
|
||||
this.xData.push(ele.titleValue)
|
||||
this.otherProps.push({
|
||||
label: ele.titleValue,
|
||||
props: 'value' + i
|
||||
})
|
||||
})
|
||||
console.log(this.otherProps)
|
||||
res.data.list.forEach((ele, index) => {
|
||||
let i = index + 1
|
||||
let m = 'value' + i
|
||||
ele.productionSituationDataVOList.forEach((item) => {
|
||||
dataArr[0]['' + m + ''] = item.ftoInput
|
||||
dataArr[0].factory = item.factory === 1 ? '邯郸' : '瑞昌'
|
||||
dataArr[1].factory = item.factory === 1 ? '邯郸' : '瑞昌'
|
||||
dataArr[2].factory = item.factory === 1 ? '邯郸' : '瑞昌'
|
||||
dataArr[3].factory = item.factory === 1 ? '邯郸' : '瑞昌'
|
||||
dataArr[1]['' + m + ''] = item.chipYield
|
||||
dataArr[2]['' + m + ''] = item.componentYield
|
||||
dataArr[3]['' + m + ''] = item.comprehensiveYieldRate
|
||||
})
|
||||
// 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)
|
||||
// })
|
||||
// })
|
||||
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.beginTime ? item.beginTime[0] + '-' + item.beginTime[1] + '-' + item.beginTime[2] : '--'
|
||||
item.endTime = item.endTime ? item.endTime[0] + '-' + item.endTime[1] + '-' + item.endTime[2] : '--'
|
||||
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] : '--'
|
||||
})
|
||||
}
|
||||
},
|
||||
@@ -452,7 +479,8 @@ export default {
|
||||
padding: 16px 16px 0 16px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
.containerTop{
|
||||
|
||||
.containerTop {
|
||||
height: calc((100vh - 170px));
|
||||
background-color: #fff;
|
||||
border-radius: 8px;
|
||||
@@ -469,6 +497,7 @@ export default {
|
||||
margin-right: 8PX;
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.containerTop {
|
||||
margin-top: 8px;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user