Merge remote-tracking branch 'origin/main' into practical-training

src/views/ne/neConfPara5G/index.vue

@@ -119,8 +119,8 @@ function fnGetData() {
       for (const item of resArr[1].rows) {
         switch (item.neType) {
           case 'OMC':
-            state.from.sbi.omc_ip = item.ip;
-            Object.assign(state.omcInfo, item);
+            // state.from.sbi.omc_ip = item.ip;
+            Object.assign(state.omcInfo, item); // 主动改OMC_IP
             break;
           case 'IMS':
             state.from.sbi.ims_ip = item.ip;
@@ -204,6 +204,13 @@ onMounted(() => {
 
 <template>
   <PageContainer>
+    <template #content>
+      {{ t('views.ne.neConfPara5G.headerTip') }}
+      <RouterLink :to="{ name: 'NeQuickSetup_2142' }">
+        {{ t('views.ne.neConfPara5G.headerTipToPage') }}
+      </RouterLink>
+    </template>
+
     <a-card :bordered="false">
       <!-- 公共参数表单 -->
       <Para5GForm v-model:data="state.from" :ne="state.hasNE"></Para5GForm>

src/views/system/role/auth-user.vue

@@ -184,7 +184,7 @@ type ModalStateType = {
 /**对话框对象信息状态 */
 let modalState: ModalStateType = reactive({
   visibleBySelectUser: false,
-  title: '选择用户',
+  title: t('views.system.role.distributeUser'),
 });
 
 /**

src/views/system/role/components/auth-user-select.vue

@@ -237,7 +237,6 @@ watch(
 <template>
   <ProModal
     :drag="true"
-    :width="800"
     :destroyOnClose="true"
     :forceFullscreen="true"
     :title="props.title"
@@ -302,7 +301,7 @@ watch(
       :loading="tableState.loading"
       :data-source="tableState.data"
       :size="tableState.size"
-      :scroll="{ scrollToFirstRowOnChange: true, y: 400, x: 600 }"
+      :scroll="{ scrollToFirstRowOnChange: true }"
       :pagination="tablePagination"
       :row-selection="{
         type: 'checkbox',