Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2
This commit is contained in:
commit
a4c3a24dda
|
@ -240,15 +240,17 @@ export default defineComponent({
|
||||||
/**
|
/**
|
||||||
* 模拟数据完成dom渲染再次获取真实后台数据
|
* 模拟数据完成dom渲染再次获取真实后台数据
|
||||||
*/
|
*/
|
||||||
let allconfig = JSON.parse("{\"resolution\": [{\"width\": 1024,\"height\": 768}]}");
|
let allconfig = JSON.parse("{\"resolution\": [{\"width\": 1920,\"height\": 1080}]}");
|
||||||
const options_resolution = computed(() => {
|
const options_resolution = computed(() => {
|
||||||
let tmp=[];
|
let tmp=[];
|
||||||
|
if(allconfig.resolution){
|
||||||
for (let index = 0; index < allconfig.resolution.length; index++) {
|
for (let index = 0; index < allconfig.resolution.length; index++) {
|
||||||
tmp.push({
|
tmp.push({
|
||||||
label: `${allconfig.resolution[index].width}*${allconfig.resolution[index].height}`,
|
label: `${allconfig.resolution[index].width}*${allconfig.resolution[index].height}`,
|
||||||
value: index,
|
value: index,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return tmp
|
return tmp
|
||||||
})
|
})
|
||||||
const child :any = ref(null);
|
const child :any = ref(null);
|
||||||
|
@ -483,11 +485,16 @@ export default defineComponent({
|
||||||
config.value.row = tmp.row;
|
config.value.row = tmp.row;
|
||||||
$store.commit("setfusion_configuration", res?.config);
|
$store.commit("setfusion_configuration", res?.config);
|
||||||
allconfig = JSON.parse($store.state.fusion_configuration);
|
allconfig = JSON.parse($store.state.fusion_configuration);
|
||||||
|
if(allconfig.resolution){
|
||||||
for (let index = 0; index < allconfig.resolution.length; index++) {
|
for (let index = 0; index < allconfig.resolution.length; index++) {
|
||||||
if(allconfig.resolution.width==allconfig.projector_width&&allconfig.resolution.height==allconfig.projector_height){
|
if(allconfig.resolution.width==allconfig.projector_width&&allconfig.resolution.height==allconfig.projector_height){
|
||||||
now_resolution.value=index
|
now_resolution.value=index
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}else{
|
||||||
|
allconfig = {resolution: [{width: tmp.projector_width,height: tmp.projector_height}]};
|
||||||
|
now_resolution.value=0
|
||||||
|
}
|
||||||
});
|
});
|
||||||
get_scenes()
|
get_scenes()
|
||||||
set?.SetBlendingOption("blending_grids_select_ui", "blending")
|
set?.SetBlendingOption("blending_grids_select_ui", "blending")
|
||||||
|
|
Loading…
Reference in New Issue