diff --git a/src/components/rightBox/report/ReportBox.vue b/src/components/rightBox/report/ReportBox.vue index 7676a7e9..70527175 100644 --- a/src/components/rightBox/report/ReportBox.vue +++ b/src/components/rightBox/report/ReportBox.vue @@ -316,14 +316,20 @@ export default { watch: { scheduleType (n, o) { this.editObject.config.schedulerConfig.type = n - this.cleanScheduleConfig() + if (!this.editObject.id) { + this.cleanScheduleConfig() + } }, scheduleChecked (n) { this.editObject.config.isScheduler = n ? 1 : 0 - this.cleanScheduleConfig() + if (!this.editObject.id) { + this.cleanScheduleConfig() + } }, monthScheduleType (n) { - this.cleanScheduleConfig() + if (!this.editObject.id) { + this.cleanScheduleConfig() + } }, 'editObject.config.schedulerConfig.interval': { handler (n) { @@ -476,7 +482,6 @@ export default { } copyObject.config = JSON.stringify(copyObject.config) - if (copyObject.id) { put(this.url, copyObject).then(res => { this.blockOperation.save = false diff --git a/src/views/entityExplorer/EntityExplorer.vue b/src/views/entityExplorer/EntityExplorer.vue index ac5bec6c..f9eaaa6b 100644 --- a/src/views/entityExplorer/EntityExplorer.vue +++ b/src/views/entityExplorer/EntityExplorer.vue @@ -555,10 +555,10 @@ export default { this.filterData[3].data.forEach(d => { d.value = response.data.result[d.column] || 0 }) - /* this.filterData[3].totalCount = response.data.result.count + this.filterData[3].totalCount = response.data.result.count this.filterData[3].osTotalCount = response.data.result.osTotalCount this.filterData[3].orgTotalCount = response.data.result.orgTotalCount - this.filterData[3].softwareTotalCount = response.data.result.softwareTotalCount */ + this.filterData[3].softwareTotalCount = response.data.result.softwareTotalCount break } }