Skip to content

Commit f0c5bd0

Browse files
authored
fix: 分屏展示-修改判断查询通道参数的条件 (#761)
* fix: 数采-bacnet子网地址长度为0时设置为空值(#35645)
1 parent 75d5693 commit f0c5bd0

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/views/DataCollect/Channel/Save/index.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@
227227
v-model:value="formData.configuration.overIp.subnetAddress"
228228
style="width: 100%"
229229
placeholder="请输入子网地址"
230+
@change="changeSubnetAddress"
230231
/>
231232
</a-form-item>
232233
<a-form-item
@@ -405,6 +406,13 @@ const getCertificateList = async () => {
405406
}
406407
};
407408
409+
// 子网地址长度为0时,设置为undefined
410+
const changeSubnetAddress = (val: Event) => {
411+
if(!val?.target?.value) {
412+
formData.value.configuration.overIp.subnetAddress = undefined
413+
}
414+
}
415+
408416
const getProvidersList = async () => {
409417
const resp: any = await getProviders();
410418
if (resp.status === 200) {

src/views/media/SplitScreen/tree.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,12 @@ const getChildren = (node: any): Promise<any> => {
198198
await getChannelChildren(node.key, node._type === 'catalog' ? node.deviceId : node.key, {
199199
pageIndex: 0,
200200
pageSize: 100,
201-
terms: [
201+
terms: node._type === 'catalog' ? [
202202
{
203203
column: "parentId",
204204
value: node._type === 'catalog' ? node.id : node.deviceId
205205
}
206-
]
206+
] : []
207207
})
208208
resolve(true)
209209
});

0 commit comments

Comments
 (0)