Merge branch 'dunhuang-dev' of http://192.168.34.160:8023/admin/zhgdyun into dunhuang-cs
This commit is contained in:
commit
ade394866a
@ -86,13 +86,10 @@
|
||||
</span>
|
||||
<span
|
||||
:class="
|
||||
data.videoName
|
||||
? 'videoName'
|
||||
: data.projectName
|
||||
? 'projectName'
|
||||
: data.companyType == 2
|
||||
? 'companyName2'
|
||||
: ''
|
||||
{'videoName' : data.videoName,
|
||||
'projectName' : data.projectName,
|
||||
'companyName2' : data.companyType == 2,
|
||||
'color-01' : data.videoItem && data.videoItem.deviceState == 1}
|
||||
"
|
||||
:title="node.label"
|
||||
>{{ node.label }}
|
||||
@ -559,8 +556,11 @@ export default {
|
||||
item.children.length > 0
|
||||
) {
|
||||
item.children = this.recursion(item.children);
|
||||
if(item.children.length > 0) {
|
||||
return item;
|
||||
}
|
||||
return
|
||||
}
|
||||
console.log(item.deviceState, this.searchInfo.deviceState);
|
||||
if(item.type == "video") {
|
||||
if(item.videoItem && item.videoItem.deviceState == this.searchInfo.deviceState) {
|
||||
@ -631,6 +631,9 @@ export default {
|
||||
};
|
||||
</script>
|
||||
<style lang="less" scoped>
|
||||
.color-01{
|
||||
color: #01FFF0 !important;
|
||||
}
|
||||
.header-search {
|
||||
padding: 10px 15px;
|
||||
.header-box1 {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user