github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-07-14 15:36:01 +00:00
Code Issues Projects Releases Wiki Activity

perf: ticket bug

Browse Source
This commit is contained in:
feng 2023-02-09 18:05:37 +08:00
parent 51d30f3275
commit 847d3a331b
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/tickets/BaseTicketList.vue
View File

@ -34,8 +34,8 @@ export default {
url: this.url, url: this.url,
columnsExclude: ['process_map', 'rel_snapshot'], columnsExclude: ['process_map', 'rel_snapshot'],
columnsShow: { columnsShow: {
min: ['title', 'type', 'state', 'actions'], min: ['title', 'serial_num', 'type', 'state', 'date_created'],
default: ['title', 'type', 'state', 'status', 'actions'] default: ['title', 'serial_num', 'type', 'state', 'status', 'date_created']
}, },
columnsMeta: { columnsMeta: {
serial_num: { serial_num: {

13
src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue
View File

@ -19,7 +19,7 @@
<el-form-item :label="$tc('tickets.Asset')"> <el-form-item :label="$tc('tickets.Asset')">
<Select2 v-model="requestForm.assets" v-bind="assetSelect2" style="width: 50% !important" /> <Select2 v-model="requestForm.assets" v-bind="assetSelect2" style="width: 50% !important" />
</el-form-item> </el-form-item>
<el-form-item :label="$tc('tickets.SystemUser')" :rules="isRequired"> <el-form-item :label="$tc('perms.Account')" :rules="isRequired">
<AccountFormatter v-model="requestForm.accounts" style="width: 50% !important" /> <AccountFormatter v-model="requestForm.accounts" style="width: 50% !important" />
</el-form-item> </el-form-item>
<el-form-item :label="$tc('common.DateStart')" required> <el-form-item :label="$tc('common.DateStart')" required>
@ -119,14 +119,14 @@ export default {
return [ return [
{ {
key: this.$tc('perms.Node'), key: this.$tc('perms.Node'),
value: object.apply_nodes.map(item => item.value).join(', ') value: object.apply_nodes.map(item => item.name).join(', ')
}, },
{ {
key: this.$tc('tickets.Asset'), key: this.$tc('tickets.Asset'),
value: object.apply_assets.map(item => item.name).join(', ') value: object.apply_assets.map(item => item.name).join(', ')
}, },
{ {
key: this.$tc('assets.Accounts'), key: this.$tc('perms.Account'),
value: object.apply_accounts.join(', ') value: object.apply_accounts.join(', ')
}, },
{ {
@ -146,7 +146,6 @@ export default {
assignedCardItems() { assignedCardItems() {
const vm = this const vm = this
const { object } = this const { object } = this
const rel_snapshot = object.rel_snapshot
return [ return [
{ {
key: this.$tc('tickets.PermissionName'), key: this.$tc('tickets.PermissionName'),
@ -162,14 +161,14 @@ export default {
}, },
{ {
key: this.$tc('perms.Node'), key: this.$tc('perms.Node'),
value: rel_snapshot.apply_nodes.map(item => item.value).join(', ') value: object.apply_nodes.map(item => item.name).join(', ')
}, },
{ {
key: this.$tc('assets.Asset'), key: this.$tc('assets.Asset'),
value: rel_snapshot.apply_assets.map(item => item.name).join(', ') value: object.apply_assets.map(item => item.name).join(', ')
}, },
{ {
key: this.$tc('perms.Accounts'), key: this.$tc('perms.Account'),
value: (object.apply_accounts || []).join(', ') value: (object.apply_accounts || []).join(', ')
}, },
{ {