From b3e976130538ea33e6e2260c54317119c6a655ba Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 20 Feb 2025 10:20:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20SGWC-CDR=E5=AD=97=E6=AE=B5=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4SGSN/GGSN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/sgwcCDR/index.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/dashboard/sgwcCDR/index.vue b/src/views/dashboard/sgwcCDR/index.vue
index b54704fd..9f5c6a25 100644
--- a/src/views/dashboard/sgwcCDR/index.vue
+++ b/src/views/dashboard/sgwcCDR/index.vue
@@ -768,12 +768,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>

From f60e530636dc22bec4a9f32d13bc110a7874a595 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 20 Feb 2025 10:21:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?sytle:=20=E5=A4=9A=E8=AF=AD=E8=A8=80EN?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index b4b23ead..2f2b12d9 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -1206,7 +1206,7 @@ export default {
         dirCd: "Enter Dir",
         viewAs: 'View Action',
         reload: "Reload",
-        follow: 'Monitoring Content',
+        follow: 'Enable Instant Update',
         tailChar: 'End Characters',
         tailLines: 'End Lines',
       },

From bae61108be234f109c80d495176516a4217b6b04 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 20 Feb 2025 19:24:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E7=BC=96=E8=AF=91=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/perfManage/goldTarget/index.vue   |   2 +-
 src/views/perfManage/kpiCReport/index.vue   | 125 +++++++++++++++-----
 src/views/perfManage/kpiKeyTarget/index.vue |  18 ++-
 3 files changed, 109 insertions(+), 36 deletions(-)

