Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2
# Conflicts: # src/components/FusionSettings/FusionLocale.vue
This commit is contained in:
miao
parent
7213e6bddb
commit
946f2dda3f
|
|
@ -1457,7 +1457,8 @@ export default class ClientConnection {
|
|||
column: number,
|
||||
location: number,
|
||||
enable: boolean,
|
||||
width: number
|
||||
width: number,
|
||||
auto_sync: boolean,
|
||||
) {
|
||||
return await this.doRpc<Protocol.NoneResponse>(
|
||||
new Protocol.SetBlendingOverlapRequestEntity(
|
||||
|
|
@ -1465,7 +1466,8 @@ export default class ClientConnection {
|
|||
column,
|
||||
location,
|
||||
enable,
|
||||
width
|
||||
width,
|
||||
auto_sync
|
||||
)
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
<Vue3DraggableResizable v-show="now_v_h == 'vertical'" :class="[options_model_v == index ? 'action' : 'point']"
|
||||
v-for="(item, index) in value_v_point.length" :initW="point.w" :initH="point.h" :resizable="false" :x="0"
|
||||
v-model:y="value_v_point[index].y" @activated="options_model_v = index; now_v_h = 'vertical'"
|
||||
@click="options_model_v = index; now_v_h = 'vertical'" :draggable="url.indexOf('pad')==-1" @dragging="dragStartHandle($event, index, 'v')">
|
||||
@click="options_model_v = index; now_v_h = 'vertical'" :draggable="url.indexOf('pad') == -1"
|
||||
@dragging="dragStartHandle($event, index, 'v')">
|
||||
<span>v{{
|
||||
index + 1
|
||||
}}</span>
|
||||
|
|
@ -15,7 +16,8 @@
|
|||
<Vue3DraggableResizable v-show="now_v_h == 'vertical'" :class="[options_model_v == index ? 'action' : 'point']"
|
||||
v-for="(item, index) in value_v_point.length" :initW="point.w" :initH="point.h" :resizable="false"
|
||||
:x="max.x - 20" @click="options_model_v = index; now_v_h = 'vertical'" v-model:y="value_v_point[index].y"
|
||||
@activated="options_model_v = index; now_v_h = 'vertical'" :draggable="url.indexOf('pad')==-1" @dragging="dragStartHandle($event, index, 'v')">
|
||||
@activated="options_model_v = index; now_v_h = 'vertical'" :draggable="url.indexOf('pad') == -1"
|
||||
@dragging="dragStartHandle($event, index, 'v')">
|
||||
<span>v{{
|
||||
index + 1
|
||||
}}</span>
|
||||
|
|
@ -23,7 +25,8 @@
|
|||
<Vue3DraggableResizable v-show="now_v_h == 'level'" :class="[options_model_h == index ? 'action' : 'point']"
|
||||
v-for="(item, index) in value_h_point.length" :initW="point.w" :initH="point.h" :resizable="false"
|
||||
v-model:x="value_h_point[index].x" :y="0" @activated="options_model_h = index; now_v_h = 'level'"
|
||||
@click="options_model_h = index; now_v_h = 'level'" :draggable="url.indexOf('pad')==-1" @dragging="dragStartHandle($event, index, 'h')">
|
||||
@click="options_model_h = index; now_v_h = 'level'" :draggable="url.indexOf('pad') == -1"
|
||||
@dragging="dragStartHandle($event, index, 'h')">
|
||||
<span>h{{
|
||||
index + 1
|
||||
}}</span>
|
||||
|
|
@ -31,7 +34,8 @@
|
|||
<Vue3DraggableResizable v-show="now_v_h == 'level'" :class="[options_model_h == index ? 'action' : 'point']"
|
||||
v-for="(item, index) in value_h_point.length" :initW="point.w" :initH="point.h" :resizable="false"
|
||||
v-model:x="value_h_point[index].x" @activated="options_model_h = index; now_v_h = 'level'" :y="max.y - 20"
|
||||
@click="options_model_h = index; now_v_h = 'level'" :draggable="url.indexOf('pad')==-1" @dragging="dragStartHandle($event, index, 'h')">
|
||||
@click="options_model_h = index; now_v_h = 'level'" :draggable="url.indexOf('pad') == -1"
|
||||
@dragging="dragStartHandle($event, index, 'h')">
|
||||
<span>h{{
|
||||
index + 1
|
||||
}}</span>
|
||||
|
|
@ -40,7 +44,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div v-show="ispad">
|
||||
<div class="row">
|
||||
<div class="col-1"></div>
|
||||
<div class="col-5">
|
||||
|
|
@ -55,7 +59,8 @@
|
|||
<div class="col-2 q-md-px-md"> <q-select class="q-pt-md" :label="$t('vertical point')"
|
||||
@update:model-value="(val) => { chang_point_amount(val, 'v') }" :dense="true" filled
|
||||
v-model="value_v_point_amount" :options="options_value_v_point_amount" emit-value map-options /></div>
|
||||
<div class="col-2 q-pt-md "><q-btn color="white" @click="()=>{add_dialog=true;value_point_amount_tmp_v=value_v_point_amount}" text-color="black"
|
||||
<div class="col-2 q-pt-md "><q-btn color="white"
|
||||
@click="() => { add_dialog = true; value_point_amount_tmp_v = value_v_point_amount }" text-color="black"
|
||||
:label="$t('add control points')" /></div>
|
||||
<div class="col-2 q-pt-md "><q-btn color="white" @click="() => { del_dialog = true }"
|
||||
:disable="value_v_point_amount <= 5" text-color="black" :label="$t('reduce control points')" /></div>
|
||||
|
|
@ -68,9 +73,11 @@
|
|||
<div class="col-2" @mousewheel="details_selsect_v"> <q-select class="q-pt-md " :label="$t('vertical')"
|
||||
@update:model-value="(val) => { options_v = val }" :dense="true" filled v-model="options_model_v"
|
||||
:options="options_v" emit-value map-options /></div>
|
||||
<div class="col-2 q-px-md" @mousewheel="details_selsect_val($event, 'v')"> <q-input v-if="value_v[options_model_v]"
|
||||
filled type="number" class="q-pt-md" :dense="true" v-model="value_v[options_model_v].y"
|
||||
@update:model-value="chang(options_model_v, $event, 'v')" lazy-rules @click="()=>{url.indexOf('pad')!=-1?ipad_chang=true:''}" :readonly="url.indexOf('pad')!=-1" />
|
||||
<div class="col-2 q-px-md" @mousewheel="details_selsect_val($event, 'v')"> <q-input
|
||||
v-if="value_v[options_model_v]" filled type="number" class="q-pt-md" :dense="true"
|
||||
v-model="value_v[options_model_v].y" @update:model-value="chang(options_model_v, $event, 'v')" lazy-rules
|
||||
@click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : '' }" :readonly="url.indexOf('pad') != -1" />
|
||||
|
||||
</div>
|
||||
<div class="q-pt-md col-2">
|
||||
<q-btn color="white" @click="reset(options_model_v, true, 'v')" text-color="black" :label="$t('reset')" />
|
||||
|
|
@ -84,10 +91,11 @@
|
|||
<div>
|
||||
<div class="row q-md-py-md" v-show="now_v_h == 'level'">
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2 q-px-md"> <q-select class="q-pt-md" :label="$t('level point')"
|
||||
<div class="col-2 q-md-px-md"> <q-select class="q-pt-md" :label="$t('level point')"
|
||||
@update:model-value="(val) => { chang_point_amount(val, 'h') }" :dense="true" filled
|
||||
v-model="value_h_point_amount" :options="options_value_h_point_amount" emit-value map-options /></div>
|
||||
<div class="col-2 q-pt-md "><q-btn color="white" @click="add_dialog = true;value_point_amount_tmp_h=value_h_point_amount" text-color="black"
|
||||
<div class="col-2 q-pt-md "><q-btn color="white"
|
||||
@click="add_dialog = true; value_point_amount_tmp_h = value_h_point_amount" text-color="black"
|
||||
:label="$t('add control points')" /></div>
|
||||
<div class="col-2 q-pt-md "><q-btn color="white" @click="() => { del_dialog = true }"
|
||||
:disable="value_h_point_amount <= 5" text-color="black" :label="$t('reduce control points')" /></div>
|
||||
|
|
@ -97,12 +105,13 @@
|
|||
|
||||
<div class="row" v-show="now_v_h == 'level'">
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2 q-px-md" @mousewheel="details_selsect_h"> <q-select class="q-pt-md" :label="$t('level')"
|
||||
<div class="col-2 q-md-px-md" @mousewheel="details_selsect_h"> <q-select class="q-pt-md" :label="$t('level')"
|
||||
@update:model-value="(val) => { options_h = val }" :dense="true" filled v-model="options_model_h"
|
||||
:options="options_h" emit-value map-options /></div>
|
||||
<div class="col-2 q-px-md" @mousewheel="details_selsect_val($event, 'h')"> <q-input v-if="value_h[options_model_h]"
|
||||
filled type="number" class="q-pt-md" :dense="true" v-model="value_h[options_model_h].x"
|
||||
@update:model-value="chang(options_model_h, $event, 'h')" lazy-rules @click="()=>{url.indexOf('pad')!=-1?ipad_chang=true:''}" :readonly="url.indexOf('pad')!=-1" />
|
||||
<div class="col-2 q-px-md" @mousewheel="details_selsect_val($event, 'h')"> <q-input
|
||||
v-if="value_h[options_model_h]" filled type="number" class="q-pt-md" :dense="true"
|
||||
v-model="value_h[options_model_h].x" @update:model-value="chang(options_model_h, $event, 'h')" lazy-rules
|
||||
@click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : '' }" :readonly="url.indexOf('pad') != -1" />
|
||||
</div>
|
||||
<div class="q-pt-md col-2">
|
||||
<q-btn color="white" @click="reset(options_model_h, true, 'h')" text-color="black" :label="$t('reset')" />
|
||||
|
|
@ -113,6 +122,96 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div v-show="!ispad">
|
||||
<div class="row">
|
||||
<div class="col-1"></div>
|
||||
<div class="col-5">
|
||||
<q-radio v-model="now_v_h" val="level" :label="$t('level')" />
|
||||
</div>
|
||||
<div class="col-5"><q-radio v-model="now_v_h" val="vertical" :label="$t('vertical')" /></div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="row q-md-py-md" v-show="now_v_h == 'vertical'">
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2 q-md-px-md"> <q-select class="q-pt-md" :label="$t('vertical point')"
|
||||
@update:model-value="(val) => { chang_point_amount(val, 'v') }" :dense="true" filled
|
||||
v-model="value_v_point_amount" :options="options_value_v_point_amount" emit-value map-options /></div>
|
||||
<div class="col-2 q-pt-md "><q-btn color="white"
|
||||
@click="() => { add_dialog = true; value_point_amount_tmp_v = value_v_point_amount }" text-color="black"
|
||||
:label="$t('add control points')" /></div>
|
||||
<div class="col-2 q-pt-md "><q-btn color="white" @click="() => { del_dialog = true }"
|
||||
:disable="value_v_point_amount <= 5" text-color="black" :label="$t('reduce control points')" /></div>
|
||||
<div class="q-pt-md col-5"> <q-btn color="white" @click="resetall_all" text-color="black"
|
||||
:label="$t('Reset all program control points')" /></div>
|
||||
</div>
|
||||
|
||||
<div v-show="now_v_h == 'vertical'" style="display: flex;justify-content: space-around;">
|
||||
<div style="min-width: 100px;" @mousewheel="details_selsect_v"> <q-select class="q-pt-md " :label="$t('vertical')"
|
||||
@update:model-value="(val) => { options_v = val }" :dense="true" filled v-model="options_model_v"
|
||||
:options="options_v" emit-value map-options /></div>
|
||||
<div @mousewheel="details_selsect_val($event, 'v')"> <q-input
|
||||
v-if="value_v[options_model_v]" filled type="number" class="q-pt-md" :dense="true"
|
||||
v-model="value_v[options_model_v].y" @update:model-value="chang(options_model_v, $event, 'v')" lazy-rules
|
||||
@focus="input_y_focus=true" @blur="input_y_focus=false"
|
||||
@click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : '' }" :readonly="url.indexOf('pad') != -1" >
|
||||
<template v-if="input_y_focus" v-slot:append>
|
||||
<q-icon name="arrow_upward" @mousedown="mousedown('+','y')" @mouseup="mouseup" />
|
||||
<q-icon name="arrow_downward" @mousedown="mousedown('-','y')" @mouseup="mouseup" />
|
||||
</template>
|
||||
</q-input>
|
||||
</div>
|
||||
<div class="q-pt-md ">
|
||||
<q-btn color="white" @click="reset(options_model_v, true, 'v')" text-color="black" :label="$t('reset')" />
|
||||
</div>
|
||||
|
||||
<div class="q-pt-md q-px-md "> <q-btn color="white" @click="resetall" text-color="black"
|
||||
:label="$t('reset all') + value_v_point_amount + $t('point')" /></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="row q-md-py-md" v-show="now_v_h == 'level'">
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2 q-md-px-md"> <q-select class="q-pt-md" :label="$t('level point')"
|
||||
@update:model-value="(val) => { chang_point_amount(val, 'h') }" :dense="true" filled
|
||||
v-model="value_h_point_amount" :options="options_value_h_point_amount" emit-value map-options /></div>
|
||||
<div class="col-2 q-pt-md "><q-btn color="white"
|
||||
@click="add_dialog = true; value_point_amount_tmp_h = value_h_point_amount" text-color="black"
|
||||
:label="$t('add control points')" /></div>
|
||||
<div class="col-2 q-pt-md "><q-btn color="white" @click="() => { del_dialog = true }"
|
||||
:disable="value_h_point_amount <= 5" text-color="black" :label="$t('reduce control points')" /></div>
|
||||
<div class="q-pt-md q-px-md col-5"> <q-btn color="white" @click="resetall_all" text-color="black"
|
||||
:label="$t('Reset all program control points')" /></div>
|
||||
</div>
|
||||
|
||||
<div v-show="now_v_h == 'level'" style="display: flex;justify-content: space-around;">
|
||||
<div style="min-width: 100px;" @mousewheel="details_selsect_h"> <q-select class="q-pt-md" :label="$t('level')"
|
||||
@update:model-value="(val) => { options_h = val }" :dense="true" filled v-model="options_model_h"
|
||||
:options="options_h" emit-value map-options /></div>
|
||||
<div class=" q-px-md" @mousewheel="details_selsect_val($event, 'h')"> <q-input
|
||||
v-if="value_h[options_model_h]" filled type="number" class="q-pt-md" :dense="true"
|
||||
v-model="value_h[options_model_h].x" @update:model-value="chang(options_model_h, $event, 'h')" lazy-rules
|
||||
@focus="input_x_focus=true" @blur="input_x_focus=false"
|
||||
@click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : '' }" :readonly="url.indexOf('pad') != -1" >
|
||||
<template v-if="input_x_focus" v-slot:append>
|
||||
<q-icon name="arrow_upward" @mousedown="mousedown('+','x')" @mouseup="mouseup" />
|
||||
<q-icon name="arrow_downward" @mousedown="mousedown('-','x')" @mouseup="mouseup" />
|
||||
</template>
|
||||
</q-input>
|
||||
</div>
|
||||
<div class="q-pt-md ">
|
||||
<q-btn color="white" @click="reset(options_model_h, true, 'h')" text-color="black" :label="$t('reset')" />
|
||||
</div>
|
||||
|
||||
<div class="q-pt-md q-px-md col-5"> <q-btn color="white" @click="resetall" text-color="black"
|
||||
:label="$t('reset all') + value_h_point_amount + $t('point')" /></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="position: absolute;bottom: 0;">
|
||||
<q-checkbox v-model="auxiliary_line" @update:model-value="(value, evt) => { send_auxiliary_line(value) }"
|
||||
:label="$t('auxiliary lines')" />
|
||||
|
|
@ -141,21 +240,26 @@
|
|||
</q-card-section>
|
||||
<q-card-section class="q-pt-none">
|
||||
<div class="row">
|
||||
<div v-if="now_v_h=='vertical'" class="col-10"><q-input filled v-model="value_v_point_amount" min="3" disable type="number"
|
||||
:label="$t('Please enter the points you need to add')" @update:model-value="(val: any) => { }" />
|
||||
<div v-if="now_v_h == 'vertical'" class="col-10"><q-input filled v-model="value_v_point_amount" min="3" disable
|
||||
type="number" :label="$t('Please enter the points you need to add')"
|
||||
@update:model-value="(val: any) => { }" />
|
||||
</div>
|
||||
<div v-else class="col-10"><q-input filled v-model="value_h_point_amount" min="3" disable type="number"
|
||||
:label="$t('Please enter the points you need to add')" @update:model-value="(val: any) => { }" />
|
||||
</div>
|
||||
<div class="col-1 q-pa-sm"> <q-btn color="white" text-color="black" label="↑"
|
||||
@click="() => {now_v_h=='vertical'?preview_v(Number(value_v_point_amount)+1):preview_h(Number(value_h_point_amount)+1)}" /> </div>
|
||||
@click="() => { now_v_h == 'vertical' ? preview_v(Number(value_v_point_amount) + 1) : preview_h(Number(value_h_point_amount) + 1) }" />
|
||||
</div>
|
||||
<div class="col-1 q-pa-sm"> <q-btn color="white" text-color="black" label="↓"
|
||||
@click="() => {now_v_h=='vertical'?preview_v(Number(value_v_point_amount)-1):preview_h(Number(value_h_point_amount)-1)}" /></div>
|
||||
@click="() => { now_v_h == 'vertical' ? preview_v(Number(value_v_point_amount) - 1) : preview_h(Number(value_h_point_amount) - 1) }" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</q-card-section>
|
||||
<q-card-actions align="right" class="bg-white text-teal">
|
||||
<q-btn flat :label="$t('Cancel')" @click="()=>{now_v_h=='vertical'?preview_v(value_point_amount_tmp_v):preview_h(value_point_amount_tmp_h)}" color="primary" v-close-popup />
|
||||
<q-btn flat :label="$t('Cancel')"
|
||||
@click="() => { now_v_h == 'vertical' ? preview_v(value_point_amount_tmp_v) : preview_h(value_point_amount_tmp_h) }"
|
||||
color="primary" v-close-popup />
|
||||
<q-btn flat :label="$t('ok')" @click="add" color="primary" v-close-popup />
|
||||
</q-card-actions>
|
||||
</q-card>
|
||||
|
|
@ -165,26 +269,41 @@
|
|||
<q-dialog v-model="ipad_chang">
|
||||
<q-card style="width: 40vw; max-width: 80vw;">
|
||||
<q-card-section>
|
||||
<div class="text-h6">{{ $t('point') +(now_v_h == 'level'?options_model_h+1:options_model_v+1)}}</div>
|
||||
<!-- <div class="text-h6">{{ $t('point') +(now_v_h == 'level'?options_model_h+1:options_model_v+1)}}</div> -->
|
||||
<div class="row">
|
||||
<div class="col-4" v-show="now_v_h != 'level'">
|
||||
<q-select class="q-pt-md " :label="$t('vertical')" @update:model-value="(val) => { options_v = val }"
|
||||
:dense="true" filled v-model="options_model_v" :options="options_v" emit-value map-options />
|
||||
</div>
|
||||
<div class="col-4" v-show="now_v_h == 'level'">
|
||||
<q-select class="q-pt-md" :label="$t('level')" @update:model-value="(val) => { options_h = val }"
|
||||
:dense="true" filled v-model="options_model_h" :options="options_h" emit-value map-options />
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
<q-card-section class="q-pt-none">
|
||||
<div class="row q-pb-md" v-show="now_v_h != 'level'">
|
||||
<div class="col-12" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_up" @touchstart="handlerTouchstart('y','+')" @touchend="handlerTouchend" /></div>
|
||||
<div class="col-12" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_up"
|
||||
@touchstart="handlerTouchstart('y', '+')" @touchend="handlerTouchend" /></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-6" style="text-align: center;"><q-btn color="white" v-show="now_v_h == 'level'" text-color="black" icon="keyboard_arrow_left" @touchstart="handlerTouchstart('x','-')" @touchend="handlerTouchend" /></div>
|
||||
<div class="col-6" style="text-align: center;"><q-btn color="white" v-show="now_v_h == 'level'" text-color="black" icon="keyboard_arrow_right" @touchstart="handlerTouchstart('x','+')" @touchend="handlerTouchend" /></div>
|
||||
<div class="col-6" style="text-align: center;"><q-btn color="white" v-show="now_v_h == 'level'"
|
||||
text-color="black" icon="keyboard_arrow_left" @touchstart="handlerTouchstart('x', '-')"
|
||||
@touchend="handlerTouchend" /></div>
|
||||
<div class="col-6" style="text-align: center;"><q-btn color="white" v-show="now_v_h == 'level'"
|
||||
text-color="black" icon="keyboard_arrow_right" @touchstart="handlerTouchstart('x', '+')"
|
||||
@touchend="handlerTouchend" /></div>
|
||||
</div>
|
||||
<div class="row q-pt-md" v-show="now_v_h != 'level'">
|
||||
<div class="col-12" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_down" @touchstart="handlerTouchstart('y','-')" @touchend="handlerTouchend" /></div>
|
||||
<div class="col-12" style="text-align: center;"><q-btn color="white" text-color="black"
|
||||
icon="keyboard_arrow_down" @touchstart="handlerTouchstart('y', '-')" @touchend="handlerTouchend" /></div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
<q-card-actions align="right" class="bg-white text-teal">
|
||||
<q-btn flat :label="$t('close')" color="primary" v-close-popup />
|
||||
<q-btn flat :label="$t('close')" color="primary" @click="ipad_chang = false" />
|
||||
</q-card-actions>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
|
|
@ -199,6 +318,14 @@
|
|||
}
|
||||
</style>
|
||||
|
||||
<style>
|
||||
input::-webkit-outer-spin-button,
|
||||
input::-webkit-inner-spin-button {
|
||||
-webkit-appearance: none !important;
|
||||
margin: 0;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script lang="ts">
|
||||
import {
|
||||
defineComponent,
|
||||
|
|
@ -1071,7 +1198,9 @@ export default defineComponent({
|
|||
* 长按实现
|
||||
*/
|
||||
let loop: NodeJS.Timeout
|
||||
let loop_end: NodeJS.Timeout
|
||||
const handlerTouchstart = (type: string, fun: string) => {
|
||||
loop_end = setTimeout(() => {
|
||||
loop = setInterval(() => {
|
||||
if (type == 'x') {
|
||||
if (fun == '+') {
|
||||
|
|
@ -1090,8 +1219,25 @@ export default defineComponent({
|
|||
}
|
||||
// chang(options_model.value, 0, '')
|
||||
}, 15)
|
||||
}, 1000);
|
||||
if (type == 'x') {
|
||||
if (fun == '+') {
|
||||
value_h.value[options_model_h.value].x++
|
||||
} else {
|
||||
value_h.value[options_model_h.value].x--
|
||||
}
|
||||
chang(options_model_h.value, value_h.value[options_model_h.value].x, "h")
|
||||
} else {
|
||||
if (fun == '+') {
|
||||
value_v.value[options_model_v.value].y++
|
||||
} else {
|
||||
value_v.value[options_model_v.value].y--
|
||||
}
|
||||
chang(options_model_v.value, value_v.value[options_model_v.value].y, "v")
|
||||
}
|
||||
}
|
||||
const handlerTouchend = () => {
|
||||
clearTimeout(loop_end)
|
||||
clearInterval(loop)
|
||||
}
|
||||
/**
|
||||
|
|
@ -1123,12 +1269,91 @@ export default defineComponent({
|
|||
}
|
||||
}
|
||||
}
|
||||
const ispad = computed(() => {
|
||||
let url = window.location.href;
|
||||
return url.indexOf("pad") != -1
|
||||
})
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
let loop_start: NodeJS.Timeout
|
||||
let loop_finish: NodeJS.Timeout
|
||||
|
||||
const mousedown = (fun: string, type: string) => {
|
||||
loop_start = setTimeout(() => {
|
||||
loop_finish = setInterval(() => {
|
||||
switch (type) {
|
||||
case 'x':
|
||||
if (fun == '+') {
|
||||
value_h.value[options_model_h.value].x++
|
||||
} else {
|
||||
value_h.value[options_model_h.value].x--
|
||||
}
|
||||
chang(options_model_h.value,value_h.value[options_model_h.value].x, 'h')
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
if (fun == '+') {
|
||||
value_v.value[options_model_v.value].y++
|
||||
} else {
|
||||
value_v.value[options_model_v.value].y--
|
||||
}
|
||||
chang(options_model_v.value, value_v.value[options_model_v.value].y, "v")
|
||||
break;
|
||||
}
|
||||
|
||||
}, 30)
|
||||
}, 1000);
|
||||
switch (type) {
|
||||
case 'x':
|
||||
if (fun == '+') {
|
||||
value_h.value[options_model_h.value].x++
|
||||
} else {
|
||||
value_h.value[options_model_h.value].x--
|
||||
}
|
||||
chang(options_model_h.value,value_h.value[options_model_h.value].x, 'h')
|
||||
break;
|
||||
|
||||
default:
|
||||
if (fun == '+') {
|
||||
value_v.value[options_model_v.value].y++
|
||||
} else {
|
||||
value_v.value[options_model_v.value].y--
|
||||
}
|
||||
chang(options_model_v.value, value_v.value[options_model_v.value].y, "v")
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
const mouseup = () => {
|
||||
clearTimeout(loop_start)
|
||||
clearInterval(loop_finish)
|
||||
}
|
||||
|
||||
|
||||
const input_x_focus=ref(false)
|
||||
const input_y_focus=ref(false)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
defineExpose({
|
||||
now_v_h,
|
||||
options_model_v,
|
||||
options_model_h
|
||||
});
|
||||
return {
|
||||
mousedown,
|
||||
mouseup,
|
||||
input_x_focus,
|
||||
input_y_focus,
|
||||
ispad,
|
||||
config,
|
||||
value_point_amount_tmp_v,
|
||||
value_point_amount_tmp_h,
|
||||
|
|
|
|||
|
|
@ -17,14 +17,16 @@
|
|||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="row">
|
||||
<div class="row" v-show="ispad">
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2 q-px-md" @mousewheel="details_selsect"> <q-select class="q-pt-md" :label="$t('point')" :dense="true" filled
|
||||
v-model="options_model" @update:model-value="(val) => { options_model = val }" :options="options" emit-value
|
||||
map-options /></div>
|
||||
<div class="col-2 q-px-md" @mousewheel="details_selsect_val($event,'x')"> <q-input filled type="number" class="q-pt-md" :dense="true"
|
||||
<div class="col-2 q-px-md" @mousewheel="details_selsect_val($event,'x')">
|
||||
<q-input filled type="number" class="q-pt-md" :dense="true"
|
||||
v-model="value[options_model].x" @click="()=>{url.indexOf('pad')!=-1?ipad_chang=true:''}" :readonly="url.indexOf('pad')!=-1" @update:model-value="chang(options_model, $event, 'h')" label="x"
|
||||
lazy-rules />
|
||||
lazy-rules >
|
||||
</q-input>
|
||||
</div>
|
||||
<div class="col-2 q-px-md" @mousewheel="details_selsect_val($event,'y')"> <q-input filled type="number" class="q-pt-md" :dense="true"
|
||||
v-model="value[options_model].y" @click="()=>{url.indexOf('pad')!=-1?ipad_chang=true:''}" :readonly="url.indexOf('pad')!=-1" @update:model-value="chang(options_model, $event, 'h')" label="y"
|
||||
|
|
@ -36,11 +38,59 @@
|
|||
<div><q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" /></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div v-show="!ispad" style="display: flex;justify-content: space-around;">
|
||||
|
||||
<div class="q-px-md" @mousewheel="details_selsect"> <q-select class="q-pt-md" :label="$t('point')" :dense="true" filled
|
||||
v-model="options_model" @update:model-value="(val) => { options_model = val }" :options="options" emit-value
|
||||
map-options /></div>
|
||||
<div class="q-px-md" @mousewheel="details_selsect_val($event,'x')">
|
||||
<q-input filled type="number" class="q-pt-md" :dense="true"
|
||||
v-model="value[options_model].x" @focus="input_x_focus=true" @blur="input_x_focus=false" @click="()=>{url.indexOf('pad')!=-1?ipad_chang=true:''}" :readonly="url.indexOf('pad')!=-1" @update:model-value="chang(options_model, $event, 'h')" label="x"
|
||||
lazy-rules >
|
||||
<template v-if="input_x_focus" v-slot:append>
|
||||
<q-icon name="arrow_upward" @mousedown="mousedown('+','x')" @mouseup="mouseup" />
|
||||
<q-icon name="arrow_downward" @mousedown="mousedown('-','x')" @mouseup="mouseup" />
|
||||
</template>
|
||||
</q-input>
|
||||
</div>
|
||||
<div class="q-px-md" @mousewheel="details_selsect_val($event,'y')"> <q-input filled type="number" class="q-pt-md" :dense="true"
|
||||
v-model="value[options_model].y" @focus="input_y_focus=true" @blur="input_y_focus=false" @click="()=>{url.indexOf('pad')!=-1?ipad_chang=true:''}" :readonly="url.indexOf('pad')!=-1" @update:model-value="chang(options_model, $event, 'h')" label="y"
|
||||
lazy-rules >
|
||||
<template v-if="input_y_focus" v-slot:append>
|
||||
<q-icon name="arrow_upward" @mousedown="mousedown('+','y')" @mouseup="mouseup" />
|
||||
<q-icon name="arrow_downward" @mousedown="mousedown('-','y')" @mouseup="mouseup" />
|
||||
</template>
|
||||
</q-input>
|
||||
</div>
|
||||
<div class="q-pt-md">
|
||||
<q-btn color="white" @click="reset(options_model, true, 'h')" text-color="black" :label="$t('reset')" />
|
||||
</div>
|
||||
<div class="q-pt-md">
|
||||
<div><q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" /></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- </div> -->
|
||||
<q-dialog v-model="ipad_chang">
|
||||
<q-card style="width: 40vw; max-width: 80vw;">
|
||||
<q-card-section>
|
||||
<div class="text-h6">{{ $t('point') +(options_model+1 )}}</div>
|
||||
<!-- <div class="text-h6">{{ $t('point') +(options_model+1 )}}</div> -->
|
||||
<div class="row">
|
||||
<div class="col-4"><q-select class="q-pt-md" :label="$t('point')" :dense="true" filled
|
||||
v-model="options_model" @update:model-value="(val) => { options_model = val }" :options="options" emit-value
|
||||
map-options /></div>
|
||||
</div>
|
||||
|
||||
</q-card-section>
|
||||
<q-card-section class="q-pt-none">
|
||||
<div class="row">
|
||||
|
|
@ -55,7 +105,7 @@
|
|||
</div>
|
||||
</q-card-section>
|
||||
<q-card-actions align="right" class="bg-white text-teal">
|
||||
<q-btn flat :label="$t('close')" color="primary" v-close-popup />
|
||||
<q-btn flat :label="$t('close')" color="primary" @click="ipad_chang=false" />
|
||||
</q-card-actions>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
|
|
@ -73,6 +123,14 @@
|
|||
}
|
||||
</style>
|
||||
|
||||
<style>
|
||||
input::-webkit-outer-spin-button,
|
||||
input::-webkit-inner-spin-button {
|
||||
-webkit-appearance: none !important;
|
||||
margin: 0;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script lang="ts">
|
||||
import {
|
||||
defineComponent,
|
||||
|
|
@ -495,9 +553,12 @@ export default defineComponent({
|
|||
}
|
||||
/**
|
||||
* 长按实现
|
||||
* 单击实现
|
||||
*/
|
||||
let loop: NodeJS.Timeout
|
||||
let loop_end: NodeJS.Timeout
|
||||
const handlerTouchstart=(type:string,fun:string)=>{
|
||||
loop_end = setTimeout(() => {
|
||||
loop=setInterval(()=>{
|
||||
if(type=='x'){
|
||||
if(fun=='+'){
|
||||
|
|
@ -515,8 +576,25 @@ export default defineComponent({
|
|||
}
|
||||
chang(options_model.value,0,'')
|
||||
},10)
|
||||
}, 1000);
|
||||
if(type=='x'){
|
||||
if(fun=='+'){
|
||||
value.value[options_model.value].x++
|
||||
}else{
|
||||
value.value[options_model.value].x--
|
||||
}
|
||||
|
||||
}else{
|
||||
if(fun=='+'){
|
||||
value.value[options_model.value].y++
|
||||
}else{
|
||||
value.value[options_model.value].y--
|
||||
}
|
||||
}
|
||||
chang(options_model.value,0,'')
|
||||
}
|
||||
const handlerTouchend=()=>{
|
||||
clearTimeout(loop_end)
|
||||
clearInterval(loop)
|
||||
}
|
||||
/**
|
||||
|
|
@ -546,10 +624,90 @@ export default defineComponent({
|
|||
if(lock==0)chang(options_model.value,"h", 'h')
|
||||
}
|
||||
}
|
||||
const ispad=computed(()=>{
|
||||
let url = window.location.href;
|
||||
return url.indexOf("pad")!=-1
|
||||
})
|
||||
const add_cut=(fun:string,type:string)=>{
|
||||
switch (type) {
|
||||
case 'x':
|
||||
if(fun=='+'){
|
||||
value.value[options_model.value].x++
|
||||
}else{
|
||||
value.value[options_model.value].x--
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
if(fun=='+'){
|
||||
value.value[options_model.value].y++
|
||||
}else{
|
||||
value.value[options_model.value].y--
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
let loop_start:NodeJS.Timeout
|
||||
let loop_finish:NodeJS.Timeout
|
||||
const input_x_focus=ref(false)
|
||||
const input_y_focus=ref(false)
|
||||
const mousedown = (fun:string,type:string) => {
|
||||
loop_start= setTimeout(() => {
|
||||
loop_finish=setInterval(()=>{
|
||||
switch (type) {
|
||||
case 'x':
|
||||
if(fun=='+'){
|
||||
value.value[options_model.value].x++
|
||||
}else{
|
||||
value.value[options_model.value].x--
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
if(fun=='+'){
|
||||
value.value[options_model.value].y++
|
||||
}else{
|
||||
value.value[options_model.value].y--
|
||||
}
|
||||
break;
|
||||
}
|
||||
chang(options_model.value,0,'')
|
||||
},30)
|
||||
}, 1000);
|
||||
switch (type) {
|
||||
case 'x':
|
||||
if(fun=='+'){
|
||||
value.value[options_model.value].x++
|
||||
}else{
|
||||
value.value[options_model.value].x--
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
if(fun=='+'){
|
||||
value.value[options_model.value].y++
|
||||
}else{
|
||||
value.value[options_model.value].y--
|
||||
}
|
||||
break;
|
||||
}
|
||||
chang(options_model.value,0,'')
|
||||
}
|
||||
|
||||
const mouseup = () => {
|
||||
clearTimeout(loop_start)
|
||||
clearInterval(loop_finish)
|
||||
}
|
||||
defineExpose({
|
||||
options_model,
|
||||
});
|
||||
return {
|
||||
input_x_focus,
|
||||
input_y_focus,
|
||||
mousedown,
|
||||
mouseup,
|
||||
add_cut,
|
||||
now_selsect_projector,
|
||||
details_selsect,
|
||||
resetall,
|
||||
|
|
@ -569,7 +727,8 @@ export default defineComponent({
|
|||
ipad_chang,
|
||||
url,
|
||||
handlerTouchstart,
|
||||
handlerTouchend
|
||||
handlerTouchend,
|
||||
ispad
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="row">
|
||||
<div class="col-4"></div>
|
||||
<div class="col-4 q-pt-sm"><q-select outlined v-model="model[0]"
|
||||
<div class="col-4 col-sm-3"></div>
|
||||
<div class="col-4 col-sm-6 q-pt-sm"><q-select outlined v-model="model[0]"
|
||||
@update:model-value="update_row_col(0, model[0])" :options="options" :dense="true" :options-dense="true"
|
||||
:label="$t('wall row')" /> </div><q-checkbox @update:model-value="send_off(0)"
|
||||
v-model="RowsColumns[0]" />
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
</div>
|
||||
<div class="col-12">
|
||||
<div class="row">
|
||||
<div class="col-4"></div>
|
||||
<div class="col-4 q-pt-sm"><q-select outlined v-model="model[1]"
|
||||
<div class="col-4 col-sm-3"></div>
|
||||
<div class="col-4 col-sm-6 q-pt-sm"><q-select outlined v-model="model[1]"
|
||||
@update:model-value="update_row_col(1, model[1])" :options="options" :dense="true" :options-dense="true"
|
||||
:label="$t('wall col')" /> </div><q-checkbox @update:model-value="send_off(1)"
|
||||
v-model="RowsColumns[1]" />
|
||||
|
|
@ -22,16 +22,16 @@
|
|||
</div>
|
||||
<div class="col-12">
|
||||
<div class="row">
|
||||
<div class="col-4"></div>
|
||||
<div class="col-4 q-pt-sm"><q-select outlined v-model="model[2]"
|
||||
<div class="col-4 col-sm-3"></div>
|
||||
<div class="col-4 col-sm-6 q-pt-sm"><q-select outlined v-model="model[2]"
|
||||
@update:model-value="update_row_col(2, model[2])" :options="line_width_options" :dense="true" :options-dense="true"
|
||||
:label="$t('line width')" /> </div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<div class="row" style="min-height: 40px;">
|
||||
<div class="col-4"></div>
|
||||
<div class="col-4 q-pt-sm">
|
||||
<div class="col-4 col-sm-3"></div>
|
||||
<div class="col-4 col-sm-6 q-pt-sm">
|
||||
<q-item>
|
||||
<q-item-section avatar class="head_1">
|
||||
{{ $t("line color") }}
|
||||
|
|
@ -51,33 +51,11 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<div class="row" style="min-height: 40px;">
|
||||
<div class="col-4"></div>
|
||||
<div class="col-4 q-pt-sm">
|
||||
<q-item>
|
||||
<q-item-section avatar class="head_1">
|
||||
{{ $t("background color") }}
|
||||
</q-item-section>
|
||||
<q-item-section>
|
||||
<q-input v-model="color[1]" :rules="['anyColor']">
|
||||
<template v-slot:append>
|
||||
<q-icon name="colorize" class="cursor-pointer" @click="index = 1">
|
||||
<q-popup-proxy cover transition-show="scale" transition-hide="scale">
|
||||
<q-color v-model="color[1]" @change="submit" />
|
||||
</q-popup-proxy>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<div class="row" style="min-height: 40px;">
|
||||
<div class="col-4"></div>
|
||||
<div class="col-4 q-pt-sm">
|
||||
<div class="col-4 col-sm-3"></div>
|
||||
<div class="col-4 col-sm-6 q-pt-sm">
|
||||
<q-item>
|
||||
<q-item-section avatar class="head_1">
|
||||
{{ $t("center circle color") }}
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="row row q-md-py-xl">
|
||||
<div v-show="ispad">
|
||||
<div class="row q-md-py-xl">
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2 q-px-md">
|
||||
<div class="col-2"> <q-select class="q-pt-md" :label="$t('point amount')"
|
||||
|
|
@ -47,11 +47,13 @@
|
|||
:options="options" emit-value map-options /></div>
|
||||
<div class="col-2 q-px-md" @mousewheel="details_selsect_val($event, 'x')"> <q-input v-if="value[options_model]"
|
||||
filled type="number" class="q-pt-md" :dense="true" v-model="value[options_model].x"
|
||||
@update:model-value="chang(options_model, $event, 'h')" label="x" lazy-rules @click="()=>{url.indexOf('pad')!=-1?ipad_chang=true:''}" :readonly="url.indexOf('pad')!=-1" />
|
||||
@update:model-value="chang(options_model, $event, 'h')" label="x" lazy-rules
|
||||
@click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : '' }" :readonly="url.indexOf('pad') != -1" />
|
||||
</div>
|
||||
<div class="col-2 q-px-md" @mousewheel="details_selsect_val($event, 'y')"><q-input v-if="value[options_model]" filled
|
||||
type="number" class="q-pt-md" :dense="true" v-model="value[options_model].y"
|
||||
@update:model-value="chang(options_model, $event, 'h')" label="y" lazy-rules @click="()=>{url.indexOf('pad')!=-1?ipad_chang=true:''}" :readonly="url.indexOf('pad')!=-1" />
|
||||
<div class="col-2 q-px-md" @mousewheel="details_selsect_val($event, 'y')"><q-input v-if="value[options_model]"
|
||||
filled type="number" class="q-pt-md" :dense="true" v-model="value[options_model].y"
|
||||
@update:model-value="chang(options_model, $event, 'h')" label="y" lazy-rules
|
||||
@click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : '' }" :readonly="url.indexOf('pad') != -1" />
|
||||
</div>
|
||||
<div class="q-pt-md col-2">
|
||||
<q-btn color="white" @click="reset(options_model, true, 'h')" text-color="black" :label="$t('reset')" />
|
||||
|
|
@ -60,9 +62,60 @@
|
|||
<div class="q-pt-md q-px-md col-3"> <q-btn color="white" @click="resetall" text-color="black"
|
||||
:label="$t('reset all') + value_point_amount + $t('point')" /></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-show="!ispad">
|
||||
<div style="display: flex;justify-content: space-around;">
|
||||
<div style="min-width: 100px;"> <q-select class="q-pt-md" :label="$t('point amount')"
|
||||
@update:model-value="(val) => { now_amount = val; chang_point_amount(val) }" :dense="true" filled
|
||||
v-model="value_point_amount" :options="options_value_point_amount" emit-value map-options />
|
||||
</div>
|
||||
<div class=" q-pt-md "><q-btn color="white"
|
||||
@click="() => { add_dialog = true; value_point_amount_tmp = value_point_amount; now_amount = value_point_amount }"
|
||||
text-color="black" :label="$t('add control points')" /></div>
|
||||
<div class="q-pt-md "><q-btn color="white" @click="() => { del_dialog = true }" :disable="value_point_amount <= 9"
|
||||
text-color="black" :label="$t('reduce control points')" /></div>
|
||||
|
||||
<div class="q-pt-md q-px-md "> <q-btn color="white" @click="resetall_all" text-color="black"
|
||||
:label="$t('Reset all program control points')" /></div>
|
||||
</div>
|
||||
|
||||
<div style="display: flex;justify-content: space-around;">
|
||||
<div style="min-width: 100px;" @mousewheel="details_selsect"> <q-select class="q-pt-md" :label="$t('point')" :dense="true"
|
||||
filled v-model="options_model" @update:model-value="(val) => { options_model = val }" :options="options"
|
||||
emit-value map-options /></div>
|
||||
<div class=" q-px-md" @mousewheel="details_selsect_val($event, 'x')"> <q-input v-if="value[options_model]" filled
|
||||
type="number" class="q-pt-md" :dense="true" v-model="value[options_model].x"
|
||||
@update:model-value="chang(options_model, $event, 'h')" label="x" lazy-rules
|
||||
@focus="input_x_focus=true" @blur="input_x_focus=false"
|
||||
@click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : '' }" :readonly="url.indexOf('pad') != -1" >
|
||||
<template v-if="input_x_focus" v-slot:append>
|
||||
<q-icon name="arrow_upward" @mousedown="mousedown('+','x')" @mouseup="mouseup" />
|
||||
<q-icon name="arrow_downward" @mousedown="mousedown('-','x')" @mouseup="mouseup" />
|
||||
</template>
|
||||
</q-input>
|
||||
</div>
|
||||
<div class=" q-px-md" @mousewheel="details_selsect_val($event, 'y')"><q-input v-if="value[options_model]" filled
|
||||
type="number" class="q-pt-md" :dense="true" v-model="value[options_model].y"
|
||||
@update:model-value="chang(options_model, $event, 'h')" label="y" lazy-rules
|
||||
@focus="input_y_focus=true" @blur="input_y_focus=false"
|
||||
@click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : '' }" :readonly="url.indexOf('pad') != -1" >
|
||||
<template v-if="input_y_focus" v-slot:append>
|
||||
<q-icon name="arrow_upward" @mousedown="mousedown('+','y')" @mouseup="mouseup" />
|
||||
<q-icon name="arrow_downward" @mousedown="mousedown('-','y')" @mouseup="mouseup" />
|
||||
</template>
|
||||
</q-input>
|
||||
</div>
|
||||
<div class="q-pt-md ">
|
||||
<q-btn color="white" @click="reset(options_model, true, 'h')" text-color="black" :label="$t('reset')" />
|
||||
|
||||
</div>
|
||||
<div class="q-pt-md q-px-md "> <q-btn color="white" @click="resetall" text-color="black"
|
||||
:label="$t('reset all') + value_point_amount + $t('point')" /></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<q-dialog v-model="del_dialog">
|
||||
<q-card style="width: 500px; max-width: 80vw;">
|
||||
<q-card-section>
|
||||
|
|
@ -110,26 +163,33 @@
|
|||
<q-dialog v-model="ipad_chang">
|
||||
<q-card style="width: 40vw; max-width: 80vw;">
|
||||
<q-card-section>
|
||||
<div class="text-h6">{{ $t('point') +(options_model+1 )}}</div>
|
||||
<!-- <div class="text-h6">{{ $t('point') +(options_model+1 )}}</div> -->
|
||||
<div class="row">
|
||||
<div class="col-4"><q-select class="q-pt-md" :label="$t('point')" :dense="true" filled v-model="options_model"
|
||||
@update:model-value="(val) => { options_model = val }" :options="options" emit-value map-options /></div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
<q-card-section class="q-pt-none">
|
||||
<div class="row">
|
||||
<div class="col-12" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_up" @touchstart="handlerTouchstart('y','+')" @touchend="handlerTouchend" /></div>
|
||||
<div class="col-12" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_up"
|
||||
@touchstart="handlerTouchstart('y', '+')" @touchend="handlerTouchend" /></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-6" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_left" @touchstart="handlerTouchstart('x','-')" @touchend="handlerTouchend" /></div>
|
||||
<div class="col-6" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_right" @touchstart="handlerTouchstart('x','+')" @touchend="handlerTouchend" /></div>
|
||||
<div class="col-6" style="text-align: center;"><q-btn color="white" text-color="black"
|
||||
icon="keyboard_arrow_left" @touchstart="handlerTouchstart('x', '-')" @touchend="handlerTouchend" /></div>
|
||||
<div class="col-6" style="text-align: center;"><q-btn color="white" text-color="black"
|
||||
icon="keyboard_arrow_right" @touchstart="handlerTouchstart('x', '+')" @touchend="handlerTouchend" /></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_down" @touchstart="handlerTouchstart('y','-')" @touchend="handlerTouchend" /></div>
|
||||
<div class="col-12" style="text-align: center;"><q-btn color="white" text-color="black"
|
||||
icon="keyboard_arrow_down" @touchstart="handlerTouchstart('y', '-')" @touchend="handlerTouchend" /></div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
<q-card-actions align="right" class="bg-white text-teal">
|
||||
<q-btn flat :label="$t('close')" color="primary" v-close-popup />
|
||||
<q-btn flat :label="$t('close')" color="primary" @click="ipad_chang = false" />
|
||||
</q-card-actions>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
|
|
@ -144,6 +204,14 @@
|
|||
}
|
||||
</style>
|
||||
|
||||
<style>
|
||||
input::-webkit-outer-spin-button,
|
||||
input::-webkit-inner-spin-button {
|
||||
-webkit-appearance: none !important;
|
||||
margin: 0;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script lang="ts">
|
||||
import {
|
||||
defineComponent,
|
||||
|
|
@ -734,7 +802,9 @@ export default defineComponent({
|
|||
* 长按实现
|
||||
*/
|
||||
let loop: NodeJS.Timeout
|
||||
let loop_end: NodeJS.Timeout
|
||||
const handlerTouchstart = (type: string, fun: string) => {
|
||||
loop_end = setTimeout(() => {
|
||||
loop = setInterval(() => {
|
||||
if (type == 'x') {
|
||||
if (fun == '+') {
|
||||
|
|
@ -751,9 +821,26 @@ export default defineComponent({
|
|||
}
|
||||
}
|
||||
chang(options_model.value, 0, '')
|
||||
}, 15)
|
||||
}, 30)
|
||||
}, 1000);
|
||||
if (type == 'x') {
|
||||
if (fun == '+') {
|
||||
value.value[options_model.value].x++
|
||||
} else {
|
||||
value.value[options_model.value].x--
|
||||
}
|
||||
|
||||
} else {
|
||||
if (fun == '+') {
|
||||
value.value[options_model.value].y++
|
||||
} else {
|
||||
value.value[options_model.value].y--
|
||||
}
|
||||
}
|
||||
chang(options_model.value, 0, '')
|
||||
}
|
||||
const handlerTouchend = () => {
|
||||
clearTimeout(loop_end)
|
||||
clearInterval(loop)
|
||||
}
|
||||
/**
|
||||
|
|
@ -783,10 +870,87 @@ export default defineComponent({
|
|||
if (lock == 0) chang(options_model.value, "h", 'h')
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const ispad = computed(() => {
|
||||
let url = window.location.href;
|
||||
return url.indexOf("pad") != -1
|
||||
})
|
||||
|
||||
|
||||
let loop_start: NodeJS.Timeout
|
||||
let loop_finish: NodeJS.Timeout
|
||||
|
||||
const mousedown = (fun: string, type: string) => {
|
||||
loop_start = setTimeout(() => {
|
||||
loop_finish = setInterval(() => {
|
||||
switch (type) {
|
||||
case 'x':
|
||||
if (fun == '+') {
|
||||
value.value[options_model.value].x++
|
||||
} else {
|
||||
value.value[options_model.value].x--
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
if (fun == '+') {
|
||||
value.value[options_model.value].y++
|
||||
} else {
|
||||
value.value[options_model.value].y--
|
||||
}
|
||||
break;
|
||||
}
|
||||
chang(options_model.value, 0, '')
|
||||
}, 30)
|
||||
}, 1000);
|
||||
switch (type) {
|
||||
case 'x':
|
||||
if (fun == '+') {
|
||||
value.value[options_model.value].x++
|
||||
} else {
|
||||
value.value[options_model.value].x--
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
if (fun == '+') {
|
||||
value.value[options_model.value].y++
|
||||
} else {
|
||||
value.value[options_model.value].y--
|
||||
}
|
||||
break;
|
||||
}
|
||||
chang(options_model.value, 0, '')
|
||||
}
|
||||
|
||||
const mouseup = () => {
|
||||
clearTimeout(loop_start)
|
||||
clearInterval(loop_finish)
|
||||
}
|
||||
|
||||
|
||||
const input_x_focus=ref(false)
|
||||
const input_y_focus=ref(false)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
defineExpose({
|
||||
options_model,
|
||||
});
|
||||
return {
|
||||
input_x_focus,
|
||||
input_y_focus,
|
||||
ispad,
|
||||
mousedown,
|
||||
mouseup,
|
||||
value_point_amount_tmp,
|
||||
details_selsect,
|
||||
resetall_all,
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
}
|
||||
}
|
||||
">
|
||||
<q-card class="" style="max-width: 90vw;padding: 0;">
|
||||
<q-card class="" id="element" style="max-width: 90vw;padding: 0;">
|
||||
<q-form>
|
||||
<q-card-section class="q-ma-none q-pa-sm">
|
||||
<div class="row">
|
||||
|
|
@ -18,6 +18,9 @@
|
|||
</div>
|
||||
|
||||
<q-space />
|
||||
<q-btn v-show="ispad" size="sm" dense flat @click="element_full_screen" round :icon="is_pad_screen?'zoom_in_map':'zoom_out_map'" >
|
||||
|
||||
</q-btn>
|
||||
<q-btn size="sm" dense flat round icon="close" color="red" @click="clear()" v-close-popup>
|
||||
<q-tooltip>
|
||||
{{ $t("close") }}
|
||||
|
|
@ -28,7 +31,7 @@
|
|||
|
||||
<q-separator />
|
||||
<!-- height: 80vh -->
|
||||
<q-card-section class="scroll" :style="{width: is_pad_style,padding: 0}">
|
||||
<q-card-section class="scroll" :style="{ 'width': is_pad_style, padding: 0 }">
|
||||
<div class="row" style="border: 1px solid #b0bec5; text-align: center">
|
||||
<div class="col-2" style="border-right: 1px solid #b0bec5">
|
||||
<p class="text-center">{{ $t("Projector") }}</p>
|
||||
|
|
@ -50,11 +53,16 @@
|
|||
<div>
|
||||
|
||||
<div class="col-3 q-px-md "> <q-select class="q-pt-md overflow-hidden" :label="$t('change 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>
|
||||
<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,'projector') }" :dense="true" filled v-model="now_select_projectorlayout"
|
||||
:options="projectorlayout" emit-value map-options /></div>
|
||||
@update:model-value="(val) => { dialog(val, set_resolution, 'resolution') }" :dense="true" filled
|
||||
v-model="now_resolution" :options="options_resolution" emit-value map-options /></div>
|
||||
<!-- <div class="col-3 q-px-md"> <q-select class="q-pt-md " use-input hide-selected fill-input
|
||||
@filter="filterFn_projector" :label="$t('Change projector layout')"
|
||||
@update:model-value="(val) => { dialog(val, send_projectorlayout, 'projector') }" :dense="true" filled
|
||||
v-model="now_select_projectorlayout" :options="show_projectorlayout" emit-value map-options /></div> -->
|
||||
<div class="col-3 q-px-md"> <q-select class="q-pt-md " use-input hide-selected fill-input
|
||||
@filter="filterFn_projector2" :label="$t('Change projector layout')"
|
||||
@update:model-value="(val) => { dialog_projectorlayout(val, send_projectorlayout2) }" :dense="true" filled
|
||||
v-model="now_select_projectorlayout_tmp" :options="show_projectorlayout2" emit-value /></div>
|
||||
</div>
|
||||
<div class="col-12" style="text-align: center">
|
||||
{{
|
||||
|
|
@ -80,12 +88,12 @@
|
|||
<q-separator />
|
||||
|
||||
<q-card-actions align="right">
|
||||
<span>{{ $t("disable blending params") }}</span>
|
||||
<!-- <span>{{ $t("disable blending params") }}</span>
|
||||
<q-checkbox style="justify-content: flex-start" v-model="disable_blending_params"
|
||||
@click="send_disable_blending_params" />
|
||||
<span>{{ $t("show blending grids") }}</span>
|
||||
<q-checkbox style="justify-content: flex-start" v-model="show_blending_grids"
|
||||
@click="send_show_blending_grids" />
|
||||
@click="send_show_blending_grids" /> -->
|
||||
<div class="q-space" data-v-39efcd1f=""></div>
|
||||
<div class="q-space" data-v-39efcd1f=""></div>
|
||||
<q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall config')" />
|
||||
|
|
@ -120,8 +128,8 @@
|
|||
</q-select>
|
||||
</q-card-section>
|
||||
<q-card-actions align="right" class="bg-white text-teal">
|
||||
<q-btn flat :label="$t('Cancel')" color="primary" v-close-popup />
|
||||
<q-btn flat :label="$t('save')" @click="saveconfig" color="primary" v-close-popup />
|
||||
<q-btn flat :label="$t('Cancel')" color="primary" @click="medium = false"/>
|
||||
<q-btn flat :label="$t('save')" @click="saveconfig" color="primary" />
|
||||
</q-card-actions>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
|
|
@ -147,8 +155,8 @@
|
|||
</q-select>
|
||||
</q-card-section>
|
||||
<q-card-actions align="right" class="bg-white text-teal">
|
||||
<q-btn flat :label="$t('Cancel')" color="primary" v-close-popup />
|
||||
<q-btn flat :label="$t('load')" @click="apply_the_selected_configuration" color="primary" v-close-popup />
|
||||
<q-btn flat :label="$t('Cancel')" color="primary" @click="select_configuration=false" />
|
||||
<q-btn flat :label="$t('load')" @click="apply_the_selected_configuration" color="primary" />
|
||||
</q-card-actions>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
|
|
@ -162,8 +170,8 @@
|
|||
{{ $t('Whether to delete') + name_to_be_deleted }}
|
||||
</q-card-section>
|
||||
<q-card-actions align="right" class="bg-white text-teal">
|
||||
<q-btn flat :label="$t('Cancel')" color="primary" v-close-popup />
|
||||
<q-btn flat :label="$t('ok')" @click="dialog_del_scenes" color="primary" v-close-popup />
|
||||
<q-btn flat :label="$t('Cancel')" color="primary" @click="del_dialog=false" />
|
||||
<q-btn flat :label="$t('ok')" @click="()=>{dialog_del_scenes();del_dialog=false}" color="primary" />
|
||||
</q-card-actions>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
|
|
@ -175,11 +183,29 @@
|
|||
<div class="text-h6">{{ $t('Do you confirm the modification') }}</div>
|
||||
</q-card-section>
|
||||
<q-card-section class="q-pt-none">
|
||||
{{ 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 }}
|
||||
{{ 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-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('ok')" @click="trigger_dialog" color="primary" v-close-popup />
|
||||
<q-btn flat :label="$t('Cancel')" @click="()=>{re_match_data();confirm=false}" color="primary" />
|
||||
<q-btn flat :label="$t('ok')" @click="()=>{trigger_dialog();confirm=false}" color="primary" />
|
||||
</q-card-actions>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
|
||||
|
||||
<q-dialog v-model="confirm_projectorlayout">
|
||||
<q-card style="width: 40vw; max-width: 80vw;">
|
||||
<q-card-section>
|
||||
<div class="text-h6">{{ $t('Do you confirm the modification') }}</div>
|
||||
</q-card-section>
|
||||
<q-card-section class="q-pt-none">
|
||||
{{ $t('Whether to change the projector layout to') + dialog_data.parameter }}
|
||||
</q-card-section>
|
||||
<q-card-actions align="right" class="bg-white text-teal">
|
||||
<q-btn flat :label="$t('Cancel')" @click="()=>{re_match_data();confirm_projectorlayout=false}" color="primary" />
|
||||
<q-btn flat :label="$t('ok')" @click="()=>{trigger_dialog_projectorlayout();confirm_projectorlayout=false}" color="primary" />
|
||||
</q-card-actions>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
|
|
@ -246,11 +272,18 @@ export default defineComponent({
|
|||
const showDialog = async () => {
|
||||
show_dialog.value = true;
|
||||
};
|
||||
/**
|
||||
* 当前平板是否全屏
|
||||
*/
|
||||
const is_pad_screen = ref(false);
|
||||
const is_pad_style = computed(() => {
|
||||
let url = window.location.href
|
||||
if (url.indexOf("pad") != -1 && $t.locale.value == "en-US") {
|
||||
return ""
|
||||
}
|
||||
if (url.indexOf("pad") != -1 && is_pad_screen.value) {
|
||||
return "100vw"
|
||||
}
|
||||
return "60vw"
|
||||
})
|
||||
const select_configuration = ref(false)
|
||||
|
|
@ -378,7 +411,7 @@ export default defineComponent({
|
|||
const disable_blending_params_id = ref("blending@disable_blending_params");
|
||||
const disable_blending_params = ref(false);
|
||||
const show_blending_grids_id = ref("blending_grids_show");
|
||||
const show_blending_grids = ref(false);
|
||||
const show_blending_grids = ref(true);
|
||||
const medium = ref(false);
|
||||
const options = computed({
|
||||
get() {
|
||||
|
|
@ -485,9 +518,11 @@ export default defineComponent({
|
|||
};
|
||||
const clear = () => {
|
||||
record_times.value = 0
|
||||
show_blending_grids.value = false;
|
||||
// show_blending_grids.value = false;
|
||||
is_pad_screen.value = false
|
||||
send_show_blending_grids();
|
||||
$store.commit("setSelectedProjector", "0/0");
|
||||
set?.SetBlendingOption("blending_grids_show", "0");
|
||||
setTimeout(() => {
|
||||
clear_sessionStorage()
|
||||
}, 500);
|
||||
|
|
@ -530,6 +565,7 @@ export default defineComponent({
|
|||
local_opt[1].value = ("0" == opt || "false" == opt.toLowerCase() ? false : true);
|
||||
}
|
||||
}
|
||||
show_blending_grids.value = true
|
||||
EnableBlending.value = tmp.enable;
|
||||
$store.commit("setEnablefusion", tmp.enable);
|
||||
config.value.col = tmp.col;
|
||||
|
|
@ -550,12 +586,15 @@ export default defineComponent({
|
|||
}
|
||||
|
||||
projectorlayout.value = []
|
||||
for (let index = 0; index < tmp.max_projector_count; index++) {
|
||||
for (let indexx = 0; indexx < tmp.max_projector_count; indexx++) {
|
||||
if(index*tmp.max_projector_count+indexx>tmp.max_projector_count){
|
||||
let cont = 0
|
||||
for (let index = 1; index <= tmp.max_projector_count; index++) {
|
||||
for (let indexx = 1; indexx <= tmp.max_projector_count; indexx++) {
|
||||
if (index * indexx > tmp.max_projector_count) {
|
||||
continue
|
||||
} else {
|
||||
projectorlayout.value.push({ label: `${index+1}x${indexx+1}`, value: index*tmp.max_projector_count+indexx })
|
||||
projectorlayout.value.push({ label: `${index}x${indexx}`, value: cont })
|
||||
cont++
|
||||
projectorlayout_tmp.value.push(`${index}x${indexx}`)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -565,13 +604,19 @@ export default defineComponent({
|
|||
if (tmp.col == Number(arr[1]) && tmp.row == Number(arr[0])) {
|
||||
now_select_projectorlayout.value = index
|
||||
}
|
||||
if(`${tmp.row}x${tmp.col}`==projectorlayout_tmp.value[index]){
|
||||
now_select_projectorlayout_tmp.value=projectorlayout_tmp.value[index]
|
||||
}
|
||||
}
|
||||
});
|
||||
get_scenes()
|
||||
set?.SetBlendingOption("blending_grids_select_ui", "blending")
|
||||
|
||||
// show_blending_grids.value=true
|
||||
// send_show_blending_grids()
|
||||
}, 1000);
|
||||
// console.log("已经挂载 ")
|
||||
});
|
||||
|
||||
const save_cover_name = ref("")
|
||||
const plan_list = [
|
||||
''
|
||||
|
|
@ -599,7 +644,11 @@ export default defineComponent({
|
|||
if (tmp.row == Number(arr[1]) && tmp.col == Number(arr[0])) {
|
||||
now_select_projectorlayout.value = index
|
||||
}
|
||||
if(`${tmp.row}x${tmp.col}`==projectorlayout_tmp.value[index]){
|
||||
now_select_projectorlayout_tmp.value=projectorlayout_tmp.value[index]
|
||||
}
|
||||
}
|
||||
select_configuration.value=false
|
||||
});
|
||||
|
||||
let tmp = options.value
|
||||
|
|
@ -626,6 +675,7 @@ export default defineComponent({
|
|||
|
||||
const saveconfig = () => {
|
||||
set?.SaveBlendingConfig(save_cover_name.value);
|
||||
medium.value = false
|
||||
}
|
||||
|
||||
const isdebug = computed(() => {
|
||||
|
|
@ -659,7 +709,9 @@ export default defineComponent({
|
|||
*/
|
||||
provide("now_selsect_projector", now_selsect_projector);
|
||||
let projectorlayout = ref([{ label: '1x1', value: 0 }, { label: '1x2', value: 1 }])
|
||||
const now_select_projectorlayout=ref(1)
|
||||
let projectorlayout_tmp = ref(<string[]>[])
|
||||
const now_select_projectorlayout = ref(0)
|
||||
const now_select_projectorlayout_tmp = ref("")
|
||||
const send_projectorlayout = (val: number) => {
|
||||
let arr = projectorlayout.value[val].label.split('x');
|
||||
set?.SetProjectorLayout(Number(arr[0]), Number(arr[1])).then(res => {
|
||||
|
|
@ -675,6 +727,40 @@ export default defineComponent({
|
|||
if (tmpp.col == Number(arr[1]) && tmpp.row == Number(arr[0])) {
|
||||
now_select_projectorlayout.value = index
|
||||
}
|
||||
if(`${tmpp.row}x${tmpp.col}`==projectorlayout_tmp.value[index]){
|
||||
now_select_projectorlayout_tmp.value=projectorlayout_tmp.value[index]
|
||||
}
|
||||
}
|
||||
let tmp = options.value
|
||||
options.value = ""
|
||||
$store.commit("setSelectedProjector", "0/0");
|
||||
setTimeout(() => {
|
||||
clear_sessionStorage()
|
||||
options.value = tmp
|
||||
$q.loading.hide()
|
||||
}, 800);
|
||||
getconfig()
|
||||
})
|
||||
}
|
||||
|
||||
const send_projectorlayout2 = (val: string) => {
|
||||
let arr = val.split('x');
|
||||
set?.SetProjectorLayout(Number(arr[0]), Number(arr[1])).then(res => {
|
||||
let tmpp = JSON.parse(res!.config)
|
||||
config.value.row = tmpp.row;
|
||||
config.value.col = tmpp.col;
|
||||
$q.loading.show({
|
||||
message: 'Loading please wait'
|
||||
})
|
||||
$store.commit("setfusion_configuration", res?.config);
|
||||
for (let index = 0; index < projectorlayout.value.length; index++) {
|
||||
let arr = projectorlayout.value[index].label.split('x');
|
||||
if (tmpp.col == Number(arr[1]) && tmpp.row == Number(arr[0])) {
|
||||
now_select_projectorlayout.value = index
|
||||
}
|
||||
if(`${tmpp.row}x${tmpp.col}`==projectorlayout_tmp.value[index]){
|
||||
now_select_projectorlayout_tmp.value=projectorlayout_tmp.value[index]
|
||||
}
|
||||
}
|
||||
let tmp = options.value
|
||||
options.value = ""
|
||||
|
|
@ -724,6 +810,29 @@ export default defineComponent({
|
|||
const trigger_dialog = () => {
|
||||
dialog_data.fun(dialog_data.parameter)
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
const confirm_projectorlayout=ref(false);
|
||||
let dialog_data_projectorlayout: any = { parameter: "", fun: ""}
|
||||
const dialog_projectorlayout = (parameter: any, fun: any) => {
|
||||
confirm_projectorlayout.value = true
|
||||
dialog_data_projectorlayout.parameter = parameter
|
||||
dialog_data_projectorlayout.fun = fun
|
||||
}
|
||||
const trigger_dialog_projectorlayout = () => {
|
||||
dialog_data_projectorlayout.fun(dialog_data_projectorlayout.parameter)
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
const re_match_data = () => {
|
||||
let tmp = JSON.parse($store.state.fusion_configuration);
|
||||
for (let index = 0; index < options_resolution.value.length; index++) {
|
||||
|
|
@ -738,9 +847,54 @@ export default defineComponent({
|
|||
if (tmp.row == Number(arr[0]) && tmp.col == Number(arr[1])) {
|
||||
now_select_projectorlayout.value = index
|
||||
}
|
||||
if(`${tmp.row}x${tmp.col}`==projectorlayout_tmp.value[index]){
|
||||
now_select_projectorlayout_tmp.value=projectorlayout_tmp.value[index]
|
||||
}
|
||||
}
|
||||
}
|
||||
const element: any = ref()
|
||||
const element_full_screen = () => {
|
||||
let elem = document.getElementById("element")
|
||||
if (!document.fullscreenElement) {
|
||||
elem!.requestFullscreen().catch((err) => {
|
||||
|
||||
});
|
||||
is_pad_screen.value = true
|
||||
} else {
|
||||
document.exitFullscreen();
|
||||
is_pad_screen.value = false
|
||||
}
|
||||
|
||||
}
|
||||
const ispad = computed(() => {
|
||||
let url = window.location.href;
|
||||
return url.indexOf("pad") != -1
|
||||
})
|
||||
interface projectorlayoutarray {
|
||||
label: string; value: number;
|
||||
}
|
||||
const show_projectorlayout = ref(<projectorlayoutarray[]>[])
|
||||
const filterFn_projector = (val: any, update: any) => {
|
||||
update(() => {
|
||||
const needle = val.toLowerCase()
|
||||
show_projectorlayout.value = projectorlayout.value.filter(v => v.label.toLowerCase().indexOf(needle) > -1)
|
||||
})
|
||||
}
|
||||
|
||||
const show_projectorlayout2 = ref(<string[]>[])
|
||||
const filterFn_projector2 = (val: any, update: any) => {
|
||||
update(() => {
|
||||
const needle = val.toLowerCase()
|
||||
show_projectorlayout2.value = projectorlayout_tmp.value.filter(v => v.toLowerCase().indexOf(needle) > -1)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
return {
|
||||
now_select_projectorlayout_tmp,
|
||||
show_projectorlayout2,
|
||||
filterFn_projector2,
|
||||
is_pad_screen,
|
||||
dialog_data,
|
||||
allconfig,
|
||||
now_selsect_projector,
|
||||
|
|
@ -785,11 +939,21 @@ export default defineComponent({
|
|||
now_resolution,
|
||||
set_resolution,
|
||||
send_projectorlayout,
|
||||
send_projectorlayout2,
|
||||
now_select_projectorlayout,
|
||||
projectorlayout,
|
||||
btn_options,
|
||||
projectors_that_can_display,
|
||||
is_pad_style
|
||||
is_pad_style,
|
||||
element,
|
||||
element_full_screen,
|
||||
ispad,
|
||||
filterFn_projector,
|
||||
show_projectorlayout,
|
||||
confirm_projectorlayout,
|
||||
dialog_data_projectorlayout,
|
||||
dialog_projectorlayout,
|
||||
trigger_dialog_projectorlayout
|
||||
};
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3460,6 +3460,7 @@ export namespace Protocol {
|
|||
location: number,
|
||||
enable: boolean,
|
||||
width: number,
|
||||
auto_sync:boolean,
|
||||
rpc_id = 0
|
||||
) {
|
||||
super();
|
||||
|
|
@ -3472,12 +3473,15 @@ export namespace Protocol {
|
|||
this.location = location ?? 0;
|
||||
this.enable = enable ?? false;
|
||||
this.width = width ?? 0;
|
||||
this.auto_sync = auto_sync ?? false;
|
||||
|
||||
}
|
||||
row = 0;
|
||||
column = 0;
|
||||
location = 0; //0：左融合带，1：上融合带，2：右融合带，3：下融合带
|
||||
enable = false;
|
||||
width = 0;
|
||||
auto_sync=false;
|
||||
}
|
||||
|
||||
export class GetBlendingConfigResponseEntity extends PacketEntity {
|
||||
|
|
|
|||
|
|
@ -417,7 +417,7 @@ export default {
|
|||
FourPointCalibration: "Four Pint Calibration",
|
||||
SurfaceCorrection: "Surface Correction",
|
||||
DensityCorrection: "Density Correction",
|
||||
GridSettings: "Grid Settings",
|
||||
GridSettings: "Auxiliary Settings",
|
||||
point: "dot",
|
||||
reset: "reset",
|
||||
"upper fusion zone parameters": "Upper Fusion Zone Parameters",
|
||||
|
|
@ -509,5 +509,9 @@ export default {
|
|||
"Whether to change the projector layout to",
|
||||
"after upgrade, please clear browser cache Or refresh hard (Ctrl/Shift + F5 Or Ctrl + Shift + R)":
|
||||
"After Upgrade, Please Clear Browser Cache Or Refresh Hard (Ctrl/Shift + F5 Or Ctrl + Shift + R)",
|
||||
"fusion zone":"fusion zone"
|
||||
"fusion zone":"fusion zone",
|
||||
"up":"up",
|
||||
"left":"left",
|
||||
"right":"right",
|
||||
"down":"down"
|
||||
};
|
||||
|
|
|
|||
|
|
@ -686,7 +686,7 @@ export default {
|
|||
FourPointCalibration: "四点校正",
|
||||
SurfaceCorrection: "曲面校正",
|
||||
DensityCorrection: "疏密校正",
|
||||
GridSettings: "网格设置",
|
||||
GridSettings: "辅助设置",
|
||||
point: "点",
|
||||
reset: "重置",
|
||||
"upper fusion zone parameters": "上融合带参数",
|
||||
|
|
@ -776,5 +776,9 @@ export default {
|
|||
"Whether to change the projector layout to": "是否更改投影机布局为",
|
||||
"after upgrade, please clear browser cache Or refresh hard (Ctrl/Shift + F5 Or Ctrl + Shift + R)":
|
||||
"升级完成后请清空浏览器缓存或者进行硬刷新(Ctrl/Shift + F5 或者 CTRL + SHIFT + R)",
|
||||
"fusion zone":"融合带"
|
||||
"fusion zone":"融合带",
|
||||
"up":"上",
|
||||
"left":"左",
|
||||
"right":"右",
|
||||
"down":"下"
|
||||
};
|
||||
|
|
|
|||
|
|
@ -314,6 +314,10 @@ export default defineComponent({
|
|||
}
|
||||
);
|
||||
const getconfig = () => {
|
||||
set?.SetBlendingOption("blending_grids_select_ui", '4')
|
||||
set?.SetBlendingOption('blending_grids_select_projector',"0-0");
|
||||
set?.SetBlendingOption("blending_grids_select_point", `4:1`)
|
||||
set?.SetBlendingOption("blending_grids_show", "1");
|
||||
try {
|
||||
set?.GetBlendingConfig("").then((res) => {
|
||||
let tmp = JSON.parse(res ? res.config : "");
|
||||
|
|
|
|||
|
|
@ -653,6 +653,10 @@ export default defineComponent({
|
|||
return "rotate " + sulv + "s linear infinite";
|
||||
});
|
||||
const getconfig = () => {
|
||||
set?.SetBlendingOption("blending_grids_select_ui", '4')
|
||||
set?.SetBlendingOption('blending_grids_select_projector',"0-0");
|
||||
set?.SetBlendingOption("blending_grids_select_point", `4:1`)
|
||||
set?.SetBlendingOption("blending_grids_show", "1");
|
||||
try {
|
||||
set?.GetBlendingConfig("").then((res) => {});
|
||||
set?.GetBlendingConfig("").then((res) => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue