From 3d3f4c2cc6d99e366a04d1514f26f8964253e93d Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Wed, 15 May 2024 14:43:07 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/overview/css/index.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/dashboard/overview/css/index.css b/src/views/dashboard/overview/css/index.css
index fcb6d4c2..56a135e4 100644
--- a/src/views/dashboard/overview/css/index.css
+++ b/src/views/dashboard/overview/css/index.css
@@ -221,7 +221,7 @@
 .upfFlowTotal .inner .chart {
   width: 100%;
   height: 100%;
-  margin-top: 1rem;
+  margin-top: 0.1rem;
 }
 .upfFlowTotal .inner .chart .data {
   display: flex;

From f6122c07588079821f4d55c9eeb049b7c20bf451 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Wed, 15 May 2024 14:44:35 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/faultManage/actAlarm.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/faultManage/actAlarm.ts b/src/api/faultManage/actAlarm.ts
index c85f3733..7d96ac81 100644
--- a/src/api/faultManage/actAlarm.ts
+++ b/src/api/faultManage/actAlarm.ts
@@ -294,7 +294,7 @@ export async function exportAll(query: Record<string, any>) {
  * @returns bolb
  */
 export async function origGet() {
-  let totalSQL = `select count(*) as value,orig_severity as name from alarm   group by orig_severity`;
+  let totalSQL = `select count(*) as value,orig_severity as name from alarm WHERE alarm_status='1'   group by orig_severity`;
 
   // 发起请求
   const result = await request({
@@ -329,8 +329,8 @@ export async function origGet() {
  * @returns object
  */
 export async function top3Sel(filterFlag?: string) {
-  let filter = ` WHERE orig_severity='${filterFlag}'`;
-  if (!filterFlag) filter = '';
+  let filter = ` WHERE alarm_status='1'and orig_severity='${filterFlag}'`;
+  if (!filterFlag) filter = "WHERE alarm_status='1'";
 
   let top3SQL = `select count(*) as value,ne_type as name   from alarm ${filter} group by ne_type ORDER BY value  desc limit 0,3 `;
 

From ce1944881a68502085794f60481ab82df2533835 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 15 May 2024 19:21:24 +0800
Subject: [PATCH 3/7] =?UTF-8?q?style:=20=E9=9A=90=E8=97=8FIP=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=8C=BA=E5=9F=9F=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/monitor/online/index.vue     | 10 +++++-----
 src/views/system/log/login/index.vue   | 12 ++++++------
 src/views/system/log/operate/index.vue |  3 +--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 868afdb9..eb3b7b29 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -66,11 +66,11 @@ let tableColumns: ColumnsType = [
     dataIndex: 'ipaddr',
     align: 'center',
   },
-  {
-    title: t('views.monitor.online.loginDes'),
-    dataIndex: 'loginLocation',
-    align: 'center',
-  },
+  // {
+  //   title: t('views.monitor.online.loginDes'),
+  //   dataIndex: 'loginLocation',
+  //   align: 'center',
+  // },
   {
     title: t('views.monitor.online.os'),
     dataIndex: 'os',
diff --git a/src/views/system/log/login/index.vue b/src/views/system/log/login/index.vue
index ef5f19db..aaf15eee 100644
--- a/src/views/system/log/login/index.vue
+++ b/src/views/system/log/login/index.vue
@@ -112,12 +112,12 @@ let tableColumns: ColumnsType = [
     align: 'left',
     width: 150,
   },
-  {
-    title: t('views.system.log.login.loginLoc'),
-    dataIndex: 'loginLocation',
-    align: 'left',
-    width: 150,
-  },
+  // {
+  //   title: t('views.system.log.login.loginLoc'),
+  //   dataIndex: 'loginLocation',
+  //   align: 'left',
+  //   width: 150,
+  // },
   {
     title: t('views.system.log.login.os'),
     dataIndex: 'os',
diff --git a/src/views/system/log/operate/index.vue b/src/views/system/log/operate/index.vue
index d77c3da2..b56c835d 100644
--- a/src/views/system/log/operate/index.vue
+++ b/src/views/system/log/operate/index.vue
@@ -656,8 +656,7 @@ onMounted(() => {
               :label="t('views.system.log.operate.operUser')"
               name="operName"
             >
-              {{ modalState.from.operName }} / {{ modalState.from.operIp }} /
-              {{ modalState.from.operLocation }}
+              {{ modalState.from.operName }} / {{ modalState.from.operIp }}
             </a-form-item>
           </a-col>
         </a-row>

From 3948924f61a1f282f4c7b7cb3ec7581f9888a697 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 15 May 2024 19:21:49 +0800
Subject: [PATCH 4/7] =?UTF-8?q?del:=20=E5=88=A0=E9=99=A4=E6=97=A7=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/logManage/operation/index.vue | 358 ------------------------
 src/views/logManage/security/index.vue  | 337 ----------------------
 2 files changed, 695 deletions(-)
 delete mode 100644 src/views/logManage/operation/index.vue
 delete mode 100644 src/views/logManage/security/index.vue

diff --git a/src/views/logManage/operation/index.vue b/src/views/logManage/operation/index.vue
deleted file mode 100644
index 04cc9bf3..00000000
--- a/src/views/logManage/operation/index.vue
+++ /dev/null
@@ -1,358 +0,0 @@
-<script setup lang="ts">
-import { reactive, onMounted, toRaw } from 'vue';
-import { PageContainer } from 'antdv-pro-layout';
-import { SizeType } from 'ant-design-vue/lib/config-provider';
-import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
-import { ColumnsType } from 'ant-design-vue/lib/table';
-import { parseDateToStr } from '@/utils/date-utils';
-import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { listOperationLog } from '@/api/logManage/operation';
-import useDictStore from '@/store/modules/dict';
-import useI18n from '@/hooks/useI18n';
-const { getDict } = useDictStore();
-const { t } = useI18n();
-
-/**字典数据 */
-let dict: {
-  /**操作日志操作类型 */
-  operationLogType: DictType[];
-} = reactive({
-  operationLogType: [],
-});
-
-/**查询参数 */
-let queryParams = reactive({
-  /**登录账号 */
-  accountName: '',
-  /**操作类型 */
-  opType: undefined,
-  /**记录时间 */
-  beginTime: '',
-  endTime: '',
-  /**当前页数 */
-  pageNum: 1,
-  /**每页条数 */
-  pageSize: 20,
-});
-
-/**查询参数重置 */
-function fnQueryReset() {
-  queryParams = Object.assign(queryParams, {
-    accountName: '',
-    opType: undefined,
-    beginTime: '',
-    endTime: '',
-    pageNum: 1,
-    pageSize: 20,
-  });
-  tablePagination.current = 1;
-  tablePagination.pageSize = 20;
-  fnGetList();
-}
-
-/**表格状态类型 */
-type TabeStateType = {
-  /**加载等待 */
-  loading: boolean;
-  /**紧凑型 */
-  size: SizeType;
-  /**搜索栏 */
-  seached: boolean;
-  /**记录数据 */
-  data: object[];
-};
-
-/**表格状态 */
-let tableState: TabeStateType = reactive({
-  loading: false,
-  size: 'middle',
-  seached: true,
-  data: [],
-});
-
-/**表格字段列 */
-let tableColumns: ColumnsType = [
-  {
-    title: t('common.rowId'),
-    dataIndex: 'opId',
-    align: 'center',
-  },
-  {
-    title: '登录账号',
-    dataIndex: 'accountName',
-    align: 'center',
-  },
-  {
-    title: '用户类型',
-    dataIndex: 'accountType',
-    align: 'center',
-  },
-  {
-    title: '源IP地址',
-    dataIndex: 'opIp',
-    align: 'center',
-  },
-  {
-    title: '操作对象',
-    dataIndex: 'subsysTag',
-    align: 'center',
-  },
-  {
-    title: '操作类型',
-    dataIndex: 'opType',
-    key: 'opType',
-    align: 'center',
-  },
-  {
-    title: '操作内容',
-    dataIndex: 'opContent',
-    align: 'center',
-  },
-  {
-    title: '操作结果',
-    dataIndex: 'opResult',
-    align: 'center',
-  },
-  {
-    title: '开始时间',
-    dataIndex: 'beginTime',
-    align: 'center',
-    customRender(opt) {
-      if (!opt.value) return '';
-      return parseDateToStr(opt.value);
-    },
-  },
-  {
-    title: '结束时间',
-    dataIndex: 'endTime',
-    align: 'center',
-    customRender(opt) {
-      if (!opt.value) return '';
-      return parseDateToStr(opt.value);
-    },
-  },
-  {
-    title: '网元虚拟化标识',
-    dataIndex: 'vnfFlag',
-    align: 'center',
-    customRender(opt) {
-      if (opt.value === 0) return 'PNF';
-      if (opt.value === 1) return 'VNF';
-      return '';
-    },
-  },
-];
-
-/**表格分页器参数 */
-let tablePagination = reactive({
-  /**当前页数 */
-  current: 1,
-  /**每页条数 */
-  pageSize: 20,
-  /**默认的每页条数 */
-  defaultPageSize: 20,
-  /**指定每页可以显示多少条 */
-  pageSizeOptions: ['10', '20', '50', '100'],
-  /**只有一页时是否隐藏分页器 */
-  hideOnSinglePage: false,
-  /**是否可以快速跳转至某页 */
-  showQuickJumper: true,
-  /**是否可以改变 pageSize */
-  showSizeChanger: true,
-  /**数据总数 */
-  total: 0,
-  showTotal: (total: number) => t('common.tablePaginationTotal', { total }),
-  onChange: (page: number, pageSize: number) => {
-    tablePagination.current = page;
-    tablePagination.pageSize = pageSize;
-    queryParams.pageNum = page;
-    queryParams.pageSize = pageSize;
-    fnGetList();
-  },
-});
-
-/**表格紧凑型变更操作 */
-function fnTableSize({ key }: MenuInfo) {
-  tableState.size = key as SizeType;
-}
-
-/**查询备份信息列表, pageNum初始页数 */
-function fnGetList(pageNum?: number) {
-  if (tableState.loading) return;
-  tableState.loading = true;
-  if(pageNum){
-    queryParams.pageNum = pageNum;
-  }
-  listOperationLog(toRaw(queryParams)).then(res => {
-    if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
-      tablePagination.total = res.total;
-      tableState.data = res.rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
-        tableState.loading = false;
-        fnGetList(queryParams.pageNum - 1);
-      }
-    }
-    tableState.loading = false;
-  });
-}
-
-onMounted(() => {
-  // 初始字典数据
-  Promise.allSettled([getDict('operation_log_type')]).then(resArr => {
-    if (resArr[0].status === 'fulfilled') {
-      dict.operationLogType = resArr[0].value;
-    }
-  });
-  // 获取列表数据
-  fnGetList();
-});
-</script>
-
-<template>
-  <PageContainer>
-    <a-card
-      v-show="tableState.seached"
-      :bordered="false"
-      :body-style="{ marginBottom: '24px', paddingBottom: 0 }"
-    >
-      <!-- 表格搜索栏 -->
-      <a-form :model="queryParams" name="queryParams" layout="horizontal">
-        <a-row :gutter="16">
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="登录账号" name="accountName">
-              <a-input
-                v-model:value="queryParams.accountName"
-                :allow-clear="true"
-                placeholder="查询登录账号"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="操作类型" name="opType">
-              <a-select
-                v-model:value="queryParams.opType"
-                allow-clear
-                placeholder="请选择操作类型"
-                :options="dict.operationLogType"
-              >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="开始时间" name="beginTime">
-              <a-date-picker
-                show-time
-                v-model:value="queryParams.beginTime"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                format="YYYY-MM-DD HH:mm:ss"
-                placeholder="查询结束时间"
-                style="width: 100%"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="结束时间" name="endTime">
-              <a-date-picker
-                show-time
-                v-model:value="queryParams.endTime"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                format="YYYY-MM-DD HH:mm:ss"
-                placeholder="查询结束时间"
-                style="width: 100%"
-              />
-            </a-form-item>
-          </a-col>
-
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item>
-              <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList(1)">
-                  <template #icon><SearchOutlined /></template>
-                  {{ t('common.search') }}
-                </a-button>
-                <a-button type="default" @click.prevent="fnQueryReset">
-                  <template #icon><ClearOutlined /></template>
-                  {{ t('common.reset') }}
-                </a-button>
-              </a-space>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </a-card>
-
-    <a-card :bordered="false" :body-style="{ padding: '0px' }">
-      <!-- 插槽-卡片左侧侧 -->
-      <template #title> </template>
-
-      <!-- 插槽-卡片右侧 -->
-      <template #extra>
-        <a-space :size="8" align="center">
-          <a-tooltip>
-            <template #title>{{ t('common.searchBarText') }}</template>
-            <a-switch
-              v-model:checked="tableState.seached"
-              :checked-children="t('common.switch.show')"
-              :un-checked-children="t('common.switch.hide')"
-              size="small"
-            />
-          </a-tooltip>
-          <a-tooltip>
-            <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList()">
-              <template #icon><ReloadOutlined /></template>
-            </a-button>
-          </a-tooltip>
-          <a-tooltip>
-            <template #title>{{ t('common.sizeText') }}</template>
-            <a-dropdown trigger="click" placement="bottomRight">
-              <a-button type="text">
-                <template #icon><ColumnHeightOutlined /></template>
-              </a-button>
-              <template #overlay>
-                <a-menu
-                  :selected-keys="[tableState.size as string]"
-                  @click="fnTableSize"
-                >
-                  <a-menu-item key="default">
-                    {{ t('common.size.default') }}
-                  </a-menu-item>
-                  <a-menu-item key="middle">
-                    {{ t('common.size.middle') }}
-                  </a-menu-item>
-                  <a-menu-item key="small">
-                    {{ t('common.size.small') }}
-                  </a-menu-item>
-                </a-menu>
-              </template>
-            </a-dropdown>
-          </a-tooltip>
-        </a-space>
-      </template>
-
-      <!-- 表格列表 -->
-      <a-table
-        class="table"
-        row-key="opId"
-        :columns="tableColumns"
-        :loading="tableState.loading"
-        :data-source="tableState.data"
-        :size="tableState.size"
-        :pagination="tablePagination"
-        :scroll="{ x: true }"
-      >
-        <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'opType'">
-            <DictTag :options="dict.operationLogType" :value="record.opType" />
-          </template>
-        </template>
-      </a-table>
-    </a-card>
-  </PageContainer>
-</template>
-
-<style lang="less" scoped>
-.table :deep(.ant-pagination) {
-  padding: 0 24px;
-}
-</style>
diff --git a/src/views/logManage/security/index.vue b/src/views/logManage/security/index.vue
deleted file mode 100644
index baf25c89..00000000
--- a/src/views/logManage/security/index.vue
+++ /dev/null
@@ -1,337 +0,0 @@
-<script setup lang="ts">
-import { reactive, ref, onMounted, toRaw } from 'vue';
-import { PageContainer } from 'antdv-pro-layout';
-import { SizeType } from 'ant-design-vue/lib/config-provider';
-import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
-import { ColumnsType } from 'ant-design-vue/lib/table';
-import { parseDateToStr } from '@/utils/date-utils';
-import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-import { listSecurityLog } from '@/api/logManage/security';
-import useDictStore from '@/store/modules/dict';
-import useI18n from '@/hooks/useI18n';
-const { getDict } = useDictStore();
-const { t } = useI18n();
-
-/**字典数据 */
-let dict: {
-  /**安全日志操作类型 */
-  securityLogType: DictType[];
-} = reactive({
-  securityLogType: [],
-});
-
-/**记录开始结束时间 */
-let queryRangePicker = ref<[string, string]>(['', '']);
-
-/**查询参数 */
-let queryParams = reactive({
-  /**登录账号 */
-  accountName: '',
-  /**操作类型	 */
-  opType: undefined,
-  /**记录时间 */
-  beginTime: '',
-  endTime: '',
-  /**当前页数 */
-  pageNum: 1,
-  /**每页条数 */
-  pageSize: 20,
-});
-
-/**查询参数重置 */
-function fnQueryReset() {
-  queryParams = Object.assign(queryParams, {
-    accountName: '',
-    opType: undefined,
-    beginTime: '',
-    endTime: '',
-    pageNum: 1,
-    pageSize: 20,
-  });
-  queryRangePicker.value = ['', ''];
-  tablePagination.current = 1;
-  tablePagination.pageSize = 20;
-  fnGetList();
-}
-
-/**表格状态类型 */
-type TabeStateType = {
-  /**加载等待 */
-  loading: boolean;
-  /**紧凑型 */
-  size: SizeType;
-  /**搜索栏 */
-  seached: boolean;
-  /**记录数据 */
-  data: object[];
-};
-
-/**表格状态 */
-let tableState: TabeStateType = reactive({
-  loading: false,
-  size: 'middle',
-  seached: true,
-  data: [],
-});
-
-/**表格字段列 */
-let tableColumns: ColumnsType = [
-  {
-    title: t('common.rowId'),
-    dataIndex: 'id',
-    align: 'center',
-  },
-  {
-    title: '登录账号',
-    dataIndex: 'accountName',
-    align: 'center',
-  },
-  {
-    title: '用户类型',
-    dataIndex: 'accountType',
-    align: 'center',
-  },
-  {
-    title: '源IP地址',
-    dataIndex: 'opIp',
-    align: 'center',
-  },
-  {
-    title: '操作类型',
-    dataIndex: 'opType',
-    key: 'opType',
-    align: 'center',
-  },
-  {
-    title: '操作内容',
-    dataIndex: 'opContent',
-    align: 'center',
-  },
-  {
-    title: '操作结果',
-    dataIndex: 'opResult',
-    align: 'center',
-    customRender(opt) {
-      if (opt.value === 1) return '成功';
-      return '失败';
-    },
-  },
-  {
-    title: '记录时间',
-    dataIndex: 'opTime',
-    align: 'center',
-    customRender(opt) {
-      if (!opt.value) return '';
-      return parseDateToStr(opt.value);
-    },
-  },
-];
-
-/**表格分页器参数 */
-let tablePagination = reactive({
-  /**当前页数 */
-  current: 1,
-  /**每页条数 */
-  pageSize: 20,
-  /**默认的每页条数 */
-  defaultPageSize: 20,
-  /**指定每页可以显示多少条 */
-  pageSizeOptions: ['10', '20', '50', '100'],
-  /**只有一页时是否隐藏分页器 */
-  hideOnSinglePage: false,
-  /**是否可以快速跳转至某页 */
-  showQuickJumper: true,
-  /**是否可以改变 pageSize */
-  showSizeChanger: true,
-  /**数据总数 */
-  total: 0,
-  showTotal: (total: number) => t('common.tablePaginationTotal', { total }),
-  onChange: (page: number, pageSize: number) => {
-    tablePagination.current = page;
-    tablePagination.pageSize = pageSize;
-    queryParams.pageNum = page;
-    queryParams.pageSize = pageSize;
-    fnGetList();
-  },
-});
-
-/**表格紧凑型变更操作 */
-function fnTableSize({ key }: MenuInfo) {
-  tableState.size = key as SizeType;
-}
-
-/**查询备份信息列表, pageNum初始页数 */
-function fnGetList(pageNum?: number) {
-  if (tableState.loading) return;
-  tableState.loading = true;
-  if(pageNum){
-    queryParams.pageNum = pageNum;
-  }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
-  }
-  queryParams.beginTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
-  listSecurityLog(toRaw(queryParams)).then(res => {
-    if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
-      tablePagination.total = res.total;
-      tableState.data = res.rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
-        tableState.loading = false;
-        fnGetList(queryParams.pageNum - 1);
-      }
-    }
-    tableState.loading = false;
-  });
-}
-
-onMounted(() => {
-  // 初始字典数据
-  Promise.allSettled([getDict('security_log_type')]).then(resArr => {
-    if (resArr[0].status === 'fulfilled') {
-      dict.securityLogType = resArr[0].value;
-    }
-  });
-  // 获取列表数据
-  fnGetList();
-});
-</script>
-
-<template>
-  <PageContainer>
-    <a-card
-      v-show="tableState.seached"
-      :bordered="false"
-      :body-style="{ marginBottom: '24px', paddingBottom: 0 }"
-    >
-      <!-- 表格搜索栏 -->
-      <a-form :model="queryParams" name="queryParams" layout="horizontal">
-        <a-row :gutter="16">
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="登录账号" name="accountName">
-              <a-input
-                v-model:value="queryParams.accountName"
-                :allow-clear="true"
-                placeholder="查询登录账号"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="操作类型" name="opType">
-              <a-select
-                v-model:value="queryParams.opType"
-                allow-clear
-                placeholder="请选择操作类型"
-                :options="dict.securityLogType"
-              >
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="8" :md="12" :xs="24">
-            <a-form-item label="记录时间" name="queryRangePicker">
-              <a-range-picker
-                v-model:value="queryRangePicker"
-                allow-clear
-                bordered
-                show-time
-                value-format="YYYY-MM-DD HH:mm:ss"
-                format="YYYY-MM-DD HH:mm:ss"
-                :placeholder="['记录开始', '记录结束']"
-                style="width: 100%"
-              ></a-range-picker>
-            </a-form-item>
-          </a-col>
-
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item>
-              <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList(1)">
-                  <template #icon><SearchOutlined /></template>
-                  {{ t('common.search') }}
-                </a-button>
-                <a-button type="default" @click.prevent="fnQueryReset">
-                  <template #icon><ClearOutlined /></template>
-                  {{ t('common.reset') }}
-                </a-button>
-              </a-space>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </a-card>
-
-    <a-card :bordered="false" :body-style="{ padding: '0px' }">
-      <!-- 插槽-卡片左侧侧 -->
-      <template #title> </template>
-
-      <!-- 插槽-卡片右侧 -->
-      <template #extra>
-        <a-space :size="8" align="center">
-          <a-tooltip>
-            <template #title>{{ t('common.searchBarText') }}</template>
-            <a-switch
-              v-model:checked="tableState.seached"
-              :checked-children="t('common.switch.show')"
-              :un-checked-children="t('common.switch.hide')"
-              size="small"
-            />
-          </a-tooltip>
-          <a-tooltip>
-            <template #title>{{ t('common.reloadText') }}</template>
-            <a-button type="text" @click.prevent="fnGetList()">
-              <template #icon><ReloadOutlined /></template>
-            </a-button>
-          </a-tooltip>
-          <a-tooltip>
-            <template #title>{{ t('common.sizeText') }}</template>
-            <a-dropdown trigger="click" placement="bottomRight">
-              <a-button type="text">
-                <template #icon><ColumnHeightOutlined /></template>
-              </a-button>
-              <template #overlay>
-                <a-menu
-                  :selected-keys="[tableState.size as string]"
-                  @click="fnTableSize"
-                >
-                  <a-menu-item key="default">
-                    {{ t('common.size.default') }}
-                  </a-menu-item>
-                  <a-menu-item key="middle">
-                    {{ t('common.size.middle') }}
-                  </a-menu-item>
-                  <a-menu-item key="small">
-                    {{ t('common.size.small') }}
-                  </a-menu-item>
-                </a-menu>
-              </template>
-            </a-dropdown>
-          </a-tooltip>
-        </a-space>
-      </template>
-
-      <!-- 表格列表 -->
-      <a-table
-        class="table"
-        row-key="id"
-        :columns="tableColumns"
-        :loading="tableState.loading"
-        :data-source="tableState.data"
-        :size="tableState.size"
-        :pagination="tablePagination"
-        :scroll="{ x: true }"
-      >
-        <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'opType'">
-            <DictTag :options="dict.securityLogType" :value="record.opType" />
-          </template>
-        </template>
-      </a-table>
-    </a-card>
-  </PageContainer>
-</template>
-
-<style lang="less" scoped>
-.table :deep(.ant-pagination) {
-  padding: 0 24px;
-}
-</style>

From b40e7980906a08e4f763322ff7c2b5412ea9b63f Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 17 May 2024 18:00:28 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat:=20AMF=E7=94=A8=E6=88=B7=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E6=94=AF=E6=8C=81IMSI=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/amfUE/index.vue | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/views/dashboard/amfUE/index.vue b/src/views/dashboard/amfUE/index.vue
index 03674474..0a4f77aa 100644
--- a/src/views/dashboard/amfUE/index.vue
+++ b/src/views/dashboard/amfUE/index.vue
@@ -39,6 +39,7 @@ let queryParams = reactive({
   neType: 'AMF',
   neId: '001',
   eventType: 'auth-result',
+  imsi: '',
   sortField: 'timestamp',
   sortOrder: 'desc',
   /**当前页数 */
@@ -52,6 +53,7 @@ function fnQueryReset() {
   eventTypes.value = ['auth-result'];
   queryParams = Object.assign(queryParams, {
     eventType: 'auth-result',
+    imsi: '',
     pageNum: 1,
     pageSize: 20,
   });
@@ -105,7 +107,7 @@ let tableColumns: ColumnsType = [
     title: 'IMSI',
     dataIndex: 'eventJSON',
     align: 'left',
-    width: 100,
+    width: 150,
     customRender(opt) {
       const eventJSON = opt.value;
       return eventJSON.imsi;
@@ -116,20 +118,20 @@ let tableColumns: ColumnsType = [
     dataIndex: 'eventType',
     key: 'eventType',
     align: 'left',
-    width: 100,
+    width: 150,
   },
   {
     title: t('views.dashboard.ue.result'),
     dataIndex: 'eventJSON',
     key: 'result',
     align: 'left',
-    width: 100,
+    width: 150,
   },
   {
     title: t('views.dashboard.ue.time'),
     dataIndex: 'eventJSON',
     key: 'time',
-    align: 'center',
+    align: 'left',
     width: 150,
   },
   {
@@ -383,20 +385,29 @@ onBeforeUnmount(() => {
       <!-- 表格搜索栏 -->
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
-          <a-col :lg="12" :md="12" :xs="24">
+          <a-col :lg="6" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.ue.eventType')"
               name="eventType "
             >
               <a-select
                 v-model:value="eventTypes"
-                mode="tags"
+                mode="multiple"
                 :options="dict.ueEventType"
                 :placeholder="t('common.selectPlease')"
                 @change="fnQueryEventTypeChange"
               ></a-select>
             </a-form-item>
           </a-col>
+          <a-col :lg="6" :md="12" :xs="24">
+            <a-form-item label="IMSI" name="imsi ">
+              <a-input
+                v-model:value="queryParams.imsi"
+                allow-clear
+                :placeholder="t('common.inputPlease')"
+              ></a-input>
+            </a-form-item>
+          </a-col>
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">

From 7a0298a41983fb8cf1ad3a31b4b1fbe849778067 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 17 May 2024 18:00:56 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat:=20IMS=E7=94=A8=E6=88=B7=E8=AF=9D?=
 =?UTF-8?q?=E5=8D=95=E6=94=AF=E6=8C=81=E5=8F=B7=E7=A0=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/imsCDR/index.vue | 34 +++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/views/dashboard/imsCDR/index.vue b/src/views/dashboard/imsCDR/index.vue
index 621b645f..2696dd21 100644
--- a/src/views/dashboard/imsCDR/index.vue
+++ b/src/views/dashboard/imsCDR/index.vue
@@ -37,6 +37,8 @@ let queryParams = reactive({
   neType: 'IMS',
   neId: '001',
   recordType: 'MOC',
+  callerParty: '',
+  calledParty: '',
   sortField: 'timestamp',
   sortOrder: 'desc',
   /**当前页数 */
@@ -50,6 +52,8 @@ function fnQueryReset() {
   recordTypes.value = ['MOC'];
   queryParams = Object.assign(queryParams, {
     recordType: 'MOC',
+    callerParty: '',
+    calledParty: '',
     pageNum: 1,
     pageSize: 20,
   });
@@ -411,14 +415,14 @@ onBeforeUnmount(() => {
       <!-- 表格搜索栏 -->
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
-          <a-col :lg="12" :md="12" :xs="24">
+          <a-col :lg="8" :md="12" :xs="24">
             <a-form-item
               :label="t('views.dashboard.cdr.recordType')"
               name="recordType "
             >
               <a-select
                 v-model:value="recordTypes"
-                mode="tags"
+                mode="multiple"
                 :options="
                   ['MOC', 'MTC', 'MOSM', 'MTSM'].map(v => ({ value: v }))
                 "
@@ -427,7 +431,31 @@ onBeforeUnmount(() => {
               ></a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="4" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.dashboard.cdr.called')"
+              name="calledParty "
+            >
+              <a-input
+                v-model:value="queryParams.calledParty"
+                allow-clear
+                :placeholder="t('common.inputPlease')"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="4" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.dashboard.cdr.caller')"
+              name="callerParty "
+            >
+              <a-input
+                v-model:value="queryParams.callerParty"
+                allow-clear
+                :placeholder="t('common.inputPlease')"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="4" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
                 <a-button type="primary" @click.prevent="fnGetList(1)">

From f2c67d087b1d36274f6f4f3b379b28366ef64b82 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 17 May 2024 18:02:22 +0800
Subject: [PATCH 7/7] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC240517?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 2 +-
 .env.production  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index e8936783..97ce74ca 100644
--- a/.env.development
+++ b/.env.development
@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS"
 VITE_APP_CODE = "CN EMS"
 
 # 应用版本
-VITE_APP_VERSION = "2.240508.1"
+VITE_APP_VERSION = "2.240517.1"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"
diff --git a/.env.production b/.env.production
index c082d4e6..fa1425ce 100644
--- a/.env.production
+++ b/.env.production
@@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS"
 VITE_APP_CODE = "CN EMS"
 
 # 应用版本
-VITE_APP_VERSION = "2.240508.1"
+VITE_APP_VERSION = "2.240517.1"
 
 # 接口基础URL地址-不带/后缀
 VITE_API_BASE_URL = "/omc-api"