diff --git a/src/views/tool/neQuickSetup/components/StepActivate.vue b/src/views/tool/neQuickSetup/components/StepActivate.vue index f6fa692e..cc4c8f91 100644 --- a/src/views/tool/neQuickSetup/components/StepActivate.vue +++ b/src/views/tool/neQuickSetup/components/StepActivate.vue @@ -1,5 +1,5 @@ - - - - - - - - - - - {{ configState.selected.title }} - - | 最近保存: {{ saveState.saveTime }} - - - - - + + 网管端配置 + {{ configState.oam }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 保存配置 + + + - + diff --git a/src/views/tool/neQuickSetup/components/StepConfigIMS.vue b/src/views/tool/neQuickSetup/components/StepConfigIMS.vue new file mode 100644 index 00000000..6f620f96 --- /dev/null +++ b/src/views/tool/neQuickSetup/components/StepConfigIMS.vue @@ -0,0 +1,242 @@ + + + + + 网管端配置 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 保存配置 + + + + + + diff --git a/src/views/tool/neQuickSetup/components/StepConfigSMF.vue b/src/views/tool/neQuickSetup/components/StepConfigSMF.vue new file mode 100644 index 00000000..694dc6ed --- /dev/null +++ b/src/views/tool/neQuickSetup/components/StepConfigSMF.vue @@ -0,0 +1,310 @@ + + + + + 网管端配置 + + + + + + + + + + + + + + + + + + + + + + + + + + 网元端配置 + + + + + + + + + + + + + + + + + + + + + + + + 保存配置 + + + + + + diff --git a/src/views/tool/neQuickSetup/components/StepConfigText.vue b/src/views/tool/neQuickSetup/components/StepConfigText.vue new file mode 100644 index 00000000..928a093a --- /dev/null +++ b/src/views/tool/neQuickSetup/components/StepConfigText.vue @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + {{ configState.selected.title }} + + | 最近保存: {{ saveState.saveTime }} + + + + + + + + diff --git a/src/views/tool/neQuickSetup/components/StepInstall.vue b/src/views/tool/neQuickSetup/components/StepInstall.vue index 4b21efd6..7e7b99f4 100644 --- a/src/views/tool/neQuickSetup/components/StepInstall.vue +++ b/src/views/tool/neQuickSetup/components/StepInstall.vue @@ -1,22 +1,17 @@ @@ -515,8 +446,8 @@ onMounted(() => { { }" > - + {{ record.path }} - {{ record.fileName }} + {{ record.name }} - + - {{ record.comment }} - {{ record.comment }} + {{ record.description }} + {{ record.description }} @@ -659,7 +590,7 @@ onMounted(() => { 开始安装 @@ -669,7 +600,7 @@ onMounted(() => { ---- 安装进行信息 - + { :wrapper-col="{ span: 24 }" :label-wrap="true" > - - + 返回重新选择安装 diff --git a/src/views/tool/neQuickSetup/components/StepNeInfo.vue b/src/views/tool/neQuickSetup/components/StepNeInfo.vue index 2b10c43e..6431d213 100644 --- a/src/views/tool/neQuickSetup/components/StepNeInfo.vue +++ b/src/views/tool/neQuickSetup/components/StepNeInfo.vue @@ -8,7 +8,6 @@ import { addNeInfo, updateNeInfo, getTypeAndIDNeInfo } from '@/api/ne/neInfo'; import { NE_TYPE_LIST } from '@/constants/ne-constants'; import { stepState } from '../hooks/useStep'; const { t } = useI18n(); -const emit = defineEmits(['next']); /**对话框对象信息状态类型 */ type ModalStateType = { @@ -204,14 +203,22 @@ function fnNeInfo() { onMounted(() => { // 读取步骤:环境检查 - const stepPrevFrom = stepState.states[0].from; - modalState.from.ip = stepPrevFrom.addr; - Object.assign(modalState.from.hosts[0], stepPrevFrom); - Object.assign(modalState.from.hosts[1], { - addr: stepPrevFrom.addr, - user: 'admin', - password: 'admin', - }); + const stepPrevFrom = stepState.states[0]; + if (stepPrevFrom && stepPrevFrom.from) { + modalState.from.ip = stepPrevFrom.from.addr; + Object.assign(modalState.from.hosts[0], stepPrevFrom.from); + Object.assign(modalState.from.hosts[1], { + addr: modalState.from.ip, + user: 'admin', + password: 'admin', + }); + } + + // 读取步骤:网元信息 + const stepCurrentFrom = stepState.states[1]; + if (stepCurrentFrom && stepCurrentFrom.from) { + Object.assign(modalState.from, stepCurrentFrom.from); + } }); diff --git a/src/views/tool/neQuickSetup/index.vue b/src/views/tool/neQuickSetup/index.vue index e46f2d8f..8a216c5a 100644 --- a/src/views/tool/neQuickSetup/index.vue +++ b/src/views/tool/neQuickSetup/index.vue @@ -1,13 +1,75 @@ @@ -66,12 +128,7 @@ import { stepState, fnStepPrev, fnStepNext } from './hooks/useStep'; - - - - - - +