diff --git a/src/components/rightBox/report/ReportBox.vue b/src/components/rightBox/report/ReportBox.vue
index 93e2072a..7676a7e9 100644
--- a/src/components/rightBox/report/ReportBox.vue
+++ b/src/components/rightBox/report/ReportBox.vue
@@ -134,7 +134,7 @@
                 <template v-if="monthIsCycle">
                   <div class="enable-tabs-custom">{{$t('report.customEvery')}}</div>
                   <el-input v-model="editObject.config.schedulerConfig.interval" size="small" placeholder=" " style="margin-top: 0.3125rem;" :disabled="!!editObject.id">
-                    <template #append>{{$t('report.moon')}}</template>
+                    <template #append>{{$t('report.month')}}</template>
                   </el-input>
                 </template>
                 <!-- 自定义月，非循环 -->
@@ -316,9 +316,14 @@ export default {
   watch: {
     scheduleType (n, o) {
       this.editObject.config.schedulerConfig.type = n
+      this.cleanScheduleConfig()
     },
     scheduleChecked (n) {
       this.editObject.config.isScheduler = n ? 1 : 0
+      this.cleanScheduleConfig()
+    },
+    monthScheduleType (n) {
+      this.cleanScheduleConfig()
     },
     'editObject.config.schedulerConfig.interval': {
       handler (n) {
@@ -400,6 +405,19 @@ export default {
     },
     typeChange (id) {
 
+    },
+    cleanScheduleConfig () {
+      this.editObject.config.schedulerConfig.monthDates = []
+      this.editObject.config.schedulerConfig.weekDates = []
+      this.editObject.config.schedulerConfig.months = []
+      this.editObject.config.schedulerConfig.monthWeekDates = []
+      this.monthIsCycle = true
+      this.dateCheckedAll = false
+      this.dateIsIndeterminate = false
+      this.monthCheckedAll = false
+      this.monthIsIndeterminate = false
+      this.monthWeekdayCheckedAll = false
+      this.monthWeekdayIsIndeterminate = false
     },
     timeConfigTypeChange (val) {
       if (val === 'customize') {
@@ -411,52 +429,54 @@ export default {
       this.blockOperation.save = true
 
       this.$refs.userForm.validate((valid) => {
-        let startTime = ''
-        let endTime = ''
-        let schedulerStart = ''
-        let schedulerEnd = ''
-        if (this.editObject.config && this.editObject.config.startTime) {
-          startTime = getMillisecond(this.editObject.config.startTime)
-        }
-        if (this.editObject.config && this.editObject.config.endTime) {
-          endTime = getMillisecond(this.editObject.config.endTime)
-        }
-        if (this.editObject.config && this.editObject.config.schedulerConfig) {
-          if (['day', 'week', 'month'].indexOf(this.editObject.config.schedulerConfig.type) > -1) {
-            this.editObject.config.isRepeat = 1
-          } else {
-            this.editObject.config.isRepeat = 0
-          }
-        }
-        if (this.editObject.schedulerStart) {
-          schedulerStart = getMillisecond(this.editObject.schedulerStart)
-        }
-        if (this.editObject.schedulerEnd) {
-          schedulerEnd = getMillisecond(this.editObject.schedulerEnd)
-        }
-
-        const copyObject = _.cloneDeep(this.editObject)
-        if (startTime) {
-          copyObject.config.startTime = startTime
-        }
-        if (endTime) {
-          copyObject.config.endTime = endTime
-        }
-        if (schedulerStart) {
-          copyObject.schedulerStart = schedulerStart
-        }
-        if (schedulerEnd) {
-          copyObject.schedulerEnd = schedulerEnd
-        }
-        if (this.categoryParams.length > 0) {
-          const queryParam = {}
-          this.categoryParams.forEach(p => {
-            queryParam[p.key] = p.value
-          })
-          copyObject.config.queryParam = queryParam
-        }
-        copyObject.config = JSON.stringify(copyObject.config)
         if (valid) {
+          let startTime = ''
+          let endTime = ''
+          let schedulerStart = ''
+          let schedulerEnd = ''
+          if (this.editObject.config && this.editObject.config.startTime) {
+            startTime = getMillisecond(this.editObject.config.startTime)
+          }
+          if (this.editObject.config && this.editObject.config.endTime) {
+            endTime = getMillisecond(this.editObject.config.endTime)
+          }
+          if (this.editObject.config && this.editObject.config.schedulerConfig) {
+            if (['day', 'week', 'month'].indexOf(this.editObject.config.schedulerConfig.type) > -1) {
+              this.editObject.config.isRepeat = 1
+            } else {
+              this.editObject.config.isRepeat = 0
+            }
+          }
+          if (this.editObject.schedulerStart) {
+            schedulerStart = getMillisecond(this.editObject.schedulerStart)
+          }
+          if (this.editObject.schedulerEnd) {
+            schedulerEnd = getMillisecond(this.editObject.schedulerEnd)
+          }
+
+          const copyObject = _.cloneDeep(this.editObject)
+          if (startTime) {
+            copyObject.config.startTime = startTime
+          }
+          if (endTime) {
+            copyObject.config.endTime = endTime
+          }
+          if (schedulerStart) {
+            copyObject.schedulerStart = schedulerStart
+          }
+          if (schedulerEnd) {
+            copyObject.schedulerEnd = schedulerEnd
+          }
+          if (this.categoryParams.length > 0) {
+            const queryParam = {}
+            this.categoryParams.forEach(p => {
+              queryParam[p.key] = p.value
+            })
+            copyObject.config.queryParam = queryParam
+          }
+          copyObject.config = JSON.stringify(copyObject.config)
+
+
           if (copyObject.id) {
             put(this.url, copyObject).then(res => {
               this.blockOperation.save = false
diff --git a/src/components/rightBox/report/reportTestBox.vue b/src/components/rightBox/report/reportTestBox.vue
deleted file mode 100644
index bb4ff39f..00000000
--- a/src/components/rightBox/report/reportTestBox.vue
+++ /dev/null
@@ -1,479 +0,0 @@
-<template>
-  <div class="right-box right-box-report">
-    <div class="right-box__header">
-      <div class="header__title">{{editObject.id ? $t('report.editBuiltin') : $t('report.createBuiltin')}}</div>
-      <div class="header__operation">
-        <span v-cancel="{object: editObject, func: esc}"><i class="cn-icon cn-icon-close"></i></span>
-      </div>
-    </div>
-    <div class="right-box__container">
-      <div class="container__form">
-        <el-form ref="userForm" :model="editObject" :rules="rules" label-position="top" label-width="120px">
-          <!--name-->
-          <el-form-item :label="$t('report.name')" prop="name">
-            <el-input id="account-input-name" v-model="editObject.name" maxlength="64" placeholder="" show-word-limit size="small" type="text"></el-input>
-          </el-form-item>
-          <!--time limit-->
-          <el-form-item :label="$t('report.timeLimit')" prop="timeLimit">
-            <el-select id="account-input-roleIds"
-                       v-model="editObject.config.timeConfig.type"
-                       class="right-box__select"
-                       clearable
-                       collapse-tags
-                       placeholder=""
-                       popper-class="right-box-select-dropdown right-box-select-report prevent-clickoutside"
-                       size="small"
-                       @change="timeLimitChange">
-              <template v-for="time in timeLimit" :key="time.value">
-                <el-option :label="time.name" :value="time.value"></el-option>
-              </template>
-            </el-select>
-            <template v-if="showChange === 'this'">
-              <el-select id="account-input-roleIds"
-                         v-model="editObject.id"
-                         class="right-box__select"
-                         clearable
-                         collapse-tags
-                         placeholder=""
-                         popper-class="right-box-select-dropdown right-box-select-report prevent-clickoutside"
-                         size="small"
-                         @change="()=>{ this.$forceUpdate() }">
-                <template v-for="time in latsList" :key="time.value">
-                  <el-option :label="time.name" :value="time.value"></el-option>
-                </template>
-              </el-select>
-            </template>
-            <template v-if="showChange === 'last' || showChange === 'previous'">
-              <el-input v-model="single" @change="singleChange" size="small" class="el-input-single" placeholder="">
-                <template #prepend><i @click="add" class="cn-icon cn-icon-a-1"></i></template>
-                <template #append><i @click="piece" class="cn-icon cn-icon-a-"></i></template>
-              </el-input>
-              <el-select id="account-input-roleIds"
-                         v-model="editObject.type"
-                         class="right-box__select right-box__select-single"
-                         clearable
-                         collapse-tags
-                         placeholder=""
-                         popper-class="right-box-select-dropdown prevent-clickoutside el-select-last"
-                         size="small"
-                         @change="()=>{ this.$forceUpdate() }">
-                <template v-for="time in latsList" :key="time.value">
-                  <el-option :label="time.name" :value="time.value"></el-option>
-                </template>
-              </el-select>
-            </template>
-          </el-form-item>
-          <!--startTime-->
-          <el-form-item :label="$t('report.startTime')" prop="startTime" v-if="showChange === 'customize'">
-            <div class="demo-datetime-picker">
-              <div class="block">
-                <el-date-picker
-                    style="width: 100%"
-                    v-model="editObject.config.startTime"
-                    size="small"
-                    :format="format"
-                    prefix-icon="cn-icon cn-icon-shijian"
-                    type="datetime"
-                    placeholder="Select date and time"
-                />
-              </div>
-            </div>
-          </el-form-item>
-          <!--endTime-->
-          <el-form-item :label="$t('report.endTime')" prop="endTime" v-if="showChange === 'customize'">
-            <div class="demo-datetime-picker">
-              <div class="block">
-                <el-date-picker
-                    style="width: 100%"
-                    v-model="editObject.config.endTime"
-                    size="small"
-                    :format="format"
-                    prefix-icon="cn-icon cn-icon-shijian"
-                    type="datetime"
-                    placeholder="Select date and time"
-                />
-              </div>
-            </div>
-          </el-form-item >
-          <el-form-item class="el-height">
-            <el-checkbox v-model="scheduleChecked" @change="scheduleCheckedChange" :disabled="showChange === 'customize'" :label="$t('report.enableTimeSchedule')" size="large" />
-          </el-form-item>
-          <!--Enable time schedule-->
-          <el-form-item prop="enableTimeSchedule" v-if="scheduleChecked">
-            <div class="enable-tab">
-              <div class="enable-tabs" @click="enableTabs(0)" :class="{'active': tabNum === 0}">{{$t('report.daily')}}</div>
-              <div class="enable-tabs" @click="enableTabs(1)" :class="{'active': tabNum === 1}">{{$t('report.weekly')}}</div>
-              <div class="enable-tabs" @click="enableTabs(2)" :class="{'active': tabNum === 2}">{{$t('report.perMonth')}}</div>
-              <div class="enable-tabs" @click="enableTabs(3)" :class="{'active': tabNum === 3}">{{$t('report.single')}}</div>
-            </div>
-            <div class="enable-tabs-daily" v-if="tabNum === 0">
-              <div class="enable-tabs-custom">{{$t('report.customEvery')}}</div>
-              <el-input v-model="day" size="small" placeholder="Please input">
-                <template #append>{{$t('report.day')}}</template>
-              </el-input>
-            </div>
-            <div class="enable-tabs-weekly" v-if="tabNum === 1">
-              <div class="enable-tabs-custom">{{$t('report.customEvery')}}</div>
-              <el-input v-model="week" size="small" placeholder="Please input">
-                <template #append>{{$t('report.week')}}</template>
-              </el-input>
-              <el-checkbox-group v-model="checkWeeklyList" @change="checkWeeklyChange">
-                <el-checkbox v-for="(item, index) in citiesWeekly" :key="index" :label="$t(item)" />
-              </el-checkbox-group>
-            </div>
-            <div class="enable-tabs-per-month" v-if="tabNum === 2">
-              <div class="enable-month-tab">
-                <div class="enable-month-tabs" @click="enableMonthTabs(0)" :class="{'active': tabMonthNum === 0}">{{$t('report.date')}}</div>
-                <div class="enable-month-tabs" @click="enableMonthTabs(1)" :class="{'active': tabMonthNum === 1}">{{$t('report.week')}}</div>
-                <el-checkbox v-model="perMonthChecked" @change="checkboxCycleChange" :label="$t('report.cycle')" size="large" />
-              </div>
-              <div class="enable-month-data-tab" v-if="tabMonthNum === 0">
-                <div class="enable-tabs-custom">{{$t('report.customEvery')}}</div>
-                <el-input v-model="moon" size="small" placeholder="Please input">
-                  <template #append>{{$t('report.moon')}}</template>
-                </el-input>
-                <div class="enable-month-data-tabs">
-                  <div>
-                    <el-checkbox v-model="dateCheckedAll" :indeterminate="isIndeterminateDate" @change="checkAllChange" :label="$t('report.all')" size="large" />
-                  </div>
-                  <el-checkbox-group v-model="dateList" @change="checkedCitiesChange">
-                    <el-checkbox v-for="(item, index) in citiesDate" :key="index" :label="item" @change="(val)=>checkboxChange(val, item)" />
-                  </el-checkbox-group>
-                </div>
-                <div class="enable-month-value">*一月，三月，五月，七月，八月，十月和12月含31天;闰年二月含29天*</div>
-              </div>
-              <div class="enable-month-moon" v-if="tabMonthNum === 1">
-                <template v-if="perMonthChecked">
-                  <div class="enable-month-moon-custom">{{$t('report.custom')}}</div>
-                  <div class="enable-month-all">
-                    <el-checkbox v-model="allMonthsChecked" class="enable-month-all-months" :indeterminate="isIndeterminateMonths" @change="checkMonthsAllChange" :label="$t('report.allMonths')" size="large" />
-                    <el-checkbox-group v-model="checkMonthsList" @change="checkedMonthsCitiesChange">
-                      <el-checkbox v-for="(item, index) in citiesMonths" :key="index" :label="$t(item)" />
-                    </el-checkbox-group>
-                  </div>
-                </template>
-                <template v-else>
-                  <div class="enable-tabs-custom">{{$t('report.customEvery')}}</div>
-                  <el-input v-model="moon" size="small" placeholder="Please input">
-                    <template #append>{{$t('report.moon')}}</template>
-                  </el-input>
-                </template>
-                <el-select id="account-input-roleIds"
-                           v-model="editObject.type"
-                           class="right-box__select"
-                           multiple
-                           placeholder=""
-                           popper-class="right-box-select-dropdown right-box-select-report prevent-clickoutside"
-                           size="small"
-                           @change="()=>{ this.$forceUpdate() }">
-                  <template v-for="time in timeLimit" :key="time.value">
-                    <el-option :label="time.name" :value="time.value"></el-option>
-                  </template>
-                </el-select>
-                <div class="enable-month-week">
-                  <el-checkbox v-model="checkedAll" class="enable-month-week-all" :label="$t('report.all')" :indeterminate="isIndeterminateWeek" @change="checkWeekAllChange" size="large" />
-                  <el-checkbox-group v-model="checkWeekList" @change="checkedWeekCitiesChange">
-                    <el-checkbox v-for="(item, index) in citiesWeek"  :key="index" :label="$t(item)" />
-                  </el-checkbox-group>
-                </div>
-
-              </div>
-            </div>
-          </el-form-item>
-          <!--startTime-->
-          <el-form-item :label="$t('report.startTime')" prop="startTime" v-if="scheduleChecked">
-            <div class="demo-datetime-picker">
-              <div class="block">
-                <el-date-picker
-                    style="width: 100%"
-                    v-model="editObject.schedulerStart"
-                    size="small"
-                    :format="format"
-                    prefix-icon="cn-icon cn-icon-shijian"
-                    type="datetime"
-                    placeholder="Select date and time"
-                />
-              </div>
-            </div>
-          </el-form-item>
-          <!--endTime-->
-          <el-form-item :label="$t('report.endTime')" prop="endTime" v-if="scheduleChecked">
-            <div class="demo-datetime-picker">
-              <div class="block">
-                <el-date-picker
-                    style="width: 100%"
-                    v-model="editObject.schedulerEnd"
-                    size="small"
-                    :format="format"
-                    prefix-icon="cn-icon cn-icon-shijian"
-                    type="datetime"
-                    placeholder="Select date and time"
-                />
-              </div>
-            </div>
-          </el-form-item>
-          <!--categoryType-->
-          <el-form-item :label="$t('report.categoryType')" prop="categoryType">
-            <el-select id="account-input-roleIds"
-                       v-model="editObject.type"
-                       class="right-box__select"
-                       clearable
-                       collapse-tags
-                       placeholder=""
-                       popper-class="right-box-select-dropdown right-box-select-report prevent-clickoutside"
-                       size="small"
-                       @change="()=>{ this.$forceUpdate() }">
-              <template v-for="time in timeLimit" :key="time.value">
-                <el-option :label="time.name" :value="time.value"></el-option>
-              </template>
-            </el-select>
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
-    <div class="right-box__footer">
-      <button id="asset-edit-cancel" v-cancel="{object: editObject, func: esc}" class="footer__btn footer__btn--light">
-        <span>{{$t('overall.cancel')}}</span>
-      </button>
-      <button id="asset-edit-save" :class="{'footer__btn--disabled': blockOperation.save}" :disabled="blockOperation.save" class="footer__btn" @click="save">
-        <span>{{$t('overall.save')}}</span>
-      </button>
-    </div>
-  </div>
-</template>
-
-<script>
-import rightBoxMixin from '@/mixins/right-box'
-import { get, post, put } from '@/utils/http'
-import { themeData, langData, storageKey, timeLimit, latsList } from '@/utils/constants'
-import { api } from '@/utils/api'
-import { ref } from 'vue'
-export default {
-  name: 'builtinReportBox',
-  mixins: [rightBoxMixin],
-  props: {
-    checkMonthsListData: {
-      type: Array
-    },
-    checkWeekListData: {
-      type: Array
-    }
-  },
-  data () {
-    return {
-      url: api.reportTemp,
-      loginName: localStorage.getItem(storageKey.username),
-      format: localStorage.getItem(storageKey.dateFormat),
-      rules: { // 表单校验规则
-        name: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      },
-      scheduleChecked: false,
-      perMonthChecked: false,
-      tabNum: 0,
-      tabMonthNum: 0,
-      single: 0,
-      showChange: '',
-      themeData,
-      langData,
-      timeLimit,
-      latsList
-    }
-  },
-  setup (props) {
-    // weekly
-    const checkWeeklyList = ref([])
-    let citiesWeekly = ref([])
-    citiesWeekly = props.checkWeekListData
-    const checkWeeklyChange = (val) => {
-      if (val) {
-        props.object.config.schedulerConfig.week_dates = val.map((item, index) => { return index + 1 })
-      }
-    }
-    // week
-    const checkWeekList = ref([])
-    const checkedAll = ref(false)
-    const isIndeterminateWeek = ref(true)
-    const citiesWeek = ref([])
-    citiesWeek.value = props.checkWeekListData
-    const checkWeekAllChange = (val) => {
-      checkWeekList.value = val ? citiesWeek.value : []
-      if (checkWeekList.value) {
-        props.object.config.schedulerConfig.month_week_dates = checkWeekList.value.map((item, index) => { return index + 1 })
-      }
-      isIndeterminateWeek.value = false
-    }
-    const checkedWeekCitiesChange = (val) => {
-      if (val) {
-        props.object.config.schedulerConfig.month_week_dates = val.map((item, index) => { return index + 1 })
-      }
-      const checkedCount = val.length
-      checkedAll.value = checkedCount === citiesWeek.value.length
-      isIndeterminateWeek.value = checkedCount > 0 && checkedCount < citiesWeek.value.length
-    }
-    // date
-    const dateList = ref([])
-    const dateCheckedAll = ref(false)
-    const isIndeterminateDate = ref(true)
-    const citiesDate = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31]
-    const checkAllChange = (val) => {
-      dateList.value = val ? citiesDate : []
-      if (dateList.value) {
-        props.object.config.schedulerConfig.month_dates = dateList.value.map((item, index) => { return index + 1 })
-      }
-      isIndeterminateDate.value = false
-    }
-    const checkedCitiesChange = (val) => {
-      if (val) {
-        props.object.config.schedulerConfig.month_dates = val.map((item, index) => { return index + 1 })
-      }
-      const checkedCount = val.length
-      dateCheckedAll.value = checkedCount === citiesDate.length
-      isIndeterminateDate.value = checkedCount > 0 && checkedCount < citiesDate.length
-    }
-    // months
-    const checkMonthsList = ref([])
-    const allMonthsChecked = ref(false)
-    const isIndeterminateMonths = ref(true)
-    const citiesMonths = ref([])
-    citiesMonths.value = props.checkMonthsListData
-    const checkMonthsAllChange = (val) => {
-      checkMonthsList.value = val ? citiesMonths.value : []
-      if (checkMonthsList.value) {
-        props.object.config.schedulerConfig.month = checkMonthsList.value.map((item, index) => { return index + 1 })
-      }
-      isIndeterminateMonths.value = false
-    }
-    const checkedMonthsCitiesChange = (val) => {
-      if (val) {
-        props.object.config.schedulerConfig.month = val.map((item, index) => { return index + 1 })
-      }
-      const checkedCount = val.length
-      allMonthsChecked.value = checkedCount === citiesMonths.value.length
-      isIndeterminateMonths.value = checkedCount > 0 && checkedCount < citiesMonths.value.length
-    }
-    return {
-      // weekly
-      checkWeeklyList,
-      citiesWeekly,
-      checkWeeklyChange,
-      // week
-      checkWeekList,
-      citiesWeek,
-      checkedAll,
-      isIndeterminateWeek,
-      checkWeekAllChange,
-      checkedWeekCitiesChange,
-      // date
-      dateList,
-      citiesDate,
-      dateCheckedAll,
-      isIndeterminateDate,
-      checkAllChange,
-      checkedCitiesChange,
-      // months
-      checkMonthsList,
-      citiesMonths,
-      allMonthsChecked,
-      isIndeterminateMonths,
-      checkMonthsAllChange,
-      checkedMonthsCitiesChange
-    }
-  },
-  mounted () {
-  },
-  methods: {
-    save () {
-      if (this.blockOperation.save) { return }
-      this.blockOperation.save = true
-      this.$refs.userForm.validate((valid) => {
-        if (valid) {
-          console.log(this.editObject)
-          if (this.editObject.id) {
-            put(this.url, this.editObject).then(res => {
-              this.blockOperation.save = false
-              if (res.code === 200) {
-                this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
-                this.esc(true)
-              } else {
-                this.$message.error(res.msg)
-              }
-            })
-          } else {
-            post(this.url, this.editObject).then(res => {
-              this.blockOperation.save = false
-              if (res.code === 200) {
-                this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
-                this.esc(true)
-              } else {
-                this.$message.error(res.msg)
-              }
-            })
-          }
-        } else {
-          this.blockOperation.save = false
-          return false
-        }
-      })
-    },
-    enableTabs (num) {
-      this.tabNum = num
-    },
-    enableMonthTabs (num) {
-      this.tabMonthNum = num
-    },
-    checkboxCycleChange (val) {
-      this.perMonthChecked = val
-    },
-    scheduleCheckedChange (val) {
-      this.scheduleChecked = val
-      if (!val) {
-        this.tabNum = ''
-        this.tabMonthNum = ''
-        this.editObject.config.isRepeat = 0
-      } else {
-        this.editObject.config.isRepeat = 1
-      }
-    },
-    timeLimitChange (val) {
-      if (val === 'customize') {
-        this.scheduleChecked = false
-        this.editObject.config.isRepeat = 0
-      } else if (val === 'this') {
-        this.editObject.config.timeConfig.offset = 0
-      }
-      this.showChange = val
-    },
-    singleChange (val) {
-      this.single = val
-    },
-    add () {
-      this.single++
-    },
-    piece () {
-      if (this.single <= 0) return
-      this.single--
-    },
-    checkboxChange (val, item) {
-      if (val) {
-        this.citiesDate.push(item)
-      } else {
-        this.citiesDate = this.citiesDate.filter(item => item !== item)
-      }
-    }
-  },
-  watch: {
-    object: {
-      deep: true,
-      immediate: true,
-      handler (n) {
-        if (n.id) {
-          this.editObject = n
-          console.log(this.editObject)
-        }
-      }
-    }
-  }
-}
-</script>