OMC/fe.ems.vue3
1
0
Fork 0
Code Issues Releases 3 Activity

Merge remote-tracking branch 'origin/main' into lichang

Browse Source
This commit is contained in:
TsMask
2024-04-15 20:18:59 +08:00
parent f1125cc042 efd389f98a
commit 8bf4a2a9ce
8 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/App.vue
View File

@@ -4,13 +4,15 @@ import { usePrimaryColor } from '@/hooks/useTheme';
import zhCN from 'ant-design-vue/lib/locale/zh_CN';
import enUS from 'ant-design-vue/lib/locale/en_US';
import dayjs from 'dayjs';
import advancedFormat from 'dayjs/plugin/advancedFormat';
import 'dayjs/locale/zh-cn';
import { ref, watch } from 'vue';
import useAppStore from '@/store/modules/app';
import useI18n from '@/hooks/useI18n';
const { t, currentLocale } = useI18n();
const appStore = useAppStore();
dayjs.extend(advancedFormat)
dayjs.locale('zh-cn'); // 默认中文
usePrimaryColor(); // 载入用户自定义主题色

2
src/views/monitor/job/log.vue
View File

@@ -470,7 +470,7 @@ onMounted(() => {
v-model:value="queryRangePicker"
allow-clear
bordered
value-format="YYYY-MM-DD"
value-format="x"
style="width: 100%"
></a-range-picker>
</a-form-item>

2
src/views/system/config/index.vue
View File

@@ -527,7 +527,7 @@ onMounted(() => {
v-model:value="queryRangePicker"
allow-clear
bordered
value-format="YYYY-MM-DD"
value-format="x"
style="width: 100%"
></a-range-picker>
</a-form-item>

2
src/views/system/dict/index.vue
View File

@@ -527,7 +527,7 @@ onMounted(() => {
v-model:value="queryRangePicker"
allow-clear
bordered
value-format="YYYY-MM-DD"
value-format="x"
style="width: 100%"
></a-range-picker>
</a-form-item>

2
src/views/system/log/login/index.vue
View File

@@ -429,7 +429,7 @@ onMounted(() => {
bordered
:show-time="{ format: 'HH:mm:ss' }"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
value-format="x"
style="width: 100%"
></a-range-picker>
</a-form-item>

2
src/views/system/log/operate/index.vue
View File

@@ -459,7 +459,7 @@ onMounted(() => {
bordered
:show-time="{ format: 'HH:mm:ss' }"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
value-format="x"
style="width: 100%"
></a-range-picker>
</a-form-item>

2
src/views/system/role/index.vue
View File

@@ -791,7 +791,7 @@ onMounted(() => {
v-model:value="queryRangePicker"
allow-clear
bordered
value-format="YYYY-MM-DD"
value-format="x"
style="width: 100%"
></a-range-picker>
</a-form-item>

2
src/views/system/user/index.vue
View File

@@ -877,7 +877,7 @@ onMounted(() => {
v-model:value="queryRangePicker"
allow-clear
bordered
value-format="YYYY-MM-DD"
value-format="x"
style="width: 100%"
></a-range-picker>
</a-form-item>