From 6058614245c3fe2757e50192a9aaa4f53a67144c Mon Sep 17 00:00:00 2001
From: H <30830569@qq.com>
Date: Fri, 11 Nov 2022 14:18:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                            | 1 -
 src/views/main/meteorological/index.vue | 4 ++--
 yarn.lock                               | 5 -----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 46eb67bf..320adba3 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,6 @@
     "intro.js": "^5.1.0",
     "lodash-es": "^4.17.21",
     "mockjs": "^1.1.0",
-    "moment": "^2.29.4",
     "nprogress": "^0.2.0",
     "path-to-regexp": "^6.2.0",
     "pinia": "2.0.12",
diff --git a/src/views/main/meteorological/index.vue b/src/views/main/meteorological/index.vue
index aa732957..a6908321 100644
--- a/src/views/main/meteorological/index.vue
+++ b/src/views/main/meteorological/index.vue
@@ -177,7 +177,6 @@
 </template>
 
 <script lang="ts" setup>
-  import moment from 'moment'
   import { formatDataByObject, getWeek, getMonth } from '/@/utils/index'
   import dayjs from 'dayjs'
   import { PageWrapper } from '/@/components/Page'
@@ -222,7 +221,8 @@
   const statisData = ref<any>({})
   const name = computed(() => baseDate?.value?.find((e: any) => e.id === formState.base_id)?.name)
   const disabledDate = (current) => {
-    return current && current > moment().endOf('day')
+    console.log(current)
+    return current && current > dayjs().endOf('day')
   }
   // 获取基地数据
   const getBase = async () => {
diff --git a/yarn.lock b/yarn.lock
index ee9a1135..1dfe34f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6674,11 +6674,6 @@ modify-values@^1.0.0:
   resolved "https://registry.npmmirror.com/modify-values/-/modify-values-1.0.1.tgz"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-moment@^2.29.4:
-  version "2.29.4"
-  resolved "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
-  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
-
 mousetrap@^1.6.5:
   version "1.6.5"
   resolved "https://registry.npmmirror.com/mousetrap/-/mousetrap-1.6.5.tgz"