projects/mesxc-zhp #367
@ -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-25 10:18:08
|
* @LastEditTime: 2024-04-25 13:40:51
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -195,7 +195,7 @@ export default {
|
|||||||
startPlaceholder: '开始时间',
|
startPlaceholder: '开始时间',
|
||||||
endPlaceholder: '结束时间',
|
endPlaceholder: '结束时间',
|
||||||
param: 'checkTime',
|
param: 'checkTime',
|
||||||
defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
|
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],
|
||||||
width: 350
|
width: 350
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -232,9 +232,10 @@ export default {
|
|||||||
},
|
},
|
||||||
created() { },
|
created() { },
|
||||||
mounted() {
|
mounted() {
|
||||||
// this.formConfig[1].defaultSelect[]
|
// this.formConfig[1].defaultSelect[0] =
|
||||||
this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
|
// this.formConfig[1].defaultSelect[0] =
|
||||||
this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
|
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.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()
|
||||||
@ -462,8 +463,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 ? val.checkTime[0] : undefined;
|
this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined;
|
||||||
this.listQuery.endTime = val.checkTime ? val.checkTime[1] : 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.lineId = val.lineId ? val.lineId : undefined
|
this.listQuery.lineId = val.lineId ? val.lineId : undefined
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
break;
|
break;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2024-04-18 14:08:46
|
* @Date: 2024-04-18 14:08:46
|
||||||
* @LastEditTime: 2024-04-25 10:18:17
|
* @LastEditTime: 2024-04-25 13:30:11
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -214,7 +214,7 @@ export default {
|
|||||||
startPlaceholder: '开始时间',
|
startPlaceholder: '开始时间',
|
||||||
endPlaceholder: '结束时间',
|
endPlaceholder: '结束时间',
|
||||||
param: 'checkTime',
|
param: 'checkTime',
|
||||||
defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
|
defaultSelect: [Date.now() - 24 * 60 * 60*1000, Date.now()],
|
||||||
width: 350
|
width: 350
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -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-24 09:56:20
|
* @LastEditTime: 2024-04-25 13:40:36
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -132,7 +132,7 @@ export default {
|
|||||||
startPlaceholder: '开始时间',
|
startPlaceholder: '开始时间',
|
||||||
endPlaceholder: '结束时间',
|
endPlaceholder: '结束时间',
|
||||||
param: 'checkTime',
|
param: 'checkTime',
|
||||||
defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
|
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],
|
||||||
width: 350
|
width: 350
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -170,8 +170,8 @@ export default {
|
|||||||
created() { },
|
created() { },
|
||||||
mounted() {
|
mounted() {
|
||||||
// this.formConfig[1].defaultSelect[]
|
// this.formConfig[1].defaultSelect[]
|
||||||
this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
|
this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime()
|
||||||
this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
|
this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000
|
||||||
// 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 +365,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 ? val.checkTime[0] : undefined;
|
this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined;
|
||||||
this.listQuery.endTime = val.checkTime ? val.checkTime[1] : 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.lineId = val.lineId ? val.lineId : undefined
|
this.listQuery.lineId = val.lineId ? val.lineId : undefined
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
break;
|
break;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: zhp
|
* @Author: zhp
|
||||||
* @Date: 2024-04-18 15:07:53
|
* @Date: 2024-04-18 15:07:53
|
||||||
* @LastEditTime: 2024-04-24 09:58:07
|
* @LastEditTime: 2024-04-25 13:41:27
|
||||||
* @LastEditors: zhp
|
* @LastEditors: zhp
|
||||||
* @Description:
|
* @Description:
|
||||||
-->
|
-->
|
||||||
@ -129,7 +129,7 @@ export default {
|
|||||||
startPlaceholder: '开始时间',
|
startPlaceholder: '开始时间',
|
||||||
endPlaceholder: '结束时间',
|
endPlaceholder: '结束时间',
|
||||||
param: 'checkTime',
|
param: 'checkTime',
|
||||||
defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
|
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],
|
||||||
width: 350
|
width: 350
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -167,8 +167,8 @@ export default {
|
|||||||
created() { },
|
created() { },
|
||||||
mounted() {
|
mounted() {
|
||||||
// this.formConfig[1].defaultSelect[]
|
// this.formConfig[1].defaultSelect[]
|
||||||
this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
|
this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime()
|
||||||
this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
|
this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000
|
||||||
// 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()
|
||||||
@ -357,8 +357,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 ? val.checkTime[0] : undefined;
|
this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined;
|
||||||
this.listQuery.endTime = val.checkTime ? val.checkTime[1] : 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.lineId = val.lineId ? val.lineId : undefined
|
this.listQuery.lineId = val.lineId ? val.lineId : undefined
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user