Merge branch 'lichang' into lite

.env.development

@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network OMC"
 VITE_APP_CODE = "OMC"
 
 # 应用版本
-VITE_APP_VERSION = "2.250430"
+VITE_APP_VERSION = "2.250509"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"

.env.production

@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network OMC"
 VITE_APP_CODE = "OMC"
 
 # 应用版本
-VITE_APP_VERSION = "2.250430"
+VITE_APP_VERSION = "2.250509"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"

src/i18n/locales/en-US.ts

@@ -1085,6 +1085,7 @@ export default {
       },
       task: {
         traceId: 'Tracing No',
+        title: 'Tracing Title',
         trackType: 'Tracing Type',
         trackTypePlease: 'Please select a tracing type',
         creater: 'Created by',

src/i18n/locales/zh-CN.ts

@@ -1085,6 +1085,7 @@ export default {
       },
       task: {
         traceId: '跟踪编号',
+        title: '跟踪标题',
         trackType: '跟踪类型',
         trackTypePlease: '请选择跟踪类型',
         creater: '创建人',

src/plugins/http-fetch.ts

@@ -242,8 +242,10 @@ async function beforeResponse(
       setRefreshToken(result.data.refreshToken, result.data.refreshExpiresIn);
       return await request(options);
     } else {
-      delAccessToken();
+      debugger
-      delRefreshToken();
+      console.warn(result)
+      // delAccessToken();
+      // delRefreshToken();
       window.location.reload();
     }
   }

src/views/traceManage/task/analyze.vue

@@ -7,6 +7,7 @@ import { SizeType } from 'ant-design-vue/es/config-provider';
 import { ColumnsType } from 'ant-design-vue/es/table';
 import DissectionTree from '../tshark/components/DissectionTree.vue';
 import DissectionDump from '../tshark/components/DissectionDump.vue';
+import TaskInfoIcon from './components/TaskInfoIcon.vue';
 import {
   RESULT_CODE_ERROR,
   RESULT_CODE_SUCCESS,
@@ -586,6 +587,8 @@ onBeforeUnmount(() => {
             {{ t('views.traceManage.task.traceId') }}: 
             <strong>{{ traceId }}</strong>
           </span>
+          <!-- 任务信息 -->
+          <TaskInfoIcon :trace-id="traceId" />
         </a-space>
       </template>
 

src/views/traceManage/task/components/TaskInfoIcon.vue

@@ -0,0 +1,107 @@
+<script setup lang="ts">
+import { onMounted, reactive, ref } from 'vue';
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import useDictStore from '@/store/modules/dict';
+import useI18n from '@/hooks/useI18n';
+import { parseDateToStr } from '@/utils/date-utils';
+import { getTraceTask } from '@/api/trace/task';
+const { t } = useI18n();
+const { getDict } = useDictStore();
+
+const props = defineProps({
+  traceId: {
+    type: [String, Number],
+    required: true,
+  },
+});
+
+/**字典数据 */
+let dict: {
+  /**跟踪类型 */
+  traceType: DictType[];
+  /**跟踪接口 */
+  traceInterfaces: DictType[];
+} = reactive({
+  traceType: [],
+  traceInterfaces: [],
+});
+
+const task = ref<Record<string, any>>({});
+
+/**查询任务信息 */
+function fnGetTaskInfo(id: string | number) {
+  getTraceTask(id).then(res => {
+    if (res.code === RESULT_CODE_SUCCESS) {
+      Object.assign(task.value, res.data);
+    }
+  });
+}
+
+onMounted(() => {
+  // 初始字典数据
+  Promise.allSettled([getDict('trace_type'), getDict('trace_interfaces')])
+    .then(resArr => {
+      if (resArr[0].status === 'fulfilled') {
+        dict.traceType = resArr[0].value;
+      }
+      if (resArr[1].status === 'fulfilled') {
+        dict.traceInterfaces = resArr[1].value;
+      }
+    })
+    .finally(() => {
+      // 获取信息
+      fnGetTaskInfo(props.traceId);
+    });
+});
+</script>
+
+<template>
+  <!-- 任务信息 -->
+  <a-popover placement="bottomRight">
+    <template #content>
+      <div>
+        <strong>{{ t('views.ne.common.neType') }}:&nbsp;</strong>
+        <span v-for="v in task.neList.split(',')"> {{ v }} &nbsp;&nbsp; </span>
+      </div>
+      <div>
+        <strong> {{ t('views.traceManage.task.startTime') }}:&nbsp; </strong>
+        {{ parseDateToStr(task.startTime) }}
+      </div>
+      <div>
+        <strong> {{ t('views.traceManage.task.endTime') }}:&nbsp; </strong>
+        {{ parseDateToStr(task.endTime) }}
+      </div>
+      <div>
+        <strong>{{ t('views.traceManage.task.trackType') }}:&nbsp;</strong>
+        <DictTag :options="dict.traceType" :value="task.traceType" />
+      </div>
+      <!-- 接口跟踪 -->
+      <div v-if="task.traceType === '1'">
+        <strong>{{ t('views.traceManage.task.interfaces') }}:&nbsp;</strong>
+        <span v-for="v in task.interfaces.split(',')">
+          {{ v }} &nbsp;&nbsp;
+        </span>
+      </div>
+      <!-- 设备跟踪 -->
+      <div v-if="task.traceType === '2'">
+        <strong>{{ t('views.traceManage.task.srcIp') }}:&nbsp;</strong>
+        {{ task.srcIp }}
+      </div>
+      <div v-if="task.traceType === '2'">
+        <strong>{{ t('views.traceManage.task.dstIp') }}:&nbsp;</strong>
+        {{ task.dstIp }}
+      </div>
+      <!-- 用户跟踪 -->
+      <div v-if="task.traceType === '3'">
+        <strong>{{ t('views.traceManage.task.imsi') }}:&nbsp;</strong>
+        {{ task.imsi }}
+      </div>
+    </template>
+    <template #title>
+      <span>{{ task.title }}</span>
+    </template>
+    <QuestionCircleOutlined />
+  </a-popover>
+</template>
+
+<style lang="css" scoped></style>

src/views/traceManage/task/data.vue

@@ -10,6 +10,7 @@ import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useDictStore from '@/store/modules/dict';
 import useTabsStore from '@/store/modules/tabs';
 import { type Dayjs } from 'dayjs';
+import TaskInfoIcon from './components/TaskInfoIcon.vue';
 import useI18n from '@/hooks/useI18n';
 import { getTraceData, listTraceData } from '@/api/trace/task';
 import { decode } from 'js-base64';
@@ -215,7 +216,7 @@ function fnTableChange(pagination: any, filters: any, sorter: any, extra: any) {
   fnGetList(1);
 }
 
-/**查询备份信息列表, pageNum初始页数 */
+/**查询数据信息列表, pageNum初始页数 */
 function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
@@ -429,6 +430,8 @@ onMounted(() => {
             {{ t('views.traceManage.task.traceId') }}: 
             <strong>{{ traceId }}</strong>
           </span>
+          <!-- 任务信息 -->
+          <TaskInfoIcon :trace-id="traceId" />
         </a-space>
       </template>
 

src/views/traceManage/task/index.vue

@@ -40,6 +40,9 @@ let dict: {
   traceInterfaces: [],
 });
 
+/**开始结束时间 */
+let queryRangePicker = ref<[Dayjs, Dayjs] | undefined>(undefined);
+
 /**网元类型_多neId */
 let neCascaderOptions = ref<Record<string, any>[]>([]);
 
@@ -47,9 +50,12 @@ let neCascaderOptions = ref<Record<string, any>[]>([]);
 let queryParams = reactive({
   /**网元类型 */
   neType: '',
-  /**记录时间 */
+  /**开始时间 */
-  startTime: '',
+  startTime: undefined as undefined | number,
-  endTime: '',
+  /**结束时间 */
+  endTime: undefined as undefined | number,
+  /**标题 */
+  title: '',
   /**排序字段 */
   sortField: 'start_time',
   /**排序方式 */
@@ -64,13 +70,15 @@ let queryParams = reactive({
 function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
     neType: '',
-    startTime: '',
+    startTime: undefined,
-    endTime: '',
+    endTime: undefined,
+    title: '',
     sortField: 'start_time',
     sortOrder: 'asc',
     pageNum: 1,
     pageSize: 20,
   });
+  queryRangePicker.value = undefined;
   tablePagination.current = 1;
   tablePagination.pageSize = 20;
   fnGetList();
@@ -107,6 +115,13 @@ let tableColumns: ColumnsType = [
     align: 'left',
     width: 150,
   },
+  {
+    title: t('views.traceManage.task.title'),
+    dataIndex: 'title',
+    align: 'left',
+    width: 200,
+    ellipsis: true,
+  },
   {
     title: t('views.traceManage.task.trackType'),
     dataIndex: 'traceType',
@@ -237,6 +252,19 @@ function fnGetList(pageNum?: number) {
   if (pageNum) {
     queryParams.pageNum = pageNum;
   }
+
+  // 时间范围
+  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;
+  }
+
   listTraceTask(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       // 取消勾选
@@ -275,11 +303,12 @@ type ModalStateType = {
   from: {
     id?: string;
     neList: string; // 网元列表 neType_neId 例如 UDM_001,AMF_001
-    /**1-Interface,2-Device,3-User */
-    traceType: string;
     startTime?: number;
     endTime?: number;
+    title: string;
     remark?: string;
+    /**1-Interface,2-Device,3-User */
+    traceType: string;
     /**1接口跟踪 */
     interfaces?: string;
     /**2设备跟踪 */
@@ -306,10 +335,11 @@ let modalState: ModalStateType = reactive({
     id: undefined,
     neList: '',
     traceId: undefined,
-    traceType: '3',
     startTime: undefined,
     endTime: undefined,
+    title: '',
     remark: '',
+    traceType: '3',
     /**1接口跟踪 */
     interfaces: '',
     /**2设备跟踪 */
@@ -345,6 +375,12 @@ const modalStateFrom = Form.useForm(
         message: t('views.traceManage.task.rangePickerPlease'),
       },
     ],
+    title: [
+      {
+        required: true,
+        message: t('common.inputPlease'),
+      },
+    ],
     // 用户跟踪
     imsi: [
       {
@@ -499,7 +535,7 @@ function fnModalOpenByEdit(id?: string) {
  */
 function fnModalOk() {
   const from = toRaw(modalState.from);
-  let valids = ['traceType', 'neList', 'endTime'];
+  let valids = ['title', 'traceType', 'neList', 'endTime'];
   if (from.traceType === '1') {
     valids = valids.concat(['interfaces']);
   }
@@ -577,7 +613,7 @@ onMounted(() => {
   );
 
   // 获取网元网元列表
-  neCascaderOptions.value = neListStore.getNeSelectOtions.filter(
+  neCascaderOptions.value = neListStore.getNeCascaderOptions.filter(
     (item: any) => {
       return ['AMF', 'AUSF', 'SMF', 'UDM', 'PCF'].includes(item.value); // 过滤不可用的网元
     }
@@ -616,32 +652,15 @@ onMounted(() => {
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.traceManage.task.startTime')"
+              :label="t('views.traceManage.task.title')"
-              name="startTime"
+              name="title"
             >
-              <a-date-picker
+              <a-input
-                show-time
+                v-model:value="queryParams.title"
-                v-model:value="queryParams.startTime"
+                allow-clear
-                format="YYYY-MM-DD HH:mm:ss"
+                :placeholder="t('common.inputPlease')"
-                value-format="x"
+              >
-                :placeholder="t('views.traceManage.task.startTime')"
+              </a-input>
-                style="width: 100%"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.traceManage.task.endTime')"
-              name="endTime"
-            >
-              <a-date-picker
-                show-time
-                v-model:value="queryParams.endTime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="x"
-                :placeholder="t('views.traceManage.task.endTime')"
-                style="width: 100%"
-              />
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
@@ -658,6 +677,22 @@ onMounted(() => {
               </a-space>
             </a-form-item>
           </a-col>
+
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.traceManage.task.rangePicker')"
+              name="queryRangePicker"
+            >
+              <a-range-picker
+                v-model:value="queryRangePicker"
+                :bordered="true"
+                :allow-clear="false"
+                style="width: 100%"
+                :show-time="{ format: 'HH:mm:ss' }"
+                format="YYYY-MM-DD HH:mm:ss"
+              ></a-range-picker>
+            </a-form-item>
+          </a-col>
         </a-row>
       </a-form>
     </a-card>
@@ -826,6 +861,28 @@ onMounted(() => {
         :label-wrap="true"
         :disabled="!!modalState.from.id"
       >
+        <a-form-item
+          :label="t('views.traceManage.task.title')"
+          name="title"
+          v-bind="modalStateFrom.validateInfos.title"
+        >
+          <a-input
+            v-model:value="modalState.from.title"
+            allow-clear
+            :placeholder="t('common.inputPlease')"
+          >
+          </a-input>
+        </a-form-item>
+        <a-form-item :label="t('views.traceManage.task.remark')" name="remark">
+          <a-textarea
+            v-model:value="modalState.from.remark"
+            :auto-size="{ minRows: 1, maxRows: 6 }"
+            :maxlength="450"
+            :show-count="true"
+            :placeholder="t('views.traceManage.task.remarkPlease')"
+          />
+        </a-form-item>
+
         <a-row>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
@@ -875,21 +932,8 @@ onMounted(() => {
             format="YYYY-MM-DD HH:mm:ss"
             style="width: 100%"
             :disabled-date="fnRangePickerDisabledDate"
-            :placeholder="[
-              t('views.traceManage.task.startTime'),
-              t('views.traceManage.task.endTime'),
-            ]"
           ></a-range-picker>
         </a-form-item>
-        <a-form-item :label="t('views.traceManage.task.remark')" name="remark">
-          <a-textarea
-            v-model:value="modalState.from.remark"
-            :auto-size="{ minRows: 1, maxRows: 6 }"
-            :maxlength="450"
-            :show-count="true"
-            :placeholder="t('views.traceManage.task.remarkPlease')"
-          />
-        </a-form-item>
 
         <!-- 接口跟踪 -->
         <template v-if="modalState.from.traceType === '1'">