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

src/views/dashboard/amfUE/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 TableColumnsDnd from '@/components/TableColumnsDnd/index.vue';
 import useI18n from '@/hooks/useI18n';
 import {

src/views/dashboard/imsCDR/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 TableColumnsDnd from '@/components/TableColumnsDnd/index.vue';
 import useI18n from '@/hooks/useI18n';
 import {

src/views/dashboard/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,
@@ -27,9 +27,6 @@ const queue = new PQueue({ concurrency: 1, autoStart: true });
 /**网元可选 */
 let neOtions = ref<Record<string, any>[]>([]);
 
-/**event Type */
-let mmeEventType = ref<DictType[]>([]);
-
 /**字典数据 */
 let dict: {
   /**UE 事件认证代码类型 */
@@ -432,13 +429,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') {
@@ -525,7 +521,7 @@ onBeforeUnmount(() => {
               <a-select
                 v-model:value="eventTypes"
                 mode="multiple"
-                :options="mmeEventType"
+                :options="dict.ueEventType"
                 :placeholder="t('common.selectPlease')"
                 @change="fnQueryEventTypeChange"
               ></a-select>
@@ -693,7 +689,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'">
@@ -750,7 +746,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>

src/views/dashboard/mocn/components/setting.vue

@@ -1,13 +1,14 @@
 <script setup lang="ts">
 import { reactive, toRaw, watch } from 'vue';
+import { ProModal } from 'antdv-pro-modal';
 import { dbGetJSON, dbSetJSON } from '@/utils/cache-db-utils';
-const emit = defineEmits(['ok', 'cancel', 'update:visible']);
+const emit = defineEmits(['ok', 'cancel', 'update:open']);
 const props = defineProps({
   title: {
     type: String,
     default: '标题',
   },
-  visible: {
+  open: {
     type: Boolean,
     default: false,
   },
@@ -27,13 +28,13 @@ let dataState = reactive({
 function fnModalOk() {
   dbSetJSON('tbl_mocn', `tmp`, toRaw(dataState));
   emit('ok');
-  emit('update:visible', false);
+  emit('update:open', false);
 }
 
 /**弹框取消按钮事件 */
 function fnModalCancel() {
   emit('cancel');
-  emit('update:visible', false);
+  emit('update:open', false);
 }
 
 /**显示弹框时初始数据 */
@@ -48,7 +49,7 @@ function init() {
 
 /**监听是否显示，初始数据 */
 watch(
-  () => props.visible,
+  () => props.open,
   val => {
     if (val) init();
   }
@@ -60,7 +61,7 @@ watch(
     :drag="true"
     :width="800"
     :title="props.title"
-    :visible="props.visible"
+    :open="props.open"
     :keyboard="false"
     :mask-closable="false"
     @cancel="fnModalCancel"

src/views/dashboard/mocn/index.vue

@@ -8,7 +8,7 @@ import Topology from '../overview/components/Topology/index.vue';
 import NeResources from '../overview/components/NeResources/index.vue';
 import UserActivity from '../overview/components/UserActivity/index.vue';
 import AlarnTypeBar from './components/AlarnTypeBar/index.vue';
-import setting from './components/setting.vue';
+import Setting from './components/setting.vue';
 import UPFFlow from '../overview/components/UPFFlow/index.vue';
 import { listUDMSub } from '@/api/neData/udm_sub';
 import { listUENumBySMF } from '@/api/neUser/smf';
@@ -208,7 +208,7 @@ onBeforeUnmount(() => {
 /**MOCN状态 */
 const mocnState = reactive({
   title: 'Set MOCN Data',
-  visible: false,
+  open: false,
   data: {
     /**基站数 */
     baseNum: 0,
@@ -220,7 +220,7 @@ const mocnState = reactive({
 });
 /**MOCN 右击设置 */
 function fnRightClick() {
-  mocnState.visible = true;
+  mocnState.open = true;
 }
 </script>
 
@@ -543,9 +543,9 @@ function fnRightClick() {
         </div>
       </div>
     </div>
-    <setting
+    <Setting
       :title="mocnState.title"
-      v-model:visible="mocnState.visible"
+      v-model:open="mocnState.open"
     ></setting>
   </div>
 </template>

src/views/dashboard/overview/components/Topology/index.vue

@@ -2,9 +2,10 @@
 import { onMounted, ref } from 'vue';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { listAllNeInfo } from '@/api/ne/neInfo';
-import { message } from 'ant-design-vue/lib';
+import { message } from 'ant-design-vue/es';
 import { getGraphData } from '@/api/monitor/topology';
 import { Graph, GraphData, Tooltip } from '@antv/g6';
+import { parseBasePath } from '@/plugins/file-static-url';
 import { edgeLineAnimateState } from '@/views/monitor/topologyBuild/hooks/registerEdge';
 import { nodeImageAnimateState } from '@/views/monitor/topologyBuild/hooks/registerNode';
 import {
@@ -186,6 +187,12 @@ function fnGraphDataLoad(reload: boolean = false) {
       const nf: Record<string, any>[] = nodes.filter(
         (node: Record<string, any>) => {
           Reflect.set(node, 'neState', { online: false });
+          // 图片路径处理
+          if (node.img) node.img = parseBasePath(node.img);
+          if (node.icon.show && node.icon?.img) {
+            node.icon.img = parseBasePath(node.icon.img);
+          }
+          // 遍历是否有网元数据
           const nodeID: string = node.id;
           const hasNe = res.neList.some(ne => {
             Reflect.set(node, 'neInfo', ne.neType === nodeID ? ne : {});

src/views/dashboard/overview/index.vue

@@ -176,6 +176,7 @@ function loadData() {
 
   clearInterval(interval10s.value);
   interval10s.value = setInterval(() => {
+    if (!interval10s.value) return
     if (upfTFActive.value === '0') {
       upfTFSend('7');
       upfTFActive.value = '7';
@@ -190,6 +191,7 @@ function loadData() {
 
   clearInterval(interval5s.value);
   interval5s.value = setInterval(() => {
+    if (!interval5s.value) return
     fnGetSkim(); // 获取概览信息
     fnGetNeState(); // 获取网元状态
   }, 5_000);

src/views/dashboard/smfCDR/index.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { reactive, onMounted, toRaw, onBeforeUnmount, ref } from 'vue';
 import { PageContainer } from 'antdv-pro-layout';
-import { Modal, message } 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 { Modal, message } 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 useNeInfoStore from '@/store/modules/neinfo';
 import useI18n from '@/hooks/useI18n';
 import {
@@ -16,7 +16,6 @@ import {
   exportSMFDataCDR,
   listSMFDataCDR,
 } from '@/api/neData/smf';
-import { parseDateToStr } from '@/utils/date-utils';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import PQueue from 'p-queue';
 import saveAs from 'file-saver';

src/views/dashboard/smscCDR/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 useDictStore from '@/store/modules/dict';
 import useI18n from '@/hooks/useI18n';
 import {