ref: v3变更,，同步v2.2508.4

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

@@ -16,6 +16,7 @@ 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();
@@ -77,8 +78,8 @@ let modalState: ModalStateType = reactive({
     ip: '',
     port: 33030,
     pvFlag: 'PNF',
-    rmUid: '',
-    neAddress: '',
+    coreUid: currentCoreUid(),
+    macAddr: '',
     dn: '-',
     vendorName: '-',
     province: 'Area',
@@ -106,7 +107,7 @@ let tableColumns: any = [
     width: 100,
   },
   {
-    title: t('views.ne.common.neId'),
+    title: t('views.ne.common.neUid'),
     dataIndex: 'neId',
     align: 'left',
     width: 150,
@@ -241,7 +242,7 @@ function fnModalVisibleByEdit(record?: any) {
       port: 33030,
       pvFlag: 'PNF',
       rmUid: `4400HXNew${neId}`,
-      neAddress: '',
+      macAddr: '',
       dn: '-',
       vendorName: '-',
       province: 'Area',
@@ -479,6 +480,7 @@ function save(key: string) {
 /**获取列表 */
 function fnGetList() {
   listAllNeInfo({
+    coreUid: currentCoreUid(),
     bandHost: true,
   }).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
@@ -653,7 +655,7 @@ onMounted(() => {
                     <template #title>
                       {{ t('views.ne.common.neTypeTip') }}
                     </template>
-                    <InfoCircleOutlined style="opacity: 0.45; color: inherit;" />
+                    <InfoCircleOutlined style="opacity: 0.45; color: inherit" />
                   </a-tooltip>
                 </template>
               </a-input>
@@ -663,25 +665,25 @@ onMounted(() => {
 
         <a-col :lg="12" :md="12" :xs="24">
           <a-form-item
-            :label="t('views.ne.common.neId')"
+            :label="t('views.ne.common.neUid')"
             name="neId"
             :rules="{
               required: true,
-              message: t('views.ne.common.neIdPlease'),
+              message: t('views.ne.common.neUidPlease'),
             }"
           >
             <a-input
               v-model:value="modalState.from.neId"
               allow-clear
-              :placeholder="t('views.ne.common.neIdPlease')"
+              :placeholder="t('views.ne.common.neUidPlease')"
               :maxlength="24"
             >
               <template #prefix>
                 <a-tooltip placement="topLeft">
                   <template #title>
-                    {{ t('views.ne.common.neIdTip') }}
+                    {{ t('views.ne.common.neUidTip') }}
                   </template>
-                  <InfoCircleOutlined style="opacity: 0.45; color: inherit;" />
+                  <InfoCircleOutlined style="opacity: 0.45; color: inherit" />
                 </a-tooltip>
               </template>
             </a-input>
@@ -717,7 +719,7 @@ onMounted(() => {
                       {{ t('views.ne.common.ipAddrTip') }}
                     </div>
                   </template>
-                  <InfoCircleOutlined style="opacity: 0.45; color: inherit;" />
+                  <InfoCircleOutlined style="opacity: 0.45; color: inherit" />
                 </a-tooltip>
               </template>
             </a-input>

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

@@ -3,14 +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 {
-  listNeInfo,
-  getPara5GFilee,
-  savePara5GFile,
-  updateNeInfo,
-} from '@/api/ne/neInfo';
+import { listNeInfo, 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';
 const { t } = useI18n();
 
 /**对象信息信息状态类型 */

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

@@ -27,7 +27,7 @@ let tableColumns = ref<TableColumnsType>([
     width: 100,
   },
   {
-    title: t('views.ne.common.neId'),
+    title: t('views.ne.common.neUid'),
     dataIndex: 'neId',
     align: 'left',
     width: 100,

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

@@ -29,7 +29,7 @@ let tableColumns = ref<TableColumnsType>([
     width: 100,
   },
   {
-    title: t('views.ne.common.neId'),
+    title: t('views.ne.common.neUid'),
     dataIndex: 'neId',
     align: 'left',
     width: 100,
@@ -128,7 +128,7 @@ function fnRecordState() {
         if (row.neType.toUpperCase() === 'OMC') {
           continue;
         }
-        const res = await stateNeLicense(row.neType, row.neId);
+        const res = await stateNeLicense(row.coreUid, row.neUid);
         if (res.code === RESULT_CODE_SUCCESS && res.data) {
           row.status = '1';
           row.serialNum = res.data.sn;