From 4ca700092a178973eb2fb9bd7893eec17cf6aac5 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 10 May 2024 14:19:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E5=90=8E=E9=87=8D?= =?UTF-8?q?=E5=AE=9A=E5=90=91=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/views/login.vue b/src/views/login.vue index 4a016406..bf3f4749 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -14,10 +14,6 @@ const appStore = useAppStore(); const router = useRouter(); const route = useRoute(); -/**登录后重定向页面 */ -const redirectPath = - (route.query && (route.query.redirect as string)) || '/index'; - let state = reactive({ /**表单属性 */ from: { @@ -52,7 +48,9 @@ function fnFinish() { .then(res => { if (res.code === RESULT_CODE_SUCCESS) { message.success(t('views.login.loginSuccess'), 3); - router.push({ path: redirectPath }); + /**登录后重定向页面 */ + const redirectPath = route.query?.redirect || '/index'; + router.push({ path: redirectPath as string }); } else { message.error(`${res.msg}`, 3); } From 9981de227113ad156be82ba4a4773cb63efe06bc Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 10 May 2024 14:49:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?del:=20=E7=A7=BB=E9=99=A4=E6=97=A7=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E4=BC=9A=E8=AF=9D=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/monitor/session.ts | 93 -------- src/views/monitor/session/index.vue | 341 ---------------------------- 2 files changed, 434 deletions(-) delete mode 100644 src/api/monitor/session.ts delete mode 100644 src/views/monitor/session/index.vue diff --git a/src/api/monitor/session.ts b/src/api/monitor/session.ts deleted file mode 100644 index 3863a896..00000000 --- a/src/api/monitor/session.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { - RESULT_CODE_ERROR, - RESULT_CODE_SUCCESS, - RESULT_MSG_ERROR, -} from '@/constants/result-constants'; -import { language, request } from '@/plugins/http-fetch'; -import { parseObjLineToHump } from '@/utils/parse-utils'; - -/** - * 查询用户会话列表 - * @param query 查询参数 - * @returns object - */ -export async function listSession(query: Record) { - let totalSQL = 'select count(*) as total from session where 1=1 '; - let rowsSQL = 'select * from session where 1=1 '; - - // 查询 - let querySQL = ''; - if (query.accountId) { - querySQL += ` and account_id like '%${query.accountId}%' `; - } - if (query.ip) { - querySQL += ` and host like '%${query.ip}%' `; - } - - // 分页 - const pageNum = (query.pageNum - 1) * query.pageSize; - const limtSql = ` limit ${pageNum},${query.pageSize} `; - - // 排序 - let sortSql = ' order by login_time '; - if (query.sortOrder === 'desc') { - sortSql += ' desc '; - } else { - sortSql += ' asc '; - } - - // 发起请求 - const result = await request({ - url: `/api/rest/databaseManagement/v1/omc_db/session`, - method: 'get', - params: { - totalSQL: totalSQL + querySQL, - rowsSQL: rowsSQL + querySQL + sortSql + limtSql, - }, - }); - - // 解析数据 - if (result.code === RESULT_CODE_SUCCESS) { - const data: DataList = { - total: 0, - rows: [], - code: result.code, - msg: result.msg, - }; - result.data.data.forEach((item: any) => { - const itemData = item['session']; - if (Array.isArray(itemData)) { - if (itemData.length === 1 && itemData[0]['total'] >= 0) { - data.total = itemData[0]['total']; - } else { - data.rows = itemData.map(v => parseObjLineToHump(v)); - } - } - }); - return data; - } - return result; -} - -/** - * 强退用户会话 - * @param tokenId 授权标识 - * @returns object - */ -export async function logoutSession(id: string) { - const result = await request({ - url: `/api/rest/databaseManagement/v1/omc_db/session?WHERE=id='${id}'`, - method: 'delete', - }); - // 解析数据 - if (result.code === RESULT_CODE_SUCCESS && result.data.data) { - let rows = result.data.data.affectedRows; - if (rows) { - delete result.data; - return result; - } else { - return { code: RESULT_CODE_ERROR, msg: RESULT_MSG_ERROR[language] }; - } - } - return result; -} diff --git a/src/views/monitor/session/index.vue b/src/views/monitor/session/index.vue deleted file mode 100644 index 3b06e2a0..00000000 --- a/src/views/monitor/session/index.vue +++ /dev/null @@ -1,341 +0,0 @@ - - - - - From 29eb1f08b16564b4004fa9efa100bc1abf9fa3c8 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 10 May 2024 14:54:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?del:=20=E7=A7=BB=E9=99=A4=E6=97=A7=E7=9A=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/configManage/configParam.ts | 163 +- src/views/configManage/configParam/index.vue | 1669 ---------------- .../configManage/configParamForm/index.vue | 1718 ---------------- .../configManage/configParamTree/index.vue | 1761 ----------------- 4 files changed, 5 insertions(+), 5306 deletions(-) delete mode 100644 src/views/configManage/configParam/index.vue delete mode 100644 src/views/configManage/configParamForm/index.vue delete mode 100644 src/views/configManage/configParamTree/index.vue diff --git a/src/api/configManage/configParam.ts b/src/api/configManage/configParam.ts index f9adfc79..29dd00cd 100644 --- a/src/api/configManage/configParam.ts +++ b/src/api/configManage/configParam.ts @@ -108,159 +108,6 @@ async function getParamConfigInfo( }); } -/** - * 查询配置参数标签栏对应信息-表格处理 - * @param neType 网元类型 - * @param topTag - * @param neId - * @returns object - */ -export async function getParamConfigInfoTable( - neType: string, - topTag: string, - neId: string -) { - const { wrRule, dataArr } = await getParamConfigInfo(neType, topTag, neId); - - // UPF参数不统一 - // if (neType === 'UPF') { - // if (Reflect.has(wrRule, 'list')) { - // for (const arr of wrRule['list']) { - // arr['name'] = parseFirstLower(arr['name']); - // } - // for (const item of dataArr) { - // for (const k in item) { - // item[parseFirstLower(k)] = item[k]; - // Reflect.deleteProperty(item, k); - // } - // } - // } - // if (Reflect.has(wrRule, 'array')) { - // for (const arr of wrRule['array']) { - // if (Array.isArray(arr['array'])) { - // for (const child of arr['array']) { - // child['name'] = parseFirstLower(child['name']); - // } - // } - // arr['name'] = parseFirstLower(arr['name']); - // } - // for (const item of dataArr) { - // for (const k in item) { - // // 处理子列表 - // if (Array.isArray(item[k])) { - // for (const child of item[k]) { - // for (const childKey in child) { - // child[parseFirstLower(childKey)] = child[childKey]; - // Reflect.deleteProperty(child, childKey); - // } - // } - // } - // item[parseFirstLower(k)] = item[k]; - // Reflect.deleteProperty(item, k); - // } - // } - // } - // } - - // 拼装数据 - const result = { - code: RESULT_CODE_SUCCESS, - msg: RESULT_MSG_SUCCESS, - data: { - type: 'list' as 'list' | 'array', - data: [] as any[], - dataRule: {}, - columns: [] as any[], - }, - }; - - // kv单列表 - if (Reflect.has(wrRule, 'list')) { - result.data.type = 'list'; - const ruleArr = Object.freeze(wrRule['list']); - - // 列表项数据 - let dataList = []; - for (const item of dataArr) { - for (const key of Object.keys(item)) { - // 规则为准 - for (const rule of ruleArr) { - if (rule['name'] === key) { - const ruleItem = Object.assign({ optional: 'true' }, rule, { - value: item[key], - }); - dataList.push(ruleItem); - break; - } - } - } - } - result.data.data = dataList; - - // 列表字段 - result.data.columns = [ - { - title: 'Key', - dataIndex: 'display', - align: 'left', - width: '30%', - }, - { - title: 'Value', - dataIndex: 'value', - align: 'left', - width: '70%', - }, - ]; - } - - // 多列表 - if (Reflect.has(wrRule, 'array')) { - result.data.type = 'array'; - const ruleArr = Object.freeze(wrRule['array']); - - // 列表项数据 - const dataArray = []; - for (const item of dataArr) { - let record: Record = {}; - for (const key of Object.keys(item)) { - // 规则为准 - for (const rule of ruleArr) { - if (rule['name'] === key) { - const ruleItem = Object.assign({ optional: 'true' }, rule, { - value: item[key], - }); - record[ruleItem.name] = ruleItem; - break; - } - } - } - dataArray.push(record); - } - result.data.data = dataArray; - - // 无数据时,用于新增 - let dataRule: Record = {}; - for (const rule of ruleArr) { - dataRule[rule.name] = rule; - } - result.data.dataRule = dataRule; - - // 列表字段 - const columns: Record[] = []; - for (const rule of ruleArr) { - columns.push({ - title: rule.display, - dataIndex: rule.name, - align: 'left', - width: 5, - }); - } - result.data.columns = columns; - } - return result; -} - /** * 查询配置参数标签栏对应信息-表单结构处理 * @param neType 网元类型 @@ -530,7 +377,7 @@ export async function getPCCRule(neId: any) { ) { let itemData = itemV.data.data; itemData.forEach((item: any) => { - pccJson.set(item.ruleId,{ value: item.ruleId, label: item.ruleId }); + pccJson.set(item.ruleId, { value: item.ruleId, label: item.ruleId }); }); } } @@ -544,7 +391,7 @@ export async function getPCCRule(neId: any) { ) { let itemData = itemV.data.data; itemData.forEach((item: any) => { - sessJson.set(item.ruleId,{ value: item.ruleId, label: item.ruleId }); + sessJson.set(item.ruleId, { value: item.ruleId, label: item.ruleId }); }); } } @@ -558,7 +405,7 @@ export async function getPCCRule(neId: any) { ) { let itemData = itemV.data.data; itemData.forEach((item: any) => { - qosJson.set(item.qosId,{ value: item.qosId, label: item.qosId }); + qosJson.set(item.qosId, { value: item.qosId, label: item.qosId }); }); } } @@ -572,7 +419,7 @@ export async function getPCCRule(neId: any) { ) { let itemData = itemV.data.data; itemData.forEach((item: any) => { - headerJson.set(item.templateName,{ + headerJson.set(item.templateName, { value: item.templateName, label: item.templateName, }); @@ -589,7 +436,7 @@ export async function getPCCRule(neId: any) { ) { let itemData = itemV.data.data; itemData.forEach((item: any) => { - sarJson.set(item.name,{ value: item.name, label: item.name }); + sarJson.set(item.name, { value: item.name, label: item.name }); }); } } diff --git a/src/views/configManage/configParam/index.vue b/src/views/configManage/configParam/index.vue deleted file mode 100644 index e2cd84fe..00000000 --- a/src/views/configManage/configParam/index.vue +++ /dev/null @@ -1,1669 +0,0 @@ - - - - - diff --git a/src/views/configManage/configParamForm/index.vue b/src/views/configManage/configParamForm/index.vue deleted file mode 100644 index 906861fd..00000000 --- a/src/views/configManage/configParamForm/index.vue +++ /dev/null @@ -1,1718 +0,0 @@ - - - - - diff --git a/src/views/configManage/configParamTree/index.vue b/src/views/configManage/configParamTree/index.vue deleted file mode 100644 index 0e53578f..00000000 --- a/src/views/configManage/configParamTree/index.vue +++ /dev/null @@ -1,1761 +0,0 @@ - - - - -