优化提示 修改ui大小

This commit is contained in:
shefengchun 2023-02-24 16:47:46 +08:00
parent 5998be5c1c
commit 4738681294
5 changed files with 28 additions and 15 deletions

View File

@ -120,7 +120,7 @@
<q-dialog v-model="del_dialog"> <q-dialog v-model="del_dialog">
<q-card style="width: 700px; max-width: 80vw;"> <q-card style="width: 500px; max-width: 80vw;">
<q-card-section> <q-card-section>
<div class="text-h6">{{ $t('confirm delete') }}</div> <div class="text-h6">{{ $t('confirm delete') }}</div>
</q-card-section> </q-card-section>
@ -149,7 +149,7 @@
</q-card> </q-card>
</q-dialog> --> </q-dialog> -->
<q-dialog position="bottom" v-model="add_dialog"> <q-dialog position="bottom" v-model="add_dialog">
<q-card style="width: 700px; max-width: 80vw;"> <q-card style="width: 500px; max-width: 80vw;">
<q-card-section> <q-card-section>
<div class="text-h6">{{ $t('Whether to add control points') }}</div> <div class="text-h6">{{ $t('Whether to add control points') }}</div>
</q-card-section> </q-card-section>

View File

@ -61,7 +61,7 @@
</div> </div>
<q-dialog v-model="del_dialog"> <q-dialog v-model="del_dialog">
<q-card style="width: 700px; max-width: 80vw;"> <q-card style="width: 500px; max-width: 80vw;">
<q-card-section> <q-card-section>
<div class="text-h6">{{ $t('confirm delete') }}</div> <div class="text-h6">{{ $t('confirm delete') }}</div>
</q-card-section> </q-card-section>
@ -78,7 +78,7 @@
<q-dialog position="bottom" v-model="add_dialog"> <q-dialog position="bottom" v-model="add_dialog">
<q-card style="width: 700px; max-width: 80vw;"> <q-card style="width: 500px; max-width: 80vw;">
<q-card-section> <q-card-section>
<div class="text-h6">{{ $t('Whether to add control points') }}</div> <div class="text-h6">{{ $t('Whether to add control points') }}</div>
</q-card-section> </q-card-section>

View File

