From 3b84db438fb39ffc20efc17d32a50e582a9cc837 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 23 Feb 2023 09:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9ui=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=91=84=E5=BD=B1=E6=9C=BA=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 34 ++++++++++---------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 8d7242b..094501d 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -40,23 +40,15 @@
                   @click="currently_selected_projector(index_row + '-' + index_col)"></projector-item>
               </div> -->
 
-              <div v-for="(item, index_row) in projectors_that_can_display.row">
-                <projector-item v-for="(item, index_col) in config.col" class="w-100" :llabel="
+              <div v-for="(item, index_row) in 1">
+                <projector-item v-for="(item, index_col) in projectors_that_can_display.col" class="w-100" :llabel="
                   $t('Projector') + (index_row * config.col + index_col + 1)
                 " :lvalue="index_row + '/' + index_col"
                   @click="currently_selected_projector(index_row + '-' + index_col)"></projector-item>
               </div>
+              <hr>
               <div>
-                <projector-item v-for="(item, index_col) in projectors_that_can_display.remain" class="w-100" :llabel="
-                  $t('Projector') + (projectors_that_can_display.row * config.col + index_col + 1)
-                " :lvalue="projectors_that_can_display.row + '/' + index_col"
-                  @click="currently_selected_projector(projectors_that_can_display.row + '-' + index_col)"></projector-item>
-              </div>
-              <div class="col-12" style="text-align: center">
-                {{
-                  $t("Enable projection mode")
-                }}<q-checkbox v-model="EnableBlending" />
-              </div>
+
               <div class="col-3 q-px-md"> <q-select class="q-pt-md " :label="$t('change resolution')"
           @update:model-value="(val) => { set_resolution(val) }" :dense="true" filled v-model="now_resolution"
           :options="options_resolution" emit-value map-options /></div>
@@ -64,6 +56,12 @@
           @update:model-value="(val) => { send_projectorlayout(val) }" :dense="true" filled v-model="now_select_projectorlayout"
           :options="projectorlayout" emit-value map-options /></div>
             </div>
+            <div class="col-12" style="text-align: center">
+                {{
+                  $t("Enable projection mode")
+                }}<q-checkbox v-model="EnableBlending" />
+              </div>
+          </div>
             <div class="col-10">
               <div class="q-ta-md">
                 <q-btn-toggle :disable="!$store.state.enablefusion" no-caps v-model="options" toggle-color="primary"
@@ -364,7 +362,7 @@ export default defineComponent({
      */
     watch(
       () => EnableBlending,
-      (newVal, oldVal) => {
+      (newVal) => {
         $store.commit("setEnablefusion", newVal.value);
         set?.EnableBlending(newVal.value);
       },
@@ -557,7 +555,7 @@ export default defineComponent({
       getconfig()
     }
     const plan_list_op = ref(plan_list)
-    const filterFn = (val: any, update: any, abort: any) => {
+    const filterFn = (val: any, update: any) => {
       update(() => {
         const needle = val.toLocaleLowerCase()
         plan_list_op.value = plan_list.filter(v => v.toLocaleLowerCase().indexOf(needle) > -1)
@@ -574,7 +572,6 @@ export default defineComponent({
 
     const isdebug = computed(() => {
       try {
-        let tmp = JSON.parse($store.state.fusion_configuration)
         return record_times.value > 2
       } catch (error) {
 
@@ -643,11 +640,8 @@ export default defineComponent({
      */
     const projectors_that_can_display=computed(()=>{
       let allconfig = JSON.parse($store.state.fusion_configuration);
-      let max = allconfig.max_projector_count
-      let row = max/allconfig.row|0
-      let remain=max%allconfig.row
-      // config_projectors
-      return {row,remain}
+      let col = allconfig.projectors.length
+      return {col}
     })
     return {
       currently_selected_projector,