new-map
parent
e6008a14ec
commit
95be79f0f6
|
|
@ -55,6 +55,7 @@
|
||||||
"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",
|
||||||
|
|
|
||||||
|
|
@ -7,14 +7,16 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
|
import dayjs from 'dayjs'
|
||||||
|
import 'dayjs/locale/zh-cn'
|
||||||
import { ConfigProvider } from 'ant-design-vue'
|
import { ConfigProvider } from 'ant-design-vue'
|
||||||
import { AppProvider } from '/@/components/Application'
|
import { AppProvider } from '/@/components/Application'
|
||||||
import { useTitle } from '/@/hooks/web/useTitle'
|
import { useTitle } from '/@/hooks/web/useTitle'
|
||||||
import { useLocale } from '/@/locales/useLocale'
|
import { useLocale } from '/@/locales/useLocale'
|
||||||
|
dayjs.locale('zh-cn')
|
||||||
|
|
||||||
// support Multi-language
|
// support Multi-language
|
||||||
const { getAntdLocale } = useLocale()
|
const { getAntdLocale } = useLocale()
|
||||||
|
|
||||||
// Listening to page changes and dynamically changing site titles
|
// Listening to page changes and dynamically changing site titles
|
||||||
useTitle()
|
useTitle()
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
|
|
||||||
<UserDropDown :theme="getHeaderTheme" />
|
<UserDropDown :theme="getHeaderTheme" />
|
||||||
|
|
||||||
<SettingDrawer v-if="getShowSetting" :class="`${prefixCls}-action__item`" />
|
<!-- <SettingDrawer v-if="getShowSetting" :class="`${prefixCls}-action__item`" /> -->
|
||||||
</div>
|
</div>
|
||||||
</Header>
|
</Header>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,6 @@ import { isDevMode } from './utils/env'
|
||||||
if (isDevMode()) {
|
if (isDevMode()) {
|
||||||
import('ant-design-vue/es/style')
|
import('ant-design-vue/es/style')
|
||||||
}
|
}
|
||||||
|
|
||||||
async function bootstrap() {
|
async function bootstrap() {
|
||||||
const app = createApp(App)
|
const app = createApp(App)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,11 @@
|
||||||
:xxl="{ span: 4 }"
|
:xxl="{ span: 4 }"
|
||||||
>
|
>
|
||||||
<FormItem label="日期">
|
<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>
|
</FormItem>
|
||||||
</Col>
|
</Col>
|
||||||
<Col
|
<Col
|
||||||
|
|
@ -173,6 +177,7 @@
|
||||||
</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'
|
||||||
|
|
@ -216,6 +221,9 @@
|
||||||
const pointDate = ref<any>([])
|
const pointDate = ref<any>([])
|
||||||
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) => {
|
||||||
|
return current && current > moment().endOf('day')
|
||||||
|
}
|
||||||
// 获取基地数据
|
// 获取基地数据
|
||||||
const getBase = async () => {
|
const getBase = async () => {
|
||||||
const res = await getGriculturalDeviceBasic({ device_type: 4 })
|
const res = await getGriculturalDeviceBasic({ device_type: 4 })
|
||||||
|
|
|
||||||
|
|
@ -6674,6 +6674,11 @@ 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"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue