完成新开发分支的合并

src/components/FusionSettings/FusionLocale.vue

@@ -11,15 +11,33 @@
                   <q-toggle class="float-right" v-model="array[0].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input dense filled type="number" :autofocus="group == 0" :bg-color="group == 0 ? 'cyan-1' : ''"
+                  <q-input v-show="ispad" dense filled type="number" :autofocus="group == 0"
-                    @focus="group = 0" v-model="array[0].value" :label="$t('upper fusion zone parameters')" lazy-rules @click="()=>{url.indexOf('pad')!=-1?ipad_chang=true:'';group=0}" :readonly="url.indexOf('pad')!=-1"
+                    :bg-color="group == 0 ? 'cyan-1' : ''" @focus="group = 0" v-model.number="array[0].value"
-                    :rules="[
+                    :label="$t('upper fusion zone parameters')" lazy-rules
+                    @click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : ''; group = 0 }"
+                    :readonly="url.indexOf('pad') != -1" :rules="[
                       (val) =>
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
                         (val >= 0 && val < config.height) || $t('Please enter 0-100'),
                     ]" />
+                  <q-input v-show="!ispad" dense filled type="number" :autofocus="group == 0"
+                    :bg-color="group == 0 ? 'cyan-1' : ''" @focus="() => { group = 0; input_focus[0] = true }"
+                    v-model.number="array[0].value" :label="$t('upper fusion zone parameters')" lazy-rules
+                    @click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : ''; group = 0 }"
+                    :readonly="url.indexOf('pad') != -1" @blur="input_focus[0] = false" :rules="[
+                      (val) =>
+                        (val !== null && val !== '') ||
+                        $t('Please enter a number'),
+                      (val) =>
+                        (val >= 0 && val < config.height) || $t('Please enter 0-100'),
+                    ]">
+                    <template v-if="input_focus[0]" v-slot:append>
+                      <q-icon name="arrow_upward" @mousedown="mousedown('+', 0)" @mouseup="mouseup" />
+                      <q-icon name="arrow_downward" @mousedown="mousedown('-', 0)" @mouseup="mouseup" />
+                    </template>
+                  </q-input>
                 </div>
               </div>
             </div>
@@ -33,15 +51,33 @@
                   <q-toggle class="float-right" @click="group = 1" v-model="array[1].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input dense filled type="number" :autofocus="group == 1" :bg-color="group == 1 ? 'cyan-1' : ''"
+                  <q-input v-show="ispad" dense filled type="number" :autofocus="group == 1"
-                    @focus="group = 1" v-model="array[1].value" :label="$t('Left fusion Band Parameters')" lazy-rules @click="()=>{url.indexOf('pad')!=-1?ipad_chang=true:'';group=1}" :readonly="url.indexOf('pad')!=-1"
+                    :bg-color="group == 1 ? 'cyan-1' : ''" @focus="group = 1" v-model.number="array[1].value"
-                    :rules="[
+                    :label="$t('Left fusion Band Parameters')" lazy-rules
+                    @click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : ''; group = 1 }"
+                    :readonly="url.indexOf('pad') != -1" :rules="[
                       (val) =>
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
                         (val >= 0 && val < config.width) || $t('Please enter 0-100'),
                     ]" />
+                  <q-input v-show="!ispad" dense filled type="number" :autofocus="group == 1"
+                    :bg-color="group == 1 ? 'cyan-1' : ''" @focus="() => { group = 1; input_focus[1] = true }"
+                    v-model.number="array[1].value" :label="$t('Left fusion Band Parameters')" lazy-rules
+                    @click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : ''; group = 1 }"
+                    :readonly="url.indexOf('pad') != -1" @blur="input_focus[1] = false" :rules="[
+                      (val) =>
+                        (val !== null && val !== '') ||
+                        $t('Please enter a number'),
+                      (val) =>
+                        (val >= 0 && val < config.width) || $t('Please enter 0-100'),
+                    ]">
+                    <template v-if="input_focus[1]" v-slot:append>
+                      <q-icon name="arrow_upward" @mousedown="mousedown('+', 1)" @mouseup="mouseup" />
+                      <q-icon name="arrow_downward" @mousedown="mousedown('-', 1)" @mouseup="mouseup" />
+                    </template>
+                  </q-input>
                 </div>
               </div>
             </div>
