lingling
/
media_player_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
miao 2023-03-08 11:42:44 +08:00
parent 4aef830905
commit b6820b4368
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/ControlPanelDialog.vue
View File

@ -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;
}) })