diff --git a/src/components/rightBox/report/ReportBox.vue b/src/components/rightBox/report/ReportBox.vue
index 936a2081..ed4d11bc 100644
--- a/src/components/rightBox/report/ReportBox.vue
+++ b/src/components/rightBox/report/ReportBox.vue
@@ -19,7 +19,6 @@
v-model="editObject.config.timeConfig.type"
class="right-box__select"
collapse-tags
- :disabled="!!editObject.id"
placeholder=" "
popper-class="right-box-select-dropdown right-box-select-report "
size="small"
@@ -31,7 +30,6 @@
-
+
@@ -53,7 +51,6 @@
v-model="editObject.config.timeConfig.unit"
class="right-box__select right-box__select-single"
collapse-tags
- :disabled="!!editObject.id"
placeholder=" "
popper-class="right-box-select-dropdown el-select-last"
size="small"
@@ -73,7 +70,6 @@
v-model="editObject.config.startTime"
size="small"
:format="dateFormat"
- :disabled="!!editObject.id"
:disabled-date="startDisabledDate"
@change="startTimeChang"
prefix-icon="cn-icon cn-icon-shijian"
@@ -92,7 +88,6 @@
v-model="editObject.config.endTime"
size="small"
:format="dateFormat"
- :disabled="!!editObject.id"
:disabled-date="endDisabledDate"
@change="endTimeChange"
prefix-icon="cn-icon cn-icon-shijian"
@@ -103,41 +98,41 @@
-
+
-
{{$t(type.name)}}
+
{{$t(type.name)}}
{{$t('report.customEvery')}}
-
+
{{$t('report.day')}}
-
+
-
+
{{$t(item.name)}}
-
{{$t('report.date')}}
-
{{$t('report.week')}}
-
+
{{$t('report.date')}}
+
{{$t('report.week')}}
+
{{$t('report.customEvery')}}
-
+
{{$t('report.month')}}
@@ -145,8 +140,8 @@
{{$t('report.custom')}}
-
-
+
+
{{$t(item.name)}}
@@ -154,8 +149,8 @@
-
-
+
+
@@ -168,7 +163,6 @@
class="right-box__select"
multiple
placeholder=" "
- :disabled="!!editObject.id"
popper-class="right-box-select-dropdown right-box-select-report"
size="small"
@change="()=>{ this.$forceUpdate() }">
@@ -177,8 +171,8 @@
-
-
+
+
{{$t(item.name)}}
@@ -228,7 +222,7 @@
:disabled="!!editObject.id"
popper-class="right-box-select-dropdown right-box-select-report"
size="small"
- @change="typeChange">
+ >
@@ -413,20 +407,14 @@ export default {
watch: {
scheduleType (n, o) {
this.editObject.config.schedulerConfig.type = n
- if (!this.editObject.id) {
- this.cleanScheduleConfig()
- }
+ this.cleanScheduleConfig()
},
scheduleChecked (n) {
this.editObject.config.isScheduler = n ? 1 : 0
- if (!this.editObject.id) {
- this.cleanScheduleConfig()
- }
+ this.cleanScheduleConfig()
},
monthScheduleType (n) {
- if (!this.editObject.id) {
- this.cleanScheduleConfig()
- }
+ this.cleanScheduleConfig()
},
monthIsCycle (n) {
if (!this.editObject.id) {
@@ -560,15 +548,13 @@ export default {
this.editObject.config.timeConfig.offset--
}
}
- },
- typeChange (id) {
-
},
cleanScheduleConfig () {
this.editObject.config.schedulerConfig.monthDates = []
this.editObject.config.schedulerConfig.weekDates = []
this.editObject.config.schedulerConfig.months = []
this.editObject.config.schedulerConfig.monthWeekDates = []
+ this.editObject.config.schedulerConfig.interval = 1
this.monthIsCycle = true
this.dateCheckedAll = false
this.dateIsIndeterminate = false
@@ -582,6 +568,9 @@ export default {
this.scheduleChecked = false
}
},
+ scheduleTypeChange (val) {
+ this.scheduleType = val
+ },
save () {
if (this.blockOperation.save) { return }
this.blockOperation.save = true