调整基站接口

src/api/neUser/base5G.ts

@@ -8,17 +8,10 @@ import { parseObjLineToHump } from '@/utils/parse-utils';
  * @returns object
  */
 export async function listBase5G(query: Record<string, any>) {
-  const realName = query.neType[0];
-  //delete query['neName'];
   const result = await request({
-    url: `/api/rest/ueManagement/v1/elementType/${realName}/objectType/nbInfo`,
+    url: `/api/rest/ueManagement/v1/elementType/${query.neType.toLowerCase()}/objectType/nbInfo`,
     method: 'get',
-    params: {
-      neId: query.neType[1],
-      nbId: query.id,
-      pageNum: query.pageNum,
-      pageSize: query.pageSize,
-    },
+    params: query,
   });
   let data: DataList = {
     total: 0,

src/views/dashboard/overview/components/AlarnTypeBar/index.vue

@@ -98,7 +98,7 @@ function initPicture() {
     if (resArr[0].status === 'fulfilled') {
       testArr = completeData(resArr[0].value.data, wantArr);
       testArr.map((item: any) => {
-        item.name = t('views.index.' + item.name) + ':' + item.value;
+        item.name = t('views.index.' + item.name) + ': ' + item.value;
         pieArr.push(item);
       });
     }
@@ -178,20 +178,16 @@ function initPicture() {
             shadowBlur: 10,
             shadowOffsetX: 0,
             shadowColor: 'rgba(0, 0, 0, 0.5)',
-            // color: function (params: any) {
-            //   console.log(params);
-            //   // 设置每个数据项的颜色
-            //   var colorList = {
-            //     '#FFAE57',
-            //     '#FF7853',
-            //     '#EA5151',
-            //     '#CC3F57',
-            //     '#9A2555',
-            //   }
-
-            //   ;
-            //   return colorList[params.dataIndex];
-            // },
+            color: function (colors: any) {
+              var colorList = [
+                '#FFAE57',
+                '#FF7853',
+                '#EA5151',
+                '#CC3F57',
+                '#CC0000',
+              ];
+              return colorList[colors.dataIndex];
+            },
           },
         },
         //柱状

src/views/dashboard/overview/components/UPFFlow/index.vue

@@ -112,7 +112,7 @@ function initPicture() {
       value: [upValue, downValue],
     };
 
-    var color = ['rgba(230, 234, 101', 'rgba(92, 123, 217'];
+    var color = ['rgba(7,217,162', 'rgba(92, 123, 217'];
     var lineY: any = [];
 
     for (var i = 0; i < charts.names.length; i++) {
@@ -133,7 +133,7 @@ function initPicture() {
             },
             {
               offset: 1,
-              color: color[x] + ', 0)',
+              color: color[x] + ', 0.5)',
             },
           ]),
           shadowColor: 'rgba(0, 0, 0, 0.1)',

src/views/dashboard/overview/index.vue

@@ -104,7 +104,9 @@ onMounted(() => {
       pageSize: '20',
     }),
     listBase5G({
-      neType: ['AMF', '001'],
+      //
+      neType: 'AMF',
+      neId: '001',
       id: '',
       pageNum: 1,
       /**每页条数 */

src/views/neUser/base5G/index.vue

@@ -13,16 +13,13 @@ const neInfoStore = useNeInfoStore();
 
 const { t } = useI18n();
 
-/**网元参数 */
-let neOtions = ref<Record<string, any>[]>([]);
-
 /**网元参数 */
 let neCascaderOptions = ref<Record<string, any>[]>([]);
 
 /**查询参数 */
 let queryParams = reactive({
   /**网元ID */
-  neId: undefined,
+  neId: '',
   /**网元类型 */
   neType: ['', ''],
   /**GNB_ID */
@@ -143,7 +140,15 @@ function fnGetList(pageNum?: number) {
   if (pageNum) {
     queryParams.pageNum = pageNum;
   }
-  listBase5G(toRaw(queryParams)).then(res => {
+
+  let toBack: Record<string, any> = {
+    neType: queryParams.neType[0],
+    neId: queryParams.neType[1],
+    nbId: queryParams.id,
+    pageNum: queryParams.pageNum,
+    pageSize: queryParams.pageSize,
+  };
+  listBase5G(toRaw(toBack)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 取消勾选
       if (tableState.selectedRowKeys.length > 0) {
@@ -166,34 +171,6 @@ function fnGetList(pageNum?: number) {
 
 onMounted(() => {
   // 获取网元网元列表
-  // useNeInfoStore()
-  //   .fnNelist()
-  //   .then(res => {
-  //     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
-  //       if (res.data.length > 0) {
-  //         let arr: Record<string, any>[] = [];
-  //         res.data.forEach(i => {
-  //           if (i.neType === 'AMF' || i.neType === 'MME') {
-  //             arr.push({ value: i.neType, label: i.neName });
-  //           }
-  //         });
-  //         neOtions.value = arr;
-  //         if (arr.length > 0) {
-  //           queryParams.neType = arr[0].value;
-  //           queryParams.neId = arr[0].label.split('_')[1];
-  //         }
-  //       }
-  //     } else {
-  //       message.warning({
-  //         content: t('common.noData'),
-  //         duration: 2,
-  //       });
-  //     }
-  //   })
-  //   .finally(() => {
-  //     // 获取列表数据
-  //     fnGetList();
-  //   });
 
   neInfoStore
     .fnNelist()
@@ -248,13 +225,6 @@ onMounted(() => {
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
-            <!-- <a-form-item :label="t('views.neUser.base5G.neType')" name="neId ">
-              <a-select
-                v-model:value="queryParams.neType"
-                :options="neOtions"
-                :placeholder="t('common.selectPlease')"
-              />
-            </a-form-item> -->
             <a-form-item name="neId" :label="t('views.neUser.base5G.neType')">
               <a-cascader
                 v-model:value="queryParams.neType"