diff --git a/src/views/tool/neQuickSetup/components/StepCheck.vue b/src/views/tool/neQuickSetup/components/StepCheck.vue index f477ba72..527f48ca 100644 --- a/src/views/tool/neQuickSetup/components/StepCheck.vue +++ b/src/views/tool/neQuickSetup/components/StepCheck.vue @@ -1,18 +1,13 @@ @@ -391,200 +480,225 @@ onMounted(() => { name="installStateFrom" layout="horizontal" :label-col="{ span: 3 }" + :wrapper-col="{ span: 8 }" :label-wrap="true" > - - ---- 安装软件包 + + + - - - - - {{ t('views.configManage.neManage.neTypeTip') }} - - - - - - - - - - - 新上传 - 已上传 - - - - - - - + + + + + {{ t('views.configManage.neManage.neTypeTip') }} + + + + + + - - - - - + - - {{ t('views.configManage.softwareManage.selectFile') }} - - + 新上传 + 已上传 + - - - - - + + - - - - {{ record.path }} - {{ record.fileName }} - + + + + + + + + + {{ t('views.configManage.softwareManage.selectFile') }} + + + + + + + + + + + + + {{ record.path }} + {{ record.fileName }} + + + + + {{ record.comment }} + {{ record.comment }} + + - - - {{ record.comment }} - {{ record.comment }} - - - - + + + + + + + + 安装检查 + + + + 安装检查 + - - + --- 安装前预输入 + + + + ----- + + + - 进行安装 + 开始安装 - - 重置 + + + + ---- 安装进行信息 + + + + + + + + + + 返回重新选择安装 - - - 进行安装 - - - - --- 安装前预输入 - - - ----- - - - ---- 安装进行日志结果 - - - - - - - - 重新安装 - - + + diff --git a/src/views/tool/neQuickSetup/components/StepNeInfo.vue b/src/views/tool/neQuickSetup/components/StepNeInfo.vue new file mode 100644 index 00000000..c1ce1ea7 --- /dev/null +++ b/src/views/tool/neQuickSetup/components/StepNeInfo.vue @@ -0,0 +1,469 @@ + + + + + + + + + + + + + {{ t('views.configManage.neManage.neTypeTip') }} + + + + + + + + + + + + + PNF + + + VNF + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ t('views.ne.neInfo.ipAddr') }} + + + + + + + + + + + + + + + {{ t('views.configManage.neManage.portTip') }} + + + + + + + + + + + + + + + + {{ t('views.ne.neInfo.rmUID') }} + + + + + + + + + + + + + + + + {{ t('views.configManage.neManage.macTip') }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 检查信息 + + + + + + diff --git a/src/views/tool/neQuickSetup/hooks/useStep.ts b/src/views/tool/neQuickSetup/hooks/useStep.ts index 6c493405..7ba5be6c 100644 --- a/src/views/tool/neQuickSetup/hooks/useStep.ts +++ b/src/views/tool/neQuickSetup/hooks/useStep.ts @@ -23,6 +23,10 @@ export const stepState: StepStateType = reactive({ title: '环境检查', description: '服务器检查,触发免密脚本', }, + { + title: '网元信息', + description: '记录下所安装网元基础信息', + }, { title: '网元安装', description: '安装包上传执行安装启动服务等待10秒停止服务', @@ -44,18 +48,12 @@ export const stepState: StepStateType = reactive({ states: [], }); -export function fnStepNext(e?: any) { - console.log(e); - if (e) { - stepState.states[stepState.current] = e; - stepState.stepNext = true; - return; - } +export function fnStepNext() { stepState.current++; - // stepState.stepNext = false; + stepState.stepNext = false; } export function fnStepPrev() { stepState.current--; - // stepState.stepNext = true; + stepState.stepNext = true; } diff --git a/src/views/tool/neQuickSetup/index.vue b/src/views/tool/neQuickSetup/index.vue index 0d99e5aa..a76a1250 100644 --- a/src/views/tool/neQuickSetup/index.vue +++ b/src/views/tool/neQuickSetup/index.vue @@ -1,20 +1,13 @@ @@ -73,27 +66,12 @@ const router = useRouter(); - fnStepNext(e)" - > - - - - + + + + + +