From 263c2acbc15f4d03fd7dd264eaaee301da6c18ed Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Mon, 6 Feb 2023 15:07:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=97=B6=E5=8F=91=E9=80=81=E9=80=89=E4=B8=AD=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 31 ++++++++++++-------
 .../FusionSettings/FusionLocale.vue           |  2 +-
 .../FusionSettings/SurfaceCorrection.vue      |  2 +-
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 1328b76..9da15fb 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -6,43 +6,43 @@
         <div style="position: absolute">
           <vue3ResizeDrag  style="border: 0;"  :class="[now_index==0?'action':'']" :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="30" :x="point_postion[0].x"
             :y="point_postion[0].y" @mousedown="activeMouseDown(0)" :isResizable="false"
-            @moveHandler="moveHandler($event, 0)"><p  class="p0 vcolro">↑</p><p class="vcolro p0">V1</p><p class=" vcolro p0">↓</p>
+            @moveHandler="moveHandler($event, 0)"><p class="vcolro p0">V1</p>
           </vue3ResizeDrag>
           <vue3ResizeDrag  style="border: 0;"  :class="[now_index==1?'action':'']" :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="30" :x="point_postion[1].x"
             :y="point_postion[1].y" @mousedown="activeMouseDown(1)" :isResizable="false"
-            @moveHandler="moveHandler($event, 1)"><p  class="p0 vcolro">↑</p><p class="vcolro p0">V2</p><p class="p0 vcolro">↓</p>
+            @moveHandler="moveHandler($event, 1)"><p class="vcolro p0">V2</p>
           </vue3ResizeDrag>
           <vue3ResizeDrag  style="border: 0;"  :class="[now_index==2?'action':'']" :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="30" :x="point_postion[2].x"
             :y="point_postion[2].y" @mousedown="activeMouseDown(2)" :isResizable="false"
-            @moveHandler="moveHandler($event, 2)"><p  class="p0 vcolro">↑</p><p class="vcolro p0">V3</p><p class="p0 vcolro">↓</p>
+            @moveHandler="moveHandler($event, 2)"><p class="vcolro p0">V3</p>
           </vue3ResizeDrag>
           <vue3ResizeDrag  style="border: 0;"  :class="[now_index==3?'action':'']" :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="30" :x="point_postion[3].x"
             :y="point_postion[3].y" @mousedown="activeMouseDown(3)" :isResizable="false"
-            @moveHandler="moveHandler($event, 3)"><p  class="p0 vcolro">↑</p><p class="vcolro p0">V4</p><p class="p0 vcolro">↓</p>
+            @moveHandler="moveHandler($event, 3)"><p class="vcolro p0">V4</p>
           </vue3ResizeDrag>
           <vue3ResizeDrag  style="border: 0;"  :class="[now_index==4?'action':'']" :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="30" :x="point_postion[4].x"
             :y="point_postion[4].y" @mousedown="activeMouseDown(4)" :isResizable="false"
-            @moveHandler="moveHandler($event, 4)"><p  class="p0 vcolro">↑</p><p class="vcolro p0">V5</p><p class="p0 vcolro">↓</p>
+            @moveHandler="moveHandler($event, 4)"><p class="vcolro p0">V5</p>
           </vue3ResizeDrag>
           <vue3ResizeDrag  style="border: 0;"  :class="[now_index==5?'action':'']" :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="40" :h="20" :x="point_postion[5].x"
             :y="point_postion[5].y" @mousedown="activeMouseDown(5)" :isResizable="false"
-            @moveHandler="moveHandler($event, 5)"><span class="hcolro">←H1→</span>
+            @moveHandler="moveHandler($event, 5)"><span class="hcolro">H1</span>
           </vue3ResizeDrag>
           <vue3ResizeDrag  style="border: 0;"  :class="[now_index==6?'action':'']" :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="40" :h="20" :x="point_postion[6].x"
             :y="point_postion[6].y" @mousedown="activeMouseDown(6)" :isResizable="false"
