fix: 跟踪任务排序开始时间和时间查询

This commit is contained in:
TsMask
2023-10-25 19:37:01 +08:00
parent 749d83e00f
commit b56530d44c
2 changed files with 69 additions and 1 deletions

View File

@@ -16,18 +16,32 @@ export async function listTraceTask(query: Record<string, any>) {
if (query.imsi) {
querySQL += ` and imsi like '%${query.imsi}%' `;
}
if (query.beginTime) {
querySQL += ` and start_time >= '${query.beginTime}' `;
}
if (query.endTime) {
querySQL += ` and end_time <= '${query.endTime}' `;
}
// 分页
const pageNum = (query.pageNum - 1) * query.pageSize;
const limtSql = ` limit ${pageNum},${query.pageSize} `;
// 排序
let sortSql = ' order by start_time ';
if (query.sortOrder === 'asc') {
sortSql += ' asc ';
} else {
sortSql += ' desc ';
}
// 发起请求
const result = await request({
url: `/api/rest/databaseManagement/v1/select/omc_db/trace_task`,
method: 'get',
params: {
totalSQL: totalSQL + querySQL,
rowsSQL: rowsSQL + querySQL + limtSql,
rowsSQL: rowsSQL + querySQL + sortSql + limtSql,
},
});

View File

@@ -34,6 +34,13 @@ let dict: {
let queryParams = reactive({
/**网元类型 */
neType: '',
/**记录时间 */
beginTime: '',
endTime: '',
/**排序字段 */
sortField: 'startTime',
/**排序方式 */
sortOrder: 'asc',
/**当前页数 */
pageNum: 1,
/**每页条数 */
@@ -44,6 +51,10 @@ let queryParams = reactive({
function fnQueryReset() {
queryParams = Object.assign(queryParams, {
neType: '',
beginTime: '',
endTime: '',
sortField: 'startTime',
sortOrder: 'asc',
pageNum: 1,
pageSize: 20,
});
@@ -86,6 +97,10 @@ let tableColumns: ColumnsType = [
title: t('views.traceManage.task.neType'),
dataIndex: 'neType',
align: 'center',
sorter: {
compare: (a, b) => 1,
multiple: 1,
},
},
{
title: t('views.traceManage.task.neID'),
@@ -111,6 +126,7 @@ let tableColumns: ColumnsType = [
if (!opt.value) return '';
return parseDateToStr(opt.value);
},
sorter: true,
},
{
title: t('views.traceManage.task.endTime'),
@@ -161,6 +177,19 @@ function fnTableSize({ key }: MenuInfo) {
tableState.size = key as SizeType;
}
/**表格分页、排序、筛选变化时触发操作, 排序方式,取值为 ascend descend */
function fnTableChange(pagination: any, filters: any, sorter: any, extra: any) {
const { field, order } = sorter;
if (order) {
queryParams.sortField = field;
queryParams.sortOrder = order.replace('end', '');
} else {
queryParams.sortOrder = 'asc';
}
fnGetList();
console.log(sorter);
}
/**
* 备份信息删除
* @param row 记录编号ID
@@ -538,6 +567,30 @@ onMounted(() => {
/>
</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">
@@ -620,6 +673,7 @@ onMounted(() => {
:size="tableState.size"
:pagination="tablePagination"
:scroll="{ x: true }"
@change="fnTableChange"
>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'traceType'">