@ -50,10 +50,10 @@
<div> <div>
<div class="col-3 q-px-md"> <q-select class="q-pt-md " :label="$t('change resolution')" <div class="col-3 q-px-md"> <q-select class="q-pt-md " :label="$t('change resolution')"
@update:model-value="(val) => { dialog(val,set_resolution) }" :dense="true" filled v-model="now_resolution" @update:model-value="(val) => { dialog(val,set_resolution,'resolution') }" :dense="true" filled v-model="now_resolution"
:options="options_resolution" emit-value map-options /></div> :options="options_resolution" emit-value map-options /></div>
<div class="col-3 q-px-md"> <q-select class="q-pt-md " :label="$t('Change projector layout')" <div class="col-3 q-px-md"> <q-select class="q-pt-md " :label="$t('Change projector layout')"
@update:model-value="(val) => { dialog(val,send_projectorlayout) }" :dense="true" filled v-model="now_select_projectorlayout" @update:model-value="(val) => { dialog(val,send_projectorlayout,'projector') }" :dense="true" filled v-model="now_select_projectorlayout"
:options="projectorlayout" emit-value map-options /></div> :options="projectorlayout" emit-value map-options /></div>
</div> </div>
<div class="col-12" style="text-align: center"> <div class="col-12" style="text-align: center">
@ -93,7 +93,7 @@
<q-btn flat :label="$t('Select saved configuration')" no-caps color="primary" <q-btn flat :label="$t('Select saved configuration')" no-caps color="primary"
@click="select_configuration = true;select_configuration_name=''; get_scenes()" /> @click="select_configuration = true;select_configuration_name=''; get_scenes()" />
<q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup <q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup
@click="$store.commit('setSelectedProjector', '0/0');" /> @click="$store.commit('setSelectedProjector', '0/0');clear()" />
<q-btn flat :label="$t('save config')" no-caps color="primary" @click="save" /> <q-btn flat :label="$t('save config')" no-caps color="primary" @click="save" />
</q-card-actions> </q-card-actions>
</q-form> </q-form>
@ -167,12 +167,12 @@
<q-dialog v-model="confirm"> <q-dialog v-model="confirm">
<q-card style="width: 700px; max-width: 80vw;"> <q-card style="width: 500px; max-width: 80vw;">
<q-card-section> <q-card-section>
<div class="text-h6">{{ $t('Do you confirm the modification') }}</div> <div class="text-h6">{{ $t('Do you confirm the modification') }}</div>
</q-card-section> </q-card-section>
<q-card-section class="q-pt-none"> <q-card-section class="q-pt-none">
{{ $t('Do you confirm the modification') }} {{ dialog_data.type=='resolution'?$t('Whether to modify the resolution to') + options_resolution[dialog_data.parameter].label:$t('Whether to change the projector layout to') + projectorlayout[dialog_data.parameter].label }}
</q-card-section> </q-card-section>
<q-card-actions align="right" class="bg-white text-teal"> <q-card-actions align="right" class="bg-white text-teal">
<q-btn flat :label="$t('Cancel')" @click="re_match_data" color="primary" v-close-popup /> <q-btn flat :label="$t('Cancel')" @click="re_match_data" color="primary" v-close-popup />
@ -480,6 +480,7 @@ export default defineComponent({
} else { } else {
optionsstr.value = "FourPointCalibration"; optionsstr.value = "FourPointCalibration";
} }
now_selsect_projector.value="0-0"
}; };
/** /**
@ -623,8 +624,10 @@ export default defineComponent({
now_selsect_projector.value=value now_selsect_projector.value=value
} }
/**
* 依赖注入
*/
provide("now_selsect_projector",now_selsect_projector); provide("now_selsect_projector",now_selsect_projector);
/** /**
* 设置投影机布局 * 设置投影机布局
*/ */
@ -684,13 +687,18 @@ export default defineComponent({
* 浅拷贝 * 浅拷贝
*/ */
const confirm=ref(false) const confirm=ref(false)
let dialog_data:any=null let dialog_data:any={parameter:"",fun:"",type:""}
const dialog=(parameter:any,fun:any)=>{ const dialog=(parameter:any,fun:any,type:string)=>{
confirm.value=true confirm.value=true
dialog_data={parameter,fun} dialog_data.parameter=parameter
dialog_data.fun=fun
dialog_data.type=type
console.log("🚀 ~ file: FusionSettingsDialog.vue:696 ~ dialog ~ type:", type)
//dialog_data={parameter,fun,type}
} }
const trigger_dialog=()=>{ const trigger_dialog=()=>{
dialog_data.fun(dialog_data.parameter) dialog_data.fun(dialog_data.parameter)
console.log(dialog_data.fun)
} }
const re_match_data=()=>{ const re_match_data=()=>{
let tmp = JSON.parse($store.state.fusion_configuration); let tmp = JSON.parse($store.state.fusion_configuration);
@ -709,6 +717,7 @@ export default defineComponent({
} }
} }
return { return {
dialog_data,
allconfig, allconfig,
now_selsect_projector, now_selsect_projector,
re_match_data, re_match_data,

View File

@ -500,5 +500,7 @@ export default {
"Please enter the square number": "Please enter the square number", "Please enter the square number": "Please enter the square number",
"Change projector layout": "Change projector layout", "Change projector layout": "Change projector layout",
"reset all":"reset all", "reset all":"reset all",
"Do you confirm the modification":"Do you confirm the modification" "Do you confirm the modification":"Do you confirm the modification",
"Whether to modify the resolution to":"Whether to modify the resolution to",
"Whether to change the projector layout to":"Whether to change the projector layout to"
}; };

View File

@ -767,5 +767,7 @@ export default {
"Please enter the square number":"请输入平方数", "Please enter the square number":"请输入平方数",
"Change projector layout":"更改投影机布局", "Change projector layout":"更改投影机布局",
"reset all":"重置所有", "reset all":"重置所有",
"Do you confirm the modification":"是否确认修改" "Do you confirm the modification":"是否确认修改",
"Whether to modify the resolution to":"是否将分辨率修改到",
"Whether to change the projector layout to":"是否更改投影机布局为"
}; };