From 2a76ead70e54825c338595ed1d387060fda8624b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Wed, 10 May 2023 15:31:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectStatusBoard/index.vue              | 49 ++++++++++++-------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
index e3495bf98..c81a3441c 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
@@ -318,7 +318,8 @@
         startTime: undefined,
         endTime: undefined,
         handlingTime: '',
-        num:0,
+        num: 0,
+        queryAllProject: true
       }
     },
     mounted() {
@@ -330,7 +331,8 @@
       if (boxContentTextText && boxContentTextText.length > 0) {
         boxContentTextText[0].classList.add('box-header-text-color')
       }
-      this.getList()
+      this.queryAllProject = true
+      // this.getList()
       this.getTimeline()
       this.handlingTime = moment(new Date()).format('YYYY-MM-DD')
       // this.handlingTime = '2023-04-30'
@@ -403,7 +405,8 @@
         let query = {
           startTime: this.startTime || this.getNewDate('before', 6),
           endTime: this.endTime || this.getNewDate('after', 5),
-          ...this.queryParam
+          ...this.queryParam,
+          queryAllProject: this.queryAllProject
         }
         this.loadingMain = true
         getAction(this.url.timeline, query).then((res) => {
@@ -436,7 +439,8 @@
         let query = {
           startTime: this.startTime || this.getNewDate('before', 6),
           endTime: this.endTime || this.getNewDate('after', 5),
-          ...this.queryParam
+          ...this.queryParam,
+          queryAllProject: this.queryAllProject
         }
         getAction(this.url.timelineList, query).then((res) => {
           if (res.success) {
@@ -550,7 +554,7 @@
       },
       searchQuery() {
         this.getTimeline()
-        this.getList()
+        // this.getList()
       },
       searchReset() {
         this.queryParam = {}
@@ -558,20 +562,20 @@
         this.startTime = undefined
         this.endTime = undefined
         this.getTimeline()
-        this.getList()
-      },
-      getList() {
-        this.loading = true
-        getAction(this.url.list, this.queryParam).then((res) => {
-          if (res.success) {
-            this.loading = false
-            this.dataSource = res.result || []
-          } else {
-            this.loading = false
-            this.dataSource = []
-          }
-        })
+        // this.getList()
       },
+      // getList() {
+      //   this.loading = true
+      //   getAction(this.url.list, this.queryParam).then((res) => {
+      //     if (res.success) {
+      //       this.loading = false
+      //       this.dataSource = res.result || []
+      //     } else {
+      //       this.loading = false
+      //       this.dataSource = []
+      //     }
+      //   })
+      // },
       projectNameClick() {
         let newUrl = this.$router.resolve({
           path: '/projectStatusAndProgress'
@@ -591,7 +595,8 @@
         let query = {
           ...this.queryParam,
           startTime: this.startTime || this.getNewDate('before', 6),
-          endTime: this.endTime || this.getNewDate('after', 5)
+          endTime: this.endTime || this.getNewDate('after', 5),
+          queryAllProject: this.queryAllProject
         }
         downloadFile('/project/ProjectStatusBoardController/exportXls',
           this.$t('GRPSystemProjectProgressStatistics') + '.xls', query, this.Deselect)
@@ -609,6 +614,12 @@
           boxContentTextText[num].classList.add('box-header-text-color')
         }
         this.num = num
+        if (num == 0) {
+          this.queryAllProject = true
+        } else if (num == 1) {
+          this.queryAllProject = false
+        }
+        this.getTimeline()
       }
     }
   }