fix: 仪表盘2用户事件显示不正常

src/views/dashboard/overview2/components/IMSActivity/index.vue

@@ -66,12 +66,19 @@ onMounted(() => {
   <div class="activty">
     <template v-for="item in eventData" :key="item.eId">
       <!-- CDR事件IMS -->
-      <div class="card-cdr" :class="{ active: item.eId === eventId }" v-if="item.eType === 'ims_cdr'">
+      <div
+        class="card-cdr"
+        :class="{ active: item.eId === eventId }"
+        v-if="item.eType === 'ims_cdr'"
+      >
         <div class="card-cdr-item">
           <div>
             {{ t('views.dashboard.overview.userActivity.type') }}:&nbsp;
             <span>
-              <DictTag :options="dict.cdrCallType" :value="item.data.callType" />
+              <DictTag
+                :options="dict.cdrCallType"
+                :value="item.data.callType"
+              />
             </span>
           </div>
           <div></div>
@@ -109,8 +116,17 @@ onMounted(() => {
         <div>
           {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
           <span v-if="item.data.callType !== 'sms'">
-            <DictTag :options="dict.cdrSipCode" :value="item.data.cause" value-default="0" />&nbsp;&nbsp;
-            <DictTag :options="dict.cdrSipCodeCause" :value="item.data.cause" value-default="0" />
+            <DictTag
+              :options="dict.cdrSipCode"
+              :value="item.data.cause"
+              value-default="0"
+            />
+            &nbsp;-&nbsp;
+            <DictTag
+              :options="dict.cdrSipCodeCause"
+              :value="item.data.cause"
+              value-default="0"
+            />
           </span>
           <span v-else>
             {{ t('views.dashboard.overview.userActivity.resultOK') }}

src/views/dashboard/overview2/components/UserActivity/index.vue

@@ -84,38 +84,35 @@ onMounted(() => {
           <div></div>
         </div>
 
-        <div class="card-ue-w33" v-if="item.type === 'auth-result'">
+        <div class="card-ue-w33" v-if="item.type === 'Auth'">
           <div>
-            GNB ID: <span>{{ item.data.gNBID }}</span>
+            GNB ID: <span>{{ item.data.nbId }}</span>
           </div>
           <div>
-            Cell ID: <span>{{ item.data.cellID }}</span>
+            Cell ID: <span>{{ item.data.cellId }}</span>
           </div>
           <div>
-            TAC ID: <span>{{ item.data.tacID }}</span>
+            TAC ID: <span>{{ item.data.tac }}</span>
           </div>
         </div>
         <div>
           {{ t('views.dashboard.overview.userActivity.time') }}:
-          <template v-if="item.data?.time">
-            {{ parseDateToStr(item.data.time) }}
-          </template>
-          <template v-else-if="item.data?.timestamp">
-            {{ parseDateToStr(+item.data.timestamp * 1000) }}
+          <template v-if="item.data?.recordTime">
+            {{ parseDateToStr(item.data.recordTime) }}
           </template>
           <template v-else> - </template>
         </div>
-        <div v-if="item.type === 'auth-result'">
+        <div v-if="item.type === 'Auth'">
           {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
           <span>
             <DictTag :options="dict.ueAauthCode" :value="item.data.result" />
           </span>
         </div>
-        <div v-if="item.type === 'detach'">
+        <div v-if="item.type === 'Detach'">
           {{ t('views.dashboard.overview.userActivity.result') }}:
           <span>{{ t('views.dashboard.overview.userActivity.resultOK') }}</span>
         </div>
-        <div class="card-ue-w33" v-if="item.type === 'cm-state'">
+        <div class="card-ue-w33" v-if="item.type === 'CM'">
           {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
           <span>
             <DictTag :options="dict.ueEventCmState" :value="item.data.result" />
@@ -131,7 +128,7 @@ onMounted(() => {
         <div class="card-ue-item">
           <div>
             {{ t('views.dashboard.overview.userActivity.type') }}:&nbsp;
-            <span v-if="item.type === 'cm-state'">
+            <span v-if="item.type === 'CM'">
               {{
                 dict.ueEventType
                   .find(s => s.value === item.type)
@@ -148,42 +145,35 @@ onMounted(() => {
           <div></div>
         </div>
 
-        <div class="card-ue-w33" v-if="item.type === 'auth-result'">
+        <div class="card-ue-w33" v-if="item.type === 'Auth'">
           <div>
-            ENB ID: <span>{{ item.data.eNBID }}</span>
+            ENB ID: <span>{{ item.data.nbId }}</span>
           </div>
           <div>
-            Cell ID: <span>{{ item.data.cellID }}</span>
+            Cell ID: <span>{{ item.data.cellId }}</span>
           </div>
           <div>
-            TAC ID: <span>{{ item.data.tacID }}</span>
+            TAC ID: <span>{{ item.data.tac }}</span>
           </div>
         </div>
         <div>
           {{ t('views.dashboard.overview.userActivity.time') }}:
-          <template v-if="item.data?.time">
-            {{ parseDateToStr(item.data.time) }}
-          </template>
-          <template v-else-if="item.data?.timestamp">
-            {{
-              typeof item.data?.timestamp === 'number'
-                ? parseDateToStr(+item.data?.timestamp * 1000)
-                : parseDateToStr(item.data?.timestamp)
-            }}
+          <template v-if="item.data?.recordTime">
+            {{ parseDateToStr(item.data.recordTime) }}
           </template>
           <template v-else> - </template>
         </div>
-        <div v-if="item.type === 'auth-result'">
+        <div v-if="item.type === 'Auth'">
           {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
           <span>
             <DictTag :options="dict.ueAauthCode" :value="item.data.result" />
           </span>
         </div>
-        <div v-if="item.type === 'detach'">
+        <div v-if="item.type === 'Detach'">
           {{ t('views.dashboard.overview.userActivity.result') }}:
           <span>{{ t('views.dashboard.overview.userActivity.resultOK') }}</span>
         </div>
-        <div class="card-ue-w33" v-if="item.type === 'cm-state'">
+        <div class="card-ue-w33" v-if="item.type === 'CM'">
           {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
           <span>
             <DictTag :options="dict.ueEventCmState" :value="item.data.result" />