From fc1c590cc46be03d4f99435ab87609463e7cd29a Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 14 Sep 2023 09:35:18 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E7=BD=91=E5=85=83=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net-ele.ts => configManage/neManage.ts} | 19 ++-- .../neManage}/index.vue | 99 +++++++------------ 2 files changed, 48 insertions(+), 70 deletions(-) rename src/api/{configuration/net-ele.ts => configManage/neManage.ts} (80%) rename src/views/{configuration/net-ele => configManage/neManage}/index.vue (89%) diff --git a/src/api/configuration/net-ele.ts b/src/api/configManage/neManage.ts similarity index 80% rename from src/api/configuration/net-ele.ts rename to src/api/configManage/neManage.ts index 773fdc54..bf074955 100644 --- a/src/api/configuration/net-ele.ts +++ b/src/api/configManage/neManage.ts @@ -1,4 +1,5 @@ import { request } from '@/plugins/http-fetch'; +import { parseObjLineToHump } from '@/utils/parse-utils'; /** * 查询网元列表 @@ -43,7 +44,7 @@ export async function listNeInfo(query: Record) { if (itemData.length === 1 && itemData[0]['total']) { data.total = itemData[0]['total']; } else { - data.rows = itemData; + data.rows = itemData.map(v => parseObjLineToHump(v)); } } }); @@ -68,8 +69,10 @@ export async function getNeInfo(id: string | number) { }); // 解析数据 if (result.code === 1 && Array.isArray(result.data.data)) { - const data = result.data.data[0]; - return Object.assign(result, { data: data['ne_info'][0] }); + let data = result.data.data[0]; + return Object.assign(result, { + data: parseObjLineToHump(data['ne_info'][0]), + }); } return result; } @@ -80,9 +83,9 @@ export async function getNeInfo(id: string | number) { * @returns object */ export function addNeInfo(data: Record) { - data.port = `${data.port}` + data.port = `${data.port}`; return request({ - url: `/systemManagement/v1/elementType/${data.ne_type}/objectType/neInfo`, + url: `/systemManagement/v1/elementType/${data.neType}/objectType/neInfo`, method: 'post', data: data, }); @@ -94,9 +97,9 @@ export function addNeInfo(data: Record) { * @returns object */ export function updateNeInfo(data: Record) { - data.port = `${data.port}` + data.port = `${data.port}`; return request({ - url: `/systemManagement/v1/elementType/${data.ne_type}/objectType/neInfo`, + url: `/systemManagement/v1/elementType/${data.neType}/objectType/neInfo`, method: 'put', data: data, }); @@ -109,7 +112,7 @@ export function updateNeInfo(data: Record) { */ export async function delNeInfo(data: Record) { return request({ - url: `/systemManagement/v1/elementType/${data.ne_type}/objectType/neInfo?ne_id=${data.ne_id}`, + url: `/systemManagement/v1/elementType/${data.neType}/objectType/neInfo?ne_id=${data.neId}`, method: 'delete', }); } diff --git a/src/views/configuration/net-ele/index.vue b/src/views/configManage/neManage/index.vue similarity index 89% rename from src/views/configuration/net-ele/index.vue rename to src/views/configManage/neManage/index.vue index 38047e9e..1ef23b05 100644 --- a/src/views/configuration/net-ele/index.vue +++ b/src/views/configManage/neManage/index.vue @@ -12,27 +12,14 @@ import { addNeInfo, updateNeInfo, delNeInfo, -} from '@/api/configuration/net-ele'; +} from '@/api/configManage/neManage'; import { parseDateToStr } from '@/utils/date-utils'; -import useDictStore from '@/store/modules/dict'; import useI18n from '@/hooks/useI18n'; const { t } = useI18n(); -const { getDict } = useDictStore(); const route = useRoute(); /**路由标题 */ -let title = ref(route.meta.title ?? '标题'); - -/**字典数据 */ -let dict: { - /**网元类型 */ - sysNoticeType: DictType[]; - /**网元状态 */ - sysNoticeStatus: DictType[]; -} = reactive({ - sysNoticeType: [], - sysNoticeStatus: [], -}); +let title = ref(route.meta.title as string ?? '标题'); /**查询参数 */ let queryParams = reactive({ @@ -83,22 +70,22 @@ let tableState: TabeStateType = reactive({ let tableColumns: ColumnsType = [ { title: '网元类型', - dataIndex: 'ne_type', + dataIndex: 'neType', align: 'center', }, { title: '网元内部标识', - dataIndex: 'ne_id', + dataIndex: 'neId', align: 'center', }, { title: '资源唯一标识', - dataIndex: 'rm_uid', + dataIndex: 'rmUid', align: 'center', }, { title: '网元名称', - dataIndex: 'ne_name', + dataIndex: 'neName', align: 'center', }, { @@ -108,7 +95,7 @@ let tableColumns: ColumnsType = [ }, { title: '网元地址', - dataIndex: 'ne_address', + dataIndex: 'neAddress', align: 'center', }, { @@ -118,7 +105,7 @@ let tableColumns: ColumnsType = [ }, { title: '网元虚拟化标识', - dataIndex: 'pv_flag', + dataIndex: 'pvFlag', align: 'center', }, { @@ -128,7 +115,7 @@ let tableColumns: ColumnsType = [ }, { title: '厂商名称', - dataIndex: 'vendor_name', + dataIndex: 'vendorName', align: 'center', }, { @@ -138,7 +125,7 @@ let tableColumns: ColumnsType = [ }, { title: '修改时间', - dataIndex: 'update_time', + dataIndex: 'updateTime', align: 'center', customRender(opt) { if (!opt.value) return ''; @@ -207,15 +194,15 @@ let modalState: ModalStateType = reactive({ from: { dn: '网络标识', ip: '192.168.4.132', - ne_address: '192.160.0.107', - ne_id: '网元内部标识', - ne_name: '网元名称', - ne_type: 'AMF', + neAddress: '192.160.0.107', + neId: '网元内部标识', + neName: '网元名称', + neType: 'AMF', port: '3030', province: '网元所在省份', - pv_flag: '', - rm_uid: '资源唯一标识', - vendor_name: '厂商名称', + pvFlag: '', + rmUid: '资源唯一标识', + vendorName: '厂商名称', }, confirmLoading: false, }); @@ -272,7 +259,7 @@ function fnModalOk() { modalState.confirmLoading = true; const from = toRaw(modalState.from); const result = from.id ? updateNeInfo(from) : addNeInfo(from); - const hide = message.loading({ content: t('loading') }); + const hide = message.loading({ content: t('common.loading') }); result .then(res => { if (res.code === 1) { @@ -359,18 +346,6 @@ function fnGetList() { } onMounted(() => { - // 初始字典数据 - Promise.allSettled([ - getDict('sys_notice_type'), - getDict('sys_notice_status'), - ]).then(resArr => { - if (resArr[0].status === 'fulfilled') { - dict.sysNoticeType = resArr[0].value; - } - if (resArr[1].status === 'fulfilled') { - dict.sysNoticeStatus = resArr[1].value; - } - }); // 获取列表数据 fnGetList(); }); @@ -520,11 +495,11 @@ onMounted(() => { @@ -540,11 +515,11 @@ onMounted(() => { @@ -556,11 +531,11 @@ onMounted(() => { @@ -570,11 +545,11 @@ onMounted(() => { @@ -629,11 +604,11 @@ onMounted(() => { @@ -641,9 +616,9 @@ onMounted(() => { - +