style: kpi菜单时间去掉当前小时加入今天选择项

src/i18n/locales/en-US.ts

@@ -1001,10 +1001,10 @@ export default {
         expression:'Expression',
         description:' Description',
         kpiSet:' Statistical Settings',
-        new1Hour:'Within current hour', 
         ago1Hour:'Last 1 hour',
         ago3Hour:'Last 3 hour',
         ago6Hour:'Last 6 hour',
+        toDay:'Today',
         ago1Day:'Last 1 day',
         ago7Day:'Last 7 day',
         ago15Day:'Last 15 day',

src/i18n/locales/zh-CN.ts

@@ -1001,10 +1001,10 @@ export default {
         expression:'计算公式',
         description:'描述',
         kpiSet:'统计设置',
-        new1Hour:'当前小时内',
         ago1Hour:'过去1小时',
         ago3Hour:'过去3小时',
         ago6Hour:'过去6小时',
+        toDay:'今天',
         ago1Day:'过去1天',
         ago7Day:'过去7天',
         ago15Day:'过去15天',

src/views/perfManage/goldTarget/index.vue

@@ -86,12 +86,15 @@ let queryRangePicker = ref<[string, string]>(['', '']);
 //日期快捷选择
 const ranges = ref([
   {
-    label: t('views.perfManage.customTarget.new1Hour'),
+    label: t('views.perfManage.customTarget.toDay'),
-    value: [dayjs().startOf('day'), dayjs()],
+    value: [dayjs().startOf('hour'), dayjs()],
   },
   {
     label: t('views.perfManage.customTarget.ago1Hour'),
-    value: [dayjs().subtract(1, 'hour').startOf('hour'), dayjs().endOf('hour')],
+    value: [
+      dayjs().subtract(1, 'hour').startOf('hour'),
+      dayjs().subtract(1, 'hour').endOf('hour'),
+    ],
   },
   // {
   //   label: t('views.perfManage.customTarget.ago3Hour'),
@@ -105,16 +108,22 @@ const ranges = ref([
     label: t('views.perfManage.customTarget.ago1Day'),
     value: [
       dayjs().subtract(1, 'day').startOf('day'),
-      dayjs().subtract(1, 'day'),
+      dayjs().subtract(1, 'day').endOf('day'),
     ],
   },
   {
     label: t('views.perfManage.customTarget.ago7Day'),
-    value: [dayjs().subtract(7, 'day').startOf('day'), dayjs()],
+    value: [
+      dayjs().subtract(7, 'day').startOf('day'),
+      dayjs().subtract(1, 'day').endOf('day'),
+    ],
   },
   {
     label: t('views.perfManage.customTarget.ago15Day'),
-    value: [dayjs().subtract(15, 'day').startOf('day'), dayjs()],
+    value: [
+      dayjs().subtract(15, 'day').startOf('day'),
+      dayjs().subtract(1, 'day').endOf('day'),
+    ],
   },
 ]);
 

src/views/perfManage/kpiCReport/index.vue

@@ -86,12 +86,15 @@ let queryRangePicker = ref<[string, string]>(['', '']);
 /**时间选择 */
 const ranges = ref([
   {
-    label: t('views.perfManage.customTarget.new1Hour'),
+    label: t('views.perfManage.customTarget.toDay'),
-    value: [dayjs().startOf('day'), dayjs()],
+    value: [dayjs().startOf('hour'), dayjs()],
   },
   {
     label: t('views.perfManage.customTarget.ago1Hour'),
-    value: [dayjs().subtract(1, 'hour').startOf('hour'), dayjs().endOf('hour')],
+    value: [
+      dayjs().subtract(1, 'hour').startOf('hour'),
+      dayjs().subtract(1, 'hour').endOf('hour'),
+    ],
   },
   // {
   //   label: t('views.perfManage.customTarget.ago3Hour'),
@@ -105,16 +108,22 @@ const ranges = ref([
     label: t('views.perfManage.customTarget.ago1Day'),
     value: [
       dayjs().subtract(1, 'day').startOf('day'),
-      dayjs().subtract(1, 'day'),
+      dayjs().subtract(1, 'day').endOf('day'),
     ],
   },
   {
     label: t('views.perfManage.customTarget.ago7Day'),
-    value: [dayjs().subtract(7, 'day').startOf('day'), dayjs()],
+    value: [
+      dayjs().subtract(7, 'day').startOf('day'),
+      dayjs().subtract(1, 'day').endOf('day'),
+    ],
   },
   {
     label: t('views.perfManage.customTarget.ago15Day'),
-    value: [dayjs().subtract(15, 'day').startOf('day'), dayjs()],
+    value: [
+      dayjs().subtract(15, 'day').startOf('day'),
+      dayjs().subtract(1, 'day').endOf('day'),
+    ],
   },
 ]);
 

src/views/perfManage/kpiKeyTarget/index.vue

@@ -36,12 +36,15 @@ const neInfoStore = useNeInfoStore();
 //日期快捷选择
 const ranges = ref([
   {
-    label: t('views.perfManage.customTarget.new1Hour'),
+    label: t('views.perfManage.customTarget.toDay'),
-    value: [dayjs().startOf('day'), dayjs()],
+    value: [dayjs().startOf('hour'), dayjs()],
   },
   {
     label: t('views.perfManage.customTarget.ago1Hour'),
-    value: [dayjs().subtract(1, 'hour').startOf('hour'), dayjs().endOf('hour')],
+    value: [
+      dayjs().subtract(1, 'hour').startOf('hour'),
+      dayjs().subtract(1, 'hour').endOf('hour'),
+    ],
   },
   // {
   //   label: t('views.perfManage.customTarget.ago3Hour'),
@@ -55,16 +58,22 @@ const ranges = ref([
     label: t('views.perfManage.customTarget.ago1Day'),
     value: [
       dayjs().subtract(1, 'day').startOf('day'),
-      dayjs().subtract(1, 'day'),
+      dayjs().subtract(1, 'day').endOf('day'),
     ],
   },
   {
     label: t('views.perfManage.customTarget.ago7Day'),
-    value: [dayjs().subtract(7, 'day').startOf('day'), dayjs()],
+    value: [
+      dayjs().subtract(7, 'day').startOf('day'),
+      dayjs().subtract(1, 'day').endOf('day'),
+    ],
   },
   {
     label: t('views.perfManage.customTarget.ago15Day'),
-    value: [dayjs().subtract(15, 'day').startOf('day'), dayjs()],
+    value: [
+      dayjs().subtract(15, 'day').startOf('day'),
+      dayjs().subtract(1, 'day').endOf('day'),
+    ],
   },
 ]);
 //WebSocket连接

src/views/perfManage/kpiOverView/index.vue

@@ -60,12 +60,15 @@ const ws = ref<WS | null>(null);
 //时间选择
 const ranges = ref([
   {
-    label: t('views.perfManage.customTarget.new1Hour'),
+    label: t('views.perfManage.customTarget.toDay'),
     value: [dayjs().startOf('day'), dayjs()],
   },
   {
     label: t('views.perfManage.customTarget.ago1Hour'),
-    value: [dayjs().subtract(1, 'hour').startOf('hour'), dayjs().endOf('hour')],
+    value: [
+      dayjs().subtract(1, 'hour').startOf('hour'),
+      dayjs().subtract(1, 'hour').endOf('hour'),
+    ],
   },
   // {
   //   label: t('views.perfManage.customTarget.ago3Hour'),
@@ -79,16 +82,22 @@ const ranges = ref([
     label: t('views.perfManage.customTarget.ago1Day'),
     value: [
       dayjs().subtract(1, 'day').startOf('day'),
-      dayjs().subtract(1, 'day'),
+      dayjs().subtract(1, 'day').endOf('day'),
     ],
   },
   {
     label: t('views.perfManage.customTarget.ago7Day'),
-    value: [dayjs().subtract(7, 'day').startOf('day'), dayjs()],
+    value: [
+      dayjs().subtract(7, 'day').startOf('day'),
+      dayjs().subtract(1, 'day').endOf('day'),
+    ],
   },
   {
     label: t('views.perfManage.customTarget.ago15Day'),
-    value: [dayjs().subtract(15, 'day').startOf('day'), dayjs()],
+    value: [
+      dayjs().subtract(15, 'day').startOf('day'),
+      dayjs().subtract(1, 'day').endOf('day'),
+    ],
   },
 ]);
 //日期范围响应式变量