在03版本的基础上修改 隐藏融合页面的 禁用融合参数 显示网格 按钮 将背景颜色从辅助放到融合界面

src/components/FusionSettings/DensityCorrection.vue

@@ -157,10 +157,10 @@
             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>
+            <!-- <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>
+        </template> -->
         </q-input>
         </div>
         <div class="q-pt-md  ">
@@ -196,10 +196,10 @@
             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>
+            <!-- <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>
+        </template> -->
         </q-input>
         </div>
         <div class="q-pt-md ">
@@ -318,13 +318,6 @@
 }
 </style>
 
-<style>
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-    -webkit-appearance: none !important;
-    margin: 0;
-}
-</style>
 
 <script lang="ts">
 import {

src/components/FusionSettings/FourPointCalibration.vue

@@ -51,19 +51,19 @@
          <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>
+        <!-- <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>
+        </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>
+          <!-- <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>
+        </template> -->
         </q-input>
         </div>
       <div class="q-pt-md">
@@ -123,13 +123,8 @@
 }
 </style>
 
-<style>
+
-input::-webkit-outer-spin-button,
+
-input::-webkit-inner-spin-button {
-    -webkit-appearance: none !important;
-    margin: 0;
-}
-</style>
 
 <script lang="ts">
 import {

src/components/FusionSettings/FusionLocale.vue

@@ -148,7 +148,29 @@
       </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 style="position: absolute;bottom: 0;">
     <q-checkbox v-model="auxiliary_line" @update:model-value="(value, evt)=>{send_auxiliary_line(value)}"
       :label="$t('auxiliary lines')" />
@@ -162,14 +184,14 @@
       </q-card-section>
       <q-card-section class="q-pt-none">
 
-        <div class="row">
+        <div class="q-mb-md" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_up" @touchstart="handlerTouchstart('+')"  @touchend="handlerTouchend"  /></div>
-          <div class="col-6" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_left" @touchstart="handlerTouchstart('-')"  @touchend="handlerTouchend" /></div>
+          <div class="q-mt-md" style="text-align: center;"><q-btn color="white" text-color="black" icon="keyboard_arrow_down" @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>
+
 
       </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>
@@ -413,6 +435,7 @@ export default defineComponent({
         config = tmp.projectors[selectedprojector.value];
         ste_status.value = 1;
         startconfig();
+        color.value = tmp.blending_grids_background_color ?? "#7f7f7f"
         setTimeout(() => {
         ste_status.value = 0;
       }, 100);
@@ -433,7 +456,8 @@ 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,7 +473,8 @@ 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);
@@ -469,7 +494,8 @@ 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);
         Number(newVal)%2!=0?array[2].value=Number(array[2].value)+1:''
@@ -486,7 +512,8 @@ 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 +530,8 @@ 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,7 +546,8 @@ 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);
         save_set_cache();
@@ -534,7 +563,8 @@ 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);
         save_set_cache();
@@ -550,7 +580,8 @@ 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();
       },
@@ -588,7 +619,8 @@ export default defineComponent({
           } else {
             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),
+            auto_sync.value);
           set_cache.value[1] = JSON.stringify(set_cache_tmp);
         }
       }
@@ -612,7 +644,8 @@ export default defineComponent({
           } else {
             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),
+            auto_sync.value);
           set_cache.value[0] = JSON.stringify(set_cache_tmp);
         }
       }
@@ -644,8 +677,19 @@ export default defineComponent({
     const handlerTouchend = () => {
       clearInterval(loop)
     }
+    const color = ref("#ffffff");
+    const ispad = computed(() => {
+      let url = window.location.href;
+      return url.indexOf("pad") != -1
+    })
+    const submit = () => {
+      set?.SetBlendingOption("blending_grids_background_color", color.value);
+    }
 
     return {
+      submit,
+      color,
+      ispad,
       send_auxiliary_line,
       group,
       array,

src/components/FusionSettings/SurfaceCorrection.vue

@@ -89,10 +89,10 @@
           @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>
+          <!-- <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>
+        </template> -->
         </q-input>
       </div>
       <div class=" q-px-md" @mousewheel="details_selsect_val($event, 'y')"><q-input v-if="value[options_model]" filled
@@ -100,10 +100,10 @@
           @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>
+          <!-- <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>
+        </template> -->
         </q-input>
       </div>
       <div class="q-pt-md ">
@@ -204,13 +204,7 @@
 }
 </style>
 
-<style>
+
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-    -webkit-appearance: none !important;
-    margin: 0;
-}
-</style>
 
 <script lang="ts">
 import {

src/components/FusionSettingsDialog.vue

@@ -201,7 +201,7 @@
           <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 }}
+          {{ $t('Whether to change the projector layout to') + dialog_data_projectorlayout.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"  />