Compare commits

..

No commits in common. "8c3518651784890cac61a2126df45bed8c49b352" and "758568e6100d1080c671d0a394ff21777d0164cd" have entirely different histories.

3 changed files with 11 additions and 1 deletions

View File

@ -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",

View File

@ -177,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'
@ -221,7 +222,10 @@
const statisData = ref<any>({})
const name = computed(() => baseDate?.value?.find((e: any) => e.id === formState.base_id)?.name)
const disabledDate = (current) => {
return current && current > dayjs().endOf('day')
// console.log(moment().endOf('day'))
return false
// return current && current > moment().endOf('day')
}
//
const getBase = async () => {

View File

@ -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"