diff --git a/src/assets/css/components/components/rightBox/report/reportBox.scss b/src/assets/css/components/components/rightBox/report/reportBox.scss
index d7961f2b..a369c36b 100644
--- a/src/assets/css/components/components/rightBox/report/reportBox.scss
+++ b/src/assets/css/components/components/rightBox/report/reportBox.scss
@@ -142,6 +142,9 @@
// border: 1px solid #dcdfe6;
// border-radius: 2px 0 0 2px;
//}
+ .el-select__prefix {
+ line-height:30px;
+ }
.el-select__prefix, .el-input__prefix {
left: 0;
background-color: #f5f7fa;
diff --git a/src/components/rightBox/report/ReportBox.vue b/src/components/rightBox/report/ReportBox.vue
index c5fe7036..c2c459aa 100644
--- a/src/components/rightBox/report/ReportBox.vue
+++ b/src/components/rightBox/report/ReportBox.vue
@@ -43,10 +43,10 @@
-
+
-
+
{{$t('report.customEvery')}}
-
+
{{$t('report.day')}}
-
+
@@ -132,9 +132,9 @@
{{$t('report.customEvery')}}
-
+
{{$t('report.month')}}
-
+
@@ -229,13 +229,13 @@
-
+ -->
-
+
{{param.key}}
-
+
{
const form = proxy.$refs.reportForm
- if (form.model.config.endTime) {
+ if (form.model && form.model.config && form.model.config.endTime) {
form.validateField('config.endTime', () => null)
}
callback()
@@ -414,14 +414,7 @@ export default {
scheduleChecked (n) {
this.editObject.config.isScheduler = n ? 1 : 0
this.cleanScheduleConfig()
- this.$nextTick(() => {
- let datePrefixIcon = document.getElementsByClassName('el-input__prefix-inner')
- if(datePrefixIcon && datePrefixIcon.length > 0) {
- Array.prototype.forEach.call(datePrefixIcon, function (element) {
- element.innerHTML = ''
- })
- }
- })
+ this.initDateCalendarPreIcon()
},
monthScheduleType (n) {
this.cleanScheduleConfig()
@@ -530,16 +523,19 @@ export default {
}
},
mounted() {
- this.$nextTick(() => {
- let datePrefixIcon = document.getElementsByClassName('el-input__prefix-inner')
- if(datePrefixIcon && datePrefixIcon.length > 0) {
- Array.prototype.forEach.call(datePrefixIcon, function (element) {
- element.innerHTML = ''
- })
- }
- })
+ this.initDateCalendarPreIcon()
},
methods: {
+ initDateCalendarPreIcon() {
+ this.$nextTick(() => {
+ let datePrefixIcon = document.getElementsByClassName('el-input__prefix-inner')
+ if(datePrefixIcon && datePrefixIcon.length > 0) {
+ Array.prototype.forEach.call(datePrefixIcon, function (element) {
+ element.innerHTML = ''
+ })
+ }
+ })
+ },
loadParamOptions () {
if (_.isArray(this.editObject.categoryParams) && !_.isEmpty(this.editObject.categoryParams)) {
this.editObject.categoryParams.forEach(param => {
@@ -587,6 +583,7 @@ export default {
if (val === 'customize') {
this.scheduleChecked = false
}
+ this.initDateCalendarPreIcon()
},
scheduleTypeChange (val) {
this.scheduleType = val