Browse Source

2023-02-06 update

1. fix date初始化时, 未重置时分秒毫秒为0
moccus 2 years ago
parent
commit
67a2fb5e59

+ 4 - 2
src/pages/dataAnalysis/agcAnalysis/components/search.vue

@@ -25,10 +25,12 @@ const funGetStation = async () => {
 /**导出 */
 const emits = defineEmits(['submit'])
 const funSubmit = async () => {
+	const startDate = new Date(queryForm.st).setHours(0,0,0,0)
+	const endDate = new Date(queryForm.et).setHours(0,0,0,0)
 	const query = {
 		id: queryForm.station,
-		startTs: new Date(queryForm.st).getTime(),
-		endTs: new Date(queryForm.et).getTime(),
+		startTs: new Date(startDate).getTime(),
+		endTs: new Date(endDate).getTime(),
 		interval: queryForm.interval
 	}
 	switch (queryForm.interval) {

+ 4 - 2
src/pages/dataFilter/prepare/components/search.vue

@@ -47,11 +47,13 @@ const funCheckAll = () => {
 /**导出 */
 const emits = defineEmits(['submit'])
 const funSubmit = async () => {
+	const startDate = new Date(queryForm.st).setHours(0,0,0,0)
+	const endDate = new Date(queryForm.et).setHours(0,0,0,0)
 	const query = {
 		station: queryForm.station,
 		wtIds: queryForm.wtIds.join(),
-		st: new Date(queryForm.st).getTime(),
-		et: new Date(queryForm.et).getTime(),
+		st: new Date(startDate).getTime(),
+		et: new Date(endDate).getTime(),
 		interval: queryForm.interval
 	}
 	switch (queryForm.interval) {