fix: 网元快速安装页面接口变更

This commit is contained in:
TsMask
2024-04-11 20:09:24 +08:00
parent 2642f18204
commit 47103249ef
3 changed files with 16 additions and 19 deletions

View File

@@ -183,7 +183,7 @@ function fnVerifyTask() {
} }
const { neType, neId } = licenseState.from; const { neType, neId } = licenseState.from;
stateNeLicense(neType, neId).then(res => { stateNeLicense(neType, neId).then(res => {
if (res.code === RESULT_CODE_SUCCESS) { if (res.code === RESULT_CODE_SUCCESS && res.data && res.data.sn) {
message.success(`${neType} ${neId} 网元激活成功`, 3); message.success(`${neType} ${neId} 网元激活成功`, 3);
verifyState.data = res.data; verifyState.data = res.data;
// 记录当前步骤状态信息 // 记录当前步骤状态信息

View File

@@ -140,13 +140,13 @@ function fnCheckInfo() {
}); });
return; return;
} }
if (!res.data.sshLink) { // if (!res.data.sshLink) {
message.warning({ // message.warning({
content: `请配置服务器间免密信任关系,确保服务器间文件传输功能`, // content: `请配置服务器间免密信任关系,确保服务器间文件传输功能`,
duration: 2, // duration: 2,
}); // });
return; // return;
} // }
message.success({ message.success({
content: `${form.addr}:${form.port} ${t('views.ne.neHost.testOk')}`, content: `${form.addr}:${form.port} ${t('views.ne.neHost.testOk')}`,
duration: 2, duration: 2,

View File

@@ -153,14 +153,12 @@ type InstallStateType = {
setp: 'pkg' | 'preinput' | 'log'; setp: 'pkg' | 'preinput' | 'log';
/**步骤日志输出 */ /**步骤日志输出 */
setpLog: string; setpLog: string;
/**主机ID */
hostId: string;
/**文件操作类型 上传 or 选择 */ /**文件操作类型 上传 or 选择 */
optionType: 'upload' | 'option'; optionType: 'upload' | 'option';
/**表单数据 */ /**表单数据 */
from: { from: {
/**网元类型 */
neType: string; neType: string;
neId: string;
name: string; name: string;
path: string; path: string;
version: string; version: string;
@@ -178,10 +176,10 @@ type InstallStateType = {
let installState: InstallStateType = reactive({ let installState: InstallStateType = reactive({
setp: 'pkg', setp: 'pkg',
setpLog: '', setpLog: '',
hostId: '',
optionType: 'upload', optionType: 'upload',
from: { from: {
neType: '', neType: '',
neId: '',
name: '', name: '',
path: '', path: '',
version: '', version: '',
@@ -336,7 +334,6 @@ function fnInstall() {
const hide = message.loading(t('common.loading'), 0); const hide = message.loading(t('common.loading'), 0);
const from = toRaw(installState.from); const from = toRaw(installState.from);
const preinput = toRaw(installState.preinput); const preinput = toRaw(installState.preinput);
Object.assign(from, { hostId: installState.hostId });
installNeSoftware({ installNeSoftware({
software: from, software: from,
preinput: preinput, preinput: preinput,
@@ -374,7 +371,7 @@ onMounted(() => {
const stepPrevFrom = stepState.states[1]; const stepPrevFrom = stepState.states[1];
if (stepPrevFrom && stepPrevFrom.from) { if (stepPrevFrom && stepPrevFrom.from) {
installState.from.neType = stepPrevFrom.from.neType; installState.from.neType = stepPrevFrom.from.neType;
installState.hostId = stepPrevFrom.from.hostIds.split(',')[0]; installState.from.neId = stepPrevFrom.from.neId;
} }
}); });
</script> </script>