diff --git a/src/views/perfManage/goldTarget/index.vue b/src/views/perfManage/goldTarget/index.vue
index f56dfd12..5e27a4b2 100644
--- a/src/views/perfManage/goldTarget/index.vue
+++ b/src/views/perfManage/goldTarget/index.vue
@@ -1084,7 +1084,7 @@ onBeforeUnmount(() => {
             :scroll="{ y: 250 }"
             size="small"
             :custom-row="
-              record => ({
+              (record:any) => ({
                 onClick: () => handleRowClick(record),
                 class: selectedRow.includes(record.kpiId) ? 'selected-row' : '',
               })
diff --git a/src/views/perfManage/kpiCReport/index.vue b/src/views/perfManage/kpiCReport/index.vue
index f53e45f3..7dc3d6ca 100644
--- a/src/views/perfManage/kpiCReport/index.vue
+++ b/src/views/perfManage/kpiCReport/index.vue
@@ -757,7 +757,7 @@ const selectedUnit = ref<string | null>(null);
 // 添加处理行点击的方法
 function handleRowClick(record: any) {
   const index = selectedRow.value.indexOf(record.kpiId);
-  console.log(record)
+  console.log(record);
   // 如果已经选中，取消选中
   if (index > -1) {
     selectedRow.value.splice(index, 1);
@@ -766,12 +766,12 @@ function handleRowClick(record: any) {
     if (selectedRow.value.length === 0) {
       selectedUnit.value = null;
     }
-
   } else {
-
     // 检查单位是否一致
     if (selectedUnit.value && selectedUnit.value !== record.unit) {
-      message.error(`${t('views.perfManage.customTarget.unitSelect')} ${selectedUnit.value}`);
+      message.error(
+        `${t('views.perfManage.customTarget.unitSelect')} ${selectedUnit.value}`
+      );
       return;
     }
 
@@ -940,28 +940,50 @@ onBeforeUnmount(() => {
 
 <template>
   <PageContainer>
-    <a-card v-show="tableState.seached" :bordered="false" :body-style="{ marginBottom: '24px', paddingBottom: 0 }">
+    <a-card
+      v-show="tableState.seached"
+      :bordered="false"
+      :body-style="{ marginBottom: '24px', paddingBottom: 0 }"
+    >
       <!-- 表格搜索栏 -->
       <a-form :model="queryParams" name="queryParamsFrom" layout="horizontal">
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item name="neType" :label="t('views.ne.common.neType')">
-              <a-cascader v-model:value="state.neType" :options="neCascaderOptions" :allow-clear="false"
-                :placeholder="t('common.selectPlease')" />
+              <a-cascader
+                v-model:value="state.neType"
+                :options="neCascaderOptions"
+                :allow-clear="false"
+                :placeholder="t('common.selectPlease')"
+              />
             </a-form-item>
           </a-col>
           <a-col :lg="10" :md="12" :xs="24">
-            <a-form-item :label="t('views.perfManage.goldTarget.timeFrame')" name="timeFrame">
-              <a-range-picker v-model:value="queryRangePicker" bordered :allow-clear="false"
-                :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" value-format="x" :presets="ranges"
-                style="width: 100%"></a-range-picker>
+            <a-form-item
+              :label="t('views.perfManage.goldTarget.timeFrame')"
+              name="timeFrame"
+            >
+              <a-range-picker
+                v-model:value="queryRangePicker"
+                bordered
+                :allow-clear="false"
+                :show-time="{ format: 'HH:mm:ss' }"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="x"
+                :presets="ranges"
+                style="width: 100%"
+              ></a-range-picker>
             </a-form-item>
           </a-col>
 
           <a-col :lg="2" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
-                <a-button type="primary" :loading="tableState.loading" @click.prevent="fnGetListTitle()">
+                <a-button
+                  type="primary"
+                  :loading="tableState.loading"
+                  @click.prevent="fnGetListTitle()"
+                >
                   <template #icon>
                     <SearchOutlined />
                   </template>
@@ -978,7 +1000,11 @@ onBeforeUnmount(() => {
       <!-- 插槽-卡片左侧侧 -->
       <template #title>
         <a-space :size="8" align="center">
-          <a-button type="primary" :loading="tableState.loading" @click.prevent="fnChangShowType()">
+          <a-button
+            type="primary"
+            :loading="tableState.loading"
+            @click.prevent="fnChangShowType()"
+          >
             <template #icon>
               <AreaChartOutlined />
             </template>
@@ -988,8 +1014,12 @@ onBeforeUnmount(() => {
                 : t('views.perfManage.goldTarget.kpiTableTitle')
             }}
           </a-button>
-          <a-button type="dashed" :loading="tableState.loading" @click.prevent="fnRecordExport()"
-            v-show="tableState.showTable">
+          <a-button
+            type="dashed"
+            :loading="tableState.loading"
+            @click.prevent="fnRecordExport()"
+            v-show="tableState.showTable"
+          >
             <template #icon>
               <ExportOutlined />
             </template>
@@ -1009,8 +1039,12 @@ onBeforeUnmount(() => {
               </template>
             </a-button>
           </a-tooltip>
-          <TableColumnsDnd v-if="tableColumns.length > 0" :cache-id="`kpiTarget_${state.neType[0]}`"
-            :columns="tableColumns" v-model:columns-dnd="tableColumnsDnd"></TableColumnsDnd>
+          <TableColumnsDnd
+            v-if="tableColumns.length > 0"
+            :cache-id="`kpiTarget_${state.neType[0]}`"
+            :columns="tableColumns"
+            v-model:columns-dnd="tableColumnsDnd"
+          ></TableColumnsDnd>
           <a-tooltip>
             <template #title>{{ t('common.sizeText') }}</template>
             <a-dropdown trigger="click" placement="bottomRight">
@@ -1020,7 +1054,10 @@ onBeforeUnmount(() => {
                 </template>
               </a-button>
               <template #overlay>
-                <a-menu :selected-keys="[tableState.size as string]" @click="fnTableSize">
+                <a-menu
+                  :selected-keys="[tableState.size as string]"
+                  @click="fnTableSize"
+                >
                   <a-menu-item key="default">
                     {{ t('common.size.default') }}
                   </a-menu-item>
@@ -1049,32 +1086,60 @@ onBeforeUnmount(() => {
               size="small"
             />
           </a-form-item> -->
-          <a-form-item :label="t('views.perfManage.goldTarget.realTimeData')" name="chartRealTime">
-            <a-switch :disabled="tableState.loading" v-model:checked="state.chartRealTime"
-              :checked-children="t('common.switch.open')" :un-checked-children="t('common.switch.shut')"
-              @change="fnRealTimeSwitch" size="small" />
+          <a-form-item
+            :label="t('views.perfManage.goldTarget.realTimeData')"
+            name="chartRealTime"
+          >
+            <a-switch
+              :disabled="tableState.loading"
+              v-model:checked="state.chartRealTime"
+              :checked-children="t('common.switch.open')"
+              :un-checked-children="t('common.switch.shut')"
+              @change="fnRealTimeSwitch"
+              size="small"
+            />
           </a-form-item>
         </a-form>
       </template>
 
       <!-- 表格列表 -->
-      <a-table v-show="tableState.showTable" class="table" row-key="id" :columns="tableColumnsDnd"
-        :loading="tableState.loading" :data-source="tableState.data" :size="tableState.size"
-        :pagination="tablePagination" :scroll="{ x: tableColumnsDnd.length * 200, y: 'calc(100vh - 480px)' }"
-        @resizeColumn="(w: number, col: any) => (col.width = w)" :show-expand-column="false" @change="fnTableChange">
+      <a-table
+        v-show="tableState.showTable"
+        class="table"
+        row-key="id"
+        :columns="tableColumnsDnd"
+        :loading="tableState.loading"
+        :data-source="tableState.data"
+        :size="tableState.size"
+        :pagination="tablePagination"
+        :scroll="{ x: tableColumnsDnd.length * 200, y: 'calc(100vh - 480px)' }"
+        @resizeColumn="(w: number, col: any) => (col.width = w)"
+        :show-expand-column="false"
+        @change="fnTableChange"
+      >
       </a-table>
 
       <!-- 图表 -->
       <div style="padding: 24px" v-show="!tableState.showTable">
-        <div ref="kpiChartDom" class="chart-container" style="height: 450px; width: 100%"></div>
+        <div
+          ref="kpiChartDom"
+          class="chart-container"
+          style="height: 450px; width: 100%"
+        ></div>
 
         <div class="table-container">
-          <a-table :columns="statsColumns" :data-source="kpiStats" :pagination="false" :scroll="{ y: 250 }" size="small"
-            :custom-row="record => ({
+          <a-table
+            :columns="statsColumns"
+            :data-source="kpiStats"
+            :pagination="false"
+            :scroll="{ y: 250 }"
+            size="small"
+            :custom-row="(record:any) => ({
               onClick: () => handleRowClick(record),
               class: selectedRow.includes(record.kpiId) ? 'selected-row' : '',
             })
-              ">
+              "
+          >
             <template #headerCell="{ column }">
               <template v-if="column.key === 'total'">
                 <span>
diff --git a/src/views/perfManage/kpiKeyTarget/index.vue b/src/views/perfManage/kpiKeyTarget/index.vue
index 2b3931e2..2aa67c6d 100644
--- a/src/views/perfManage/kpiKeyTarget/index.vue
+++ b/src/views/perfManage/kpiKeyTarget/index.vue
@@ -1333,7 +1333,7 @@ const handleTabChange = async (activeKey: string, type: AllChartType) => {
                   :scroll="{ y: 'true' }"
                   :loading="chartStates[type].tableState.loading"
                   :custom-row="
-                    record => ({
+                    (record:any) => ({
                       onClick: () => handleRowClick(record, type),
                       class: selectedRows[type]?.includes(record.kpiId)
                         ? 'selected-row'
@@ -1348,7 +1348,9 @@ const handleTabChange = async (activeKey: string, type: AllChartType) => {
                         <a-tooltip placement="bottom">
                           <template #title>
                             <span>
-                              {{ t('views.perfManage.kpiOverView.totalValueTip') }}
+                              {{
+                                t('views.perfManage.kpiOverView.totalValueTip')
+                              }}
                             </span>
                           </template>
                           <InfoCircleOutlined />
@@ -1361,7 +1363,9 @@ const handleTabChange = async (activeKey: string, type: AllChartType) => {
                         <a-tooltip placement="bottom">
                           <template #title>
                             <span>
-                              {{ t('views.perfManage.kpiOverView.avgValueTip') }}
+                              {{
+                                t('views.perfManage.kpiOverView.avgValueTip')
+                              }}
                             </span>
                           </template>
                           <InfoCircleOutlined />
@@ -1374,7 +1378,9 @@ const handleTabChange = async (activeKey: string, type: AllChartType) => {
                         <a-tooltip placement="bottom">
                           <template #title>
                             <span>
-                              {{ t('views.perfManage.kpiOverView.maxValueTip') }}
+                              {{
+                                t('views.perfManage.kpiOverView.maxValueTip')
+                              }}
                             </span>
                           </template>
                           <InfoCircleOutlined />
@@ -1387,7 +1393,9 @@ const handleTabChange = async (activeKey: string, type: AllChartType) => {
                         <a-tooltip placement="bottom">
                           <template #title>
                             <span>
-                              {{ t('views.perfManage.kpiOverView.minValueTip') }}
+                              {{
+                                t('views.perfManage.kpiOverView.minValueTip')
+                              }}
                             </span>
                           </template>
                           <InfoCircleOutlined />