fix: 页面字段/接口调整

src/views/dashboard/sgwcCDR/index.vue

@@ -17,6 +17,7 @@ import {
   listSGWCDataCDR,
 } from '@/api/neData/sgwc';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
+import dayjs, { type Dayjs } from 'dayjs';
 import PQueue from 'p-queue';
 import saveAs from 'file-saver';
 import { useClipboard } from '@vueuse/core';
@@ -29,7 +30,25 @@ const queue = new PQueue({ concurrency: 1, autoStart: true });
 let neOtions = ref<Record<string, any>[]>([]);
 
 /**开始结束时间 */
-let queryRangePicker = ref<[string, string]>(['', '']);
+let queryRangePicker = ref<[Dayjs, Dayjs] | undefined>([
+  dayjs().startOf('hour'),
+  dayjs().endOf('hour'),
+]);
+/**时间范围 */
+let rangePickerPresets = ref([
+  {
+    label: 'Now hour',
+    value: [dayjs().startOf('hour'), dayjs().endOf('hour')],
+  },
+  { label: 'Today', value: [dayjs().startOf('day'), dayjs().endOf('day')] },
+  {
+    label: 'Yesterday',
+    value: [
+      dayjs().subtract(1, 'day').startOf('day'),
+      dayjs().subtract(1, 'day').endOf('day'),
+    ],
+  },
+]);
 
 /**查询参数 */
 let queryParams = reactive({
@@ -41,9 +60,9 @@ let queryParams = reactive({
   sortField: 'timestamp',
   sortOrder: 'desc',
   /**开始时间 */
-  startTime: '',
+  beginTime: undefined as undefined | number,
   /**结束时间 */
-  endTime: '',
+  endTime: undefined as undefined | number,
   /**当前页数 */
   pageNum: 1,
   /**每页条数 */
@@ -55,12 +74,12 @@ function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
     imsi: '',
     msisdn: '',
-    startTime: '',
-    endTime: '',
+    beginTime: undefined,
+    endTime: undefined,
     pageNum: 1,
     pageSize: 20,
   });
-  queryRangePicker.value = ['', ''];
+  queryRangePicker.value = [dayjs().startOf('hour'), dayjs().endOf('hour')];
   tablePagination.current = 1;
   tablePagination.pageSize = 20;
   fnGetList();
@@ -310,20 +329,30 @@ function fnGetList(pageNum?: number) {
   if (pageNum) {
     queryParams.pageNum = pageNum;
   }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.beginTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.beginTime = undefined;
+    queryParams.endTime = undefined;
   }
-  queryParams.startTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
+
   listSGWCDataCDR(toRaw(queryParams)).then(res => {
-    if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
+    if (res.code === RESULT_CODE_SUCCESS) {
       // 取消勾选
       if (tableState.selectedRowKeys.length > 0) {
         tableState.selectedRowKeys = [];
       }
-      tablePagination.total = res.total;
+      const { total, rows } = res.data;
+      tablePagination.total = total;
+      // tableState.data = rows;
       // 遍历处理cdr字符串数据
-      tableState.data = res.rows.map(item => {
+      tableState.data = rows.map((item: any) => {
         let cdrJSON = item.cdrJSON;
         if (!cdrJSON) {
           Reflect.set(item, 'cdrJSON', {});
@@ -454,12 +483,12 @@ onMounted(() => {
   useNeInfoStore()
     .fnNelist()
     .then(res => {
-      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+      if (res.code === RESULT_CODE_SUCCESS) {
         if (res.data.length > 0) {
           let arr: Record<string, any>[] = [];
-          res.data.forEach(i => {
-            if (i.neType === 'SGWC') {
-              arr.push({ value: i.neId, label: i.neName });
+          res.data.forEach((v: any) => {
+            if (v.neType === 'SGWC') {
+              arr.push({ value: v.neId, label: v.neName });
             }
           });
           neOtions.value = arr;
@@ -554,12 +583,12 @@ onBeforeUnmount(() => {
             >
               <a-range-picker
                 v-model:value="queryRangePicker"
-                allow-clear
-                bordered
+                :presets="rangePickerPresets"
+                :bordered="true"
+                :allow-clear="false"
+                style="width: 100%"
                 :show-time="{ format: 'HH:mm:ss' }"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="x"
-                style="width: 100%"
               ></a-range-picker>
             </a-form-item>
           </a-col>
@@ -768,12 +797,18 @@ onBeforeUnmount(() => {
                 <span> {{ record.cdrJSON.servedMSISDN }} </span>
               </div>
               <div>
-                <span>PGW Address Used: </span>
-                <span> {{ record.cdrJSON.pGWAddressUsed }} </span>
+                <span>GGSN Address: </span>
+                <span>
+                  {{
+                    record.cdrJSON.pGWAddressUsed || record.cdrJSON.GGSNAddress
+                  }}
+                </span>
               </div>
               <div>
-                <span>SGW Address: </span>
-                <span> {{ record.cdrJSON.sGWAddress }} </span>
+                <span>SGSN Address: </span>
+                <span>
+                  {{ record.cdrJSON.sGWAddress || record.cdrJSON.SGSNAddress }}
+                </span>
               </div>
               <div>
                 <span>RAT Type: </span>