Merge branch 'dunhuang-dev' of http://192.168.34.160:8023/admin/zhgdyun into dunhuang-cs

This commit is contained in:
Rain_ 2025-11-17 09:19:31 +08:00
commit ade394866a

View File

@ -86,13 +86,10 @@
</span> </span>
<span <span
:class=" :class="
data.videoName {'videoName' : data.videoName,
? 'videoName' 'projectName' : data.projectName,
: data.projectName 'companyName2' : data.companyType == 2,
? 'projectName' 'color-01' : data.videoItem && data.videoItem.deviceState == 1}
: data.companyType == 2
? 'companyName2'
: ''
" "
:title="node.label" :title="node.label"
>{{ node.label }} >{{ node.label }}
@ -559,7 +556,10 @@ export default {
item.children.length > 0 item.children.length > 0
) { ) {
item.children = this.recursion(item.children); item.children = this.recursion(item.children);
return item; if(item.children.length > 0) {
return item;
}
return
} }
console.log(item.deviceState, this.searchInfo.deviceState); console.log(item.deviceState, this.searchInfo.deviceState);
if(item.type == "video") { if(item.type == "video") {
@ -631,6 +631,9 @@ export default {
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.color-01{
color: #01FFF0 !important;
}
.header-search { .header-search {
padding: 10px 15px; padding: 10px 15px;
.header-box1 { .header-box1 {