@@ -51,15 +87,33 @@
                   <q-toggle class="float-right" @click="group = 2" v-model="array[2].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input dense filled type="number" :autofocus="group == 2" :bg-color="group == 2 ? 'cyan-1' : ''"
+                  <q-input v-show="ispad" dense filled type="number" :autofocus="group == 2"
-                    @focus="group = 2" v-model="array[2].value" :label="$t('Right fusion Band Parameters')" lazy-rules @click="()=>{url.indexOf('pad')!=-1?ipad_chang=true:'';group=2}" :readonly="url.indexOf('pad')!=-1"
+                    :bg-color="group == 2 ? 'cyan-1' : ''" @focus="group = 2" v-model.number="array[2].value"
-                    :rules="[
+                    :label="$t('Right fusion Band Parameters')" lazy-rules
+                    @click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : ''; group = 2 }"
+                    :readonly="url.indexOf('pad') != -1" :rules="[
                       (val) =>
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
                         (val >= 0 && val < config.width) || $t('Please enter 0-100'),
                     ]" />
+                  <q-input v-show="!ispad" dense filled type="number" :autofocus="group == 2"
+                    :bg-color="group == 2 ? 'cyan-1' : ''" @focus="() => { group = 2; input_focus[2] = true }"
+                    v-model.number="array[2].value" :label="$t('Right fusion Band Parameters')" lazy-rules
+                    @click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : ''; group = 2 }"
+                    :readonly="url.indexOf('pad') != -1" @blur="input_focus[2] = false" :rules="[
+                      (val) =>
+                        (val !== null && val !== '') ||
+                        $t('Please enter a number'),
+                      (val) =>
+                        (val >= 0 && val < config.width) || $t('Please enter 0-100'),
+                    ]">
+                    <template v-if="input_focus[2]" v-slot:append>
+                      <q-icon name="arrow_upward" @mousedown="mousedown('+', 2)" @mouseup="mouseup" />
+                      <q-icon name="arrow_downward" @mousedown="mousedown('-', 2)" @mouseup="mouseup" />
+                    </template>
+                  </q-input>
                 </div>
                 <div class="col-3"><span>{{ $t('Whether to operate synchronously') }}</span><q-checkbox
                     v-model="auto_sync" @update:model-value="() => { }" /></div>
@@ -75,15 +129,33 @@
                   <q-toggle class="float-right" v-model="array[3].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input dense filled type="number" :autofocus="group == 3" :bg-color="group == 3 ? 'cyan-1' : ''"
+                  <q-input v-show="ispad" dense filled type="number" :autofocus="group == 3"
-                    @focus="group = 3" v-model="array[3].value" :label="$t('Lower fusion Zone Parameters')" lazy-rules @click="()=>{url.indexOf('pad')!=-1?ipad_chang=true:'';group=3}" :readonly="url.indexOf('pad')!=-1"
+                    :bg-color="group == 3 ? 'cyan-1' : ''" @focus="group = 3" v-model.number="array[3].value"
-                    :rules="[
+                    :label="$t('Lower fusion Zone Parameters')" lazy-rules
+                    @click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : ''; group = 3 }"
+                    :readonly="url.indexOf('pad') != -1" :rules="[
                       (val) =>
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
                         (val >= 0 && val < config.height) || $t('Please enter 0-100'),
                     ]" />
+                  <q-input v-show="!ispad" dense filled type="number" :autofocus="group == 3"
+                    :bg-color="group == 3 ? 'cyan-1' : ''" @focus="() => { group = 3; input_focus[3] = true }"
+                    v-model.number="array[3].value" :label="$t('Lower fusion Zone Parameters')" lazy-rules
+                    @click="() => { url.indexOf('pad') != -1 ? ipad_chang = true : ''; group = 3 }"
+                    :readonly="url.indexOf('pad') != -1" @blur="input_focus[3] = false" :rules="[
+                      (val) =>
+                        (val !== null && val !== '') ||
+                        $t('Please enter a number'),
+                      (val) =>
+                        (val >= 0 && val < config.height) || $t('Please enter 0-100'),
+                    ]">
+                    <template v-if="input_focus[3]" v-slot:append>
+                      <q-icon name="arrow_upward" @mousedown="handlerTouchstart('+')" @mouseup="handlerTouchend" />
+                      <q-icon name="arrow_downward" @mousedown="handlerTouchstart('-')" @mouseup="handlerTouchend" />
+                    </template>
+                  </q-input>
                 </div>
               </div>
             </div>
