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

2024-04-15 20:18:59 +08:00
parent f1125cc042 efd389f98a
commit 8bf4a2a9ce
8 changed files with 10 additions and 8 deletions
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -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>
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -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>
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -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>
--- a/src/views/system/log/login/index.vue
+++ b/src/views/system/log/login/index.vue
@@ -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>
--- a/src/views/system/log/operate/index.vue
+++ b/src/views/system/log/operate/index.vue
@@ -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>
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -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>
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -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>