Merge remote-tracking branch 'origin/lichang'

src/App.vue

@@ -38,7 +38,7 @@ onBeforeMount(() => {
   // 输出应用版本号
   const appStore = useAppStore();
   console.info(
-    `%c ${t('common.title')} %c ${appStore.appCode} - ${appStore.appVersion} `,
+    `%c ${t('common.desc')} %c ${appStore.appCode} - ${appStore.appVersion} `,
     'color: #fadfa3; background: #030307; padding: 4px 0;',
     'color: #030307; background: #fadfa3; padding: 4px 0;'
   );

src/components/IntlTelInput/index.vue

@@ -1,9 +1,9 @@
 <!-- https://github.com/jackocnr/intl-tel-input/blob/master/react/src/intl-tel-input/react.tsx -->
 <script lang="ts" setup>
-import intlTelInput, { Iti, SomeOptions } from 'intl-tel-input';
+import { Iti } from 'intl-tel-input';
+import intlTelInput from 'intl-tel-input/intlTelInputWithUtils';
 import 'intl-tel-input/build/css/intlTelInput.min.css';
-import 'intl-tel-input/build/js/utils.js';
+import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue';
-import { ref, onMounted, onBeforeUnmount, nextTick, watch } from 'vue';
 import useI18n from '@/hooks/useI18n';
 const { currentLocale } = useI18n();
 const emit = defineEmits(['update:value', 'update:change']);
@@ -45,13 +45,13 @@ const itiRef = ref<Iti | null>(null);
 function fnChange() {
   if (!itiRef.value) return;
 
-  const num = itiRef.value?.getNumber() || '';
+  const number = itiRef.value?.getNumber() || '';
   const countryIso = itiRef.value?.getSelectedCountryData().iso2 || '';
   // note: this number will be in standard E164 format, but any container component can use
   // intlTelInputUtils.formatNumber() to convert this to another format
   // as well as intlTelInputUtils.getNumberType() etc. if need be
   let data = {
-    num,
+    number,
     countryIso,
     validity: false,
     errorCode: -1,
@@ -69,21 +69,11 @@ function fnChange() {
     data.errorCode = errorCode;
   }
   // console.log(data);
-  emit('update:value', num);
+
+  emit('update:value', number);
   emit('update:change', data);
 }
 
-watch(
-  () => props.value,
-  v => {
-    if (v) {
-      itiRef.value?.setNumber(v);
-    } else {
-      itiRef.value?.setNumber('');
-    }
-  }
-);
-
 onMounted(() => {
   nextTick(async () => {
     if (inputRef.value) {
@@ -106,7 +96,13 @@ onMounted(() => {
         formatOnDisplay: true,
         autoPlaceholder: 'polite',
         i18n: i18n,
-      } as SomeOptions);
+      });
+      if (props.value) {
+        itiRef.value.setNumber(props.value);
+      }
+      if (props.disabled) {
+        itiRef.value.setDisabled(props.disabled);
+      }
       inputRef.value.addEventListener('countrychange', fnChange);
     }
   });
@@ -124,8 +120,7 @@ onBeforeUnmount(() => {
   <input
     type="tel"
     class="ant-input"
-    ref="inputRef"
+    ref="inputRef" 
-    :value="value"
     :disabled="disabled"
     :placeholder="placeholder"
     :maxlength="maxlength"

src/i18n/locales/en-US.ts

@@ -6,7 +6,7 @@ export default {
 
   // 通用
   common: {
-    title: 'Core Network Management Platform',
+    title: 'Login Platform',
     desc: 'Core Network Management Platform',
     loading: 'Please wait...',
     inputPlease: 'Please input',

src/i18n/locales/zh-CN.ts

@@ -6,7 +6,7 @@ export default {
 
   // 通用
   common: {
-    title: '核心网管理平台',
+    title: '登录平台',
     desc: '核心网管理平台',
     loading: '请稍等...',
     inputPlease: '请输入',

src/typings/vite-env.d.ts

@@ -8,3 +8,8 @@ declare module '*.vue' {
 }
 
 declare module 'vue3-smooth-dnd';
+
+declare module 'intl-tel-input/intlTelInputWithUtils' {
+  import intlTelInput from 'intl-tel-input';
+  export default intlTelInput;
+}

src/views/account/components/base-info.vue

@@ -169,7 +169,7 @@ onMounted(() => {
           <IntlTelInput
             v-model:value="stateForm.form.phonenumber"
             allow-clear
-            :maxlength="16"
+            :maxlength="20"
             :placeholder="t('views.account.settings.phonenumberPleace')"
           ></IntlTelInput>
         </a-form-item>

src/views/dashboard/smscCDR/index.vue

@@ -176,7 +176,10 @@ let tableColumns: ColumnsType = [
     width: 150,
     customRender(opt) {
       const cdrJSON = opt.value;
-      return parseDateToStr(+cdrJSON.updateTime * 1000);
+      if (typeof cdrJSON.seizureTime === 'number') {
+        return parseDateToStr(+cdrJSON.updateTime * 1000);
+      }
+      return cdrJSON.updateTime;
     },
   },
   {

src/views/login.vue

@@ -12,7 +12,7 @@ import useLayoutStore from '@/store/modules/layout';
 import { viewTransitionTheme } from 'antdv-pro-layout';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { parseUrlPath } from '@/plugins/file-static-url';
-const { t, changeLocale, optionsLocale, currentLocale } = useI18n();
+const { t, changeLocale, optionsLocale } = useI18n();
 const layoutStore = useLayoutStore();
 const appStore = useAppStore();
 const router = useRouter();
@@ -89,28 +89,12 @@ function fnGetCaptcha() {
   });
 }
 
-// LOGO地址
-const logoUrl = computed(() => {
-  let url =
-    appStore.logoType === 'brand'
-      ? parseUrlPath(appStore.filePathBrand)
-      : parseUrlPath(appStore.filePathIcon);
-
-  if (url.indexOf('{language}') === -1) {
-    return url;
-  }
-  // 语言参数替换
-  const local = currentLocale.value;
-  const lang = local.split('_')[0];
-  return url.replace('{language}', lang);
-});
-
 // 判断是否有背景地址
 const calcBG = computed(() => {
   const bgURL = parseUrlPath(appStore.loginBackground);
   if (bgURL && bgURL !== '#') {
     return {
-      backgroundImage: `url(${bgURL})`,
+      backgroundImage: `url('${bgURL}')`,
       backgroundPosition: 'center',
       backgroundSize: 'cover',
     };
@@ -157,21 +141,9 @@ function fnChangeLocale(e: any) {
       <div class="animation animation5"></div>
     </section>
 
-    <header class="header">
-      <div class="header-left">
-        <template v-if="appStore.logoType === 'icon'">
-          <img :src="logoUrl" class="logo-icon" :alt="appStore.appName" />
-          <span class="title">{{ appStore.appName }}</span>
-        </template>
-        <template v-if="appStore.logoType === 'brand'">
-          <img :src="logoUrl" class="logo-brand" :alt="appStore.appName" />
-        </template>
-      </div>
-    </header>
-
     <a-card :bordered="false" class="login-card">
-      <div class="desc">
+      <div class="title">
-        {{ t('common.desc') }}
+        {{ t('common.title') }}
       </div>
       <a-form :model="state.from" name="stateFrom" @finish="fnFinish">
         <a-form-item
@@ -317,10 +289,6 @@ function fnChangeLocale(e: any) {
         </a-row>
       </a-form>
     </a-card>
-
-    <footer class="footer">
-      <div class="footer-copyright">{{ appStore.copyright }}</div>
-    </footer>
   </div>
 </template>
 
@@ -386,52 +354,6 @@ function fnChangeLocale(e: any) {
   background-color: #141414;
 }
 
-.header {
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100%;
-  z-index: 1000;
-  background-color: rgb(255 255 255 / 85%);
-  padding: 0 16px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-
-  .logo-icon {
-    height: 40px;
-    width: 40px;
-    margin-right: 14px;
-    vertical-align: top;
-    border-style: none;
-    border-radius: 6.66px;
-    margin-top: 4px;
-    margin-bottom: 4px;
-  }
-  .logo-brand {
-    height: 48px;
-    width: 174px;
-    vertical-align: top;
-    border-style: none;
-    border-radius: 2px;
-  }
-  .title {
-    position: relative;
-    top: 12px;
-    color: rgba(0, 0, 0, 0.85);
-    font-weight: 600;
-    font-size: 24px;
-    font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
-  }
-}
-
-[data-theme='dark'] .header {
-  background-color: rgb(0 0 0 / 85%);
-  .title {
-    color: rgba(255, 255, 255, 0.85);
-  }
-}
-
 .login-card {
   width: 368px;
   min-width: 260px;
@@ -439,10 +361,10 @@ function fnChangeLocale(e: any) {
   margin-left: 60%;
   border-radius: 6px;
 
-  & .desc {
+  & .title {
-    text-align: center;
+    text-align: left;
     margin-bottom: 18px;
-    color: #666;
+    color: #141414;
     font-weight: 600;
     font-size: 18px;
   }
@@ -450,8 +372,10 @@ function fnChangeLocale(e: any) {
     color: #8c8c8c;
     font-size: 16px;
   }
+}
 
-  [data-theme='dark'] & .desc {
+[data-theme='dark'] .login-card {
+  & .title {
     color: #999;
   }
 }
@@ -461,28 +385,4 @@ function fnChangeLocale(e: any) {
     margin: 0 auto;
   }
 }
-
-.footer {
-  position: absolute;
-  bottom: 0;
-  height: 32px;
-  padding: 0px 16px;
-  text-align: left;
-  background-color: rgba(255, 255, 255, 0.85);
-  width: 100%;
-  line-height: 32px;
-
-  &-copyright {
-    font-size: 14px;
-    color: rgba(0, 0, 0, 0.75);
-    font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
-  }
-}
-
-[data-theme='dark'] .footer {
-  background-color: rgb(0 0 0 / 85%);
-  &-copyright {
-    color: rgba(255, 255, 255, 0.75);
-  }
-}
 </style>

src/views/monitor/monitor/index.vue

@@ -496,7 +496,7 @@ onMounted(() => {
         </a-card>
       </a-col>
     </a-row>
-    <a-row>
+    <a-row :gutter="16">
       <a-col :lg="12" :md="12" :xs="24">
         <a-card :bordered="false" :body-style="{ marginBottom: '24px' }">
           <!-- 插槽-卡片左侧侧 -->
@@ -554,7 +554,7 @@ onMounted(() => {
         </a-card>
       </a-col>
     </a-row>
-    <a-row>
+    <a-row :gutter="16">
       <a-col :lg="12" :md="12" :xs="24">
         <a-card :bordered="false" :body-style="{ marginBottom: '24px' }">
           <!-- 插槽-卡片左侧侧 -->

src/views/monitor/topology/index.vue

@@ -24,8 +24,9 @@ const graphG6Data = reactive<Record<string, any>>({
 
 /**查询全部网元数据列表 */
 function fnRanderData() {
-  if (!graphG6Dom.value) return;
+  if (!graphG6Dom.value) return false;
   graphG6.value = randerGroph(t, graphG6Dom.value, graphG6Data);
+  return true;
 }
 
 /**网元状态调度器 */
@@ -140,17 +141,21 @@ function fnGetList(refresh: boolean = false) {
       }
     })
     .then(hasNeList => {
-      if (!hasNeList) return;
+      if (!hasNeList) return false;
       if (refresh) {
         // graphG6.value.get('canvas').set('localRefresh', true);
         graphG6.value.destroy();
         // graphG6.value.clear();
       }
-      fnRanderData();
+      return fnRanderData();
-      fnGetState();
+    })
-      interval10s.value = setInterval(() => {
+    .then(randerGroph => {
-        fnGetState(); // 获取网元状态
+      if (!randerGroph) return;
-      }, 10_000);
+      fnGetState().finally(() => {
+        interval10s.value = setInterval(() => {
+          fnGetState(); // 获取网元状态
+        }, 10_000);
+      });
     });
 }
 

src/views/ne/neLicense/index.vue

@@ -413,7 +413,7 @@ onMounted(() => {
             :loading="modalState.confirmLoading"
             @click.prevent="fnRecordStateBatch()"
           >
-            <template #icon><SecurityScanOutlined /></template>
+            <template #icon><CloudSyncOutlined /></template>
             {{ t('views.ne.neLicense.reloadBatch') }}
           </a-button>
         </a-space>
@@ -505,19 +505,19 @@ onMounted(() => {
           </template>
           <template v-if="column.key === 'id'">
             <a-space :size="8" align="center">
+              <a-tooltip placement="topRight">
+                <template #title>{{ t('views.ne.neLicense.reload') }}</template>
+                <a-button type="link" @click.prevent="fnRecordState(record)">
+                  <template #icon><CloudSyncOutlined /> </template>
+                </a-button>
+              </a-tooltip>
               <a-tooltip placement="topRight">
                 <template #title>{{ t('views.ne.neLicense.change') }}</template>
                 <a-button
                   type="link"
                   @click.prevent="fnModalVisibleByEdit(record.id)"
                 >
-                  <template #icon><InteractionOutlined /> </template>
+                  <template #icon><CloudUploadOutlined /> </template>
-                </a-button>
-              </a-tooltip>
-              <a-tooltip placement="topRight">
-                <template #title>{{ t('views.ne.neLicense.reload') }}</template>
-                <a-button type="link" @click.prevent="fnRecordState(record)">
-                  <template #icon><SecurityScanOutlined /> </template>
                 </a-button>
               </a-tooltip>
             </a-space>

src/views/system/config/index.vue

@@ -98,6 +98,7 @@ let tableColumns: ColumnsType = [
     title: t('common.rowId'),
     dataIndex: 'configId',
     align: 'left',
+    width: 100,
   },
   {
     title: t('views.system.config.configName'),

src/views/system/user/index.vue

@@ -1367,7 +1367,7 @@ onMounted(() => {
               <IntlTelInput
                 v-model:value="modalState.from.phonenumber"
                 allow-clear
-                :maxlength="16"
+                :maxlength="20"
                 :placeholder="t('common.inputPlease')"
               ></IntlTelInput>
             </a-form-item>

src/views/tool/iperf/index.vue

@@ -80,6 +80,14 @@ async function fnIPerf() {
     });
     return;
   }
+
+  // 网元切换时重置
+  if (neType !== state.params.neType || neId !== state.params.neId) {
+    state.initialized = false;
+    state.params.neType = neType;
+    state.params.neId = neId;
+  }
+
   // 软件版本检查
   state.params.neType = neType;
   state.params.neId = neId;
@@ -88,7 +96,6 @@ async function fnIPerf() {
     neId,
     version: state.data.version,
   });
-
   if (resVersion.code !== RESULT_CODE_SUCCESS) {
     Modal.confirm({
       title: t('common.tipTitle'),
@@ -99,6 +106,7 @@ async function fnIPerf() {
   } else {
     state.versionInfo = resVersion.data;
   }
+
   // 初始化的直接重发
   if (state.initialized) {
     fnResend();
@@ -145,8 +153,8 @@ function fnResend() {
   if (!toolTerminal.value) return;
   state.running = true;
   toolTerminal.value.ctrlC();
-  toolTerminal.value.clear();
   setTimeout(() => {
+    toolTerminal.value.clear();
     const data = JSON.parse(JSON.stringify(state.data));
     if (state.dataType === 'options') data.command = '';
     toolTerminal.value.send('iperf', data);
@@ -180,9 +188,12 @@ function fnProcessMessage(data: string): string {
     if (lestIndex !== -1) {
       text = text.substring(0, lestIndex);
     }
+    if (text.endsWith('# ')) {
+      text = text.substring(0, text.lastIndexOf('\r\n') + 2);
+    }
 
     // console.log({ parts, text });
-    if (parts[0].startsWith('iperf')) {
+    if (parts.length > 1 && parts[0].startsWith('iperf')) {
       return parts[0] + '\r\n' + text;
     }
     return text;

src/views/tool/ping/index.vue

@@ -72,13 +72,15 @@ async function fnPing() {
     });
     return;
   }
-  if (state.initialized) {
+
-    fnResend();
+  // 网元切换时重置
-    return;
+  if (neType !== state.params.neType || neId !== state.params.neId) {
+    state.initialized = false;
+    state.params.neType = neType;
+    state.params.neId = neId;
   }
 
-  state.params.neType = neType;
+  // 软件版本检查
-  state.params.neId = neId;
   const resVersion = await pingV({ neType, neId });
   if (resVersion.code !== RESULT_CODE_SUCCESS) {
     message.warning({
@@ -89,6 +91,12 @@ async function fnPing() {
   } else {
     state.versionInfo = resVersion.data;
   }
+
+  // 初始化的直接重发
+  if (state.initialized) {
+    fnResend();
+    return;
+  }
   state.initialized = true;
 }
 
@@ -108,8 +116,8 @@ function fnResend() {
   if (!toolTerminal.value) return;
   state.running = true;
   toolTerminal.value.ctrlC();
-  toolTerminal.value.clear();
   setTimeout(() => {
+    toolTerminal.value.clear();
     const data = JSON.parse(JSON.stringify(state.data));
     if (state.dataType === 'options') data.command = '';
     toolTerminal.value.send('ping', data);
@@ -143,9 +151,12 @@ function fnProcessMessage(data: string): string {
     if (lestIndex !== -1) {
       text = text.substring(0, lestIndex);
     }
+    if (text.endsWith('# ')) {
+      text = text.substring(0, text.lastIndexOf('\r\n') + 2);
+    }
 
     // console.log({ parts, text });
-    if (parts[0].startsWith('ping')) {
+    if (parts.length > 1 && parts[0].startsWith('ping')) {
       return parts[0] + '\r\n' + text;
     }
     return text;
@@ -377,10 +388,7 @@ onBeforeUnmount(() => {});
         <a-auto-complete
           v-model:value="state.data.command"
           :disabled="state.running"
-          :options="[
+          :options="[{ value: '-help' }, { value: '-i 1 -c 4 8.8.8.8' }]"
-              { value: '-help' },
-              { value: '-i 1 -c 4 8.8.8.8' },
-            ]"
           :dropdown-match-select-width="500"
           style="width: 100%"
         >