Merge remote-tracking branch 'origin/lichang' into lite

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

@@ -248,15 +248,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) => {
@@ -392,7 +385,7 @@ onBeforeUnmount(() => {
               class="item toRouter"
               @click="fnToRouter('Ue_2081')"
               :title="t('views.dashboard.overview.toRouter')"
-              v-perms:has="['dashboard:overview:gnbBase']"
+              v-perms:has="['dashboard:overview:smfUeNum']"
             >
               <div>
                 <img :src="svgUserSMF" style="width: 18px; margin-right: 8px" />
@@ -507,7 +500,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"

src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue

@@ -121,7 +121,7 @@ function fnTableSelectedRowKeys(
 ) {
   tableState.selectedRowKeys = keys;
   // 选择的表单数据填充
-  Object.assign(state.from, selectedRows[0], { id: '' });
+  Object.assign(state.from, selectedRows[0], { id: undefined });
 }
 
 /**查询列表, pageNum初始页数 */
@@ -205,7 +205,7 @@ function fnModalOpen() {
 
 /**对话框弹出确认执行函数*/
 function fnModalOk(e: any) {
-  Object.assign(state.from, e, { id: '' });
+  Object.assign(state.from, e, { id: undefined });
 }
 
 /**对话框弹出关闭执行函数*/