Merge remote-tracking branch 'origin/main' into practical-training

This commit is contained in:
TsMask
2024-07-16 10:01:32 +08:00
7 changed files with 29 additions and 9 deletions

View File

@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS"
VITE_APP_CODE = "CN EMS" VITE_APP_CODE = "CN EMS"
# 应用版本 # 应用版本
VITE_APP_VERSION = "2.240704" VITE_APP_VERSION = "2.240712"
# 接口基础URL地址-不带/后缀 # 接口基础URL地址-不带/后缀
VITE_API_BASE_URL = "/omc-api" VITE_API_BASE_URL = "/omc-api"

View File

@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS"
VITE_APP_CODE = "CN EMS" VITE_APP_CODE = "CN EMS"
# 应用版本 # 应用版本
VITE_APP_VERSION = "2.240704" VITE_APP_VERSION = "2.240712"
# 接口基础URL地址-不带/后缀 # 接口基础URL地址-不带/后缀
VITE_API_BASE_URL = "/omc-api" VITE_API_BASE_URL = "/omc-api"

View File

@@ -11,8 +11,9 @@
*/ */
(function () { (function () {
// host = ip:port // host = ip:port
const host = '192.168.8.100:33030'; // const host = '192.168.8.100:33030';
const host = `${window.location.hostname}:33030`;
// Service Address // Service Address
sessionStorage.setItem('baseUrl', `http://${host}`); sessionStorage.setItem('baseUrl', `http://${host}`);
// websocket Address // websocket Address

View File

@@ -233,8 +233,10 @@ function fnModalEditOk(from: Record<string, any>) {
if (item && res.code === RESULT_CODE_SUCCESS) { if (item && res.code === RESULT_CODE_SUCCESS) {
item.neType = from.neType; item.neType = from.neType;
item.neId = from.neId; item.neId = from.neId;
item.ip = from.ip; item.rmUid = from.rmUid;
item.neName = from.neName; item.neName = from.neName;
item.ip = from.ip;
item.port = from.port;
item.status = res.data.online ? '1' : '0'; item.status = res.data.online ? '1' : '0';
Object.assign(item.serverState, res.data); Object.assign(item.serverState, res.data);
const resouresUsage = parseResouresUsage(item.serverState); const resouresUsage = parseResouresUsage(item.serverState);

View File

@@ -770,6 +770,7 @@ onMounted(() => {
<a-input <a-input
v-model:value="queryParams.imsi" v-model:value="queryParams.imsi"
allow-clear allow-clear
:maxlength="15"
:placeholder="t('common.inputPlease')" :placeholder="t('common.inputPlease')"
></a-input> ></a-input>
</a-form-item> </a-form-item>
@@ -1026,6 +1027,7 @@ onMounted(() => {
<a-input <a-input
v-model:value="modalState.from.imsi" v-model:value="modalState.from.imsi"
allow-clear allow-clear
:maxlength="15"
:disabled="!!modalState.from.id" :disabled="!!modalState.from.id"
> >
<template #prefix> <template #prefix>
@@ -1196,7 +1198,11 @@ onMounted(() => {
name="imsi" name="imsi"
v-bind="modalStateBatchFrom.validateInfos.imsi" v-bind="modalStateBatchFrom.validateInfos.imsi"
> >
<a-input v-model:value="modalState.BatchForm.imsi" allow-clear> <a-input
v-model:value="modalState.BatchForm.imsi"
allow-clear
:maxlength="15"
>
<template #prefix> <template #prefix>
<a-tooltip placement="topLeft"> <a-tooltip placement="topLeft">
<template #title> <template #title>
@@ -1344,7 +1350,11 @@ onMounted(() => {
name="imsi" name="imsi"
v-bind="modalStateBatchDelFrom.validateInfos.imsi" v-bind="modalStateBatchDelFrom.validateInfos.imsi"
> >
<a-input v-model:value="modalState.BatchDelForm.imsi" allow-clear> <a-input
v-model:value="modalState.BatchDelForm.imsi"
allow-clear
:maxlength="15"
>
<template #prefix> <template #prefix>
<a-tooltip placement="topLeft"> <a-tooltip placement="topLeft">
<template #title> <template #title>

View File

@@ -223,7 +223,7 @@ onMounted(() => {
</a-col> </a-col>
<a-col :lg="6" :md="12" :xs="24"> <a-col :lg="6" :md="12" :xs="24">
<a-form-item label="IMSI" name="imsi"> <a-form-item label="IMSI" name="imsi">
<a-input v-model:value="queryParams.imsi" allow-clear></a-input> <a-input v-model:value="queryParams.imsi" allow-clear :maxlength="15"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6" :md="12" :xs="24"> <a-col :lg="6" :md="12" :xs="24">

View File

@@ -1262,6 +1262,7 @@ onMounted(() => {
<a-input <a-input
v-model:value="queryParams.imsi" v-model:value="queryParams.imsi"
allow-clear allow-clear
:maxlength="15"
:placeholder="t('common.inputPlease')" :placeholder="t('common.inputPlease')"
></a-input> ></a-input>
</a-form-item> </a-form-item>
@@ -1271,6 +1272,7 @@ onMounted(() => {
<a-input <a-input
v-model:value="queryParams.msisdn" v-model:value="queryParams.msisdn"
allow-clear allow-clear
:maxlength="32"
:placeholder="t('common.inputPlease')" :placeholder="t('common.inputPlease')"
></a-input> ></a-input>
</a-form-item> </a-form-item>
@@ -1538,6 +1540,7 @@ onMounted(() => {
<a-input <a-input
v-model:value="modalState.from.imsi" v-model:value="modalState.from.imsi"
allow-clear allow-clear
:maxlength="15"
:disabled="!!modalState.from.id" :disabled="!!modalState.from.id"
> >
<template #prefix> <template #prefix>
@@ -2628,7 +2631,11 @@ onMounted(() => {
name="imsi" name="imsi"
v-bind="modalStateBatchDelFrom.validateInfos.imsi" v-bind="modalStateBatchDelFrom.validateInfos.imsi"
> >
<a-input v-model:value="modalState.BatchDelForm.imsi" allow-clear> <a-input
v-model:value="modalState.BatchDelForm.imsi"
allow-clear
:maxlength="15"
>
<template #prefix> <template #prefix>
<a-tooltip placement="topLeft"> <a-tooltip placement="topLeft">
<template #title> <template #title>