diff --git a/src/frontend/admin/src/directives/time.js b/src/frontend/admin/src/directives/time.js
index 7b84738c..4bc66e5f 100644
--- a/src/frontend/admin/src/directives/time.js
+++ b/src/frontend/admin/src/directives/time.js
@@ -34,7 +34,7 @@ const Time = {
return date.getFullYear() + '-' + month + '-' + day
},
//转换时间
- getFormateTime: function (timestamp) {
+ getFormatTime: function (timestamp) {
timestamp = new Date(timestamp)
const now = this.getUnix()
const today = this.getTodayUnix()
@@ -48,10 +48,10 @@ const Time = {
tip = '刚刚'
} else if (timer < 3600) {
tip = Math.floor(timer / 60) + '分钟前'
- } else if (timer >= 3600 && timestamp - today >= 0) {
+ } else if (timer >= 3600 && (timestamp - today >= 0 || Math.floor(timer / 86400) <= 0)) {
tip = Math.floor(timer / 3600) + '小时前'
} else if (timer / 86400 <= 31) {
- tip = Math.ceil(timer / 86400) + '天前'
+ tip = Math.floor(timer / 86400) + '天前'
} else {
tip = this.getLastDate(timestamp)
}
@@ -68,9 +68,9 @@ export default (el, binding) => {
value = value * 1000
}
if (modifiers.tip) {
- el.innerHTML = Time.getFormateTime(value)
+ el.innerHTML = Time.getFormatTime(value)
el.__timeout__ = setInterval(() => {
- el.innerHTML = Time.getFormateTime(value)
+ el.innerHTML = Time.getFormatTime(value)
}, 60000)
} else {
const format = el.getAttribute('format') || undefined
diff --git a/src/frontend/admin/src/layout/components/tasks.vue b/src/frontend/admin/src/layout/components/tasks.vue
index 32c2e2ac..71409f1a 100644
--- a/src/frontend/admin/src/layout/components/tasks.vue
+++ b/src/frontend/admin/src/layout/components/tasks.vue
@@ -17,7 +17,7 @@
{{ job.jobName }}
-
{{ $t('上次执行:') }}
+
{{ $t('上次执行:') }}
下次执行:{{ job.nextExecTime }}
diff --git a/src/frontend/admin/src/views/home/widgets/index.vue b/src/frontend/admin/src/views/home/widgets/index.vue
index 582f7124..9ae86258 100644
--- a/src/frontend/admin/src/views/home/widgets/index.vue
+++ b/src/frontend/admin/src/views/home/widgets/index.vue
@@ -151,6 +151,10 @@ export default {
}
},
created() {
+ const roleDefaultGrid = this.$GLOBAL.user.roles.filter((x) => x.displayDashboard).sort((x, y) => y.id - x.id)[0].dashboardLayout
+ if (roleDefaultGrid) {
+ this.defaultGrid = JSON.parse(roleDefaultGrid)
+ }
this.loadGrid()
},
mounted() {
diff --git a/src/frontend/admin/src/views/profile/message/components/list.vue b/src/frontend/admin/src/views/profile/message/components/list.vue
index 6e8ed557..7535ffc1 100644
--- a/src/frontend/admin/src/views/profile/message/components/list.vue
+++ b/src/frontend/admin/src/views/profile/message/components/list.vue
@@ -49,7 +49,7 @@
{{ msg.sender.userName }}
-
+
diff --git a/src/frontend/admin/src/views/sys/dic/index.vue b/src/frontend/admin/src/views/sys/dic/index.vue
index c82f09cd..9635014e 100644
--- a/src/frontend/admin/src/views/sys/dic/index.vue
+++ b/src/frontend/admin/src/views/sys/dic/index.vue
@@ -15,7 +15,6 @@
label: 'name',
}"
@node-click="click"
- default-expand-all
node-key="id"
ref="dic">