|
@@ -1,7 +1,7 @@ |
|
|
<!-- |
|
|
<!-- |
|
|
* @Author: zhp |
|
|
* @Author: zhp |
|
|
* @Date: 2024-04-18 10:01:33 |
|
|
* @Date: 2024-04-18 10:01:33 |
|
|
* @LastEditTime: 2024-04-26 09:42:54 |
|
|
|
|
|
|
|
|
* @LastEditTime: 2024-04-26 10:44:27 |
|
|
* @LastEditors: zhp |
|
|
* @LastEditors: zhp |
|
|
* @Description: |
|
|
* @Description: |
|
|
--> |
|
|
--> |
|
@@ -104,7 +104,7 @@ export default { |
|
|
listQuery: { |
|
|
listQuery: { |
|
|
startTime: undefined, |
|
|
startTime: undefined, |
|
|
endTime: undefined, |
|
|
endTime: undefined, |
|
|
lineId:null, |
|
|
|
|
|
|
|
|
lineId:undefined, |
|
|
}, |
|
|
}, |
|
|
formConfig: [ |
|
|
formConfig: [ |
|
|
// { |
|
|
// { |
|
@@ -132,7 +132,7 @@ export default { |
|
|
startPlaceholder: '开始时间', |
|
|
startPlaceholder: '开始时间', |
|
|
endPlaceholder: '结束时间', |
|
|
endPlaceholder: '结束时间', |
|
|
param: 'checkTime', |
|
|
param: 'checkTime', |
|
|
defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime(), new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000], |
|
|
|
|
|
|
|
|
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()], |
|
|
width: 350 |
|
|
width: 350 |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
@@ -142,6 +142,7 @@ export default { |
|
|
labelField: 'name', |
|
|
labelField: 'name', |
|
|
valueField: 'id', |
|
|
valueField: 'id', |
|
|
param: 'lineId', |
|
|
param: 'lineId', |
|
|
|
|
|
multiple:true, |
|
|
filterable: true |
|
|
filterable: true |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
{ |
|
@@ -170,8 +171,8 @@ export default { |
|
|
created() { }, |
|
|
created() { }, |
|
|
mounted() { |
|
|
mounted() { |
|
|
// this.formConfig[1].defaultSelect[] |
|
|
// this.formConfig[1].defaultSelect[] |
|
|
this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() |
|
|
|
|
|
this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000 |
|
|
|
|
|
|
|
|
this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000 |
|
|
|
|
|
this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() |
|
|
// this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000 |
|
|
// this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000 |
|
|
this.getDataList() |
|
|
this.getDataList() |
|
|
this.getDict() |
|
|
this.getDict() |
|
@@ -365,8 +366,8 @@ export default { |
|
|
// this.listQuery.materialId = val.materialId ? val.materialId : undefined; |
|
|
// this.listQuery.materialId = val.materialId ? val.materialId : undefined; |
|
|
// this.listQuery.startTime = '1706144404000'; |
|
|
// this.listQuery.startTime = '1706144404000'; |
|
|
// this.listQuery.endTime = '1706230804000'; |
|
|
// this.listQuery.endTime = '1706230804000'; |
|
|
this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined; |
|
|
|
|
|
this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000 : undefined; |
|
|
|
|
|
|
|
|
this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000 : undefined; |
|
|
|
|
|
this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() : undefined; |
|
|
this.listQuery.lineId = val.lineId ? val.lineId : undefined |
|
|
this.listQuery.lineId = val.lineId ? val.lineId : undefined |
|
|
this.getDataList(); |
|
|
this.getDataList(); |
|
|
break; |
|
|
break; |
|
|