@@ -91,20 +163,38 @@
         </div>
       </div>
     </div>
-    <div class="col-12" v-if="group != 4">
+    <div class="col-12" v-show="group != 4 || ispad">
       <p class="text-center" style="margin: 0 0 8;">{{ $t("Set Fusion Band Parameters") }}</p>
       <div style="display: flex; justify-content: space-evenly">
         <div>
-          <q-slider v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
+          <q-slider v-model="array[group].alpha" v-show="!ispad" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01"
-            vertical reverse label-always />
+            color="green" vertical reverse label-always />
-          <div> <q-input dense filled hide-bottom-space type="number" max="1" min="0" step="0.1"
+          <div> <q-input v-show="ispad" dense filled hide-bottom-space type="number" max="1" min="0" step="0.1"
-              @update:model-value="chang('alpha')" v-model="array[group].alpha" lazy-rules :rules="[
+              @update:model-value="chang('alpha')"
+              @click="() => { now_apg = 'alpha'; ispad ? ipad_chang_input = true : '' }" :readonly="ispad"
+              v-model.number="array[group].alpha" lazy-rules :rules="[
                 (val) =>
                   (val !== null && val !== '') ||
                   $t('Please enter a number'),
                 (val) =>
                   (val >= 0 && val <= 1) || $t('Please enter a value within the range'),
               ]" />
+               <q-input v-show="!ispad" dense filled hide-bottom-space type="number" max="1" min="0" step="0.1"
+              @update:model-value="chang('alpha')"
+              @click="() => { now_apg = 'alpha'; ispad ? ipad_chang_input = true : '' }" :readonly="ispad"
+              @focus="input_focus_apg[0]=true" @blur="input_focus_apg[0]=false"
+              v-model.number="array[group].alpha" lazy-rules :rules="[
+                (val) =>
+                  (val !== null && val !== '') ||
+                  $t('Please enter a number'),
+                (val) =>
+                  (val >= 0 && val <= 1) || $t('Please enter a value within the range'),
+              ]" >
+              <template v-if="input_focus_apg[0]" v-slot:append>
+                      <q-icon name="arrow_upward" @mousedown="handlerTouchstart_apg('+')" @mouseup="handlerTouchend_apg" />
+                      <q-icon name="arrow_downward" @mousedown="handlerTouchstart_apg('-')" @mouseup="handlerTouchend_apg" />
+                    </template>
+                  </q-input>
             <p style="text-align: center;">Alpha</p>
             <q-btn style="margin-top: 0.5rem;" color="white" @click="reset('alpha')" text-color="black"
               :label="$t('reset')" />
@@ -112,16 +202,32 @@
         </div>
 
         <div>
-          <q-slider v-model="array[group].p" :min="0" @change="chang('p')" :max="16" :step="0.01" color="green" vertical
+          <q-slider v-model="array[group].p" v-show="!ispad" :min="0" @change="chang('p')" :max="16" :step="0.01"
-            reverse label-always />
+            color="green" vertical reverse label-always />
-          <div> <q-input dense filled hide-bottom-space type="number" max="16" min="0" step="0.1"
+          <div> <q-input v-show="ispad" dense filled hide-bottom-space type="number" max="16" min="0" step="0.1"
-              @update:model-value="chang('p')" v-model="array[group].p" lazy-rules :rules="[
+              @update:model-value="chang('p')" @click="() => { now_apg = 'p'; ispad ? ipad_chang_input = true : '' }"
+              :readonly="ispad" v-model.number="array[group].p" lazy-rules :rules="[
                 (val) =>
                   (val !== null && val !== '') ||
                   $t('Please enter a number'),
                 (val) =>
                   (val >= 0 && val <= 16) || $t('Please enter a value within the range'),
               ]" />
+               <q-input v-show="!ispad" dense filled hide-bottom-space type="number" max="16" min="0" step="0.1"
+               @focus="input_focus_apg[1]=true" @blur="input_focus_apg[1]=false"
+              @update:model-value="chang('p')" @click="() => { now_apg = 'p'; ispad ? ipad_chang_input = true : '' }"
+              :readonly="ispad" v-model.number="array[group].p" lazy-rules :rules="[
+                (val) =>
+                  (val !== null && val !== '') ||
+                  $t('Please enter a number'),
+                (val) =>
+                  (val >= 0 && val <= 16) || $t('Please enter a value within the range'),
+              ]" >
+              <template v-if="input_focus_apg[1]" v-slot:append>
+                      <q-icon name="arrow_upward" @mousedown="handlerTouchstart_apg('+')" @mouseup="handlerTouchend_apg" />
+                      <q-icon name="arrow_downward" @mousedown="handlerTouchstart_apg('-')" @mouseup="handlerTouchend_apg" />
+                    </template>
+                  </q-input>
             <p style="text-align: center;">Power</p>
             <q-btn style="margin-top: 0.5rem;" color="white" @click="reset('p')" text-color="black"
               :label="$t('reset')" />
