From 2ec9c02d0ccec65a5ad295d4369ff5a41b93d685 Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Mon, 5 Dec 2022 15:59:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E6=88=91?= =?UTF-8?q?=E7=9A=84=E8=B5=84=E4=BA=A7=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AssetSelect/index.vue | 18 +++++++++++++----- src/views/ops/Job/JobUpdateCreate.vue | 2 ++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue index 6f8400afd..3bcc3f015 100644 --- a/src/components/AssetSelect/index.vue +++ b/src/components/AssetSelect/index.vue @@ -39,6 +39,14 @@ export default { componentName: 'AssetSelect', components: { TreeTable, Select2, Dialog }, props: { + baseUrl: { + type: String, + default: '/api/v1/assets/assets/' + }, + baseNodeUrl: { + type: String, + default: '/api/v1/assets/nodes/' + }, value: { type: Array, default: () => [] @@ -68,7 +76,7 @@ export default { multiple: true, clearable: true, ajax: { - url: '/api/v1/assets/assets/', + url: this.baseUrl, transformOption: (item) => { return { label: item.name + '(' + item.address + ')', value: item.id } } @@ -84,15 +92,15 @@ export default { showMenu: false, showRefresh: true, showAssets: false, - url: '/api/v1/assets/assets/', - nodeUrl: '/api/v1/assets/nodes/', + url: this.baseUrl, + nodeUrl: this.baseNodeUrl, // ?assets=0不显示资产. =1显示资产 - treeUrl: '/api/v1/assets/nodes/children/tree/?assets=0' + treeUrl: `${this.baseNodeUrl}/children/tree/?assets=0` }, select2Config: select2Config, dialogSelect2Config: select2Config, tableConfig: { - url: '/api/v1/assets/assets/', + url: this.baseUrl, hasTree: true, hasSelection: false, canSelect: this.canSelect, diff --git a/src/views/ops/Job/JobUpdateCreate.vue b/src/views/ops/Job/JobUpdateCreate.vue index 005702d32..c76bd2954 100644 --- a/src/views/ops/Job/JobUpdateCreate.vue +++ b/src/views/ops/Job/JobUpdateCreate.vue @@ -86,6 +86,8 @@ export default { required: false }], el: { + baseUrl: '/api/v1/perms/users/self/assets/', + baseNodeUrl: '/api/v1/perms/users/self/nodes/', value: [] } },