Merge branch 'master' of http://111.30.93.211:10101/r/supipe

张晓波

2023-10-30 4bc74cce28fd8c01433bed66b4d36da0ba9b3f79

 web/src/views/EquipmentManage/EquipSpot.vue

@@ -179,8 +179,8 @@
          bigNumber: this.bigNumber,
               pageNum: this.pageNum,
               pageSize: this.pageSize,
               startTime: this.timeData ? this.timeData[0] : '',
               endTime: this.timeData ? this.timeData[1] : ''
               startTime: this.timeData ? this.timeData[0] + ' 00:00:00' : '',
               endTime: this.timeData ? this.timeData[1] + ' 23:59:59' : ''
        }).then(res => {
               if(res.success) {
                  this.total = res.data.total;