From 85bc4aea537aeee50dfa0e505249a392f0d6e39b Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 9 Dec 2024 10:51:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=B5=E9=9D=A2=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/mmeUE/index.vue           | 155 ++++++++++++------
 .../components/UserActivity/index.vue         |   6 +-
 2 files changed, 110 insertions(+), 51 deletions(-)

diff --git a/src/views/dashboard/mmeUE/index.vue b/src/views/dashboard/mmeUE/index.vue
index ad0c4849..ab038bf0 100644
--- a/src/views/dashboard/mmeUE/index.vue
+++ b/src/views/dashboard/mmeUE/index.vue
@@ -467,45 +467,71 @@ onBeforeUnmount(() => {
 
 <template>
   <PageContainer>
-    <a-card v-show="tableState.seached" :bordered="false" :body-style="{ marginBottom: '24px', paddingBottom: 0 }">
+    <a-card
+      v-show="tableState.seached"
+      :bordered="false"
+      :body-style="{ marginBottom: '24px', paddingBottom: 0 }"
+    >
       <!-- 表格搜索栏 -->
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item label="MME" name="neId ">
-              <a-select v-model:value="queryParams.neId" :options="neOtions" :placeholder="t('common.selectPlease')" />
+              <a-select
+                v-model:value="queryParams.neId"
+                :options="neOtions"
+                :placeholder="t('common.selectPlease')"
+              />
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item :label="t('views.dashboard.ue.eventType')" name="eventType ">
-              <a-select v-model:value="eventTypes" mode="multiple" :options="dict.ueEventType"
-                :placeholder="t('common.selectPlease')" @change="fnQueryEventTypeChange"></a-select>
+            <a-form-item
+              :label="t('views.dashboard.ue.eventType')"
+              name="eventType "
+            >
+              <a-select
+                v-model:value="eventTypes"
+                mode="multiple"
+                :options="dict.ueEventType"
+                :placeholder="t('common.selectPlease')"
+                @change="fnQueryEventTypeChange"
+              ></a-select>
             </a-form-item>
           </a-col>
           <a-col :lg="4" :md="12" :xs="24">
             <a-form-item label="IMSI" name="imsi ">
-              <a-input v-model:value="queryParams.imsi" allow-clear :placeholder="t('common.inputPlease')"></a-input>
+              <a-input
+                v-model:value="queryParams.imsi"
+                allow-clear
+                :placeholder="t('common.inputPlease')"
+              ></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="8" :md="12" :xs="24">
-            <a-form-item :label="t('views.dashboard.cdr.time')" name="queryRangePicker">
-              <a-range-picker v-model:value="queryRangePicker" allow-clear bordered :show-time="{ format: 'HH:mm:ss' }"
-                format="YYYY-MM-DD HH:mm:ss" value-format="x" style="width: 100%"></a-range-picker>
+            <a-form-item
+              :label="t('views.dashboard.cdr.time')"
+              name="queryRangePicker"
+            >
+              <a-range-picker
+                v-model:value="queryRangePicker"
+                allow-clear
+                bordered
+                :show-time="{ format: 'HH:mm:ss' }"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="x"
+                style="width: 100%"
+              ></a-range-picker>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
                 <a-button type="primary" @click.prevent="fnGetList(1)">
-                  <template #icon>
-                    <SearchOutlined />
-                  </template>
+                  <template #icon><SearchOutlined /></template>
                   {{ t('common.search') }}
                 </a-button>
                 <a-button type="default" @click.prevent="fnQueryReset">
-                  <template #icon>
-                    <ClearOutlined />
-                  </template>
+                  <template #icon><ClearOutlined /></template>
                   {{ t('common.reset') }}
                 </a-button>
               </a-space>
@@ -519,14 +545,19 @@ onBeforeUnmount(() => {
       <!-- 插槽-卡片左侧侧 -->
       <template #title>
         <a-space :size="8" align="center">
-          <a-popconfirm placement="bottomLeft" :title="!realTimeData
-              ? t('views.dashboard.ue.realTimeDataStart')
-              : t('views.dashboard.ue.realTimeDataStop')
-            " ok-text="Yes" cancel-text="No" @confirm="fnRealTime()">
+          <a-popconfirm
+            placement="bottomLeft"
+            :title="
+              !realTimeData
+                ? t('views.dashboard.ue.realTimeDataStart')
+                : t('views.dashboard.ue.realTimeDataStop')
+            "
+            ok-text="Yes"
+            cancel-text="No"
+            @confirm="fnRealTime()"
+          >
             <a-button type="primary" :danger="realTimeData">
-              <template #icon>
-                <FundOutlined />
-              </template>
+              <template #icon><FundOutlined /> </template>
               {{
                 !realTimeData
                   ? t('views.dashboard.ue.realTimeDataStart')
@@ -535,18 +566,19 @@ onBeforeUnmount(() => {
             </a-button>
           </a-popconfirm>
 
-          <a-button type="default" danger :disabled="tableState.selectedRowKeys.length <= 0"
-            :loading="modalState.confirmLoading" @click.prevent="fnRecordDelete('0')">
-            <template #icon>
-              <DeleteOutlined />
-            </template>
+          <a-button
+            type="default"
+            danger
+            :disabled="tableState.selectedRowKeys.length <= 0"
+            :loading="modalState.confirmLoading"
+            @click.prevent="fnRecordDelete('0')"
+          >
+            <template #icon><DeleteOutlined /></template>
             {{ t('common.deleteText') }}
           </a-button>
 
           <a-button type="dashed" @click.prevent="fnExportList()">
-            <template #icon>
-              <ExportOutlined />
-            </template>
+            <template #icon><ExportOutlined /></template>
             {{ t('common.export') }}
           </a-button>
         </a-space>
@@ -557,27 +589,31 @@ onBeforeUnmount(() => {
         <a-space :size="8" align="center">
           <a-tooltip>
             <template #title>{{ t('common.searchBarText') }}</template>
-            <a-switch v-model:checked="tableState.seached" :checked-children="t('common.switch.show')"
-              :un-checked-children="t('common.switch.hide')" size="small" :disabled="realTimeData" />
+            <a-switch
+              v-model:checked="tableState.seached"
+              :checked-children="t('common.switch.show')"
+              :un-checked-children="t('common.switch.hide')"
+              size="small"
+              :disabled="realTimeData"
+            />
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.reloadText') }}</template>
             <a-button type="text" @click.prevent="fnGetList()">
-              <template #icon>
-                <ReloadOutlined />
-              </template>
+              <template #icon><ReloadOutlined /></template>
             </a-button>
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.sizeText') }}</template>
             <a-dropdown trigger="click" placement="bottomRight">
               <a-button type="text">
-                <template #icon>
-                  <ColumnHeightOutlined />
-                </template>
+                <template #icon><ColumnHeightOutlined /></template>
               </a-button>
               <template #overlay>
-                <a-menu :selected-keys="[tableState.size as string]" @click="fnTableSize">
+                <a-menu
+                  :selected-keys="[tableState.size as string]"
+                  @click="fnTableSize"
+                >
                   <a-menu-item key="default">
                     {{ t('common.size.default') }}
                   </a-menu-item>
@@ -595,34 +631,51 @@ onBeforeUnmount(() => {
       </template>
 
       <!-- 表格列表 -->
-      <a-table class="table" row-key="id" :columns="tableColumns" :loading="tableState.loading"
-        :data-source="tableState.data" :size="tableState.size" :pagination="tablePagination"
-        :scroll="{ x: tableColumns.length * 120, y: 'calc(100vh - 480px)' }" :row-selection="{
+      <a-table
+        class="table"
+        row-key="id"
+        :columns="tableColumns"
+        :loading="tableState.loading"
+        :data-source="tableState.data"
+        :size="tableState.size"
+        :pagination="tablePagination"
+        :scroll="{ x: tableColumns.length * 120, y: 'calc(100vh - 480px)' }"
+        :row-selection="{
           type: 'checkbox',
           columnWidth: '48px',
           selectedRowKeys: tableState.selectedRowKeys,
           onChange: fnTableSelectedRowKeys,
-        }">
+        }"
+      >
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'eventType'">
             <DictTag :options="dict.ueEventType" :value="record.eventType" />
           </template>
           <template v-if="column.key === 'result'">
             <span v-if="record.eventType === 'auth-result'">
-              <DictTag :options="dict.ueAauthCode" :value="record.eventJSON.result" />
+              <DictTag
+                :options="dict.ueAauthCode"
+                :value="record.eventJSON.result"
+              />
             </span>
             <span v-if="record.eventType === 'detach'">
               <span>{{ t('views.dashboard.ue.resultOk') }}</span>
             </span>
             <span v-if="record.eventType === 'cm-state'">
-              <DictTag :options="dict.ueEventCmState" :value="record.eventJSON.result" />
+              <DictTag
+                :options="dict.ueEventCmState"
+                :value="record.eventJSON.result"
+              />
             </span>
           </template>
           <template v-if="column.key === 'id'">
             <a-space :size="8" align="center">
               <a-tooltip>
                 <template #title>{{ t('common.deleteText') }}</template>
-                <a-button type="link" @click.prevent="fnRecordDelete(record.id)">
+                <a-button
+                  type="link"
+                  @click.prevent="fnRecordDelete(record.id)"
+                >
                   <template #icon>
                     <DeleteOutlined />
                   </template>
@@ -658,13 +711,19 @@ onBeforeUnmount(() => {
             <div>
               <span>{{ t('views.dashboard.ue.result') }}: </span>
               <span v-if="record.eventType === 'auth-result'">
-                <DictTag :options="dict.ueAauthCode" :value="record.eventJSON.result" />
+                <DictTag
+                  :options="dict.ueAauthCode"
+                  :value="record.eventJSON.result"
+                />
               </span>
               <span v-if="record.eventType === 'detach'">
                 {{ t('views.dashboard.ue.resultOk') }}
               </span>
               <span v-if="record.eventType === 'cm-state'">
-                <DictTag :options="dict.ueEventCmState" :value="record.eventJSON.result" />
+                <DictTag
+                  :options="dict.ueEventCmState"
+                  :value="record.eventJSON.result"
+                />
               </span>
             </div>
           </div>
diff --git a/src/views/dashboard/overview/components/UserActivity/index.vue b/src/views/dashboard/overview/components/UserActivity/index.vue
index ae3e07a5..1a2af1eb 100644
--- a/src/views/dashboard/overview/components/UserActivity/index.vue
+++ b/src/views/dashboard/overview/components/UserActivity/index.vue
@@ -198,12 +198,12 @@ onMounted(() => {
             </span>
           </div>
           <div>
-            IMSI: <span :title="item.data.imsi">{{ item.data.imsi }}</span>
+            IMSI: <span :title="item.data?.imsi">{{ item.data?.imsi }}</span>
           </div>
           <div>
             {{ t('views.dashboard.overview.userActivity.time') }}:
-            <span :title="item.data.timestamp">
-              {{ parseDateToStr(+item.data.timestamp * 1000) }}
+            <span :title="item.data?.timestamp">
+              {{ parseDateToStr(+item.data?.timestamp * 1000) }}
             </span>
           </div>
         </div>