zhouhui
/
lcny-vue3-antd-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交

new-map
H 2022-11-11 14:18:13 +08:00
parent 95be79f0f6
commit 6058614245
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -55,7 +55,6 @@
"intro.js": "^5.1.0", "intro.js": "^5.1.0",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"mockjs": "^1.1.0", "mockjs": "^1.1.0",
"moment": "^2.29.4",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"path-to-regexp": "^6.2.0", "path-to-regexp": "^6.2.0",
"pinia": "2.0.12", "pinia": "2.0.12",

4
src/views/main/meteorological/index.vue
View File

@ -177,7 +177,6 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import moment from 'moment'
import { formatDataByObject, getWeek, getMonth } from '/@/utils/index' import { formatDataByObject, getWeek, getMonth } from '/@/utils/index'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import { PageWrapper } from '/@/components/Page' import { PageWrapper } from '/@/components/Page'
@ -222,7 +221,8 @@
const statisData = ref<any>({}) const statisData = ref<any>({})
const name = computed(() => baseDate?.value?.find((e: any) => e.id === formState.base_id)?.name) const name = computed(() => baseDate?.value?.find((e: any) => e.id === formState.base_id)?.name)
const disabledDate = (current) => { const disabledDate = (current) => {
return current && current > moment().endOf('day') console.log(current)
return current && current > dayjs().endOf('day')
} }
// 获取基地数据 // 获取基地数据
const getBase = async () => { const getBase = async () => {

5
yarn.lock
View File

@ -6674,11 +6674,6 @@ modify-values@^1.0.0:
resolved "https://registry.npmmirror.com/modify-values/-/modify-values-1.0.1.tgz" resolved "https://registry.npmmirror.com/modify-values/-/modify-values-1.0.1.tgz"
integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== 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: mousetrap@^1.6.5:
version "1.6.5" version "1.6.5"
resolved "https://registry.npmmirror.com/mousetrap/-/mousetrap-1.6.5.tgz" resolved "https://registry.npmmirror.com/mousetrap/-/mousetrap-1.6.5.tgz"