|
|
@@ -30,13 +30,13 @@
|
|
|
<div v-else>{{ row.pushContent }}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column :formatter="statusFormatter" :label="'推送方式'" prop="pushType" min-width="100"
|
|
|
+ <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 }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column :formatter="statusFormatter" :label="'推送频率'" prop="pushFrequency" min-width="120"
|
|
|
+ <el-table-column :formatter="statusFormatter" :label="'推送频率'" prop="pushFrequency" min-width="100"
|
|
|
show-overflow-tooltip>
|
|
|
</el-table-column>
|
|
|
<el-table-column :formatter="statusFormatter" :label="'推送时间'" prop="createTime" min-width="200"
|
|
|
@@ -58,8 +58,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column :formatter="statusFormatter" :label="'触发记录'" prop="pushDetail" min-width="250"
|
|
|
- show-overflow-tooltip>
|
|
|
+ <el-table-column :formatter="statusFormatter" :label="'触发记录'" prop="pushDetail" min-width="250">
|
|
|
<template #default="{ row }">
|
|
|
<div class="trigger-info" @click="showTriggerInfo(row)">
|
|
|
{{ row.pushDetail }}
|
|
|
@@ -87,8 +86,18 @@ import { fetchItemList } from '/@/api/admin/dict';
|
|
|
const { t } = useI18n();
|
|
|
|
|
|
const getDataListWithProcess = (params: any): Promise<any> => {
|
|
|
+ const data = {
|
|
|
+ ...params,
|
|
|
+ pageNum: params.current,
|
|
|
+ pageSize: params.size,
|
|
|
+ }
|
|
|
+
|
|
|
+ delete data.current;
|
|
|
+ delete data.size;
|
|
|
+ delete data.ascs;
|
|
|
+ delete data.descs;
|
|
|
return new Promise((resolve, reject) => {
|
|
|
- getPushPage(params).then((res: any) => {
|
|
|
+ getPushPage(data).then((res: any) => {
|
|
|
console.log(res, 'res');
|
|
|
try {
|
|
|
if (res.data && res.data.records && res.data.records.length > 0) {
|
