fix:bugs

src/views/marketing/push-logs/index.vue

@@ -50,14 +50,14 @@
 						{{ formatNum(row.pushFrequency) }}
 					</template>
         </el-table-column>
-        <el-table-column :formatter="statusFormatter" :label="'推送时间'" prop="createTime" min-width="200"
-          show-overflow-tooltip></el-table-column>
         <el-table-column :formatter="statusFormatter" :label="'延时推送'" prop="delayPush" min-width="100"
           show-overflow-tooltip>
 					<template #default="{ row }">
 						{{ row.delayPush }}s
 					</template>
         </el-table-column>
+        <el-table-column :formatter="statusFormatter" :label="'推送时间'" prop="createTime" min-width="200"
+          show-overflow-tooltip></el-table-column>
         <el-table-column :formatter="statusFormatter" :label="'推送状态'" prop="pushStatus" min-width="120"
           show-overflow-tooltip>
           <template #default="{ row }">
@@ -98,8 +98,8 @@ const getDataListWithProcess = (params: any): Promise<any> => {
         ...params,
         pageNum: params.current,
         pageSize: params.size,
-        endTime: params.createTime ? formatDate(params.createTime[0], 'YYYY-mm-dd') : '',
-        createTime: params.createTime ? formatDate(params.createTime[1], 'YYYY-mm-dd') : '',
+        endTime: params.createTime ? formatDate(params.createTime[1], 'YYYY-mm-dd') : '',
+        createTime: params.createTime ? formatDate(params.createTime[0], 'YYYY-mm-dd') : '',
     }
     delete data.current;
     delete data.size;

src/views/marketing/record/index.vue

@@ -17,10 +17,9 @@
           </el-form-item>
         </el-form>
       </el-row>
-      <el-table ref="tableRef" :data="state.dataList" row-key="id"
-        style="width: 100%" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
-        :header-cell-style="tableStyle?.headerCellStyle">
-        
+      <el-table ref="tableRef" :data="state.dataList" row-key="id" style="width: 100%" v-loading="state.loading" border
+        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle?.headerCellStyle">
+
         <el-table-column :formatter="statusFormatter" :label="'规则名称'" prop="ruleName" min-width="120"
           show-overflow-tooltip></el-table-column>
         <el-table-column :formatter="statusFormatter" :label="'客户端ID'" prop="clientId" min-width="120"
@@ -35,13 +34,18 @@
         <el-table-column :formatter="statusFormatter" :label="'推送方式'" prop="pushType" min-width="150"
           show-overflow-tooltip>
           <template #default="{ row }">
-              {{ pushMode.filter(item => item.value == row.pushAction)[0]?.label }}
+            {{pushMode.filter(item => item.value == row.pushAction)[0]?.label}}
           </template>
         </el-table-column>
-        <el-table-column :label="'推送频率'" prop="pushFrequency" min-width="100"
+        <el-table-column :label="'推送频率'" prop="pushFrequency" min-width="100" show-overflow-tooltip>
+          <template #default="{ row }">
+            {{ formatNum(row.pushFrequency) }}
+          </template>
+        </el-table-column>
+        <el-table-column :formatter="statusFormatter" :label="'延时推送'" prop="delayPush" min-width="100"
           show-overflow-tooltip>
           <template #default="{ row }">
-              {{ formatNum(row.pushFrequency) }}
+            {{ row.delayPush }}s
           </template>
         </el-table-column>
         <el-table-column :formatter="statusFormatter" :label="'推送时间'" prop="createTime" min-width="200"
@@ -49,10 +53,10 @@
         <el-table-column :formatter="statusFormatter" :label="'推送状态'" prop="pushStatus" min-width="120"
           show-overflow-tooltip>
           <template #default="{ row }">
-             {{ row.pushStatus ? '已推送' : '未推送' }}
+            {{ row.pushStatus ? '已推送' : '未推送' }}
           </template>
         </el-table-column>
-        <el-table-column :formatter="statusFormatter" :label="'触发信息'" prop="triggerCondition" min-width="250" >
+        <el-table-column :formatter="statusFormatter" :label="'触发信息'" prop="triggerCondition" min-width="250">
           <template #default="{ row }">
             <div style="width: 100%; text-align: left;">
               关键字：{{ row._keywords?.length ? row._keywords.join(', ') : '--' }}
@@ -115,7 +119,7 @@ const getDataListWithProcess = (params: any): Promise<any> => {
             } catch (error) {
               console.warn('解析触发器条件失败:', item.triggerCondition, error);
             }
-            
+
             return {
               ...item,
               _keywords: parsedData?.keywords || [],
@@ -183,20 +187,20 @@ const resetQuery = () => {
 const statusFormatter = (row: any, column: any, cellValue: any, index: any) => {
   return cellValue || '--';
 }
+// 格式化数据展示
 const formatNum = (value: string | number = 0) => {
   let num = Number(value);
   if (num > 0 && num < 1) {
-    return (num * 100).toFixed(2) + '%';
-
+    return (num * 100).toFixed(0) + '%';
   } else if (num >= 1 && num < 10000) {
-    return num;
+    return '每' + num + '次推送';
   }
-  return '--'
-}
+  return '--';
+};
 const showTriggerInfo = (row: any) => {
   // 信息详情弹窗
   richContentDialogRef.value.openDialog(
-    row.pushDetail, 
+    row.pushDetail,
     {
       createTime: row.createTime,
       triggerKeyword: row._keywords
@@ -259,7 +263,7 @@ onMounted(() => {
   color: #999;
   font-size: 14px;
   cursor: help;
-  
+
   &:hover {
     color: #409eff;
   }