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

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

@@ -178,7 +178,7 @@ export default function useWS() {
     //初始时时无需还原全部属性以及关闭
     if (ws.state() === WebSocket.OPEN) {
       ws.close();
-      userActivityReset();
+      // userActivityReset();
       upfTotalFlowReset();
       neStateRequestMap.value = new Map();
       //topologyReset();

src/views/dashboard/overview/index.vue

@@ -235,15 +235,8 @@ function fnToRouter(name: string, query?: any) {
 /**网元参数 */
 let neOtions = ref<Record<string, any>[]>([]);
 
-/**UPF网元Id */
-let queryParams = reactive({
-  /**45G类型 */
-  neRealId: '',
-});
-
 // UPF实时流量下拉框选择
 function fnSelectNe(value: any, option: any) {
-  queryParams.neRealId = value;
   upfWhoId.value = value;
   reSendUPF(value);
   // upfTotalFlow.value.map((item: any) => {
@@ -492,7 +485,7 @@ onBeforeUnmount(() => {
               t('views.dashboard.overview.upfFlow.title')
             }}</span>
             <a-select
-              v-model:value="queryParams.neRealId"
+              v-model:value="upfWhoId"
               :options="neOtions"
               :get-Popup-Container="getPopupContainer"
               class="toDeep"
@@ -546,7 +539,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="
                   () => {