This commit is contained in:
pycook 2023-08-19 11:04:06 +08:00
parent a24ba8f7cd
commit 836892d909
4 changed files with 16 additions and 12 deletions

View File

@ -60,7 +60,7 @@
</vxe-column> </vxe-column>
<vxe-column field="type_id" title="模型" width="150px"> <vxe-column field="type_id" title="模型" width="150px">
<template #default="{ row }"> <template #default="{ row }">
{{ row.operate_type === '删除模型' ? row.change.alias : row.type_id}} {{ row.operate_type === '删除模型' ? row.change.alias : row.type_id }}
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="changeDescription" title="描述"> <vxe-column field="changeDescription" title="描述">

View File

@ -14,12 +14,16 @@
} }
" "
class="cmdb-views-header-metadata" class="cmdb-views-header-metadata"
><a-icon type="info-circle" /> ><a-icon type="info-circle" />
属性说明 属性说明
</span> </span>
</span> </span>
<a-button size="small" icon="plus" type="primary" @click="$refs.create.handleOpen(true, 'create')" <a-button
>新建</a-button size="small"
icon="plus"
type="primary"
@click="$refs.create.handleOpen(true, 'create')"
>新建</a-button
> >
</div> </div>
<SplitPane <SplitPane
@ -231,10 +235,10 @@
margin: '2px', margin: '2px',
...getChoiceValueStyle(col, value), ...getChoiceValueStyle(col, value),
}" }"
><ops-icon ><ops-icon
:style="{ color: getChoiceValueIcon(col, value).color }" :style="{ color: getChoiceValueIcon(col, value).color }"
:type="getChoiceValueIcon(col, value).name" :type="getChoiceValueIcon(col, value).name"
/>{{ value }}</span />{{ value }}</span
> >
</template> </template>
<span <span

View File

@ -382,9 +382,9 @@
:style="{ display: 'inline-block', width: '98%', margin: '0 7px 24px' }" :style="{ display: 'inline-block', width: '98%', margin: '0 7px 24px' }"
v-if=" v-if="
attributes.findIndex((v) => v == 'bank_card_number') !== -1 || attributes.findIndex((v) => v == 'bank_card_number') !== -1 ||
attributes.findIndex((v) => v == 'bank_card_name') !== -1 || attributes.findIndex((v) => v == 'bank_card_name') !== -1 ||
attributes.findIndex((v) => v == 'opening_bank') !== -1 || attributes.findIndex((v) => v == 'opening_bank') !== -1 ||
attributes.findIndex((v) => v == 'account_opening_location') !== -1 attributes.findIndex((v) => v == 'account_opening_location') !== -1
" "
> >
<a-row :gutter="[8, { xs: 8 }]"> <a-row :gutter="[8, { xs: 8 }]">

View File

@ -117,7 +117,7 @@ export default {
const loginParams = { ...values } const loginParams = { ...values }
delete loginParams.username delete loginParams.username
loginParams[!state.loginType ? 'email' : 'username'] = values.username loginParams[!state.loginType ? 'email' : 'username'] = values.username
loginParams.password = appConfig.useEncryption?md5(values.password):values.password loginParams.password = appConfig.useEncryption ? md5(values.password) : values.password
Login(loginParams) Login(loginParams)
.then((res) => this.loginSuccess(res)) .then((res) => this.loginSuccess(res))
.finally(() => { .finally(() => {