-            @moveHandler="moveHandler($event, 6)"><span class="hcolro">←H2→</span>
+            @moveHandler="moveHandler($event, 6)"><span class="hcolro">H2</span>
           </vue3ResizeDrag>
           <vue3ResizeDrag  style="border: 0;"  :class="[now_index==7?'action':'']" :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="40" :h="20" :x="point_postion[7].x"
             :y="point_postion[7].y" @mousedown="activeMouseDown(7)" :isResizable="false"
-            @moveHandler="moveHandler($event, 7)"><span class="hcolro">←H3→</span>
+            @moveHandler="moveHandler($event, 7)"><span class="hcolro">H3</span>
           </vue3ResizeDrag>
           <vue3ResizeDrag  style="border: 0;"  :class="[now_index==8?'action':'']" :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="40" :h="20" :x="point_postion[8].x"
             :y="point_postion[8].y" @mousedown="activeMouseDown(8)" :isResizable="false"
-            @moveHandler="moveHandler($event, 8)"><span class="hcolro">←H4→</span>
+            @moveHandler="moveHandler($event, 8)"><span class="hcolro">H4</span>
           </vue3ResizeDrag>
           <vue3ResizeDrag  style="border: 0;"  :class="[now_index==9?'action':'']" :isActive="isactivearray[9]" v-if="isshowarray[9]" :w="40" :h="20" :x="point_postion[9].x"
             :y="point_postion[9].y" @mousedown="activeMouseDown(9)" :isResizable="false"
-            @moveHandler="moveHandler($event, 9)"><span class="hcolro">←H5→</span>
+            @moveHandler="moveHandler($event, 9)"><span class="hcolro">H5</span>
           </vue3ResizeDrag>
         </div>
       </div>
@@ -247,6 +247,7 @@ export default defineComponent({
       { x: 0, y: 0 },
       { x: 0, y: 0 },
     ]);
+    // const max
     let options = ref(["10", "20", "30", "40", "50"]);
     let config = JSON.parse($store.state.fusion_configuration).projectors[0];
     let Proportion = ref({ x: 0, y: 0 });
@@ -493,6 +494,14 @@ export default defineComponent({
         }
       }
       use_server_config();
+      if (
+        sessionStorage.DensityCorrection &&
+        sessionStorage.DensityCorrection.length > 0
+      ) {
+        set_cache.value = JSON.parse(sessionStorage.DensityCorrection);
+        use_set_cache();
+      } else {
+      }
       syncpoint();
     });
 
@@ -534,7 +543,7 @@ export default defineComponent({
       setTimeout(() => {
         isshowarray.value[index] = true;
       }, 100);
-      now_index.value=index
+      if(ste_status.value == 0)now_index.value=index
     };
     watch(
       () => value[0],
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 9ebd166..6ed7320 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -115,7 +115,7 @@
           <q-slider  v-model="array[group].p" :min="0" @change="chang('p')" :max="16" :step="0.01" color="green"
             vertical reverse label-always />
           <!-- <div  class="btn_top"><q-btn size="sm"  color="white" @click="reduce('p')" text-color="black" label="↓" /></div> -->
-          <div> <q-input dense filled type="number"  step="0.1" v-model="array[group].p" label="p"
+          <div> <q-input dense filled type="number" @update:model-value="()=>{}"   step="0.1" v-model="array[group].p" label="p"
               lazy-rules :rules="[
                 (val) =>
                   (val !== null && val !== '') ||
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index cb5346a..6e5af40 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -770,7 +770,7 @@ export default defineComponent({
       setTimeout(() => {
         isshowarray.value[index] = true;
       }, 100);
-      now_index.value=index
+      if(ste_status.value == 0)now_index.value=index
     };
     const save = () => {
       set?.SaveBlendingConfig("");