diff --git a/public/default/config.js b/public/default/config.js index 98d65367..ff149cba 100644 --- a/public/default/config.js +++ b/public/default/config.js @@ -2,11 +2,11 @@ * =============== Zh =============== * - Nginx部署 * 删除loading.js同级下同名文件,Nginx代理地址: /omc-api - * + * * - 非Nginx部署 * 请将当前文件与loading.js同级,将host变量值修改为数据服务访问地址 * !!!注意: 修改当前文件后,建议关闭浏览器后重新访问 - * + * * =============== En =============== * - Nginx Deployment * Delete the file with the same name under the same level of loading.js, Nginx proxy address: /omc-api @@ -20,11 +20,22 @@ // host = ip:prot const host = '192.168.2.166:3030'; - // Service Address 服务地址 - const baseUrl = `http://${host}`; - sessionStorage.setItem('baseUrl', baseUrl); + const configs = { + // internationalization 国际化禁用,默认语言选择 + i18nDisable: false, + i18nDisableDefault: 'en_US', + // Service Address 服务地址 + baseUrl: `http://${host}`, + // websocket Address + wsUrl: `ws://${host}`, + }; + + if(!configs.i18nDisable){ + localStorage.setItem('cache:local:i18n', configs.i18nDisableDefault); + } + for (const key in configs) { + console.log(key, `${configs[key]}`); + sessionStorage.setItem(key, `${configs[key]}`); + } - // websocket Address - const wsUrl = `ws://${host}`; - sessionStorage.setItem('wsUrl', wsUrl); })(); diff --git a/src/api/neUser/ims.ts b/src/api/neUser/ims.ts index d4fa7050..6d9efc05 100644 --- a/src/api/neUser/ims.ts +++ b/src/api/neUser/ims.ts @@ -26,5 +26,17 @@ export async function listIMS(query: Record) { data.total = rows.length; data.rows = rows; } + + // 测试数据 + // data.rows = [ + // { + // activeTime: '2023-11-29 17:04:54', + // barring: 0, + // impu: 'sip:12307551232@ims.mnc000.mcc460.3gppnetwork.org', + // imsi: '460001230000002', + // msisdn: '12307551232', + // regState: 1, + // }, + // ]; return data; } diff --git a/src/api/neUser/n3iwf.ts b/src/api/neUser/n3iwf.ts index 94d1f341..9b68a157 100644 --- a/src/api/neUser/n3iwf.ts +++ b/src/api/neUser/n3iwf.ts @@ -8,7 +8,6 @@ import { parseObjLineToHump } from '@/utils/parse-utils'; * @returns object */ export async function listN3iwf(query: Record) { - query.nbId = query.id; const result = await request({ url: '/api/rest/ueManagement/v1/elementType/n3iwf/objectType/ueInfo', method: 'get', diff --git a/src/layouts/components/RightContent.vue b/src/layouts/components/RightContent.vue index f608b151..780324ff 100644 --- a/src/layouts/components/RightContent.vue +++ b/src/layouts/components/RightContent.vue @@ -6,6 +6,7 @@ import useI18n from '@/hooks/useI18n'; import useAppStore from '@/store/modules/app'; import useUserStore from '@/store/modules/user'; import useAlarmStore from '@/store/modules/alarm'; +import { sessionGet } from '@/utils/cache-session-utils'; const { isFullscreen, toggle } = useFullscreen(); const { t, changeLocale, optionsLocale } = useI18n(); const userStore = useUserStore(); @@ -42,6 +43,9 @@ function fnClickHelpDoc(language?: string) { window.open(href, '_blank'); } +// 兼容旧前端可改配置文件 +const i18nDisable = sessionGet('i18nDisable') === 'false'; + /**改变多语言 */ function fnChangeLocale(e: any) { changeLocale(e.key); @@ -81,7 +85,11 @@ function fnChangeLocale(e: any) { - + {{ t('i18n') }} diff --git a/src/views/login.vue b/src/views/login.vue index 95421728..9dae81e0 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -8,6 +8,7 @@ import { useRouter, useRoute } from 'vue-router'; import useI18n from '@/hooks/useI18n'; import { toRaw } from 'vue'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; +import { sessionGet } from '@/utils/cache-session-utils'; const { t, changeLocale, optionsLocale } = useI18n(); const appStore = useAppStore(); const router = useRouter(); @@ -115,6 +116,9 @@ onMounted(() => { fnGetCaptcha(); }); +// 兼容旧前端可改配置文件 +const i18nDisable = sessionGet('i18nDisable') === 'false'; + /**改变多语言 */ function fnChangeLocale(e: any) { changeLocale(e.key); @@ -270,6 +274,7 @@ function fnChangeLocale(e: any) { justify="space-between" align="middle" style="margin-top: 18px" + v-if="!i18nDisable" > diff --git a/src/views/neUser/auth/index.vue b/src/views/neUser/auth/index.vue index 70f5ee34..8c7ebb8e 100644 --- a/src/views/neUser/auth/index.vue +++ b/src/views/neUser/auth/index.vue @@ -861,7 +861,7 @@ onMounted(() => { :size="tableState.size" :row-class-name="fnTableStriped" :pagination="tablePagination" - :scroll="{ y: 450 }" + :scroll="{ y: 'calc(100vh - 480px)' }" @change="fnTableChange" @resizeColumn="(w:number, col:any) => (col.width = w)" > @@ -1293,4 +1293,8 @@ onMounted(() => { .table :deep(.table-striped) td { background-color: #fafafa; } + +.table :deep(.ant-pagination) { + padding: 0 24px; +} diff --git a/src/views/neUser/base5G/index.vue b/src/views/neUser/base5G/index.vue index 4eabb556..5f30c06a 100644 --- a/src/views/neUser/base5G/index.vue +++ b/src/views/neUser/base5G/index.vue @@ -69,26 +69,26 @@ let tableColumns: ColumnsType = [ { title: 'NodeB ID', dataIndex: 'id', - align: 'center', - width: 2, + align: 'left', + width: 150, }, { - title: 'NodeB Address', - dataIndex: 'address', - align: 'center', - width: 3, + title: 'UE Number', + dataIndex: 'ueNum', + align: 'left', + width: 150, }, { title: 'NodeB Name', dataIndex: 'name', align: 'left', - width: 2, + width: 150, }, { - title: 'UE Number', - dataIndex: 'ueNum', - align: 'center', - width: 2, + title: 'NodeB Address', + dataIndex: 'address', + align: 'left', + minWidth: 150, }, ]; diff --git a/src/views/neUser/ims/index.vue b/src/views/neUser/ims/index.vue index 10b2e70a..7816ecb6 100644 --- a/src/views/neUser/ims/index.vue +++ b/src/views/neUser/ims/index.vue @@ -72,38 +72,38 @@ let tableColumns: ColumnsType = [ { title: 'IMSI', dataIndex: 'imsi', - align: 'center', - width: 3, + align: 'left', + width: 150, }, { title: 'MSISDN', dataIndex: 'msisdn', - align: 'center', - width: 3, - }, - { - title: 'IMPU', - dataIndex: 'impu', - align: 'center', - width: 5, + align: 'left', + width: 150, }, + { title: 'Barring', dataIndex: 'barring', - align: 'center', - width: 2, + align: 'left', + width: 150, }, { title: 'Registration State', dataIndex: 'regState', - align: 'center', - width: 2, + align: 'left', + width: 150, }, { title: 'Active Time', dataIndex: 'activeTime', - align: 'center', - width: 3, + align: 'left', + width: 150, + }, + { + title: 'IMPU', + dataIndex: 'impu', + align: 'left', }, ]; diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue index 760a5631..edd77753 100644 --- a/src/views/neUser/sub/index.vue +++ b/src/views/neUser/sub/index.vue @@ -1100,7 +1100,7 @@ onMounted(() => { :size="tableState.size" :row-class-name="fnTableStriped" :pagination="tablePagination" - :scroll="{ x: tableColumnsDnd.length * 200, y: 450 }" + :scroll="{ x: tableColumnsDnd.length * 200, y: 'calc(100vh - 480px)' }" @change="fnTableChange" @resizeColumn="(w:number, col:any) => (col.width = w)" >