From a88615125975226d27730a1d5df888e0803b38f0 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Fri, 17 Jun 2022 14:23:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B7=A6=E4=BE=A7=E7=AD=9B=E9=80=89=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E6=8A=A5=E5=91=8A=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/rightBox/report/ReportBox.vue | 13 +++++++++----
 src/views/entityExplorer/EntityExplorer.vue  |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

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
             }
           }