@@ -129,17 +235,35 @@
         </div>
 
         <div>
-          <q-slider v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green"
+          <q-slider v-model="array[group].gamma" v-show="!ispad" :min="0" @change="chang('gamma')" :max="16" :step="0.01"
-            vertical reverse label-always />
+            color="green" vertical reverse label-always />
           <div>
-            <q-input :dense="true" filled hide-bottom-space type="number" max="16" min="0" step="0.1"
+            <q-input v-show="ispad" :dense="true" filled hide-bottom-space type="number" max="16" min="0" step="0.1"
-              @update:model-value="chang('gamma')" v-model="array[group].gamma" lazy-rules :rules="[
+              @update:model-value="chang('gamma')"
+              @click="() => { now_apg = 'gamma'; ispad ? ipad_chang_input = true : '' }" :readonly="ispad"
+              v-model.number="array[group].gamma" lazy-rules :rules="[
                 (val) =>
                   (val !== null && val !== '') ||
                   $t('Please enter a number'),
                 (val) =>
                   (val >= 0 && val <= 16) || $t('Please enter a value within the range'),
               ]" />
+              <q-input v-show="!ispad" :dense="true" filled hide-bottom-space type="number" max="16" min="0" step="0.1"
+              @update:model-value="chang('gamma')"
+              @focus="input_focus_apg[2]=true" @blur="input_focus_apg[2]=false"
+              @click="() => { now_apg = 'gamma'; ispad ? ipad_chang_input = true : '' }" :readonly="ispad"
+              v-model.number="array[group].gamma" lazy-rules :rules="[
+                (val) =>
+                  (val !== null && val !== '') ||
+                  $t('Please enter a number'),
+                (val) =>
+                  (val >= 0 && val <= 16) || $t('Please enter a value within the range'),
+              ]" >
+              <template v-if="input_focus_apg[2]" v-slot:append>
+                      <q-icon name="arrow_upward" @mousedown="handlerTouchstart_apg('+')" @mouseup="handlerTouchend_apg" />
+                      <q-icon name="arrow_downward" @mousedown="handlerTouchstart_apg('-')" @mouseup="handlerTouchend_apg" />
+                    </template>
+                  </q-input>
             <p style="text-align: center;">Gamma</p>
             <q-btn style="margin-top: 0.5rem;" color="white" @click="reset('gamma')" text-color="black"
               :label="$t('reset')" />
@@ -147,7 +271,33 @@
         </div>
       </div>
     </div>
+    <div class="col-12">
+      <div class="row" style="min-height: 40px;">
+        <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("background color") }}
+            </q-item-section>
+            <q-item-section>
+              <q-input v-model="color" :rules="['anyColor']">
+                <template v-slot:append>
+                  <q-icon name="colorize" class="cursor-pointer">
+                    <q-popup-proxy cover transition-show="scale" transition-hide="scale">
+                      <q-color v-model="color" @change="submit" />
+                    </q-popup-proxy>
+                  </q-icon>
+                </template>
+              </q-input>
+            </q-item-section>
+          </q-item>
         </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) }"
@@ -155,25 +305,52 @@
   </div>
 
 
-  <q-dialog v-model="ipad_chang">
+  <q-dialog v-model="ipad_chang" ref="ipadref">
     <q-card style="width: 40vw; max-width: 80vw;">
       <q-card-section>
-        <div class="text-h6">{{ $t('fusion zone') +(group+1 )}}</div>
+        <!-- <div class="text-h6">{{ $t('fusion zone') + (group + 1) }}</div> -->
+        <div class="row">
+          <div class="col-4"><q-select  class="q-pt-md" :label="$t('fusion zone')" :dense="true" filled
+          v-model="group" @update:model-value="(val) => { group = val }" :options="options" emit-value
+          map-options /></div>
+        </div>
       </q-card-section>
       <q-card-section class="q-pt-none">
