diff --git a/public/theme/element-extra.css b/public/theme/element-extra.css index f4574a068..3ab5dca38 100644 --- a/public/theme/element-extra.css +++ b/public/theme/element-extra.css @@ -448,3 +448,7 @@ td .el-button.el-button--mini { color: $--color-text-primary; cursor: not-allowed; } + +.el-step__description.is-finish { + color: #676a6c; +} diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 688ae8944..f666bd1aa 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -1169,7 +1169,7 @@ "OpenTicket": "Open Ticket", "HandleTicket": "Handle Ticket", "FinishedTicket": "Finished Ticket", - "CheckViewAcceptor": "Click to view the acceptor", + "CheckViewAcceptor": "View more acceptor", "Assignees": "Assignees", "Close": "Close", "OpenStatus": "Open", diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index cf4694c59..e2d84a0e7 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -1220,7 +1220,7 @@ "OpenTicket": "ワークオーダーの作成", "HandleTicket": "作業指示の処理", "FinishedTicket": "ワークオーダーの完了", - "CheckViewAcceptor": "クリックして受付人を表示", + "CheckViewAcceptor": "もっとみる見る", "IP": "IP", "Hostname": "ホスト名", "Asset": "資産", diff --git a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue index f83bf2b31..62287cdff 100644 --- a/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue +++ b/src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue @@ -121,7 +121,7 @@ export default { }, { key: this.$tc('tickets.type'), - value: 'abc' + value: object.type.label }, { key: this.$tc('tickets.user'), @@ -146,27 +146,27 @@ export default { return [ { key: this.$tc('perms.Node'), - value: object.apply_nodes.join(', ') + value: object.apply_nodes.map(item => item.value).join(', ') }, { key: this.$tc('tickets.Asset'), - value: object.apply_assets.join(', ') + value: object.apply_assets.map(item => item.name).join(', ') }, { - key: this.$tc('tickets.Account'), - value: object.apply_accounts + key: this.$tc('assets.Accounts'), + value: object.apply_accounts.join(', ') }, { key: this.$tc('assets.Action'), - value: object.apply_actions + value: object.apply_actions.map(item => item.label).join(', ') }, { key: this.$tc('common.DateStart'), - value: toSafeLocalDateStr(object.apply_date_start) + value: object.apply_date_start }, { key: this.$tc('common.dateExpired'), - value: toSafeLocalDateStr(object.apply_date_expired) + value: object.apply_date_expired } ] }, @@ -189,27 +189,27 @@ export default { }, { key: this.$tc('perms.Node'), - value: rel_snapshot.apply_nodes.join(', ') + value: rel_snapshot.apply_nodes.map(item => item.value).join(', ') }, { key: this.$tc('assets.Asset'), - value: rel_snapshot.apply_assets.join(', ') + value: rel_snapshot.apply_assets.map(item => item.name).join(', ') }, { - key: this.$tc('tickets.Account'), - value: rel_snapshot.apply_accounts + key: this.$tc('perms.Accounts'), + value: (rel_snapshot.apply_accounts || []).join(', ') }, { key: this.$tc('assets.Action'), - value: object.apply_actions + value: object.apply_actions.map(item => item.label).join(', ') }, { key: this.$tc('common.DateStart'), - value: toSafeLocalDateStr(object.apply_date_start) + value: object.apply_date_start }, { key: this.$tc('common.dateExpired'), - value: toSafeLocalDateStr(object.apply_date_expired) + value: object.apply_date_expired } ] }, diff --git a/src/views/tickets/components/Steps.vue b/src/views/tickets/components/Steps.vue index a1b47a8d0..c020e3eb7 100644 --- a/src/views/tickets/components/Steps.vue +++ b/src/views/tickets/components/Steps.vue @@ -3,10 +3,10 @@