新增性能测量数据展示

src/api/perfManage/perfData.ts

@@ -0,0 +1,69 @@
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { request } from '@/plugins/http-fetch';
+import { parseObjLineToHump } from '@/utils/parse-utils';
+
+/**
+ * 查询日志列表
+ * @param query 查询参数
+ * @returns object
+ */
+export async function listperfData(query: Record<string, any>) {
+  let totalSQL = 'select count(*) as total from measure_data where 1=1 ';
+  let rowsSQL = 'select * from measure_data where 1=1 ';
+
+  // 查询
+  let querySQL = '';
+  if (query.neType) {
+    querySQL += ` and ne_type like '%${query.neType}%' `;
+  }
+  if (query.beginTime) {
+    querySQL += ` and start_time >= '${query.beginTime}' `;
+  }
+  if (query.endTime) {
+    querySQL += ` and start_time <= '${query.endTime}' `;
+  }
+
+  // 排序
+  let sortSql = ' order by start_time ';
+  if (query.sortOrder === 'asc') {
+    sortSql += ' asc ';
+  } else {
+    sortSql += ' desc ';
+  }
+
+  // 分页
+  const pageNum = (query.pageNum - 1) * query.pageSize;
+  const limtSql = ` limit ${pageNum},${query.pageSize} `;
+
+  // 发起请求
+  const result = await request({
+    url: `/databaseManagement/v1/select/omc_db/measure_data`,
+    method: 'get',
+    params: {
+      totalSQL: totalSQL + querySQL,
+      rowsSQL: rowsSQL + querySQL + sortSql + limtSql,
+    },
+  });
+
+  // 解析数据
+  if (result.code === RESULT_CODE_SUCCESS) {
+    const data: DataList = {
+      total: 0,
+      rows: [],
+      code: result.code,
+      msg: result.msg,
+    };
+    result.data.data.forEach((item: any) => {
+      const itemData = item['measure_data'];
+      if (Array.isArray(itemData)) {
+        if (itemData.length === 1 && itemData[0]['total'] >= 0) {
+          data.total = itemData[0]['total'];
+        } else {
+          data.rows = itemData.map(v => parseObjLineToHump(v));
+        }
+      }
+    });
+    return data;
+  }
+  return result;
+}

src/views/perfManage/perfData/index.vue

@@ -1,28 +1,41 @@
 <script setup lang="ts">
 import { useRoute } from 'vue-router';
-import { reactive, ref, onMounted, toRaw, nextTick } from 'vue';
+import { reactive, ref, onMounted, toRaw } from 'vue';
 import { PageContainer } from '@ant-design-vue/pro-layout';
-import { message, Modal } from 'ant-design-vue/lib';
 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 { saveAs } from 'file-saver';
+import { listperfData } from '@/api/perfManage/perfData';
+import useNeInfoStore from '@/store/modules/neinfo';
+import useDictStore from '@/store/modules/dict';
 import useI18n from '@/hooks/useI18n';
-import { getTraceRawInfo, listTraceData } from '@/api/traceManage/analysis';
+const { getDict } = useDictStore();
 const { t } = useI18n();
 const route = useRoute();
 
 /**路由标题 */
 let title = ref<string>((route.meta.title as string) ?? '标题');
 
