feat(frontend): 资源池增加统计视图、专用业务专用db改单选 TencentBlueKing#6519

# Reviewed, transaction id: 17384
JustaCattt · Sep 4, 2024 · 9038ce2 · 9038ce2
1 parent b08a34c
commit 9038ce2
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 42 deletions.
diff --git a/dbm-ui/frontend/src/services/source/dbresourceResource.ts b/dbm-ui/frontend/src/services/source/dbresourceResource.ts
@@ -51,19 +51,6 @@ export function fetchMountPoints() {
   return http.get<string[]>(`${path}/get_mountpoints/`);
 }
 
-/**
- * 根据逻辑城市查询园区
- */
-export function fetchSubzones(params: { citys: string[] }) {
-  return http.get<
-    ListBase<
-      {
-        citys: string[];
-      }[]
-    >
-  >(`${path}/get_subzones/`, params);
-}
-
 /**
  * 资源池导入
  */

diff --git a/...ews/resource-manage/pool/host-list/components/search-box/components/com-factory/Index.vue b/...ews/resource-manage/pool/host-list/components/search-box/components/com-factory/Index.vue
@@ -57,7 +57,7 @@
   import OSType from './components/OSType.vue';
   import ResourceType from './components/ResourceType.vue';
   import SpecId from './components/SpecId.vue';
-  import Subzones from './components/Subzones.vue';
+  import SubzoneIds from './components/SubzoneIds.vue';
 
   interface Props {
     name: string;
@@ -93,7 +93,7 @@
     mem: Mem,
     disk: Disk,
     disk_type: DiskType,
-    subzones: Subzones,
+    subzone_ids: SubzoneIds,
     bk_cloud_ids: BkCloudIds,
     spec_id: SpecId,
   };

diff --git a/...nents/com-factory/components/Subzones.vue → ...nts/com-factory/components/SubzoneIds.vue b/...nents/com-factory/components/Subzones.vue → ...nts/com-factory/components/SubzoneIds.vue
@@ -13,21 +13,25 @@
 
 <template>
   <BkSelect
-    :model-value="defaultValue"
+    collapse-tags
+    :model-value="localValue"
+    multiple
+    multiple-mode="tag"
+    show-select-all
     @change="handleChange">
     <BkOption
       v-for="item in data"
-      :key="item">
-      {{ item }}
-    </BkOption>
+      :key="item.bk_sub_zone_id"
+      :label="item.bk_sub_zone"
+      :value="`${item.bk_sub_zone_id}`" />
   </BkSelect>
 </template>
 
 <script setup lang="ts">
   import { watch } from 'vue';
   import { useRequest } from 'vue-request';
 
-  import { fetchSubzones } from '@services/source/dbresourceResource';
+  import { getInfrasSubzonesByCity } from '@services/source/infras';
 
   interface Props {
     model: Record<string, any>;
@@ -38,23 +42,28 @@
   }
 
   const props = defineProps<Props>();
+
   const emits = defineEmits<Emits>();
+
   defineOptions({
     inheritAttrs: false,
   });
-  const { data, run: fetchData } = useRequest(fetchSubzones, {
+
+  const localValue = ref<string[]>(props.defaultValue || []);
+
+  const { data, run: fetchData } = useRequest(getInfrasSubzonesByCity, {
     initialData: [],
     manual: true,
+    onSuccess() {
+      localValue.value = [];
+    },
   });
 
   watch(
-    () => props.model,
+    () => props.model.city,
     () => {
-      if (!props.model.city) {
-        return;
-      }
       fetchData({
-        citys: props.model.city,
+        city_code: props.model.city,
       });
     },
     {
@@ -63,6 +72,7 @@
   );
 
   const handleChange = (value: Props['defaultValue']) => {
+    localValue.value = value as string[];
     emits('change', value);
   };
 </script>
diff --git a/...src/views/resource-manage/pool/host-list/components/search-box/components/field-config.ts b/...src/views/resource-manage/pool/host-list/components/search-box/components/field-config.ts
@@ -14,9 +14,9 @@
 import _ from 'lodash';
 
 import { getBizs } from '@services/source/cmdb';
-import { fetchMountPoints, fetchSubzones } from '@services/source/dbresourceResource';
+import { fetchMountPoints } from '@services/source/dbresourceResource';
 import { getResourceSpec } from '@services/source/dbresourceSpec';
-import { fetchDbTypeList, getInfrasCities } from '@services/source/infras';
+import { fetchDbTypeList, getInfrasCities, getInfrasSubzonesByCity } from '@services/source/infras';
 import { getCloudList } from '@services/source/ipchooser';
 
 import { ipv4 } from '@common/regex';
@@ -90,10 +90,10 @@ export default {
       return undefined;
     },
   },
-  subzones: {
+  subzone_ids: {
     label: t('园区'),
-    component: 'subzones',
-    service: fetchSubzones,
+    component: 'subzone_ids',
+    service: getInfrasSubzonesByCity,
   },
   device_class: {
     label: t('机型'),

diff --git a/...ews/resource-manage/pool/host-list/components/search-box/components/field-input/Index.vue b/...ews/resource-manage/pool/host-list/components/search-box/components/field-input/Index.vue
@@ -83,9 +83,9 @@
             name="disk_type"
             @change="handleChange" />
           <ComFactory
-            :ref="(el: any) => initInputRefCallback(el, 'subzones')"
+            :ref="(el: any) => initInputRefCallback(el, 'subzone_ids')"
             :model="localValueMemo"
-            name="subzones"
+            name="subzone_ids"
             @change="handleChange" />
           <ComFactory
             :ref="(el: any) => initInputRefCallback(el, 'os_type')"

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
@@ -11,7 +11,7 @@
         :value="item.city_code" />
     </BkSelect>
     <BkSelect
-      v-model="subzones"
+      v-model="subzoneIds"
       collapse-tags
       :disabled="!cityCode"
       filterable
@@ -23,7 +23,7 @@
         v-for="item in subzoneList"
         :key="item.bk_sub_zone_id"
         :label="item.bk_sub_zone"
-        :value="item.bk_sub_zone" />
+        :value="`${item.bk_sub_zone_id}`" />
     </BkSelect>
   </BkComposeFormItem>
 </template>
@@ -43,7 +43,7 @@
   interface Exposes {
     getValue: () => {
       city: string;
-      sub_zones: string[];
+      subzone_ids: string[];
     };
   }
 
@@ -53,7 +53,7 @@
     default: '',
   });
 
-  const subzones = defineModel<string[]>('subzones', {
+  const subzoneIds = defineModel<string[]>('subzoneIds', {
     default: [],
   });
 
@@ -67,17 +67,20 @@
       citiyList.value = cloneData;
     },
   });
-  const { data: subzoneList, run: fetchSubzones } = useRequest(getInfrasSubzonesByCity, {
+  const { data: subzoneList, run: fetchData } = useRequest(getInfrasSubzonesByCity, {
     initialData: [],
     manual: true,
+    onSuccess() {
+      subzoneIds.value = [];
+    },
   });
 
   watch(
     cityCode,
     () => {
       if (cityCode.value) {
-        fetchSubzones({
-          city_code: cityCode.value,
+        fetchData({
+          city_code: cityCode.value === 'default' ? '' : cityCode.value,
         });
       }
     },
@@ -92,8 +95,8 @@
 
   defineExpose<Exposes>({
     getValue: () => ({
-      city: cityCode.value,
-      sub_zones: subzones.value,
+      city: cityCode.value === 'default' ? '' : cityCode.value,
+      subzone_ids: subzoneIds.value,
     }),
   });
 </script>