Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/views/DataCollect/Channel/Save/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@
v-model:value="formData.configuration.overIp.subnetAddress"
style="width: 100%"
placeholder="请输入子网地址"
@change="changeSubnetAddress"
/>
</a-form-item>
<a-form-item
Expand Down Expand Up @@ -405,6 +406,13 @@ const getCertificateList = async () => {
}
};

// 子网地址长度为0时,设置为undefined
const changeSubnetAddress = (val: Event) => {
if(!val?.target?.value) {
formData.value.configuration.overIp.subnetAddress = undefined
}
}

const getProvidersList = async () => {
const resp: any = await getProviders();
if (resp.status === 200) {
Expand Down
4 changes: 2 additions & 2 deletions src/views/media/SplitScreen/tree.vue
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,12 @@ const getChildren = (node: any): Promise<any> => {
await getChannelChildren(node.key, node._type === 'catalog' ? node.deviceId : node.key, {
pageIndex: 0,
pageSize: 100,
terms: [
terms: node._type === 'catalog' ? [
{
column: "parentId",
value: node._type === 'catalog' ? node.id : node.deviceId
}
]
] : []
})
resolve(true)
});
Expand Down