凯盛：默认报表进去查询-按月-累计值

@@ -51,6 +51,10 @@ const props = defineProps({
   chartType: {
     type: Number,
     default: 0
+  },
+  defaultActive: {
+    type: Number,
+    default: undefined
   }
 })
 const timerData: any = computed(() => {
@@ -76,7 +80,9 @@ const timerData: any = computed(() => {
 })
 const emits = defineEmits(['change'])
 // 选择的日期单位
-const extraActive = ref<string | number | boolean>(props.chartType == 16 || props.chartType == 15? 2 : (props.dateUnit.length < 3 ? 1 : 0))
+const extraActive = ref<string | number | boolean>(
+  props.defaultActive ?? (props.chartType == 16 || props.chartType == 15 ? 2 : (props.dateUnit.length < 3 ? 1 : 0))
+)
 // const extraActive = ref<string | number | boolean>(1)
 // 日期选择器 - 值
 const pickerVal = ref<any>(extraActive.value == 0 ? dayjs().format("YYYY-MM-DD") : extraActive.value == 1 ? dayjs().format("YYYY-MM") : dayjs().format("YYYY"))

@@ -22,13 +22,14 @@
         </a-tabs>
         <a-space>
           <time-bar @change="timeChange" is-current-date-disabled
+                    :default-active="1"
                     :date-unit="props.reportType === 2 ? ['month','year']: ['day','month','year']"/>
           <a-select v-model="searchForm.changeType" :style="{width:'220px'}" placeholder="请选择"
                     v-if="props.reportType === 1 && timeParams.timeUnit !== 0">
+            <a-option value="5">累计值</a-option>
             <a-option value="2">平均值</a-option>
             <a-option value="3">最小值</a-option>
             <a-option value="4">最大值</a-option>
-            <a-option value="5">累计值</a-option>
           </a-select>
           <a-checkbox v-model="searchForm.isCharge" v-if="reportType === 2">电费</a-checkbox>
           <a-button type="primary" @click="fetchTableData">
@@ -100,7 +101,7 @@ const tableInfo: any = ref({
 
 const searchForm = ref({
   templateId: '',
-  changeType: '',
+  changeType: '5',
   isFengGuData: props.reportType !== 1,
   isCharge: false
 })
@@ -117,9 +118,9 @@ const tabsChange = (key: any) => {
  */
 const timeChange = (time: any) => {
   timeParams.value = time;
-  searchForm.value.changeType = '';
+  searchForm.value.changeType = '5';
   if (time.timeUnit !== 0) {
-    searchForm.value.changeType = '2';
+    searchForm.value.changeType = '5';
   }
 }
 /**