+/**字典数据 */
+let dict: {
+  /**告警状态 */
+  alarmStatus: DictType[];
+} = reactive({
+  alarmStatus: [],
+});
+
+/**记录开始结束时间 */
+let queryRangePicker = ref<[string, string]>(['', '']);
+
 /**查询参数 */
 let queryParams = reactive({
-  /**移动号 */
+  /**网元类型 */
-  imsi: '',
+  neType: '',
-  /**移动号 */
+  /**记录时间 */
-  msisdn: '',
+  beginTime: '',
+  endTime: '',
   /**当前页数 */
   pageNum: 1,
   /**每页条数 */
@@ -32,10 +45,13 @@ let queryParams = reactive({
 /**查询参数重置 */
 function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
-    imsi: '',
+    neType: '',
+    beginTime: '',
+    endTime: '',
     pageNum: 1,
     pageSize: 20,
   });
+  queryRangePicker.value = ['', ''];
   tablePagination.current = 1;
   tablePagination.pageSize = 20;
   fnGetList();
@@ -64,48 +80,49 @@ let tableState: TabeStateType = reactive({
 /**表格字段列 */
 let tableColumns: ColumnsType = [
   {
-    title: t('views.traceManage.analysis.trackTaskId'),
+    title: t('common.rowId'),
+    dataIndex: 'id',
+    align: 'center',
+  },
+  {
+    title: '任务ID',
     dataIndex: 'taskId',
     align: 'center',
   },
   {
-    title: t('views.traceManage.analysis.imsi'),
+    title: '网元类型',
-    dataIndex: 'imsi',
+    dataIndex: 'neType',
     align: 'center',
   },
   {
-    title: t('views.traceManage.analysis.msisdn'),
+    title: '网元名称',
-    dataIndex: 'msisdn',
+    dataIndex: 'neName',
     align: 'center',
   },
   {
-    title: t('views.traceManage.analysis.srcIp'),
+    title: '颗粒度',
-    dataIndex: 'srcAddr',
+    dataIndex: 'granulOption',
     align: 'center',
   },
   {
-    title: t('views.traceManage.analysis.dstIp'),
+    title: '统计编码',
-    dataIndex: 'dstAddr',
+    dataIndex: 'kpiCode',
     align: 'center',
   },
   {
-    title: t('views.traceManage.analysis.signalType'),
+    title: '统计指标项',
-    dataIndex: 'ifType',
+    dataIndex: 'kpiId',
+    //key: 'alarmTitle',
+    align: 'left',
+  },
+  {
+    title: '值',
+    dataIndex: 'value',
     align: 'center',
   },
   {
-    title: t('views.traceManage.analysis.msgType'),
+    title: '开始时间',
-    dataIndex: 'msgType',
+    dataIndex: 'startTime',
-    align: 'center',
-  },
-  {
-    title: t('views.traceManage.analysis.msgDirect'),
-    dataIndex: 'msgDirect',
-    align: 'center',
-  },
-  {
-    title: t('views.traceManage.analysis.rowTime'),
-    dataIndex: 'timestamp',
     align: 'center',
     customRender(opt) {
       if (!opt.value) return '';
@@ -113,10 +130,14 @@ let tableColumns: ColumnsType = [
     },
   },
   {
-    title: t('common.operate'),
+    title: '结束时间',
-    key: 'id',
+    dataIndex: 'endTime',
     align: 'center',
-  },
+    customRender(opt) {
+      if (!opt.value) return '';
+      return parseDateToStr(opt.value);
+    },
+  }
 ];
 
 /**表格分页器参数 */
@@ -156,7 +177,12 @@ function fnTableSize({ key }: MenuInfo) {
 function fnGetList() {
   if (tableState.loading) return;
   tableState.loading = true;
-  listTraceData(toRaw(queryParams)).then(res => {
+  if (!queryRangePicker.value) {
+    queryRangePicker.value = ['', ''];
+  }
+  queryParams.beginTime = queryRangePicker.value[0];
+  queryParams.endTime = queryRangePicker.value[1];
+  listperfData(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       tablePagination.total = res.total;
       tableState.data = res.rows;
@@ -165,176 +191,15 @@ function fnGetList() {
   });
 }
 
-/**抽屉对象信息状态类型 */
-type ModalStateType = {
-  /**抽屉框是否显示 */
-  visible: boolean;
-  /**标题 */
-  title: string;
-  /**表单数据 */
-  from: Record<string, any>;
-};
-
-/**抽屉对象信息状态 */
-let modalState: ModalStateType = reactive({
-  visible: false,
-  title: '',
-  from: {
-    rawData: '',
-    rawDataHTML: '',
-    downBtn: false,
-  },
-});
-
-/**
- * 对话框弹出显示
- * @param row 记录信息
- */
-function fnModalVisible(row: Record<string, any>) {
-  // 进制转数据
-  const hexString = parseBase64Data(row.rawMsg);
-  const rawData = convertToReadableFormat(hexString);
-  modalState.from.rawData = rawData;
-  // RAW解析HTML
-  getTraceRawInfo(row.id).then(res => {
-    if (res.code === RESULT_CODE_SUCCESS) {
-      const htmlString = rawDataHTMLScript(res.msg);
-      modalState.from.rawDataHTML = htmlString;
-      modalState.from.downBtn = true;
-    } else {
-      modalState.from.rawDataHTML = t('views.traceManage.analysis.noData');
-    }
-  });
-  modalState.title = t('views.traceManage.analysis.taskTitle', {
-    num: row.imsi,
-  });
-  modalState.visible = true;
-}
-
-/**
- * 对话框弹出关闭
- */
-function fnModalVisibleClose() {
-  modalState.visible = false;
-  modalState.from.downBtn = false;
-  modalState.from.rawDataHTML = '';
-  modalState.from.rawData = '';
-}
-
-// 将Base64编码解码为字节数组
-function parseBase64Data(hexData: string) {
-  // 将Base64编码解码为字节数组
-  const byteString = atob(hexData);
-  const byteArray = new Uint8Array(byteString.length);
-  for (let i = 0; i < byteString.length; i++) {
-    byteArray[i] = byteString.charCodeAt(i);
-  }
-
-  // 将每一个字节转换为2位16进制数表示，并拼接起来
-  let hexString = '';
-  for (let i = 0; i < byteArray.length; i++) {
-    const hex = byteArray[i].toString(16);
-    hexString += hex.length === 1 ? '0' + hex : hex;
-  }
-  return hexString;
-}
-
-// 转换十六进制字节流为可读格式和ASCII码表示
-function convertToReadableFormat(hexString: string) {
-  let result = '';
-  let asciiResult = '';
-  let arr = [];
-  let row = 100;
-  for (let i = 0; i < hexString.length; i += 2) {
-    const hexChars = hexString.substring(i, i + 2);
-    const decimal = parseInt(hexChars, 16);
-    const asciiChar =
-      decimal >= 32 && decimal <= 126 ? String.fromCharCode(decimal) : '.';
-
-    result += hexChars + ' ';
-    asciiResult += asciiChar;
-
-    if ((i + 2) % 32 === 0) {
-      arr.push({
-        row: row,
-        code: result,
-        asciiText: asciiResult,
-      });
-      result = '';
-      asciiResult = '';
-      row += 10;
-    }
-    if (2 + i == hexString.length) {
-      arr.push({
-        row: row,
-        code: result,
-        asciiText: asciiResult,
-      });
-      result = '';
-      asciiResult = '';
-      row += 10;
-    }
-  }
-  return arr;
-}
-
-// 信息详情HTMl内容处理
-function rawDataHTMLScript(htmlString: string) {
-  // 删除所有 <a> 标签
-  // const withoutATags = htmlString.replace(/<a\b[^>]*>(.*?)<\/a>/gi, '');
-  // 删除所有 <script> 标签
-  let withoutScriptTags = htmlString.replace(
-    /<script\b[^>]*>([\s\S]*?)<\/script>/gi,
-    ''
-  );
-  // 默认全展开
-  // const withoutHiddenElements = withoutScriptTags.replace(
-  //   /style="display:none"/gi,
-  //   'style="background:#ffffff"'
-  // );
-
-  function set_node(node: any, str: string) {
-    if (!node) return;
-    node.style.display = str;
-    node.style.background = '#ffffff';
-  }
-  Reflect.set(window, 'set_node', set_node);
-  function toggle_node(node: any) {
-    node = document.getElementById(node);
-    if (!node) return;
-    set_node(node, node.style.display != 'none' ? 'none' : 'block');
-  }
-  Reflect.set(window, 'toggle_node', toggle_node);
-  function hide_node(node: any) {
-    node = document.getElementById(node);
-    if (!node) return;
-    set_node(node, 'none');
-  }
-  Reflect.set(window, 'hide_node', hide_node);
-
-  // 展开第一个
-  withoutScriptTags = withoutScriptTags.replace(
-    'id="f1c" style="display:none"',
-    'id="f1c" style="display:block"'
-  );
-  return withoutScriptTags;
-}
-
-/**信息文件下载 */
-function fnDownloadFile() {
-  Modal.confirm({
-    title: t('common.tipTitle'),
-    content: t('views.traceManage.analysis.taskDownTip'),
-    onOk() {
-      const blob = new Blob([modalState.from.rawDataHTML], {
-        type: 'text/plain',
-      });
-      saveAs(blob, `${modalState.title}_${Date.now()}.html`);
-    },
-  });
-}
-
 onMounted(() => {
+  // 初始字典数据
+  Promise.allSettled([getDict('alarm_status')]).then(resArr => {
+    if (resArr[0].status === 'fulfilled') {
+      dict.alarmStatus = resArr[0].value;
+    }
+  });
+  // 获取网元网元列表
+  useNeInfoStore().fnNelist();
   // 获取列表数据
   fnGetList();
 });
@@ -351,29 +216,30 @@ onMounted(() => {
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
+            <a-form-item label="网元类型" name="neType">
-              :label="t('views.traceManage.analysis.imsi')"
+              <a-auto-complete
-              name="imsi"
+                v-model:value="queryParams.neType"
-            >
+                :options="useNeInfoStore().getNeSelectOtions"
-              <a-input
+                allow-clear
-                v-model:value="queryParams.imsi"
+                placeholder="查询网元类型"
-                :allow-clear="true"
+              />
-                :placeholder="t('views.traceManage.analysis.imsiPlease')"
-              ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="8" :md="12" :xs="24">
-            <a-form-item
+            <a-form-item label="开始时间" name="queryRangePicker">
-              :label="t('views.traceManage.analysis.msisdn')"
+              <a-range-picker
-              name="imsi"
+                v-model:value="queryRangePicker"
-            >
+                allow-clear
-              <a-input
+                bordered
-                v-model:value="queryParams.msisdn"
+                show-time
-                :allow-clear="true"
+                value-format="YYYY-MM-DD HH:mm:ss"
-                :placeholder="t('views.traceManage.analysis.msisdnPlease')"
+                format="YYYY-MM-DD HH:mm:ss"
-              ></a-input>
+                :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">
@@ -416,7 +282,7 @@ onMounted(() => {
           </a-tooltip>
           <a-tooltip>
             <template #title>{{ t('common.sizeText') }}</template>
-            <a-dropdown trigger="click">
+            <a-dropdown trigger="click" placement="bottomRight">
               <a-button type="text">
                 <template #icon><ColumnHeightOutlined /></template>
               </a-button>
@@ -425,15 +291,15 @@ onMounted(() => {
                   :selected-keys="[tableState.size as string]"
                   @click="fnTableSize"
                 >
-                  <a-menu-item key="default">{{
+                  <a-menu-item key="default">
-                    t('common.size.default')
+                    {{ t('common.size.default') }}
-                  }}</a-menu-item>
+                  </a-menu-item>
-                  <a-menu-item key="middle">{{
+                  <a-menu-item key="middle">
-                    t('common.size.middle')
+                    {{ t('common.size.middle') }}
-                  }}</a-menu-item>
+                  </a-menu-item>
-                  <a-menu-item key="small">{{
+                  <a-menu-item key="small">
-                    t('common.size.small')
+                    {{ t('common.size.small') }}
-                  }}</a-menu-item>
+                  </a-menu-item>
                 </a-menu>
               </template>
             </a-dropdown>
@@ -453,57 +319,15 @@ onMounted(() => {
         :scroll="{ x: true }"
       >
         <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'id'">
+          <template v-if="column.key === 'alarmTitle'">
-            <a-space :size="8" align="center">
+            <a-tooltip>
-              <a-tooltip>
+              <template #title>{{ record.operResult }}</template>
-                <template #title>查看详情</template>
+              <div class="alarmTitleText">{{ record.alarmTitle }}</div>
-                <a-button type="link" @click.prevent="fnModalVisible(record)">
+            </a-tooltip>
-                  <template #icon><ProfileOutlined /></template>
-                </a-button>
-              </a-tooltip>
-            </a-space>
           </template>
         </template>
       </a-table>
     </a-card>
-
-    <!-- 详情框 -->
-    <a-modal
-      width="800px"
-      :title="modalState.title"
-      :visible="modalState.visible"
-      @cancel="fnModalVisibleClose"
-    >
-      <div class="raw-title">
-        {{ t('views.traceManage.analysis.signalData') }}
-      </div>
-      <a-row
-        class="raw"
-        :gutter="16"
-        v-for="v in modalState.from.rawData"
-        :key="v.row"
-      >
-        <a-col class="num" :span="2">{{ v.row }}</a-col>
-        <a-col class="code" :span="12">{{ v.code }}</a-col>
-        <a-col class="txt" :span="10">{{ v.asciiText }}</a-col>
-      </a-row>
-      <a-divider />
-      <div class="raw-title">
-        {{ t('views.traceManage.analysis.signalDetail') }}
-        <a-button
-          type="dashed"
-          size="small"
-          @click.prevent="fnDownloadFile"
-          v-if="modalState.from.downBtn"
-        >
-          <template #icon>
-            <DownloadOutlined />
-          </template>
-          {{ t('views.traceManage.analysis.taskDownText') }}
-        </a-button>
-      </div>
-      <div class="raw-html" v-html="modalState.from.rawDataHTML"></div>
-    </a-modal>
   </PageContainer>
 </template>
 
@@ -511,26 +335,8 @@ onMounted(() => {
 .table :deep(.ant-pagination) {
   padding: 0 24px;
 }
-
+.alarmTitleText {
-.raw {
+  max-width: 300px;
-  &-title {
+  cursor: pointer;
-    color: #000000d9;
-    font-size: 24px;
-    line-height: 1.8;
-  }
-  .num {
-    background-color: #e5e5e5;
-  }
-  .code {
-    background-color: #e7e6ff;
-  }
-  .txt {
-    background-color: #ffe3e5;
-  }
-
-  &-html {
-    max-height: 300px;
-    overflow-y: scroll;
-  }
 }
 </style>