Merge branch 'refs/heads/xinyan' into test

src/views/reportManage/dataCenter/combinedDisplay/components/DatePicker/index.vue

@@ -196,6 +196,7 @@ watch(dateType, () => {
         <span class="demonstration">月数据:</span>
         <el-date-picker
             v-model="monthlyDataTime"
+            :clearable="false"
             :disabled-date="disabledDate"
             :shortcuts="monthShortCuts"
             end-placeholder="结束月"

src/views/reportManage/dataCenter/combinedDisplay/components/monthDatePicker/index.vue

@@ -88,6 +88,7 @@ const disabledDate = (time) => {
     <span class="demonstration">月数据时间:</span>
     <el-date-picker
         v-model="monthlyDataTime"
+        :clearable="false"
         type="monthrange"
         unlink-panels
         range-separator="To"
@@ -96,6 +97,17 @@ const disabledDate = (time) => {
         :disabled-date="disabledDate"
         @change="handleMonthChange"
         :shortcuts="monthShortCuts"
+        :popper-options="{
+              modifiers: [
+                  {
+                      name: 'flip',
+                      options: {
+                          fallbackPlacements: ['bottom'],
+                          allowedAutoPlacements: ['bottom'],
+                      }
+                  }
+              ]
+  }"
     />
   </div>
 </template>

src/views/reportManage/dataCenter/normalDisplay/components/DatePicker/index.vue

@@ -267,7 +267,7 @@ watch(dateType, () => {
 .demonstration {
   color: var(--el-text-color-secondary);
   font-size: 14px;
-  margin-right: 8px;
+  margin: 8px;
   white-space: nowrap;
 }