From 1106e796607373b54ed82471ae19cce00228636f Mon Sep 17 00:00:00 2001
From: lannoy0523 <46735290+lannoy0523@users.noreply.github.com>
Date: Mon, 20 Nov 2023 14:38:46 +0800
Subject: [PATCH] =?UTF-8?q?bug:opdata=20=E4=BB=93=E5=BA=93=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20#1455=20(#1459)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/devops-op/src/utils/request.js              | 2 +-
 src/frontend/devops-op/src/views/node/ProjectMetrics.vue | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/frontend/devops-op/src/utils/request.js b/src/frontend/devops-op/src/utils/request.js
index a12f16ed05..7dcce14883 100644
--- a/src/frontend/devops-op/src/utils/request.js
+++ b/src/frontend/devops-op/src/utils/request.js
@@ -6,7 +6,7 @@ import store from '@/store'
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000 // request timeout
+  timeout: 1000 * 60 * 5 // request timeout
 })
 
 // request interceptor
diff --git a/src/frontend/devops-op/src/views/node/ProjectMetrics.vue b/src/frontend/devops-op/src/views/node/ProjectMetrics.vue
index e706dbd537..e7986f4021 100644
--- a/src/frontend/devops-op/src/views/node/ProjectMetrics.vue
+++ b/src/frontend/devops-op/src/views/node/ProjectMetrics.vue
@@ -184,7 +184,9 @@ export default {
       } else {
         realType = this.type
       }
-      const url = '/opdata/api/project/metrics/list/project/capSize/download/?' + (this.limitSize === '' ? '' : 'limitSize=' + this.limitSize * 1024 * 1024 * 1024 + '&') + 'type=' + realType
+      const url = '/opdata/api/project/metrics/list/project/capSize/download/?' +
+        (this.limitSize === '' ? '' : 'limitSize=' + this.limitSize * 1024 * 1024 * 1024 + '&') +
+        (realType === null ? '' : 'type=' + realType)
       window.open(
         '/web' + url,
         '_self'