From bcf1f60ec36c432f714cff97754effe7c636a331 Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Fri, 31 Mar 2023 17:03:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20bug#11300=E3=80=8111289?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataCollect/Collector/Point/Save/SaveModBus.vue | 10 ++-------- src/views/DataCollect/Collector/Point/index.vue | 11 ++++++++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue index 6ed17666..062475ca 100644 --- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue +++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue @@ -413,23 +413,17 @@ const filterOption = (input: string, option: any) => { const getProviderList = async () => { const res: any = await queryCodecProvider(); providerListAll.value = res.result - .filter((i: any) => i.id !== 'property') + .filter((i: any) => i.id !== 'property' && i.id !== 'bool') .map((item: any) => ({ value: item.id, label: item.name, })); - setProviderList(formData.value.configuration.function); }; getProviderList(); const setProviderList = (value: string | undefined) => { - providerList.value = - value === 'HoldingRegisters' - ? providerListAll.value - : providerListAll.value.filter( - (item: any) => item.value !== 'bool', - ); + providerList.value = providerListAll.value; }; watch( diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue index 266e91bb..4a4a55ce 100644 --- a/src/views/DataCollect/Collector/Point/index.vue +++ b/src/views/DataCollect/Collector/Point/index.vue @@ -281,9 +281,14 @@ {{ getText(slotProps) }} - {{ - getInterval(slotProps) - }} + {{ + getInterval(slotProps) + }}