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

package.json

@@ -24,7 +24,7 @@
     "@xterm/xterm": "^5.5.0",
     "ant-design-vue": "^3.2.20",
     "antdv-pro-layout": "~3.3.5",
-    "antdv-pro-modal": "^3.0.8",
+    "antdv-pro-modal": "^3.0.9",
     "codemirror": "^6.0.1",
     "dayjs": "^1.11.11",
     "echarts": "~5.5.0",
@@ -38,7 +38,7 @@
     "pinia": "^2.1.7",
     "vue": "~3.3.13",
     "vue-i18n": "^9.13.1",
-    "vue-router": "^4.3.3",
+    "vue-router": "^4.4.0",
     "vue3-smooth-dnd": "^0.0.6",
     "xlsx": "~0.18.5"
   },
@@ -53,6 +53,6 @@
     "unplugin-vue-components": "~0.26.0",
     "vite": "~5.3.1",
     "vite-plugin-compression": "~0.5.1",
-    "vue-tsc": "~2.0.21"
+    "vue-tsc": "~2.0.22"
   }
 }

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

@@ -1066,7 +1066,7 @@ onMounted(() => {
         :data-source="alarmTableState.data"
         :size="alarmTableState.size"
         :pagination="false"
-        :scroll="{ x: 1700, y: '82vh' }"
+        :scroll="{ x: 1700, y: '88vh' }"
       >
       </a-table>
     </ProModal>

src/views/neUser/sub/index.vue

@@ -8,6 +8,7 @@ import { ColumnsType } from 'ant-design-vue/lib/table';
 import UploadModal from '@/components/UploadModal/index.vue';
 import TableColumnsDnd from '@/components/TableColumnsDnd/index.vue';
 import useNeInfoStore from '@/store/modules/neinfo';
+import useDictStore from '@/store/modules/dict';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import saveAs from 'file-saver';
@@ -25,6 +26,15 @@ import {
 } from '@/api/neData/udm_sub';
 import { uploadFile } from '@/api/tool/file';
 const { t } = useI18n();
+const { getDict } = useDictStore();
+
+/**字典数据 */
+let dict: {
+  /**CN Type可选类型 */
+  udmSubCNType: DictType[];
+} = reactive({
+  udmSubCNType: [],
+});
 
 /**网元参数 */
 let neOtions = ref<Record<string, any>[]>([]);
@@ -139,6 +149,7 @@ let tableColumns = ref<ColumnsType>([
   {
     title: 'CN Type',
     dataIndex: 'cn',
+    key: 'cn',
     align: 'center',
     width: 100,
   },
@@ -1189,6 +1200,13 @@ function delBigRow(bigIndex: any) {
 }
 
 onMounted(() => {
+  // 初始字典数据
+  Promise.allSettled([getDict('udm_sub_cn_type')]).then(resArr => {
+    if (resArr[0].status === 'fulfilled') {
+      dict.udmSubCNType = resArr[0].value;
+    }
+  });
+
   // 获取网元网元列表
   useNeInfoStore()
     .fnNelist()
@@ -1234,7 +1252,7 @@ onMounted(() => {
             <a-form-item :label="t('views.neUser.sub.neType')" name="neId ">
               <a-select
                 v-model:value="queryParams.neId"
-                :options="neOtions"
+                :options="dict.udmSubCNType"
                 :placeholder="t('common.selectPlease')"
               />
             </a-form-item>
@@ -1456,6 +1474,9 @@ onMounted(() => {
         }"
       >
         <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'cn'">
+            <DictTag :options="dict.udmSubCNType" :value="record.cn" />
+          </template>
           <template v-if="column.key === 'imsi'">
             <a-space :size="8" align="center">
               <a-tooltip>
@@ -1512,7 +1533,6 @@ onMounted(() => {
             <a-form-item
               label="IMSI"
               name="imsi"
-              :label-col="{ span: 5 }"
               v-bind="modalStateFrom.validateInfos.imsi"
             >
               <a-input v-model:value="modalState.from.imsi" allow-clear>
@@ -1529,6 +1549,13 @@ onMounted(() => {
                 </template>
               </a-input>
             </a-form-item>
+            <a-form-item label="CN Type" name="cn">
+              <a-select
+                v-model:value="modalState.from.cn"
+                :options="dict.udmSubCNType"
+                :placeholder="t('common.selectPlease')"
+              />
+            </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
@@ -1553,8 +1580,10 @@ onMounted(() => {
             </a-form-item>
           </a-col>
         </a-row>
-        <a-divider orientation="left"
+
-          >Subscribed SM Data
+        <!-- SM Data ---- S -->
+        <a-divider orientation="left">
+          Subscribed SM Data
           <a-tooltip title="Add SM Data">
             <a-button
               shape="circle"
@@ -1657,6 +1686,8 @@ onMounted(() => {
             </a-row>
           </div>
         </div>
+        <!-- SM Data ---- E -->
+
         <a-collapse :bordered="false" ghost>
           <a-collapse-panel key="5G">
             <template #header>
@@ -2065,6 +2096,13 @@ onMounted(() => {
                 </template>
               </a-input>
             </a-form-item>
+            <a-form-item label="CN Type" name="cn">
+              <a-select
+                v-model:value="modalState.BatchForm.cn"
+                :options="dict.udmSubCNType"
+                :placeholder="t('common.selectPlease')"
+              />
+            </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
@@ -2089,8 +2127,10 @@ onMounted(() => {
             </a-form-item>
           </a-col>
         </a-row>
-        <a-divider orientation="left"
+
-          >Subscribed SM Data
+        <!-- SM Data ---- S -->
+        <a-divider orientation="left">
+          Subscribed SM Data
           <a-tooltip title="Add SM Data">
             <a-button
               shape="circle"
@@ -2193,6 +2233,7 @@ onMounted(() => {
             </a-row>
           </div>
         </div>
+        <!-- SM Data ---- E -->
 
         <a-collapse :bordered="false" ghost>
           <a-collapse-panel key="5G">