feat(frontend): 资源池统计视图 TencentBlueKing#6519

JustaCattt · Oct 10, 2024 · 68278e0 · 68278e0
1 parent 8c44a01
commit 68278e0
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 38 deletions.
diff --git a/dbm-ui/frontend/src/services/model/db-resource/DbResource.ts b/dbm-ui/frontend/src/services/model/db-resource/DbResource.ts
@@ -106,14 +106,14 @@ export default class DbResource {
     return this.agent_status === 0;
   }
 
-  get for_biz_display() {
+  get forBizDisplay() {
     if (this.for_biz.bk_biz_id === 0 || !this.for_biz.bk_biz_name) {
       return t('公共资源池');
     }
     return this.for_biz.bk_biz_name;
   }
 
-  get resource_type_display() {
+  get resourceTypeDisplay() {
     if (!this.resource_type || this.resource_type === 'PUBLIC') {
       return t('通用');
     }

diff --git a/dbm-ui/frontend/src/views/resource-manage/pool/host-list/Index.vue b/dbm-ui/frontend/src/views/resource-manage/pool/host-list/Index.vue
@@ -148,15 +148,15 @@
     },
     {
       label: t('所属业务'),
-      field: 'for_biz_display',
+      field: 'forBizDisplay',
       width: 170,
-      render: ({ data }: {data: DbResourceModel}) => data.for_biz_display || '--',
+      render: ({ data }: {data: DbResourceModel}) => data.forBizDisplay || '--',
     },
     {
       label: t('所属DB类型'),
-      field: 'resource_type_display',
+      field: 'resourceTypeDisplay',
       width: 150,
-      render: ({ data }: {data: DbResourceModel}) => data.resource_type_display || '--',
+      render: ({ data }: {data: DbResourceModel}) => data.resourceTypeDisplay || '--',
     },
     {
       label: t('机架'),

diff --git a/...-manage/pool/host-list/components/search-box/components/com-factory/components/ForBiz.vue b/...-manage/pool/host-list/components/search-box/components/com-factory/components/ForBiz.vue
@@ -80,15 +80,10 @@
 
   useRequest(getBizs, {
     onSuccess(data) {
-      const cloneData = data.map((item) => ({
-        bk_biz_id: item.bk_biz_id,
-        display_name: item.display_name,
-      }));
-      cloneData.unshift({
-        bk_biz_id: 0,
-        display_name: t('公共资源池'),
-      });
-      bizList.value = cloneData;
+      bizList.value = [
+        { bk_biz_id: 0, display_name: t('公共资源池') },
+        ...data.map(({ bk_biz_id, display_name }) => ({ bk_biz_id, display_name })),
+      ];
     },
   });
 

diff --git a/...e/pool/host-list/components/search-box/components/com-factory/components/ResourceType.vue b/...e/pool/host-list/components/search-box/components/com-factory/components/ResourceType.vue
@@ -80,12 +80,7 @@
 
   useRequest(fetchDbTypeList, {
     onSuccess(data) {
-      const cloneData = data;
-      cloneData.unshift({
-        id: 'PUBLIC',
-        name: t('通用'),
-      });
-      dbTypeList.value = cloneData;
+      dbTypeList.value = [{ id: 'PUBLIC', name: t('通用') }, ...data];
     },
   });
 

diff --git a/...tend/src/views/resource-manage/pool/summary-view/components/search-box/components/Biz.vue b/...tend/src/views/resource-manage/pool/summary-view/components/search-box/components/Biz.vue
@@ -47,15 +47,10 @@
 
   useRequest(getBizs, {
     onSuccess(data) {
-      const cloneData = data.map((item) => ({
-        bk_biz_id: item.bk_biz_id,
-        display_name: item.display_name,
-      }));
-      cloneData.unshift({
-        bk_biz_id: 0,
-        display_name: t('公共资源池'),
-      });
-      bizList.value = cloneData;
+      bizList.value = [
+        { bk_biz_id: 0, display_name: t('公共资源池') },
+        ...data.map(({ bk_biz_id, display_name }) => ({ bk_biz_id, display_name })),
+      ];
     },
   });
 

diff --git a/...ntend/src/views/resource-manage/pool/summary-view/components/search-box/components/Db.vue b/...ntend/src/views/resource-manage/pool/summary-view/components/search-box/components/Db.vue
@@ -49,12 +49,7 @@
 
   useRequest(fetchDbTypeList, {
     onSuccess(data) {
-      const cloneData = data;
-      cloneData.unshift({
-        id: 'PUBLIC',
-        name: t('通用'),
-      });
-      dbTypeList.value = cloneData;
+      dbTypeList.value = [{ id: 'PUBLIC', name: t('通用') }, ...data];
     },
   });
 

diff --git a/...d/src/views/resource-manage/pool/summary-view/components/search-box/components/Region.vue b/...d/src/views/resource-manage/pool/summary-view/components/search-box/components/Region.vue
@@ -58,6 +58,7 @@
   const citiyList = ref<CityItem[]>([]);
   const cityCode = ref('');
   const subzoneIds = ref<string[]>([]);
+
   const renderSubzoneList = computed(() =>
     (subzoneList.value || []).filter((item) => item.bk_city_code === cityCode.value),
   );

diff --git a/...end/src/views/resource-manage/pool/summary-view/components/search-box/components/Spec.vue b/...end/src/views/resource-manage/pool/summary-view/components/search-box/components/Spec.vue
@@ -44,9 +44,9 @@
 <script setup lang="ts">
   import { useRequest } from 'vue-request';
 
-  import { type ClusterTypeInfoItem, clusterTypeInfos, ClusterTypes } from '@common/const';
+  import { getResourceSpecList } from '@services/source/dbresourceSpec';
 
-  import { getResourceSpecList } from '@/services/source/dbresourceSpec';
+  import { type ClusterTypeInfoItem, clusterTypeInfos, ClusterTypes } from '@common/const';
 
   interface Props {
     model: Record<string, string>;
@@ -72,6 +72,7 @@
   const machineType = ref('');
   const specIdList = ref<string[]>([]);
   const clusterMachineList = ref<ClusterTypeInfoItem['machineList']>([]);
+
   const clusterTypeList = computed(
     () => Object.values(clusterTypeInfos).filter((item) => item.dbType === props.model.db_type) || [],
   );