merge main to multi-tenant

src/views/index/defaultIndex.vue

@@ -38,12 +38,12 @@ const statusBarChart = ref<any>(null);
 
 /**网元状态字典数据 */
 let indexColor = ref<DictType[]>([
-  { label: 'Normal', value: 'normal', elTagType: '', elTagClass: '#91cc75' },
+  { label: 'Normal', value: 'normal', tagType: '', tagClass: '#91cc75' },
   {
     label: 'Abnormal',
     value: 'abnormal',
-    elTagType: '',
-    elTagClass: '#ee6666',
+    tagType: '',
+    tagClass: '#ee6666',
   },
 ]);
 
@@ -197,7 +197,7 @@ function fnGetList(one: boolean) {
         orient: 'vertical',
         left: 'left',
       },
-      color: indexColor.value.map(item => item.elTagClass),
+      color: indexColor.value.map(item => item.tagClass),
       series: [
         {
           name: t('views.index.realNeStatus'),

src/views/index/moduleInfo.vue

@@ -2,7 +2,7 @@
 import { ref, onMounted, markRaw, reactive } from 'vue';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { listSub } from '@/api/neUser/sub';
+import { listUDMSub } from '@/api/neData/udm_sub';
 import { listUENumBySMF, listUEInfoBySMF } from '@/api/neUser/smf';
 import { listBase5G } from '@/api/neUser/base5G';
 import { useRouter } from 'vue-router';
@@ -38,7 +38,7 @@ let skimState: SkimStateType = reactive({
 /**获取概览信息 */
 async function fnGetSkim() {
   const resArr = await Promise.allSettled([
-    listSub({
+    listUDMSub({
       neid: '001',
       pageNum: 1,
       pageSize: 1,