Merge branch 'lichang' into lite

src/views/dashboard/overview/index.vue

@@ -245,7 +245,7 @@ function loadData() {
     if (!interval5s.value || !initFlag) return;
     fnGetSkim(); // 获取概览信息
     fnGetNeState(); // 获取网元状态
-  }, 5_000);
+  }, 10_000);
 }
 
 /**栏目信息跳转 */
@@ -371,7 +371,10 @@ onBeforeUnmount(() => {
                 {{ skimState.udmSubNum }}
               </div>
               <span>
-                <a-dropdown :trigger="['click']">
+                <a-dropdown
+                  :trigger="['click']"
+                  :get-Popup-Container="getPopupContainer"
+                >
                   <div class="toDeep-text">
                     {{ t('views.dashboard.overview.skim.users') }}
                     <DownOutlined style="margin-left: 12px; font-size: 12px" />

src/views/traceManage/task/index.vue

@@ -615,7 +615,7 @@ onMounted(() => {
   // 获取网元网元列表
   neCascaderOptions.value = neListStore.getNeCascaderOptions.filter(
     (item: any) => {
-      return ['AMF', 'AUSF', 'SMF', 'UDM', 'PCF'].includes(item.value); // 过滤不可用的网元
+      return ['AMF', 'AUSF', 'SMF', 'UDM', 'PCF', 'UPF'].includes(item.value); // 过滤不可用的网元
     }
   );
   if (neCascaderOptions.value.length === 0) {