feat:自动推送记录

src/api/marketing/apps.ts

@@ -189,4 +189,19 @@ export const getPushPage = (data: Object) => {
 		method: 'post',
 		data,
 	});
+};
+
+/**
+ * 分页查询手动推送记录
+ * @param startTime 开始时间
+ * @param endTime 结束时间
+ * @param pageNum	页码
+ * @param pageSize	每页条数
+ */
+export const getHandPushPage = (data: Object) => {
+	return request({
+		url: '/marketing/handPush/page',
+		method: 'post',
+		data,
+	});
 };

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

@@ -11,7 +11,7 @@
           </el-form-item> -->
           <el-form-item :label="'推送时间'" prop="createTime">
             <el-date-picker :disabled-date="disabledDate" :end-placeholder="'结束日期'" :start-placeholder="'开始日期'"
-              format="YYYY-MM-DD HH:mm:ss" range-separator="至" type="datetimerange" v-model="state.queryForm.createTime" />
+              format="YYYY-MM-DD" range-separator="至" type="daterange" v-model="state.queryForm.createTime" />
           </el-form-item>
           <el-form-item>
             <el-button @click="query" class="ml10" icon="search" type="primary">
@@ -24,10 +24,10 @@
 
       <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="'推送IP'" prop="pushIP" min-width="200"
+        <!-- <el-table-column :formatter="statusFormatter" :label="'推送IP'" prop="pushIP" min-width="200"
           show-overflow-tooltip></el-table-column>
         <el-table-column :formatter="statusFormatter" :label="'推送域名'" prop="pushDomain" min-width="200"
-          show-overflow-tooltip></el-table-column>
+          show-overflow-tooltip></el-table-column> -->
         <el-table-column :formatter="statusFormatter" :label="'推送内容'" prop="pushContent" min-width="300"
           show-overflow-tooltip>
           <template #default="{ row }">
@@ -70,20 +70,33 @@
 </template>
 
 <script lang="ts" name="marketingApps" setup>
-import { getPushPage } from '/@/api/marketing/apps';
+import { getHandPushPage } from '/@/api/marketing/apps';
 import { BasicTableProps, useTable } from '/@/hooks/table';
 import { useI18n } from 'vue-i18n';
 import { ref, reactive, onMounted, defineAsyncComponent } from 'vue'
 const dataInfoModal = defineAsyncComponent(() => import('/@/views/marketing/data/dataInfoModal.vue'));
 import { ElImage } from 'element-plus';
-import lockScreen from '/@/assets/lockScreen.png';
 import { fetchItemList } from '/@/api/admin/dict';
+import { formatDate } from '/@/utils/formatTime';
 
 const { t } = useI18n();
 
 const getDataListWithProcess = (params: any): Promise<any> => {
   return new Promise((resolve, reject) => {
-    getPushPage(params).then((res: any) => {
+    console.log(params, 'params');
+    const data = {
+        ...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') : '',
+    }
+    delete data.current;
+    delete data.size;
+    delete data.ascs;
+    delete data.descs;
+
+    getHandPushPage(data).then((res: any) => {
       console.log(res, 'res');
       try {
         if (res.data && res.data.records && res.data.records.length > 0) {