Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2
# Conflicts: # src/components/ControlPanelDialog.vue
This commit is contained in:
commit
59bc352276
|
@ -1494,6 +1494,10 @@ export default defineComponent({
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if(a.length==0){
|
if(a.length==0){
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
console.log(123)
|
||||||
|
>>>>>>> b2f88140799e0867e7ee99aaa09fe88f841aa673
|
||||||
test_monitor_list.value.forEach((ele) => {
|
test_monitor_list.value.forEach((ele) => {
|
||||||
ele.isHide = false;
|
ele.isHide = false;
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue