Merge remote-tracking branch 'origin/lichang' into lite

src/i18n/locales/en-US.ts

@@ -607,6 +607,7 @@ export default {
         upgradeDone: 'Update complete, service being reloaded',
         upgradeFail: 'The update fails, please check whether the software file exists and whether the service terminal environment is available!',
         upgradeModal: 'Network Element Version Updates',
+        noPath: 'Package File Not Found',
       },
       neLicense: {
         status: "License Status",
@@ -1108,7 +1109,7 @@ export default {
         exportAll: 'Export All',
         disPlayFilfter: 'Display Filters',
         alarmId:'Alarm ID',
-        alarmTitle:'Title',
+        alarmTitle:'Alarm Title',
         clearUser:'Clear User',
         clearType:'Clear Type',
         ackState: 'Ack Status',
@@ -1159,7 +1160,7 @@ export default {
         alarmId:'Alarm ID',
         alarmSeq:'Sequence Number',
         alarmCode:'Alarm Code',
-        alarmTitle: 'Alarm Time',
+        alarmTitle: 'Alarm Title',
         alarmStatus:'Status',
         alarmType:'Alarm Type',
         origSeverity:'Severity',

src/i18n/locales/zh-CN.ts

@@ -607,6 +607,7 @@ export default {
         upgradeDone: '更新完成，服务正在重载',
         upgradeFail: '更新失败，请检查软件文件是否存在且服务终端环境是否可用！',
         upgradeModal: '网元版本更新',
+        noPath: '软件包文件未发现',
       },
       neLicense: {
         status: "许可证状态",
@@ -1108,7 +1109,7 @@ export default {
         exportAll: '导出全部',
         disPlayFilfter: '显示过滤',
         alarmId:'告警唯一标识',
-        alarmTitle:'告警名称',
+        alarmTitle:'告警标题',
         clearUser:'告警清除用户',
         clearType:'告警清除类型',
         ackState:'告警确认状态',

src/views/faultManage/active-alarm/index.vue

@@ -920,7 +920,7 @@ onMounted(() => {
     <a-card :bordered="false" :body-style="{ padding: '0px' }">
       <!-- 插槽-卡片左侧侧 -->
       <template #title>
-        <a-space :size="8" align="center" v-if="false">
+        <a-space :size="8" align="center">
           <a-button
             type="primary"
             @click.prevent="fnCancelConfirm()"
@@ -961,6 +961,7 @@ onMounted(() => {
             type="primary"
             @click.prevent="fnExportAll()"
             :disabled="tableState.data.length <= 0"
+            v-if="false"
           >
             <template #icon> <export-outlined /> </template>
             {{ t('views.faultManage.activeAlarm.exportAll') }}
@@ -1027,7 +1028,8 @@ onMounted(() => {
         :data-source="tableState.data"
         :size="tableState.size"
         :row-selection="{
-          columnWidth: 2,
+          type: 'checkbox',
+          columnWidth: '48px',
           selectedRowKeys: state.selectedRowKeys,
           onChange: onSelectChange,
         }"
@@ -1525,22 +1527,3 @@ onMounted(() => {
   padding: 0 24px;
 }
 </style>
-
-<style lang="less">
-.full-modal {
-  .ant-modal {
-    max-width: 100%;
-    top: 0;
-    padding-bottom: 0;
-    margin: 0;
-  }
-  .ant-modal-content {
-    display: flex;
-    flex-direction: column;
-    height: calc(100vh);
-  }
-  .ant-modal-body {
-    flex: 1;
-  }
-}
-</style>

src/views/faultManage/event/index.vue

@@ -742,22 +742,3 @@ onMounted(() => {
   padding: 0 24px;
 }
 </style>
-
-<style lang="less">
-.full-modal {
-  .ant-modal {
-    max-width: 100%;
-    top: 0;
-    padding-bottom: 0;
-    margin: 0;
-  }
-  .ant-modal-content {
-    display: flex;
-    flex-direction: column;
-    height: calc(100vh);
-  }
-  .ant-modal-body {
-    flex: 1;
-  }
-}
-</style>

src/views/faultManage/history-alarm/index.vue

@@ -798,11 +798,6 @@ onMounted(() => {
         :loading="tableState.loading"
         :data-source="tableState.data"
         :size="tableState.size"
-        :row-selection="{
-          columnWidth: 3,
-          selectedRowKeys: state.selectedRowKeys,
-          onChange: onSelectChange,
-        }"
         :pagination="tablePagination"
         :scroll="{ x: tableColumns.length * 150, y: 'calc(100vh - 480px)' }"
       >

src/views/ne/neVersion/index.vue

@@ -120,6 +120,7 @@ let tableColumns = ref<TableColumnsType>([
   {
     title: t('views.ne.neVersion.preVersion'),
     dataIndex: 'preVersion',
+    key: 'preVersion',
     align: 'left',
     width: 150,
     resizable: true,
@@ -305,6 +306,10 @@ function fnRecordVersion(
       message.warning(t('views.ne.neVersion.rollbackTipEmpty'), 3);
       return;
     }
+    if (row.prePath === '' || row.prePath === '-') {
+      message.warning(t('views.ne.neVersion.noPath'), 3);
+      return;
+    }
     if (row.preVersion === row.version) {
       contentTip = t('views.ne.neVersion.rollbackTipEqual');
     }
@@ -523,8 +528,7 @@ onMounted(() => {
             type="primary"
             :disabled="tableState.selectedRowKeys.length > 1"
             @click.prevent="
-              () =>
+              () => (modalState.openByMoreFile = !modalState.openByMoreFile)
-                (modalState.openByMoreFile = !modalState.openByMoreFile)
             "
           >
             <template #icon><UploadOutlined /></template>
@@ -616,6 +620,21 @@ onMounted(() => {
           <template v-if="column.key === 'status'">
             <DictTag :options="dictStatus" :value="record.status" />
           </template>
+          <template v-if="column.key === 'preVersion'">
+            {{ record.preVersion }}
+            <a-tooltip
+              placement="topRight"
+              v-if="
+                record.preVersion &&
+                (record.prePath === '' || record.prePath === '-')
+              "
+            >
+              <template #title>
+                {{ t('views.ne.neVersion.noPath') }}
+              </template>
+              <InfoCircleOutlined />
+            </a-tooltip>
+          </template>
           <template v-if="column.key === 'id'">
             <a-space :size="8" align="center">
               <a-tooltip placement="topRight">

src/views/neUser/auth/index.vue

@@ -385,7 +385,7 @@ function fnBatchDelModalOk() {
       const neId = queryParams.neId || '-';
       batchDelUDMAuth(neId, from.imsi, from.num).then(res => {
         if (res.code === RESULT_CODE_SUCCESS) {
-          const timerS = Math.ceil(+from.num / 1500) + 1;
+          const timerS = Math.ceil(+from.num / 800) + 1;
           notification.success({
             message: modalState.title,
             description: t('common.operateOk'),
@@ -530,7 +530,7 @@ function fnLoadData() {
   resetUDMAuth(neId).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       const num = res.data;
-      const timerS = Math.ceil(+num / 3000) + 3;
+      const timerS = Math.ceil(+num / 800) + 3;
       notification.success({
         message: t('views.neUser.auth.loadData'),
         description: t('views.neUser.auth.loadDataTip', { num, timer: timerS }),
@@ -1047,8 +1047,9 @@ onMounted(() => {
                 v-model:value="modalState.from.num"
                 style="width: 100%"
                 :min="1"
-                :max="10000"
+                :max="500"
-                placeholder="<=10000"
+                :maxlength="3"
+                placeholder="<=500"
               ></a-input-number>
             </a-form-item>
           </a-col>
@@ -1208,8 +1209,9 @@ onMounted(() => {
                 v-model:value="modalState.BatchDelForm.num"
                 style="width: 100%"
                 :min="1"
-                :max="10000"
+                :max="500"
-                placeholder="<=10000"
+                :maxlength="3"
+                placeholder="<=500"
               ></a-input-number>
             </a-form-item>
           </a-col>

src/views/neUser/sub/index.vue

@@ -662,10 +662,7 @@ function fnModalOk() {
               });
               fnGetList(1);
             } else {
-              const timerS = Math.max(
+              const timerS = Math.ceil(+from.num / 800) + 1;
-                Math.ceil(+from.num / 500),
-                `${from.num}`.length * 5
-              );
               notification.success({
                 message: modalState.title,
                 description: t('common.operateOk'),
@@ -728,7 +725,7 @@ function fnBatchDelModalOk() {
       const neId = queryParams.neId || '-';
       batchDelUDMSub(neId, from.imsi, from.num).then(res => {
         if (res.code === RESULT_CODE_SUCCESS) {
-          const timerS = Math.ceil(+from.num / 1500) + 1;
+          const timerS = Math.ceil(+from.num / 800) + 1;
           notification.success({
             message: modalState.title,
             description: t('common.operateOk'),
@@ -909,7 +906,7 @@ function fnLoadData() {
   resetUDMSub(neId).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       const num = res.data;
-      const timerS = Math.ceil(+num / 2000) + 3;
+      const timerS = Math.ceil(+num / 800) + 3;
       notification.success({
         message: t('views.neUser.sub.loadData'),
         description: t('views.neUser.sub.loadDataTip', { num, timer: timerS }),
@@ -1456,8 +1453,9 @@ onMounted(() => {
                 v-model:value="modalState.from.num"
                 style="width: 100%"
                 :min="1"
-                :max="10000"
+                :max="500"
-                placeholder="<=10000"
+                :maxlength="3"
+                placeholder="<=500"
               ></a-input-number>
             </a-form-item>
           </a-col>
@@ -2088,8 +2086,9 @@ onMounted(() => {
                 v-model:value="modalState.BatchDelForm.num"
                 style="width: 100%"
                 :min="1"
-                :max="10000"
+                :max="500"
-                placeholder="<=10000"
+                :maxlength="3"
+                placeholder="<=500"
               ></a-input-number>
             </a-form-item>
           </a-col>

src/views/perfManage/kpiKeyTarget/index.vue

@@ -70,14 +70,13 @@ const ALL_NE_TYPES = [
   'mocngw',
   'smsc',
   'cbc',
-  'ausf',
 ] as const;
 type AllChartType = (typeof ALL_NE_TYPES)[number] & string;
-
+console.log( neInfoStore.getNeCascaderOptions)
 // 在 ALL_NE_TYPES 定义之后添加 小写转大写
-const neTypeOptions = ALL_NE_TYPES.map(type => ({
+const neTypeOptions =  neInfoStore.getNeCascaderOptions.map(v => ({
-  label: type.toUpperCase(),
+  label: v.value,
-  value: type,
+  value: v.label,
 }));
 
 // 使用 ref 来使 networkElementTypes 变为响应式，并使用 ALL_NE_TYPES 初始化