diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index d40e3dce..2c0763b9 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -629,6 +629,7 @@ export default { neTypePleace: "Please select the network element type", neIdSyncPleace: "Please select the synchronized network element", noConfigData: "No data on configuration items", + noConfigdDisabled: "The configuration item is not normal", updateValue: "[ {num} ] parameter value modified successfully.", updateValueErr: "Attribute value modification failure", updateItem: "Modify Index to {num}.", @@ -647,12 +648,6 @@ export default { updateItemTip: "Confirm updating the data item with Index [{num}]?", delItemTip: "Confirm deleting the data item with Index [{num}]?", arrayMore: "Expand", - checkSync: { - sync: "Sync", - tip: "Synchronize regional network elements", - title: "Select All/Select None", - selectProvince: "Select", - } }, neConfigBackup: { name: "Name", diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index b0241bde..61beaaad 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -629,6 +629,7 @@ export default { neTypePleace: "请选择网元类型", neIdSyncPleace: "请选择同步网元", noConfigData: "暂无配置项数据", + noConfigdDisabled: "配置项网元未正常服务", updateValue: "【 {num} 】 属性值修改成功", updateValueErr: "属性值修改失败", updateItem: "修改 Index 为 {num} 记录成功", @@ -647,12 +648,6 @@ export default { updateItemTip: "确认更新Index为 【{num}】 的数据项?", delItemTip: "确认删除Index为 【{num}】 的数据项?", arrayMore: "展开", - checkSync: { - sync: "同步", - tip: "同步区域网元", - title: "全选/全不选", - selectProvince: "选择区域", - } }, neConfigBackup: { name: "名称", diff --git a/src/views/ne/neConfig/components/CheckSyncNe/index.vue b/src/views/ne/neConfig/components/CheckSyncNe/index.vue deleted file mode 100644 index 1acf3536..00000000 --- a/src/views/ne/neConfig/components/CheckSyncNe/index.vue +++ /dev/null @@ -1,191 +0,0 @@ - - - - - diff --git a/src/views/ne/neConfig/hooks/useConfigArray.ts b/src/views/ne/neConfig/hooks/useConfigArray.ts index ffe3e946..ea093048 100644 --- a/src/views/ne/neConfig/hooks/useConfigArray.ts +++ b/src/views/ne/neConfig/hooks/useConfigArray.ts @@ -133,17 +133,7 @@ export default function useConfigArray({ // 请求 const reqArr = []; - if (neTypeSelect.value[1] !== 'SYNC') { - reqArr.push( - editNeConfigData({ - neType: neTypeSelect.value[0], - neId: neTypeSelect.value[1], - paramName: treeState.selectNode.paramName, - paramData: data, - loc: loc, - }) - ); - } else { + if (neTypeSelect.value[1].startsWith('SYNC')) { for (const neId of neIdSelect.value) { reqArr.push( editNeConfigData({ @@ -155,6 +145,16 @@ export default function useConfigArray({ }) ); } + } else { + reqArr.push( + editNeConfigData({ + neType: neTypeSelect.value[0], + neId: neTypeSelect.value[1], + paramName: treeState.selectNode.paramName, + paramData: data, + loc: loc, + }) + ); } // 无请求提示 if (reqArr.length === 0) { @@ -207,16 +207,7 @@ export default function useConfigArray({ onOk() { // 请求 const reqArr = []; - if (neTypeSelect.value[1] !== 'SYNC') { - reqArr.push( - delNeConfigData({ - neType: neTypeSelect.value[0], - neId: neTypeSelect.value[1], - paramName: treeState.selectNode.paramName, - loc: loc, - }) - ); - } else { + if (neTypeSelect.value[1].startsWith('SYNC')) { for (const neId of neIdSelect.value) { reqArr.push( delNeConfigData({ @@ -227,6 +218,15 @@ export default function useConfigArray({ }) ); } + } else { + reqArr.push( + delNeConfigData({ + neType: neTypeSelect.value[0], + neId: neTypeSelect.value[1], + paramName: treeState.selectNode.paramName, + loc: loc, + }) + ); } // 无请求提示 if (reqArr.length === 0) { @@ -336,17 +336,7 @@ export default function useConfigArray({ // 请求 const reqArr = []; - if (neTypeSelect.value[1] !== 'SYNC') { - reqArr.push( - addNeConfigData({ - neType: neTypeSelect.value[0], - neId: neTypeSelect.value[1], - paramName: treeState.selectNode.paramName, - paramData: data, - loc: `${from['index']['value']}`, - }) - ); - } else { + if (neTypeSelect.value[1].startsWith('SYNC')) { for (const neId of neIdSelect.value) { reqArr.push( addNeConfigData({ @@ -358,6 +348,16 @@ export default function useConfigArray({ }) ); } + } else { + reqArr.push( + addNeConfigData({ + neType: neTypeSelect.value[0], + neId: neTypeSelect.value[1], + paramName: treeState.selectNode.paramName, + paramData: data, + loc: `${from['index']['value']}`, + }) + ); } // 无请求提示 if (reqArr.length === 0) { diff --git a/src/views/ne/neConfig/hooks/useConfigArrayChild.ts b/src/views/ne/neConfig/hooks/useConfigArrayChild.ts index 24428ca9..851e2df4 100644 --- a/src/views/ne/neConfig/hooks/useConfigArrayChild.ts +++ b/src/views/ne/neConfig/hooks/useConfigArrayChild.ts @@ -201,17 +201,7 @@ export default function useConfigArrayChild({ // 请求 const reqArr = []; - if (neTypeSelect.value[1] !== 'SYNC') { - reqArr.push( - editNeConfigData({ - neType: neTypeSelect.value[0], - neId: neTypeSelect.value[1], - paramName: treeState.selectNode.paramName, - paramData: data, - loc, - }) - ); - } else { + if (neTypeSelect.value[1].startsWith('SYNC')) { for (const neId of neIdSelect.value) { reqArr.push( editNeConfigData({ @@ -223,6 +213,16 @@ export default function useConfigArrayChild({ }) ); } + } else { + reqArr.push( + editNeConfigData({ + neType: neTypeSelect.value[0], + neId: neTypeSelect.value[1], + paramName: treeState.selectNode.paramName, + paramData: data, + loc, + }) + ); } // 无请求提示 if (reqArr.length === 0) { @@ -276,16 +276,7 @@ export default function useConfigArrayChild({ onOk() { // 请求 const reqArr = []; - if (neTypeSelect.value[1] !== 'SYNC') { - reqArr.push( - delNeConfigData({ - neType: neTypeSelect.value[0], - neId: neTypeSelect.value[1], - paramName: treeState.selectNode.paramName, - loc, - }) - ); - } else { + if (neTypeSelect.value[1].startsWith('SYNC')) { for (const neId of neIdSelect.value) { reqArr.push( delNeConfigData({ @@ -296,6 +287,15 @@ export default function useConfigArrayChild({ }) ); } + } else { + reqArr.push( + delNeConfigData({ + neType: neTypeSelect.value[0], + neId: neTypeSelect.value[1], + paramName: treeState.selectNode.paramName, + loc, + }) + ); } // 无请求提示 if (reqArr.length === 0) { @@ -381,17 +381,7 @@ export default function useConfigArrayChild({ // 请求 const reqArr = []; - if (neTypeSelect.value[1] !== 'SYNC') { - reqArr.push( - addNeConfigData({ - neType: neTypeSelect.value[0], - neId: neTypeSelect.value[1], - paramName: treeState.selectNode.paramName, - paramData: data, - loc, - }) - ); - } else { + if (neTypeSelect.value[1].startsWith('SYNC')) { for (const neId of neIdSelect.value) { reqArr.push( addNeConfigData({ @@ -403,6 +393,16 @@ export default function useConfigArrayChild({ }) ); } + } else { + reqArr.push( + addNeConfigData({ + neType: neTypeSelect.value[0], + neId: neTypeSelect.value[1], + paramName: treeState.selectNode.paramName, + paramData: data, + loc, + }) + ); } // 无请求提示 if (reqArr.length === 0) { diff --git a/src/views/ne/neConfig/hooks/useConfigList.ts b/src/views/ne/neConfig/hooks/useConfigList.ts index 143f5574..52a57627 100644 --- a/src/views/ne/neConfig/hooks/useConfigList.ts +++ b/src/views/ne/neConfig/hooks/useConfigList.ts @@ -86,18 +86,7 @@ export default function useConfigList({ // 请求 const reqArr = []; - if (neTypeSelect.value[1] !== 'SYNC') { - reqArr.push( - editNeConfigData({ - neType: neTypeSelect.value[0], - neId: neTypeSelect.value[1], - paramName: treeState.selectNode.paramName, - paramData: { - [from['name']]: from['value'], - }, - }) - ); - } else { + if (neTypeSelect.value[1].startsWith('SYNC')) { for (const neId of neIdSelect.value) { reqArr.push( editNeConfigData({ @@ -110,6 +99,17 @@ export default function useConfigList({ }) ); } + } else { + reqArr.push( + editNeConfigData({ + neType: neTypeSelect.value[0], + neId: neTypeSelect.value[1], + paramName: treeState.selectNode.paramName, + paramData: { + [from['name']]: from['value'], + }, + }) + ); } // 无请求提示 if (reqArr.length === 0) { diff --git a/src/views/ne/neConfig/index.vue b/src/views/ne/neConfig/index.vue index 42abcf29..224a2012 100644 --- a/src/views/ne/neConfig/index.vue +++ b/src/views/ne/neConfig/index.vue @@ -1,20 +1,11 @@