-
+        <div class="row  q-pb-md" >
-        <div class="row">
+          <div class="col-12" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_up"
-          <div class="col-6" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_left" @touchstart="handlerTouchstart('-')"  @touchend="handlerTouchend" /></div>
+              @touchstart="handlerTouchstart('+')" @touchend="handlerTouchend" /></div>
-          <div class="col-6" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_right" @touchstart="handlerTouchstart('+')"  @touchend="handlerTouchend"  /></div>
+        </div>
+        <div class="row  q-pt-md" >
+          <div class="col-12" style="text-align: center;"><q-btn color="white" text-color="black"
+              icon="keyboard_arrow_down" @touchstart="handlerTouchstart('-')" @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>
+  <q-dialog v-model="ipad_chang_input">
+    <q-card style="width: 40vw; max-width: 80vw;">
+      <q-card-section>
+        <div class="text-h6">{{ $t('fusion zone') + options[group].label + ` ${now_apg}` }}</div>
 
+      </q-card-section>
+      <q-card-section class="q-pt-none">
+        <div class="row  q-pb-md">
+          <div class="col-12" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_up"
+              @touchstart="handlerTouchstart_apg('+')" @touchend="handlerTouchend_apg" /></div>
+        </div>
+        <div class="row  q-pt-md">
+          <div class="col-12" style="text-align: center;"><q-btn color="white" text-color="black"
+              icon="keyboard_arrow_down" @touchstart="handlerTouchstart_apg('-')" @touchend="handlerTouchend_apg" /></div>
+        </div>
+      </q-card-section>
+      <q-card-actions align="right" class="bg-white text-teal">
+        <q-btn flat :label="$t('close')" color="primary" @click="ipad_chang_input = false" />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
 </template>
 
 <style>
@@ -194,6 +371,14 @@ p {
 }
 </style>
 
