From aaba2454fc88bc6cdcdf5833ca413338fbc3b46e Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Wed, 3 Jun 2020 16:15:30 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E6=92=A4=E9=94=80=E4=B8=8A=E6=AC=A1?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/NavBar/Logo.vue | 2 +- src/views/assets/Asset/AssetCreateUpdate.vue | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/layout/components/NavBar/Logo.vue b/src/layout/components/NavBar/Logo.vue index 829e7b4f5..4a7a4dc8a 100644 --- a/src/layout/components/NavBar/Logo.vue +++ b/src/layout/components/NavBar/Logo.vue @@ -40,7 +40,7 @@ export default { // eslint-disable-next-line vue/return-in-computed-property logoSrc() { if (this.publicSettings.XPACK_LICENSE_IS_VALID) { - if (this.customSettings && this.customSettings.logo_index && this.customSettings.logo_index !== '/media/xpack/logo/logo_text.png') { + if (this.customSettings && this.customSettings.logo_index && this.customSettings.logo_index !== '/static/img/logo_text.png') { return this.customSettings.logo_index } } else { diff --git a/src/views/assets/Asset/AssetCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate.vue index 0fa3ea6f9..2148eee04 100644 --- a/src/views/assets/Asset/AssetCreateUpdate.vue +++ b/src/views/assets/Asset/AssetCreateUpdate.vue @@ -32,7 +32,10 @@ export default { el: { multiple: false, ajax: { - url: '/api/v1/assets/platforms/' + url: '/api/v1/assets/platforms/', + transformOption: (item) => { + return { label: `${item.name}`, value: item.name } + } } } },