Merge remote-tracking branch 'origin/main' into multi-tenant

2025-02-25 14:55:22 +08:00
parent 1d02b17c20 8df5e278c8
commit 3d4d785f33
5 changed files with 134 additions and 55 deletions
--- a/.env.development
+++ b/.env.development
@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network OMC"
 VITE_APP_CODE = "OMC"

 # 应用版本
-VITE_APP_VERSION = "2.250214"
+VITE_APP_VERSION = "2.250221"

 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network OMC"
 VITE_APP_CODE = "OMC"

 # 应用版本
-VITE_APP_VERSION = "2.250214"
+VITE_APP_VERSION = "2.250221"

 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"
--- a/src/views/dashboard/imsCDR/index.vue
+++ b/src/views/dashboard/imsCDR/index.vue
@@ -24,6 +24,7 @@ import saveAs from 'file-saver';
 import PQueue from 'p-queue';
 import { listTenant } from '@/api/system/tenant';
 import { useClipboard } from '@vueuse/core';
+import dayjs, { type Dayjs } from 'dayjs';
 const { copy } = useClipboard({ legacy: true });
 const { t } = useI18n();
 const { getDict } = useDictStore();
@@ -45,7 +46,25 @@ let dict: {
 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({
@@ -60,9 +79,9 @@ let queryParams = reactive({
  sortField: 'timestamp',
  sortOrder: 'desc',
  /**开始时间 */
-  startTime: '',
+  startTime: undefined as undefined | number,
  /**结束时间 */
-  endTime: '',
+  endTime: undefined as undefined | number,
  /**当前页数 */
  pageNum: 1,
  /**每页条数 */
@@ -77,12 +96,12 @@ function fnQueryReset() {
    callerParty: '',
    calledParty: '',
    tenantName: '',
-    startTime: '',
-    endTime: '',
+    startTime: undefined,
+    endTime: undefined,
    pageNum: 1,
    pageSize: 20,
  });
-  queryRangePicker.value = ['', ''];
+  queryRangePicker.value = [dayjs().startOf('hour'), dayjs().endOf('hour')];
  tablePagination.current = 1;
  tablePagination.pageSize = 20;
  fnGetList();
@@ -343,11 +362,17 @@ function fnGetList(pageNum?: number) {
  if (pageNum) {
    queryParams.pageNum = pageNum;
  }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.startTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.startTime = undefined;
+    queryParams.endTime = undefined;
  }
-  queryParams.startTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
  listIMSDataCDR(toRaw(queryParams)).then(res => {
    if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
      // 取消勾选
@@ -612,12 +637,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>
--- a/src/views/dashboard/sgwcCDR/index.vue
+++ b/src/views/dashboard/sgwcCDR/index.vue
@@ -20,6 +20,7 @@ import { OptionsType, WS } from '@/plugins/ws-websocket';
 import PQueue from 'p-queue';
 import saveAs from 'file-saver';
 import { useClipboard } from '@vueuse/core';
+import dayjs, { type Dayjs } from 'dayjs';
 const { copy } = useClipboard({ legacy: true });
 const { t } = useI18n();
 const ws = new WS();
@@ -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: '',
+  startTime: 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: '',
+    startTime: 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,11 +329,17 @@ function fnGetList(pageNum?: number) {
  if (pageNum) {
    queryParams.pageNum = pageNum;
  }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.startTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.startTime = 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)) {
      // 取消勾选
@@ -554,12 +579,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>
@@ -767,19 +792,21 @@ onBeforeUnmount(() => {
                <span>MSISDN: </span>
                <span> {{ record.cdrJSON.servedMSISDN }} </span>
              </div>
-              <div>
-                <span>GGSN Address: </span>
-                <span>
-                  {{
-                    record.cdrJSON.pGWAddressUsed || record.cdrJSON.GGSNAddress
-                  }}
-                </span>
+              <div v-if="record.cdrJSON.pGWAddressUsed">
+                <span>PGW Address: </span>
+                <span> {{ record.cdrJSON.pGWAddressUsed }} </span>
              </div>
-              <div>
+              <div v-if="record.cdrJSON.GGSNAddress">
+                <span>GGSN Address: </span>
+                <span> {{ record.cdrJSON.GGSNAddress }} </span>
+              </div>
+              <div v-if="record.cdrJSON.sGWAddress">
+                <span>SGW Address: </span>
+                <span> {{ record.cdrJSON.sGWAddress }} </span>
+              </div>
+              <div v-if="record.cdrJSON.SGSNAddress">
                <span>SGSN Address: </span>
-                <span>
-                  {{ record.cdrJSON.sGWAddress || record.cdrJSON.SGSNAddress }}
-                </span>
+                <span> {{ record.cdrJSON.SGSNAddress }} </span>
              </div>
              <div>
                <span>RAT Type: </span>
--- a/src/views/dashboard/smscCDR/index.vue
+++ b/src/views/dashboard/smscCDR/index.vue
@@ -24,6 +24,7 @@ import PQueue from 'p-queue';
 import { listTenant } from '@/api/system/tenant';
 import { useClipboard } from '@vueuse/core';
 import { hasPermissions } from '@/plugins/auth-user';
+import dayjs, { type Dayjs } from 'dayjs';
 const { copy } = useClipboard({ legacy: true });
 const { getDict } = useDictStore();
 const { t } = useI18n();
@@ -42,7 +43,25 @@ let dict: {
 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({
@@ -58,9 +77,9 @@ let queryParams = reactive({
  sortField: 'timestamp',
  sortOrder: 'desc',
  /**开始时间 */
-  startTime: '',
+  startTime: undefined as undefined | number,
  /**结束时间 */
-  endTime: '',
+  endTime: undefined as undefined | number,
  /**当前页数 */
  pageNum: 1,
  /**每页条数 */
@@ -76,12 +95,12 @@ function fnQueryReset() {
    calledParty: '',
    /** 租户名称*/
    tenantName: '',
-    startTime: '',
-    endTime: '',
+    startTime: undefined,
+    endTime: undefined,
    pageNum: 1,
    pageSize: 20,
  });
-  queryRangePicker.value = ['', ''];
+  queryRangePicker.value = [dayjs().startOf('hour'), dayjs().endOf('hour')];
  tablePagination.current = 1;
  tablePagination.pageSize = 20;
  fnGetList();
@@ -317,11 +336,19 @@ function fnGetList(pageNum?: number) {
  if (pageNum) {
    queryParams.pageNum = pageNum;
  }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.startTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.startTime = undefined;
+    queryParams.endTime = undefined;
  }
-  queryParams.startTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
+
  listSMSCDataCDR(toRaw(queryParams)).then(res => {
    if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
      // 取消勾选
@@ -579,12 +606,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>