fix: 修复 租户页面合并问题

src/views/dashboard/overview/index.vue

@@ -28,7 +28,7 @@ import useWS from './hooks/useWS';
 import useAppStore from '@/store/modules/app';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { useRouter } from 'vue-router';
-import { message } from 'ant-design-vue/lib/components';
+import { message } from 'ant-design-vue/es/components';
 import useNeInfoStore from '@/store/modules/neinfo';
 
 const router = useRouter();

src/views/index/defaultIndex.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { PageContainer } from 'antdv-pro-layout';
-import { ColumnsType } from 'ant-design-vue/lib/table';
+import { ColumnsType } from 'ant-design-vue/es/table';
-import { message } from 'ant-design-vue/lib';
+import { message } from 'ant-design-vue/es';
 import { reactive, toRaw, ref, onMounted, onBeforeUnmount, markRaw } from 'vue';
 import { listMain } from '@/api/index';
 import useI18n from '@/hooks/useI18n';
@@ -344,7 +344,7 @@ onBeforeUnmount(() => {
 <template>
   <PageContainer :breadcrumb="{}">
     <div>
-      <a-drawer :visible="visible" @close="closeDrawer" :width="700">
+      <a-drawer :open="visible" @close="closeDrawer" :width="700">
         <a-descriptions bordered :column="1" :label-style="{ width: '160px' }">
           <a-descriptions-item :label="t('views.index.hostName')">{{
             pronInfo.hostName

src/views/monitor/topology/index.vue

@@ -50,6 +50,7 @@ async function fnGetState() {
       graphG6.value.setItemState(neShape, 'neState', ne.serverState.online);
     }
   }
+  await new Promise(resolve => setTimeout(resolve, 15_000));
 }
 
 /**查询全部网元数据列表 */

src/views/neUser/base5G/index.vue

@@ -9,7 +9,7 @@ import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useNeInfoStore from '@/store/modules/neinfo';
 import { useRoute } from 'vue-router';
-import { ColumnsType } from 'ant-design-vue/lib/table';
+import { ColumnsType } from 'ant-design-vue/es/table';
 import TableColumnsDnd from '@/components/TableColumnsDnd/index.vue';
 import { listTenant } from '@/api/system/tenant';
 const neInfoStore = useNeInfoStore();

src/views/system/tenant/index.vue

@@ -4,8 +4,8 @@ import { PageContainer } from 'antdv-pro-layout';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useNeInfoStore from '@/store/modules/neinfo';
 import useI18n from '@/hooks/useI18n';
-import { SizeType } from 'ant-design-vue/lib/config-provider';
+import { SizeType } from 'ant-design-vue/es/config-provider';
-import { ColumnsType } from 'ant-design-vue/lib/table';
+import { ColumnsType } from 'ant-design-vue/es/table';
 import {
   listTenant,
   getTenant,
@@ -956,7 +956,7 @@ onMounted(() => {
       width="800px"
       :keyboard="false"
       :mask-closable="false"
-      :visible="modalState.visibleByEdit"
+      :open="modalState.visibleByEdit"
       :title="modalState.title"
       @ok="fnModalOk"
       @cancel="fnModalCancel"
@@ -1003,7 +1003,7 @@ onMounted(() => {
       width="800px"
       :keyboard="false"
       :mask-closable="false"
-      :visible="modalState.visibleByType"
+      :open="modalState.visibleByType"
       :title="modalState.typeTitle"
       @ok="fnModalTypeOk"
       @cancel="fnModalCancel"

src/views/tenant/amfUE/index.vue

@@ -676,17 +676,6 @@ onBeforeUnmount(() => {
         </template>
         <template #expandedRowRender="{ record }">
           <div style="width: 46%; padding-left: 32px; padding-bottom: 16px">
-            <a-divider orientation="left">
-              {{ t('views.dashboard.ue.ueInfo') }}
-            </a-divider>
-            <div>
-              <span>{{ t('views.ne.common.neName') }}: </span>
-              <span>{{ record.neName }}</span>
-            </div>
-            <div>
-              <span>{{ t('views.ne.common.rmUid') }}: </span>
-              <span>{{ record.rmUID }}</span>
-            </div>
             <a-divider orientation="left">
               {{ t('views.dashboard.ue.rowInfo') }}
             </a-divider>

src/views/tenant/base5G/index.vue

@@ -9,7 +9,7 @@ import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useNeInfoStore from '@/store/modules/neinfo';
 import { useRoute } from 'vue-router';
-import { ColumnsType } from 'ant-design-vue/lib/table';
+import { ColumnsType } from 'ant-design-vue/es/table';
 import TableColumnsDnd from '@/components/TableColumnsDnd/index.vue';
 const neInfoStore = useNeInfoStore();
 const route = useRoute();

src/views/tenant/ims/index.vue

@@ -33,7 +33,6 @@ let queryParams = reactive({
 /**查询参数重置 */
 function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
-    totalType: [],
     imsi: '',
     msisdn: '',
     pageNum: 1,

src/views/tenant/operate/index.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { reactive, ref, onMounted, toRaw } from 'vue';
 import { PageContainer } from 'antdv-pro-layout';
-import { ProModal } from 'antdv-pro-modal';
 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';
@@ -596,7 +595,7 @@ onMounted(() => {
     <!-- 详情框 -->
     <a-modal
       width="800px"
-      :visible="modalState.visibleByView"
+      :open="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
     >

src/views/tenant/smscCDR/index.vue

@@ -12,7 +12,7 @@ import {
 } from '@/constants/result-constants';
 import useNeInfoStore from '@/store/modules/neinfo';
 import { exportSMSCDataCDR, listSMSCDataCDR } from '@/api/neData/smsc';
-import { parseDateToStr, parseDuration } from '@/utils/date-utils';
+import { parseDateToStr } from '@/utils/date-utils';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
 import saveAs from 'file-saver';
 import PQueue from 'p-queue';
@@ -168,7 +168,10 @@ let tableColumns: ColumnsType = [
     width: 150,
     customRender(opt) {
       const cdrJSON = opt.value;
+      if (typeof cdrJSON.updateTime === 'number') {
         return parseDateToStr(+cdrJSON.updateTime * 1000);
+      }
+      return cdrJSON.updateTime;
     },
   },
 ];
@@ -573,7 +576,13 @@ onBeforeUnmount(() => {
             </div>
             <div>
               <span>{{ t('views.dashboard.cdr.time') }}: </span>
-              <span>{{ parseDateToStr(+record.timestamp * 1000) }}</span>
+              <span>
+                {{
+                  typeof record.cdrJSON.updateTime === 'number'
+                    ? parseDateToStr(+record.cdrJSON.updateTime * 1000)
+                    : record.cdrJSON.updateTime
+                }}
+              </span>
             </div>
             <a-divider orientation="left">
               {{ t('views.dashboard.cdr.rowInfo') }}

src/views/tenant/ue/index.vue

@@ -38,7 +38,6 @@ let queryParams = reactive({
 /**查询参数重置 */
 function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
-    totalType: [],
     imsi: '',
     msisdn: '',
     pageNum: 1,
@@ -67,7 +66,7 @@ type TabeStateType = {
 let tableState: TabeStateType = reactive({
   loading: false,
   size: 'middle',
-  seached: false,
+  seached: true,
   data: [],
   selectedRowKeys: [],
 });
@@ -443,13 +442,13 @@ onMounted(() => {
     <!-- 详情框 -->
     <ProModal
       :width="800"
-      :visible="modalState.visibleByView"
+      :open="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
       :footer="null"
     >
       <a-form layout="horizontal" labelAlign="left" :labelWrap="false">
-        <a-row >
+        <a-row>
           <a-col :lg="8" :md="8" :xs="24">
             <a-form-item label="IMSI" name="imsi">
               {{ modalState.from.imsi }}