From 26567e319f8959d06f613b1b02f60a735571dad6 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Tue, 8 Nov 2022 11:30:47 +0800
Subject: [PATCH] =?UTF-8?q?#3168=20=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=BA=94=E7=94=A8=E5=9C=BA=E6=99=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=80=89=E5=85=A8=E9=83=A8=E8=B5=84=E6=BA=90=E6=B1=A0?=
 =?UTF-8?q?=E9=98=9F=E5=88=97=E6=97=B6=E5=BA=94=E5=8C=85=E5=90=AB=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E8=B5=84=E6=BA=90=E8=A7=84=E6=A0=BC=E4=B8=94=E4=B8=8D?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/vuepages/apis/modules/resources.js          | 13 +++++++++++++
 .../pages/resources/components/SceneDialog.vue      |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/web_src/vuepages/apis/modules/resources.js b/web_src/vuepages/apis/modules/resources.js
index 32a87c53f..965d5ae04 100644
--- a/web_src/vuepages/apis/modules/resources.js
+++ b/web_src/vuepages/apis/modules/resources.js
@@ -110,6 +110,19 @@ export const getResSpecificationList = (params) => {
   });
 }
 
+// 查询资源规格列表(所有)
+// cluster 所属集群 ：OpenI 启智集群，C2Net 智算集群
+// queue 所属队列id
+// status 状态 ： 1 待审核 2已上架 3已下架
+export const getResSpecificationListAll = (params) => {
+  return service({
+    url: '/admin/resources/specification/list/all',
+    method: 'get',
+    params,
+    data: {},
+  });
+}
+
 // 同步智算网络资源池（队列）
 export const syncResSpecification = () => {
   return service({
diff --git a/web_src/vuepages/pages/resources/components/SceneDialog.vue b/web_src/vuepages/pages/resources/components/SceneDialog.vue
index cadfb1db1..fed3f8db0 100644
--- a/web_src/vuepages/pages/resources/components/SceneDialog.vue
+++ b/web_src/vuepages/pages/resources/components/SceneDialog.vue
@@ -89,7 +89,7 @@
 </template>
 <script>
 import BaseDialog from '~/components/BaseDialog.vue';
-import { getResQueueCode, getResSpecificationList, addResScene, updateResScene } from '~/apis/modules/resources';
+import { getResQueueCode, getResSpecificationListAll, addResScene, updateResScene } from '~/apis/modules/resources';
 import { JOB_TYPE, CLUSTERS, ACC_CARD_TYPE, SPECIFICATION_STATUS } from '~/const';
 import { getListValueWithKey } from '~/utils';
 
@@ -170,9 +170,9 @@ export default {
         cluster: this.dataInfo.Cluster,
         queue: this.dataInfo.QueueId === '-1' ? '' : this.dataInfo.QueueId,
         // status: 2,
-        page: 1,
+        // page: 1,
       };
-      return getResSpecificationList(params).then(res => {
+      return getResSpecificationListAll(params).then(res => {
         res = res.data;
         if (res.Code === 0) {
           const list = res.Data.List;