+<style>
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none !important;
+  margin: 0;
+}
+</style>
+
 <script lang="ts">
 import {
   defineComponent,
@@ -217,7 +402,7 @@ export default defineComponent({
     let set = GlobalData.getInstance().getCurrentClient();
     let $store = useStore();
     let $t = useI18n();
-    const group = ref(4);
+    const group = ref(2);
     const set_cache: any = ref([]);
     const enablefusion = ref(false);
     let array: any = reactive([
@@ -241,6 +426,11 @@ export default defineComponent({
         $store.getters.GetTheCurrentlySelectedCamera[1]
       );
     });
+    const color = ref("#ffffff");
+    const ispad = computed(() => {
+      let url = window.location.href;
+      return url.indexOf("pad") != -1
+    })
     const reset = (type: string) => {
       switch (type) {
         case 'gamma':
@@ -285,7 +475,9 @@ export default defineComponent({
     watch(
       () => configselsect,
       (newVal, oldVal) => {
-        let tmp = JSON.parse($store.state.fusion_configuration);
+        set?.GetBlendingConfig("").then((res) => {
+          let tmp = JSON.parse(res ? res.config : "");
+          // let tmp = JSON.parse($store.state.fusion_configuration);
           let fortmp = null;
           let i;
           for (i of tmp.projectors) {
@@ -300,11 +492,13 @@ export default defineComponent({
 
           config = JSON.parse(JSON.stringify(fortmp));
           use_server_config();
-        use_set_cache();
+          // use_set_cache();
           setTimeout(() => {
             ste_status.value = 0;
           }, 100);
           setnowindex();
+        });
+
       },
       { deep: true }
     );
@@ -412,6 +606,8 @@ export default defineComponent({
         let tmp = JSON.parse(res ? res.config : "");
         config = tmp.projectors[selectedprojector.value];
         ste_status.value = 1;
+        color.value = tmp.blending_grids_background_color ?? "#7f7f7f"
+        // console.log(tmp.blending_grids_background_color )
         startconfig();
         setTimeout(() => {
           ste_status.value = 0;
@@ -433,7 +629,7 @@ export default defineComponent({
             $store.getters.GetTheCurrentlySelectedCamera[1],
             1,
             array[0].isshow,
-            Number(array[0].value)
+            Number(array[0].value), auto_sync.value
           );
 
         save_set_cache();
@@ -449,10 +645,10 @@ export default defineComponent({
             $store.getters.GetTheCurrentlySelectedCamera[1],
             0,
             array[1].isshow,
-            Number(array[1].value)
+            Number(array[1].value), auto_sync.value
           );
         if (auto_sync.value) {
-          left_right_auto_add(Number(newVal)%2==0?newVal:Number(newVal)+1);
+          // left_right_auto_add(Number(newVal)%2==0?newVal:Number(newVal)+1);
 
         }
         Number(newVal) % 2 != 0 ? array[1].value = Number(array[1].value) + 1 : ''
@@ -469,9 +665,9 @@ export default defineComponent({
             $store.getters.GetTheCurrentlySelectedCamera[1],
             2,
             array[2].isshow,
-            Number(array[2].value)
+            Number(array[2].value), auto_sync.value
           );
-        if (auto_sync.value) left_right_auto_add(Number(newVal)%2==0?newVal:Number(newVal)+1);
+        // if (auto_sync.value) left_right_auto_add(Number(newVal)%2==0?newVal:Number(newVal)+1);
         Number(newVal) % 2 != 0 ? array[2].value = Number(array[2].value) + 1 : ''
         save_set_cache();
       },
@@ -486,7 +682,7 @@ export default defineComponent({
             $store.getters.GetTheCurrentlySelectedCamera[1],
             3,
             array[3].isshow,
-            Number(array[3].value)
+            Number(array[3].value), auto_sync.value
           );
         save_set_cache();
       },
@@ -503,7 +699,7 @@ export default defineComponent({
             $store.getters.GetTheCurrentlySelectedCamera[1],
             1,
             array[0].isshow,
-            Number(array[0].value)
+            Number(array[0].value), auto_sync.value
           );
         save_set_cache();
       },
@@ -518,9 +714,9 @@ export default defineComponent({
             $store.getters.GetTheCurrentlySelectedCamera[1],
             0,
             array[1].isshow,
-            Number(array[1].value)
+            Number(array[1].value), auto_sync.value
           );
-        if (auto_sync.value) left_right_auto_add(-1);
+        // if (auto_sync.value) left_right_auto_add(-1);
         save_set_cache();
       },
       { deep: true }
@@ -534,9 +730,9 @@ export default defineComponent({
             $store.getters.GetTheCurrentlySelectedCamera[1],
             2,
             array[2].isshow,
-            Number(array[2].value)
+            Number(array[2].value), auto_sync.value
           );
-        if (auto_sync.value) left_right_auto_add(-1);
+        // if (auto_sync.value) left_right_auto_add(-1);
         save_set_cache();
       },
       { deep: true }
@@ -550,7 +746,7 @@ export default defineComponent({
             $store.getters.GetTheCurrentlySelectedCamera[1],
             3,
             array[3].isshow,
-            Number(array[3].value)
+            Number(array[3].value), auto_sync.value
           );
         save_set_cache();
       },
@@ -569,54 +765,60 @@ export default defineComponent({
     const changenablefusion = () => {
       $store.commit("setenablefusion", enablefusion.value);
     };
-    const left_right_auto_add = (difference: number) => {
+    // const left_right_auto_add = (difference: number) => {
-      let tmpobjall = JSON.parse($store.state.fusion_configuration)
+    //   let tmpobjall = JSON.parse($store.state.fusion_configuration)
-      if ($store.getters.GetTheCurrentlySelectedCamera[1] == 0&&group.value==2) {
+    //   if ($store.getters.GetTheCurrentlySelectedCamera[1] == 0&&group.value==2) {
-        let tmp = set_cache.value[1] == null ? tmpobjall.projectors[1].params : JSON.parse(set_cache.value[1]);
+    //     let tmp = set_cache.value[1] == null ? tmpobjall.projectors[1].params : JSON.parse(set_cache.value[1]);
-        let set_cache_tmp: any = []
+    //     let set_cache_tmp: any = []
-        if (tmp[1].hasOwnProperty("power")) {
+    //     if (tmp[1].hasOwnProperty("power")) {
-          for (let index = 0; index < 4; index++) {
+    //       for (let index = 0; index < 4; index++) {
-            let tmpobj = { alpha: Number(tmp[arr[index]].alpha.toFixed(2)), p: Number(tmp[arr[index]].power.toFixed(2)), gamma: Number(tmp[arr[index]].gamma.toFixed(2)), isshow: tmp[arr[index]].enable, value: Number(tmp[arr[index]].size) }
+    //         let tmpobj = { alpha: Number(tmp[arr[index]].alpha.toFixed(2)), p: Number(tmp[arr[index]].power.toFixed(2)), gamma: Number(tmp[arr[index]].gamma.toFixed(2)), isshow: tmp[arr[index]].enable, value: Number(tmp[arr[index]].size) }
-            set_cache_tmp.push(tmpobj)
+    //         set_cache_tmp.push(tmpobj)
-          }
+    //       }
-        } else {
+    //     } else {
-          set_cache_tmp = tmp
+    //       set_cache_tmp = tmp
-        }
+    //     }
-        if (ste_status.value == 0) {
+    //     if (ste_status.value == 0) {
-          if (difference == -1) {
+    //       if (difference == -1) {
-            set_cache_tmp[1].isshow = array[2].isshow
+    //         set_cache_tmp[1].isshow = array[2].isshow
-          } else {
+    //       } else {
-            set_cache_tmp[1].value = difference
+    //         set_cache_tmp[1].value = difference
-          }
+    //       }
-          set?.SetBlendingOverlap(0, 1, 0, set_cache_tmp[1].isshow, Number(set_cache_tmp[1].value));
+    //       set?.SetBlendingOverlap(0, 1, 0, set_cache_tmp[1].isshow, Number(set_cache_tmp[1].value));
-          set_cache.value[1] = JSON.stringify(set_cache_tmp);
+    //       set_cache.value[1] = JSON.stringify(set_cache_tmp);
-        }
+    //     }
-      }
+    //   }
-      if ($store.getters.GetTheCurrentlySelectedCamera[1] == 1&&group.value==1) {
+    //   if ($store.getters.GetTheCurrentlySelectedCamera[1] == 1&&group.value==1) {
 
-        let tmp = set_cache.value[0] == null ? tmpobjall.projectors[0].params : JSON.parse(set_cache.value[0]);
+    //     let tmp = set_cache.value[0] == null ? tmpobjall.projectors[0].params : JSON.parse(set_cache.value[0]);
-        let set_cache_tmp: any = []
+    //     let set_cache_tmp: any = []
-        if (tmp[0].hasOwnProperty("power")) {
+    //     if (tmp[0].hasOwnProperty("power")) {
-          for (let index = 0; index < 4; index++) {
+    //       for (let index = 0; index < 4; index++) {
-            let tmpobj = { alpha: Number(tmp[arr[index]].alpha.toFixed(2)), p: Number(tmp[arr[index]].power.toFixed(2)), gamma: Number(tmp[arr[index]].gamma.toFixed(2)), isshow: tmp[arr[index]].enable, value: Number(tmp[arr[index]].size) }
+    //         let tmpobj = { alpha: Number(tmp[arr[index]].alpha.toFixed(2)), p: Number(tmp[arr[index]].power.toFixed(2)), gamma: Number(tmp[arr[index]].gamma.toFixed(2)), isshow: tmp[arr[index]].enable, value: Number(tmp[arr[index]].size) }
-            set_cache_tmp.push(tmpobj)
+    //         set_cache_tmp.push(tmpobj)
-          }
+    //       }
-        } else {
+    //     } else {
-          set_cache_tmp = tmp
+    //       set_cache_tmp = tmp
-        }
+    //     }
-        if (ste_status.value == 0) {
+    //     if (ste_status.value == 0) {
-          //set_cache_tmp[2].value = Number(set_cache_tmp[2].value) + difference
+    //       //set_cache_tmp[2].value = Number(set_cache_tmp[2].value) + difference
 
-          if (difference == -1) {
+    //       if (difference == -1) {
-            set_cache_tmp[2].isshow = array[1].isshow
+    //         set_cache_tmp[2].isshow = array[1].isshow
-          } else {
+    //       } else {
-            set_cache_tmp[2].value = difference
+    //         set_cache_tmp[2].value = difference
-          }
+    //       }
-          set?.SetBlendingOverlap(0, 0, 2, set_cache_tmp[2].isshow, Number(set_cache_tmp[2].value));
+    //       set?.SetBlendingOverlap(0, 0, 2, set_cache_tmp[2].isshow, Number(set_cache_tmp[2].value));
-          set_cache.value[0] = JSON.stringify(set_cache_tmp);
+    //       set_cache.value[0] = JSON.stringify(set_cache_tmp);
-        }
+    //     }
-      }
+    //   }
-    }
+    // }
+
+
+    // watch(()=>auto_sync,()=>{
+    //   console.log(auto_sync.value)
+    //   set?.SetBlendingOption("fusion_with_automatic_sync", auto_sync.value?'1':'0');
+    // },{deep:true})
 
     /**
      * 平板弹窗修改
@@ -630,22 +832,128 @@ export default defineComponent({
 
     /**
     * 长按实现
+    * 单击实现
     */
     let loop: NodeJS.Timeout
+    let loop_end: NodeJS.Timeout
     const handlerTouchstart = (fun: string) => {
+      loop_end = setTimeout(() => {
         loop = setInterval(() => {
           if (fun == '+') {
             array[group.value].value += 2
           } else {
             array[group.value].value -= 2
           }
-      }, 15)
+        }, 30)
+      }, 100);
+      if (fun == '+') {
+        array[group.value].value += 2
+      } else {
+        array[group.value].value -= 2
+      }
     }
     const handlerTouchend = () => {
       clearInterval(loop)
+      clearTimeout(loop_end)
     }
 
+    const submit = () => {
+      set?.SetBlendingOption("blending_grids_background_color", color.value);
+    }
+    /**
+* 处理平板模式下 伽马校正操作
+*/
+    const ipad_chang_input = ref(false)
+    const now_apg = ref("");
+    let loop__apg: NodeJS.Timeout
+    let loop__apg_end: NodeJS.Timeout
+    const handlerTouchstart_apg = (fun: string) => {
+      loop__apg_end = setTimeout(() => {
+        loop__apg = setInterval(() => {
+          if (fun == '+') {
+            array[group.value][now_apg.value] = toDecimal(array[group.value][now_apg.value] + 0.1)
+          } else {
+            array[group.value][now_apg.value] = toDecimal(array[group.value][now_apg.value] - 0.1)
+          }
+        }, 30)
+      }, 1000);
+      if (fun == '+') {
+        array[group.value][now_apg.value] = toDecimal(array[group.value][now_apg.value] + 0.1)
+      } else {
+        array[group.value][now_apg.value] = toDecimal(array[group.value][now_apg.value] - 0.1)
+      }
+    }
+    const handlerTouchend_apg = () => {
+      clearTimeout(loop__apg_end)
+      clearInterval(loop__apg)
+    }
+    const toDecimal = (num: number): number => {
+      return Math.round(num * 100) / 100;
+    }
+
+
+
+
+    let loop_start: NodeJS.Timeout
+    let loop_finish: NodeJS.Timeout
+    const input_focus = ref([false, false, false, false,])
+    const mousedown = (fun: string, index: number) => {
+      loop_start = setTimeout(() => {
+        loop_finish = setInterval(() => {
+          if (fun == '+') {
+            array[index].value+=2
+          } else {
+            array[index].value-=2
+          }
+        }, 30)
+      }, 1000);
+      if (fun == '+') {
+        array[index].value+=2
+      } else {
+        array[index].value-=2
+      }
+    }
+
+    const mouseup = () => {
+      clearTimeout(loop_start)
+      clearInterval(loop_finish)
+    }
+
+
+    const input_focus_apg=ref([false,false,false,])
+
+
+
+    // const ["上","左","右","下"]
+
+    const options = [{
+      label: $t.t('up'),
+      value: 0
+    }, {
+      label: $t.t('left'),
+      value: 1
+    }, {
+      label: $t.t('right'),
+      value: 2
+    }, {
+      label: $t.t('down'),
+      value: 3
+    }, {
+      label: $t.t('down'),
+      value: 4
+    }]
+
+
     return {
+      options,
+      input_focus_apg,
+      input_focus,
+      mousedown,
+      mouseup,
+      now_apg,
+      handlerTouchstart_apg,
+      handlerTouchend_apg,
+      ipad_chang_input,
       send_auxiliary_line,
       group,
       array,
@@ -662,7 +970,10 @@ export default defineComponent({
       ipad_chang,
       url,
       handlerTouchstart,
-      handlerTouchend
+      handlerTouchend,
+      ispad,
+      color,
+      submit
     };
   },
 });

src/pad/TopToolbar.vue

@@ -330,6 +330,7 @@ export default defineComponent({
       plan_running,
       window_rect_edit_dialog,
       power_flag,
+      getconfig,
 
       toogleFullScreen() {
         if (!$q.fullscreen.isCapable) {