Merge branch 'lichang' into lite

src/views/dashboard/overview/css/index.css

@@ -16,6 +16,8 @@
 .column {
   flex: 3;
   position: relative;
+  display: flex;
+  flex-direction: column;
 }
 
 /* 边框 */
@@ -86,6 +88,7 @@
 .topology {
   /* min-height: 27.8rem; */
   height: 56.4%;
+  flex: 1;
 }
 .topology .inner h3 {
   display: flex;
@@ -179,6 +182,7 @@
 .userActivity {
   /* min-height: 35.8rem; */
   height: 54.6%;
+  flex: 1;
 }
 .userActivity .inner .chart {
   width: 100%;
@@ -259,6 +263,7 @@
 .alarmType {
   /* min-height: 25rem; */
   height: 46%;
+  flex: 1;
 }
 .alarmType .inner .chart {
   width: 100%;

src/views/dashboard/overview/hooks/useUPFTotalFlow.ts

@@ -36,11 +36,6 @@ export function upfFlowParse(data: Record<string, string>) {
     upfFlowData.value.lineYDown.shift();
     upfFlowData.value.cap -= 1;
   }
-  // UPF-总流量数0天 当天24小时
-  upfTFParse('0', {
-    up: upfTotalFlow.value['0'].up + +data['UPF.03'],
-    down: upfTotalFlow.value['0'].down + +data['UPF.06'],
-  });
 }
 
 type TFType = {

src/views/dashboard/overview/hooks/useWS.ts

@@ -83,25 +83,25 @@ export default function useWS() {
     }
     switch (data.groupId) {
       // kpiEvent 指标UPF
-      case '12_' + upfWhoId.value:
+      case '10_UPF_' + upfWhoId.value:
         if (data.data) {
           upfFlowParse(data.data);
         }
         break;
       // AMF_UE会话事件
-      case '1010':
+      case '1010_001':
         if (data.data) {
           queue.add(() => eventItemParseAndPush('amf_ue', data.data));
         }
         break;
       // MME_UE会话事件
-      case '1011':
+      case '1011_001':
         if (data.data) {
           queue.add(() => eventItemParseAndPush('mme_ue', data.data));
         }
         break;
       // IMS_CDR会话事件
-      case '1005':
+      case '1005_001':
         if (data.data) {
           queue.add(() => eventItemParseAndPush('ims_cdr', data.data));
         }
@@ -172,7 +172,7 @@ export default function useWS() {
     });
   }
 
-  /**重新发送至UPF 12_neId */
+  /**重新发送至UPF 10_UPF_neId */
   function reSendUPF(neId: string) {
     upfWhoId.value = neId;
     //初始时时无需还原全部属性以及关闭
@@ -188,12 +188,12 @@ export default function useWS() {
       params: {
         /**订阅通道组
          *
-         * 指标UPF (GroupID:12_neId)
+         * 指标UPF (GroupID:10_neType_neId)
          * AMF_UE会话事件(GroupID:1010_neId)
          * MME_UE会话事件(GroupID:1011_neId)
          * IMS_CDR会话事件(GroupID:1005_neId)
          */
-        subGroupID: '12_' + neId + ',1010,1011,1005',
+        subGroupID: '10_UPF_' + neId + ',1010_001,1011_001,1005_001',
       },
       onmessage: wsMessage,
       onerror: (ev: any) => {

src/views/dashboard/overview/index.vue

@@ -213,29 +213,30 @@ function loadData() {
   fnGetNeState(); // 获取网元状态
   userActivitySend();
   upfTFSend('0');
-  upfTFSend('7');
+  // upfTFSend('7');
-  upfTFSend('30');
+  // upfTFSend('30');
 
   clearInterval(interval10s.value);
-  interval10s.value = setInterval(() => {
+  // interval10s.value = setInterval(() => {
-    if (!interval10s.value || !initFlag) return;
+  //   if (!interval10s.value || !initFlag) return;
-    if (upfTFActive.value === '0') {
+  //   if (upfTFActive.value === '0') {
-      upfTFSend('7');
+  //     upfTFSend('7');
-      upfTFActive.value = '7';
+  //     upfTFActive.value = '7';
-    } else if (upfTFActive.value === '7') {
+  //   } else if (upfTFActive.value === '7') {
-      upfTFSend('30');
+  //     upfTFSend('30');
-      upfTFActive.value = '30';
+  //     upfTFActive.value = '30';
-    } else if (upfTFActive.value === '30') {
+  //   } else if (upfTFActive.value === '30') {
-      upfTFSend('0');
+  //     upfTFSend('0');
-      upfTFActive.value = '0';
+  //     upfTFActive.value = '0';
-    }
+  //   }
-  }, 10_000);
+  // }, 10_000);
 
   clearInterval(interval5s.value);
   interval5s.value = setInterval(() => {
     if (!interval5s.value || !initFlag) return;
     fnGetSkim(); // 获取概览信息
     fnGetNeState(); // 获取网元状态
+    upfTFSend('0');
   }, 5_000);
 }
 
@@ -377,6 +378,7 @@ onBeforeUnmount(() => {
               @click="fnToRouter('Ims_2080')"
               :title="t('views.dashboard.overview.toRouter')"
               style="margin: 0 12px"
+              v-perms:has="['dashboard:overview:imsUeNum']"
             >
               <div>
                 <img :src="svgUserIMS" style="width: 18px; margin-right: 8px" />
@@ -390,6 +392,7 @@ onBeforeUnmount(() => {
               class="item toRouter"
               @click="fnToRouter('Ue_2081')"
               :title="t('views.dashboard.overview.toRouter')"
+              v-perms:has="['dashboard:overview:gnbBase']"
             >
               <div>
                 <img :src="svgUserSMF" style="width: 18px; margin-right: 8px" />
@@ -402,7 +405,7 @@ onBeforeUnmount(() => {
           </div>
         </div>
       </div>
-      <div class="skim panel base">
+      <div class="skim panel base" v-perms:has="['dashboard:overview:gnbBase']">
         <div class="inner">
           <h3>
             <GlobalOutlined style="color: #68d8fe" />&nbsp;&nbsp; 5G
@@ -439,7 +442,7 @@ onBeforeUnmount(() => {
           </div>
         </div>
       </div>
-      <div class="skim panel base">
+      <div class="skim panel base" v-perms:has="['dashboard:overview:enbBase']">
         <div class="inner">
           <h3>
             <GlobalOutlined style="color: #68d8fe" />&nbsp;&nbsp; 4G
@@ -558,7 +561,7 @@ onBeforeUnmount(() => {
               <span
                 :data-key="v"
                 :class="{ active: upfTFActive === v }"
-                v-for="v in ['0', '7', '30']"
+                v-for="v in ['0']"
                 :key="v"
                 @click="
                   () => {

src/views/dashboard/sgwcCDR/index.vue

@@ -427,7 +427,7 @@ function fnRealTime() {
       params: {
         /**订阅通道组
          *
-         * CDR会话事件-SGWC (GroupID:1008)
+         * CDR会话事件-SGWC (GroupID:1008_neId)
          */
         subGroupID: `1008_${queryParams.neId}`,
       },

src/views/system/menu/index.vue

@@ -463,7 +463,7 @@ function fnGetList() {
   if (tableState.loading) return;
   tableState.loading = true;
   listMenu(toRaw(queryParams)).then(res => {
-    if (res.code === RESULT_CODE_SUCCESS) { 
+    if (res.code === RESULT_CODE_SUCCESS) {
       menuListData = JSON.parse(JSON.stringify(res.data));
       // 初始上级菜单和展开编号key
       if (treeDataAll.length <= 0) {
@@ -813,7 +813,10 @@ onMounted(() => {
             :xs="24"
             v-if="modalState.from.menuType !== MENU_TYPE_BUTTON"
           >
-            <a-form-item :label="t('views.system.menu.routerAdrr')" name="menuPath">
+            <a-form-item
+              :label="t('views.system.menu.routerAdrr')"
+              name="menuPath"
+            >
               {{ modalState.from.menuPath }}
             </a-form-item>
           </a-col>
@@ -1125,6 +1128,19 @@ onMounted(() => {
             </a-form-item>
           </a-col>
         </a-row>
+        <a-form-item
+          :label="t('views.system.menu.menuStatus')"
+          name="statusFlag"
+          :label-col="{ span: 3 }"
+          v-if="modalState.from.menuType === MENU_TYPE_BUTTON"
+        >
+          <a-select
+            v-model:value="modalState.from.statusFlag"
+            default-value="0"
+            :options="dict.sysNormalDisable"
+          >
+          </a-select>
+        </a-form-item>
 
         <a-form-item
           :label="t('views.system.menu.formLoc')"