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

src/views/dashboard/mmeUE/index.vue

@@ -429,7 +429,12 @@ onMounted(() => {
       dict.ueAauthCode = resArr[0].value;
     }
     if (resArr[1].status === 'fulfilled') {
-      dict.ueEventType = resArr[1].value;
+      dict.ueEventType = resArr[1].value.map(item => {
+        if (item.value === 'cm-state') {
+          item.label = item.label.replace('CM', 'ECM');
+        }
+        return item;
+      });
     }
     if (resArr[2].status === 'fulfilled') {
       dict.ueEventCmState = resArr[2].value;

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

@@ -251,36 +251,27 @@ function fnChangeData(data: any[], itemID: string) {
   let nfCpuUsage = 0;
   if (info.neState.cpu) {
     nfCpuUsage = info.neState.cpu.nfCpuUsage;
+    const nfCpu = +(info.neState.cpu.nfCpuUsage / 100);
+    nfCpuUsage = +nfCpu.toFixed(2);
     if (nfCpuUsage > 100) {
-      const nfCpu = +(info.neState.cpu.nfCpuUsage / 100);
-      if (nfCpu > 100) {
-        nfCpuUsage = 100;
-      } else {
-        nfCpuUsage = +nfCpu.toFixed(2);
-      }
+      nfCpuUsage = 100;
     }
 
     sysCpuUsage = info.neState.cpu.sysCpuUsage;
+    let sysCpu = +(info.neState.cpu.sysCpuUsage / 100);
+    sysCpuUsage = +sysCpu.toFixed(2);
     if (sysCpuUsage > 100) {
-      const sysCpu = +(info.neState.cpu.sysCpuUsage / 100);
-      if (sysCpu > 100) {
-        sysCpuUsage = 100;
-      } else {
-        sysCpuUsage = +sysCpu.toFixed(2);
-      }
+      sysCpuUsage = 100;
     }
   }
 
   let sysMemUsage = 0;
   if (info.neState.mem) {
-    let men = info.neState.mem.sysMemUsage;
-    if (men > 100) {
-      men = +(men / 100).toFixed(2);
+    const men = info.neState.mem.sysMemUsage;
+    sysMemUsage = +(men / 100).toFixed(2);
+    if (sysMemUsage > 100) {
+      sysMemUsage = 100;
     }
-    if (men > 100) {
-      men = 100;
-    }
-    sysMemUsage = men;
   }
 
   let sysDiskUsage = 0;

src/views/dashboard/smscCDR/index.vue

@@ -5,6 +5,7 @@ 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 useDictStore from '@/store/modules/dict';
 import useI18n from '@/hooks/useI18n';
 import {
   RESULT_CODE_ERROR,
@@ -16,14 +17,23 @@ 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';
+const { getDict } = useDictStore();
 const { t } = useI18n();
 const ws = new WS();
 const queue = new PQueue({ concurrency: 1, autoStart: true });
 
+/**字典数据 */
+let dict: {
+  /**CDR 响应原因代码类别类型 */
+  cdrCauseCode: DictType[];
+} = reactive({
+  cdrCauseCode: [],
+});
+
 /**网元可选 */
 let neOtions = ref<Record<string, any>[]>([]);
 
@@ -158,12 +168,6 @@ let tableColumns: ColumnsType = [
     key: 'cause',
     align: 'left',
     width: 120,
-    customRender(opt) {
-      const cdrJSON = opt.value;
-      return +cdrJSON.result
-        ? t('views.dashboard.cdr.resultOk')
-        : t('views.dashboard.cdr.resultFail');
-    },
   },
   {
     title: t('views.dashboard.cdr.time'),
@@ -426,6 +430,12 @@ function wsMessage(res: Record<string, any>) {
 }
 
 onMounted(() => {
+  // 初始字典数据
+  Promise.allSettled([getDict('cdr_cause_code')]).then(resArr => {
+    if (resArr[0].status === 'fulfilled') {
+      dict.cdrCauseCode = resArr[0].value;
+    }
+  });
   // 获取网元网元列表
   useNeInfoStore()
     .fnNelist()
@@ -661,6 +671,18 @@ onBeforeUnmount(() => {
         }"
       >
         <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'cause'">
+            <span v-if="record.cdrJSON.result === 0">
+              <DictTag
+                :options="dict.cdrCauseCode"
+                :value="record.cdrJSON.cause"
+                value-default="0"
+              />
+            </span>
+            <span v-else>
+              {{ t('views.dashboard.cdr.resultOk') }}
+            </span>
+          </template>
           <template v-if="column.key === 'id'">
             <a-space :size="8" align="center">
               <a-tooltip>
@@ -711,12 +733,15 @@ onBeforeUnmount(() => {
             </div>
             <div>
               <span>{{ t('views.dashboard.cdr.result') }}: </span>
-              <span>
-                {{
-                  +record.cdrJSON.result
-                    ? t('views.dashboard.cdr.resultOk')
-                    : t('views.dashboard.cdr.resultFail')
-                }}
+              <span v-if="record.cdrJSON.result === 0">
+                <DictTag
+                  :options="dict.cdrCauseCode"
+                  :value="record.cdrJSON.cause"
+                  value-default="0"
+                />
+              </span>
+              <span v-else>
+                {{ t('views.dashboard.cdr.resultOk') }}
               </span>
             </div>
           </div>