github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-09-23 20:17:54 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修复表格的时间过滤问题

Browse Source
This commit is contained in:
Orange
2020-10-13 14:48:06 +08:00
committed by 老广
parent 1519ccb8e2
commit b849df1dc1
8 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/utils/common.js
View File

@@ -145,6 +145,13 @@ export function getDaysFuture(days, now) {
return new Date(now.getTime() + 3600 * 1000 * 24 * days)
}
export function getDayEnd(now) {
if (!now) {
now = new Date()
}
return new Date(new Date(now.toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1)
}
export function setUrlParam(url, name, value) {
const urlArray = url.split('?')
if (urlArray.length === 1) {

4
src/views/audits/CommandExecutionList.vue
View File

@@ -9,7 +9,7 @@
<script type="text/jsx">
import GenericListPage from '@/layout/components/GenericListPage'
import { getDaysAgo } from '@/utils/common'
import { getDayEnd, getDaysAgo } from '@/utils/common'
import { Dialog, ListTable } from '@/components'
import { DisplayFormatter } from '@/components/ListTable/formatters'
import { setUrlParam } from '@/utils/common'
@@ -21,7 +21,7 @@ export default {
data() {
const now = new Date()
const dateFrom = getDaysAgo(7, now).toISOString()
const dateTo = now.toISOString()
const dateTo = getDayEnd(now).toISOString()
const vm = this
return {
tableConfig: {

4
src/views/audits/FTPLogList.vue
View File

@@ -4,7 +4,7 @@
<script>
import GenericListPage from '@/layout/components/GenericListPage'
import { getDaysAgo } from '@/utils/common'
import { getDayEnd, getDaysAgo } from '@/utils/common'
export default {
components: {
@@ -13,7 +13,7 @@ export default {
data() {
const now = new Date()
const dateFrom = getDaysAgo(7, now).toISOString()
const dateTo = now.toISOString()
const dateTo = getDayEnd(now).toISOString()
return {
tableConfig: {
url: '/api/v1/audits/ftp-logs/',

4
src/views/audits/LoginLogList.vue
View File

@@ -4,7 +4,7 @@
<script>
import GenericListPage from '@/layout/components/GenericListPage'
import { getDaysAgo } from '@/utils/common'
import { getDayEnd, getDaysAgo } from '@/utils/common'
export default {
components: {
@@ -13,7 +13,7 @@ export default {
data() {
const now = new Date()
const dateFrom = getDaysAgo(7, now).toISOString()
const dateTo = now.toISOString()
const dateTo = getDayEnd(now).toISOString()
return {
tableConfig: {
url: '/api/v1/audits/login-logs/',

4
src/views/audits/OperateLogList.vue
View File

@@ -4,7 +4,7 @@
<script>
import GenericListPage from '@/layout/components/GenericListPage'
import { getDaysAgo } from '@/utils/common'
import { getDayEnd, getDaysAgo } from '@/utils/common'
export default {
components: {
@@ -13,7 +13,7 @@ export default {
data() {
const now = new Date()
const dateFrom = getDaysAgo(7, now).toISOString()
const dateTo = now.toISOString()
const dateTo = getDayEnd(now).toISOString()
return {
tableConfig: {
url: '/api/v1/audits/operate-logs/',

4
src/views/audits/PasswordChangeLogList.vue
View File

@@ -4,7 +4,7 @@
<script>
import GenericListPage from '@/layout/components/GenericListPage'
import { getDaysAgo } from '@/utils/common'
import { getDayEnd, getDaysAgo } from '@/utils/common'
export default {
components: {
@@ -13,7 +13,7 @@ export default {
data() {
const now = new Date()
const dateFrom = getDaysAgo(7, now).toISOString()
const dateTo = now.toISOString()
const dateTo = getDayEnd(now).toISOString()
return {
tableConfig: {
url: '/api/v1/audits/password-change-logs/',

4
src/views/sessions/CommandList.vue
View File

@@ -4,7 +4,7 @@
<script>
import { GenericListPage } from '@/layout/components'
import { getDaysAgo, toSafeLocalDateStr } from '@/utils/common'
import { getDayEnd, getDaysAgo, toSafeLocalDateStr } from '@/utils/common'
import { OutputExpandFormatter } from './formatters'
import { DetailFormatter } from '@/components/ListTable/formatters'
@@ -16,7 +16,7 @@ export default {
const vm = this
const now = new Date()
const dateFrom = getDaysAgo(2, now).toISOString()
const dateTo = now.toISOString()
const dateTo = getDayEnd(now).toISOString()
return {
tableConfig: {
url: '/api/v1/terminal/commands/',

4
src/views/sessions/SessionList/BaseList.vue
View File

@@ -4,7 +4,7 @@
<script type="text/jsx">
import ListTable from '@/components/ListTable'
import { timeOffset, getDaysAgo } from '@/utils/common'
import { timeOffset, getDaysAgo, getDayEnd } from '@/utils/common'
import { ActionsFormatter } from '@/components/ListTable/formatters'
export default {
name: 'BaseList',
@@ -24,7 +24,7 @@ export default {
data() {
const now = new Date()
const dateFrom = getDaysAgo(2, now).toISOString()
const dateTo = now.toISOString()
const dateTo = getDayEnd(now).toISOString()
return {
tableConfig: {
url: this.url,