diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue index 062475ca..40dd552b 100644 --- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue +++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue @@ -330,11 +330,13 @@ const handleOk = async () => { if (data?.configuration.function !== 'HoldingRegisters') { codec.provider = 'int8'; } + const { interval } = formData.value.configuration; const params = { ...props.data, ...data, provider, collectorId, + interval, }; // address是多余字段,但是react版本上使用到了这个字段 diff --git a/src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue b/src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue index 869d0954..3192c66e 100644 --- a/src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue +++ b/src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue @@ -132,11 +132,13 @@ const formData = ref({ const handleOk = async () => { const data = await formRef.value?.validate(); + const { interval } = formData.value.configuration; const params = { ...props.data, ...data, provider, collectorId, + interval, }; loading.value = true; diff --git a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue index ab4cb85a..4e5354a3 100644 --- a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue +++ b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue @@ -101,7 +101,7 @@ const formRef = ref(); const formData = ref({ accessModes: [], - interval: '', + interval: undefined, features: [], }); @@ -118,7 +118,10 @@ const handleOk = async () => { const data = cloneDeep(formData.value); const { accessModes, features, interval } = data; const ischange = - accessModes.length !== 0 || features.length !== 0 || !!interval; + accessModes.length !== 0 || + features.length !== 0 || + Number(interval) === 0 || + !!interval; if (ischange) { const params = cloneDeep(props.data); params.forEach((i: any) => { @@ -132,7 +135,7 @@ const handleOk = async () => { } } features.length !== 0 && (i.features = data.features); - if (!!interval) { + if (!!interval || Number(interval) === 0) { i.interval = data.interval; i.configuration = { ...i.configuration, diff --git a/src/views/DataCollect/Collector/Tree/index.vue b/src/views/DataCollect/Collector/Tree/index.vue index 5a2f7259..29cfecd0 100644 --- a/src/views/DataCollect/Collector/Tree/index.vue +++ b/src/views/DataCollect/Collector/Tree/index.vue @@ -310,6 +310,9 @@ watch( :deep(.ant-tree-list-holder-inner) { width: 90%; } + :deep(.ant-tree-list) { + width: 110%; + } :deep(.ant-tree-treenode) { width: 100%;