Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/assets/styles/mixin.less

@@ -1040,24 +1040,25 @@
 }
 
 .ant-calendar-picker-container {
-    .ant-calendar-range {
+    .ant-calendar-range,.ant-calendar {
         background: @m-grey22;
         border-color: @m-grey22;
         .ant-calendar-panel {
-            .ant-calendar-date-panel {
-                .ant-calendar-range-part {
-                    .ant-calendar-input-wrap {
-                        border-bottom-color: @m-grey23;
-                        .ant-calendar-input {
-                            background: transparent;
-                            border: 1px solid @m-grey1;
-                            color: @m-white0;
-                            &::placeholder {
-                                color: @m-grey1;
-                            }
-                        }
+            .ant-calendar-input-wrap {
+                border-bottom-color: @m-grey23;
+                .ant-calendar-input {
+                    background: transparent;
+                    border: 1px solid @m-grey1;
+                    color: @m-white0;
+                    &::placeholder {
+                        color: @m-grey1;
                     }
+                }
+            }
+            .ant-calendar-date-panel {
+                // .ant-calendar-range-part {
                     .ant-calendar-header {
+                        border-color: @m-grey1;
                         .ant-calendar-prev-year-btn,.ant-calendar-prev-month-btn {
                             color: @m-grey1;
                             &::before,&::after {
@@ -1068,6 +1069,7 @@
                             color: @m-grey1;
                         }
                     }
+                    
                     .ant-calendar-body {
                         border-top-color: @m-grey1;
                         .ant-calendar-column-header-inner {
@@ -1078,10 +1080,16 @@
                                 background: transparent;
                                 color: @m-white0;
                             }
+                            &:hover {
+                                .ant-calendar-date {
+                                    color: @m-blue0;
+                                }
+                            }
                         }
                         .ant-calendar-last-day-of-month,.ant-calendar-next-month-btn-day {
                             .ant-calendar-date {
                                 color: @m-white1;
+                                
                             }
                         }
                         .ant-calendar-disabled-cell {
@@ -1101,12 +1109,13 @@
                                 }
                             }
                         }
-                    }
+                    // }
                 }
                 .ant-calendar-range-middle {
                     color: @m-white1;
                 }
             }
+            
         }
         .ant-calendar-footer {
             border-top-color: @m-grey1;
@@ -1125,6 +1134,45 @@
             }
         }
     }
+    .ant-calendar-month-calendar {
+        .ant-calendar-month-calendar-content {
+            .ant-calendar-month-header-wrap {
+                .ant-calendar-header {
+                    .ant-calendar-prev-year-btn,.ant-calendar-prev-month-btn {
+                        color: @m-grey1;
+                        &::before,&::after {
+                            border-color: @m-grey2;
+                        }
+                    }
+                    .ant-calendar-month-panel-year-select {
+                        color: @m-grey1;
+                    }
+                }
+                .ant-calendar-month-panel-body {
+                    .ant-calendar-month-panel-table {
+                        .ant-calendar-month-panel-tbody {
+                            .ant-calendar-month-panel-cell {
+                                .ant-calendar-month-panel-month {
+                                    color: @m-white1;
+                                    &:hover {
+                                        background: transparent;
+                                        color: @m-blue0;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        .ant-calendar-month-panel {
+            background: @m-grey22;
+            border-color: @m-grey22;
+            .ant-calendar-month-panel-header {
+                border-color: @m-grey1;
+            }
+        }
+    }
 }
 .ant-calendar-range {
     .ant-calendar-in-range-cell::before {
@@ -1132,6 +1180,7 @@
     }
 }
 
+
 .has-error .ant-input:not(.has-error .ant-input-disabled), -has-error .ant-input:not(.has-error .ant-input-disabled), .has-error .ant-input:not(-has-error .ant-input-disabled), -has-error .ant-input:not(-has-error .ant-input-disabled) {
     background: @m-grey21;
 }

src/views/report/components/filter/index.vue

@@ -16,10 +16,12 @@
       <a-space direction="vertical">
         <a-month-picker v-model:value="time"
                         @change="timeChange"
+                        class="commonDatePicker"
                         v-if="isMonth()" />
         <a-date-picker v-model:value="time"
                        v-else
                        @change="timeChange"
+                       class="commonDatePicker"
                        :format="dateFormat" />
       </a-space>
       <a-select label-in-value