From 1c30a646dcdaf5309e19ba70522fe0184919f6db Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 14 Nov 2022 20:13:26 +0800 Subject: [PATCH] =?UTF-8?q?pref:=20=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/theme/element-extra.css | 4 ++ src/i18n/langs/en.json | 2 +- src/i18n/langs/ja.json | 2 +- .../RequestAssetPerm/Detail/TicketDetail.vue | 30 +++++++------- src/views/tickets/components/Steps.vue | 40 ++++++++++--------- 5 files changed, 42 insertions(+), 36 deletions(-) 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 @@
-
+
{{ `${this.$t('tickets.Applicant')}：${object.rel_snapshot.applicant}` }}
{{ `${this.$t('common.DateCreated')}: ${toSafeLocalDateStr(object.date_created)}` }}
@@ -14,29 +14,31 @@
- {{ `${thisCopy.statusMap[item.state].title}` }} -
-
- - {{ $t('tickets.CheckViewAcceptor') }} +
+ + {{ assignee }} + +
+ + {{ $tc('tickets.CheckViewAcceptor') }}
-
-
{{ `${thisCopy.$t('tickets.Assignee')}：${object.rel_snapshot.applicant}` }}
-
{{ `${thisCopy.$t('common.dateFinished')}: ${toSafeLocalDateStr(item.approval_date)}` }}
+
+
{{ $t('tickets.Assignee') }}：{{ object.rel_snapshot.applicant }}
+
{{ $t('common.dateFinished') }}: {{ toSafeLocalDateStr(item.approval_date) }}
-
-
{{ `${thisCopy.$t('tickets.Assignee')}：${item.processor_display}` }}
-
{{ `${thisCopy.$t('common.dateFinished')}: ${toSafeLocalDateStr(item.approval_date)}` }}
+
+
{{ $t('tickets.Assignee') }}：{{ item.processor_display }}
+
{{ $t('common.dateFinished') }}: {{ toSafeLocalDateStr(item.approval_date) }}
-
+
{{ `${this.$t('common.dateFinished')}: ${toSafeLocalDateStr(object.date_updated)}` }}
@@ -50,6 +52,7 @@ import { formatTime, getDateTimeStamp } from '@/utils/index' import { toSafeLocalDateStr } from '@/utils/common' import IBox from '@/components/IBox' import { STATE_MAP } from '../const' + export default { name: 'Steps', components: { IBox }, @@ -63,20 +66,19 @@ export default { return { STATUS: { open: 2, close: 3 }, process: this.object.process_map, - thisCopy: this, + vm: this, statusMap: STATE_MAP, isFinish: false } }, computed: { ticketSteps() { - // eslint-disable-next-line no-unused-vars - var countApprove = 0 + let countApprove = 0 // eslint-disable-next-line vue/no-side-effects-in-computed-properties this.process.sort((a, b) => a.approval_level - b.approval_level) this.process.forEach(item => { // eslint-disable-next-line space-before-blocks - if (item.state === 'approved'){ + if (item.state === 'approved') { countApprove += 1 } })