修改bug
This commit is contained in:
		@@ -143,7 +143,7 @@ export default {
 | 
			
		||||
          valueFormat: "timestamp",
 | 
			
		||||
          rangeSeparator: '-',
 | 
			
		||||
          param: 'checkTime',
 | 
			
		||||
          defaultSelect: Date.now(),
 | 
			
		||||
          defaultSelect: Date.now() - 24 * 60 * 60 * 1000,
 | 
			
		||||
          width: 150
 | 
			
		||||
        },
 | 
			
		||||
        {
 | 
			
		||||
@@ -169,9 +169,9 @@ export default {
 | 
			
		||||
  },
 | 
			
		||||
  mounted() {
 | 
			
		||||
    // this.formConfig[1].defaultSelect[]
 | 
			
		||||
    this.listQuery.startTime = Date.now()
 | 
			
		||||
    this.time = moment(new Date(Date.now())).format('YYYY-MM-DD')
 | 
			
		||||
    this.listQuery.endTime = Date.now() + 24 * 60 * 60 * 1000
 | 
			
		||||
    this.listQuery.startTime = Date.now() - 24 * 60 * 60 * 1000
 | 
			
		||||
    this.time = moment(new Date((Date.now() - 24 * 60 * 60 * 1000)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now()).setHours(8, 0, 0, 0)).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()
 | 
			
		||||
    // this.getSpanArr(this.tableData)
 | 
			
		||||
@@ -308,7 +308,7 @@ export default {
 | 
			
		||||
            'sj11': null,
 | 
			
		||||
 | 
			
		||||
            'sj14': null,
 | 
			
		||||
            putType: '原料投入'
 | 
			
		||||
            putType: '原料投入(kg)'
 | 
			
		||||
          },
 | 
			
		||||
          {
 | 
			
		||||
            classType: 1,
 | 
			
		||||
@@ -374,7 +374,7 @@ export default {
 | 
			
		||||
            'sj11': null,
 | 
			
		||||
 | 
			
		||||
            'sj14': null,
 | 
			
		||||
            putType: '原料投入',
 | 
			
		||||
            putType: '原料投入(kg)',
 | 
			
		||||
          },
 | 
			
		||||
          {
 | 
			
		||||
            classType: 2,
 | 
			
		||||
@@ -440,7 +440,7 @@ export default {
 | 
			
		||||
            'sj11': null,
 | 
			
		||||
 | 
			
		||||
            'sj14': null,
 | 
			
		||||
            putType: '原料投入',
 | 
			
		||||
            putType: '原料投入(kg)',
 | 
			
		||||
          },
 | 
			
		||||
          {
 | 
			
		||||
            classType: 3,
 | 
			
		||||
@@ -535,9 +535,9 @@ export default {
 | 
			
		||||
      // Date.now() - 24 * 60 * 60 - 1000
 | 
			
		||||
      switch (val.btnName) {
 | 
			
		||||
        case 'search':
 | 
			
		||||
          this.listQuery.startTime = val.checkTime ? val.checkTime : undefined;
 | 
			
		||||
          this.time = moment(new Date(this.listQuery.startTime)).format('YYYY-MM-DD')
 | 
			
		||||
          this.listQuery.endTime = val.checkTime ? val.checkTime + 24 * 60 * 60 * 1000 : undefined;
 | 
			
		||||
          this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime).setHours(8, 0, 0, 0)).getTime() : undefined;
 | 
			
		||||
          this.time = moment(new Date((val.checkTime)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss')
 | 
			
		||||
          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(8, 0, 0, 0)).getTime() : undefined;
 | 
			
		||||
          this.getDataList();
 | 
			
		||||
          break;
 | 
			
		||||
        case 'export':
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
<!--
 | 
			
		||||
 * @Author: zhp
 | 
			
		||||
 * @Date: 2024-04-18 15:07:53
 | 
			
		||||
 * @LastEditTime: 2024-04-25 13:41:27
 | 
			
		||||
 * @LastEditTime: 2024-04-25 16:27:01
 | 
			
		||||
 * @LastEditors: zhp
 | 
			
		||||
 * @Description:
 | 
			
		||||
-->
 | 
			
		||||
@@ -67,7 +67,7 @@ const tableProps = [
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    prop: 'area',
 | 
			
		||||
    label: '面积'
 | 
			
		||||
    label: '面积(㎡)'
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    prop: 'rate',
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user