diff --git a/src/assets/css/components/views/report/builtinReport.scss b/src/assets/css/components/views/report/builtinReport.scss index 7aef7fa3..fbf67ceb 100644 --- a/src/assets/css/components/views/report/builtinReport.scss +++ b/src/assets/css/components/views/report/builtinReport.scss @@ -123,6 +123,11 @@ position: relative; font-size: 16px; } + .table-operation-item--disabled { + cursor: not-allowed; + filter: grayscale(1); + opacity: .6; + } } } } diff --git a/src/components/rightBox/report/ReportBox.vue b/src/components/rightBox/report/ReportBox.vue index 8d0e9d63..93e2072a 100644 --- a/src/components/rightBox/report/ReportBox.vue +++ b/src/components/rightBox/report/ReportBox.vue @@ -11,7 +11,7 @@ - + @@ -20,7 +20,7 @@ class="right-box__select" collapse-tags :disabled="!!editObject.id" - placeholder="" + placeholder=" " popper-class="right-box-select-dropdown right-box-select-report " size="small" @change="timeConfigTypeChange" @@ -34,9 +34,8 @@ :disabled="!!editObject.id" v-model="editObject.config.timeConfig.unit" class="right-box__select" - clearable collapse-tags - placeholder="" + placeholder=" " popper-class="right-box-select-dropdown right-box-select-report " size="small" @change="()=>{ this.$forceUpdate() }"> @@ -46,17 +45,16 @@
- + @@ -78,7 +76,7 @@ :disabled="!!editObject.id" prefix-icon="cn-icon cn-icon-shijian" type="datetime" - placeholder="" + placeholder=" " />
@@ -95,7 +93,7 @@ :disabled="!!editObject.id" prefix-icon="cn-icon cn-icon-shijian" type="datetime" - placeholder="" + placeholder=" " /> @@ -110,7 +108,7 @@
{{$t('report.customEvery')}}
- +
@@ -135,7 +133,7 @@ @@ -165,7 +163,7 @@ v-model="editObject.config.schedulerConfig.monthWeekDates" class="right-box__select" multiple - placeholder="" + placeholder=" " :disabled="!!editObject.id" popper-class="right-box-select-dropdown right-box-select-report " size="small" @@ -195,7 +193,7 @@ :format="dateFormat" prefix-icon="cn-icon cn-icon-shijian" type="datetime" - placeholder="" + placeholder=" " /> @@ -211,7 +209,7 @@ :format="dateFormat" prefix-icon="cn-icon cn-icon-shijian" type="datetime" - placeholder="" + placeholder=" " /> @@ -221,9 +219,8 @@ - + diff --git a/src/components/table/report/reportTestTable.vue b/src/components/table/report/reportTestTable.vue index 722cefff..edecb2ed 100644 --- a/src/components/table/report/reportTestTable.vue +++ b/src/components/table/report/reportTestTable.vue @@ -19,7 +19,7 @@