projects/mesxc-dy
in i projects/mesxc-test
4 månader sedan
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: Do not edit | |||
* @Date: 2023-12-13 14:10:04 | |||
* @LastEditTime: 2024-04-23 16:47:21 | |||
* @LastEditTime: 2024-04-26 15:59:39 | |||
* @LastEditors: DY | |||
* @Description: | |||
--> | |||
@@ -38,15 +38,15 @@ | |||
import { updateGlass, updateGlassRemark } from '@/api/report/glass'; | |||
const cols = [ | |||
{ | |||
prop: 'lineName', | |||
label: '生产线', | |||
}, | |||
{ | |||
prop: 'xc', | |||
label: '许昌安彩周原片生产汇总', | |||
align: 'center', | |||
// align: '200px', | |||
children: [ | |||
{ | |||
prop: 'lineName', | |||
label: '生产线', | |||
}, | |||
{ | |||
prop: 'm', | |||
label: '拉引量㎡', | |||
@@ -181,9 +181,9 @@ const cols = [ | |||
deep: true, | |||
handler(newv, oldv) { | |||
if (newv[0] !== '' && newv[0] !== undefined) { | |||
this.cols[0].label = this.date + '(' + newv[0] + '-' + newv[1] + ')' | |||
this.cols[1].label = this.date + '(' + newv[0] + '-' + newv[1] + ')' | |||
} else { | |||
this.cols[0].label = this.date | |||
this.cols[1].label = this.date | |||
} | |||
} | |||
}, | |||
@@ -208,15 +208,15 @@ const cols = [ | |||
text2 = '上年' | |||
text3 = '原片合计(片/年)' | |||
} | |||
this.cols[0].children[1].children[0].label = text1 | |||
this.cols[0].children[1].children[1].label = text2 | |||
this.cols[0].children[2].children[0].label = text1 | |||
this.cols[0].children[2].children[1].label = text2 | |||
this.cols[0].children[3].children[0].label = text1 | |||
this.cols[0].children[3].children[1].label = text2 | |||
this.cols[0].children[4].children[0].label = text1 | |||
this.cols[0].children[4].children[1].label = text2 | |||
this.cols[0].children[2].label = text3 | |||
this.cols[1].children[0].children[0].label = text1 | |||
this.cols[1].children[0].children[1].label = text2 | |||
this.cols[1].children[1].children[0].label = text1 | |||
this.cols[1].children[1].children[1].label = text2 | |||
this.cols[1].children[2].children[0].label = text1 | |||
this.cols[1].children[2].children[1].label = text2 | |||
this.cols[1].children[3].children[0].label = text1 | |||
this.cols[1].children[3].children[1].label = text2 | |||
this.cols[1].children[1].label = text3 | |||
} | |||
} | |||
}, | |||
@@ -23,7 +23,7 @@ | |||
}" class="baseTable" :span-method="objectSpanMethod" :data="tableData" style="width: 100%"> | |||
<el-table-column align="center" prop="" :label=" '配料日报' + time " width="120"> | |||
<el-table-column label="原料样式" align="right" width="150"> | |||
<el-table-column prop="className" label="时间" width="120"> | |||
<el-table-column prop="className" label="时间" width="150"> | |||
</el-table-column> | |||
</el-table-column> | |||
<el-table-column align="center" prop="putType" label="" width="180"> | |||
@@ -32,8 +32,7 @@ | |||
<el-table-column prop="activityName"></el-table-column> | |||
<el-table-column prop="message"></el-table-column> | |||
</el-table-column> --> | |||
<el-table-column align="center" style="text-align: center;" v-for="(item, index) in codeList " :prop="item" | |||
:label="item"> | |||
<el-table-column align="center" style="text-align: center;" v-for="(item, index) in codeList " :key="index" :prop="item" :label="item"> | |||
<!-- <template slot-scope="scope"> | |||
<el-col :span="12"> | |||
{{ codeList[index] }} | |||
@@ -170,7 +169,7 @@ export default { | |||
mounted() { | |||
// this.formConfig[1].defaultSelect[] | |||
this.listQuery.startTime = Date.now() | |||
this.time = moment(new Date((Date.now())).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now() + 24*60*60*1000).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') | |||
this.time = moment(new Date((Date.now())).setHours(8, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now() + 24*60*60*1000).setHours( 7, 59, 59)).format('YYYY-MM-DD HH:mm:ss') | |||
this.listQuery.endTime = Date.now() | |||
// this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000 | |||
this.getDataList() | |||
@@ -579,14 +578,14 @@ export default { | |||
content: ''; | |||
position: absolute; | |||
width: 1px; | |||
height: 75px; | |||
height: 90px; | |||
/*这里需要自己调整,根据td的宽度和高度*/ | |||
top: 0; | |||
left: 0; | |||
background-color: grey; | |||
opacity: 0.3; | |||
display: block; | |||
transform: rotate(-53deg); | |||
transform: rotate(-60deg); | |||
/*这里需要自己调整,根据线的位置*/ | |||
transform-origin: top; | |||
} | |||
@@ -595,14 +594,14 @@ export default { | |||
content: ''; | |||
position: absolute; | |||
width: 1px; | |||
height: 75px; | |||
height: 90px; | |||
/*这里需要自己调整,根据td的宽度和高度*/ | |||
bottom: 0; | |||
right: 0; | |||
background-color: grey; | |||
opacity: 0.3; | |||
display: block; | |||
transform: rotate(-54deg); | |||
transform: rotate(-60deg); | |||
/*这里需要自己调整,根据线的位置*/ | |||
transform-origin: bottom; | |||
} | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-12-12 13:45:25 | |||
* @LastEditTime: 2024-04-24 15:29:21 | |||
* @LastEditTime: 2024-04-26 16:01:20 | |||
* @LastEditors: DY | |||
* @Description: | |||
--> | |||
@@ -32,13 +32,19 @@ | |||
background: '#F2F4F9', | |||
color: '#606266' | |||
}"> | |||
<el-table-column :label="'许昌安彩周成品生产汇总' + '(' + timeTips + ')'" align="center"> | |||
<el-table-column prop="lineId" label="生产线" align="center"> | |||
<el-table-column prop="lineId" label="生产线" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.lineName }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column :label="'许昌安彩周成品生产汇总' + '(' + timeTips + ')'"> | |||
<!-- <el-table-column prop="lineId" label="生产线" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.lineName }} </span> | |||
</template> | |||
</el-table-column> | |||
</el-table-column> --> | |||
<el-table-column label="投入数㎡" align="center"> | |||
<el-table-column prop="inputNow" label="本周" align="center"> | |||
<template slot-scope="scope"> | |||
@@ -1,8 +1,8 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2024-04-18 10:01:33 | |||
* @LastEditTime: 2024-04-26 10:44:00 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-04-26 15:22:57 | |||
* @LastEditors: DY | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -12,14 +12,14 @@ | |||
background: '#F2F4F9', | |||
color: '#606266' | |||
}" class="baseTable" :max-height="tableH" id="exportTable" :data="tableData" style="width: 100%"> | |||
<el-table-column v-for="item in tableProps" :prop="item.prop" :label="item.label" align="center"> | |||
<el-table-column v-for="it in item.children" :prop="it.prop" :label="it.label" align="center"> | |||
<el-table-column v-for="(item, index) in tableProps" :key="index" :prop="item.prop" :label="item.label" align="center"> | |||
<el-table-column v-for="(it, indexNo) in item.children" :key="indexNo" :prop="it.prop" :label="it.label" align="center"> | |||
</el-table-column> | |||
</el-table-column> | |||
</el-table> | |||
<el-table class="baseTable" :max-height="tableH" id="exportTableChild" :data="tableDataChild" style="width: 100%"> | |||
<el-table-column v-for="item in tablePropsChild" :prop="item.prop" :label="item.label" align="center"> | |||
<el-table-column v-for="it in item.children" :prop="it.prop" :label="it.label" align="center"> | |||
<el-table-column v-for="(item, indexn) in tablePropsChild" :key="indexn" :prop="item.prop" :label="item.label" align="center"> | |||
<el-table-column v-for="(it, indexi) in item.children" :key="indexi" :prop="it.prop" :label="it.label" align="center"> | |||
</el-table-column> | |||
</el-table-column> | |||
</el-table> | |||
@@ -205,7 +205,7 @@ export default { | |||
labelField: 'name', | |||
valueField: 'id', | |||
param: 'lineId', | |||
multiple:true, | |||
// multiple:true, | |||
filterable: true | |||
}, | |||
{ | |||
@@ -1,8 +1,8 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2024-04-18 14:08:46 | |||
* @LastEditTime: 2024-04-26 09:10:53 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-04-26 16:12:51 | |||
* @LastEditors: DY | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -49,7 +49,7 @@ | |||
<el-table :header-cell-style="{ | |||
background: '#F2F4F9', | |||
color: '#606266' | |||
}" class=" baseTable" :data="tableData" style="width: 100%"> | |||
}" id="exportTable" class="baseTable" :data="tableData" style="width: 100%"> | |||
<el-table-column label="时间" align="right" width="150"> | |||
<el-table-column prop="name" label="缺陷" width="120"> | |||
</el-table-column> | |||
@@ -60,7 +60,7 @@ | |||
<el-table-column prop="activityName"></el-table-column> | |||
<el-table-column prop="message"></el-table-column> | |||
</el-table-column> --> | |||
<el-table-column v-for="(item, index) in codeList " :prop="item.prop" :label="item.label"> | |||
<el-table-column v-for="(item, index) in codeList " :key="index" :prop="item.prop" :label="item.label"> | |||
</el-table-column> | |||
</el-table> | |||
<!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total" | |||
@@ -244,7 +244,7 @@ export default { | |||
// this.listQuery.endTime = this.formConfig[0].defaultSelect[1] | |||
// this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000 | |||
this.listQuery.startTime = new Date() | |||
this.getDataList() | |||
// this.getDataList() | |||
this.getDict() | |||
// this.getSpanArr(this.tableData) | |||
// this.getDict(); | |||
@@ -310,6 +310,7 @@ export default { | |||
//设置导出文件名称 | |||
"全检检验记录.xlsx" | |||
); | |||
this.$message.success('导出成功'); | |||
} catch (e) { | |||
if (typeof console !== "undefined") console.log(e, wbout); | |||
} | |||
@@ -349,7 +350,7 @@ export default { | |||
let arr = [] | |||
console.log(res.data) | |||
res.data.timeStrList.push('不良合计') | |||
res.data?.timeStrList.push('不良合计') | |||
this.codeList = res.data.timeStrList.map((ele, index) => { | |||
if (ele === '不良合计') { | |||
return { | |||
@@ -1,8 +1,8 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2024-04-18 10:01:33 | |||
* @LastEditTime: 2024-04-26 10:44:27 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-04-26 15:31:24 | |||
* @LastEditors: DY | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -13,8 +13,7 @@ | |||
color: '#606266' | |||
}" class="baseTable" border :max-height="tableH" id="exportTable" :data="tableData" style="width: 100%" | |||
:span-method="objectSpanMethod"> | |||
<el-table-column :width="item.width" v-for="item in tableProps" :prop="item.prop" :label="item.label" | |||
align="center"> | |||
<el-table-column :width="item.width" v-for="(item, index) in tableProps" :key="index" :prop="item.prop" :label="item.label" align="center"> | |||
</el-table-column> | |||
</el-table> | |||
<!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total" | |||
@@ -51,7 +50,7 @@ const tableProps = [ | |||
// }, | |||
{ | |||
prop: 'lineName', | |||
label: '产线', | |||
label: '生产线', | |||
width:'100' | |||
}, | |||
{ | |||
@@ -132,7 +131,7 @@ export default { | |||
startPlaceholder: '开始时间', | |||
endPlaceholder: '结束时间', | |||
param: 'checkTime', | |||
defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000, new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()], | |||
defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000, new Date(new Date(Date.now()).setHours(6, 59, 59, 0)).getTime()], | |||
width: 350 | |||
}, | |||
{ | |||
@@ -1,8 +1,8 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2024-04-18 15:07:53 | |||
* @LastEditTime: 2024-04-26 10:44:41 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-04-26 15:20:45 | |||
* @LastEditors: DY | |||
* @Description: | |||
--> | |||
<template> | |||
@@ -12,8 +12,7 @@ | |||
background: '#F2F4F9', | |||
color: '#606266' | |||
}" class="baseTable" border id="exportTable" :data="tableData" style="width: 100%" :span-method="objectSpanMethod"> | |||
<el-table-column :width="item.width" v-for="item in tableProps" :prop="item.prop" :label="item.label" | |||
align="center"> | |||
<el-table-column :width="item.width" v-for="(item, index) in tableProps" :key="index" :prop="item.prop" :label="item.label" align="center"> | |||
</el-table-column> | |||
</el-table> | |||
<!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total" | |||
@@ -56,7 +55,7 @@ const tableProps = [ | |||
}, | |||
{ | |||
prop: 'dataType', | |||
label: '类别', | |||
label: '类型', | |||
width: '150', | |||
}, | |||
{ | |||