diff --git a/src/pages/Monitor/MonitorClients.vue b/src/pages/Monitor/MonitorClients.vue index 4a7e2f4e1..ff51e4464 100644 --- a/src/pages/Monitor/MonitorClients.vue +++ b/src/pages/Monitor/MonitorClients.vue @@ -18,17 +18,13 @@ const filter = computed(() => { const obj = {}; const formatFrom = setHours(from.value, 'from'); const formatTo = setHours(to.value, 'to'); + let stamp; - if (!formatFrom && formatTo) - Object.assign(obj, { where: { 'v.stamp': { lte: formatTo } } }); - else if (formatFrom && !formatTo) - Object.assign(obj, { where: { 'v.stamp': { gte: formatFrom } } }); - else if (formatFrom && formatTo) - Object.assign(obj, { - where: { 'v.stamp': { between: [formatFrom, formatTo] } }, - }); + if (!formatFrom && formatTo) stamp = { lte: formatTo }; + else if (formatFrom && !formatTo) stamp = { gte: formatFrom }; + else if (formatFrom && formatTo) stamp = { between: [formatFrom, formatTo] }; - return obj; + return Object.assign(obj, { where: { 'v.stamp': stamp } }); }); function exprBuilder(param, value) { @@ -84,6 +80,7 @@ const columns = computed(() => [ useLike: false, }, }, + columnClass: 'no-padding', }, { label: t('salesClientsTable.client'), @@ -102,6 +99,7 @@ const columns = computed(() => [ sortBy: 'name ASC', }, }, + columnClass: 'no-padding', }, ]); @@ -131,16 +129,12 @@ const columns = computed(() => [