fix: 页面字段/接口调整

src/views/perfManage/goldTarget/index.vue

@@ -25,6 +25,7 @@ import {
   h,
   watch,
 } from 'vue';
+import dayjs, { Dayjs } from 'dayjs';
 import { PageContainer } from 'antdv-pro-layout';
 import { message, Modal, TableColumnType } from 'ant-design-vue/es';
 import { SizeType } from 'ant-design-vue/es/config-provider';
@@ -61,14 +62,6 @@ echarts.use([
   UniversalTransition,
 ]);
 
-type EChartsOption = echarts.ComposeOption<
-  | TooltipComponentOption
-  | GridComponentOption
-  | LegendComponentOption
-  | DataZoomComponentOption
-  | LineSeriesOption
->;
-
 /**图DOM节点实例对象 */
 const kpiChartDom = ref<HTMLElement | undefined>(undefined);
 
@@ -78,8 +71,26 @@ const kpiChart = ref<any>(null);
 /**网元参数 */
 let neCascaderOptions = 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 tableColumns = ref<any[]>([]);
@@ -150,9 +161,9 @@ let queryParams: any = reactive({
   /**颗粒度 */
   interval: 900,
   /**开始时间 */
-  startTime: '',
+  beginTime: undefined as undefined | number,
   /**结束时间 */
-  endTime: '',
+  endTime: undefined as undefined | number,
   /**排序字段 */
   sortField: 'timeGroup',
   /**排序方式 */
@@ -314,7 +325,7 @@ function fnGetListTitle() {
   getKPITitle(state.neType[0])
     .then(res => {
       //处理getKPITitle返回的结果
-      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+      if (res.code === RESULT_CODE_SUCCESS) {
         //检查值
         tableColumns.value = []; //设为空数组
         const columns: any[] = []; //初始化，构建新表头
@@ -374,12 +385,23 @@ function fnGetList() {
   tableState.loading = true;
   queryParams.neType = state.neType[0];
   queryParams.neId = state.neType[1];
-  queryParams.startTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
+
+  // 时间范围
+  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;
+  }
+
   listKPIData(toRaw(queryParams))
     .then(res => {
       tableState.loading = false;
-      if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+      if (res.code === RESULT_CODE_SUCCESS) {
         tablePagination.total = res.data.length;
         tableState.data = res.data;
 
@@ -804,7 +826,7 @@ onMounted(() => {
   // 目前支持的 AMF AUSF MME MOCNGW NSSF SMF UDM UPF PCF
   // 获取网元网元列表
   neInfoStore.fnNelist().then(res => {
-    if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+    if (res.code === RESULT_CODE_SUCCESS) {
       if (res.data.length > 0) {
         // 过滤不可用的网元
         neCascaderOptions.value = neInfoStore.getNeCascaderOptions.filter(
@@ -836,17 +858,6 @@ onMounted(() => {
           queryParams.neId = info.neId;
         }
 
-        // 查询当前小时
-        const now = new Date();
-        now.setMinutes(0, 0, 0);
-        // 设置起始时间为整点前一小时
-        const startTime = new Date(now);
-        startTime.setHours(now.getHours() - 1);
-        queryRangePicker.value[0] = `${startTime.getTime()}`;
-        // 设置结束时间为整点
-        const endTime = new Date(now);
-        endTime.setMinutes(59, 59, 59);
-        queryRangePicker.value[1] = `${endTime.getTime()}`;
         fnGetListTitle();
         // 绘图
         fnRanderChart();
@@ -892,12 +903,12 @@ onBeforeUnmount(() => {
             >
               <a-range-picker
                 v-model:value="queryRangePicker"
-                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>