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

src/views/perfManage/goldTarget/index.vue

@@ -87,7 +87,7 @@ let queryRangePicker = ref<[string, string]>(['', '']);
 const ranges = ref([
   {
     label: t('views.perfManage.customTarget.toDay'),
-    value: [dayjs().startOf('hour'), dayjs()],
+    value: [dayjs().startOf('day'), dayjs()],
   },
   {
     label: t('views.perfManage.customTarget.ago1Hour'),
@@ -336,7 +336,11 @@ function fnRecordExport() {
           for (const key of keys) {
             if (tableColumnsKeyArr[i] === key) {
               const title = tableColumnsTitleArr[i];
-              kpiData[title] = item[key];
+              if (key === 'timeGroup') {
+                kpiData[title] = parseDateToStr(item[key]);
+              } else {
+                kpiData[title] = item[key];
+              }
             }
           }
         }
@@ -1309,9 +1313,7 @@ function handleSearch() {
   // 检查是否选择了网元类型和网元ID
   if (!state.neType) {
     message.warning({
-      content:
-        t('views.perfManage.goldTarget.selectNeTypeFirst') ||
-        '请先选择网元类型',
+      content: 'Please select the network element type first',
       duration: 2,
     });
     return;
@@ -1319,9 +1321,7 @@ function handleSearch() {
 
   if (state.neIds.length === 0) {
     message.warning({
-      content:
-        t('views.perfManage.goldTarget.selectNeIdsFirst') ||
-        '请选择至少一个网元',
+      content: 'Please select at least one network element',
       duration: 2,
     });
     return;

src/views/perfManage/kpiCReport/index.vue

@@ -87,7 +87,7 @@ let queryRangePicker = ref<[string, string]>(['', '']);
 const ranges = ref([
   {
     label: t('views.perfManage.customTarget.toDay'),
-    value: [dayjs().startOf('hour'), dayjs()],
+    value: [dayjs().startOf('day'), dayjs()],
   },
   {
     label: t('views.perfManage.customTarget.ago1Hour'),
@@ -334,7 +334,11 @@ function fnRecordExport() {
           for (const key of keys) {
             if (tableColumnsKeyArr[i] === key) {
               const title = tableColumnsTitleArr[i];
-              kpiData[title] = item[key];
+              if (key === 'timeGroup') {
+                kpiData[title] = parseDateToStr(item[key]);
+              } else {
+                kpiData[title] = item[key];
+              }
             }
           }
         }

src/views/perfManage/kpiKeyTarget/index.vue

@@ -37,7 +37,7 @@ const neInfoStore = useNeInfoStore();
 const ranges = ref([
   {
     label: t('views.perfManage.customTarget.toDay'),
-    value: [dayjs().startOf('hour'), dayjs()],
+    value: [dayjs().startOf('day'), dayjs()],
   },
   {
     label: t('views.perfManage.customTarget.ago1Hour'),