ref: v3变更,，表结构对应相关接口功能

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

@@ -16,7 +16,6 @@ import { regExpIPv4, regExpIPv6 } from '@/utils/regular-utils';
 import { fnToStepName } from '../hooks/useStep';
 import useI18n from '@/hooks/useI18n';
 import useDictStore from '@/store/modules/dict';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 
 const { getDict } = useDictStore();
 const { t } = useI18n();
@@ -74,7 +73,6 @@ let modalState: ModalStateType = reactive({
     id: undefined,
     neType: '',
     neUid: '',
-    coreUid: currentCoreUid(),
     neName: '',
     ipAddr: '',
     port: 33030,
@@ -234,7 +232,6 @@ function fnModalVisibleByEdit(record?: Record<string, any>) {
     modalState.title = t('views.ne.neInfo.addTitle');
     modalState.from = {
       id: undefined,
-      coreUid: currentCoreUid(),
       neUid: '',
       neType: '',
       neName: '',
@@ -282,7 +279,7 @@ function fnModalVisibleByEdit(record?: Record<string, any>) {
     const hide = message.loading(t('common.loading'), 0);
     modalState.confirmLoading = true;
 
-    getNeInfo(currentCoreUid(), record.id).then(res => {
+    getNeInfo(record.id).then(res => {
       modalState.confirmLoading = false;
       hide();
       if (res.code === RESULT_CODE_SUCCESS) {
@@ -335,7 +332,6 @@ function fnDelete(row: Record<string, any>) {
       tableState.loading = true;
       const hide = message.loading(t('common.loading'), 0);
       delNeInfo({
-        coreUid: row.coreUid,
         neUid: row.neUid,
         id: row.id,
       })
@@ -481,7 +477,6 @@ function save(key: string) {
 /**获取列表 */
 function fnGetList() {
   listAllNeInfo({
-    coreUid: currentCoreUid(),
     bandHost: true,
   }).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {

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

@@ -3,11 +3,10 @@ import { Modal, message } from 'ant-design-vue/es';
 import { onMounted, reactive, toRaw } from 'vue';
 import { fnToStepName } from '../hooks/useStep';
 import useI18n from '@/hooks/useI18n';
-import { listAllNeInfo,  updateNeInfo } from '@/api/ne/neInfo';
+import { listAllNeInfo, updateNeInfo } from '@/api/ne/neInfo';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import Para5GForm from '@/views/ne/neQuickSetup/components/Para5GForm.vue';
 import { getPara5GFilee, savePara5GFile } from '@/api/ne/neAction';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 
 /**对象信息信息状态类型 */
@@ -76,7 +75,6 @@ function fnGetList() {
   Promise.all([
     getPara5GFilee(),
     listAllNeInfo({
-      coreUid: currentCoreUid(),
       bandStatus: false,
     }),
   ]).then(resArr => {

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

@@ -8,7 +8,6 @@ import useDictStore from '@/store/modules/dict';
 import { listNeVersion, operateNeVersion } from '@/api/ne/neVersion';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { NE_TYPE_LIST } from '@/constants/ne-constants';
-import { currentCoreUid } from '@/hooks/useCoreUid';
 const { t } = useI18n();
 const { getDict } = useDictStore();
 
@@ -153,7 +152,6 @@ async function fnRecordInstall() {
   for (const row of selectRows) {
     if (row.newVersion === '-' || row.newVersion === '') {
       state.operateDataUpgrade.push({
-        coreUid: row.coreUid,
         neType: row.neType,
         neUid: row.neUid,
         status: 'fail',
@@ -167,7 +165,6 @@ async function fnRecordInstall() {
       preinput = { pisCSCF: 'y', updateMFetc: 'No', updateMFshare: 'No' };
     }
     const installData = {
-      coreUid: row.coreUid,
       neType: row.neType,
       neUid: row.neUid,
       action: 'install',
@@ -177,7 +174,6 @@ async function fnRecordInstall() {
     try {
       const res = await operateNeVersion(installData);
       const operateData = {
-        coreUid: row.coreUid,
         neType: row.neType,
         neUid: row.neUid,
         status: 'fail',
@@ -204,7 +200,6 @@ async function fnRecordInstall() {
 function fnGetList() {
   state.loading = true;
   listNeVersion({
-    coreUid: currentCoreUid(),
     checkVersion: false,
     pageNum: 1,
     pageSize: 50,

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

@@ -5,17 +5,12 @@ import { fnToStepName, stepState } from '../hooks/useStep';
 import useI18n from '@/hooks/useI18n';
 import useDictStore from '@/store/modules/dict';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import {
-  codeNeLicense,
-  listNeLicense,
-  stateNeLicense,
-} from '@/api/ne/neLicense';
 import saveAs from 'file-saver';
-import { currentCoreUid } from '@/hooks/useCoreUid';
+import { codeNeLicense, getNeInfo, listAllNeInfo } from '@/api/ne/neInfo';
 const { t } = useI18n();
 const { getDict } = useDictStore();
 const UploadLicenseFile = defineAsyncComponent(
-  () => import('@/views/ne/neLicense/components/UploadLicenseFile.vue')
+  () => import('@/views/ne/neLicense/components/LicenseUpdateMore.vue')
 );
 
 /**字典数据-状态 */
@@ -54,6 +49,18 @@ let tableColumns = ref<TableColumnsType>([
     align: 'left',
     width: 100,
   },
+  {
+    title: t('views.ne.common.ueNumber'),
+    dataIndex: 'ueNumber',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.ne.common.nbNumber'),
+    dataIndex: 'nbNumber',
+    align: 'left',
+    width: 100,
+  },
 ]);
 
 /**对象信息信息状态类型 */
@@ -129,11 +136,13 @@ function fnRecordState() {
         if (row.neType.toUpperCase() === 'OMC') {
           continue;
         }
-        const res = await stateNeLicense(row.coreUid, row.neUid);
+        const res = await getNeInfo(row.id);
         if (res.code === RESULT_CODE_SUCCESS && res.data) {
           row.status = '1';
           row.serialNum = res.data.sn;
           row.expiryDate = res.data.expire;
+          row.ueNumber = res.data.ueNumber;
+          row.nbNumber = res.data.nbNumber;
         } else {
           row.status = '0';
         }
@@ -164,7 +173,7 @@ function fnRecordCode() {
         if (row.neType.toUpperCase() === 'OMC') {
           continue;
         }
-        const res = await codeNeLicense(row.coreUid, row.neUid);
+        const res = await codeNeLicense(row.neUid);
         if (res.code === RESULT_CODE_SUCCESS) {
           const activationRequestCode = res.data;
           row.activationRequestCode = activationRequestCode;
@@ -190,10 +199,8 @@ function fnRecordCode() {
 /**获取列表 */
 function fnGetList() {
   state.loading = true;
-  listNeLicense({
-    coreUid: currentCoreUid(),
-    pageNum: 1,
-    pageSize: 50,
+  listAllNeInfo({
+    bandHost: true,
   }).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       // 取消勾选