diff --git a/src/components/DetailCard/ItemValue.vue b/src/components/DetailCard/ItemValue.vue index 3cd965844..252cd827c 100644 --- a/src/components/DetailCard/ItemValue.vue +++ b/src/components/DetailCard/ItemValue.vue @@ -3,7 +3,7 @@ export default { name: 'ItemValue', props: { value: { - type: [String, Function], + type: [String, Function, Array], default: '' }, item: { diff --git a/src/i18n/langs/cn/route.json b/src/i18n/langs/cn/route.json index 44b8c1da8..91d6062b2 100644 --- a/src/i18n/langs/cn/route.json +++ b/src/i18n/langs/cn/route.json @@ -43,6 +43,7 @@ "BatchCommand": "批量命令", "TaskMonitor": "任务监控", "Tickets": "工单管理", + "TicketDetail": "工单详情", "Audits": "日志审计", "LoginLog": "登录日志", "FtpLog": "FTP日志", diff --git a/src/i18n/langs/cn/tickets.json b/src/i18n/langs/cn/tickets.json index 661feb46c..9bd5520f1 100644 --- a/src/i18n/langs/cn/tickets.json +++ b/src/i18n/langs/cn/tickets.json @@ -7,5 +7,7 @@ "MyTickets": "我的工单", "AssignedMe": "待处理", "Assignees": "待处理人", - "Assignee": "处理人" + "Assignee": "处理人", + "Open": "开启", + "Closed": "关闭" } diff --git a/src/utils/index.js b/src/utils/index.js index 7e3fc1ab0..ad4b79983 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -105,3 +105,8 @@ export function param2Obj(url) { '"}' ) } + +// 将标准时间转换成时间戳 +export function getDateTimeStamp(dateStr) { + return Date.parse(dateStr.replace(/-/gi, '/')) +} diff --git a/src/views/tickets/TicketDetail/TicketDetail.vue b/src/views/tickets/TicketDetail/TicketDetail.vue index ab657bfae..eeedfd450 100644 --- a/src/views/tickets/TicketDetail/TicketDetail.vue +++ b/src/views/tickets/TicketDetail/TicketDetail.vue @@ -7,24 +7,24 @@
- {{ object.user_display }} {{ object.date_created }} + {{ object.user_display }} {{ formatTime(object.date_created) }}
- {{ object.date_created }} + {{ toSafeLocalDateStr(object.date_created) }}
-