From 5a621053a48e3f109b041a9d0cf7cefc8ef9d039 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 16 Oct 2024 16:46:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E5=85=83=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E9=85=8D=E7=BD=AEUDM=E6=94=AF=E6=8C=81Redis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/en-US.ts | 7 +- src/i18n/locales/zh-CN.ts | 5 +- src/views/ne/neInfo/components/EditModal.vue | 74 ++++++++++++++++--- .../neQuickSetup/components/NeInfoConfig.vue | 20 ++++- .../quick-start/components/NeInfoConfig.vue | 28 +++++-- 5 files changed, 109 insertions(+), 25 deletions(-) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index d1ae436c..3c761433 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -685,11 +685,12 @@ export default { addrPlease: "Please fill in the host IP address correctly", port: "Port", portPlease: "Please fill in the host port number correctly", - user: "Login User", - userPlease: "Please fill in the host login user correctly", + user: "User", + userPlease: "Please fill in the host user correctly", + database: "DataBase", authMode: "Auth Mode", password: "Password", - passwordPlease: "Please fill in the host login password correctly", + passwordPlease: "Please fill in the host password correctly", privateKey: "Private Key", privateKeyPlease: "Please fill in the private key characters correctly ~/.ssh/id_rsa", passPhrase: "Private Key Cipher", diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 687b2c27..69369e45 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -686,10 +686,11 @@ export default { port: "端口", portPlease: "请正确填写主机端口号", user: "用户名", - userPlease: "请正确填写主机登录用户", + userPlease: "请正确填写主机用户", + database: "数据库", authMode: "认证模式", password: "密码", - passwordPlease: "请正确填写主机登录密码", + passwordPlease: "请正确填写主机密码", privateKey: "私钥", privateKeyPlease: "请正确填写私钥字符内容 ~/.ssh/id_rsa", passPhrase: "私钥密码", diff --git a/src/views/ne/neInfo/components/EditModal.vue b/src/views/ne/neInfo/components/EditModal.vue index d7f55748..b28b5142 100644 --- a/src/views/ne/neInfo/components/EditModal.vue +++ b/src/views/ne/neInfo/components/EditModal.vue @@ -40,7 +40,7 @@ let dict: { * 测试主机连接 */ function fnHostTest(row: Record) { - if (modalState.confirmLoading || !row.addr) return; + if (modalState.confirmLoading || !row.addr || !row.port) return; modalState.confirmLoading = true; const hide = message.loading(t('common.loading'), 0); testNeHost(row) @@ -124,8 +124,8 @@ let modalState: ModalStateType = reactive({ addr: '', port: 22, user: 'omcuser', - authMode: '0', - password: 'a9tU53r', + authMode: '2', + password: '', privateKey: '', passPhrase: '', remark: '', @@ -283,11 +283,11 @@ function fnModalCancel() { /**表单修改网元类型 */ function fnNeTypeChange(v: any) { - const hostsLen = modalState.from.hosts.length; // 网元默认只含22和4100 - if (hostsLen === 3 && v !== 'UPF') { + if (modalState.from.hosts.length === 3) { modalState.from.hosts.pop(); } + const hostsLen = modalState.from.hosts.length; // UPF标准版本可支持5002 if (hostsLen === 2 && v === 'UPF') { modalState.from.hosts.push({ @@ -295,11 +295,27 @@ function fnNeTypeChange(v: any) { hostType: 'telnet', groupId: '1', title: 'Telnet_NE_5002', - addr: '', + addr: modalState.from.ip, port: 5002, - user: 'user', + user: 'admin', authMode: '0', - password: 'user', + password: 'admin', + remark: '', + }); + } + // UDM可支持6379 + if (hostsLen === 2 && v === 'UDM') { + modalState.from.hosts.push({ + hostId: undefined, + hostType: 'redis', + groupId: '1', + title: 'REDIS_NE_6379', + addr: modalState.from.ip, + port: 6379, + user: 'udmdb', + authMode: '0', + password: 'helloearth', + dbName: '0', remark: '', }); } @@ -626,8 +642,13 @@ onMounted(() => { (s:any) => !(s.hostType === 'telnet' && modalState.from.neType === 'OMC') )" :key="host.title" - :header="`${host.hostType.toUpperCase()} ${host.port}`" > + @@ -654,7 +675,22 @@ onMounted(() => { - + + + + + + { v-model:value="host.authMode" default-value="0" :options="dict.neHostAuthMode" - :disabled="host.hostType === 'telnet'" > @@ -692,7 +727,6 @@ onMounted(() => { > - + + + + + { /> + ) { - if (tabState.confirmLoading || !row.addr) return; + if (tabState.confirmLoading || !row.addr || !row.port) return; tabState.confirmLoading = true; const hide = message.loading(t('common.loading'), 0); testNeHost(row) @@ -187,19 +187,19 @@ function fnHostAuthorized(row: Record) { * 表单修改网元类型 */ function fnNeTypeChange(v: any, data: any) { - const hostsLen = data.hosts.length; // 网元默认只含22和4100 - if (hostsLen === 3 && v !== 'UPF') { - data.hosts.pop(); + if (modalState.from.hosts.length === 3) { + modalState.from.hosts.pop(); } + const hostsLen = modalState.from.hosts.length; // UPF标准版本可支持5002 if (hostsLen === 2 && v === 'UPF') { - data.hosts.push({ + modalState.from.hosts.push({ hostId: undefined, hostType: 'telnet', groupId: '1', title: 'Telnet_NE_5002', - addr: '', + addr: modalState.from.ip, port: 5002, user: 'admin', authMode: '0', @@ -207,6 +207,22 @@ function fnNeTypeChange(v: any, data: any) { remark: '', }); } + // UDM可支持6379 + if (hostsLen === 2 && v === 'UDM') { + modalState.from.hosts.push({ + hostId: undefined, + hostType: 'redis', + groupId: '1', + title: 'REDIS_NE_6379', + addr: modalState.from.ip, + port: 6379, + user: 'udmdb', + authMode: '0', + password: 'helloearth', + dbName: '0', + remark: '', + }); + } } //打开新增或修改界面