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

src/views/dashboard/smfCDR/index.vue

@@ -101,7 +101,7 @@ let tableColumns: ColumnsType = [
     },
   },
   {
-    title: t('views.dashboard.cdr.smfSubscriptionIDType'), // 用户 ID 类型
+    title: t('views.dashboard.cdr.smfSubscriptionIDType'), // 订阅 ID 类型
     dataIndex: 'cdrJSON',
     align: 'left',
     width: 150,
@@ -111,7 +111,7 @@ let tableColumns: ColumnsType = [
     },
   },
   {
-    title: t('views.dashboard.cdr.smfSubscriptionIDData'), // 用户 ID 数据
+    title: t('views.dashboard.cdr.smfSubscriptionIDData'), // 订阅 ID 数据
     dataIndex: 'cdrJSON',
     align: 'left',
     width: 150,

src/views/ne/neInfo/components/EditModal.vue

@@ -223,12 +223,6 @@ function fnModalVisibleByEdit(editId: string) {
       modalState.confirmLoading = false;
       hide();
       if (res.code === RESULT_CODE_SUCCESS) {
-        // OMC没有telnet
-        if (res.data.neType === 'OMC') {
-          res.data.hosts = res.data.hosts.filter(
-            (s: any) => s.hostType === 'ssh'
-          );
-        }
         Object.assign(modalState.from, res.data);
         modalState.title = t('views.ne.neInfo.editTitle');
         modalState.visibleByEdit = true;
@@ -292,10 +286,6 @@ function fnModalCancel() {
  */
 function fnNeTypeChange(v: any) {
   const hostsLen = modalState.from.hosts.length;
-  // OMC没有telnet
-  if (hostsLen >= 2 && v === 'OMC') {
-    modalState.from.hosts.splice(1, hostsLen);
-  }
   // 网元默认只含22和4100
   if (hostsLen === 3 && v !== 'UPF') {
     modalState.from.hosts.pop();
@@ -626,7 +616,9 @@ onMounted(() => {
       </a-divider>
       <a-collapse class="collapse" ghost>
         <a-collapse-panel
-          v-for="host in modalState.from.hosts"
+          v-for="host in modalState.from.hosts.filter(
+            (s:any) => !(s.hostType === 'telnet' &&  modalState.from.neType === 'OMC')
+          )"
           :key="host.title"
           :header="`${host.hostType.toUpperCase()} ${host.port}`"
         >

src/views/ne/neSoftware/index.vue

@@ -434,8 +434,13 @@ onMounted(() => {
             "
           >
             <template #icon><UploadOutlined /></template>
-            {{ t('views.ne.neSoftware.uploadBatch') }}
-            {{ tableState.selectedRowOne.neType }}
+            <template v-if="tableState.selectedRowOne.neType">
+              {{ t('views.ne.neSoftware.upload') }}
+              {{ tableState.selectedRowOne.neType }}
+            </template>
+            <template v-else>
+              {{ t('views.ne.neSoftware.uploadBatch') }}
+            </template>
           </a-button>
           <a-button
             type="default"

src/views/ne/neVersion/index.vue

@@ -528,8 +528,13 @@ onMounted(() => {
             "
           >
             <template #icon><UploadOutlined /></template>
-            {{ t('views.ne.neSoftware.uploadBatch') }}
-            {{ tableState.selectedRowOne.neType }}
+            <template v-if="tableState.selectedRowOne.neType">
+              {{ t('views.ne.neSoftware.upload') }}
+              {{ tableState.selectedRowOne.neType }}
+            </template>
+            <template v-else>
+              {{ t('views.ne.neSoftware.uploadBatch') }}
+            </template>
           </a-button>
           <a-button
             type="primary"

src/views/neUser/ue/index.vue

@@ -25,7 +25,7 @@ let queryParams = reactive({
   /**当前页数 */
   pageNum: 1,
   /**每页条数 */
-  pageSize: 20,
+  pageSize: 50,
 });
 
 /**查询参数重置 */
@@ -34,10 +34,10 @@ function fnQueryReset() {
     imsi: '',
     msisdn: '',
     pageNum: 1,
-    pageSize: 20,
+    pageSize: 50,
   });
   tablePagination.current = 1;
-  tablePagination.pageSize = 20;
+  tablePagination.pageSize = 50;
   fnGetList();
 }
 
@@ -59,7 +59,7 @@ type TabeStateType = {
 let tableState: TabeStateType = reactive({
   loading: false,
   size: 'middle',
-  seached: false,
+  seached: true,
   data: [],
   selectedRowKeys: [],
 });
@@ -130,17 +130,13 @@ let tablePagination = reactive({
   /**当前页数 */
   current: 1,
   /**每页条数 */
-  pageSize: 20,
-  /**默认的每页条数 */
-  defaultPageSize: 20,
-  /**指定每页可以显示多少条 */
-  pageSizeOptions: ['10', '20', '50', '100'],
+  pageSize: 50,
   /**只有一页时是否隐藏分页器 */
   hideOnSinglePage: false,
   /**是否可以快速跳转至某页 */
   showQuickJumper: true,
   /**是否可以改变 pageSize */
-  showSizeChanger: true,
+  showSizeChanger: false,
   /**数据总数 */
   total: 0,
   showTotal: (total: number) => t('common.tablePaginationTotal', { total }),

src/views/system/quick-start/components/NeInfoSoftwareInstall.vue

@@ -284,7 +284,7 @@ onMounted(() => {
           "
         >
           <template #icon><UploadOutlined /></template>
-          {{ t('views.ne.neSoftware.uploadBatch') }}
+          {{ t('views.ne.neSoftware.upload') }}
           {{ state.selectedRowOne.neType }}
         </a-button>
 

src/views/system/quick-start/components/NeInfoSoftwareLicense.vue

@@ -296,7 +296,7 @@ onMounted(() => {
           @click.prevent="fnModalOpen"
         >
           <template #icon><UploadOutlined /></template>
-          {{ t('views.ne.neLicense.uploadBatch') }}
+          {{ t('views.ne.neLicense.uploadFile') }}
         </a-button>
 
         <a-button