Merge remote-tracking branch 'origin/main' into multi-tenant

src/views/tenant/mmeUE/index.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { reactive, onMounted, toRaw, ref, onBeforeUnmount } from 'vue';
 import { PageContainer } from 'antdv-pro-layout';
-import { message, Modal } from 'ant-design-vue/lib';
-import { SizeType } from 'ant-design-vue/lib/config-provider';
-import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
-import { ColumnsType } from 'ant-design-vue/lib/table';
+import { message, Modal } from 'ant-design-vue/es';
+import { SizeType } from 'ant-design-vue/es/config-provider';
+import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
+import { ColumnsType } from 'ant-design-vue/es/table';
 import useI18n from '@/hooks/useI18n';
 import {
   RESULT_CODE_ERROR,
@@ -22,8 +22,7 @@ const ws = new WS();
 const queue = new PQueue({ concurrency: 1, autoStart: true });
 
 
-/**event Type */
-let mmeEventType = ref<DictType[]>([]);
+
 
 /**字典数据 */
 let dict: {
@@ -414,13 +413,12 @@ onMounted(() => {
         dict.ueAauthCode = resArr[0].value;
       }
       if (resArr[1].status === 'fulfilled') {
-        resArr[1].value.map(item => {
-        const realJson = JSON.parse(JSON.stringify(item));
-
-        if (realJson.value === 'cm-state') {
-          realJson.label = realJson.label.replace('CM', 'ECM');
+        const ueEventType: any[] = JSON.parse(JSON.stringify(resArr[1].value));
+      dict.ueEventType = ueEventType.map(item => {
+        if (item.value === 'cm-state') {
+          item.label = item.label.replace('CM', 'ECM');
         }
-        mmeEventType.value.push(realJson);
+        return item;
       });
       }
       if (resArr[2].status === 'fulfilled') {
@@ -458,7 +456,7 @@ onBeforeUnmount(() => {
               <a-select
                 v-model:value="eventTypes"
                 mode="multiple"
-                :options="mmeEventType"
+                :options="dict.ueEventType"
                 :placeholder="t('common.selectPlease')"
                 @change="fnQueryEventTypeChange"
               ></a-select>
@@ -582,7 +580,7 @@ onBeforeUnmount(() => {
       >
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'eventType'">
-            <DictTag :options="mmeEventType" :value="record.eventType" />
+            <DictTag :options="dict.ueEventType" :value="record.eventType" />
           </template>
           <template v-if="column.key === 'result'">
             <span v-if="record.eventType === 'auth-result'">
@@ -639,7 +637,7 @@ onBeforeUnmount(() => {
             </div>
             <div>
               <span>{{ t('views.dashboard.ue.eventType') }}: </span>
-              <DictTag :options="mmeEventType" :value="record.eventType" />
+              <DictTag :options="dict.ueEventType" :value="record.eventType" />
             </div>
             <div>
               <span>{{ t('views.dashboard.ue.result') }}: </span>