From b98b01f05c77eda059a34693da16591b88daecbe Mon Sep 17 00:00:00 2001 From: Shikong <919411476@qq.com> Date: Thu, 16 Mar 2023 17:12:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=BD=A8=E8=BF=B9=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/DateTimeSelector.vue | 4 +- .../src/views/record/AMapLocation.vue | 355 +++++++++++++++++- 2 files changed, 355 insertions(+), 4 deletions(-) diff --git a/frontend/matrix-middle-service-web/src/components/DateTimeSelector.vue b/frontend/matrix-middle-service-web/src/components/DateTimeSelector.vue index c8cc449..23654af 100644 --- a/frontend/matrix-middle-service-web/src/components/DateTimeSelector.vue +++ b/frontend/matrix-middle-service-web/src/components/DateTimeSelector.vue @@ -150,8 +150,8 @@ function rangeToOptions(dateData){ return true; } - let result = moment(date.value.from).isSameOrBefore(dateData) - if(!result){ + let result = moment(date.value.from).startOf('d').isSameOrBefore(dateData) + if(!moment(date.value.from).startOf('d').isSameOrBefore(date.value.to)){ date.value.to = date.value.from } return result; diff --git a/frontend/matrix-middle-service-web/src/views/record/AMapLocation.vue b/frontend/matrix-middle-service-web/src/views/record/AMapLocation.vue index a36bf96..0c39c56 100644 --- a/frontend/matrix-middle-service-web/src/views/record/AMapLocation.vue +++ b/frontend/matrix-middle-service-web/src/views/record/AMapLocation.vue @@ -1,12 +1,14 @@