From 95be79f0f6bdd3eec43e24803a47ff9386016220 Mon Sep 17 00:00:00 2001
From: H <30830569@qq.com>
Date: Fri, 11 Nov 2022 14:04:34 +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/App.vue                             |  4 +++-
 src/layouts/default/header/index.vue    |  2 +-
 src/main.ts                             |  1 -
 src/views/main/meteorological/index.vue | 10 +++++++++-
 yarn.lock                               |  5 +++++
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 320adba3..46eb67bf 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "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/App.vue b/src/App.vue
index 5a17ba2b..d0969c7f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,14 +7,16 @@
 </template>
 
 <script lang="ts" setup>
+  import dayjs from 'dayjs'
+  import 'dayjs/locale/zh-cn'
   import { ConfigProvider } from 'ant-design-vue'
   import { AppProvider } from '/@/components/Application'
   import { useTitle } from '/@/hooks/web/useTitle'
   import { useLocale } from '/@/locales/useLocale'
+  dayjs.locale('zh-cn')
 
   // support Multi-language
   const { getAntdLocale } = useLocale()
-
   // Listening to page changes and dynamically changing site titles
   useTitle()
 </script>
diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue
index ae3ed065..541080a8 100644
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@@ -50,7 +50,7 @@
 
       <UserDropDown :theme="getHeaderTheme" />
 
-      <SettingDrawer v-if="getShowSetting" :class="`${prefixCls}-action__item`" />
+      <!-- <SettingDrawer v-if="getShowSetting" :class="`${prefixCls}-action__item`" /> -->
     </div>
   </Header>
 </template>
diff --git a/src/main.ts b/src/main.ts
index fb275f8c..1829cb8b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -19,7 +19,6 @@ import { isDevMode } from './utils/env'
 if (isDevMode()) {
   import('ant-design-vue/es/style')
 }
-
 async function bootstrap() {
   const app = createApp(App)
 
diff --git a/src/views/main/meteorological/index.vue b/src/views/main/meteorological/index.vue
index ef3358b4..aa732957 100644
--- a/src/views/main/meteorological/index.vue
+++ b/src/views/main/meteorological/index.vue
@@ -46,7 +46,11 @@
             :xxl="{ span: 4 }"
           >
             <FormItem label="日期">
-              <RangePicker @change="onChange('time')" v-model:value="formState.time"></RangePicker>
+              <RangePicker
+                :disabledDate="disabledDate"
+                @change="onChange('time')"
+                v-model:value="formState.time"
+              ></RangePicker>
             </FormItem>
           </Col>
           <Col
@@ -173,6 +177,7 @@
 </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'
@@ -216,6 +221,9 @@
   const pointDate = ref<any>([])
   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')
+  }
   // 获取基地数据
   const getBase = async () => {
     const res = await getGriculturalDeviceBasic({ device_type: 4 })
diff --git a/yarn.lock b/yarn.lock
index 1dfe34f0..ee9a1135 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6674,6 +6674,11 @@ 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"