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

This commit is contained in:
shefengchun 2023-03-08 16:38:58 +08:00
parent bc87c6dbcb 9e7acc2482
commit 49b38635aa
1 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/components/ControlPanelDialog.vue
View File

@ -102,7 +102,7 @@
<q-separator /> <q-separator />
<q-card-section style="max-height: 80vh; width: 55vw" class="q-pa-none"> <q-card-section style="max-height: 70vh; width: 48vw" class="q-pa-none">
<q-scroll-area style="height: 70vh"> <q-scroll-area style="height: 70vh">
<q-card class="my-card" flat bordered> <q-card class="my-card" flat bordered>
<q-card-section horizontal> <q-card-section horizontal>
@ -298,8 +298,8 @@
<div <div
style=" style="
position: absolute; position: absolute;
height: 20.7vw; height: 18vw;
width: 36.8vw; width: 32vw;
text-align: center; text-align: center;
" "
:class="$store.state.power_state ? 'wall' : ''" :class="$store.state.power_state ? 'wall' : ''"
@ -321,8 +321,8 @@
v-if="$store.state.power_state" v-if="$store.state.power_state"
style=" style="
position: absolute; position: absolute;
height: 20.7vw; height: 18vw;
width: 36.8vw; width: 32vw;
overflow: hidden; overflow: hidden;
" "
@click="canel_active()" @click="canel_active()"
@ -670,7 +670,7 @@
.wall { .wall {
border: 1px solid black; border: 1px solid black;
background: no-repeat url("../../public/magic_bg/bg.jpg"); background: no-repeat url("../../public/magic_bg/bg.jpg");
background-size: 36.8vw 20.7vw; background-size: 32vw 18vw;
} }
.wall_row { .wall_row {
@ -1292,9 +1292,11 @@ export default defineComponent({
((item.currenty + item.h / 2) / wall_dom?.offsetHeight) * 2160 ((item.currenty + item.h / 2) / wall_dom?.offsetHeight) * 2160
); );
} }
test_monitor_wall.value=ordination(JSON.parse(JSON.stringify(test_monitor_wall.value))) test_monitor_wall.value = ordination(
JSON.parse(JSON.stringify(test_monitor_wall.value))
);
realtime_upload(); realtime_upload();
item.active=true item.active = true;
}; };
const exceedrange = (item: test_monitor) => { const exceedrange = (item: test_monitor) => {
const wall_dom = wall.value; const wall_dom = wall.value;
@ -1482,7 +1484,7 @@ export default defineComponent({
); );
item.angle = element.angle; item.angle = element.angle;
item.isShow = true; item.isShow = true;
item.active=false; item.active = false;
test_monitor_wall.value.push(JSON.parse(JSON.stringify(item))); test_monitor_wall.value.push(JSON.parse(JSON.stringify(item)));
sort_index.value.push(test_monitor_list.value[element.index].uuid); sort_index.value.push(test_monitor_list.value[element.index].uuid);
@ -1493,6 +1495,12 @@ export default defineComponent({
}); });
}); });
} }
if (a.length == 0) {
test_monitor_list.value.forEach((ele) => {
ele.isHide = false;
});
test_monitor_wall.value = [];
}
}; };
const sub_x = () => { const sub_x = () => {
const wall_dom = wall.value; const wall_dom = wall.value;
@ -1713,6 +1721,7 @@ export default defineComponent({
sort_index.value = []; sort_index.value = [];
old_sort_index = []; old_sort_index = [];
last_wall.value = []; last_wall.value = [];
last_percenter.value = 1;
let client = GlobalData.getInstance().getCurrentClient(); let client = GlobalData.getInstance().getCurrentClient();
if (client) { if (client) {
const settings = await GlobalData.getInstance() const settings = await GlobalData.getInstance()
@ -1734,6 +1743,9 @@ export default defineComponent({
offsetWidth.value = wall_dom.offsetWidth; offsetWidth.value = wall_dom.offsetWidth;
getpx(); getpx();
} }
test_monitor_list.value.forEach((element) => {
element.isHide = false;
});
if (response && settings) { if (response && settings) {
const a = response?.config.windows; const a = response?.config.windows;
output_length.value = output_length.value =
@ -1762,12 +1774,10 @@ export default defineComponent({
multiple.value = false; multiple.value = false;
last_wall.value = []; last_wall.value = [];
sort_index.value = []; sort_index.value = [];
test_monitor_list.value.forEach((element) => {
element.isHide = false;
});
$store.commit("setShowMonitorList", []); $store.commit("setShowMonitorList", []);
loading.value = false; loading.value = false;
} else if (a && wall_dom) { } else if (a && wall_dom) {
a.forEach((element) => { a.forEach((element) => {
let item: test_monitor = new test_monitor(0, "0", 0, 0, 0); let item: test_monitor = new test_monitor(0, "0", 0, 0, 0);
extend(true, item, test_monitor_list.value[element.index]); extend(true, item, test_monitor_list.value[element.index]);
@ -1791,7 +1801,7 @@ export default defineComponent({
); );
item.angle = element.angle; item.angle = element.angle;
item.isShow = true; item.isShow = true;
item.active=false item.active = false;
test_monitor_wall.value.push(JSON.parse(JSON.stringify(item))); test_monitor_wall.value.push(JSON.parse(JSON.stringify(item)));
last_wall.value.push(JSON.parse(JSON.stringify(item))); last_wall.value.push(JSON.parse(JSON.stringify(item)));
sort_index.value.push( sort_index.value.push(
@ -1808,6 +1818,13 @@ export default defineComponent({
current_index.value = -1; current_index.value = -1;
} }
} }
if (a.length == 0) {
test_monitor_list.value.forEach((ele) => {
ele.isHide = false;
});
sort_index.value = [];
test_monitor_wall.value = [];
}
} }
} }
}, },
@ -2197,7 +2214,7 @@ export default defineComponent({
tep_item.currenty = item.currenty; tep_item.currenty = item.currenty;
} }
}); });
multiple_select.value=[]
realtime_upload(); realtime_upload();
}, },
alignBottom() { alignBottom() {
@ -2208,6 +2225,7 @@ export default defineComponent({
tep_item.currenty = item.currenty + item.h - tep_item.h; tep_item.currenty = item.currenty + item.h - tep_item.h;
} }
}); });
multiple_select.value=[]
realtime_upload(); realtime_upload();
}, },
alignRight() { alignRight() {
@ -2218,7 +2236,7 @@ export default defineComponent({
tep_item.currentx = item.currentx + item.w - tep_item.w; tep_item.currentx = item.currentx + item.w - tep_item.w;
} }
}); });
multiple_select.value=[]
realtime_upload(); realtime_upload();
}, },
alignLeft() { alignLeft() {
@ -2229,6 +2247,7 @@ export default defineComponent({
tep_item.currentx = item.currentx; tep_item.currentx = item.currentx;
} }
}); });
multiple_select.value=[]
realtime_upload(); realtime_upload();
}, },
testLog(a: any) { testLog(a: any) {