From 584f228c91895918644b71022cf9664c7df8a27b Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 6 Jan 2023 12:14:17 +0800
Subject: [PATCH 01/78] =?UTF-8?q?=E6=9B=B4=E6=94=B9=20=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/FourPointCalibration.vue   |  85 ++++++++-----
 .../FusionSettings/FusionLocale.vue           |  38 +++---
 .../FusionSettings/SurfaceCorrection.vue      | 114 ++++++++++--------
 src/components/FusionSettingsDialog.vue       |  55 +++------
 src/pages/TopToolBar.vue                      |  14 ++-
 src/store/index.ts                            |  16 +--
 6 files changed, 179 insertions(+), 143 deletions(-)

diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 80f355e..1ab3fe4 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -70,6 +70,7 @@ import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
 import ClientConnection from "src/common/ClientConnection"
 import GlobalData from "src/common/GlobalData";
+import { json } from "body-parser";
 
 export default defineComponent({
     name: "ComponentFourPointCalibration",
@@ -82,14 +83,15 @@ export default defineComponent({
         const setIndexProjector = () => {
             console.log($store.state.selected_projector);
         };
+        let config=JSON.parse($store.state.fusion_configuration).projectors[0];
         let set = GlobalData.getInstance().getCurrentClient();
-        const for_1 = computed(() => { })
-        let four = ref([{ x: 0, y: 1080 }, { x: 1920, y: 1080 }, { x: 0, y: 0 }, { x: 1920, y: 0 }]);
+        const configselsect = computed(() => {return $store.state.selected_projector})
+        let four = ref([{ x: config.point4[0].x, y: config.point4[0].y }, { x: config.point4[1].x, y: config.point4[1].y }, { x: config.point4[2].x, y: config.point4[2].x }, { x: config.point4[3].x, y: config.point4[3].y }]);
         let defaultfour = ref([{ x: 0, y: 1080 }, { x: 1920, y: 1080 }, { x: 0, y: 0 }, { x: 1920, y: 0 }]);
         let defaultfourpostion: any = ref([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }]);
         let fourpostion: any = ref([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }]);
         let div: any = ref(null);
-        let div2: any = ref(null);
+        // let div2: any = ref(null);
         let options = ref(['10', '20', '30', '40', '50']);
         let Proportion = ref({ x: 0, y: 0 });
         let point1 = reactive({ x: 0, y: 0 });
@@ -103,7 +105,7 @@ export default defineComponent({
         const { offset } = dom
 
         const save=()=>{
-
+            set?.SaveBlendingConfig("")
         }
 
         const activeMouseDown = (index: number) => {
@@ -118,6 +120,7 @@ export default defineComponent({
         })
 
         const setpoa = () => {
+            console.log(config);
             point1.x = 0
             point1.y = 0
 
@@ -145,22 +148,22 @@ export default defineComponent({
 
             fourpostion.value[3].x = div.value.offsetWidth - 25
             fourpostion.value[3].y = div.value.offsetHeight - 25
-
-            Proportion.value.x = 1920 / (div.value.offsetWidth - 25)
-            Proportion.value.y = 1080 / (div.value.offsetHeight - 25)
+            
+            Proportion.value.x = config.width / (div.value.offsetWidth - 25)
+            Proportion.value.y = config.height / (div.value.offsetHeight - 25)
             for (let index = 0; index < fourpostion.value.length; index++) {
                 defaultfourpostion.value[index].x = fourpostion.value[index].x ;
                 defaultfourpostion.value[index].y = fourpostion.value[index].y;
-                defaultfour.value[index].x=four.value[index].x
-                defaultfour.value[index].y=four.value[index].y
+                defaultfour.value[index].x=config.point4[index].def_x
+                defaultfour.value[index].y=config.point4[index].def_y
             }
         }
         watch(() => four.value[0], (newVal, oldVal) => {
-            if($store.state.EnableBlending)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 1, Number(newVal.x), Number(newVal.y));
+            if($store.state.enablefusion)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 1, Number(newVal.x), Number(newVal.y));
             ///
             if (!isactivearray.value[0]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 x1.value = x
                 y1.value = y
                 isshowarray.value[0] = false
@@ -172,11 +175,11 @@ export default defineComponent({
             }
         }, { deep: true })
         watch(() => four.value[1], (newVal, oldVal) => {
-            if($store.state.EnableBlending)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 2, Number(newVal.x), Number(newVal.y));
+            if($store.state.enablefusion)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 2, Number(newVal.x), Number(newVal.y));
             ///
             if (!isactivearray.value[1]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 point2.value.x = x
                 point2.value.y = y
                 isshowarray.value[1] = false
@@ -188,11 +191,11 @@ export default defineComponent({
             ///
         }, { deep: true })
         watch(() => four.value[2], (newVal, oldVal) => {
-            if($store.state.EnableBlending)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 3, Number(newVal.x), Number(newVal.y));
+            if($store.state.enablefusion)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 3, Number(newVal.x), Number(newVal.y));
             ///
             if (!isactivearray.value[2]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil((1080 / Proportion.value.y) - (newVal.y / Proportion.value.y));
+                let y = Math.ceil((config.height / Proportion.value.y) - (newVal.y / Proportion.value.y));
                 
                 point3.value.x = x
                 point3.value.y = y
@@ -204,11 +207,11 @@ export default defineComponent({
             ///
         }, { deep: true })
         watch(() => four.value[3], (newVal, oldVal) => {
-            if($store.state.EnableBlending)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 4, Number(newVal.x), Number(newVal.y));
+            if($store.state.enablefusion)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 4, Number(newVal.x), Number(newVal.y));
             ///
             if (!isactivearray.value[3]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil((1080 / Proportion.value.y) - (newVal.y / Proportion.value.y));
+                let y = Math.ceil((config.height / Proportion.value.y) - (newVal.y / Proportion.value.y));
                 
                 point4.value.x = x
                 point4.value.y = y
@@ -221,9 +224,23 @@ export default defineComponent({
         }, { deep: true })
 
         ///
+
+        watch(() => configselsect, (newVal, oldVal) => {
+            //console.log(newVal);
+            let tmp=JSON.parse($store.state.fusion_configuration);
+            let fortmp=null
+            let i
+            for(i of tmp.projectors){
+                if(i.col===$store.getters.GetTheCurrentlySelectedCamera[0]&&i.row===$store.getters.GetTheCurrentlySelectedCamera[1]){
+                    fortmp=JSON.parse(JSON.stringify(i)) 
+                }
+            }
+            config=JSON.parse(JSON.stringify(fortmp)) 
+            console.log(config)
+        }, { deep: true })
+
         const reset = (index: number) => {
             if (index == 0) {
-                console.log(x1.value + "," + y1.value)
                 four.value[0].x = 0
                 four.value[0].y = 1080
                 point1.x = 0
@@ -249,6 +266,10 @@ export default defineComponent({
                 fourpostion.value[3].x = div.value.offsetWidth - 25
                 fourpostion.value[3].y = div.value.offsetHeight - 25
             }
+            // auto set config
+            four.value[index].x = config.point4[index].def_x
+            four.value[index].y = config.point4[index].def_y
+
             isshowarray.value[index] = false
             setTimeout(() => {
                 isshowarray.value[index] = true
@@ -260,7 +281,6 @@ export default defineComponent({
             for (let index = 0; index < fourpostion.value.length; index++) {
                 fourpostion.value[index].x=defaultfourpostion.value[index].x 
                 fourpostion.value[index].y=defaultfourpostion.value[index].y 
-                console.log("ok");
                 four.value[index].x=defaultfour.value[index].x
                 four.value[index].y=defaultfour.value[index].y
 
@@ -273,38 +293,37 @@ export default defineComponent({
 
         const moveHandler_1 = (data: any) => {
             let x = Math.ceil((data.left - fourpostion.value[0].x) * Proportion.value.x + 0);
-            let y = Math.ceil((1080 - data.top * Proportion.value.y - fourpostion.value[0].y));
+            let y = Math.ceil((config.height - data.top * Proportion.value.y - fourpostion.value[0].y));
 
-            four.value[0].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
-            four.value[0].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y;
+            four.value[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            four.value[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
             isactivearray.value[0] = true
         }
         const moveHandler_2 = (data: any) => {
-            //y0 x1920
-            let x = Math.ceil((data.left - fourpostion.value[1].x) * Proportion.value.x + 1920);
-            let y = Math.ceil((1080 - data.top * Proportion.value.y - fourpostion.value[1].y));
-            four.value[1].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
-            four.value[1].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y;
+            //y0 xconfig.width
+            let x = Math.ceil((data.left - fourpostion.value[1].x) * Proportion.value.x + config.width);
+            let y = Math.ceil((config.height - data.top * Proportion.value.y - fourpostion.value[1].y));
+            four.value[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            four.value[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
             //console.log("x :"+x+" y:"+y)
         }
         const moveHandler_3 = (data: any) => {
             let x = Math.ceil((data.left - fourpostion.value[2].x) * Proportion.value.x);
             let y = Math.abs(Math.ceil((data.top - fourpostion.value[2].y) * Proportion.value.y));
-            four.value[2].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
-            four.value[2].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y;
+            four.value[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            four.value[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
             console.log("x :" + x + " y:" + y)
             //console.log("x :" + data.left + " y:" + (1370-data.top));
         }
         const moveHandler_4 = (data: any) => {
-            let x = Math.ceil((data.left - fourpostion.value[3].x) * Proportion.value.x + 1920);
+            let x = Math.ceil((data.left - fourpostion.value[3].x) * Proportion.value.x + config.width);
             let y = Math.abs(Math.ceil((data.top - fourpostion.value[3].y) * Proportion.value.y));
-            four.value[3].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
-            four.value[3].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y;
+            four.value[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            four.value[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
             //console.log("x :"+x+" y:"+y)
         }
         return {
             div,
-            div2,
             options,
             fourpostion,
             reset,
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 3ff5a22..b3d0e37 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -208,7 +208,7 @@ export default defineComponent({
     const age = ref(0);
     const standard = ref(0);
     const group = ref(4);
-    const EnableBlending=ref(false);
+    const enablefusion=ref(false);
     let array: any = ref([
       { alpha: 0, p: 0, gamma: 0 },
       { alpha: 0, p: 0, gamma: 0 },
@@ -260,7 +260,7 @@ export default defineComponent({
     });
     const chang = (type: string) => {
       if (type == "alpha") {
-        if($store.state.EnableBlending)set?.setBlendingAlphaParam(
+        if($store.state.enablefusion)set?.setBlendingAlphaParam(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
           group.value,
@@ -268,15 +268,15 @@ export default defineComponent({
         );
       }
       if (type == "p") {
-        if($store.state.EnableBlending)set?.setBlendingPowerParam(
+        if($store.state.enablefusion)set?.setBlendingPowerParam(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
           group.value,
           array.value[group.value].p
         );
       }
-      if($store.state.EnableBlending)if (type == "gamma") {
-        set?.setBlendingGammaParam(
+      if (type == "gamma") {
+        if($store.state.enablefusion)set?.setBlendingGammaParam(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
           group.value,
@@ -289,7 +289,7 @@ export default defineComponent({
     watch(
       () => array2[0][0],
       (newVal, oldVal) => {
-        if($store.state.EnableBlending)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],1,array2[0][0].isshow,Number(array2[0][0].value));
+        if($store.state.enablefusion)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],1,array2[0][0].isshow,Number(array2[0][0].value));
         if(!array2[0][0].isshow){
           array2[0][0].value=0
         }
@@ -299,7 +299,7 @@ export default defineComponent({
     watch(
       () => array2[0][1],
       (newVal, oldVal) => {
-        if($store.state.EnableBlending)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],0,array2[0][1].isshow,Number(array2[0][1].value));
+        if($store.state.enablefusion)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],0,array2[0][1].isshow,Number(array2[0][1].value));
         if(!array2[0][1].isshow){
           array2[0][1].value=0
         }
@@ -309,7 +309,7 @@ export default defineComponent({
     watch(
       () => array2[0][2],
       (newVal, oldVal) => {
-        if($store.state.EnableBlending)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],2,array2[0][2].isshow,Number(array2[0][2].value));
+        if($store.state.enablefusion)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],2,array2[0][2].isshow,Number(array2[0][2].value));
         if(!array2[0][2].isshow){
           array2[0][2].value=0
         }
@@ -319,7 +319,7 @@ export default defineComponent({
     watch(
       () => array2[0][3],
       (newVal, oldVal) => {
-        if($store.state.EnableBlending)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],3,array2[0][3].isshow,Number(array2[0][3].value));
+        if($store.state.enablefusion)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],3,array2[0][3].isshow,Number(array2[0][3].value));
         if(!array2[0][3].isshow){
           array2[0][3].value=0
         }
@@ -332,7 +332,7 @@ export default defineComponent({
 watch(
       () => array2[1][0],
       (newVal, oldVal) => {
-        if($store.state.EnableBlending) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],1,array2[1][0].isshow,Number(array2[1][0].value));
+        if($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],1,array2[1][0].isshow,Number(array2[1][0].value));
         if(!array2[1][0].isshow){
           array2[1][0].value=0
         }
@@ -342,7 +342,7 @@ watch(
     watch(
       () => array2[1][1],
       (newVal, oldVal) => {
-        if($store.state.EnableBlending) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],0,array2[1][1].isshow,Number(array2[1][2].value));
+        if($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],0,array2[1][1].isshow,Number(array2[1][1].value));
         if(!array2[1][1].isshow){
           array2[1][1].value=0
         }
@@ -352,7 +352,7 @@ watch(
     watch(
       () => array2[1][2],
       (newVal, oldVal) => {
-        if($store.state.EnableBlending) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],2,array2[1][2].isshow,Number(array2[1][2].value));
+        if($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],2,array2[1][2].isshow,Number(array2[1][2].value));
         if(!array2[1][2].isshow){
           array2[1][2].value=0
         }
@@ -362,7 +362,7 @@ watch(
     watch(
       () => array2[1][3],
       (newVal, oldVal) => {
-        if($store.state.EnableBlending) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],3,array2[1][3].isshow,Number(array2[1][3].value));
+        if($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],3,array2[1][3].isshow,Number(array2[1][3].value));
         if(!array2[1][3].isshow){
           array2[1][3].value=0
         }
@@ -372,14 +372,14 @@ watch(
 ///
 
     watch(
-      () => EnableBlending,
+      () => enablefusion,
       (newVal, oldVal) => {
-        $store.commit('setEnableBlending',newVal.value);
+        $store.commit('setenablefusion',newVal.value);
         set?.EnableBlending(newVal.value);
       },{ deep: true }
     );
-    const changEnableBlending=()=>{
-      $store.commit('setEnableBlending',EnableBlending.value);
+    const changenablefusion=()=>{
+      $store.commit('setenablefusion',enablefusion.value);
     }
     return {
       model,
@@ -391,9 +391,9 @@ watch(
       text,
       array,
       chang,
-      EnableBlending,
+      enablefusion,
       array2,
-      changEnableBlending,
+      changenablefusion,
       selectedprojector
     };
   },
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index a7b86a1..c433680 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -162,6 +162,8 @@ export default defineComponent({
         const setIndexProjector = () => {
             console.log($store.state.selected_projector);
         };
+        let config=JSON.parse($store.state.fusion_configuration).projectors[0];
+        const configselsect = computed(() => {return $store.state.selected_projector})
         let Proportion = ref({ x: 0, y: 0 });
         let centor = ref({ x: 0, y: 0 });
         const div = ref();
@@ -177,67 +179,80 @@ export default defineComponent({
         let defaultninepostion: any = ref([{ x: 0, y: 1920 }, { x: 960, y: 1920 }, { x: 1080, y: 1920 }, { x: 0, y: 540 }, { x: 960, y: 540 }, { x: 1080, y: 540 }, { x: 0, y: 0 }, { x: 540, y: 0 }, { x: 1080, y: 0 }]);
         const moveHandler_1 = (data: any) => {
             let x = Math.ceil((data.left - ninepostion.value[0].x) * Proportion.value.x);
-            let y = 1080 - Math.ceil((data.top - ninepostion.value[0].y) * Proportion.value.y);
+            let y = config.height - Math.ceil((data.top - ninepostion.value[0].y) * Proportion.value.y);
 
-            nine.value[0].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
-            nine.value[0].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+            nine.value[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine.value[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y
         }
         const moveHandler_2 = (data: any) => {
             let x = 960 + Math.ceil((data.left - ninepostion.value[1].x) * centor.value.x);
-            let y = 1080 - Math.ceil((data.top - ninepostion.value[1].y) * Proportion.value.y);
+            let y = config.height - Math.ceil((data.top - ninepostion.value[1].y) * Proportion.value.y);
 
-            nine.value[1].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
-            nine.value[1].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+            nine.value[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine.value[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y
         }
         const moveHandler_3 = (data: any) => {
-            let x = 1920 + Math.ceil((data.left - ninepostion.value[2].x) * Proportion.value.x);
-            let y = 1080 - Math.ceil((data.top - ninepostion.value[2].y) * Proportion.value.y);
+            let x = config.width + Math.ceil((data.left - ninepostion.value[2].x) * Proportion.value.x);
+            let y = config.height - Math.ceil((data.top - ninepostion.value[2].y) * Proportion.value.y);
 
-            nine.value[2].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
-            nine.value[2].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+            nine.value[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine.value[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y
         }
         const moveHandler_4 = (data: any) => {
             let x = Math.ceil((data.left - ninepostion.value[3].x) * Proportion.value.x);
             let y = 530 - Math.ceil((data.top - ninepostion.value[3].y) * Proportion.value.y);
 
-            nine.value[3].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
-            nine.value[3].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+            nine.value[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine.value[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y
         }
         const moveHandler_5 = (data: any) => {
             let x = 960 + Math.ceil((data.left - ninepostion.value[4].x) * centor.value.x);
             let y = 530 - Math.ceil((data.top - ninepostion.value[4].y) * Proportion.value.y);
 
-            nine.value[4].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
-            nine.value[4].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+            nine.value[4].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine.value[4].y = y > config.height ? config.height : y && y < 0 ? 0 : y
         }
         const moveHandler_6 = (data: any) => {
-            let x = 1920 + Math.ceil((data.left - ninepostion.value[5].x) * Proportion.value.x);
+            let x = config.width + Math.ceil((data.left - ninepostion.value[5].x) * Proportion.value.x);
             let y = 530 - Math.ceil((data.top - ninepostion.value[5].y) * Proportion.value.y);
 
-            nine.value[5].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
-            nine.value[5].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+            nine.value[5].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine.value[5].y = y > config.height ? config.height : y && y < 0 ? 0 : y
         }
         const moveHandler_7 = (data: any) => {
             let x = Math.ceil((data.left - ninepostion.value[6].x) * Proportion.value.x);
             let y = Math.abs(Math.ceil((data.top - ninepostion.value[6].y) * Proportion.value.y));
 
-            nine.value[6].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
-            nine.value[6].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+            nine.value[6].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine.value[6].y = y > config.height ? config.height : y && y < 0 ? 0 : y
         }
         const moveHandler_8 = (data: any) => {
             let x = 960 + Math.ceil((data.left - ninepostion.value[7].x) * Proportion.value.x);
             let y = Math.abs(Math.ceil((data.top - ninepostion.value[7].y) * Proportion.value.y));;
 
-            nine.value[7].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
-            nine.value[7].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+            nine.value[7].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine.value[7].y = y > config.height ? config.height : y && y < 0 ? 0 : y
         }
         const moveHandler_9 = (data: any) => {
-            let x = 1920 + Math.ceil((data.left - ninepostion.value[8].x) * Proportion.value.x);
+            let x = config.width + Math.ceil((data.left - ninepostion.value[8].x) * Proportion.value.x);
             let y = Math.abs(Math.ceil((data.top - ninepostion.value[8].y) * Proportion.value.y));
 
-            nine.value[8].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
-            nine.value[8].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+            nine.value[8].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine.value[8].y = y > config.height ? config.height : y && y < 0 ? 0 : y
         }
+        watch(() => configselsect, (newVal, oldVal) => {
+            //console.log(newVal);
+            let tmp=JSON.parse($store.state.fusion_configuration);
+            let fortmp=null
+            let i
+            for(i of tmp.projectors){
+                if(i.col===$store.getters.GetTheCurrentlySelectedCamera[1]&&i.row===$store.getters.GetTheCurrentlySelectedCamera[0]){
+                    fortmp=JSON.parse(JSON.stringify(i)) 
+                }
+            }
+            config=JSON.parse(JSON.stringify(fortmp)) 
+            console.log(config)
+        }, { deep: true })
         onMounted(() => {
             startpostion();
 
@@ -270,11 +285,11 @@ export default defineComponent({
             ninepostion.value[8].x = div.value.offsetWidth - 25
             ninepostion.value[8].y = div.value.offsetHeight - 25
 
-            Proportion.value.x = 1920 / (div.value.offsetWidth - 25)
-            Proportion.value.y = 1080 / (div.value.offsetHeight - 25)
+            Proportion.value.x = config.width / (div.value.offsetWidth - 25)
+            Proportion.value.y = config.height / (div.value.offsetHeight - 25)
 
-            centor.value.x = 2160 / (div.value.offsetWidth + 25)
-            centor.value.y = 3840 / (div.value.offsetHeight + 25)
+            centor.value.x = config.width *2 / (div.value.offsetWidth + 25)
+            centor.value.y = config.height*2 / (div.value.offsetHeight + 25)
 
             for (let index = 0; index < defaultninepostion.value.length; index++) {
                 defaultninepostion.value[index].x = ninepostion.value[index].x;
@@ -344,6 +359,9 @@ export default defineComponent({
                 ninepostion.value[8].x = div.value.offsetWidth - 25
                 ninepostion.value[8].y = div.value.offsetHeight - 25
             }
+            //data is flase
+            // nine.value[index].x = config.point9[index].def_x
+            // nine.value[index].y = config.point9[index].def_y
             isshowarray.value[index] = false
             setTimeout(() => {
                 isshowarray.value[index] = true
@@ -366,78 +384,78 @@ export default defineComponent({
         }
         ///
         watch(() => nine.value[0], (newVal, oldVal) => {
-            if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 1, Number(newVal.x), Number(newVal.y));
+            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 1, Number(newVal.x), Number(newVal.y));
             ///
             if (!isactivearray.value[0]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(0, x, y)
             }
             ///
         }, { deep: true })
         watch(() => nine.value[1], (newVal, oldVal) => {
-            if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 2, Number(newVal.x), Number(newVal.y));
+            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 2, Number(newVal.x), Number(newVal.y));
             ///
             if (!isactivearray.value[1]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(1, x, y)
             }
             ///
         }, { deep: true })
         watch(() => nine.value[2], (newVal, oldVal) => {
-            if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 3, Number(newVal.x), Number(newVal.y));
+            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 3, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[2]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(2, x, y)
             }
         }, { deep: true })
         watch(() => nine.value[3], (newVal, oldVal) => {
-            if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 4, Number(newVal.x), Number(newVal.y));
+            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 4, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[3]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(3, x, y)
             }
         }, { deep: true })
         watch(() => nine.value[4], (newVal, oldVal) => {
-            if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 5, Number(newVal.x), Number(newVal.y));
+            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 5, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[4]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(4, x, y)
             }
         }, { deep: true })
         watch(() => nine.value[5], (newVal, oldVal) => {
-            if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 6, Number(newVal.x), Number(newVal.y));
+            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 6, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[5]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(5, x, y)
             }
         }, { deep: true })
         watch(() => nine.value[6], (newVal, oldVal) => {
-            if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 7, Number(newVal.x), Number(newVal.y));
+            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 7, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[6]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(6, x, y)
             }
         }, { deep: true })
         watch(() => nine.value[7], (newVal, oldVal) => {
-            if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 8, Number(newVal.x), Number(newVal.y));
+            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 8, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[7]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(7, x, y)
             }
         }, { deep: true })
         watch(() => nine.value[8], (newVal, oldVal) => {
-            if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 9, Number(newVal.x), Number(newVal.y));
+            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 9, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[8]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(8, x, y)
             }
         }, { deep: true })
@@ -457,8 +475,8 @@ export default defineComponent({
 
 
         }
-        const save = () => {
-
+        const save=()=>{
+            set?.SaveBlendingConfig("")
         }
         return {
             model,
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 4d71de5..b693e5d 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -1,15 +1,11 @@
 <template>
-  <q-dialog
-    persistent
-    v-model="show_dialog"
-    @keydown="
-      (evt:any) => {
-        if (evt.keyCode == 27) {
-          show_dialog = false;
-        }
+  <q-dialog persistent v-model="show_dialog" @keydown="
+    (evt: any) => {
+      if (evt.keyCode == 27) {
+        show_dialog = false;
       }
-    "
-  >
+    }
+  ">
     <q-card class="overflow-hidden" style="max-width: 90vw; height: 90vh">
       <q-form>
         <!-- @submit="onSubmit" -->
@@ -35,27 +31,15 @@
           <div class="row" style="border: 1px solid;text-align: center;">
             <div class="col-3" style="border-right: 1px solid;">
               <p class="text-center">{{ $t("Projector") }}</p>
-              <projector-item
-                class="w-100"
-                :llabel="$t('Projector') + '1'"
-                :lvalue="'0/0'"
-              ></projector-item>
-              <projector-item
-                class="w-100"
-                :llabel="$t('Projector') + '2'"
-                :lvalue="'0/1'"
-              ></projector-item>
+              <projector-item class="w-100" :llabel="$t('Projector') + '1'" :lvalue="'0/0'"></projector-item>
+              <projector-item class="w-100" :llabel="$t('Projector') + '2'" :lvalue="'1/0'"></projector-item>
               <div class="col-12" style="text-align: center">
-                {{$t('Whether to enable mixing')}}<q-checkbox v-model="EnableBlending" />
+                {{ $t('Whether to enable mixing') }}<q-checkbox v-model="EnableBlending" />
               </div>
             </div>
             <div class="col-9">
               <div class="q-ta-md">
-                <q-btn-toggle
-                  :disable="!$store.state.EnableBlending"
-                  no-caps
-                  v-model="options"
-                  toggle-color="primary"
+                <q-btn-toggle :disable="!$store.state.EnableBlending" no-caps v-model="options" toggle-color="primary"
                   :options="[
                     { label: $t('FusionLocale'), value: 'FusionLocale' },
                     {
@@ -71,8 +55,7 @@
                       value: 'DensityCorrection',
                     },
                     { label: $t('GridSettings'), value: 'GridSettings' },
-                  ]"
-                />
+                  ]" />
               </div>
               <div style="min-height: 72vh">
                 <component :is="options" />
@@ -84,13 +67,7 @@
         <q-separator />
 
         <q-card-actions align="right">
-          <q-btn
-            flat
-            :label="$t('Cancel')"
-            no-caps
-            color="primary"
-            v-close-popup
-          />
+          <q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup />
         </q-card-actions>
       </q-form>
     </q-card>
@@ -115,6 +92,8 @@ import {
   watch,
   computed,
   onMounted,
+  onBeforeMount,
+  onUpdated,
   onBeforeUnmount,
   nextTick,
 } from "vue";
@@ -174,6 +153,12 @@ export default defineComponent({
       { deep: true }
     );
     let data = ref({});
+
+    onBeforeMount(() => {
+      setTimeout(() => {
+        set?.GetBlendingConfig("").then((res)=>{let tmp=JSON.parse(res?res.config:"");EnableBlending.value=tmp.enable;$store.commit("setEnableBlending", tmp.enable);;$store.commit("setfusion_configuration", res?.config);})
+      }, 1000);
+      })
     return {
       show_dialog,
       options,
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index 647036b..39d11bc 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -409,7 +409,19 @@
             </q-item-section>
           </q-item>
 
-
+          <q-item
+            clickable
+            v-close-popup
+            @click="$refs.fusion_settings_dialog.showDialog()"
+          >
+            <q-item-section avatar>
+              <!-- <q-icon name="devices" /> -->
+              <q-icon name="open_with" />
+            </q-item-section>
+            <q-item-section>
+              {{ $t("fusion settings") }}
+            </q-item-section>
+          </q-item>
 
           <q-item
             clickable
diff --git a/src/store/index.ts b/src/store/index.ts
index 75380de..39e5b1f 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -77,12 +77,11 @@ export interface StateInterface {
   power_state: boolean;
   product_name: string;
   custom_defines: CustomDefines;
-  fusion_configuration:object;
+  fusion_configuration:string;
   isLedPlayer: () => boolean;
   isSpecialVideo: () => boolean;
-  //
   selected_projector: string;
-  EnableBlending:boolean
+  enablefusion:boolean
 }
 
 // provide typings for `this.$store`
@@ -340,12 +339,12 @@ export default store(function (/* { ssrContext } */) {
       landspace: window.innerWidth > window.innerHeight,
       device_attribute: 0,
       power_state: false,
-      fusion_configuration:{},
+      fusion_configuration:"",
       product_name: EProductNames.LED_PLAYER,
 
       custom_defines: new CustomDefines(),
       selected_projector: "0/0",
-      EnableBlending:false,
+      enablefusion:false,
       isLedPlayer: () => {
         return (
           Store.state.product_name == EProductNames.LED_PLAYER ||
@@ -607,8 +606,8 @@ export default store(function (/* { ssrContext } */) {
       setSelectedProjector(state: StateInterface, playload?: any){
         state.selected_projector = playload;
       },
-      setEnableBlending(state: StateInterface, playload?: any){
-        state.EnableBlending = playload;
+      setEnablefusion(state: StateInterface, playload?: any){
+        state.enablefusion = playload;
       },
       clearSignalSourceTree(state: StateInterface, playload?: any) {
         state.signal_source_tree = [];
@@ -999,6 +998,9 @@ export default store(function (/* { ssrContext } */) {
           state.connect_list.slice(index, 1);
         }
       },
+      setfusion_configuration(state: StateInterface, playload?: any){
+        state.fusion_configuration=playload
+      }
     },
     getters:{
       GetTheCurrentlySelectedCamera(state){

From a6a4a0860d659de4c7e91db8ff773c5023ddff78 Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Mon, 9 Jan 2023 16:51:15 +0800
Subject: [PATCH 02/78] =?UTF-8?q?=E7=96=8F=E5=AF=86=E8=B0=83=E8=8A=82?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/ClientConnection.ts | 32 +++++++++++++++++++
 src/entities/WSProtocol.ts     | 58 +++++++++++++++++++++++++++++++++-
 2 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index 3d05b64..94113e0 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -1437,6 +1437,38 @@ export default class ClientConnection {
     );
   }
 
+  public async SetBlendingHorDensity(
+    row: number,
+    column: number,
+    control_point: number,
+    value: number
+  ) {
+    return await this.doRpc<Protocol.NoneResponse>(
+      new Protocol.SetBlendingHoDensityRequestEntity(
+        row,
+        column,
+        control_point,
+        value
+      )
+    );
+  }
+
+  public async SetBlendingVerDensity(
+    row: number,
+    column: number,
+    control_point: number,
+    value: number
+  ) {
+    return await this.doRpc<Protocol.NoneResponse>(
+      new Protocol.SetBlendingVerDensityRequestEntity(
+        row,
+        column,
+        control_point,
+        value
+      )
+    );
+  }
+
   public destory() {
     this.ws?.close();
     if (this.ws) {
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index a6e3fd4..31d02e8 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -514,6 +514,12 @@ export namespace Protocol {
     public static get kSaveBlendingConfig() {
       return Commands.PROTOCOL_PREFIX + "SaveBlendingConfig";
     }
+    public static get kSetBlendingHorDensity() {
+      return Commands.PROTOCOL_PREFIX + "SetBlendingHorDensity";
+    }
+    public static get kSetBlendingVerDensity() {
+      return Commands.PROTOCOL_PREFIX + "SetBlendingVerDensity";
+    }
 
     static _all_commands = new Set([
       Commands.kUnKnowCommand,
@@ -642,7 +648,9 @@ export namespace Protocol {
       Commands.kEnableBlending,
       Commands.kSetBlendingOverlap,
       Commands.kGetBlendingConfig,
-      Commands.kSaveBlendingConfig,
+      Commands.kSaveBlendingConfig,
+      Commands.SetBlendingHorDensity,
+      Commands.SetBlendingVerDensity,
     ]);
     public static get AllCommands() {
       return this._all_commands;
@@ -3391,4 +3399,52 @@ export namespace Protocol {
     }
     name = "";
   }
+
+  export class SetBlendingHorDensityRequestEntity extends PacketEntity {
+    constructor(
+      row: number,
+      column: number,
+      control_point: number,
+      value: number,
+      rpc_id = 0
+    ) {
+      super();
+      super.command = Commands.kSetBlendingHorDensity;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      super.rpc_id = rpc_id;
+
+      this.row = row ?? 0;
+      this.column = column ?? 0;
+      this.control_point = control_point ?? 0;
+      this.value = value ?? 0;
+    }
+    row = 0;
+    column = 0;
+    control_point = 0; //控制点编号，1开始，从上到下从左到右
+    value = 0;
+  }
+
+  export class SetBlendingVerDensityRequestEntity extends PacketEntity {
+    constructor(
+      row: number,
+      column: number,
+      control_point: number,
+      value: number,
+      rpc_id = 0
+    ) {
+      super();
+      super.command = Commands.kSetBlendingVerDensity;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      super.rpc_id = rpc_id;
+
+      this.row = row ?? 0;
+      this.column = column ?? 0;
+      this.control_point = control_point ?? 0;
+      this.value = value ?? 0;
+    }
+    row = 0;
+    column = 0;
+    control_point = 0; //控制点编号，1开始，从上到下从左到右
+    value = 0;
+  }
 }

From 6defd6ffad96c0469c66d048d527cb44b4033efc Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Wed, 11 Jan 2023 10:44:15 +0800
Subject: [PATCH 03/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/entities/WSProtocol.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index 31d02e8..6fe811f 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -648,9 +648,9 @@ export namespace Protocol {
       Commands.kEnableBlending,
       Commands.kSetBlendingOverlap,
       Commands.kGetBlendingConfig,
-      Commands.kSaveBlendingConfig,
-      Commands.SetBlendingHorDensity,
-      Commands.SetBlendingVerDensity,
+      Commands.kSaveBlendingConfig,
+      Commands.kSetBlendingHorDensity,
+      Commands.kSetBlendingVerDensity,
     ]);
     public static get AllCommands() {
       return this._all_commands;

From 4ec209def67f346a0a14135f91308ed1134495f5 Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Wed, 11 Jan 2023 10:53:05 +0800
Subject: [PATCH 04/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=90=8D?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/ClientConnection.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index 94113e0..726403f 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -1444,7 +1444,7 @@ export default class ClientConnection {
     value: number
   ) {
     return await this.doRpc<Protocol.NoneResponse>(
-      new Protocol.SetBlendingHoDensityRequestEntity(
+      new Protocol.SetBlendingHorDensityRequestEntity(
         row,
         column,
         control_point,

From 9545a4c45d4c7e7e27de00c426bf97f7a75c4464 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 12 Jan 2023 11:37:40 +0800
Subject: [PATCH 05/78] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=20=E5=8F=8A=E4=B8=80=E4=BA=9B=E5=B0=8F?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 501 +++++++++++++++---
 .../FusionSettings/FourPointCalibration.vue   | 305 ++++++-----
 .../FusionSettings/FusionLocale.vue           | 366 +++++--------
 .../FusionSettings/SurfaceCorrection.vue      | 352 ++++++------
 src/components/FusionSettingsDialog.vue       |  53 +-
 src/i18n/en-US/index.ts                       |   2 +-
 src/i18n/zh-CN/index.ts                       |   2 +-
 src/pages/TopToolBar.vue                      |  13 +-
 8 files changed, 964 insertions(+), 630 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 8651eed..2c73544 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -1,71 +1,138 @@
 <template>
     <div class="row">
-        <div class="col-2 q-pa-lg"></div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg">
-            <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[0]" label="" lazy-rules />
-        </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg">
-            <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[1]" label="" lazy-rules />
-        </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg">
-            <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[2]" label="" lazy-rules />
-        </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg">
-            <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[3]" label="" lazy-rules />
-        </div>
+        <div class="col-1"></div>
+        <div class="col-8 q-pt-md">
+            <div ref="div" style="width:100%;background-color: aquamarine;height: 100%;">
 
-        
+                <div style="position:absolute;">
+                    <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="20"
+                        :x="point_postion[0].x" :y="point_postion[0].y" @mousedown="isactivearray[0] = true"
+                        :isResizable="false" @moveHandler="moveHandler($event, 0)"><span>{{ $t('point') }}1</span>
+                    </vue3ResizeDrag>
+                    <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="20"
+                        :x="point_postion[1].x" :y="point_postion[1].y" @mousedown="isactivearray[1] = true"
+                        :isResizable="false" @moveHandler="moveHandler($event, 1)"><span>{{ $t('point') }}2</span>
+                    </vue3ResizeDrag>
+                    <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="20"
+                        :x="point_postion[2].x" :y="point_postion[2].y" @mousedown="isactivearray[2] = true"
+                        :isResizable="false" @moveHandler="moveHandler($event, 2)"><span>{{ $t('point') }}3</span>
+                    </vue3ResizeDrag>
+                    <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="20"
+                        :x="point_postion[3].x" :y="point_postion[3].y" @mousedown="isactivearray[3] = true"
+                        :isResizable="false" @moveHandler="moveHandler($event, 3)"><span>{{ $t('point') }}4</span>
+                    </vue3ResizeDrag>
+                    <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="20"
+                        :x="point_postion[4].x" :y="point_postion[4].y" @mousedown="isactivearray[4] = true"
+                        :isResizable="false" @moveHandler="moveHandler($event, 4)"><span>{{ $t('point') }}5</span>
+                    </vue3ResizeDrag>
+                    <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="30" :h="20"
+                        :x="point_postion[5].x" :y="point_postion[5].y" @mousedown="isactivearray[5] = true"
+                        :isResizable="false" @moveHandler="moveHandler($event, 5)"><span>{{ $t('point') }}6</span>
+                    </vue3ResizeDrag>
+                    <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="30" :h="20"
+                        :x="point_postion[6].x" :y="point_postion[6].y" @mousedown="isactivearray[6] = true"
+                        :isResizable="false" @moveHandler="moveHandler($event, 6)"><span>{{ $t('point') }}7</span>
+                    </vue3ResizeDrag>
+                    <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="30" :h="20"
+                        :x="point_postion[7].x" :y="point_postion[7].y" @mousedown="isactivearray[7] = true"
+                        :isResizable="false" @moveHandler="moveHandler($event, 7)"><span>{{ $t('point') }}8</span>
+                    </vue3ResizeDrag>
+                    <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="30" :h="20"
+                        :x="point_postion[8].x" :y="point_postion[8].y" @mousedown="isactivearray[8] = true"
+                        :isResizable="false" @moveHandler="moveHandler($event, 8)"><span>{{ $t('point') }}9</span>
+                    </vue3ResizeDrag>
+                    <vue3ResizeDrag :isActive="isactivearray[9]" v-if="isshowarray[9]" :w="35" :h="20"
+                        :x="point_postion[9].x" :y="point_postion[9].y" @mousedown="isactivearray[9] = true"
+                        :isResizable="false" @moveHandler="moveHandler($event, 9)"><span>{{ $t('point') }}10</span>
+                    </vue3ResizeDrag>
+                </div>
 
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg"> </div>
-        <div class="col-2 q-pa-lg">
-            <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[3]" label="" lazy-rules />
+            </div>
         </div>
+        <div class="col-3 q-pt-md">
+            <div class="row">
+                <div class="col-12">
+                    <div class="row">
+                        <div class="col-2"></div>
+                        <div class="col-8"><q-input @focus="isactivearray[0] = false" filled type="number"
+                                class="q-pt-md" :dense="true" v-model="value[0].y" label="y" lazy-rules />
+                            <q-btn color="white" @click="reset(0)" text-color="black" :label="$t('reset')" />
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12">
+                    <div class="row">
+                        <div class="col-2"></div>
+                        <div class="col-8"><q-input @focus="isactivearray[1] = false" filled type="number"
+                                class="q-pt-md" :dense="true" v-model="value[1].y" label="y" lazy-rules />
+                            <q-btn color="white" @click="reset(1)" text-color="black" :label="$t('reset')" />
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12">
+                    <div class="row">
+                        <div class="col-2"></div>
+                        <div class="col-8"><q-input @focus="isactivearray[2] = false" filled type="number"
+                                class="q-pt-md" :dense="true" v-model="value[2].y" label="y" lazy-rules />
+                            <q-btn color="white" @click="reset(2)" text-color="black" :label="$t('reset')" />
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12">
+                    <div class="row">
+                        <div class="col-2"></div>
+                        <div class="col-8"><q-input @focus="isactivearray[3] = false" filled type="number"
+                                class="q-pt-md" :dense="true" v-model="value[3].y" label="y" lazy-rules />
+                            <q-btn color="white" @click="reset(3)" text-color="black" :label="$t('reset')" />
+                        </div>
+                    </div>
+                </div>
+                <div class="col-12">
+                    <div class="row">
+                        <div class="col-2"></div>
+                        <div class="col-8"><q-input @focus="isactivearray[4] = false" filled type="number"
+                                class="q-pt-md" :dense="true" v-model="value[4].y" label="y" lazy-rules />
+                            <q-btn color="white" @click="reset(4)" text-color="black" :label="$t('reset')" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-1"></div>
+        <div class="col-11">
+            <div class="row">
+                <div class="col-1"><q-input filled @focus="isactivearray[5] = false" type="number" class="q-pt-md"
+                        :dense="true" v-model="value[5].x" label="x" lazy-rules />
+                    <q-btn color="white" @click="reset(5)" text-color="black" :label="$t('reset')" />
+                </div>
+                <div class="col-1"></div>
+                <div class="col-1"><q-input filled @focus="isactivearray[6] = false" type="number" class="q-pt-md"
+                        :dense="true" v-model="value[6].x" label="x" lazy-rules />
+                    <q-btn color="white" @click="reset(6)" text-color="black" :label="$t('reset')" />
+                </div>
+                <div class="col-1"></div>
+                <div class="col-1"><q-input filled @focus="isactivearray[7] = false" type="number" class="q-pt-md"
+                        :dense="true" v-model="value[7].x" label="x" lazy-rules />
+                    <q-btn color="white" @click="reset(7)" text-color="black" :label="$t('reset')" />
+                </div>
+                <div class="col-1"></div>
+                <div class="col-1"><q-input filled @focus="isactivearray[8] = false" type="number" class="q-pt-md"
+                        :dense="true" v-model="value[8].x" label="x" lazy-rules />
+                    <q-btn color="white" @click="reset(8)" text-color="black" :label="$t('reset')" />
+                </div>
+                <div class="col-1"></div>
+                <div class="col-1"><q-input filled @focus="isactivearray[9] = false" type="number" class="q-pt-md"
+                        :dense="true" v-model="value[9].x" label="x" lazy-rules />
+                    <q-btn color="white" @click="reset(9)" text-color="black" :label="$t('reset')" />
+                </div>
+                <div class="col-1"></div>
+                <div class="col-1 q-pt-xl">
+                    <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
 
+                </div>
 
-
-        <div class="col-2 q-pa-lg">
-            <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[4]" label="" lazy-rules />
+            </div>
         </div>
-        <div class="col-2 q-pa-lg">
-            <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[5]" label="" lazy-rules />
-        </div>
-        <div class="col-2 q-pa-lg">
-            <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[6]" label="" lazy-rules />
-        </div>
-        <div class="col-2 q-pa-lg">
-            <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[7]" label="" lazy-rules />
-        </div>
-        <div class="col-2 q-pa-lg">
-            <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[8]" label="" lazy-rules />
-        </div>
-        <div class="col-2 q-pa-lg">
-            <!-- <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[9]" label="" lazy-rules /> -->
-        </div>
-
-
 
     </div>
 </template>
@@ -74,23 +141,327 @@
 
 </style>
 <script lang="ts">
-import { defineComponent, ref, watch, computed, defineProps, withDefaults, reactive} from "vue";
+import { defineComponent, ref, watch, computed, defineProps, withDefaults, reactive, onMounted, onBeforeUnmount } from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
-
-
+import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
+import GlobalData from "src/common/GlobalData";
 export default defineComponent({
     name: "ComponentDensityCorrection",
+    components: {
+        vue3ResizeDrag
+    },
     setup() {
         let $store = useStore();
         let $t = useI18n();
-        const value=reactive([0,0,0,0,0,0,0,0,0,0,0]);
+        const value = reactive([{ x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}]);
         let model = ref(null);
+        const div = ref();
+        const isshowarray = ref([true, true, true, true, true, true, true, true, true, true])
+        const isactivearray = ref([true, true, true, true, true, true, true, true, true, true])
+        const default_location: any = reactive([{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },]);
         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 });
+        const configselsect = computed(() => { return $store.state.selected_projector })
+        //用于计算当前投影仪的索引
+        let serverconfig = JSON.parse($store.state.fusion_configuration);
+        const selectedprojector = computed(() => {
+            return $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col + $store.getters.GetTheCurrentlySelectedCamera[1]
+        })
+        const set_cache: any = ref([]);
+        const ste_status =ref(0);
+        //
+        //为了加载 缓存的配置时 同步点的位置
+        const syncpoint = () => {
+            for (let index = 0; index < value.length; index++) {
+                isactivearray.value[index] = false
+            }
+        }
+
+        const use_set_cache = () => {
+            if (set_cache.value[selectedprojector.value]!=null) {
+                let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
+                deepcopy(value, tmp)
+                syncpoint()
+            }
+        };
+        const deepcopy = (o1: any, o2: any) => {
+            for (let k in o2) {
+                if (typeof o2[k] === 'object') {
+                    o1[k] = {};
+                    deepcopy(o1[k], o2[k]);
+                } else {
+                    o1[k] = o2[k];
+                }
+            }
+        }
+        const save_set_cache = () => {
+            set_cache.value[selectedprojector.value] = JSON.stringify(value);
+        }
+        onBeforeUnmount(() => {
+            sessionStorage.DensityCorrection = JSON.stringify(set_cache.value)
+        })
+        watch(() => configselsect, (newVal, oldVal) => {
+            let tmp = JSON.parse($store.state.fusion_configuration);
+            let fortmp = null
+            let i
+            for (i of tmp.projectors) {
+                if (i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && i.row === $store.getters.GetTheCurrentlySelectedCamera[0]) {
+                    fortmp = JSON.parse(JSON.stringify(i))
+                }
+            }
+            ste_status.value=1;
+            config = JSON.parse(JSON.stringify(fortmp))
+            use_set_cache()
+            setTimeout(() => {
+                ste_status.value=0;
+            }, 100);
+        }, { deep: true })
+        const initialization = () => {
+            ste_status.value=1;
+            for (let index = 0; index < config.hor_density.length; index++) {
+                value[index].x = config.ver_density[index].x
+                value[index].y = config.ver_density[index].y
+                value[index].number = config.ver_density[index].number
+                value[index + 5].x = config.hor_density[index].x
+                value[index + 5].y = config.hor_density[index].y
+                value[index+5].number = config.hor_density[index].number
+            }
+            if(sessionStorage.DensityCorrection&&sessionStorage.DensityCorrection.length>0){
+                set_cache.value=JSON.parse(sessionStorage.DensityCorrection);
+                use_set_cache()
+            }else{
+                
+            }
+            syncpoint()
+            setTimeout(() => {
+                ste_status.value=0;
+            }, 100);
+        }
+
+        const resetall = () => {
+            for (let index = 0; index < config.hor_density.length + config.ver_density.length; index++) {
+                reset(index)
+            }
+        }
+        const reset = (index: number) => {
+            if (index >= 5) {
+                value[index].x = config.hor_density[index - 5].def_x
+                value[index].y = config.hor_density[index - 5].def_y
+                set?.SetBlendingVerDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index - 5+1, Number(value[index].x));
+            } else {
+                value[index].x = config.ver_density[index].def_x
+                value[index].y = config.ver_density[index].def_y
+                set?.SetBlendingHorDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index+1, Number(value[index].y))
+
+            }
+
+            point_postion[index].y = default_location[index].y
+            point_postion[index].x = default_location[index].x
+            isshowarray.value[index] = false
+            setTimeout(() => {
+                isshowarray.value[index] = true
+            }, 100);
+        }
+        const point_postion: any = reactive([{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },])
+        let set = GlobalData.getInstance().getCurrentClient();
+        const save = () => {
+            set?.SaveBlendingConfig("")
+            setTimeout(() => {
+                set?.GetBlendingConfig("").then((res) => { $store.commit("setfusion_configuration", res?.config); })
+            }, 1000);
+        }
+
+        const moveHandler = ($event: any, index: number) => {
+            let x = 0
+            let y = 0
+            switch (index) {
+                case 0:
+                case 1:
+                case 2:
+                case 3:
+                case 4:
+                    x = config.width / 2 + Math.ceil(($event.left - default_location[index].x) * Proportion.value.x);
+                    y = (config.height - (config.height / 4) * index) - Math.ceil(($event.top - default_location[index].y) * Proportion.value.y);
+                    break;
+                case 5:
+                case 6:
+                case 7:
+                case 8:
+                case 9:
+                    x = Math.ceil($event.left * Proportion.value.x);
+                    y = config.height / 2 - Math.ceil(($event.top - default_location[index].y) * Proportion.value.y);
+                    
+                    break;
+                default:
+            }
+            value[index].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            value[index].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            save_set_cache()
+        }
+
+        onMounted(() => {
+            
+            initialization()
+            Proportion.value.x = config.width / (div.value.offsetWidth - 25)
+            Proportion.value.y = config.height / (div.value.offsetHeight - 25)
+            let Width = (div.value.offsetWidth - 25) / 4
+            let Height = (div.value.offsetHeight - 25) / 4
+            for (let index = 0; index < config.hor_density.length + config.ver_density.length; index++) {
+                if (index < 5) {
+                    point_postion[index].y = default_location[index].y = Height * index
+                    point_postion[index].x = default_location[index].x = Width * 2
+                } else {
+                    point_postion[index].y = default_location[index].y = Height * 2
+                    point_postion[index].x = default_location[index].x = Width * (index - 5)
+                }
+            }
+            
+        })
+
+        const setdianposin = (index: number, x: number, y: number) => {
+            point_postion[index].x = x
+            point_postion[index].y = y
+            isshowarray.value[index] = false
+            isactivearray.value[index] = false
+            setTimeout(() => {
+                isshowarray.value[index] = true
+            }, 100);
+        }
+        //
+        watch(() => value[0], (newVal, oldVal) => {
+            send_configuration(0, newVal.y,newVal.number)
+            if (!isactivearray.value[0]) {
+                let x = default_location[0].x;
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
+                setdianposin(0, x, y)
+            }
+            save_set_cache()
+        }, { deep: true })
+
+        watch(() => value[1], (newVal, oldVal) => {
+            send_configuration(1, newVal.y,newVal.number)
+            if (!isactivearray.value[1]) {
+                let x = default_location[1].x;
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
+                setdianposin(1, x, y)
+            }
+            save_set_cache()
+        }, { deep: true })
+
+        watch(() => value[2], (newVal, oldVal) => {
+            //发送x y 唯一一个
+            send_configuration(2, newVal.y,newVal.number)
+            if (!isactivearray.value[2]) {
+                let x = Math.ceil(newVal.x / Proportion.value.x);
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
+                setdianposin(2, x, y)
+            }
+            save_set_cache()
+        }, { deep: true })
+
+        watch(() => value[3], (newVal, oldVal) => {
+            send_configuration(3, newVal.y,newVal.number)
+            if (!isactivearray.value[3]) {
+                let x = default_location[3].x;
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
+                setdianposin(3, x, y)
+            }
+            save_set_cache()
+        }, { deep: true })
+
+        watch(() => value[4], (newVal, oldVal) => {
+            send_configuration(4, newVal.y,newVal.number)
+            if (!isactivearray.value[4]) {
+                let x = default_location[4].x;
+                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
+                setdianposin(4, x, y)
+            }
+            save_set_cache()
+        }, { deep: true })
+
+
+        ///
+
+        watch(() => value[5], (newVal, oldVal) => {
+            send_configuration(5, newVal.x,newVal.number)
+            if (!isactivearray.value[5]) {
+                let x = Math.ceil(newVal.x / Proportion.value.x);
+                let y = default_location[5].y
+                setdianposin(5, x, y)
+            }
+            save_set_cache()
+        }, { deep: true })
+
+        watch(() => value[6], (newVal, oldVal) => {
+            send_configuration(6, newVal.x,newVal.number)
+            if (!isactivearray.value[6]) {
+                let x = Math.ceil(newVal.x / Proportion.value.x);
+                let y = default_location[6].y
+                setdianposin(6, x, y)
+            }
+            save_set_cache()
+        }, { deep: true })
+
+        watch(() => value[7], (newVal, oldVal) => {
+            send_configuration(7, newVal.x,newVal.number)
+            if (!isactivearray.value[7]) {
+                let x = Math.ceil(newVal.x / Proportion.value.x);
+                let y = default_location[7].y
+                setdianposin(7, x, y)
+            }
+            save_set_cache()
+        }, { deep: true })
+
+        watch(() => value[8], (newVal, oldVal) => {
+            send_configuration(8, newVal.x,newVal.number)
+            if (!isactivearray.value[8]) {
+                let x = Math.ceil(newVal.x / Proportion.value.x);
+                let y = default_location[8].y
+                setdianposin(8, x, y)
+            }
+            save_set_cache()
+        }, { deep: true })
+
+        watch(() => value[9], (newVal, oldVal) => {
+            //console.log(newVal)
+            send_configuration(9, newVal.x,newVal.number)
+            if (!isactivearray.value[9]) {
+                let x = Math.ceil(newVal.x / Proportion.value.x);
+                let y = default_location[9].y
+                setdianposin(9, x, y)
+            }
+            save_set_cache()
+        }, { deep: true })
+        ///
+
+        const send_configuration = (index: number, value: number,number:number) => {
+            
+            if(ste_status.value==0){
+                //console.log("Send")
+                if(index < 5){
+                    set?.SetBlendingVerDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index+1, Number(value)) 
+                }else{
+                    set?.SetBlendingHorDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index-4, Number(value));
+                }
+            }
+            save_set_cache()
+        }
+
+        initialization();
         return {
             model,
             options,
-            value
+            value,
+            reset,
+            resetall,
+            point_postion,
+            moveHandler,
+            div,
+            isshowarray,
+            isactivearray,
+            save
         };
     },
 });
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 1ab3fe4..99e4bcf 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -1,8 +1,8 @@
 <template>
     <div class="row">
         <div class="col-2">
-            <q-input filled type="number" class="q-pt-md" style="text-align: center;" :dense="true" @focus="isactivearray[0] = false"
-                v-model="four[0].x" label="x" lazy-rules />
+            <q-input filled type="number" class="q-pt-md" style="text-align: center;" :dense="true"
+                @focus="isactivearray[0] = false" v-model="four[0].x" label="x" lazy-rules />
             <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[0] = false"
                 v-model="four[0].y" label="y" lazy-rules />
             <q-btn color="white" @click="reset(0)" text-color="black" :label="$t('reset')" />
@@ -19,23 +19,28 @@
         </div>
 
         <div class="col-2"></div>
-        <div class="col-8">            <div ref="div" style="background-color: #7fffd4;height: 40vh;">
+        <div class="col-8">
+            <div ref="div" style="background-color: #7fffd4;height: 40vh;">
                 <div style="position:absolute;">
                     <vue3ResizeDrag v-if="isshowarray[0]" :isActive="isactivearray[0]" @mousedown="activeMouseDown(0)"
-                        @mouseUpHandler="mouseUpHandler(0)" :w="30" :h="20" :x="x1" :y="y1" :isResizable="false"
-                        @moveHandler="moveHandler_1"><span>{{$t('point')}}1</span>
+                        @mouseUpHandler="mouseUpHandler(0)" :w="30" :h="20" :x="points[0].x" :y="points[0].y"
+                        :isResizable="false" @moveHandler="moveHandler_1"><span>{{ $t('point') }}1</span>
                     </vue3ResizeDrag>
                     <vue3ResizeDrag v-if="isshowarray[1]" :isActive="isactivearray[1]" @mousedown="activeMouseDown(1)"
-                        @mouseUpHandler="mouseUpHandler(1)" :w="30" :h="20" :x="point2.x" :y="point2.y"
-                        :isResizable="false" @moveHandler="moveHandler_2"><span>{{$t('point')}}2</span> </vue3ResizeDrag>
+                        @mouseUpHandler="mouseUpHandler(1)" :w="30" :h="20" :x="points[1].x" :y="points[1].y"
+                        :isResizable="false" @moveHandler="moveHandler_2"><span>{{ $t('point') }}2</span>
+                    </vue3ResizeDrag>
                     <vue3ResizeDrag v-if="isshowarray[2]" :isActive="isactivearray[2]" @mousedown="activeMouseDown(2)"
-                        @mouseUpHandler="mouseUpHandler(2)" :w="30" :h="20" :x="point3.x" :y="point3.y"
-                        :isResizable="false" @moveHandler="moveHandler_3"><span>{{$t('point')}}3</span> </vue3ResizeDrag>
+                        @mouseUpHandler="mouseUpHandler(2)" :w="30" :h="20" :x="points[2].x" :y="points[2].y"
+                        :isResizable="false" @moveHandler="moveHandler_3"><span>{{ $t('point') }}3</span>
+                    </vue3ResizeDrag>
                     <vue3ResizeDrag v-if="isshowarray[3]" :isActive="isactivearray[3]" @mousedown="activeMouseDown(3)"
-                        @mouseUpHandler="mouseUpHandler(3)" :w="30" :h="20" :x="point4.x" :y="point4.y"
-                        :isResizable="false" @moveHandler="moveHandler_4"><span>{{$t('point')}}4</span> </vue3ResizeDrag>
+                        @mouseUpHandler="mouseUpHandler(3)" :w="30" :h="20" :x="points[3].x" :y="points[3].y"
+                        :isResizable="false" @moveHandler="moveHandler_4"><span>{{ $t('point') }}4</span>
+                    </vue3ResizeDrag>
                 </div>
-            </div></div>
+            </div>
+        </div>
         <div class="col-2"></div>
 
         <div class="col-2">
@@ -46,7 +51,7 @@
             <q-btn color="white" @click="reset(2)" text-color="black" :label="$t('reset')" />
         </div>
         <div class="col-8">
-            <q-btn color="white"  @click="resetall" text-color="black" :label="$t('resetall')" /><q-btn color="white" @click="save" text-color="black" :label="$t('save config')" />
+            <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
         </div>
         <div class="col-2">
             <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[3] = false"
@@ -65,7 +70,7 @@
 import vue3ResizeDrag from "src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
 import { dom } from 'quasar'
 
-import { defineComponent, ref, watch, computed, defineProps, withDefaults, onMounted, reactive } from "vue";
+import { defineComponent, ref, watch, computed, defineProps, withDefaults, onMounted, reactive,onBeforeUnmount } from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
 import ClientConnection from "src/common/ClientConnection"
@@ -80,34 +85,60 @@ export default defineComponent({
     setup() {
         let $store = useStore();
         let $t = useI18n();
-        const setIndexProjector = () => {
-            console.log($store.state.selected_projector);
-        };
-        let config=JSON.parse($store.state.fusion_configuration).projectors[0];
+        let config = JSON.parse($store.state.fusion_configuration).projectors[0];
         let set = GlobalData.getInstance().getCurrentClient();
-        const configselsect = computed(() => {return $store.state.selected_projector})
-        let four = ref([{ x: config.point4[0].x, y: config.point4[0].y }, { x: config.point4[1].x, y: config.point4[1].y }, { x: config.point4[2].x, y: config.point4[2].x }, { x: config.point4[3].x, y: config.point4[3].y }]);
+        const configselsect = computed(() => { return $store.state.selected_projector })
+        //用于计算当前投影仪的索引
+        let serverconfig = JSON.parse($store.state.fusion_configuration);
+        const selectedprojector = computed(() => {
+            return $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col + $store.getters.GetTheCurrentlySelectedCamera[1]
+        })
+        const set_cache: any = ref([]);
+        //
+        //let four = ref([{ x: config.point4[0].x, y: config.point4[0].y }, { x: config.point4[1].x, y: config.point4[1].y }, { x: config.point4[2].x, y: config.point4[2].x }, { x: config.point4[3].x, y: config.point4[3].y }]);
+        let four = reactive([{ x: config.point4[0].x, y: config.point4[0].y }, { x: config.point4[1].x, y: config.point4[1].y }, { x: config.point4[2].x, y: config.point4[2].x }, { x: config.point4[3].x, y: config.point4[3].y }]);
         let defaultfour = ref([{ x: 0, y: 1080 }, { x: 1920, y: 1080 }, { x: 0, y: 0 }, { x: 1920, y: 0 }]);
         let defaultfourpostion: any = ref([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }]);
         let fourpostion: any = ref([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }]);
         let div: any = ref(null);
-        // let div2: any = ref(null);
-        let options = ref(['10', '20', '30', '40', '50']);
-        let Proportion = ref({ x: 0, y: 0 });
-        let point1 = reactive({ x: 0, y: 0 });
-        let point2 = ref({ x: 0, y: 0 });
-        let point3 = ref({ x: 0, y: 0 });
-        let point4 = ref({ x: 0, y: 0 });
+        let Proportion = ref({ x: 0, y: 0 });//缩放比例
+        let points = reactive([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }]);//点的位置
         const isshowarray = ref([true, true, true, true])
         const isactivearray = ref([true, true, true, true])
-        const x1 = ref(0);
-        const y1 = ref(0);
-        const { offset } = dom
-
-        const save=()=>{
+        const ste_status =ref(0);
+        const save = () => {
             set?.SaveBlendingConfig("")
+            setTimeout(() => {
+                set?.GetBlendingConfig("").then((res) => { $store.commit("setfusion_configuration", res?.config); })
+            }, 1000);
         }
-
+        ///
+        const use_set_cache = () => {
+            if (set_cache.value[selectedprojector.value]!=null) {
+                let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
+                deepcopy(four, tmp)
+                //four=JSON.parse(JSON.stringify(tmp))
+                
+            }
+            syncpoint()
+        };
+        const deepcopy = (o1: any, o2: any) => {
+            for (let k in o2) {
+                if (typeof o2[k] === 'object') {
+                    o1[k] = {};
+                    deepcopy(o1[k], o2[k]);
+                } else {
+                    o1[k] = o2[k];
+                }
+            }
+        }
+        const save_set_cache = () => {
+            set_cache.value[selectedprojector.value] = JSON.stringify(four);
+        }
+        onBeforeUnmount(()=>{
+            sessionStorage.FourPointCalibration=JSON.stringify(set_cache.value)
+        })
+        ///
         const activeMouseDown = (index: number) => {
             isactivearray.value[index] = true
         }
@@ -115,26 +146,28 @@ export default defineComponent({
             isactivearray.value[index] = false
         }
         onMounted(() => {
+            ste_status.value=1;
             setpoa();
 
+            setTimeout(() => {
+                ste_status.value=0;
+            }, 100);
         })
 
         const setpoa = () => {
-            console.log(config);
-            point1.x = 0
-            point1.y = 0
+            
+            points[0].x = 0
+            points[0].y = 0
 
-            x1.value = 0
-            y1.value = 0
+            points[1].x = div.value.offsetWidth - 25
+            points[1].y = 0
 
-            point2.value.x = div.value.offsetWidth - 25
-            point2.value.y = 0
+            points[2].x = 0
+            points[2].y = div.value.offsetHeight - 25
 
-            point3.value.x = 0
-            point3.value.y = div.value.offsetHeight - 25
+            points[3].x = div.value.offsetWidth - 25
+            points[3].y = div.value.offsetHeight - 25
 
-            point4.value.x = div.value.offsetWidth - 25
-            point4.value.y = div.value.offsetHeight - 25
 
 
             fourpostion.value[0].x = 0
@@ -148,183 +181,172 @@ export default defineComponent({
 
             fourpostion.value[3].x = div.value.offsetWidth - 25
             fourpostion.value[3].y = div.value.offsetHeight - 25
-            
+
             Proportion.value.x = config.width / (div.value.offsetWidth - 25)
             Proportion.value.y = config.height / (div.value.offsetHeight - 25)
             for (let index = 0; index < fourpostion.value.length; index++) {
-                defaultfourpostion.value[index].x = fourpostion.value[index].x ;
+                defaultfourpostion.value[index].x = fourpostion.value[index].x;
                 defaultfourpostion.value[index].y = fourpostion.value[index].y;
-                defaultfour.value[index].x=config.point4[index].def_x
-                defaultfour.value[index].y=config.point4[index].def_y
+                defaultfour.value[index].x = config.point4[index].def_x
+                defaultfour.value[index].y = config.point4[index].def_y
+                four[index].x = config.point4[index].x
+                four[index].y = config.point4[index].y
             }
+            if(sessionStorage.FourPointCalibration&&sessionStorage.FourPointCalibration.length>0){
+                set_cache.value=JSON.parse(sessionStorage.FourPointCalibration);
+                use_set_cache()
+            }else{
+                
+            }
+            //syncpoint()
+            
         }
-        watch(() => four.value[0], (newVal, oldVal) => {
-            if($store.state.enablefusion)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 1, Number(newVal.x), Number(newVal.y));
-            ///
+        watch(() => four[0], (newVal, oldVal) => {
+            if ($store.state.enablefusion&&ste_status.value==0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 1, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[0]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                x1.value = x
-                y1.value = y
+                points[0].x = x
+                points[0].y = y
                 isshowarray.value[0] = false
                 isactivearray.value[0] = false
                 setTimeout(() => {
                     isshowarray.value[0] = true
                 }, 100);
-                ///
+                
             }
+            save_set_cache()
         }, { deep: true })
-        watch(() => four.value[1], (newVal, oldVal) => {
-            if($store.state.enablefusion)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 2, Number(newVal.x), Number(newVal.y));
-            ///
+        watch(() => four[1], (newVal, oldVal) => {
+            if ($store.state.enablefusion&&ste_status.value==0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 2, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[1]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                point2.value.x = x
-                point2.value.y = y
+                points[1].x = x
+                points[1].y = y
                 isshowarray.value[1] = false
                 isactivearray.value[1] = false
                 setTimeout(() => {
                     isshowarray.value[1] = true
                 }, 100);
+                
             }
-            ///
+            save_set_cache()
         }, { deep: true })
-        watch(() => four.value[2], (newVal, oldVal) => {
-            if($store.state.enablefusion)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 3, Number(newVal.x), Number(newVal.y));
-            ///
+        watch(() => four[2], (newVal, oldVal) => {
+            if ($store.state.enablefusion&&ste_status.value==0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 3, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[2]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil((config.height / Proportion.value.y) - (newVal.y / Proportion.value.y));
-                
-                point3.value.x = x
-                point3.value.y = y
+
+                points[2].x = x
+                points[2].y = y
                 isshowarray.value[2] = false
                 setTimeout(() => {
                     isshowarray.value[2] = true
                 }, 100);
+                
             }
-            ///
+            save_set_cache()
         }, { deep: true })
-        watch(() => four.value[3], (newVal, oldVal) => {
-            if($store.state.enablefusion)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 4, Number(newVal.x), Number(newVal.y));
-            ///
+        watch(() => four[3], (newVal, oldVal) => {
+            if ($store.state.enablefusion&&ste_status.value==0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 4, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[3]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil((config.height / Proportion.value.y) - (newVal.y / Proportion.value.y));
-                
-                point4.value.x = x
-                point4.value.y = y
+
+                points[3].x = x
+                points[3].y = y
                 isshowarray.value[3] = false
                 setTimeout(() => {
                     isshowarray.value[3] = true
                 }, 100);
+                
             }
-            ///
+            save_set_cache()
         }, { deep: true })
 
-        ///
 
         watch(() => configselsect, (newVal, oldVal) => {
-            //console.log(newVal);
-            let tmp=JSON.parse($store.state.fusion_configuration);
-            let fortmp=null
+            let tmp = JSON.parse($store.state.fusion_configuration);
+            let fortmp = null
             let i
-            for(i of tmp.projectors){
-                if(i.col===$store.getters.GetTheCurrentlySelectedCamera[0]&&i.row===$store.getters.GetTheCurrentlySelectedCamera[1]){
-                    fortmp=JSON.parse(JSON.stringify(i)) 
+            for (i of tmp.projectors) {
+                if (i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && i.row === $store.getters.GetTheCurrentlySelectedCamera[0]) {
+                    fortmp = JSON.parse(JSON.stringify(i))
                 }
             }
-            config=JSON.parse(JSON.stringify(fortmp)) 
-            console.log(config)
+            ste_status.value=1;
+            config = JSON.parse(JSON.stringify(fortmp))
+            //setpoa();
+            use_set_cache()
+            setTimeout(() => {
+                ste_status.value=0;
+            }, 100);
         }, { deep: true })
 
+        //为了加载 缓存的配置时 同步点的位置
+        const syncpoint=()=>{
+            for (let index = 0; index < fourpostion.value.length; index++) {
+                isactivearray.value[index]=false
+            }
+        }
+
         const reset = (index: number) => {
-            if (index == 0) {
-                four.value[0].x = 0
-                four.value[0].y = 1080
-                point1.x = 0
-                point1.y = 0
-                x1.value = 0
-                y1.value = 0
-            }
-            if (index == 1) {
-                four.value[1].x = 1920
-                four.value[1].y = 1080
-                fourpostion.value[1].x = div.value.offsetWidth - 25
-                fourpostion.value[1].y = 0
-            }
-            if (index == 2) {
-                four.value[2].x = 0
-                four.value[2].y = 0
-                fourpostion.value[2].x = 0
-                fourpostion.value[2].y = div.value.offsetHeight - 25
-            }
-            if (index == 3) {
-                four.value[3].x = 1920
-                four.value[3].y = 0
-                fourpostion.value[3].x = div.value.offsetWidth - 25
-                fourpostion.value[3].y = div.value.offsetHeight - 25
-            }
-            // auto set config
-            four.value[index].x = config.point4[index].def_x
-            four.value[index].y = config.point4[index].def_y
+            fourpostion.value[index].x = defaultfourpostion.value[index].x;
+            fourpostion.value[index].y = defaultfourpostion.value[index].y;
+
+            four[index].x = config.point4[index].def_x
+            four[index].y = config.point4[index].def_y
+
+            set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, index+1, Number(config.point4[index].def_x), Number(config.point4[index].def_y));
 
             isshowarray.value[index] = false
             setTimeout(() => {
                 isshowarray.value[index] = true
             }, 100);
+            
         }
 
-        const resetall=()=>{
-            
+        const resetall = () => {
             for (let index = 0; index < fourpostion.value.length; index++) {
-                fourpostion.value[index].x=defaultfourpostion.value[index].x 
-                fourpostion.value[index].y=defaultfourpostion.value[index].y 
-                four.value[index].x=defaultfour.value[index].x
-                four.value[index].y=defaultfour.value[index].y
-
-                isshowarray.value[index] = false
-                setTimeout(() => {
-                isshowarray.value[index] = true
-                }, 100);
+                reset(index)
             }
+            
         }
 
         const moveHandler_1 = (data: any) => {
             let x = Math.ceil((data.left - fourpostion.value[0].x) * Proportion.value.x + 0);
             let y = Math.ceil((config.height - data.top * Proportion.value.y - fourpostion.value[0].y));
 
-            four.value[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            four.value[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+            four[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            four[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
             isactivearray.value[0] = true
+            save_set_cache()
         }
         const moveHandler_2 = (data: any) => {
-            //y0 xconfig.width
             let x = Math.ceil((data.left - fourpostion.value[1].x) * Proportion.value.x + config.width);
             let y = Math.ceil((config.height - data.top * Proportion.value.y - fourpostion.value[1].y));
-            four.value[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            four.value[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-            //console.log("x :"+x+" y:"+y)
+            four[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            four[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+            save_set_cache()
         }
         const moveHandler_3 = (data: any) => {
             let x = Math.ceil((data.left - fourpostion.value[2].x) * Proportion.value.x);
             let y = Math.abs(Math.ceil((data.top - fourpostion.value[2].y) * Proportion.value.y));
-            four.value[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            four.value[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-            console.log("x :" + x + " y:" + y)
-            //console.log("x :" + data.left + " y:" + (1370-data.top));
+            four[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            four[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+            save_set_cache()
         }
         const moveHandler_4 = (data: any) => {
             let x = Math.ceil((data.left - fourpostion.value[3].x) * Proportion.value.x + config.width);
             let y = Math.abs(Math.ceil((data.top - fourpostion.value[3].y) * Proportion.value.y));
-            four.value[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            four.value[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-            //console.log("x :"+x+" y:"+y)
+            four[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            four[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+            save_set_cache()
         }
         return {
             div,
-            options,
             fourpostion,
             reset,
             resetall,
@@ -334,16 +356,11 @@ export default defineComponent({
             moveHandler_4,
             four,
             save,
-            point1,
-            point2,
-            point3,
-            point4,
-            x1,
-            y1,
             isshowarray,
             isactivearray,
             activeMouseDown,
-            mouseUpHandler
+            mouseUpHandler,
+            points
         };
     },
 });
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index b3d0e37..c1839d4 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -1,34 +1,23 @@
 <template>
   <div class="row">
     <div class="col-12">
-      <p class="text-center">{{$t('Set the fusion band width')}}</p>
+      <!-- <p class="text-center">{{ $t('Set the fusion band width') }}</p> -->
       <div class="row">
         <div class="col-12">
           <div class="row">
             <div class="col-4 offset-4">
               <div class="row">
                 <div class="col-6">
-                  <q-toggle
-                    class="float-right"
-                    v-model="array2[selectedprojector][0].isshow"
-                    label=""
-                  />
+                  <q-toggle class="float-right" v-model="array[0].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input
-                    filled
-                    type="number"
-                    @focus="group = 0"
-                    v-model="array2[selectedprojector][0].value"
-                    :label="$t('upper fusion zone parameters')"
-                    lazy-rules
-                    :rules="[
+                  <q-input filled type="number" @focus="group = 0" v-model="array[0].value"
+                    :label="$t('upper fusion zone parameters')" lazy-rules :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
                       (val) =>
                         (val > -1 && val < 1080) || $t('Please enter 0-100'),
-                    ]"
-                  />
+                    ]" />
                 </div>
               </div>
             </div>
@@ -39,54 +28,32 @@
             <div class="col-6">
               <div class="row">
                 <div class="col-6">
-                  <q-toggle
-                    class="float-right"
-                    v-model="array2[selectedprojector][1].isshow"
-                    label=""
-                  />
+                  <q-toggle class="float-right" v-model="array[1].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input
-                    filled
-                    type="number"
-                    @focus="group = 1"
-                    v-model="array2[selectedprojector][1].value"
-                    :label="$t('Left fusion Band Parameters')"
-                    lazy-rules
-                    :rules="[
+                  <q-input filled type="number" @focus="group = 1" v-model="array[1].value"
+                    :label="$t('Left fusion Band Parameters')" lazy-rules :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
                       (val) =>
                         (val > -1 && val < 1920) || $t('Please enter 0-100'),
-                    ]"
-                  />
+                    ]" />
                 </div>
               </div>
             </div>
             <div class="col-6">
               <div class="row">
                 <div class="col-6">
-                  <q-toggle
-                    class="float-right"
-                    v-model="array2[selectedprojector][2].isshow"
-                    label=""
-                  />
+                  <q-toggle class="float-right" v-model="array[2].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input
-                    filled
-                    type="number"
-                    @focus="group = 2"
-                    v-model="array2[selectedprojector][2].value"
-                    :label="$t('Right fusion Band Parameters')"
-                    lazy-rules
-                    :rules="[
+                  <q-input filled type="number" @focus="group = 2" v-model="array[2].value"
+                    :label="$t('Right fusion Band Parameters')" lazy-rules :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
                       (val) =>
                         (val > -1 && val < 1920) || $t('Please enter 0-100'),
-                    ]"
-                  />
+                    ]" />
                 </div>
               </div>
             </div>
@@ -97,83 +64,46 @@
             <div class="col-4 offset-4">
               <div class="row">
                 <div class="col-6">
-                  <q-toggle
-                    class="float-right"
-                    v-model="array2[selectedprojector][3].isshow"
-                    label=""
-                  />
+                  <q-toggle class="float-right" v-model="array[3].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input
-                    filled
-                    type="number"
-                    @focus="group = 3"
-                    v-model="array2[selectedprojector][3].value"
-                    :label="$t('Lower fusion Zone Parameters')"
-                    lazy-rules
-                    :rules="[
+                  <q-input filled type="number" @focus="group = 3" v-model="array[3].value"
+                    :label="$t('Lower fusion Zone Parameters')" lazy-rules :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
                       (val) =>
                         (val > -1 && val < 1080) || $t('Please enter 0-100'),
-                    ]"
-                  />
+                    ]" />
                 </div>
               </div>
             </div>
           </div>
         </div>
-        
+
       </div>
     </div>
-    <div v-if="!(group == 4) && array2[selectedprojector][group].isshow" class="col-4 offset-4">
-      <p class="text-center">{{$t('Set Fusion Band Parameters')}}</p>
+    <div class="col-4 offset-4">
+      <p class="text-center">{{ $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"
-            vertical
-            reverse
-            label-always
-          />
+          <q-slider v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
+            vertical reverse label-always />
           <p class="text-center">alpha</p>
         </div>
 
         <div>
-          <q-slider
-            v-model="array[group].p"
-            :min="0"
-            @change="chang('p')"
-            :max="2.5"
-            :step="0.01"
-            color="green"
-            vertical
-            reverse
-            label-always
-          />
+          <q-slider v-model="array[group].p" :min="0" @change="chang('p')" :max="2.5" :step="0.01" color="green"
+            vertical reverse label-always />
           <p class="text-center">p</p>
         </div>
 
         <div>
-          <q-slider
-            v-model="array[group].gamma"
-            :min="0"
-            @change="chang('gamma')"
-            :max="2.5"
-            :step="0.01"
-            color="green"
-            vertical
-            reverse
-            label-always
-          />
+          <q-slider v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="2.5" :step="0.01" color="green"
+            vertical reverse label-always />
           <p class="text-center">gamma</p>
         </div>
       </div>
+      <!-- <q-btn color="white" @click="save" text-color="black" :label="$t('save config')" /> -->
     </div>
   </div>
 </template>
@@ -192,6 +122,7 @@ import {
   computed,
   defineProps,
   withDefaults,
+  onBeforeUnmount,
   reactive,
 } from "vue";
 import { useStore } from "src/store";
@@ -205,196 +136,169 @@ export default defineComponent({
     let set = GlobalData.getInstance().getCurrentClient();
     let $store = useStore();
     let $t = useI18n();
-    const age = ref(0);
-    const standard = ref(0);
-    const group = ref(4);
-    const enablefusion=ref(false);
-    let array: any = ref([
-      { alpha: 0, p: 0, gamma: 0 },
-      { alpha: 0, p: 0, gamma: 0 },
-      { alpha: 0, p: 0, gamma: 0 },
-      { alpha: 0, p: 0, gamma: 0 },
-      { alpha: 0, p: 0, gamma: 0 },
+    const group = ref(0);
+    const set_cache: any = ref([]);
+    const enablefusion = ref(false);
+    let array: any = reactive([
+      { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
+      { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
+      { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
+      { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
     ]);
-    let array2: any = reactive([[
-      { isshow: false, value: 0 },
-      { isshow: false, value: 0 },
-      { isshow: false, value: 0 },
-      { isshow: false, value: 0 },
-    ],[
-      { isshow: false, value: 0 },
-      { isshow: false, value: 0 },
-      { isshow: false, value: 0 },
-      { isshow: false, value: 0 },
-    ]]);
-    const selectedprojector=computed(()=>{
-      return $store.state.selected_projector=="0/0"?0:1
+    let serverconfig = JSON.parse($store.state.fusion_configuration);
+    const selectedprojector = computed(() => {
+      return $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col + $store.getters.GetTheCurrentlySelectedCamera[1]
     })
-    const options = ref([
-      {
-        label: "上融合带参数",
-        value: 0,
-      },
-      {
-        label: "左融合带参数",
-        value: 1,
-      },
-      {
-        label: "右融合带参数",
-        value: 2,
-      },
-      {
-        label: "下融合带参数",
-        value: 3,
-      },
-    ]);
-    const accept = ref(false);
-    const text = ref("");
-    const model = computed({
-      get() {
-        return $store.state.selected_projector;
-      },
-      set(newValue) {
-        $store.commit("setSelectedProjector", newValue);
-      },
-    });
+    const ste_status = ref(0);
+    const use_set_cache = () => {
+      if (set_cache.value[selectedprojector.value] != null) {
+        let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
+        deepcopy(array, tmp)
+        //console.log(set_cache.value,"use")
+      }
+    };
+    const deepcopy = (o1: any, o2: any) => {
+      for (let k in o2) {
+        if (typeof o2[k] === 'object') {
+          o1[k] = {};
+          deepcopy(o1[k], o2[k]);
+        } else {
+          o1[k] = o2[k];
+        }
+      }
+    }
+    const save_set_cache = () => {
+      set_cache.value[selectedprojector.value] = JSON.stringify(array);
+    }
+    let config = JSON.parse($store.state.fusion_configuration).projectors[0];
+    const configselsect = computed(() => { return $store.state.selected_projector })
+    watch(() => configselsect, (newVal, oldVal) => {
+      let tmp = JSON.parse($store.state.fusion_configuration);
+      let fortmp = null
+      let i
+      for (i of tmp.projectors) {
+        if (i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && i.row === $store.getters.GetTheCurrentlySelectedCamera[0]) {
+          fortmp = JSON.parse(JSON.stringify(i))
+        }
+      }
+      ste_status.value = 1;
+      config = JSON.parse(JSON.stringify(fortmp))
+      //startconfig()
+      use_set_cache()
+      setTimeout(() => {
+        ste_status.value = 0;
+      }, 100);
+    }, { deep: true })
     const chang = (type: string) => {
       if (type == "alpha") {
-        if($store.state.enablefusion)set?.setBlendingAlphaParam(
+        if ($store.state.enablefusion) set?.setBlendingAlphaParam(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
           group.value,
-          array.value[group.value].alpha
+          array[group.value].alpha
         );
       }
       if (type == "p") {
-        if($store.state.enablefusion)set?.setBlendingPowerParam(
+        if ($store.state.enablefusion) set?.setBlendingPowerParam(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
           group.value,
-          array.value[group.value].p
+          array[group.value].p
         );
       }
       if (type == "gamma") {
-        if($store.state.enablefusion)set?.setBlendingGammaParam(
+        if ($store.state.enablefusion) set?.setBlendingGammaParam(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
           group.value,
-          array.value[group.value].gamma
+          array[group.value].gamma
         );
       }
-      //console.log("giao")
+      save_set_cache();
     };
-     //0：左融合带，1：上融合带，2：右融合带，3：下融合带
-    watch(
-      () => array2[0][0],
-      (newVal, oldVal) => {
-        if($store.state.enablefusion)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],1,array2[0][0].isshow,Number(array2[0][0].value));
-        if(!array2[0][0].isshow){
-          array2[0][0].value=0
-        }
-      },
-      { deep: true }
-    );
-    watch(
-      () => array2[0][1],
-      (newVal, oldVal) => {
-        if($store.state.enablefusion)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],0,array2[0][1].isshow,Number(array2[0][1].value));
-        if(!array2[0][1].isshow){
-          array2[0][1].value=0
-        }
-      },
-      { deep: true }
-    );
-    watch(
-      () => array2[0][2],
-      (newVal, oldVal) => {
-        if($store.state.enablefusion)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],2,array2[0][2].isshow,Number(array2[0][2].value));
-        if(!array2[0][2].isshow){
-          array2[0][2].value=0
-        }
-      },
-      { deep: true }
-    );
-    watch(
-      () => array2[0][3],
-      (newVal, oldVal) => {
-        if($store.state.enablefusion)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],3,array2[0][3].isshow,Number(array2[0][3].value));
-        if(!array2[0][3].isshow){
-          array2[0][3].value=0
-        }
-      },
-      { deep: true }
-    );
+    const startconfig = () => {
+      for (let index = 0; index < array.length; index++) {
+        array[index].gamma = config.params[index].gamma
+        array[index].alpha = config.params[index].alpha
+        array[index].p = config.params[index].power
+        array[index].isshow = config.params[index].enable
+        array[index].value = Number(config.params[index].size)
+      }
+      if (sessionStorage.FusionLocale) set_cache.value = JSON.parse(sessionStorage.FusionLocale); use_set_cache()
 
-///
+    }
+    startconfig()
+    onBeforeUnmount(() => {
+      sessionStorage.FusionLocale = JSON.stringify(set_cache.value)
+    })
 
-watch(
-      () => array2[1][0],
+    watch(
+      () => array[0],
       (newVal, oldVal) => {
-        if($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],1,array2[1][0].isshow,Number(array2[1][0].value));
-        if(!array2[1][0].isshow){
-          array2[1][0].value=0
-        }
+        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 1, array[0].isshow, Number(array[0].value));
+        // if (!array[0].isshow) {
+        //   array[0].value = 0
+        // }
+        save_set_cache()
       },
       { deep: true }
     );
     watch(
-      () => array2[1][1],
+      () => array[1],
       (newVal, oldVal) => {
-        if($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],0,array2[1][1].isshow,Number(array2[1][1].value));
-        if(!array2[1][1].isshow){
-          array2[1][1].value=0
-        }
+        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 0, array[1].isshow, Number(array[1].value));
+        // if (!array[1].isshow) {
+        //   array[1].value = 0
+        // }
+        save_set_cache()
       },
       { deep: true }
     );
     watch(
-      () => array2[1][2],
+      () => array[2],
       (newVal, oldVal) => {
-        if($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],2,array2[1][2].isshow,Number(array2[1][2].value));
-        if(!array2[1][2].isshow){
-          array2[1][2].value=0
-        }
+        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 2, array[2].isshow, Number(array[2].value));
+        // if (!array[2].isshow) {
+        //   array[2].value = 0
+        // }
+        save_set_cache()
       },
       { deep: true }
     );
     watch(
-      () => array2[1][3],
+      () => array[3],
       (newVal, oldVal) => {
-        if($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],3,array2[1][3].isshow,Number(array2[1][3].value));
-        if(!array2[1][3].isshow){
-          array2[1][3].value=0
-        }
+        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 3, array[3].isshow, Number(array[3].value));
+        save_set_cache()
       },
       { deep: true }
     );
-///
 
     watch(
       () => enablefusion,
       (newVal, oldVal) => {
-        $store.commit('setenablefusion',newVal.value);
+        $store.commit('setenablefusion', newVal.value);
         set?.EnableBlending(newVal.value);
-      },{ deep: true }
+      }, { deep: true }
     );
-    const changenablefusion=()=>{
-      $store.commit('setenablefusion',enablefusion.value);
+    const changenablefusion = () => {
+      $store.commit('setenablefusion', enablefusion.value);
+    }
+    const save = () => {
+      set?.SaveBlendingConfig("")
+      setTimeout(() => {
+        set?.GetBlendingConfig("").then((res) => { $store.commit("setfusion_configuration", res?.config); })
+      }, 1000);
     }
     return {
-      model,
-      age,
-      accept,
-      standard,
-      options,
       group,
-      text,
       array,
       chang,
       enablefusion,
-      array2,
       changenablefusion,
-      selectedprojector
+      selectedprojector,
+      save,
+      set_cache
     };
   },
 });
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index c433680..014b05b 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -49,7 +49,7 @@
                         :dense="true" v-model="nine[3].x" label="x" lazy-rules />
                     <q-input filled type="number" class="q-pt-md" @focus="isactivearray[3] = false" :dense="true"
                         v-model="nine[3].y" label="y" lazy-rules />
-                    <q-btn color="white"  @click="reset(3)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(3)" text-color="black" :label="$t('reset')" />
                 </div>
             </div>
 
@@ -57,35 +57,34 @@
         <div class="col-8">
             <div ref="div" style="background-color: #7fffd4;height: 40vh;">
                 <div style="position:absolute;">
-                    <vue3ResizeDrag :isActive="true" v-if="isshowarray[0]" :w="30" :h="20" :x="ninepostion[0].x"
+                    <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="20" :x="ninepostion[0].x"
                         :y="ninepostion[0].y" @mousedown="activeMouseDown(0)" :isResizable="false"
                         @moveHandler="moveHandler_1"><span>{{ $t('point') }}1</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="true" v-if="isshowarray[1]" :w="30" :h="20" :x="ninepostion[1].x"
+                    <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="20" :x="ninepostion[1].x"
                         :y="ninepostion[1].y" @mousedown="activeMouseDown(1)" :isResizable="false"
                         @moveHandler="moveHandler_2"><span>{{ $t('point') }}2</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="true" v-if="isshowarray[2]" :w="30" :h="20" :x="ninepostion[2].x"
+                    <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="20" :x="ninepostion[2].x"
                         :y="ninepostion[2].y" @mousedown="activeMouseDown(2)" :isResizable="false"
                         @moveHandler="moveHandler_3"><span>{{ $t('point') }}3</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="true" v-if="isshowarray[3]" :w="30" :h="20" :x="ninepostion[3].x"
+                    <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="20" :x="ninepostion[3].x"
                         :y="ninepostion[3].y" @mousedown="activeMouseDown(3)" :isResizable="false"
                         @moveHandler="moveHandler_4"><span>{{ $t('point') }}4</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="true" v-if="isshowarray[4]" :w="30" :h="20" :x="ninepostion[4].x"
+                    <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="20" :x="ninepostion[4].x"
                         :y="ninepostion[4].y" @mousedown="activeMouseDown(4)" :isResizable="false"
                         @moveHandler="moveHandler_5"><span>{{ $t('point') }}5</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="true" v-if="isshowarray[5]" :w="30" :h="20" :x="ninepostion[5].x"
+                    <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="30" :h="20" :x="ninepostion[5].x"
                         :y="ninepostion[5].y" @mousedown="activeMouseDown(5)" :isResizable="false"
                         @moveHandler="moveHandler_6"><span>{{ $t('point') }}6</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="true" v-if="isshowarray[6]" :w="30" :h="20" :x="ninepostion[6].x"
+                    <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="30" :h="20" :x="ninepostion[6].x"
                         :y="ninepostion[6].y" @mousedown="activeMouseDown(6)" :isResizable="false"
                         @moveHandler="moveHandler_7"><span>{{ $t('point') }}7</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="true" v-if="isshowarray[7]" :w="30" :h="20" :x="ninepostion[7].x"
+                    <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="30" :h="20" :x="ninepostion[7].x"
                         :y="ninepostion[7].y" @mousedown="activeMouseDown(7)" :isResizable="false"
                         @moveHandler="moveHandler_8"><span>{{ $t('point') }}8</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="true" v-if="isshowarray[8]" :w="30" :h="20" :x="ninepostion[8].x"
+                    <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="30" :h="20" :x="ninepostion[8].x"
                         :y="ninepostion[8].y" @mousedown="activeMouseDown(8)" :isResizable="false"
                         @moveHandler="moveHandler_9"><span>{{ $t('point') }}9</span> </vue3ResizeDrag>
                 </div>
-
             </div>
         </div>
         <div class="col-2">
@@ -101,9 +100,8 @@
         </div>
         <div class="col-4">
             <div class="row">
-                <div class="col-6"> <q-btn color="white"   @click="resetall" text-color="black"
-                        :label="$t('resetall')" /><q-btn color="white" @click="save" text-color="black"
-                        :label="$t('save config')" /></div>
+                <div class="col-6"> <q-btn color="white" @click="resetall" text-color="black"
+                        :label="$t('resetall')" /></div>
                 <div class="col-3"> <q-input filled type="number" @focus="isactivearray[6] = false" class="q-pt-md"
                         :dense="true" v-model="nine[6].x" label="x" lazy-rules />
                     <q-input filled type="number" class="q-pt-md" @focus="isactivearray[6] = false" :dense="true"
@@ -146,7 +144,7 @@
 <script lang="ts">
 import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
 import GlobalData from "src/common/GlobalData";
-import { defineComponent, ref, watch, computed, defineProps, withDefaults, onMounted } from "vue";
+import { defineComponent, ref, watch, computed, defineProps, withDefaults, onMounted ,onBeforeUnmount ,reactive} from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
 
@@ -159,20 +157,24 @@ export default defineComponent({
     setup() {
         let $store = useStore();
         let $t = useI18n();
-        const setIndexProjector = () => {
-            console.log($store.state.selected_projector);
-        };
-        let config=JSON.parse($store.state.fusion_configuration).projectors[0];
-        const configselsect = computed(() => {return $store.state.selected_projector})
+        let config = JSON.parse($store.state.fusion_configuration).projectors[0];
+        const configselsect = computed(() => { return $store.state.selected_projector })
         let Proportion = ref({ x: 0, y: 0 });
         let centor = ref({ x: 0, y: 0 });
         const div = ref();
-        let nine = ref([{ x: 0, y: 1080 }, { x: 960, y: 1920 }, { x: 1920, y: 1080 }, { x: 0, y: 540 }, { x: 960, y: 540 }, { x: 1920, y: 540 }, { x: 0, y: 0 }, { x: 960, y: 0 }, { x: 1920, y: 0 }]);
+        let nine = reactive([{ x: 0, y: 1080 }, { x: 960, y: 1920 }, { x: 1920, y: 1080 }, { x: 0, y: 540 }, { x: 960, y: 540 }, { x: 1920, y: 540 }, { x: 0, y: 0 }, { x: 960, y: 0 }, { x: 1920, y: 0 }]);
         let defaultnine = ref([{ x: 0, y: 1080 }, { x: 960, y: 1920 }, { x: 1920, y: 1080 }, { x: 0, y: 540 }, { x: 960, y: 540 }, { x: 1920, y: 540 }, { x: 0, y: 0 }, { x: 960, y: 0 }, { x: 1920, y: 0 }]);
-        ///
         const activeMouseDown = (index: number) => {
             isactivearray.value[index] = true
         }
+        //用于计算当前投影仪的索引
+        let serverconfig = JSON.parse($store.state.fusion_configuration);
+        const selectedprojector = computed(() => {
+            return $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col + $store.getters.GetTheCurrentlySelectedCamera[1]
+        })
+        const set_cache: any = ref([]);
+        //
+        const ste_status =ref(0);
         const isshowarray = ref([true, true, true, true, true, true, true, true, true,])
         const isactivearray = ref([true, true, true, true, true, true, true, true, true,])
         let ninepostion: any = ref([{ x: 0, y: 1920 }, { x: 960, y: 1920 }, { x: 1080, y: 1920 }, { x: 0, y: 540 }, { x: 960, y: 540 }, { x: 1080, y: 540 }, { x: 0, y: 0 }, { x: 540, y: 0 }, { x: 1080, y: 0 }]);
@@ -180,83 +182,141 @@ export default defineComponent({
         const moveHandler_1 = (data: any) => {
             let x = Math.ceil((data.left - ninepostion.value[0].x) * Proportion.value.x);
             let y = config.height - Math.ceil((data.top - ninepostion.value[0].y) * Proportion.value.y);
-
-            nine.value[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine.value[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            nine[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            save_set_cache()
         }
         const moveHandler_2 = (data: any) => {
-            let x = 960 + Math.ceil((data.left - ninepostion.value[1].x) * centor.value.x);
+            let x = config.width / 2 + Math.ceil((data.left - ninepostion.value[1].x) * centor.value.x);
             let y = config.height - Math.ceil((data.top - ninepostion.value[1].y) * Proportion.value.y);
-
-            nine.value[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine.value[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            nine[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            save_set_cache()
         }
         const moveHandler_3 = (data: any) => {
             let x = config.width + Math.ceil((data.left - ninepostion.value[2].x) * Proportion.value.x);
             let y = config.height - Math.ceil((data.top - ninepostion.value[2].y) * Proportion.value.y);
-
-            nine.value[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine.value[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            nine[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            save_set_cache()
         }
         const moveHandler_4 = (data: any) => {
             let x = Math.ceil((data.left - ninepostion.value[3].x) * Proportion.value.x);
-            let y = 530 - Math.ceil((data.top - ninepostion.value[3].y) * Proportion.value.y);
-
-            nine.value[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine.value[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            let y = config.height / 2 - Math.ceil((data.top - ninepostion.value[3].y) * Proportion.value.y);
+            nine[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            save_set_cache()
         }
         const moveHandler_5 = (data: any) => {
-            let x = 960 + Math.ceil((data.left - ninepostion.value[4].x) * centor.value.x);
-            let y = 530 - Math.ceil((data.top - ninepostion.value[4].y) * Proportion.value.y);
-
-            nine.value[4].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine.value[4].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            let x = config.width / 2 + Math.ceil((data.left - ninepostion.value[4].x) * centor.value.x);
+            let y = config.height / 2 - Math.ceil((data.top - ninepostion.value[4].y) * Proportion.value.y);
+            nine[4].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine[4].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            save_set_cache()
         }
         const moveHandler_6 = (data: any) => {
             let x = config.width + Math.ceil((data.left - ninepostion.value[5].x) * Proportion.value.x);
-            let y = 530 - Math.ceil((data.top - ninepostion.value[5].y) * Proportion.value.y);
-
-            nine.value[5].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine.value[5].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            let y = config.height / 2 - Math.ceil((data.top - ninepostion.value[5].y) * Proportion.value.y);
+            nine[5].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine[5].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            save_set_cache()
         }
         const moveHandler_7 = (data: any) => {
             let x = Math.ceil((data.left - ninepostion.value[6].x) * Proportion.value.x);
             let y = Math.abs(Math.ceil((data.top - ninepostion.value[6].y) * Proportion.value.y));
-
-            nine.value[6].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine.value[6].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            nine[6].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine[6].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            save_set_cache()
         }
         const moveHandler_8 = (data: any) => {
-            let x = 960 + Math.ceil((data.left - ninepostion.value[7].x) * Proportion.value.x);
+            let x = config.width / 2 + Math.ceil((data.left - ninepostion.value[7].x) * Proportion.value.x);
             let y = Math.abs(Math.ceil((data.top - ninepostion.value[7].y) * Proportion.value.y));;
-
-            nine.value[7].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine.value[7].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            nine[7].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine[7].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            save_set_cache()
         }
         const moveHandler_9 = (data: any) => {
             let x = config.width + Math.ceil((data.left - ninepostion.value[8].x) * Proportion.value.x);
             let y = Math.abs(Math.ceil((data.top - ninepostion.value[8].y) * Proportion.value.y));
-
-            nine.value[8].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine.value[8].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            nine[8].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+            nine[8].y = y > config.height ? config.height : y && y < 0 ? 0 : y
+            save_set_cache()
         }
-        watch(() => configselsect, (newVal, oldVal) => {
-            //console.log(newVal);
-            let tmp=JSON.parse($store.state.fusion_configuration);
-            let fortmp=null
-            let i
-            for(i of tmp.projectors){
-                if(i.col===$store.getters.GetTheCurrentlySelectedCamera[1]&&i.row===$store.getters.GetTheCurrentlySelectedCamera[0]){
-                    fortmp=JSON.parse(JSON.stringify(i)) 
+
+
+        //为了加载 缓存的配置时 同步点的位置
+        const syncpoint = () => {
+            for (let index = 0; index < ninepostion.value.length; index++) {
+                isactivearray.value[index] = false
+            }
+        }
+
+        const use_set_cache = () => {
+            if (set_cache.value[selectedprojector.value]!=null) {
+                let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
+                deepcopy(nine, tmp)
+                
+            }
+            //console.log(nine)
+            syncpoint()
+        };
+        const deepcopy = (o1: any, o2: any) => {
+            for (let k in o2) {
+                if (typeof o2[k] === 'object') {
+                    o1[k] = {};
+                    deepcopy(o1[k], o2[k]);
+                } else {
+                    o1[k] = o2[k];
                 }
             }
-            config=JSON.parse(JSON.stringify(fortmp)) 
-            console.log(config)
+        }
+        const save_set_cache = () => {
+            set_cache.value[selectedprojector.value] = JSON.stringify(nine);
+        }
+        onBeforeUnmount(() => {
+            if(set_cache.value[selectedprojector.value]!=null){
+                sessionStorage.SurfaceCorrection = JSON.stringify(set_cache.value)
+            }
+            
+        })
+
+        watch(() => configselsect, (newVal, oldVal) => {
+            let tmp = JSON.parse($store.state.fusion_configuration);
+            let fortmp = null
+            let i
+            for (i of tmp.projectors) {
+                if (i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && i.row === $store.getters.GetTheCurrentlySelectedCamera[0]) {
+                    fortmp = JSON.parse(JSON.stringify(i))
+                }
+            }
+            ste_status.value=1;
+            config = JSON.parse(JSON.stringify(fortmp))
+            use_set_cache()
+            setTimeout(() => {
+                ste_status.value=0;
+            }, 100);
         }, { deep: true })
         onMounted(() => {
+            ste_status.value=1;
             startpostion();
-
+            for (let index = 0; index < defaultninepostion.value.length; index++) {
+                defaultninepostion.value[index].x = ninepostion.value[index].x;
+                defaultninepostion.value[index].y = ninepostion.value[index].y;
+                defaultnine.value[index].x = config.point9[index].def_x
+                defaultnine.value[index].y = config.point9[index].def_y
+            }
+            setninepostion();
+            syncpoint()
+            setTimeout(() => {
+                ste_status.value=0;
+            }, 100);
         })
+        const setninepostion = () => {
+            for (let index = 0; index < defaultninepostion.value.length; index++) {
+                nine[index].x = config.point9[index].x
+                nine[index].y = config.point9[index].y
+            }
+        }
         const startpostion = () => {
             ninepostion.value[0].x = 0
             ninepostion.value[0].y = 0
@@ -288,180 +348,128 @@ export default defineComponent({
             Proportion.value.x = config.width / (div.value.offsetWidth - 25)
             Proportion.value.y = config.height / (div.value.offsetHeight - 25)
 
-            centor.value.x = config.width *2 / (div.value.offsetWidth + 25)
-            centor.value.y = config.height*2 / (div.value.offsetHeight + 25)
+            centor.value.x = config.width * 2 / (div.value.offsetWidth + 25)
+            centor.value.y = config.height * 2 / (div.value.offsetHeight + 25)
 
             for (let index = 0; index < defaultninepostion.value.length; index++) {
                 defaultninepostion.value[index].x = ninepostion.value[index].x;
                 defaultninepostion.value[index].y = ninepostion.value[index].y;
-                defaultnine.value[index].x = nine.value[index].x
-                defaultnine.value[index].y = nine.value[index].y
+                defaultnine.value[index].x = nine[index].x
+                defaultnine.value[index].y = nine[index].y
             }
-
-
+            if(sessionStorage.SurfaceCorrection&&sessionStorage.SurfaceCorrection.length>0){
+                set_cache.value=JSON.parse(sessionStorage.SurfaceCorrection);
+                use_set_cache()
+            }else{
+                
+            }
+            syncpoint()
         }
-        ///
         const reset = (index: number) => {
-            if (index == 0 || index == -1) {
-                nine.value[0].x = 0
-                nine.value[0].y = 1080
-                ninepostion.value[0].x = 0
-                ninepostion.value[0].y = 0
-            }
-            if (index == 1 || index == -1) {
-                nine.value[1].x = 960
-                nine.value[1].y = 1080
-                ninepostion.value[1].x = div.value.offsetWidth / 2 - 25
-                ninepostion.value[1].y = 0
-            }
-            if (index == 2 || index == -1) {
-                nine.value[2].x = 1920
-                nine.value[2].y = 1080
-                ninepostion.value[2].x = div.value.offsetWidth - 25
-                ninepostion.value[2].y = 0
-            }
-            if (index == 3 || index == -1) {
-                nine.value[3].x = 0
-                nine.value[3].y = 540
-                ninepostion.value[3].x = 0
-                ninepostion.value[3].y = div.value.offsetHeight / 2 - 8
-            }
-            if (index == 4 || index == -1) {
-                nine.value[4].x = 960
-                nine.value[4].y = 540
-                ninepostion.value[4].x = div.value.offsetWidth / 2 - 25
-                ninepostion.value[4].y = div.value.offsetHeight / 2 - 8
-            }
-            if (index == 5 || index == -1) {
-                nine.value[5].x = 1920
-                nine.value[5].y = 540
+            ninepostion.value[index].x = defaultninepostion.value[index].x;
+            ninepostion.value[index].y = defaultninepostion.value[index].y;
 
-                ninepostion.value[5].x = div.value.offsetWidth - 25
-                ninepostion.value[5].y = div.value.offsetHeight / 2
-            }
-            if (index == 6 || index == -1) {
-                nine.value[6].x = 0
-                nine.value[6].y = 0
+            nine[index].x = config.point9[index].def_x
+            nine[index].y = config.point9[index].def_y
 
-                ninepostion.value[6].x = 0
-                ninepostion.value[6].y = div.value.offsetHeight - 25
-            }
-            if (index == 7 || index == -1) {
-                nine.value[7].x = 960
-                nine.value[7].y = 0
-                ninepostion.value[7].x = div.value.offsetWidth / 2
-                ninepostion.value[7].y = div.value.offsetHeight - 25
-            }
-            if (index == 8 || index == -1) {
-                nine.value[8].x = 1920
-                nine.value[8].y = 0
+            set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, index+1, Number(config.point9[index].def_x), Number(config.point9[index].def_y));
 
-                ninepostion.value[8].x = div.value.offsetWidth - 25
-                ninepostion.value[8].y = div.value.offsetHeight - 25
-            }
-            //data is flase
-            // nine.value[index].x = config.point9[index].def_x
-            // nine.value[index].y = config.point9[index].def_y
             isshowarray.value[index] = false
             setTimeout(() => {
                 isshowarray.value[index] = true
             }, 100);
         }
         const resetall = () => {
-            for (let index = 0; index < nine.value.length; index++) {
-
-                ninepostion.value[index].x = defaultninepostion.value[index].x;
-                ninepostion.value[index].y = defaultninepostion.value[index].y;
-                nine.value[index].x = defaultnine.value[index].x
-                nine.value[index].y = defaultnine.value[index].y
-
-
-                isshowarray.value[index] = false
-                setTimeout(() => {
-                    isshowarray.value[index] = true
-                }, 100);
+            for (let index = 0; index < nine.length; index++) {
+                reset(index)
             }
         }
-        ///
-        watch(() => nine.value[0], (newVal, oldVal) => {
-            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 1, Number(newVal.x), Number(newVal.y));
-            ///
+        watch(() => nine[0], (newVal, oldVal) => {
+            if ($store.state.enablefusion&&ste_status.value==0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 1, Number(newVal.x), Number(newVal.y));
+
             if (!isactivearray.value[0]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(0, x, y)
             }
-            ///
+            save_set_cache()
+
         }, { deep: true })
-        watch(() => nine.value[1], (newVal, oldVal) => {
-            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 2, Number(newVal.x), Number(newVal.y));
-            ///
+        watch(() => nine[1], (newVal, oldVal) => {
+            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 2, Number(newVal.x), Number(newVal.y));
+
             if (!isactivearray.value[1]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(1, x, y)
             }
-            ///
+            save_set_cache()
+
         }, { deep: true })
-        watch(() => nine.value[2], (newVal, oldVal) => {
-            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 3, Number(newVal.x), Number(newVal.y));
+        watch(() => nine[2], (newVal, oldVal) => {
+            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 3, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[2]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(2, x, y)
             }
+            save_set_cache()
         }, { deep: true })
-        watch(() => nine.value[3], (newVal, oldVal) => {
-            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 4, Number(newVal.x), Number(newVal.y));
+        watch(() => nine[3], (newVal, oldVal) => {
+            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 4, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[3]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(3, x, y)
             }
+            save_set_cache()
         }, { deep: true })
-        watch(() => nine.value[4], (newVal, oldVal) => {
-            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 5, Number(newVal.x), Number(newVal.y));
+        watch(() => nine[4], (newVal, oldVal) => {
+            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 5, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[4]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(4, x, y)
             }
+            save_set_cache()
         }, { deep: true })
-        watch(() => nine.value[5], (newVal, oldVal) => {
-            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 6, Number(newVal.x), Number(newVal.y));
+        watch(() => nine[5], (newVal, oldVal) => {
+            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 6, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[5]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(5, x, y)
             }
+            save_set_cache()
         }, { deep: true })
-        watch(() => nine.value[6], (newVal, oldVal) => {
-            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 7, Number(newVal.x), Number(newVal.y));
+        watch(() => nine[6], (newVal, oldVal) => {
+            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 7, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[6]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(6, x, y)
             }
+            save_set_cache()
         }, { deep: true })
-        watch(() => nine.value[7], (newVal, oldVal) => {
-            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 8, Number(newVal.x), Number(newVal.y));
+        watch(() => nine[7], (newVal, oldVal) => {
+            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 8, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[7]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(7, x, y)
             }
+            save_set_cache()
         }, { deep: true })
-        watch(() => nine.value[8], (newVal, oldVal) => {
-            if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 9, Number(newVal.x), Number(newVal.y));
+        watch(() => nine[8], (newVal, oldVal) => {
+            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 9, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[8]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
                 setdianposin(8, x, y)
             }
+            save_set_cache()
         }, { deep: true })
-        ///
         let model = ref(null);
-        let options = ref(['10', '20', '30', '40', '50']);
         let set = GlobalData.getInstance().getCurrentClient();
         const setdianposin = (index: number, x: number, y: number) => {
             ninepostion.value[index].x = x
@@ -471,16 +479,16 @@ export default defineComponent({
             setTimeout(() => {
                 isshowarray.value[index] = true
             }, 100);
-
-
-
+            
         }
-        const save=()=>{
+        const save = () => {
             set?.SaveBlendingConfig("")
+            setTimeout(() => {
+                set?.GetBlendingConfig("").then((res) => { $store.commit("setfusion_configuration", res?.config); })
+            }, 1000);
         }
         return {
             model,
-            options,
             save,
             nine,
             moveHandler_1,
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index b693e5d..c59bb63 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -8,7 +8,6 @@
   ">
     <q-card class="overflow-hidden" style="max-width: 90vw; height: 90vh">
       <q-form>
-        <!-- @submit="onSubmit" -->
         <q-card-section class="q-ma-none q-pa-sm">
           <div class="row">
             <div class="col-auto text-h6">
@@ -31,15 +30,18 @@
           <div class="row" style="border: 1px solid;text-align: center;">
             <div class="col-3" style="border-right: 1px solid;">
               <p class="text-center">{{ $t("Projector") }}</p>
-              <projector-item class="w-100" :llabel="$t('Projector') + '1'" :lvalue="'0/0'"></projector-item>
-              <projector-item class="w-100" :llabel="$t('Projector') + '2'" :lvalue="'1/0'"></projector-item>
+              <!-- row 在前col在后 -->
+              <div v-for="(item,index_row) in config.row">
+                <projector-item v-for="(item,index_col) in config.col" class="w-100" :llabel="$t('Projector') + (index_row*config.col+index_col+1)" :lvalue="index_row+'/'+index_col"></projector-item>
+              </div>
+              
               <div class="col-12" style="text-align: center">
-                {{ $t('Whether to enable mixing') }}<q-checkbox v-model="EnableBlending" />
+                {{ $t('Whether to enable integration') }}<q-checkbox v-model="EnableBlending" />
               </div>
             </div>
             <div class="col-9">
               <div class="q-ta-md">
-                <q-btn-toggle :disable="!$store.state.EnableBlending" no-caps v-model="options" toggle-color="primary"
+                <q-btn-toggle :disable="!$store.state.enablefusion" no-caps v-model="options" toggle-color="primary"
                   :options="[
                     { label: $t('FusionLocale'), value: 'FusionLocale' },
                     {
@@ -54,7 +56,7 @@
                       label: $t('DensityCorrection'),
                       value: 'DensityCorrection',
                     },
-                    { label: $t('GridSettings'), value: 'GridSettings' },
+                    // { label: $t('GridSettings'), value: 'GridSettings' },
                   ]" />
               </div>
               <div style="min-height: 72vh">
@@ -68,6 +70,7 @@
 
         <q-card-actions align="right">
           <q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup />
+          <q-btn flat :label="$t('save config')" no-caps color="primary" @click="save" v-close-popup />
         </q-card-actions>
       </q-form>
     </q-card>
@@ -93,9 +96,6 @@ import {
   computed,
   onMounted,
   onBeforeMount,
-  onUpdated,
-  onBeforeUnmount,
-  nextTick,
 } from "vue";
 import { useStore } from "src/store";
 import { useQuasar, copyToClipboard } from "quasar";
@@ -128,11 +128,11 @@ export default defineComponent({
     let $q = useQuasar();
     let $t = useI18n();
     let show_dialog = ref(false);
-    const target_language = ref("zh-CN");
-    const text = ref("Projector");
     const showDialog = async () => {
       show_dialog.value = true;
     };
+    //投影机数量
+    const config=ref({col:0,row:0});
     const EnableBlending = ref(false);
     let optionsstr = ref();
     optionsstr.value = "FusionLocale";
@@ -147,17 +147,38 @@ export default defineComponent({
     watch(
       () => EnableBlending,
       (newVal, oldVal) => {
-        $store.commit("setEnableBlending", newVal.value);
+        $store.commit("setEnablefusion", newVal.value);
         set?.EnableBlending(newVal.value);
       },
       { deep: true }
     );
-    let data = ref({});
 
+      const erroe=()=>{
+        $q.notify({
+              color: "negative",
+              icon: "warning",
+              message:"数据获取失败!",
+              position: "top",
+              timeout: 1500,
+            });
+      }
+      const save = () => {
+            set?.SaveBlendingConfig("")
+            show_dialog.value = false
+        }
     onBeforeMount(() => {
       setTimeout(() => {
-        set?.GetBlendingConfig("").then((res)=>{let tmp=JSON.parse(res?res.config:"");EnableBlending.value=tmp.enable;$store.commit("setEnableBlending", tmp.enable);;$store.commit("setfusion_configuration", res?.config);})
-      }, 1000);
+        try {
+          set?.GetBlendingConfig("").then((res)=>{let tmp=JSON.parse(res?res.config:"");EnableBlending.value=tmp.enable;$store.commit("setEnablefusion", tmp.enable);config.value.col=tmp.col;config.value.row=tmp.row;$store.commit("setfusion_configuration", res?.config);})  
+        } catch (error) {
+          //let textdata="{\"col\":2,\"enable\":true,\"projectors\":[{\"col\":0,\"height\":1080,\"hor_density\":[{\"def_x\":0,\"def_y\":540,\"number\":1,\"x\":0,\"y\":540},{\"def_x\":480,\"def_y\":540,\"number\":2,\"x\":480,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":1440,\"def_y\":540,\"number\":4,\"x\":1440,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":5,\"x\":1920,\"y\":540}],\"params\":[{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0}],\"point4\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":2,\"x\":1171,\"y\":712},{\"def_x\":0,\"def_y\":0,\"number\":3,\"x\":0,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":4,\"x\":1920,\"y\":0}],\"point9\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":960,\"def_y\":1080,\"number\":2,\"x\":960,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":3,\"x\":1920,\"y\":1080},{\"def_x\":0,\"def_y\":540,\"number\":4,\"x\":0,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":5,\"x\":960,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":6,\"x\":1920,\"y\":540},{\"def_x\":0,\"def_y\":0,\"number\":7,\"x\":0,\"y\":0},{\"def_x\":960,\"def_y\":0,\"number\":8,\"x\":960,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":9,\"x\":1920,\"y\":0}],\"row\":0,\"ver_density\":[{\"def_x\":960,\"def_y\":1080,\"number\":1,\"x\":960,\"y\":1080},{\"def_x\":960,\"def_y\":810,\"number\":2,\"x\":960,\"y\":810},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":960,\"def_y\":270,\"number\":4,\"x\":960,\"y\":270},{\"def_x\":960,\"def_y\":0,\"number\":5,\"x\":960,\"y\":0}],\"width\":1920},{\"col\":1,\"height\":1080,\"hor_density\":[{\"def_x\":0,\"def_y\":540,\"number\":1,\"x\":0,\"y\":540},{\"def_x\":480,\"def_y\":540,\"number\":2,\"x\":480,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":1440,\"def_y\":540,\"number\":4,\"x\":1440,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":5,\"x\":1920,\"y\":540}],\"params\":[{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0}],\"point4\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":2,\"x\":1920,\"y\":1080},{\"def_x\":0,\"def_y\":0,\"number\":3,\"x\":0,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":4,\"x\":1920,\"y\":0}],\"point9\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":960,\"def_y\":1080,\"number\":2,\"x\":960,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":3,\"x\":1920,\"y\":1080},{\"def_x\":0,\"def_y\":540,\"number\":4,\"x\":0,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":5,\"x\":960,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":6,\"x\":1920,\"y\":540},{\"def_x\":0,\"def_y\":0,\"number\":7,\"x\":0,\"y\":0},{\"def_x\":960,\"def_y\":0,\"number\":8,\"x\":960,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":9,\"x\":1920,\"y\":0}],\"row\":0,\"ver_density\":[{\"def_x\":960,\"def_y\":1080,\"number\":1,\"x\":960,\"y\":1080},{\"def_x\":960,\"def_y\":810,\"number\":2,\"x\":960,\"y\":810},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":960,\"def_y\":270,\"number\":4,\"x\":960,\"y\":270},{\"def_x\":960,\"def_y\":0,\"number\":5,\"x\":960,\"y\":0}],\"width\":1920}],\"row\":1,\"screen_height\":0,\"screen_width\":0}"
+          //let tmp=JSON.parse(textdata);EnableBlending.value=tmp.enable;$store.commit("setEnablefusion", tmp.enable);config.value.col=tmp.col;config.value.row=tmp.row;$store.commit("setfusion_configuration", textdata)
+          //set?.GetBlendingConfig("").then((res)=>{let tmp=JSON.parse(res?res.config:"");EnableBlending.value=tmp.enable;$store.commit("setEnablefusion", tmp.enable);config.value.col=tmp.col;config.value.row=tmp.row;$store.commit("setfusion_configuration", res?.config);})
+          console.log("data is false")
+        }
+        
+        
+      }, 500);
       })
     return {
       show_dialog,
@@ -165,6 +186,8 @@ export default defineComponent({
       copyToClipboard,
       showDialog,
       EnableBlending,
+      config,
+      save
     };
   },
 });
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 3d46c3e..422363a 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -423,5 +423,5 @@ export default {
   "Projector":"Projector",
   "resetall":"reset all",
   "save config":"save config",
-  "Whether to enable mixing":"Whether to enable mixing"
+  "Whether to enable integration":"Whether to enable integration"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 26d435e..8baec0c 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -692,5 +692,5 @@ export default {
   "Projector":"投影机",
   "resetall":"重置所有",
   "save config":"保存配置",
-  "Whether to enable mixing":"是否启用混合"
+  "Whether to enable integration":"是否启用融合"
 };
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index 39d11bc..31baac0 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -412,7 +412,7 @@
           <q-item
             clickable
             v-close-popup
-            @click="$refs.fusion_settings_dialog.showDialog()"
+            @click="$refs.fusion_settings_dialog.showDialog();getconfig()"
           >
             <q-item-section avatar>
               <!-- <q-icon name="devices" /> -->
@@ -566,6 +566,8 @@ export default defineComponent({
     let $q = useQuasar();
     let $t = useI18n();
 
+    let set = GlobalData.getInstance().getCurrentClient();
+
     let show_advanced_menu = ref(true);
     const edge_blending_dialog: Ref<any> = ref(null);
     const register_dialog: Ref<any> = ref(null);
@@ -594,6 +596,14 @@ export default defineComponent({
         return 'rotate '+sulv+'s linear infinite'
       }
     );
+    const getconfig=()=>{
+      try {
+        set?.GetBlendingConfig("").then((res)=>{})
+      } catch (error) {
+        
+      }
+      
+    }
     const checkRegistered = () => {
       if (
         GlobalData.getInstance().getCurrentClient()?.is_connected &&
@@ -660,6 +670,7 @@ export default defineComponent({
     });
 
     return {
+      getconfig,
       show_advanced_menu,
       plan_running,
       edge_blending_dialog,

From 2a74a78e99cb0b10404e8d7b489a4287b641e31a Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 12 Jan 2023 16:06:00 +0800
Subject: [PATCH 06/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 12 +++++
 .../FusionSettings/FourPointCalibration.vue   | 12 +++++
 .../FusionSettings/FusionLocale.vue           | 47 ++++++++++---------
 .../FusionSettings/SurfaceCorrection.vue      |  9 ++++
 src/components/FusionSettingsDialog.vue       | 19 +++++++-
 5 files changed, 74 insertions(+), 25 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 2c73544..249c38d 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -213,6 +213,7 @@ export default defineComponent({
             }
             ste_status.value=1;
             config = JSON.parse(JSON.stringify(fortmp))
+            use_server_config()
             use_set_cache()
             setTimeout(() => {
                 ste_status.value=0;
@@ -301,6 +302,17 @@ export default defineComponent({
             save_set_cache()
         }
 
+        const use_server_config=()=>{
+            for (let index = 0; index < config.hor_density.length; index++) {
+                value[index].x = config.ver_density[index].x
+                value[index].y = config.ver_density[index].y
+                value[index].number = config.ver_density[index].number
+                value[index + 5].x = config.hor_density[index].x
+                value[index + 5].y = config.hor_density[index].y
+                value[index+5].number = config.hor_density[index].number
+            }
+        }
+
         onMounted(() => {
             
             initialization()
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 99e4bcf..7367a77 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -154,6 +154,17 @@ export default defineComponent({
             }, 100);
         })
 
+        const use_server_config=()=>{
+            for (let index = 0; index < fourpostion.value.length; index++) {
+                defaultfourpostion.value[index].x = fourpostion.value[index].x;
+                defaultfourpostion.value[index].y = fourpostion.value[index].y;
+                defaultfour.value[index].x = config.point4[index].def_x
+                defaultfour.value[index].y = config.point4[index].def_y
+                four[index].x = config.point4[index].x
+                four[index].y = config.point4[index].y
+            }
+        }
+
         const setpoa = () => {
             
             points[0].x = 0
@@ -279,6 +290,7 @@ export default defineComponent({
             ste_status.value=1;
             config = JSON.parse(JSON.stringify(fortmp))
             //setpoa();
+            use_server_config()
             use_set_cache()
             setTimeout(() => {
                 ste_status.value=0;
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index c1839d4..c2e8d87 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -2,16 +2,17 @@
   <div class="row">
     <div class="col-12">
       <!-- <p class="text-center">{{ $t('Set the fusion band width') }}</p> -->
+      <div style="height: 1rem;"></div>
       <div class="row">
         <div class="col-12">
           <div class="row">
             <div class="col-4 offset-4">
               <div class="row">
-                <div class="col-6">
-                  <q-toggle class="float-right" v-model="array[0].isshow" label="" />
+                <div class="col-3">
+                  <q-toggle class="float-right"  v-model="array[0].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" @focus="group = 0" v-model="array[0].value"
+                  <q-input filled type="number" :bg-color="group==0?'cyan-1':''"  @focus="group = 0" v-model="array[0].value"
                     :label="$t('upper fusion zone parameters')" lazy-rules :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
@@ -27,11 +28,11 @@
           <div class="row">
             <div class="col-6">
               <div class="row">
-                <div class="col-6">
+                <div class="col-3">
                   <q-toggle class="float-right" v-model="array[1].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" @focus="group = 1" v-model="array[1].value"
+                  <q-input filled type="number" :bg-color="group==1?'cyan-1':''"  @focus="group = 1" v-model="array[1].value"
                     :label="$t('Left fusion Band Parameters')" lazy-rules :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
@@ -43,11 +44,11 @@
             </div>
             <div class="col-6">
               <div class="row">
-                <div class="col-6">
+                <div class="col-3">
                   <q-toggle class="float-right" v-model="array[2].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" @focus="group = 2" v-model="array[2].value"
+                  <q-input filled type="number" :bg-color="group==2?'cyan-1':''"  @focus="group = 2" v-model="array[2].value"
                     :label="$t('Right fusion Band Parameters')" lazy-rules :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
@@ -63,11 +64,11 @@
           <div class="row">
             <div class="col-4 offset-4">
               <div class="row">
-                <div class="col-6">
+                <div class="col-3">
                   <q-toggle class="float-right" v-model="array[3].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" @focus="group = 3" v-model="array[3].value"
+                  <q-input filled type="number" :bg-color="group==3?'cyan-1':''"  @focus="group = 3" v-model="array[3].value"
                     :label="$t('Lower fusion Zone Parameters')" lazy-rules :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
@@ -154,7 +155,6 @@ export default defineComponent({
       if (set_cache.value[selectedprojector.value] != null) {
         let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
         deepcopy(array, tmp)
-        //console.log(set_cache.value,"use")
       }
     };
     const deepcopy = (o1: any, o2: any) => {
@@ -182,8 +182,9 @@ export default defineComponent({
         }
       }
       ste_status.value = 1;
+      
       config = JSON.parse(JSON.stringify(fortmp))
-      //startconfig()
+      use_server_config()
       use_set_cache()
       setTimeout(() => {
         ste_status.value = 0;
@@ -218,15 +219,24 @@ export default defineComponent({
     };
     const startconfig = () => {
       for (let index = 0; index < array.length; index++) {
-        array[index].gamma = config.params[index].gamma
-        array[index].alpha = config.params[index].alpha
-        array[index].p = config.params[index].power
+        array[index].gamma = config.params[index].gamma.toFixed(2)
+        array[index].alpha = config.params[index].alpha.toFixed(2)
+        array[index].p = config.params[index].power.toFixed(2)
         array[index].isshow = config.params[index].enable
         array[index].value = Number(config.params[index].size)
       }
       if (sessionStorage.FusionLocale) set_cache.value = JSON.parse(sessionStorage.FusionLocale); use_set_cache()
 
     }
+    const use_server_config=()=>{
+      for (let index = 0; index < array.length; index++) {
+        array[index].gamma = config.params[index].gamma.toFixed(2)
+        array[index].alpha = config.params[index].alpha.toFixed(2)
+        array[index].p = config.params[index].power.toFixed(2)
+        array[index].isshow = config.params[index].enable
+        array[index].value = Number(config.params[index].size)
+      }
+    }
     startconfig()
     onBeforeUnmount(() => {
       sessionStorage.FusionLocale = JSON.stringify(set_cache.value)
@@ -236,9 +246,6 @@ export default defineComponent({
       () => array[0],
       (newVal, oldVal) => {
         if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 1, array[0].isshow, Number(array[0].value));
-        // if (!array[0].isshow) {
-        //   array[0].value = 0
-        // }
         save_set_cache()
       },
       { deep: true }
@@ -247,9 +254,6 @@ export default defineComponent({
       () => array[1],
       (newVal, oldVal) => {
         if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 0, array[1].isshow, Number(array[1].value));
-        // if (!array[1].isshow) {
-        //   array[1].value = 0
-        // }
         save_set_cache()
       },
       { deep: true }
@@ -258,9 +262,6 @@ export default defineComponent({
       () => array[2],
       (newVal, oldVal) => {
         if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 2, array[2].isshow, Number(array[2].value));
-        // if (!array[2].isshow) {
-        //   array[2].value = 0
-        // }
         save_set_cache()
       },
       { deep: true }
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 014b05b..be4fa82 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -291,6 +291,7 @@ export default defineComponent({
             }
             ste_status.value=1;
             config = JSON.parse(JSON.stringify(fortmp))
+            use_server_config()
             use_set_cache()
             setTimeout(() => {
                 ste_status.value=0;
@@ -365,6 +366,14 @@ export default defineComponent({
             }
             syncpoint()
         }
+        const use_server_config=()=>{
+            for (let index = 0; index < defaultninepostion.value.length; index++) {
+                defaultninepostion.value[index].x = ninepostion.value[index].x;
+                defaultninepostion.value[index].y = ninepostion.value[index].y;
+                defaultnine.value[index].x = nine[index].x
+                defaultnine.value[index].y = nine[index].y
+            }
+        }
         const reset = (index: number) => {
             ninepostion.value[index].x = defaultninepostion.value[index].x;
             ninepostion.value[index].y = defaultninepostion.value[index].y;
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index c59bb63..268fea6 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -15,7 +15,7 @@
             </div>
 
             <q-space />
-            <q-btn flat round icon="close" color="red" v-close-popup>
+            <q-btn flat round icon="close" color="red" @click="clear()" v-close-popup>
               <q-tooltip>
                 {{ $t("close") }}
               </q-tooltip>
@@ -26,7 +26,7 @@
 
         <q-separator />
         <!-- height: 80vh -->
-        <q-card-section class="scroll" style="width: 90vw">
+        <q-card-section class="scroll" style="width: 70vw">
           <div class="row" style="border: 1px solid;text-align: center;">
             <div class="col-3" style="border-right: 1px solid;">
               <p class="text-center">{{ $t("Projector") }}</p>
@@ -165,7 +165,21 @@ export default defineComponent({
       const save = () => {
             set?.SaveBlendingConfig("")
             show_dialog.value = false
+            clear()
+            set?.GetBlendingConfig("").then((res)=>{let tmp=JSON.parse(res?res.config:"");EnableBlending.value=tmp.enable;$store.commit("setEnablefusion", tmp.enable);config.value.col=tmp.col;config.value.row=tmp.row;$store.commit("setfusion_configuration", res?.config);})  
         }
+      const clear=()=>{
+        
+        sessionStorage.removeItem('DensityCorrection')
+            sessionStorage.removeItem('FourPointCalibration')
+            
+            sessionStorage.removeItem('SurfaceCorrection')
+            
+            setTimeout(()=>{
+              sessionStorage.removeItem('FusionLocale')
+            },500)
+      }
+
     onBeforeMount(() => {
       setTimeout(() => {
         try {
@@ -181,6 +195,7 @@ export default defineComponent({
       }, 500);
       })
     return {
+      clear,
       show_dialog,
       options,
       copyToClipboard,

From 4d967cb4ae877ad91940c4cda4a74c0562b43b7c Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 12 Jan 2023 16:34:48 +0800
Subject: [PATCH 07/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=8F=98=E5=8C=96=E8=B7=9F=E9=9A=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 95 +++++++++++++++----------
 1 file changed, 57 insertions(+), 38 deletions(-)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 268fea6..51fbe48 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -27,14 +27,16 @@
         <q-separator />
         <!-- height: 80vh -->
         <q-card-section class="scroll" style="width: 70vw">
-          <div class="row" style="border: 1px solid;text-align: center;">
-            <div class="col-3" style="border-right: 1px solid;">
+          <div class="row" style="border: 1px solid #b0bec5;text-align: center;">
+            <div class="col-3" style="border-right: 1px solid #b0bec5;">
               <p class="text-center">{{ $t("Projector") }}</p>
               <!-- row 在前col在后 -->
-              <div v-for="(item,index_row) in config.row">
-                <projector-item v-for="(item,index_col) in config.col" class="w-100" :llabel="$t('Projector') + (index_row*config.col+index_col+1)" :lvalue="index_row+'/'+index_col"></projector-item>
+              <div v-for="(item, index_row) in config.row">
+                <projector-item v-for="(item, index_col) in config.col" class="w-100"
+                  :llabel="$t('Projector') + (index_row * config.col + index_col + 1)"
+                  :lvalue="index_row + '/' + index_col"></projector-item>
               </div>
-              
+
               <div class="col-12" style="text-align: center">
                 {{ $t('Whether to enable integration') }}<q-checkbox v-model="EnableBlending" />
               </div>
@@ -60,7 +62,7 @@
                   ]" />
               </div>
               <div style="min-height: 72vh">
-                <component :is="options" />
+                <component :is="options" v-if="resize" />
               </div>
             </div>
           </div>
@@ -131,8 +133,23 @@ export default defineComponent({
     const showDialog = async () => {
       show_dialog.value = true;
     };
+    const resize = ref(true)
+    //窗口变动重新渲染
+    onMounted(() => {
+      //监听窗口变化
+      window.onresize = () => {
+        return (() => {
+          console.log("resize")
+          resize.value = false; setTimeout(() => {
+            resize.value = true
+          }, 100);
+        })();
+      };
+    });
+
+
     //投影机数量
-    const config=ref({col:0,row:0});
+    const config = ref({ col: 0, row: 0 });
     const EnableBlending = ref(false);
     let optionsstr = ref();
     optionsstr.value = "FusionLocale";
@@ -153,48 +170,50 @@ export default defineComponent({
       { deep: true }
     );
 
-      const erroe=()=>{
-        $q.notify({
-              color: "negative",
-              icon: "warning",
-              message:"数据获取失败!",
-              position: "top",
-              timeout: 1500,
-            });
-      }
-      const save = () => {
-            set?.SaveBlendingConfig("")
-            show_dialog.value = false
-            clear()
-            set?.GetBlendingConfig("").then((res)=>{let tmp=JSON.parse(res?res.config:"");EnableBlending.value=tmp.enable;$store.commit("setEnablefusion", tmp.enable);config.value.col=tmp.col;config.value.row=tmp.row;$store.commit("setfusion_configuration", res?.config);})  
-        }
-      const clear=()=>{
-        
-        sessionStorage.removeItem('DensityCorrection')
-            sessionStorage.removeItem('FourPointCalibration')
-            
-            sessionStorage.removeItem('SurfaceCorrection')
-            
-            setTimeout(()=>{
-              sessionStorage.removeItem('FusionLocale')
-            },500)
-      }
+    const erroe = () => {
+      $q.notify({
+        color: "negative",
+        icon: "warning",
+        message: "数据获取失败!",
+        position: "top",
+        timeout: 1500,
+      });
+    }
+    const save = () => {
+      set?.SaveBlendingConfig("")
+      show_dialog.value = false
+      clear()
+      set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); EnableBlending.value = tmp.enable; $store.commit("setEnablefusion", tmp.enable); config.value.col = tmp.col; config.value.row = tmp.row; $store.commit("setfusion_configuration", res?.config); })
+    }
+    const clear = () => {
+
+      sessionStorage.removeItem('DensityCorrection')
+      sessionStorage.removeItem('FourPointCalibration')
+
+      sessionStorage.removeItem('SurfaceCorrection')
+
+      setTimeout(() => {
+        sessionStorage.removeItem('FusionLocale')
+      }, 500)
+    }
 
     onBeforeMount(() => {
       setTimeout(() => {
         try {
-          set?.GetBlendingConfig("").then((res)=>{let tmp=JSON.parse(res?res.config:"");EnableBlending.value=tmp.enable;$store.commit("setEnablefusion", tmp.enable);config.value.col=tmp.col;config.value.row=tmp.row;$store.commit("setfusion_configuration", res?.config);})  
+          set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); EnableBlending.value = tmp.enable; $store.commit("setEnablefusion", tmp.enable); config.value.col = tmp.col; config.value.row = tmp.row; $store.commit("setfusion_configuration", res?.config); })
         } catch (error) {
           //let textdata="{\"col\":2,\"enable\":true,\"projectors\":[{\"col\":0,\"height\":1080,\"hor_density\":[{\"def_x\":0,\"def_y\":540,\"number\":1,\"x\":0,\"y\":540},{\"def_x\":480,\"def_y\":540,\"number\":2,\"x\":480,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":1440,\"def_y\":540,\"number\":4,\"x\":1440,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":5,\"x\":1920,\"y\":540}],\"params\":[{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0}],\"point4\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":2,\"x\":1171,\"y\":712},{\"def_x\":0,\"def_y\":0,\"number\":3,\"x\":0,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":4,\"x\":1920,\"y\":0}],\"point9\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":960,\"def_y\":1080,\"number\":2,\"x\":960,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":3,\"x\":1920,\"y\":1080},{\"def_x\":0,\"def_y\":540,\"number\":4,\"x\":0,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":5,\"x\":960,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":6,\"x\":1920,\"y\":540},{\"def_x\":0,\"def_y\":0,\"number\":7,\"x\":0,\"y\":0},{\"def_x\":960,\"def_y\":0,\"number\":8,\"x\":960,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":9,\"x\":1920,\"y\":0}],\"row\":0,\"ver_density\":[{\"def_x\":960,\"def_y\":1080,\"number\":1,\"x\":960,\"y\":1080},{\"def_x\":960,\"def_y\":810,\"number\":2,\"x\":960,\"y\":810},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":960,\"def_y\":270,\"number\":4,\"x\":960,\"y\":270},{\"def_x\":960,\"def_y\":0,\"number\":5,\"x\":960,\"y\":0}],\"width\":1920},{\"col\":1,\"height\":1080,\"hor_density\":[{\"def_x\":0,\"def_y\":540,\"number\":1,\"x\":0,\"y\":540},{\"def_x\":480,\"def_y\":540,\"number\":2,\"x\":480,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":1440,\"def_y\":540,\"number\":4,\"x\":1440,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":5,\"x\":1920,\"y\":540}],\"params\":[{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0}],\"point4\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":2,\"x\":1920,\"y\":1080},{\"def_x\":0,\"def_y\":0,\"number\":3,\"x\":0,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":4,\"x\":1920,\"y\":0}],\"point9\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":960,\"def_y\":1080,\"number\":2,\"x\":960,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":3,\"x\":1920,\"y\":1080},{\"def_x\":0,\"def_y\":540,\"number\":4,\"x\":0,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":5,\"x\":960,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":6,\"x\":1920,\"y\":540},{\"def_x\":0,\"def_y\":0,\"number\":7,\"x\":0,\"y\":0},{\"def_x\":960,\"def_y\":0,\"number\":8,\"x\":960,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":9,\"x\":1920,\"y\":0}],\"row\":0,\"ver_density\":[{\"def_x\":960,\"def_y\":1080,\"number\":1,\"x\":960,\"y\":1080},{\"def_x\":960,\"def_y\":810,\"number\":2,\"x\":960,\"y\":810},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":960,\"def_y\":270,\"number\":4,\"x\":960,\"y\":270},{\"def_x\":960,\"def_y\":0,\"number\":5,\"x\":960,\"y\":0}],\"width\":1920}],\"row\":1,\"screen_height\":0,\"screen_width\":0}"
           //let tmp=JSON.parse(textdata);EnableBlending.value=tmp.enable;$store.commit("setEnablefusion", tmp.enable);config.value.col=tmp.col;config.value.row=tmp.row;$store.commit("setfusion_configuration", textdata)
           //set?.GetBlendingConfig("").then((res)=>{let tmp=JSON.parse(res?res.config:"");EnableBlending.value=tmp.enable;$store.commit("setEnablefusion", tmp.enable);config.value.col=tmp.col;config.value.row=tmp.row;$store.commit("setfusion_configuration", res?.config);})
-          console.log("data is false")
+          // console.log("data is false")
+          erroe()
         }
-        
-        
+
+
       }, 500);
-      })
+    })
     return {
+      resize,
       clear,
       show_dialog,
       options,

From ff63d3dc67ec4b8177986beab0e1c4b77aafb225 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 13 Jan 2023 09:27:00 +0800
Subject: [PATCH 08/78] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E6=9B=B4=E6=94=B9=E6=97=B6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 101 +++++++++------
 .../FusionSettings/FourPointCalibration.vue   | 105 +++++++++++-----
 .../FusionSettings/FusionLocale.vue           |  59 ++++++---
 .../FusionSettings/SurfaceCorrection.vue      | 116 +++++++++++-------
 src/components/FusionSettingsDialog.vue       |  35 ++++--
 src/pages/TopToolBar.vue                      |   1 +
 6 files changed, 272 insertions(+), 145 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 249c38d..31f0034 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -154,12 +154,12 @@ export default defineComponent({
     setup() {
         let $store = useStore();
         let $t = useI18n();
-        const value = reactive([{ x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}, { x: 0, y: 0 ,number:0}]);
+        const value = reactive([{ x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }]);
         let model = ref(null);
         const div = ref();
         const isshowarray = ref([true, true, true, true, true, true, true, true, true, true])
         const isactivearray = ref([true, true, true, true, true, true, true, true, true, true])
-        const default_location: any = reactive([{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },]);
+        const default_location: any = reactive([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 },]);
         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 });
@@ -170,7 +170,7 @@ export default defineComponent({
             return $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col + $store.getters.GetTheCurrentlySelectedCamera[1]
         })
         const set_cache: any = ref([]);
-        const ste_status =ref(0);
+        const ste_status = ref(0);
         //
         //为了加载 缓存的配置时 同步点的位置
         const syncpoint = () => {
@@ -180,7 +180,7 @@ export default defineComponent({
         }
 
         const use_set_cache = () => {
-            if (set_cache.value[selectedprojector.value]!=null) {
+            if (set_cache.value[selectedprojector.value] != null) {
                 let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
                 deepcopy(value, tmp)
                 syncpoint()
@@ -211,33 +211,33 @@ export default defineComponent({
                     fortmp = JSON.parse(JSON.stringify(i))
                 }
             }
-            ste_status.value=1;
+            ste_status.value = 1;
             config = JSON.parse(JSON.stringify(fortmp))
             use_server_config()
             use_set_cache()
             setTimeout(() => {
-                ste_status.value=0;
+                ste_status.value = 0;
             }, 100);
         }, { deep: true })
         const initialization = () => {
-            ste_status.value=1;
+            ste_status.value = 1;
             for (let index = 0; index < config.hor_density.length; index++) {
                 value[index].x = config.ver_density[index].x
                 value[index].y = config.ver_density[index].y
                 value[index].number = config.ver_density[index].number
                 value[index + 5].x = config.hor_density[index].x
                 value[index + 5].y = config.hor_density[index].y
-                value[index+5].number = config.hor_density[index].number
+                value[index + 5].number = config.hor_density[index].number
             }
-            if(sessionStorage.DensityCorrection&&sessionStorage.DensityCorrection.length>0){
-                set_cache.value=JSON.parse(sessionStorage.DensityCorrection);
+            if (sessionStorage.DensityCorrection && sessionStorage.DensityCorrection.length > 0) {
+                set_cache.value = JSON.parse(sessionStorage.DensityCorrection);
                 use_set_cache()
-            }else{
-                
+            } else {
+
             }
             syncpoint()
             setTimeout(() => {
-                ste_status.value=0;
+                ste_status.value = 0;
             }, 100);
         }
 
@@ -250,11 +250,11 @@ export default defineComponent({
             if (index >= 5) {
                 value[index].x = config.hor_density[index - 5].def_x
                 value[index].y = config.hor_density[index - 5].def_y
-                set?.SetBlendingVerDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index - 5+1, Number(value[index].x));
+                set?.SetBlendingVerDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index - 5 + 1, Number(value[index].x));
             } else {
                 value[index].x = config.ver_density[index].def_x
                 value[index].y = config.ver_density[index].def_y
-                set?.SetBlendingHorDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index+1, Number(value[index].y))
+                set?.SetBlendingHorDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index + 1, Number(value[index].y))
 
             }
 
@@ -265,7 +265,7 @@ export default defineComponent({
                 isshowarray.value[index] = true
             }, 100);
         }
-        const point_postion: any = reactive([{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },{ x: 0, y: 0 },])
+        const point_postion: any = reactive([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 },])
         let set = GlobalData.getInstance().getCurrentClient();
         const save = () => {
             set?.SaveBlendingConfig("")
@@ -293,7 +293,7 @@ export default defineComponent({
                 case 9:
                     x = Math.ceil($event.left * Proportion.value.x);
                     y = config.height / 2 - Math.ceil(($event.top - default_location[index].y) * Proportion.value.y);
-                    
+
                     break;
                 default:
             }
@@ -302,19 +302,19 @@ export default defineComponent({
             save_set_cache()
         }
 
-        const use_server_config=()=>{
+        const use_server_config = () => {
             for (let index = 0; index < config.hor_density.length; index++) {
                 value[index].x = config.ver_density[index].x
                 value[index].y = config.ver_density[index].y
                 value[index].number = config.ver_density[index].number
                 value[index + 5].x = config.hor_density[index].x
                 value[index + 5].y = config.hor_density[index].y
-                value[index+5].number = config.hor_density[index].number
+                value[index + 5].number = config.hor_density[index].number
             }
         }
 
         onMounted(() => {
-            
+
             initialization()
             Proportion.value.x = config.width / (div.value.offsetWidth - 25)
             Proportion.value.y = config.height / (div.value.offsetHeight - 25)
@@ -329,9 +329,32 @@ export default defineComponent({
                     point_postion[index].x = default_location[index].x = Width * (index - 5)
                 }
             }
-            
+
         })
 
+        //窗口变动重新渲染
+        onMounted(() => {
+            //监听窗口变化
+            window.onresize = () => {
+                return (() => {
+                    initialization()
+                    Proportion.value.x = config.width / (div.value.offsetWidth - 25)
+                    Proportion.value.y = config.height / (div.value.offsetHeight - 25)
+                    let Width = (div.value.offsetWidth - 25) / 4
+                    let Height = (div.value.offsetHeight - 25) / 4
+                    for (let index = 0; index < config.hor_density.length + config.ver_density.length; index++) {
+                        if (index < 5) {
+                            point_postion[index].y = default_location[index].y = Height * index
+                            point_postion[index].x = default_location[index].x = Width * 2
+                        } else {
+                            point_postion[index].y = default_location[index].y = Height * 2
+                            point_postion[index].x = default_location[index].x = Width * (index - 5)
+                        }
+                    }
+                })();
+            };
+        });
+
         const setdianposin = (index: number, x: number, y: number) => {
             point_postion[index].x = x
             point_postion[index].y = y
@@ -343,7 +366,7 @@ export default defineComponent({
         }
         //
         watch(() => value[0], (newVal, oldVal) => {
-            send_configuration(0, newVal.y,newVal.number)
+            send_configuration(0, newVal.y, newVal.number)
             if (!isactivearray.value[0]) {
                 let x = default_location[0].x;
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -353,7 +376,7 @@ export default defineComponent({
         }, { deep: true })
 
         watch(() => value[1], (newVal, oldVal) => {
-            send_configuration(1, newVal.y,newVal.number)
+            send_configuration(1, newVal.y, newVal.number)
             if (!isactivearray.value[1]) {
                 let x = default_location[1].x;
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -364,7 +387,7 @@ export default defineComponent({
 
         watch(() => value[2], (newVal, oldVal) => {
             //发送x y 唯一一个
-            send_configuration(2, newVal.y,newVal.number)
+            send_configuration(2, newVal.y, newVal.number)
             if (!isactivearray.value[2]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -374,7 +397,7 @@ export default defineComponent({
         }, { deep: true })
 
         watch(() => value[3], (newVal, oldVal) => {
-            send_configuration(3, newVal.y,newVal.number)
+            send_configuration(3, newVal.y, newVal.number)
             if (!isactivearray.value[3]) {
                 let x = default_location[3].x;
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -384,7 +407,7 @@ export default defineComponent({
         }, { deep: true })
 
         watch(() => value[4], (newVal, oldVal) => {
-            send_configuration(4, newVal.y,newVal.number)
+            send_configuration(4, newVal.y, newVal.number)
             if (!isactivearray.value[4]) {
                 let x = default_location[4].x;
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -397,7 +420,7 @@ export default defineComponent({
         ///
 
         watch(() => value[5], (newVal, oldVal) => {
-            send_configuration(5, newVal.x,newVal.number)
+            send_configuration(5, newVal.x, newVal.number)
             if (!isactivearray.value[5]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = default_location[5].y
@@ -407,7 +430,7 @@ export default defineComponent({
         }, { deep: true })
 
         watch(() => value[6], (newVal, oldVal) => {
-            send_configuration(6, newVal.x,newVal.number)
+            send_configuration(6, newVal.x, newVal.number)
             if (!isactivearray.value[6]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = default_location[6].y
@@ -417,7 +440,7 @@ export default defineComponent({
         }, { deep: true })
 
         watch(() => value[7], (newVal, oldVal) => {
-            send_configuration(7, newVal.x,newVal.number)
+            send_configuration(7, newVal.x, newVal.number)
             if (!isactivearray.value[7]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = default_location[7].y
@@ -427,7 +450,7 @@ export default defineComponent({
         }, { deep: true })
 
         watch(() => value[8], (newVal, oldVal) => {
-            send_configuration(8, newVal.x,newVal.number)
+            send_configuration(8, newVal.x, newVal.number)
             if (!isactivearray.value[8]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = default_location[8].y
@@ -437,8 +460,7 @@ export default defineComponent({
         }, { deep: true })
 
         watch(() => value[9], (newVal, oldVal) => {
-            //console.log(newVal)
-            send_configuration(9, newVal.x,newVal.number)
+            send_configuration(9, newVal.x, newVal.number)
             if (!isactivearray.value[9]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = default_location[9].y
@@ -448,14 +470,13 @@ export default defineComponent({
         }, { deep: true })
         ///
 
-        const send_configuration = (index: number, value: number,number:number) => {
-            
-            if(ste_status.value==0){
-                //console.log("Send")
-                if(index < 5){
-                    set?.SetBlendingVerDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index+1, Number(value)) 
-                }else{
-                    set?.SetBlendingHorDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index-4, Number(value));
+        const send_configuration = (index: number, value: number, number: number) => {
+
+            if (ste_status.value == 0) {
+                if (index < 5) {
+                    set?.SetBlendingVerDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index + 1, Number(value))
+                } else {
+                    set?.SetBlendingHorDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index - 4, Number(value));
                 }
             }
             save_set_cache()
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 7367a77..b072b48 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -70,7 +70,7 @@
 import vue3ResizeDrag from "src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
 import { dom } from 'quasar'
 
-import { defineComponent, ref, watch, computed, defineProps, withDefaults, onMounted, reactive,onBeforeUnmount } from "vue";
+import { defineComponent, ref, watch, computed, defineProps, withDefaults, onMounted, reactive, onBeforeUnmount } from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
 import ClientConnection from "src/common/ClientConnection"
@@ -105,7 +105,7 @@ export default defineComponent({
         let points = reactive([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }]);//点的位置
         const isshowarray = ref([true, true, true, true])
         const isactivearray = ref([true, true, true, true])
-        const ste_status =ref(0);
+        const ste_status = ref(0);
         const save = () => {
             set?.SaveBlendingConfig("")
             setTimeout(() => {
@@ -114,11 +114,11 @@ export default defineComponent({
         }
         ///
         const use_set_cache = () => {
-            if (set_cache.value[selectedprojector.value]!=null) {
+            if (set_cache.value[selectedprojector.value] != null) {
                 let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
                 deepcopy(four, tmp)
                 //four=JSON.parse(JSON.stringify(tmp))
-                
+
             }
             syncpoint()
         };
@@ -135,8 +135,8 @@ export default defineComponent({
         const save_set_cache = () => {
             set_cache.value[selectedprojector.value] = JSON.stringify(four);
         }
-        onBeforeUnmount(()=>{
-            sessionStorage.FourPointCalibration=JSON.stringify(set_cache.value)
+        onBeforeUnmount(() => {
+            sessionStorage.FourPointCalibration = JSON.stringify(set_cache.value)
         })
         ///
         const activeMouseDown = (index: number) => {
@@ -146,15 +146,15 @@ export default defineComponent({
             isactivearray.value[index] = false
         }
         onMounted(() => {
-            ste_status.value=1;
+            ste_status.value = 1;
             setpoa();
 
             setTimeout(() => {
-                ste_status.value=0;
+                ste_status.value = 0;
             }, 100);
         })
 
-        const use_server_config=()=>{
+        const use_server_config = () => {
             for (let index = 0; index < fourpostion.value.length; index++) {
                 defaultfourpostion.value[index].x = fourpostion.value[index].x;
                 defaultfourpostion.value[index].y = fourpostion.value[index].y;
@@ -166,7 +166,7 @@ export default defineComponent({
         }
 
         const setpoa = () => {
-            
+
             points[0].x = 0
             points[0].y = 0
 
@@ -203,17 +203,18 @@ export default defineComponent({
                 four[index].x = config.point4[index].x
                 four[index].y = config.point4[index].y
             }
-            if(sessionStorage.FourPointCalibration&&sessionStorage.FourPointCalibration.length>0){
-                set_cache.value=JSON.parse(sessionStorage.FourPointCalibration);
+            if (sessionStorage.FourPointCalibration && sessionStorage.FourPointCalibration.length > 0) {
+                set_cache.value = JSON.parse(sessionStorage.FourPointCalibration);
                 use_set_cache()
-            }else{
-                
+            } else {
+
             }
+            set_point_x()
             //syncpoint()
-            
+
         }
         watch(() => four[0], (newVal, oldVal) => {
-            if ($store.state.enablefusion&&ste_status.value==0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 1, Number(newVal.x), Number(newVal.y));
+            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 1, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[0]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -224,12 +225,12 @@ export default defineComponent({
                 setTimeout(() => {
                     isshowarray.value[0] = true
                 }, 100);
-                
+
             }
             save_set_cache()
         }, { deep: true })
         watch(() => four[1], (newVal, oldVal) => {
-            if ($store.state.enablefusion&&ste_status.value==0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 2, Number(newVal.x), Number(newVal.y));
+            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 2, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[1]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -240,12 +241,12 @@ export default defineComponent({
                 setTimeout(() => {
                     isshowarray.value[1] = true
                 }, 100);
-                
+
             }
             save_set_cache()
         }, { deep: true })
         watch(() => four[2], (newVal, oldVal) => {
-            if ($store.state.enablefusion&&ste_status.value==0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 3, Number(newVal.x), Number(newVal.y));
+            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 3, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[2]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil((config.height / Proportion.value.y) - (newVal.y / Proportion.value.y));
@@ -256,12 +257,12 @@ export default defineComponent({
                 setTimeout(() => {
                     isshowarray.value[2] = true
                 }, 100);
-                
+
             }
             save_set_cache()
         }, { deep: true })
         watch(() => four[3], (newVal, oldVal) => {
-            if ($store.state.enablefusion&&ste_status.value==0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 4, Number(newVal.x), Number(newVal.y));
+            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 4, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[3]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil((config.height / Proportion.value.y) - (newVal.y / Proportion.value.y));
@@ -272,7 +273,7 @@ export default defineComponent({
                 setTimeout(() => {
                     isshowarray.value[3] = true
                 }, 100);
-                
+
             }
             save_set_cache()
         }, { deep: true })
@@ -287,23 +288,53 @@ export default defineComponent({
                     fortmp = JSON.parse(JSON.stringify(i))
                 }
             }
-            ste_status.value=1;
+            ste_status.value = 1;
             config = JSON.parse(JSON.stringify(fortmp))
             //setpoa();
             use_server_config()
             use_set_cache()
             setTimeout(() => {
-                ste_status.value=0;
+                ste_status.value = 0;
             }, 100);
+            set_point_x()
         }, { deep: true })
 
         //为了加载 缓存的配置时 同步点的位置
-        const syncpoint=()=>{
+        const syncpoint = () => {
             for (let index = 0; index < fourpostion.value.length; index++) {
-                isactivearray.value[index]=false
+                isactivearray.value[index] = false
             }
         }
+        //手动同步 我裂开
+        const set_point_x = () => {
+            //console.log("kaishi jisuan ")
+            let x = Math.ceil(four[0].x/ Proportion.value.x);
+            let y = Math.ceil(((config.height - four[0].y) / Proportion.value.y));
+            set_point(0,x,y);
 
+            x = Math.ceil(four[1].x / Proportion.value.x);
+            y = Math.ceil(((config.height - four[1].y) / Proportion.value.y));
+            set_point(1,x,y);
+
+            x = Math.ceil(four[2].x / Proportion.value.x);
+            y = Math.ceil((config.height / Proportion.value.y) - (four[2].y / Proportion.value.y));
+            set_point(2,x,y);
+
+            x = Math.ceil(four[3].x / Proportion.value.x);
+            y = Math.ceil((config.height / Proportion.value.y) - (four[3].y / Proportion.value.y));
+            set_point(3,x,y);
+        }
+
+        const set_point = (index:number,x:number,y:number) => {
+            
+            points[index].x = x
+            points[index].y = y
+            isshowarray.value[index] = false
+            isactivearray.value[index] = false
+            setTimeout(() => {
+                isshowarray.value[index] = true
+            }, 100);
+        }
         const reset = (index: number) => {
             fourpostion.value[index].x = defaultfourpostion.value[index].x;
             fourpostion.value[index].y = defaultfourpostion.value[index].y;
@@ -311,20 +342,20 @@ export default defineComponent({
             four[index].x = config.point4[index].def_x
             four[index].y = config.point4[index].def_y
 
-            set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, index+1, Number(config.point4[index].def_x), Number(config.point4[index].def_y));
+            set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, index + 1, Number(config.point4[index].def_x), Number(config.point4[index].def_y));
 
             isshowarray.value[index] = false
             setTimeout(() => {
                 isshowarray.value[index] = true
             }, 100);
-            
+
         }
 
         const resetall = () => {
             for (let index = 0; index < fourpostion.value.length; index++) {
                 reset(index)
             }
-            
+
         }
 
         const moveHandler_1 = (data: any) => {
@@ -357,6 +388,20 @@ export default defineComponent({
             four[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
             save_set_cache()
         }
+            //窗口变动重新渲染
+    onMounted(() => {
+      //监听窗口变化
+      window.onresize = () => {
+        return (() => {
+            ste_status.value = 1;
+            setpoa();
+
+            setTimeout(() => {
+                ste_status.value = 0;
+            }, 100);
+        })();
+      };
+    });
         return {
             div,
             fourpostion,
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index c2e8d87..698e93a 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -9,11 +9,11 @@
             <div class="col-4 offset-4">
               <div class="row">
                 <div class="col-3">
-                  <q-toggle class="float-right"  v-model="array[0].isshow" label="" />
+                  <q-toggle class="float-right" v-model="array[0].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :bg-color="group==0?'cyan-1':''"  @focus="group = 0" v-model="array[0].value"
-                    :label="$t('upper fusion zone parameters')" lazy-rules :rules="[
+                  <q-input filled type="number" :bg-color="group == 0 ? 'cyan-1' : ''" @focus="group = 0"
+                    v-model="array[0].value" :label="$t('upper fusion zone parameters')" lazy-rules :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
                       (val) =>
@@ -32,8 +32,8 @@
                   <q-toggle class="float-right" v-model="array[1].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :bg-color="group==1?'cyan-1':''"  @focus="group = 1" v-model="array[1].value"
-                    :label="$t('Left fusion Band Parameters')" lazy-rules :rules="[
+                  <q-input filled type="number" :bg-color="group == 1 ? 'cyan-1' : ''" @focus="group = 1"
+                    v-model="array[1].value" :label="$t('Left fusion Band Parameters')" lazy-rules :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
                       (val) =>
@@ -48,8 +48,8 @@
                   <q-toggle class="float-right" v-model="array[2].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :bg-color="group==2?'cyan-1':''"  @focus="group = 2" v-model="array[2].value"
-                    :label="$t('Right fusion Band Parameters')" lazy-rules :rules="[
+                  <q-input filled type="number" :bg-color="group == 2 ? 'cyan-1' : ''" @focus="group = 2"
+                    v-model="array[2].value" :label="$t('Right fusion Band Parameters')" lazy-rules :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
                       (val) =>
@@ -68,8 +68,8 @@
                   <q-toggle class="float-right" v-model="array[3].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :bg-color="group==3?'cyan-1':''"  @focus="group = 3" v-model="array[3].value"
-                    :label="$t('Lower fusion Zone Parameters')" lazy-rules :rules="[
+                  <q-input filled type="number" :bg-color="group == 3 ? 'cyan-1' : ''" @focus="group = 3"
+                    v-model="array[3].value" :label="$t('Lower fusion Zone Parameters')" lazy-rules :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
                       (val) =>
@@ -83,7 +83,7 @@
 
       </div>
     </div>
-    <div class="col-4 offset-4">
+    <div class="col-4 offset-4" v-if="group != 4">
       <p class="text-center">{{ $t('Set Fusion Band Parameters') }}</p>
       <div style="display: flex; justify-content: space-evenly">
         <div>
@@ -137,7 +137,7 @@ export default defineComponent({
     let set = GlobalData.getInstance().getCurrentClient();
     let $store = useStore();
     let $t = useI18n();
-    const group = ref(0);
+    const group = ref(4);
     const set_cache: any = ref([]);
     const enablefusion = ref(false);
     let array: any = reactive([
@@ -145,6 +145,7 @@ export default defineComponent({
       { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
       { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
       { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
+      { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
     ]);
     let serverconfig = JSON.parse($store.state.fusion_configuration);
     const selectedprojector = computed(() => {
@@ -182,13 +183,14 @@ export default defineComponent({
         }
       }
       ste_status.value = 1;
-      
+
       config = JSON.parse(JSON.stringify(fortmp))
       use_server_config()
       use_set_cache()
       setTimeout(() => {
         ste_status.value = 0;
       }, 100);
+      setnowindex()
     }, { deep: true })
     const chang = (type: string) => {
       if (type == "alpha") {
@@ -217,8 +219,34 @@ export default defineComponent({
       }
       save_set_cache();
     };
+
+    const setnowindex = () => {
+      let sum = 0;
+      let indexx = 4;
+      for (let index = 0; index < array.length - 1; index++) {
+        if (array[index].isshow && Number(array[index].value) > 0) {
+          sum++;
+          indexx = index;
+        }
+      }
+      if (sum == 1) {
+        group.value = indexx
+      } else {
+        group.value = 4
+      }
+    }
+
+    const getconfig = () => {
+      try {
+        set?.GetBlendingConfig("").then((res) => {  })
+        set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); $store.commit("setEnablefusion", tmp.enable); $store.commit("setfusion_configuration", res?.config); })
+      } catch (error) {
+
+      }
+
+    }
     const startconfig = () => {
-      for (let index = 0; index < array.length; index++) {
+      for (let index = 0; index < array.length - 1; index++) {
         array[index].gamma = config.params[index].gamma.toFixed(2)
         array[index].alpha = config.params[index].alpha.toFixed(2)
         array[index].p = config.params[index].power.toFixed(2)
@@ -228,8 +256,9 @@ export default defineComponent({
       if (sessionStorage.FusionLocale) set_cache.value = JSON.parse(sessionStorage.FusionLocale); use_set_cache()
 
     }
-    const use_server_config=()=>{
-      for (let index = 0; index < array.length; index++) {
+    const use_server_config = () => {
+
+      for (let index = 0; index < array.length - 1; index++) {
         array[index].gamma = config.params[index].gamma.toFixed(2)
         array[index].alpha = config.params[index].alpha.toFixed(2)
         array[index].p = config.params[index].power.toFixed(2)
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index be4fa82..49927a5 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -57,32 +57,32 @@
         <div class="col-8">
             <div ref="div" style="background-color: #7fffd4;height: 40vh;">
                 <div style="position:absolute;">
-                    <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="20" :x="ninepostion[0].x"
-                        :y="ninepostion[0].y" @mousedown="activeMouseDown(0)" :isResizable="false"
+                    <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="20"
+                        :x="ninepostion[0].x" :y="ninepostion[0].y" @mousedown="activeMouseDown(0)" :isResizable="false"
                         @moveHandler="moveHandler_1"><span>{{ $t('point') }}1</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="20" :x="ninepostion[1].x"
-                        :y="ninepostion[1].y" @mousedown="activeMouseDown(1)" :isResizable="false"
+                    <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="20"
+                        :x="ninepostion[1].x" :y="ninepostion[1].y" @mousedown="activeMouseDown(1)" :isResizable="false"
                         @moveHandler="moveHandler_2"><span>{{ $t('point') }}2</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="20" :x="ninepostion[2].x"
-                        :y="ninepostion[2].y" @mousedown="activeMouseDown(2)" :isResizable="false"
+                    <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="20"
+                        :x="ninepostion[2].x" :y="ninepostion[2].y" @mousedown="activeMouseDown(2)" :isResizable="false"
                         @moveHandler="moveHandler_3"><span>{{ $t('point') }}3</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="20" :x="ninepostion[3].x"
-                        :y="ninepostion[3].y" @mousedown="activeMouseDown(3)" :isResizable="false"
+                    <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="20"
+                        :x="ninepostion[3].x" :y="ninepostion[3].y" @mousedown="activeMouseDown(3)" :isResizable="false"
                         @moveHandler="moveHandler_4"><span>{{ $t('point') }}4</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="20" :x="ninepostion[4].x"
-                        :y="ninepostion[4].y" @mousedown="activeMouseDown(4)" :isResizable="false"
+                    <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="20"
+                        :x="ninepostion[4].x" :y="ninepostion[4].y" @mousedown="activeMouseDown(4)" :isResizable="false"
                         @moveHandler="moveHandler_5"><span>{{ $t('point') }}5</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="30" :h="20" :x="ninepostion[5].x"
-                        :y="ninepostion[5].y" @mousedown="activeMouseDown(5)" :isResizable="false"
+                    <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="30" :h="20"
+                        :x="ninepostion[5].x" :y="ninepostion[5].y" @mousedown="activeMouseDown(5)" :isResizable="false"
                         @moveHandler="moveHandler_6"><span>{{ $t('point') }}6</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="30" :h="20" :x="ninepostion[6].x"
-                        :y="ninepostion[6].y" @mousedown="activeMouseDown(6)" :isResizable="false"
+                    <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="30" :h="20"
+                        :x="ninepostion[6].x" :y="ninepostion[6].y" @mousedown="activeMouseDown(6)" :isResizable="false"
                         @moveHandler="moveHandler_7"><span>{{ $t('point') }}7</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="30" :h="20" :x="ninepostion[7].x"
-                        :y="ninepostion[7].y" @mousedown="activeMouseDown(7)" :isResizable="false"
+                    <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="30" :h="20"
+                        :x="ninepostion[7].x" :y="ninepostion[7].y" @mousedown="activeMouseDown(7)" :isResizable="false"
                         @moveHandler="moveHandler_8"><span>{{ $t('point') }}8</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="30" :h="20" :x="ninepostion[8].x"
-                        :y="ninepostion[8].y" @mousedown="activeMouseDown(8)" :isResizable="false"
+                    <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="30" :h="20"
+                        :x="ninepostion[8].x" :y="ninepostion[8].y" @mousedown="activeMouseDown(8)" :isResizable="false"
                         @moveHandler="moveHandler_9"><span>{{ $t('point') }}9</span> </vue3ResizeDrag>
                 </div>
             </div>
@@ -100,8 +100,8 @@
         </div>
         <div class="col-4">
             <div class="row">
-                <div class="col-6"> <q-btn color="white" @click="resetall" text-color="black"
-                        :label="$t('resetall')" /></div>
+                <div class="col-6"> <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
+                </div>
                 <div class="col-3"> <q-input filled type="number" @focus="isactivearray[6] = false" class="q-pt-md"
                         :dense="true" v-model="nine[6].x" label="x" lazy-rules />
                     <q-input filled type="number" class="q-pt-md" @focus="isactivearray[6] = false" :dense="true"
@@ -144,7 +144,7 @@
 <script lang="ts">
 import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
 import GlobalData from "src/common/GlobalData";
-import { defineComponent, ref, watch, computed, defineProps, withDefaults, onMounted ,onBeforeUnmount ,reactive} from "vue";
+import { defineComponent, ref, watch, computed, defineProps, withDefaults, onMounted, onBeforeUnmount, reactive } from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
 
@@ -174,7 +174,7 @@ export default defineComponent({
         })
         const set_cache: any = ref([]);
         //
-        const ste_status =ref(0);
+        const ste_status = ref(0);
         const isshowarray = ref([true, true, true, true, true, true, true, true, true,])
         const isactivearray = ref([true, true, true, true, true, true, true, true, true,])
         let ninepostion: any = ref([{ x: 0, y: 1920 }, { x: 960, y: 1920 }, { x: 1080, y: 1920 }, { x: 0, y: 540 }, { x: 960, y: 540 }, { x: 1080, y: 540 }, { x: 0, y: 0 }, { x: 540, y: 0 }, { x: 1080, y: 0 }]);
@@ -252,12 +252,11 @@ export default defineComponent({
         }
 
         const use_set_cache = () => {
-            if (set_cache.value[selectedprojector.value]!=null) {
+            if (set_cache.value[selectedprojector.value] != null) {
                 let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
                 deepcopy(nine, tmp)
-                
+
             }
-            //console.log(nine)
             syncpoint()
         };
         const deepcopy = (o1: any, o2: any) => {
@@ -274,10 +273,10 @@ export default defineComponent({
             set_cache.value[selectedprojector.value] = JSON.stringify(nine);
         }
         onBeforeUnmount(() => {
-            if(set_cache.value[selectedprojector.value]!=null){
+            if (set_cache.value[selectedprojector.value] != null) {
                 sessionStorage.SurfaceCorrection = JSON.stringify(set_cache.value)
             }
-            
+
         })
 
         watch(() => configselsect, (newVal, oldVal) => {
@@ -289,16 +288,16 @@ export default defineComponent({
                     fortmp = JSON.parse(JSON.stringify(i))
                 }
             }
-            ste_status.value=1;
+            ste_status.value = 1;
             config = JSON.parse(JSON.stringify(fortmp))
             use_server_config()
             use_set_cache()
             setTimeout(() => {
-                ste_status.value=0;
+                ste_status.value = 0;
             }, 100);
         }, { deep: true })
         onMounted(() => {
-            ste_status.value=1;
+            ste_status.value = 1;
             startpostion();
             for (let index = 0; index < defaultninepostion.value.length; index++) {
                 defaultninepostion.value[index].x = ninepostion.value[index].x;
@@ -309,9 +308,32 @@ export default defineComponent({
             setninepostion();
             syncpoint()
             setTimeout(() => {
-                ste_status.value=0;
+                ste_status.value = 0;
             }, 100);
         })
+
+        //窗口变动重新渲染
+        onMounted(() => {
+            //监听窗口变化
+            window.onresize = () => {
+                return (() => {
+                    ste_status.value = 1;
+                    startpostion();
+                    for (let index = 0; index < defaultninepostion.value.length; index++) {
+                        defaultninepostion.value[index].x = ninepostion.value[index].x;
+                        defaultninepostion.value[index].y = ninepostion.value[index].y;
+                        defaultnine.value[index].x = config.point9[index].def_x
+                        defaultnine.value[index].y = config.point9[index].def_y
+                    }
+                    setninepostion();
+                    syncpoint()
+                    setTimeout(() => {
+                        ste_status.value = 0;
+                    }, 100);
+                })();
+            };
+        });
+
         const setninepostion = () => {
             for (let index = 0; index < defaultninepostion.value.length; index++) {
                 nine[index].x = config.point9[index].x
@@ -358,15 +380,15 @@ export default defineComponent({
                 defaultnine.value[index].x = nine[index].x
                 defaultnine.value[index].y = nine[index].y
             }
-            if(sessionStorage.SurfaceCorrection&&sessionStorage.SurfaceCorrection.length>0){
-                set_cache.value=JSON.parse(sessionStorage.SurfaceCorrection);
+            if (sessionStorage.SurfaceCorrection && sessionStorage.SurfaceCorrection.length > 0) {
+                set_cache.value = JSON.parse(sessionStorage.SurfaceCorrection);
                 use_set_cache()
-            }else{
-                
+            } else {
+
             }
             syncpoint()
         }
-        const use_server_config=()=>{
+        const use_server_config = () => {
             for (let index = 0; index < defaultninepostion.value.length; index++) {
                 defaultninepostion.value[index].x = ninepostion.value[index].x;
                 defaultninepostion.value[index].y = ninepostion.value[index].y;
@@ -381,7 +403,7 @@ export default defineComponent({
             nine[index].x = config.point9[index].def_x
             nine[index].y = config.point9[index].def_y
 
-            set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, index+1, Number(config.point9[index].def_x), Number(config.point9[index].def_y));
+            set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, index + 1, Number(config.point9[index].def_x), Number(config.point9[index].def_y));
 
             isshowarray.value[index] = false
             setTimeout(() => {
@@ -394,7 +416,7 @@ export default defineComponent({
             }
         }
         watch(() => nine[0], (newVal, oldVal) => {
-            if ($store.state.enablefusion&&ste_status.value==0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 1, Number(newVal.x), Number(newVal.y));
+            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 1, Number(newVal.x), Number(newVal.y));
 
             if (!isactivearray.value[0]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
@@ -405,7 +427,7 @@ export default defineComponent({
 
         }, { deep: true })
         watch(() => nine[1], (newVal, oldVal) => {
-            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 2, Number(newVal.x), Number(newVal.y));
+            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 2, Number(newVal.x), Number(newVal.y));
 
             if (!isactivearray.value[1]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
@@ -416,7 +438,7 @@ export default defineComponent({
 
         }, { deep: true })
         watch(() => nine[2], (newVal, oldVal) => {
-            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 3, Number(newVal.x), Number(newVal.y));
+            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 3, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[2]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -425,7 +447,7 @@ export default defineComponent({
             save_set_cache()
         }, { deep: true })
         watch(() => nine[3], (newVal, oldVal) => {
-            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 4, Number(newVal.x), Number(newVal.y));
+            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 4, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[3]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -434,7 +456,7 @@ export default defineComponent({
             save_set_cache()
         }, { deep: true })
         watch(() => nine[4], (newVal, oldVal) => {
-            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 5, Number(newVal.x), Number(newVal.y));
+            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 5, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[4]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -443,7 +465,7 @@ export default defineComponent({
             save_set_cache()
         }, { deep: true })
         watch(() => nine[5], (newVal, oldVal) => {
-            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 6, Number(newVal.x), Number(newVal.y));
+            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 6, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[5]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -452,7 +474,7 @@ export default defineComponent({
             save_set_cache()
         }, { deep: true })
         watch(() => nine[6], (newVal, oldVal) => {
-            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 7, Number(newVal.x), Number(newVal.y));
+            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 7, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[6]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -461,7 +483,7 @@ export default defineComponent({
             save_set_cache()
         }, { deep: true })
         watch(() => nine[7], (newVal, oldVal) => {
-            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 8, Number(newVal.x), Number(newVal.y));
+            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 8, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[7]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -470,7 +492,7 @@ export default defineComponent({
             save_set_cache()
         }, { deep: true })
         watch(() => nine[8], (newVal, oldVal) => {
-            if ($store.state.enablefusion&&ste_status.value==0)  set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 9, Number(newVal.x), Number(newVal.y));
+            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 9, Number(newVal.x), Number(newVal.y));
             if (!isactivearray.value[8]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -488,7 +510,7 @@ export default defineComponent({
             setTimeout(() => {
                 isshowarray.value[index] = true
             }, 100);
-            
+
         }
         const save = () => {
             set?.SaveBlendingConfig("")
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 51fbe48..f6b4dce 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -134,18 +134,17 @@ export default defineComponent({
       show_dialog.value = true;
     };
     const resize = ref(true)
-    //窗口变动重新渲染
-    onMounted(() => {
-      //监听窗口变化
-      window.onresize = () => {
-        return (() => {
-          console.log("resize")
-          resize.value = false; setTimeout(() => {
-            resize.value = true
-          }, 100);
-        })();
-      };
-    });
+    // //窗口变动重新渲染
+    // onMounted(() => {
+    //   //监听窗口变化
+    //   window.onresize = () => {
+    //     return (() => {
+    //       resize.value = false; setTimeout(() => {
+    //         resize.value = true
+    //       }, 100);
+    //     })();
+    //   };
+    // });
 
 
     //投影机数量
@@ -185,6 +184,15 @@ export default defineComponent({
       clear()
       set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); EnableBlending.value = tmp.enable; $store.commit("setEnablefusion", tmp.enable); config.value.col = tmp.col; config.value.row = tmp.row; $store.commit("setfusion_configuration", res?.config); })
     }
+    const getconfig=()=>{
+      try {
+        set?.GetBlendingConfig("").then((res)=>{})
+        set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); $store.commit("setEnablefusion", tmp.enable); $store.commit("setfusion_configuration", res?.config); })
+      } catch (error) {
+        
+      }
+      
+    }
     const clear = () => {
 
       sessionStorage.removeItem('DensityCorrection')
@@ -195,6 +203,7 @@ export default defineComponent({
       setTimeout(() => {
         sessionStorage.removeItem('FusionLocale')
       }, 500)
+      getconfig()
     }
 
     onBeforeMount(() => {
@@ -210,7 +219,7 @@ export default defineComponent({
         }
 
 
-      }, 500);
+      }, 1000);
     })
     return {
       resize,
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index 31baac0..52151ba 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -599,6 +599,7 @@ export default defineComponent({
     const getconfig=()=>{
       try {
         set?.GetBlendingConfig("").then((res)=>{})
+        set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); $store.commit("setEnablefusion", tmp.enable); $store.commit("setfusion_configuration", res?.config); })
       } catch (error) {
         
       }

From b982b66a311722d8bd38bdd582b52cdb4ed079f7 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 13 Jan 2023 11:07:58 +0800
Subject: [PATCH 09/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=88=87=E6=8D=A2=E6=97=B6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8D=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 40 +++++++++----------
 .../FusionSettings/FourPointCalibration.vue   |  8 ++--
 .../FusionSettings/FusionLocale.vue           | 25 +++++++-----
 .../FusionSettings/SurfaceCorrection.vue      | 32 ++++++++-------
 src/components/FusionSettingsDialog.vue       | 32 +++++----------
 src/pages/TopToolBar.vue                      |  2 +-
 6 files changed, 68 insertions(+), 71 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 31f0034..d986cba 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -7,43 +7,43 @@
                 <div style="position:absolute;">
                     <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="20"
                         :x="point_postion[0].x" :y="point_postion[0].y" @mousedown="isactivearray[0] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 0)"><span>{{ $t('point') }}1</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 0)"><span>v1</span>
                     </vue3ResizeDrag>
                     <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="20"
                         :x="point_postion[1].x" :y="point_postion[1].y" @mousedown="isactivearray[1] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 1)"><span>{{ $t('point') }}2</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 1)"><span>v2</span>
                     </vue3ResizeDrag>
                     <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="20"
                         :x="point_postion[2].x" :y="point_postion[2].y" @mousedown="isactivearray[2] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 2)"><span>{{ $t('point') }}3</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 2)"><span>v3</span>
                     </vue3ResizeDrag>
                     <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="20"
                         :x="point_postion[3].x" :y="point_postion[3].y" @mousedown="isactivearray[3] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 3)"><span>{{ $t('point') }}4</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 3)"><span>v4</span>
                     </vue3ResizeDrag>
                     <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="20"
                         :x="point_postion[4].x" :y="point_postion[4].y" @mousedown="isactivearray[4] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 4)"><span>{{ $t('point') }}5</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 4)"><span>v5</span>
                     </vue3ResizeDrag>
                     <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="30" :h="20"
                         :x="point_postion[5].x" :y="point_postion[5].y" @mousedown="isactivearray[5] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 5)"><span>{{ $t('point') }}6</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 5)"><span>h6</span>
                     </vue3ResizeDrag>
                     <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="30" :h="20"
                         :x="point_postion[6].x" :y="point_postion[6].y" @mousedown="isactivearray[6] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 6)"><span>{{ $t('point') }}7</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 6)"><span>h7</span>
                     </vue3ResizeDrag>
                     <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="30" :h="20"
                         :x="point_postion[7].x" :y="point_postion[7].y" @mousedown="isactivearray[7] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 7)"><span>{{ $t('point') }}8</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 7)"><span>h8</span>
                     </vue3ResizeDrag>
                     <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="30" :h="20"
                         :x="point_postion[8].x" :y="point_postion[8].y" @mousedown="isactivearray[8] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 8)"><span>{{ $t('point') }}9</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 8)"><span>h9</span>
                     </vue3ResizeDrag>
                     <vue3ResizeDrag :isActive="isactivearray[9]" v-if="isshowarray[9]" :w="35" :h="20"
                         :x="point_postion[9].x" :y="point_postion[9].y" @mousedown="isactivearray[9] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 9)"><span>{{ $t('point') }}10</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 9)"><span>h10</span>
                     </vue3ResizeDrag>
                 </div>
 
@@ -56,7 +56,7 @@
                         <div class="col-2"></div>
                         <div class="col-8"><q-input @focus="isactivearray[0] = false" filled type="number"
                                 class="q-pt-md" :dense="true" v-model="value[0].y" label="y" lazy-rules />
-                            <q-btn color="white" @click="reset(0)" text-color="black" :label="$t('reset')" />
+                            <q-btn color="white" @click="reset(0)" text-color="black" :label="$t('reset')+' v1'" />
                         </div>
                     </div>
                 </div>
@@ -65,7 +65,7 @@
                         <div class="col-2"></div>
                         <div class="col-8"><q-input @focus="isactivearray[1] = false" filled type="number"
                                 class="q-pt-md" :dense="true" v-model="value[1].y" label="y" lazy-rules />
-                            <q-btn color="white" @click="reset(1)" text-color="black" :label="$t('reset')" />
+                            <q-btn color="white" @click="reset(1)" text-color="black" :label="$t('reset')+' v2'" />
                         </div>
                     </div>
                 </div>
@@ -74,7 +74,7 @@
                         <div class="col-2"></div>
                         <div class="col-8"><q-input @focus="isactivearray[2] = false" filled type="number"
                                 class="q-pt-md" :dense="true" v-model="value[2].y" label="y" lazy-rules />
-                            <q-btn color="white" @click="reset(2)" text-color="black" :label="$t('reset')" />
+                            <q-btn color="white" @click="reset(2)" text-color="black" :label="$t('reset')+' v3'" />
                         </div>
                     </div>
                 </div>
@@ -83,7 +83,7 @@
                         <div class="col-2"></div>
                         <div class="col-8"><q-input @focus="isactivearray[3] = false" filled type="number"
                                 class="q-pt-md" :dense="true" v-model="value[3].y" label="y" lazy-rules />
-                            <q-btn color="white" @click="reset(3)" text-color="black" :label="$t('reset')" />
+                            <q-btn color="white" @click="reset(3)" text-color="black" :label="$t('reset')+' v4'" />
                         </div>
                     </div>
                 </div>
@@ -92,7 +92,7 @@
                         <div class="col-2"></div>
                         <div class="col-8"><q-input @focus="isactivearray[4] = false" filled type="number"
                                 class="q-pt-md" :dense="true" v-model="value[4].y" label="y" lazy-rules />
-                            <q-btn color="white" @click="reset(4)" text-color="black" :label="$t('reset')" />
+                            <q-btn color="white" @click="reset(4)" text-color="black" :label="$t('reset')+' v5'" />
                         </div>
                     </div>
                 </div>
@@ -103,27 +103,27 @@
             <div class="row">
                 <div class="col-1"><q-input filled @focus="isactivearray[5] = false" type="number" class="q-pt-md"
                         :dense="true" v-model="value[5].x" label="x" lazy-rules />
-                    <q-btn color="white" @click="reset(5)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(5)" text-color="black" :label="$t('reset')+' h1'" />
                 </div>
                 <div class="col-1"></div>
                 <div class="col-1"><q-input filled @focus="isactivearray[6] = false" type="number" class="q-pt-md"
                         :dense="true" v-model="value[6].x" label="x" lazy-rules />
-                    <q-btn color="white" @click="reset(6)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(6)" text-color="black" :label="$t('reset')+' h2'" />
                 </div>
                 <div class="col-1"></div>
                 <div class="col-1"><q-input filled @focus="isactivearray[7] = false" type="number" class="q-pt-md"
                         :dense="true" v-model="value[7].x" label="x" lazy-rules />
-                    <q-btn color="white" @click="reset(7)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(7)" text-color="black" :label="$t('reset')+' h3'" />
                 </div>
                 <div class="col-1"></div>
                 <div class="col-1"><q-input filled @focus="isactivearray[8] = false" type="number" class="q-pt-md"
                         :dense="true" v-model="value[8].x" label="x" lazy-rules />
-                    <q-btn color="white" @click="reset(8)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(8)" text-color="black" :label="$t('reset')+' h4'" />
                 </div>
                 <div class="col-1"></div>
                 <div class="col-1"><q-input filled @focus="isactivearray[9] = false" type="number" class="q-pt-md"
                         :dense="true" v-model="value[9].x" label="x" lazy-rules />
-                    <q-btn color="white" @click="reset(9)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(9)" text-color="black" :label="$t('reset')+' h5'" />
                 </div>
                 <div class="col-1"></div>
                 <div class="col-1 q-pt-xl">
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index b072b48..e958c77 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -5,7 +5,7 @@
                 @focus="isactivearray[0] = false" v-model="four[0].x" label="x" lazy-rules />
             <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[0] = false"
                 v-model="four[0].y" label="y" lazy-rules />
-            <q-btn color="white" @click="reset(0)" text-color="black" :label="$t('reset')" />
+            <q-btn color="white" @click="reset(0)" text-color="black" :label="$t('reset') +$t('point') +'1'" />
         </div>
         <div class="col-8">
 
@@ -15,7 +15,7 @@
                 v-model="four[1].x" label="x" lazy-rules />
             <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[1] = false"
                 v-model="four[1].y" label="y" lazy-rules />
-            <q-btn color="white" @click="reset(1)" text-color="black" :label="$t('reset')" />
+            <q-btn color="white" @click="reset(1)" text-color="black" :label="$t('reset') +$t('point') +'2'" />
         </div>
 
         <div class="col-2"></div>
@@ -48,7 +48,7 @@
                 v-model="four[2].x" label="x" lazy-rules />
             <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[2] = false"
                 v-model="four[2].y" label="y" lazy-rules />
-            <q-btn color="white" @click="reset(2)" text-color="black" :label="$t('reset')" />
+            <q-btn color="white" @click="reset(2)" text-color="black" :label="$t('reset') +$t('point') +'3'" />
         </div>
         <div class="col-8">
             <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
@@ -58,7 +58,7 @@
                 v-model="four[3].x" label="x" lazy-rules />
             <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[3] = false"
                 v-model="four[3].y" label="y" lazy-rules />
-            <q-btn color="white" @click="reset(3)" text-color="black" :label="$t('reset')" />
+            <q-btn color="white" @click="reset(3)" text-color="black" :label="$t('reset') +$t('point') +'4'" />
         </div>
     </div>
 </template>
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 698e93a..1899253 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -12,8 +12,9 @@
                   <q-toggle class="float-right" v-model="array[0].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :bg-color="group == 0 ? 'cyan-1' : ''" @focus="group = 0"
-                    v-model="array[0].value" :label="$t('upper fusion zone parameters')" lazy-rules :rules="[
+                  <q-input filled type="number" :autofocus="group == 0" :bg-color="group == 0 ? 'cyan-1' : ''"
+                    @focus="group = 0" v-model="array[0].value" :label="$t('upper fusion zone parameters')" lazy-rules
+                    :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
                       (val) =>
@@ -32,8 +33,9 @@
                   <q-toggle class="float-right" v-model="array[1].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :bg-color="group == 1 ? 'cyan-1' : ''" @focus="group = 1"
-                    v-model="array[1].value" :label="$t('Left fusion Band Parameters')" lazy-rules :rules="[
+                  <q-input filled type="number" :autofocus="group == 1" :bg-color="group == 1 ? 'cyan-1' : ''"
+                    @focus="group = 1" v-model="array[1].value" :label="$t('Left fusion Band Parameters')" lazy-rules
+                    :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
                       (val) =>
@@ -48,8 +50,9 @@
                   <q-toggle class="float-right" v-model="array[2].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :bg-color="group == 2 ? 'cyan-1' : ''" @focus="group = 2"
-                    v-model="array[2].value" :label="$t('Right fusion Band Parameters')" lazy-rules :rules="[
+                  <q-input filled type="number" :autofocus="group == 2" :bg-color="group == 2 ? 'cyan-1' : ''"
+                    @focus="group = 2" v-model="array[2].value" :label="$t('Right fusion Band Parameters')" lazy-rules
+                    :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
                       (val) =>
@@ -68,8 +71,9 @@
                   <q-toggle class="float-right" v-model="array[3].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :bg-color="group == 3 ? 'cyan-1' : ''" @focus="group = 3"
-                    v-model="array[3].value" :label="$t('Lower fusion Zone Parameters')" lazy-rules :rules="[
+                  <q-input filled type="number" :autofocus="group == 3" :bg-color="group == 3 ? 'cyan-1' : ''"
+                    @focus="group = 3" v-model="array[3].value" :label="$t('Lower fusion Zone Parameters')" lazy-rules
+                    :rules="[
                       (val) =>
                         (val !== null && val !== '') || $t('Please enter a number'),
                       (val) =>
@@ -234,11 +238,12 @@ export default defineComponent({
       } else {
         group.value = 4
       }
+      console.log(group.value)
     }
 
     const getconfig = () => {
       try {
-        set?.GetBlendingConfig("").then((res) => {  })
+        set?.GetBlendingConfig("").then((res) => { })
         set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); $store.commit("setEnablefusion", tmp.enable); $store.commit("setfusion_configuration", res?.config); })
       } catch (error) {
 
@@ -254,7 +259,7 @@ export default defineComponent({
         array[index].value = Number(config.params[index].size)
       }
       if (sessionStorage.FusionLocale) set_cache.value = JSON.parse(sessionStorage.FusionLocale); use_set_cache()
-
+      setnowindex()
     }
     const use_server_config = () => {
 
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 49927a5..f4c6c51 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -7,7 +7,7 @@
                         :dense="true" v-model="nine[0].x" label="x" lazy-rules />
                     <q-input filled type="number" class="q-pt-md" @focus="isactivearray[0] = false" :dense="true"
                         v-model="nine[0].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(0)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(0)" text-color="black" :label="$t('reset') +$t('point') +'1'" />
                 </div>
             </div>
         </div>
@@ -19,14 +19,14 @@
                         :dense="true" v-model="nine[1].x" label="x" lazy-rules />
                     <q-input filled type="number" class="q-pt-md" @focus="isactivearray[1] = false" :dense="true"
                         v-model="nine[1].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(1)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(1)" text-color="black" :label="$t('reset') +$t('point') +'2'" />
                 </div>
 
                 <div class="col-3" style="margin-left: 5px;"> <q-input filled type="number" class="q-pt-md"
                         :dense="true" v-model="nine[4].x" label="x" @focus="isactivearray[4] = false" lazy-rules />
                     <q-input filled type="number" class="q-pt-md" :dense="true" v-model="nine[4].y" label="y"
                         @focus="isactivearray[4] = false" lazy-rules />
-                    <q-btn color="white" @click="reset(4)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(4)" text-color="black" :label="$t('reset') +$t('point') +'5'" />
                 </div>
             </div>
         </div>
@@ -37,7 +37,7 @@
                         :dense="true" v-model="nine[2].x" label="x" lazy-rules />
                     <q-input filled type="number" class="q-pt-md" @focus="isactivearray[2] = false" :dense="true"
                         v-model="nine[2].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(2)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(2)" text-color="black" :label="$t('reset') +$t('point') +'3'" />
                 </div>
             </div>
 
@@ -49,7 +49,7 @@
                         :dense="true" v-model="nine[3].x" label="x" lazy-rules />
                     <q-input filled type="number" class="q-pt-md" @focus="isactivearray[3] = false" :dense="true"
                         v-model="nine[3].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(3)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(3)" text-color="black" :label="$t('reset') +$t('point') +'4'" />
                 </div>
             </div>
 
@@ -93,7 +93,7 @@
                         :dense="true" v-model="nine[5].x" label="x" lazy-rules />
                     <q-input filled type="number" class="q-pt-md" @focus="isactivearray[5] = false" :dense="true"
                         v-model="nine[5].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(5)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(5)" text-color="black" :label="$t('reset') +$t('point') +'6'" />
                 </div>
             </div>
 
@@ -106,7 +106,7 @@
                         :dense="true" v-model="nine[6].x" label="x" lazy-rules />
                     <q-input filled type="number" class="q-pt-md" @focus="isactivearray[6] = false" :dense="true"
                         v-model="nine[6].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(6)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(6)" text-color="black" :label="$t('reset') +$t('point') +'7'" />
                 </div>
             </div>
 
@@ -118,7 +118,7 @@
                         :dense="true" v-model="nine[7].x" label="x" lazy-rules />
                     <q-input filled type="number" class="q-pt-md" @focus="isactivearray[7] = false" :dense="true"
                         v-model="nine[7].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(7)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(7)" text-color="black" :label="$t('reset') +$t('point') +'8'" />
                 </div>
             </div>
 
@@ -130,7 +130,7 @@
                         :dense="true" v-model="nine[8].x" label="x" lazy-rules />
                     <q-input filled type="number" class="q-pt-md" @focus="isactivearray[8] = false" :dense="true"
                         v-model="nine[8].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(8)" text-color="black" :label="$t('reset')" />
+                    <q-btn color="white" @click="reset(8)" text-color="black" :label="$t('reset') +$t('point') +'9'" />
                 </div>
             </div>
 
@@ -255,7 +255,6 @@ export default defineComponent({
             if (set_cache.value[selectedprojector.value] != null) {
                 let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
                 deepcopy(nine, tmp)
-
             }
             syncpoint()
         };
@@ -306,7 +305,8 @@ export default defineComponent({
                 defaultnine.value[index].y = config.point9[index].def_y
             }
             setninepostion();
-            syncpoint()
+            //syncpoint()
+            use_set_cache()
             setTimeout(() => {
                 ste_status.value = 0;
             }, 100);
@@ -326,7 +326,8 @@ export default defineComponent({
                         defaultnine.value[index].y = config.point9[index].def_y
                     }
                     setninepostion();
-                    syncpoint()
+                    //syncpoint()
+                    use_set_cache()
                     setTimeout(() => {
                         ste_status.value = 0;
                     }, 100);
@@ -380,7 +381,7 @@ export default defineComponent({
                 defaultnine.value[index].x = nine[index].x
                 defaultnine.value[index].y = nine[index].y
             }
-            if (sessionStorage.SurfaceCorrection && sessionStorage.SurfaceCorrection.length > 0) {
+            if (sessionStorage.SurfaceCorrection) {
                 set_cache.value = JSON.parse(sessionStorage.SurfaceCorrection);
                 use_set_cache()
             } else {
@@ -394,6 +395,8 @@ export default defineComponent({
                 defaultninepostion.value[index].y = ninepostion.value[index].y;
                 defaultnine.value[index].x = nine[index].x
                 defaultnine.value[index].y = nine[index].y
+                nine[index].x = config.point9[index].x
+                nine[index].y = config.point9[index].y
             }
         }
         const reset = (index: number) => {
@@ -537,7 +540,8 @@ export default defineComponent({
             reset,
             isshowarray,
             isactivearray,
-            activeMouseDown
+            activeMouseDown,
+            set_cache
         };
     },
 });
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index f6b4dce..03b730a 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -26,7 +26,7 @@
 
         <q-separator />
         <!-- height: 80vh -->
-        <q-card-section class="scroll" style="width: 70vw">
+        <q-card-section class="scroll" style="width: 80vw">
           <div class="row" style="border: 1px solid #b0bec5;text-align: center;">
             <div class="col-3" style="border-right: 1px solid #b0bec5;">
               <p class="text-center">{{ $t("Projector") }}</p>
@@ -62,7 +62,7 @@
                   ]" />
               </div>
               <div style="min-height: 72vh">
-                <component :is="options" v-if="resize" />
+                <component :is="options"  />
               </div>
             </div>
           </div>
@@ -71,7 +71,7 @@
         <q-separator />
 
         <q-card-actions align="right">
-          <q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup />
+          <q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup @click="$store.commit('setSelectedProjector','0/0');" />
           <q-btn flat :label="$t('save config')" no-caps color="primary" @click="save" v-close-popup />
         </q-card-actions>
       </q-form>
@@ -133,18 +133,8 @@ export default defineComponent({
     const showDialog = async () => {
       show_dialog.value = true;
     };
-    const resize = ref(true)
-    // //窗口变动重新渲染
-    // onMounted(() => {
-    //   //监听窗口变化
-    //   window.onresize = () => {
-    //     return (() => {
-    //       resize.value = false; setTimeout(() => {
-    //         resize.value = true
-    //       }, 100);
-    //     })();
-    //   };
-    // });
+
+
 
 
     //投影机数量
@@ -183,6 +173,7 @@ export default defineComponent({
       show_dialog.value = false
       clear()
       set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); EnableBlending.value = tmp.enable; $store.commit("setEnablefusion", tmp.enable); config.value.col = tmp.col; config.value.row = tmp.row; $store.commit("setfusion_configuration", res?.config); })
+      $store.commit('setSelectedProjector','0/0');
     }
     const getconfig=()=>{
       try {
@@ -194,14 +185,12 @@ export default defineComponent({
       
     }
     const clear = () => {
-
-      sessionStorage.removeItem('DensityCorrection')
-      sessionStorage.removeItem('FourPointCalibration')
-
-      sessionStorage.removeItem('SurfaceCorrection')
-
+      $store.commit('setSelectedProjector','0/0');
       setTimeout(() => {
         sessionStorage.removeItem('FusionLocale')
+        sessionStorage.removeItem('SurfaceCorrection')
+        sessionStorage.removeItem('DensityCorrection')
+        sessionStorage.removeItem('FourPointCalibration')
       }, 500)
       getconfig()
     }
@@ -222,7 +211,6 @@ export default defineComponent({
       }, 1000);
     })
     return {
-      resize,
       clear,
       show_dialog,
       options,
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index 52151ba..1a648a7 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -598,7 +598,7 @@ export default defineComponent({
     );
     const getconfig=()=>{
       try {
-        set?.GetBlendingConfig("").then((res)=>{})
+        set?.GetBlendingConfig("").then((res)=>{console.log(res)})
         set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); $store.commit("setEnablefusion", tmp.enable); $store.commit("setfusion_configuration", res?.config); })
       } catch (error) {
         

From b58044d5b7d234d86cf06024cbe13099a11139a7 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 13 Jan 2023 11:16:10 +0800
Subject: [PATCH 10/78] =?UTF-8?q?=E5=88=A0=E9=99=A4debug=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/FusionLocale.vue | 1 -
 src/pages/TopToolBar.vue                       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 1899253..085f167 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -238,7 +238,6 @@ export default defineComponent({
       } else {
         group.value = 4
       }
-      console.log(group.value)
     }
 
     const getconfig = () => {
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index 1a648a7..52151ba 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -598,7 +598,7 @@ export default defineComponent({
     );
     const getconfig=()=>{
       try {
-        set?.GetBlendingConfig("").then((res)=>{console.log(res)})
+        set?.GetBlendingConfig("").then((res)=>{})
         set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); $store.commit("setEnablefusion", tmp.enable); $store.commit("setfusion_configuration", res?.config); })
       } catch (error) {
         

From 998ef225fc4b8d55040c96af9a83f45512cd998c Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Fri, 13 Jan 2023 11:49:45 +0800
Subject: [PATCH 11/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=9E=8D=E5=90=88=E5=8F=82=E6=95=B0=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/ClientConnection.ts |  6 ++++++
 src/entities/WSProtocol.ts     | 17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index 726403f..c83e0fd 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -1469,6 +1469,12 @@ export default class ClientConnection {
     );
   }
 
+  public async ResetBlendingConfig() {
+    return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
+      new Protocol.ResetBlendingConfigRequestEntity()
+    );
+  }
+
   public destory() {
     this.ws?.close();
     if (this.ws) {
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index 6fe811f..1e64b73 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -520,6 +520,9 @@ export namespace Protocol {
     public static get kSetBlendingVerDensity() {
       return Commands.PROTOCOL_PREFIX + "SetBlendingVerDensity";
     }
+    public static get kResetBlending() {
+      return Commands.PROTOCOL_PREFIX + "ResetBlending";
+    }
 
     static _all_commands = new Set([
       Commands.kUnKnowCommand,
@@ -650,7 +653,8 @@ export namespace Protocol {
       Commands.kGetBlendingConfig,
       Commands.kSaveBlendingConfig,
       Commands.kSetBlendingHorDensity,
-      Commands.kSetBlendingVerDensity,
+      Commands.kSetBlendingVerDensity,
+      Commands.kResetBlending,
     ]);
     public static get AllCommands() {
       return this._all_commands;
@@ -3447,4 +3451,15 @@ export namespace Protocol {
     control_point = 0; //控制点编号，1开始，从上到下从左到右
     value = 0;
   }
+
+  export class ResetBlendingConfigRequestEntity extends PacketEntity {
+    constructor(
+      rpc_id = 0
+    ) {
+      super();
+      super.command = Commands.kResetBlending;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      super.rpc_id = rpc_id;
+    }
+  }
 }

From 6d3a838cfa731613a78704bc2955fdd84fe1f489 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 13 Jan 2023 16:33:20 +0800
Subject: [PATCH 12/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=B4=A2=E5=BC=95=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      |  46 ++++---
 .../FusionSettings/FusionLocale.vue           | 130 +++++++++++++-----
 2 files changed, 121 insertions(+), 55 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index d986cba..a476afb 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -27,23 +27,23 @@
                     </vue3ResizeDrag>
                     <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="30" :h="20"
                         :x="point_postion[5].x" :y="point_postion[5].y" @mousedown="isactivearray[5] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 5)"><span>h6</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 5)"><span>h1</span>
                     </vue3ResizeDrag>
                     <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="30" :h="20"
                         :x="point_postion[6].x" :y="point_postion[6].y" @mousedown="isactivearray[6] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 6)"><span>h7</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 6)"><span>h2</span>
                     </vue3ResizeDrag>
                     <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="30" :h="20"
                         :x="point_postion[7].x" :y="point_postion[7].y" @mousedown="isactivearray[7] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 7)"><span>h8</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 7)"><span>h3</span>
                     </vue3ResizeDrag>
                     <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="30" :h="20"
                         :x="point_postion[8].x" :y="point_postion[8].y" @mousedown="isactivearray[8] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 8)"><span>h9</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 8)"><span>h4</span>
                     </vue3ResizeDrag>
                     <vue3ResizeDrag :isActive="isactivearray[9]" v-if="isshowarray[9]" :w="35" :h="20"
                         :x="point_postion[9].x" :y="point_postion[9].y" @mousedown="isactivearray[9] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 9)"><span>h10</span>
+                        :isResizable="false" @moveHandler="moveHandler($event, 9)"><span>h5</span>
                     </vue3ResizeDrag>
                 </div>
 
@@ -247,14 +247,15 @@ export default defineComponent({
             }
         }
         const reset = (index: number) => {
-            if (index >= 5) {
+            if (index > 4) {
                 value[index].x = config.hor_density[index - 5].def_x
                 value[index].y = config.hor_density[index - 5].def_y
-                set?.SetBlendingVerDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index - 5 + 1, Number(value[index].x));
+                
+                set?.SetBlendingHorDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index - 5+1, Number(value[index].x));
             } else {
                 value[index].x = config.ver_density[index].def_x
                 value[index].y = config.ver_density[index].def_y
-                set?.SetBlendingHorDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index + 1, Number(value[index].y))
+                set?.SetBlendingVerDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index+1, Number(value[index].y))
 
             }
 
@@ -366,7 +367,7 @@ export default defineComponent({
         }
         //
         watch(() => value[0], (newVal, oldVal) => {
-            send_configuration(0, newVal.y, newVal.number)
+            send_configuration(1, newVal.y, newVal.number)
             if (!isactivearray.value[0]) {
                 let x = default_location[0].x;
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -376,7 +377,7 @@ export default defineComponent({
         }, { deep: true })
 
         watch(() => value[1], (newVal, oldVal) => {
-            send_configuration(1, newVal.y, newVal.number)
+            send_configuration(2, newVal.y, newVal.number)
             if (!isactivearray.value[1]) {
                 let x = default_location[1].x;
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -387,7 +388,7 @@ export default defineComponent({
 
         watch(() => value[2], (newVal, oldVal) => {
             //发送x y 唯一一个
-            send_configuration(2, newVal.y, newVal.number)
+            send_configuration(3, newVal.y, newVal.number)
             if (!isactivearray.value[2]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -397,7 +398,7 @@ export default defineComponent({
         }, { deep: true })
 
         watch(() => value[3], (newVal, oldVal) => {
-            send_configuration(3, newVal.y, newVal.number)
+            send_configuration(4, newVal.y, newVal.number)
             if (!isactivearray.value[3]) {
                 let x = default_location[3].x;
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -407,7 +408,7 @@ export default defineComponent({
         }, { deep: true })
 
         watch(() => value[4], (newVal, oldVal) => {
-            send_configuration(4, newVal.y, newVal.number)
+            send_configuration(5, newVal.y, newVal.number)
             if (!isactivearray.value[4]) {
                 let x = default_location[4].x;
                 let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
@@ -420,7 +421,7 @@ export default defineComponent({
         ///
 
         watch(() => value[5], (newVal, oldVal) => {
-            send_configuration(5, newVal.x, newVal.number)
+            send_configuration(6, newVal.x, newVal.number)
             if (!isactivearray.value[5]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = default_location[5].y
@@ -430,7 +431,7 @@ export default defineComponent({
         }, { deep: true })
 
         watch(() => value[6], (newVal, oldVal) => {
-            send_configuration(6, newVal.x, newVal.number)
+            send_configuration(7, newVal.x, newVal.number)
             if (!isactivearray.value[6]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = default_location[6].y
@@ -440,7 +441,7 @@ export default defineComponent({
         }, { deep: true })
 
         watch(() => value[7], (newVal, oldVal) => {
-            send_configuration(7, newVal.x, newVal.number)
+            send_configuration(8, newVal.x, newVal.number)
             if (!isactivearray.value[7]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = default_location[7].y
@@ -450,7 +451,7 @@ export default defineComponent({
         }, { deep: true })
 
         watch(() => value[8], (newVal, oldVal) => {
-            send_configuration(8, newVal.x, newVal.number)
+            send_configuration(9, newVal.x, newVal.number)
             if (!isactivearray.value[8]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = default_location[8].y
@@ -460,7 +461,7 @@ export default defineComponent({
         }, { deep: true })
 
         watch(() => value[9], (newVal, oldVal) => {
-            send_configuration(9, newVal.x, newVal.number)
+            send_configuration(10, newVal.x, newVal.number)
             if (!isactivearray.value[9]) {
                 let x = Math.ceil(newVal.x / Proportion.value.x);
                 let y = default_location[9].y
@@ -473,10 +474,13 @@ export default defineComponent({
         const send_configuration = (index: number, value: number, number: number) => {
 
             if (ste_status.value == 0) {
-                if (index < 5) {
-                    set?.SetBlendingVerDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index + 1, Number(value))
+                if (index <= 5) {
+                    //SetBlendingHorDensity h0 v1
+                    //
+                    set?.SetBlendingVerDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index, Number(value))
                 } else {
-                    set?.SetBlendingHorDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index - 4, Number(value));
+                    //
+                    set?.SetBlendingHorDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index - 5, Number(value));
                 }
             }
             save_set_cache()
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 085f167..690d5dc 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -108,8 +108,11 @@
           <p class="text-center">gamma</p>
         </div>
       </div>
-      <!-- <q-btn color="white" @click="save" text-color="black" :label="$t('save config')" /> -->
     </div>
+    
+  </div>
+  <div>
+    <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
   </div>
 </template>
 
@@ -151,6 +154,8 @@ export default defineComponent({
       { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
       { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
     ]);
+    //正确的 索引编号
+    let arr = [1, 0, 2, 3]
     let serverconfig = JSON.parse($store.state.fusion_configuration);
     const selectedprojector = computed(() => {
       return $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col + $store.getters.GetTheCurrentlySelectedCamera[1]
@@ -196,34 +201,35 @@ export default defineComponent({
       }, 100);
       setnowindex()
     }, { deep: true })
+
     const chang = (type: string) => {
       if (type == "alpha") {
         if ($store.state.enablefusion) set?.setBlendingAlphaParam(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
-          group.value,
-          array[group.value].alpha
+          arr[group.value],
+          array[arr[group.value]].alpha
         );
       }
       if (type == "p") {
         if ($store.state.enablefusion) set?.setBlendingPowerParam(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
-          group.value,
-          array[group.value].p
+          arr[group.value],
+          array[arr[group.value]].p
         );
       }
       if (type == "gamma") {
         if ($store.state.enablefusion) set?.setBlendingGammaParam(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
-          group.value,
-          array[group.value].gamma
+          arr[group.value],
+          array[arr[group.value]].gamma
         );
       }
       save_set_cache();
     };
-
+    //左上右下
     const setnowindex = () => {
       let sum = 0;
       let indexx = 4;
@@ -240,34 +246,52 @@ export default defineComponent({
       }
     }
 
-    const getconfig = () => {
-      try {
-        set?.GetBlendingConfig("").then((res) => { })
-        set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); $store.commit("setEnablefusion", tmp.enable); $store.commit("setfusion_configuration", res?.config); })
-      } catch (error) {
 
+    //接受 赋值
+    const setconfig = (config: any) => {
+      let tmp = JSON.parse(config);
+      let fortmp = null
+      let i
+      for (i of tmp.projectors) {
+        if (i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && i.row === $store.getters.GetTheCurrentlySelectedCamera[0]) {
+          fortmp = JSON.parse(JSON.stringify(i))
+        }
+      }
+      ste_status.value = 1;
+      config = JSON.parse(JSON.stringify(fortmp))
+      //手动对应数据索引
+      for (let index = 0; index < array.length - 1; index++) {
+        array[arr[index]].gamma = config.params[index].gamma.toFixed(2)
+        array[arr[index]].alpha = config.params[index].alpha.toFixed(2)
+        array[arr[index]].p = config.params[index].power.toFixed(2)
+        array[arr[index]].isshow = config.params[index].enable
+        array[arr[index]].value = Number(config.params[index].size)
       }
 
+      setTimeout(() => {
+        ste_status.value = 0;
+      }, 100);
+      setnowindex()
     }
     const startconfig = () => {
+      //手动对应数据索引
       for (let index = 0; index < array.length - 1; index++) {
-        array[index].gamma = config.params[index].gamma.toFixed(2)
-        array[index].alpha = config.params[index].alpha.toFixed(2)
-        array[index].p = config.params[index].power.toFixed(2)
-        array[index].isshow = config.params[index].enable
-        array[index].value = Number(config.params[index].size)
+        array[arr[index]].gamma = config.params[index].gamma.toFixed(2)
+        array[arr[index]].alpha = config.params[index].alpha.toFixed(2)
+        array[arr[index]].p = config.params[index].power.toFixed(2)
+        array[arr[index]].isshow = config.params[index].enable
+        array[arr[index]].value = Number(config.params[index].size)
       }
       if (sessionStorage.FusionLocale) set_cache.value = JSON.parse(sessionStorage.FusionLocale); use_set_cache()
       setnowindex()
     }
     const use_server_config = () => {
-
       for (let index = 0; index < array.length - 1; index++) {
-        array[index].gamma = config.params[index].gamma.toFixed(2)
-        array[index].alpha = config.params[index].alpha.toFixed(2)
-        array[index].p = config.params[index].power.toFixed(2)
-        array[index].isshow = config.params[index].enable
-        array[index].value = Number(config.params[index].size)
+        array[arr[index]].gamma = config.params[index].gamma.toFixed(2)
+        array[arr[index]].alpha = config.params[index].alpha.toFixed(2)
+        array[arr[index]].p = config.params[index].power.toFixed(2)
+        array[arr[index]].isshow = config.params[index].enable
+        array[arr[index]].value = Number(config.params[index].size)
       }
     }
     startconfig()
@@ -276,7 +300,7 @@ export default defineComponent({
     })
 
     watch(
-      () => array[0],
+      () => array[0].value,
       (newVal, oldVal) => {
         if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 1, array[0].isshow, Number(array[0].value));
         save_set_cache()
@@ -284,7 +308,7 @@ export default defineComponent({
       { deep: true }
     );
     watch(
-      () => array[1],
+      () => array[1].value,
       (newVal, oldVal) => {
         if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 0, array[1].isshow, Number(array[1].value));
         save_set_cache()
@@ -292,7 +316,7 @@ export default defineComponent({
       { deep: true }
     );
     watch(
-      () => array[2],
+      () => array[2].value,
       (newVal, oldVal) => {
         if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 2, array[2].isshow, Number(array[2].value));
         save_set_cache()
@@ -300,7 +324,7 @@ export default defineComponent({
       { deep: true }
     );
     watch(
-      () => array[3],
+      () => array[3].value,
       (newVal, oldVal) => {
         if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 3, array[3].isshow, Number(array[3].value));
         save_set_cache()
@@ -308,6 +332,42 @@ export default defineComponent({
       { deep: true }
     );
 
+    ////
+    watch(
+      () => array[0].isshow,
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 1, array[0].isshow, Number(array[0].value));
+        save_set_cache()
+      },
+      { deep: true }
+    );
+    watch(
+      () => array[1].isshow,
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 0, array[1].isshow, Number(array[1].value));
+        save_set_cache()
+      },
+      { deep: true }
+    );
+    watch(
+      () => array[2].isshow,
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 2, array[2].isshow, Number(array[2].value));
+        save_set_cache()
+      },
+      { deep: true }
+    );
+    watch(
+      () => array[3].isshow,
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 3, array[3].isshow, Number(array[3].value));
+        save_set_cache()
+      },
+      { deep: true }
+    );
+
+    ////
+
     watch(
       () => enablefusion,
       (newVal, oldVal) => {
@@ -318,11 +378,13 @@ export default defineComponent({
     const changenablefusion = () => {
       $store.commit('setenablefusion', enablefusion.value);
     }
-    const save = () => {
-      set?.SaveBlendingConfig("")
-      setTimeout(() => {
-        set?.GetBlendingConfig("").then((res) => { $store.commit("setfusion_configuration", res?.config); })
-      }, 1000);
+    let resnewdata = null;
+    const resetall = () => {
+      try {
+        set?.GetBlendingConfig("").then((res) => { resnewdata = res?.config; setconfig(resnewdata) })
+      } catch (error) {
+        console.log("ResetBlendingConfig error")
+      }
     }
     return {
       group,
@@ -331,7 +393,7 @@ export default defineComponent({
       enablefusion,
       changenablefusion,
       selectedprojector,
-      save,
+      resetall,
       set_cache
     };
   },

From 652fb277df5f492336cd5104f701b18c31c0e30e Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Fri, 13 Jan 2023 16:34:05 +0800
Subject: [PATCH 13/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E8=9E=8D=E5=90=88=E9=80=89=E9=A1=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/ClientConnection.ts | 12 ++++++++++++
 src/entities/WSProtocol.ts     | 26 ++++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index c83e0fd..9ba1fc0 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -1475,6 +1475,18 @@ export default class ClientConnection {
     );
   }
 
+  public async SetBlendingOption(
+    id: number,
+    value: number
+  ) {
+    return await this.doRpc<Protocol.NoneResponse>(
+      new Protocol.SetBlendingOptionRequestEntity(
+        id,
+        value
+      )
+    );
+  }
+
   public destory() {
     this.ws?.close();
     if (this.ws) {
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index 1e64b73..5f88bf8 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -523,6 +523,9 @@ export namespace Protocol {
     public static get kResetBlending() {
       return Commands.PROTOCOL_PREFIX + "ResetBlending";
     }
+    public static get kSetBlendingOption() {
+      return Commands.PROTOCOL_PREFIX + "SetBlendingOption";
+    }
 
     static _all_commands = new Set([
       Commands.kUnKnowCommand,
@@ -653,8 +656,9 @@ export namespace Protocol {
       Commands.kGetBlendingConfig,
       Commands.kSaveBlendingConfig,
       Commands.kSetBlendingHorDensity,
-      Commands.kSetBlendingVerDensity,
-      Commands.kResetBlending,
+      Commands.kSetBlendingVerDensity,
+      Commands.kResetBlending,
+      Commands.kSetBlendingOption,
     ]);
     public static get AllCommands() {
       return this._all_commands;
@@ -3462,4 +3466,22 @@ export namespace Protocol {
       super.rpc_id = rpc_id;
     }
   }
+
+  export class SetBlendingOptionRequestEntity extends PacketEntity {
+    constructor(
+      id: number,
+      value: number,
+      rpc_id = 0
+    ) {
+      super();
+      super.command = Commands.kSetBlendingOption;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      super.rpc_id = rpc_id;
+
+      this.id = id ?? 0;
+      this.value = value ?? 0;
+    }
+    id = 0;
+    value = 0;
+  }
 }

From 5ca7e6e495a576158d0ea9dd70d1de60363b3444 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 13 Jan 2023 16:46:00 +0800
Subject: [PATCH 14/78] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 1342 +++++++++-----
 .../FusionSettings/FourPointCalibration.vue   |  997 +++++++----
 .../FusionSettings/FusionLocale.vue           |  430 +++--
 .../FusionSettings/SurfaceCorrection.vue      | 1558 +++++++++++------
 src/components/FusionSettingsDialog.vue       |  146 +-
 src/pages/TopToolBar.vue                      |   54 +-
 6 files changed, 2928 insertions(+), 1599 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index a476afb..ba6d0d9 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -1,505 +1,885 @@
 <template>
-    <div class="row">
-        <div class="col-1"></div>
-        <div class="col-8 q-pt-md">
-            <div ref="div" style="width:100%;background-color: aquamarine;height: 100%;">
-
-                <div style="position:absolute;">
-                    <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="20"
-                        :x="point_postion[0].x" :y="point_postion[0].y" @mousedown="isactivearray[0] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 0)"><span>v1</span>
-                    </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="20"
-                        :x="point_postion[1].x" :y="point_postion[1].y" @mousedown="isactivearray[1] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 1)"><span>v2</span>
-                    </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="20"
-                        :x="point_postion[2].x" :y="point_postion[2].y" @mousedown="isactivearray[2] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 2)"><span>v3</span>
-                    </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="20"
-                        :x="point_postion[3].x" :y="point_postion[3].y" @mousedown="isactivearray[3] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 3)"><span>v4</span>
-                    </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="20"
-                        :x="point_postion[4].x" :y="point_postion[4].y" @mousedown="isactivearray[4] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 4)"><span>v5</span>
-                    </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="30" :h="20"
-                        :x="point_postion[5].x" :y="point_postion[5].y" @mousedown="isactivearray[5] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 5)"><span>h1</span>
-                    </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="30" :h="20"
-                        :x="point_postion[6].x" :y="point_postion[6].y" @mousedown="isactivearray[6] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 6)"><span>h2</span>
-                    </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="30" :h="20"
-                        :x="point_postion[7].x" :y="point_postion[7].y" @mousedown="isactivearray[7] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 7)"><span>h3</span>
-                    </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="30" :h="20"
-                        :x="point_postion[8].x" :y="point_postion[8].y" @mousedown="isactivearray[8] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 8)"><span>h4</span>
-                    </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[9]" v-if="isshowarray[9]" :w="35" :h="20"
-                        :x="point_postion[9].x" :y="point_postion[9].y" @mousedown="isactivearray[9] = true"
-                        :isResizable="false" @moveHandler="moveHandler($event, 9)"><span>h5</span>
-                    </vue3ResizeDrag>
-                </div>
-
-            </div>
+  <div class="row">
+    <div class="col-1"></div>
+    <div class="col-8 q-pt-md">
+      <div
+        ref="div"
+        style="width: 100%; background-color: aquamarine; height: 100%"
+      >
+        <div style="position: absolute">
+          <vue3ResizeDrag
+            :isActive="isactivearray[0]"
+            v-if="isshowarray[0]"
+            :w="30"
+            :h="20"
+            :x="point_postion[0].x"
+            :y="point_postion[0].y"
+            @mousedown="isactivearray[0] = true"
+            :isResizable="false"
+            @moveHandler="moveHandler($event, 0)"
+            ><span>v1</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[1]"
+            v-if="isshowarray[1]"
+            :w="30"
+            :h="20"
+            :x="point_postion[1].x"
+            :y="point_postion[1].y"
+            @mousedown="isactivearray[1] = true"
+            :isResizable="false"
+            @moveHandler="moveHandler($event, 1)"
+            ><span>v2</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[2]"
+            v-if="isshowarray[2]"
+            :w="30"
+            :h="20"
+            :x="point_postion[2].x"
+            :y="point_postion[2].y"
+            @mousedown="isactivearray[2] = true"
+            :isResizable="false"
+            @moveHandler="moveHandler($event, 2)"
+            ><span>v3</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[3]"
+            v-if="isshowarray[3]"
+            :w="30"
+            :h="20"
+            :x="point_postion[3].x"
+            :y="point_postion[3].y"
+            @mousedown="isactivearray[3] = true"
+            :isResizable="false"
+            @moveHandler="moveHandler($event, 3)"
+            ><span>v4</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[4]"
+            v-if="isshowarray[4]"
+            :w="30"
+            :h="20"
+            :x="point_postion[4].x"
+            :y="point_postion[4].y"
+            @mousedown="isactivearray[4] = true"
+            :isResizable="false"
+            @moveHandler="moveHandler($event, 4)"
+            ><span>v5</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[5]"
+            v-if="isshowarray[5]"
+            :w="30"
+            :h="20"
+            :x="point_postion[5].x"
+            :y="point_postion[5].y"
+            @mousedown="isactivearray[5] = true"
+            :isResizable="false"
+            @moveHandler="moveHandler($event, 5)"
+            ><span>h1</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[6]"
+            v-if="isshowarray[6]"
+            :w="30"
+            :h="20"
+            :x="point_postion[6].x"
+            :y="point_postion[6].y"
+            @mousedown="isactivearray[6] = true"
+            :isResizable="false"
+            @moveHandler="moveHandler($event, 6)"
+            ><span>h2</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[7]"
+            v-if="isshowarray[7]"
+            :w="30"
+            :h="20"
+            :x="point_postion[7].x"
+            :y="point_postion[7].y"
+            @mousedown="isactivearray[7] = true"
+            :isResizable="false"
+            @moveHandler="moveHandler($event, 7)"
+            ><span>h3</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[8]"
+            v-if="isshowarray[8]"
+            :w="30"
+            :h="20"
+            :x="point_postion[8].x"
+            :y="point_postion[8].y"
+            @mousedown="isactivearray[8] = true"
+            :isResizable="false"
+            @moveHandler="moveHandler($event, 8)"
+            ><span>h4</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[9]"
+            v-if="isshowarray[9]"
+            :w="35"
+            :h="20"
+            :x="point_postion[9].x"
+            :y="point_postion[9].y"
+            @mousedown="isactivearray[9] = true"
+            :isResizable="false"
+            @moveHandler="moveHandler($event, 9)"
+            ><span>h5</span>
+          </vue3ResizeDrag>
         </div>
-        <div class="col-3 q-pt-md">
-            <div class="row">
-                <div class="col-12">
-                    <div class="row">
-                        <div class="col-2"></div>
-                        <div class="col-8"><q-input @focus="isactivearray[0] = false" filled type="number"
-                                class="q-pt-md" :dense="true" v-model="value[0].y" label="y" lazy-rules />
-                            <q-btn color="white" @click="reset(0)" text-color="black" :label="$t('reset')+' v1'" />
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12">
-                    <div class="row">
-                        <div class="col-2"></div>
-                        <div class="col-8"><q-input @focus="isactivearray[1] = false" filled type="number"
-                                class="q-pt-md" :dense="true" v-model="value[1].y" label="y" lazy-rules />
-                            <q-btn color="white" @click="reset(1)" text-color="black" :label="$t('reset')+' v2'" />
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12">
-                    <div class="row">
-                        <div class="col-2"></div>
-                        <div class="col-8"><q-input @focus="isactivearray[2] = false" filled type="number"
-                                class="q-pt-md" :dense="true" v-model="value[2].y" label="y" lazy-rules />
-                            <q-btn color="white" @click="reset(2)" text-color="black" :label="$t('reset')+' v3'" />
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12">
-                    <div class="row">
-                        <div class="col-2"></div>
-                        <div class="col-8"><q-input @focus="isactivearray[3] = false" filled type="number"
-                                class="q-pt-md" :dense="true" v-model="value[3].y" label="y" lazy-rules />
-                            <q-btn color="white" @click="reset(3)" text-color="black" :label="$t('reset')+' v4'" />
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12">
-                    <div class="row">
-                        <div class="col-2"></div>
-                        <div class="col-8"><q-input @focus="isactivearray[4] = false" filled type="number"
-                                class="q-pt-md" :dense="true" v-model="value[4].y" label="y" lazy-rules />
-                            <q-btn color="white" @click="reset(4)" text-color="black" :label="$t('reset')+' v5'" />
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="col-1"></div>
-        <div class="col-11">
-            <div class="row">
-                <div class="col-1"><q-input filled @focus="isactivearray[5] = false" type="number" class="q-pt-md"
-                        :dense="true" v-model="value[5].x" label="x" lazy-rules />
-                    <q-btn color="white" @click="reset(5)" text-color="black" :label="$t('reset')+' h1'" />
-                </div>
-                <div class="col-1"></div>
-                <div class="col-1"><q-input filled @focus="isactivearray[6] = false" type="number" class="q-pt-md"
-                        :dense="true" v-model="value[6].x" label="x" lazy-rules />
-                    <q-btn color="white" @click="reset(6)" text-color="black" :label="$t('reset')+' h2'" />
-                </div>
-                <div class="col-1"></div>
-                <div class="col-1"><q-input filled @focus="isactivearray[7] = false" type="number" class="q-pt-md"
-                        :dense="true" v-model="value[7].x" label="x" lazy-rules />
-                    <q-btn color="white" @click="reset(7)" text-color="black" :label="$t('reset')+' h3'" />
-                </div>
-                <div class="col-1"></div>
-                <div class="col-1"><q-input filled @focus="isactivearray[8] = false" type="number" class="q-pt-md"
-                        :dense="true" v-model="value[8].x" label="x" lazy-rules />
-                    <q-btn color="white" @click="reset(8)" text-color="black" :label="$t('reset')+' h4'" />
-                </div>
-                <div class="col-1"></div>
-                <div class="col-1"><q-input filled @focus="isactivearray[9] = false" type="number" class="q-pt-md"
-                        :dense="true" v-model="value[9].x" label="x" lazy-rules />
-                    <q-btn color="white" @click="reset(9)" text-color="black" :label="$t('reset')+' h5'" />
-                </div>
-                <div class="col-1"></div>
-                <div class="col-1 q-pt-xl">
-                    <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
-
-                </div>
-
-            </div>
-        </div>
-
+      </div>
     </div>
+    <div class="col-3 q-pt-md">
+      <div class="row">
+        <div class="col-12">
+          <div class="row">
+            <div class="col-2"></div>
+            <div class="col-8">
+              <q-input
+                @focus="isactivearray[0] = false"
+                filled
+                type="number"
+                class="q-pt-md"
+                :dense="true"
+                v-model="value[0].y"
+                label="y"
+                lazy-rules
+              />
+              <q-btn
+                color="white"
+                @click="reset(0)"
+                text-color="black"
+                :label="$t('reset') + ' v1'"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="col-12">
+          <div class="row">
+            <div class="col-2"></div>
+            <div class="col-8">
+              <q-input
+                @focus="isactivearray[1] = false"
+                filled
+                type="number"
+                class="q-pt-md"
+                :dense="true"
+                v-model="value[1].y"
+                label="y"
+                lazy-rules
+              />
+              <q-btn
+                color="white"
+                @click="reset(1)"
+                text-color="black"
+                :label="$t('reset') + ' v2'"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="col-12">
+          <div class="row">
+            <div class="col-2"></div>
+            <div class="col-8">
+              <q-input
+                @focus="isactivearray[2] = false"
+                filled
+                type="number"
+                class="q-pt-md"
+                :dense="true"
+                v-model="value[2].y"
+                label="y"
+                lazy-rules
+              />
+              <q-btn
+                color="white"
+                @click="reset(2)"
+                text-color="black"
+                :label="$t('reset') + ' v3'"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="col-12">
+          <div class="row">
+            <div class="col-2"></div>
+            <div class="col-8">
+              <q-input
+                @focus="isactivearray[3] = false"
+                filled
+                type="number"
+                class="q-pt-md"
+                :dense="true"
+                v-model="value[3].y"
+                label="y"
+                lazy-rules
+              />
+              <q-btn
+                color="white"
+                @click="reset(3)"
+                text-color="black"
+                :label="$t('reset') + ' v4'"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="col-12">
+          <div class="row">
+            <div class="col-2"></div>
+            <div class="col-8">
+              <q-input
+                @focus="isactivearray[4] = false"
+                filled
+                type="number"
+                class="q-pt-md"
+                :dense="true"
+                v-model="value[4].y"
+                label="y"
+                lazy-rules
+              />
+              <q-btn
+                color="white"
+                @click="reset(4)"
+                text-color="black"
+                :label="$t('reset') + ' v5'"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="col-1"></div>
+    <div class="col-11">
+      <div class="row">
+        <div class="col-1">
+          <q-input
+            filled
+            @focus="isactivearray[5] = false"
+            type="number"
+            class="q-pt-md"
+            :dense="true"
+            v-model="value[5].x"
+            label="x"
+            lazy-rules
+          />
+          <q-btn
+            color="white"
+            @click="reset(5)"
+            text-color="black"
+            :label="$t('reset') + ' h1'"
+          />
+        </div>
+        <div class="col-1"></div>
+        <div class="col-1">
+          <q-input
+            filled
+            @focus="isactivearray[6] = false"
+            type="number"
+            class="q-pt-md"
+            :dense="true"
+            v-model="value[6].x"
+            label="x"
+            lazy-rules
+          />
+          <q-btn
+            color="white"
+            @click="reset(6)"
+            text-color="black"
+            :label="$t('reset') + ' h2'"
+          />
+        </div>
+        <div class="col-1"></div>
+        <div class="col-1">
+          <q-input
+            filled
+            @focus="isactivearray[7] = false"
+            type="number"
+            class="q-pt-md"
+            :dense="true"
+            v-model="value[7].x"
+            label="x"
+            lazy-rules
+          />
+          <q-btn
+            color="white"
+            @click="reset(7)"
+            text-color="black"
+            :label="$t('reset') + ' h3'"
+          />
+        </div>
+        <div class="col-1"></div>
+        <div class="col-1">
+          <q-input
+            filled
+            @focus="isactivearray[8] = false"
+            type="number"
+            class="q-pt-md"
+            :dense="true"
+            v-model="value[8].x"
+            label="x"
+            lazy-rules
+          />
+          <q-btn
+            color="white"
+            @click="reset(8)"
+            text-color="black"
+            :label="$t('reset') + ' h4'"
+          />
+        </div>
+        <div class="col-1"></div>
+        <div class="col-1">
+          <q-input
+            filled
+            @focus="isactivearray[9] = false"
+            type="number"
+            class="q-pt-md"
+            :dense="true"
+            v-model="value[9].x"
+            label="x"
+            lazy-rules
+          />
+          <q-btn
+            color="white"
+            @click="reset(9)"
+            text-color="black"
+            :label="$t('reset') + ' h5'"
+          />
+        </div>
+        <div class="col-1"></div>
+        <div class="col-1 q-pt-xl">
+          <q-btn
+            color="white"
+            @click="resetall"
+            text-color="black"
+            :label="$t('resetall')"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
-<style scoped>
-
-</style>
+<style scoped></style>
 <script lang="ts">
-import { defineComponent, ref, watch, computed, defineProps, withDefaults, reactive, onMounted, onBeforeUnmount } from "vue";
+import {
+  defineComponent,
+  ref,
+  watch,
+  computed,
+  defineProps,
+  withDefaults,
+  reactive,
+  onMounted,
+  onBeforeUnmount,
+} from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
 import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
 import GlobalData from "src/common/GlobalData";
 export default defineComponent({
-    name: "ComponentDensityCorrection",
-    components: {
-        vue3ResizeDrag
-    },
-    setup() {
-        let $store = useStore();
-        let $t = useI18n();
-        const value = reactive([{ x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }, { x: 0, y: 0, number: 0 }]);
-        let model = ref(null);
-        const div = ref();
-        const isshowarray = ref([true, true, true, true, true, true, true, true, true, true])
-        const isactivearray = ref([true, true, true, true, true, true, true, true, true, true])
-        const default_location: any = reactive([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 },]);
-        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 });
-        const configselsect = computed(() => { return $store.state.selected_projector })
-        //用于计算当前投影仪的索引
-        let serverconfig = JSON.parse($store.state.fusion_configuration);
-        const selectedprojector = computed(() => {
-            return $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col + $store.getters.GetTheCurrentlySelectedCamera[1]
-        })
-        const set_cache: any = ref([]);
-        const ste_status = ref(0);
-        //
-        //为了加载 缓存的配置时 同步点的位置
-        const syncpoint = () => {
-            for (let index = 0; index < value.length; index++) {
-                isactivearray.value[index] = false
-            }
+  name: "ComponentDensityCorrection",
+  components: {
+    vue3ResizeDrag,
+  },
+  setup() {
+    let $store = useStore();
+    let $t = useI18n();
+    const value = reactive([
+      { x: 0, y: 0, number: 0 },
+      { x: 0, y: 0, number: 0 },
+      { x: 0, y: 0, number: 0 },
+      { x: 0, y: 0, number: 0 },
+      { x: 0, y: 0, number: 0 },
+      { x: 0, y: 0, number: 0 },
+      { x: 0, y: 0, number: 0 },
+      { x: 0, y: 0, number: 0 },
+      { x: 0, y: 0, number: 0 },
+      { x: 0, y: 0, number: 0 },
+    ]);
+    let model = ref(null);
+    const div = ref();
+    const isshowarray = ref([
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+    ]);
+    const isactivearray = ref([
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+    ]);
+    const default_location: any = reactive([
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+    ]);
+    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 });
+    const configselsect = computed(() => {
+      return $store.state.selected_projector;
+    });
+    //用于计算当前投影仪的索引
+    let serverconfig = JSON.parse($store.state.fusion_configuration);
+    const selectedprojector = computed(() => {
+      return (
+        $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col +
+        $store.getters.GetTheCurrentlySelectedCamera[1]
+      );
+    });
+    const set_cache: any = ref([]);
+    const ste_status = ref(0);
+    //为了加载 缓存的配置时 同步点的位置
+    const syncpoint = () => {
+      for (let index = 0; index < value.length; index++) {
+        isactivearray.value[index] = false;
+      }
+    };
+
+    const use_set_cache = () => {
+      if (set_cache.value[selectedprojector.value] != null) {
+        let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
+        deepcopy(value, tmp);
+        syncpoint();
+      }
+    };
+    const deepcopy = (o1: any, o2: any) => {
+      for (let k in o2) {
+        if (typeof o2[k] === "object") {
+          o1[k] = {};
+          deepcopy(o1[k], o2[k]);
+        } else {
+          o1[k] = o2[k];
         }
-
-        const use_set_cache = () => {
-            if (set_cache.value[selectedprojector.value] != null) {
-                let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
-                deepcopy(value, tmp)
-                syncpoint()
-            }
-        };
-        const deepcopy = (o1: any, o2: any) => {
-            for (let k in o2) {
-                if (typeof o2[k] === 'object') {
-                    o1[k] = {};
-                    deepcopy(o1[k], o2[k]);
-                } else {
-                    o1[k] = o2[k];
-                }
-            }
+      }
+    };
+    const save_set_cache = () => {
+      set_cache.value[selectedprojector.value] = JSON.stringify(value);
+    };
+    onBeforeUnmount(() => {
+      sessionStorage.DensityCorrection = JSON.stringify(set_cache.value);
+    });
+    watch(
+      () => configselsect,
+      (newVal, oldVal) => {
+        let tmp = JSON.parse($store.state.fusion_configuration);
+        let fortmp = null;
+        let i;
+        for (i of tmp.projectors) {
+          if (
+            i.col === $store.getters.GetTheCurrentlySelectedCamera[1] &&
+            i.row === $store.getters.GetTheCurrentlySelectedCamera[0]
+          ) {
+            fortmp = JSON.parse(JSON.stringify(i));
+          }
         }
-        const save_set_cache = () => {
-            set_cache.value[selectedprojector.value] = JSON.stringify(value);
-        }
-        onBeforeUnmount(() => {
-            sessionStorage.DensityCorrection = JSON.stringify(set_cache.value)
-        })
-        watch(() => configselsect, (newVal, oldVal) => {
-            let tmp = JSON.parse($store.state.fusion_configuration);
-            let fortmp = null
-            let i
-            for (i of tmp.projectors) {
-                if (i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && i.row === $store.getters.GetTheCurrentlySelectedCamera[0]) {
-                    fortmp = JSON.parse(JSON.stringify(i))
-                }
-            }
-            ste_status.value = 1;
-            config = JSON.parse(JSON.stringify(fortmp))
-            use_server_config()
-            use_set_cache()
-            setTimeout(() => {
-                ste_status.value = 0;
-            }, 100);
-        }, { deep: true })
-        const initialization = () => {
-            ste_status.value = 1;
-            for (let index = 0; index < config.hor_density.length; index++) {
-                value[index].x = config.ver_density[index].x
-                value[index].y = config.ver_density[index].y
-                value[index].number = config.ver_density[index].number
-                value[index + 5].x = config.hor_density[index].x
-                value[index + 5].y = config.hor_density[index].y
-                value[index + 5].number = config.hor_density[index].number
-            }
-            if (sessionStorage.DensityCorrection && sessionStorage.DensityCorrection.length > 0) {
-                set_cache.value = JSON.parse(sessionStorage.DensityCorrection);
-                use_set_cache()
-            } else {
+        ste_status.value = 1;
+        config = JSON.parse(JSON.stringify(fortmp));
+        use_server_config();
+        use_set_cache();
+        setTimeout(() => {
+          ste_status.value = 0;
+        }, 100);
+      },
+      { deep: true }
+    );
+    const initialization = () => {
+      ste_status.value = 1;
+      for (let index = 0; index < config.hor_density.length; index++) {
+        value[index].x = config.ver_density[index].x;
+        value[index].y = config.ver_density[index].y;
+        value[index].number = config.ver_density[index].number;
+        value[index + 5].x = config.hor_density[index].x;
+        value[index + 5].y = config.hor_density[index].y;
+        value[index + 5].number = config.hor_density[index].number;
+      }
+      if (
+        sessionStorage.DensityCorrection &&
+        sessionStorage.DensityCorrection.length > 0
+      ) {
+        set_cache.value = JSON.parse(sessionStorage.DensityCorrection);
+        use_set_cache();
+      } else {
+      }
+      syncpoint();
+      setTimeout(() => {
+        ste_status.value = 0;
+      }, 100);
+    };
 
-            }
-            syncpoint()
-            setTimeout(() => {
-                ste_status.value = 0;
-            }, 100);
-        }
+    const resetall = () => {
+      for (
+        let index = 0;
+        index < config.hor_density.length + config.ver_density.length;
+        index++
+      ) {
+        reset(index);
+      }
+    };
+    const reset = (index: number) => {
+      if (index > 4) {
+        value[index].x = config.hor_density[index - 5].def_x;
+        value[index].y = config.hor_density[index - 5].def_y;
 
-        const resetall = () => {
-            for (let index = 0; index < config.hor_density.length + config.ver_density.length; index++) {
-                reset(index)
-            }
-        }
-        const reset = (index: number) => {
-            if (index > 4) {
-                value[index].x = config.hor_density[index - 5].def_x
-                value[index].y = config.hor_density[index - 5].def_y
-                
-                set?.SetBlendingHorDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index - 5+1, Number(value[index].x));
-            } else {
-                value[index].x = config.ver_density[index].def_x
-                value[index].y = config.ver_density[index].def_y
-                set?.SetBlendingVerDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index+1, Number(value[index].y))
+        set?.SetBlendingHorDensity(
+          $store.getters.GetTheCurrentlySelectedCamera[0],
+          $store.getters.GetTheCurrentlySelectedCamera[1],
+          index - 5 + 1,
+          Number(value[index].x)
+        );
+      } else {
+        value[index].x = config.ver_density[index].def_x;
+        value[index].y = config.ver_density[index].def_y;
+        set?.SetBlendingVerDensity(
+          $store.getters.GetTheCurrentlySelectedCamera[0],
+          $store.getters.GetTheCurrentlySelectedCamera[1],
+          index + 1,
+          Number(value[index].y)
+        );
+      }
 
-            }
-
-            point_postion[index].y = default_location[index].y
-            point_postion[index].x = default_location[index].x
-            isshowarray.value[index] = false
-            setTimeout(() => {
-                isshowarray.value[index] = true
-            }, 100);
-        }
-        const point_postion: any = reactive([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 },])
-        let set = GlobalData.getInstance().getCurrentClient();
-        const save = () => {
-            set?.SaveBlendingConfig("")
-            setTimeout(() => {
-                set?.GetBlendingConfig("").then((res) => { $store.commit("setfusion_configuration", res?.config); })
-            }, 1000);
-        }
-
-        const moveHandler = ($event: any, index: number) => {
-            let x = 0
-            let y = 0
-            switch (index) {
-                case 0:
-                case 1:
-                case 2:
-                case 3:
-                case 4:
-                    x = config.width / 2 + Math.ceil(($event.left - default_location[index].x) * Proportion.value.x);
-                    y = (config.height - (config.height / 4) * index) - Math.ceil(($event.top - default_location[index].y) * Proportion.value.y);
-                    break;
-                case 5:
-                case 6:
-                case 7:
-                case 8:
-                case 9:
-                    x = Math.ceil($event.left * Proportion.value.x);
-                    y = config.height / 2 - Math.ceil(($event.top - default_location[index].y) * Proportion.value.y);
-
-                    break;
-                default:
-            }
-            value[index].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            value[index].y = y > config.height ? config.height : y && y < 0 ? 0 : y
-            save_set_cache()
-        }
-
-        const use_server_config = () => {
-            for (let index = 0; index < config.hor_density.length; index++) {
-                value[index].x = config.ver_density[index].x
-                value[index].y = config.ver_density[index].y
-                value[index].number = config.ver_density[index].number
-                value[index + 5].x = config.hor_density[index].x
-                value[index + 5].y = config.hor_density[index].y
-                value[index + 5].number = config.hor_density[index].number
-            }
-        }
-
-        onMounted(() => {
-
-            initialization()
-            Proportion.value.x = config.width / (div.value.offsetWidth - 25)
-            Proportion.value.y = config.height / (div.value.offsetHeight - 25)
-            let Width = (div.value.offsetWidth - 25) / 4
-            let Height = (div.value.offsetHeight - 25) / 4
-            for (let index = 0; index < config.hor_density.length + config.ver_density.length; index++) {
-                if (index < 5) {
-                    point_postion[index].y = default_location[index].y = Height * index
-                    point_postion[index].x = default_location[index].x = Width * 2
-                } else {
-                    point_postion[index].y = default_location[index].y = Height * 2
-                    point_postion[index].x = default_location[index].x = Width * (index - 5)
-                }
-            }
-
-        })
-
-        //窗口变动重新渲染
-        onMounted(() => {
-            //监听窗口变化
-            window.onresize = () => {
-                return (() => {
-                    initialization()
-                    Proportion.value.x = config.width / (div.value.offsetWidth - 25)
-                    Proportion.value.y = config.height / (div.value.offsetHeight - 25)
-                    let Width = (div.value.offsetWidth - 25) / 4
-                    let Height = (div.value.offsetHeight - 25) / 4
-                    for (let index = 0; index < config.hor_density.length + config.ver_density.length; index++) {
-                        if (index < 5) {
-                            point_postion[index].y = default_location[index].y = Height * index
-                            point_postion[index].x = default_location[index].x = Width * 2
-                        } else {
-                            point_postion[index].y = default_location[index].y = Height * 2
-                            point_postion[index].x = default_location[index].x = Width * (index - 5)
-                        }
-                    }
-                })();
-            };
+      point_postion[index].y = default_location[index].y;
+      point_postion[index].x = default_location[index].x;
+      isshowarray.value[index] = false;
+      setTimeout(() => {
+        isshowarray.value[index] = true;
+      }, 100);
+    };
+    const point_postion: any = reactive([
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+    ]);
+    let set = GlobalData.getInstance().getCurrentClient();
+    const save = () => {
+      set?.SaveBlendingConfig("");
+      setTimeout(() => {
+        set?.GetBlendingConfig("").then((res) => {
+          $store.commit("setfusion_configuration", res?.config);
         });
+      }, 1000);
+    };
 
-        const setdianposin = (index: number, x: number, y: number) => {
-            point_postion[index].x = x
-            point_postion[index].y = y
-            isshowarray.value[index] = false
-            isactivearray.value[index] = false
-            setTimeout(() => {
-                isshowarray.value[index] = true
-            }, 100);
+    const moveHandler = ($event: any, index: number) => {
+      let x = 0;
+      let y = 0;
+      switch (index) {
+        case 0:
+        case 1:
+        case 2:
+        case 3:
+        case 4:
+          x =
+            config.width / 2 +
+            Math.ceil(
+              ($event.left - default_location[index].x) * Proportion.value.x
+            );
+          y =
+            config.height -
+            (config.height / 4) * index -
+            Math.ceil(
+              ($event.top - default_location[index].y) * Proportion.value.y
+            );
+          break;
+        case 5:
+        case 6:
+        case 7:
+        case 8:
+        case 9:
+          x = Math.ceil($event.left * Proportion.value.x);
+          y =
+            config.height / 2 -
+            Math.ceil(
+              ($event.top - default_location[index].y) * Proportion.value.y
+            );
+
+          break;
+        default:
+      }
+      value[index].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+      value[index].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      save_set_cache();
+    };
+
+    const use_server_config = () => {
+      for (let index = 0; index < config.hor_density.length; index++) {
+        value[index].x = config.ver_density[index].x;
+        value[index].y = config.ver_density[index].y;
+        value[index].number = config.ver_density[index].number;
+        value[index + 5].x = config.hor_density[index].x;
+        value[index + 5].y = config.hor_density[index].y;
+        value[index + 5].number = config.hor_density[index].number;
+      }
+    };
+
+    onMounted(() => {
+      initialization();
+      Proportion.value.x = config.width / (div.value.offsetWidth - 25);
+      Proportion.value.y = config.height / (div.value.offsetHeight - 25);
+      let Width = (div.value.offsetWidth - 25) / 4;
+      let Height = (div.value.offsetHeight - 25) / 4;
+      for (
+        let index = 0;
+        index < config.hor_density.length + config.ver_density.length;
+        index++
+      ) {
+        if (index < 5) {
+          point_postion[index].y = default_location[index].y = Height * index;
+          point_postion[index].x = default_location[index].x = Width * 2;
+        } else {
+          point_postion[index].y = default_location[index].y = Height * 2;
+          point_postion[index].x = default_location[index].x =
+            Width * (index - 5);
         }
-        //
-        watch(() => value[0], (newVal, oldVal) => {
-            send_configuration(1, newVal.y, newVal.number)
-            if (!isactivearray.value[0]) {
-                let x = default_location[0].x;
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                setdianposin(0, x, y)
+      }
+    });
+
+    //窗口变动重新渲染
+    onMounted(() => {
+      window.onresize = () => {
+        return (() => {
+          initialization();
+          Proportion.value.x = config.width / (div.value.offsetWidth - 25);
+          Proportion.value.y = config.height / (div.value.offsetHeight - 25);
+          let Width = (div.value.offsetWidth - 25) / 4;
+          let Height = (div.value.offsetHeight - 25) / 4;
+          for (
+            let index = 0;
+            index < config.hor_density.length + config.ver_density.length;
+            index++
+          ) {
+            if (index < 5) {
+              point_postion[index].y = default_location[index].y =
+                Height * index;
+              point_postion[index].x = default_location[index].x = Width * 2;
+            } else {
+              point_postion[index].y = default_location[index].y = Height * 2;
+              point_postion[index].x = default_location[index].x =
+                Width * (index - 5);
             }
-            save_set_cache()
-        }, { deep: true })
+          }
+        })();
+      };
+    });
 
-        watch(() => value[1], (newVal, oldVal) => {
-            send_configuration(2, newVal.y, newVal.number)
-            if (!isactivearray.value[1]) {
-                let x = default_location[1].x;
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                setdianposin(1, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-
-        watch(() => value[2], (newVal, oldVal) => {
-            //发送x y 唯一一个
-            send_configuration(3, newVal.y, newVal.number)
-            if (!isactivearray.value[2]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                setdianposin(2, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-
-        watch(() => value[3], (newVal, oldVal) => {
-            send_configuration(4, newVal.y, newVal.number)
-            if (!isactivearray.value[3]) {
-                let x = default_location[3].x;
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                setdianposin(3, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-
-        watch(() => value[4], (newVal, oldVal) => {
-            send_configuration(5, newVal.y, newVal.number)
-            if (!isactivearray.value[4]) {
-                let x = default_location[4].x;
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                setdianposin(4, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-
-
-        ///
-
-        watch(() => value[5], (newVal, oldVal) => {
-            send_configuration(6, newVal.x, newVal.number)
-            if (!isactivearray.value[5]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = default_location[5].y
-                setdianposin(5, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-
-        watch(() => value[6], (newVal, oldVal) => {
-            send_configuration(7, newVal.x, newVal.number)
-            if (!isactivearray.value[6]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = default_location[6].y
-                setdianposin(6, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-
-        watch(() => value[7], (newVal, oldVal) => {
-            send_configuration(8, newVal.x, newVal.number)
-            if (!isactivearray.value[7]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = default_location[7].y
-                setdianposin(7, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-
-        watch(() => value[8], (newVal, oldVal) => {
-            send_configuration(9, newVal.x, newVal.number)
-            if (!isactivearray.value[8]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = default_location[8].y
-                setdianposin(8, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-
-        watch(() => value[9], (newVal, oldVal) => {
-            send_configuration(10, newVal.x, newVal.number)
-            if (!isactivearray.value[9]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = default_location[9].y
-                setdianposin(9, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-        ///
-
-        const send_configuration = (index: number, value: number, number: number) => {
-
-            if (ste_status.value == 0) {
-                if (index <= 5) {
-                    //SetBlendingHorDensity h0 v1
-                    //
-                    set?.SetBlendingVerDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index, Number(value))
-                } else {
-                    //
-                    set?.SetBlendingHorDensity($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], index - 5, Number(value));
-                }
-            }
-            save_set_cache()
+    const setdianposin = (index: number, x: number, y: number) => {
+      point_postion[index].x = x;
+      point_postion[index].y = y;
+      isshowarray.value[index] = false;
+      isactivearray.value[index] = false;
+      setTimeout(() => {
+        isshowarray.value[index] = true;
+      }, 100);
+    };
+    watch(
+      () => value[0],
+      (newVal, oldVal) => {
+        send_configuration(1, newVal.y, newVal.number);
+        if (!isactivearray.value[0]) {
+          let x = default_location[0].x;
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          setdianposin(0, x, y);
         }
+        save_set_cache();
+      },
+      { deep: true }
+    );
 
-        initialization();
-        return {
-            model,
-            options,
-            value,
-            reset,
-            resetall,
-            point_postion,
-            moveHandler,
-            div,
-            isshowarray,
-            isactivearray,
-            save
-        };
-    },
+    watch(
+      () => value[1],
+      (newVal, oldVal) => {
+        send_configuration(2, newVal.y, newVal.number);
+        if (!isactivearray.value[1]) {
+          let x = default_location[1].x;
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          setdianposin(1, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+
+    watch(
+      () => value[2],
+      (newVal, oldVal) => {
+        send_configuration(3, newVal.y, newVal.number);
+        if (!isactivearray.value[2]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          setdianposin(2, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+
+    watch(
+      () => value[3],
+      (newVal, oldVal) => {
+        send_configuration(4, newVal.y, newVal.number);
+        if (!isactivearray.value[3]) {
+          let x = default_location[3].x;
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          setdianposin(3, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+
+    watch(
+      () => value[4],
+      (newVal, oldVal) => {
+        send_configuration(5, newVal.y, newVal.number);
+        if (!isactivearray.value[4]) {
+          let x = default_location[4].x;
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          setdianposin(4, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+
+
+    watch(
+      () => value[5],
+      (newVal, oldVal) => {
+        send_configuration(6, newVal.x, newVal.number);
+        if (!isactivearray.value[5]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = default_location[5].y;
+          setdianposin(5, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+
+    watch(
+      () => value[6],
+      (newVal, oldVal) => {
+        send_configuration(7, newVal.x, newVal.number);
+        if (!isactivearray.value[6]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = default_location[6].y;
+          setdianposin(6, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+
+    watch(
+      () => value[7],
+      (newVal, oldVal) => {
+        send_configuration(8, newVal.x, newVal.number);
+        if (!isactivearray.value[7]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = default_location[7].y;
+          setdianposin(7, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+
+    watch(
+      () => value[8],
+      (newVal, oldVal) => {
+        send_configuration(9, newVal.x, newVal.number);
+        if (!isactivearray.value[8]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = default_location[8].y;
+          setdianposin(8, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+
+    watch(
+      () => value[9],
+      (newVal, oldVal) => {
+        send_configuration(10, newVal.x, newVal.number);
+        if (!isactivearray.value[9]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = default_location[9].y;
+          setdianposin(9, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+
+    const send_configuration = (
+      index: number,
+      value: number,
+      number: number
+    ) => {
+      if (ste_status.value == 0) {
+        if (index <= 5) {
+          set?.SetBlendingVerDensity(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            index,
+            Number(value)
+          );
+        } else {
+          set?.SetBlendingHorDensity(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            index - 5,
+            Number(value)
+          );
+        }
+      }
+      save_set_cache();
+    };
+
+    initialization();
+    return {
+      model,
+      options,
+      value,
+      reset,
+      resetall,
+      point_postion,
+      moveHandler,
+      div,
+      isshowarray,
+      isactivearray,
+      save,
+    };
+  },
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index e958c77..71ffb4a 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -1,424 +1,655 @@
 <template>
-    <div class="row">
-        <div class="col-2">
-            <q-input filled type="number" class="q-pt-md" style="text-align: center;" :dense="true"
-                @focus="isactivearray[0] = false" v-model="four[0].x" label="x" lazy-rules />
-            <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[0] = false"
-                v-model="four[0].y" label="y" lazy-rules />
-            <q-btn color="white" @click="reset(0)" text-color="black" :label="$t('reset') +$t('point') +'1'" />
-        </div>
-        <div class="col-8">
-
-        </div>
-        <div class="col-2">
-            <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[1] = false"
-                v-model="four[1].x" label="x" lazy-rules />
-            <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[1] = false"
-                v-model="four[1].y" label="y" lazy-rules />
-            <q-btn color="white" @click="reset(1)" text-color="black" :label="$t('reset') +$t('point') +'2'" />
-        </div>
-
-        <div class="col-2"></div>
-        <div class="col-8">
-            <div ref="div" style="background-color: #7fffd4;height: 40vh;">
-                <div style="position:absolute;">
-                    <vue3ResizeDrag v-if="isshowarray[0]" :isActive="isactivearray[0]" @mousedown="activeMouseDown(0)"
-                        @mouseUpHandler="mouseUpHandler(0)" :w="30" :h="20" :x="points[0].x" :y="points[0].y"
-                        :isResizable="false" @moveHandler="moveHandler_1"><span>{{ $t('point') }}1</span>
-                    </vue3ResizeDrag>
-                    <vue3ResizeDrag v-if="isshowarray[1]" :isActive="isactivearray[1]" @mousedown="activeMouseDown(1)"
-                        @mouseUpHandler="mouseUpHandler(1)" :w="30" :h="20" :x="points[1].x" :y="points[1].y"
-                        :isResizable="false" @moveHandler="moveHandler_2"><span>{{ $t('point') }}2</span>
-                    </vue3ResizeDrag>
-                    <vue3ResizeDrag v-if="isshowarray[2]" :isActive="isactivearray[2]" @mousedown="activeMouseDown(2)"
-                        @mouseUpHandler="mouseUpHandler(2)" :w="30" :h="20" :x="points[2].x" :y="points[2].y"
-                        :isResizable="false" @moveHandler="moveHandler_3"><span>{{ $t('point') }}3</span>
-                    </vue3ResizeDrag>
-                    <vue3ResizeDrag v-if="isshowarray[3]" :isActive="isactivearray[3]" @mousedown="activeMouseDown(3)"
-                        @mouseUpHandler="mouseUpHandler(3)" :w="30" :h="20" :x="points[3].x" :y="points[3].y"
-                        :isResizable="false" @moveHandler="moveHandler_4"><span>{{ $t('point') }}4</span>
-                    </vue3ResizeDrag>
-                </div>
-            </div>
-        </div>
-        <div class="col-2"></div>
-
-        <div class="col-2">
-            <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[2] = false"
-                v-model="four[2].x" label="x" lazy-rules />
-            <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[2] = false"
-                v-model="four[2].y" label="y" lazy-rules />
-            <q-btn color="white" @click="reset(2)" text-color="black" :label="$t('reset') +$t('point') +'3'" />
-        </div>
-        <div class="col-8">
-            <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
-        </div>
-        <div class="col-2">
-            <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[3] = false"
-                v-model="four[3].x" label="x" lazy-rules />
-            <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[3] = false"
-                v-model="four[3].y" label="y" lazy-rules />
-            <q-btn color="white" @click="reset(3)" text-color="black" :label="$t('reset') +$t('point') +'4'" />
-        </div>
+  <div class="row">
+    <div class="col-2">
+      <q-input
+        filled
+        type="number"
+        class="q-pt-md"
+        style="text-align: center"
+        :dense="true"
+        @focus="isactivearray[0] = false"
+        v-model="four[0].x"
+        label="x"
+        lazy-rules
+      />
+      <q-input
+        filled
+        type="number"
+        class="q-pt-md"
+        :dense="true"
+        @focus="isactivearray[0] = false"
+        v-model="four[0].y"
+        label="y"
+        lazy-rules
+      />
+      <q-btn
+        color="white"
+        @click="reset(0)"
+        text-color="black"
+        :label="$t('reset') + $t('point') + '1'"
+      />
     </div>
+    <div class="col-8"></div>
+    <div class="col-2">
+      <q-input
+        filled
+        type="number"
+        class="q-pt-md"
+        :dense="true"
+        @focus="isactivearray[1] = false"
+        v-model="four[1].x"
+        label="x"
+        lazy-rules
+      />
+      <q-input
+        filled
+        type="number"
+        class="q-pt-md"
+        :dense="true"
+        @focus="isactivearray[1] = false"
+        v-model="four[1].y"
+        label="y"
+        lazy-rules
+      />
+      <q-btn
+        color="white"
+        @click="reset(1)"
+        text-color="black"
+        :label="$t('reset') + $t('point') + '2'"
+      />
+    </div>
+
+    <div class="col-2"></div>
+    <div class="col-8">
+      <div ref="div" style="background-color: #7fffd4; height: 40vh">
+        <div style="position: absolute">
+          <vue3ResizeDrag
+            v-if="isshowarray[0]"
+            :isActive="isactivearray[0]"
+            @mousedown="activeMouseDown(0)"
+            @mouseUpHandler="mouseUpHandler(0)"
+            :w="30"
+            :h="20"
+            :x="points[0].x"
+            :y="points[0].y"
+            :isResizable="false"
+            @moveHandler="moveHandler_1"
+            ><span>{{ $t("point") }}1</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            v-if="isshowarray[1]"
+            :isActive="isactivearray[1]"
+            @mousedown="activeMouseDown(1)"
+            @mouseUpHandler="mouseUpHandler(1)"
+            :w="30"
+            :h="20"
+            :x="points[1].x"
+            :y="points[1].y"
+            :isResizable="false"
+            @moveHandler="moveHandler_2"
+            ><span>{{ $t("point") }}2</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            v-if="isshowarray[2]"
+            :isActive="isactivearray[2]"
+            @mousedown="activeMouseDown(2)"
+            @mouseUpHandler="mouseUpHandler(2)"
+            :w="30"
+            :h="20"
+            :x="points[2].x"
+            :y="points[2].y"
+            :isResizable="false"
+            @moveHandler="moveHandler_3"
+            ><span>{{ $t("point") }}3</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            v-if="isshowarray[3]"
+            :isActive="isactivearray[3]"
+            @mousedown="activeMouseDown(3)"
+            @mouseUpHandler="mouseUpHandler(3)"
+            :w="30"
+            :h="20"
+            :x="points[3].x"
+            :y="points[3].y"
+            :isResizable="false"
+            @moveHandler="moveHandler_4"
+            ><span>{{ $t("point") }}4</span>
+          </vue3ResizeDrag>
+        </div>
+      </div>
+    </div>
+    <div class="col-2"></div>
+
+    <div class="col-2">
+      <q-input
+        filled
+        type="number"
+        class="q-pt-md"
+        :dense="true"
+        @focus="isactivearray[2] = false"
+        v-model="four[2].x"
+        label="x"
+        lazy-rules
+      />
+      <q-input
+        filled
+        type="number"
+        class="q-pt-md"
+        :dense="true"
+        @focus="isactivearray[2] = false"
+        v-model="four[2].y"
+        label="y"
+        lazy-rules
+      />
+      <q-btn
+        color="white"
+        @click="reset(2)"
+        text-color="black"
+        :label="$t('reset') + $t('point') + '3'"
+      />
+    </div>
+    <div class="col-8">
+      <q-btn
+        color="white"
+        @click="resetall"
+        text-color="black"
+        :label="$t('resetall')"
+      />
+    </div>
+    <div class="col-2">
+      <q-input
+        filled
+        type="number"
+        class="q-pt-md"
+        :dense="true"
+        @focus="isactivearray[3] = false"
+        v-model="four[3].x"
+        label="x"
+        lazy-rules
+      />
+      <q-input
+        filled
+        type="number"
+        class="q-pt-md"
+        :dense="true"
+        @focus="isactivearray[3] = false"
+        v-model="four[3].y"
+        label="y"
+        lazy-rules
+      />
+      <q-btn
+        color="white"
+        @click="reset(3)"
+        text-color="black"
+        :label="$t('reset') + $t('point') + '4'"
+      />
+    </div>
+  </div>
 </template>
 
-<style scoped>
-
-</style>
+<style scoped></style>
 <script lang="ts">
 import vue3ResizeDrag from "src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
-import { dom } from 'quasar'
+import { dom } from "quasar";
 
-import { defineComponent, ref, watch, computed, defineProps, withDefaults, onMounted, reactive, onBeforeUnmount } from "vue";
+import {
+  defineComponent,
+  ref,
+  watch,
+  computed,
+  defineProps,
+  withDefaults,
+  onMounted,
+  reactive,
+  onBeforeUnmount,
+} from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
-import ClientConnection from "src/common/ClientConnection"
+import ClientConnection from "src/common/ClientConnection";
 import GlobalData from "src/common/GlobalData";
 import { json } from "body-parser";
 
 export default defineComponent({
-    name: "ComponentFourPointCalibration",
-    components: {
-        vue3ResizeDrag
-    },
-    setup() {
-        let $store = useStore();
-        let $t = useI18n();
-        let config = JSON.parse($store.state.fusion_configuration).projectors[0];
-        let set = GlobalData.getInstance().getCurrentClient();
-        const configselsect = computed(() => { return $store.state.selected_projector })
-        //用于计算当前投影仪的索引
-        let serverconfig = JSON.parse($store.state.fusion_configuration);
-        const selectedprojector = computed(() => {
-            return $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col + $store.getters.GetTheCurrentlySelectedCamera[1]
-        })
-        const set_cache: any = ref([]);
-        //
-        //let four = ref([{ x: config.point4[0].x, y: config.point4[0].y }, { x: config.point4[1].x, y: config.point4[1].y }, { x: config.point4[2].x, y: config.point4[2].x }, { x: config.point4[3].x, y: config.point4[3].y }]);
-        let four = reactive([{ x: config.point4[0].x, y: config.point4[0].y }, { x: config.point4[1].x, y: config.point4[1].y }, { x: config.point4[2].x, y: config.point4[2].x }, { x: config.point4[3].x, y: config.point4[3].y }]);
-        let defaultfour = ref([{ x: 0, y: 1080 }, { x: 1920, y: 1080 }, { x: 0, y: 0 }, { x: 1920, y: 0 }]);
-        let defaultfourpostion: any = ref([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }]);
-        let fourpostion: any = ref([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }]);
-        let div: any = ref(null);
-        let Proportion = ref({ x: 0, y: 0 });//缩放比例
-        let points = reactive([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }]);//点的位置
-        const isshowarray = ref([true, true, true, true])
-        const isactivearray = ref([true, true, true, true])
-        const ste_status = ref(0);
-        const save = () => {
-            set?.SaveBlendingConfig("")
-            setTimeout(() => {
-                set?.GetBlendingConfig("").then((res) => { $store.commit("setfusion_configuration", res?.config); })
-            }, 1000);
+  name: "ComponentFourPointCalibration",
+  components: {
+    vue3ResizeDrag,
+  },
+  setup() {
+    let $store = useStore();
+    let $t = useI18n();
+    let config = JSON.parse($store.state.fusion_configuration).projectors[0];
+    let set = GlobalData.getInstance().getCurrentClient();
+    const configselsect = computed(() => {
+      return $store.state.selected_projector;
+    });
+    //用于计算当前投影仪的索引
+    let serverconfig = JSON.parse($store.state.fusion_configuration);
+    const selectedprojector = computed(() => {
+      return (
+        $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col +
+        $store.getters.GetTheCurrentlySelectedCamera[1]
+      );
+    });
+    const set_cache: any = ref([]);
+    let four = reactive([
+      { x: config.point4[0].x, y: config.point4[0].y },
+      { x: config.point4[1].x, y: config.point4[1].y },
+      { x: config.point4[2].x, y: config.point4[2].x },
+      { x: config.point4[3].x, y: config.point4[3].y },
+    ]);
+    let defaultfour = ref([
+      { x: 0, y: 1080 },
+      { x: 1920, y: 1080 },
+      { x: 0, y: 0 },
+      { x: 1920, y: 0 },
+    ]);
+    let defaultfourpostion: any = ref([
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+    ]);
+    let fourpostion: any = ref([
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+    ]);
+    let div: any = ref(null);
+    let Proportion = ref({ x: 0, y: 0 }); //缩放比例
+    let points = reactive([
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+      { x: 0, y: 0 },
+    ]); //点的位置
+    const isshowarray = ref([true, true, true, true]);
+    const isactivearray = ref([true, true, true, true]);
+    const ste_status = ref(0);
+    const save = () => {
+      set?.SaveBlendingConfig("");
+      setTimeout(() => {
+        set?.GetBlendingConfig("").then((res) => {
+          $store.commit("setfusion_configuration", res?.config);
+        });
+      }, 1000);
+    };
+    const use_set_cache = () => {
+      if (set_cache.value[selectedprojector.value] != null) {
+        let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
+        deepcopy(four, tmp);
+      }
+      syncpoint();
+    };
+    const deepcopy = (o1: any, o2: any) => {
+      for (let k in o2) {
+        if (typeof o2[k] === "object") {
+          o1[k] = {};
+          deepcopy(o1[k], o2[k]);
+        } else {
+          o1[k] = o2[k];
         }
-        ///
-        const use_set_cache = () => {
-            if (set_cache.value[selectedprojector.value] != null) {
-                let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
-                deepcopy(four, tmp)
-                //four=JSON.parse(JSON.stringify(tmp))
+      }
+    };
+    const save_set_cache = () => {
+      set_cache.value[selectedprojector.value] = JSON.stringify(four);
+    };
+    onBeforeUnmount(() => {
+      sessionStorage.FourPointCalibration = JSON.stringify(set_cache.value);
+    });
+    const activeMouseDown = (index: number) => {
+      isactivearray.value[index] = true;
+    };
+    const mouseUpHandler = (index: number) => {
+      isactivearray.value[index] = false;
+    };
+    onMounted(() => {
+      ste_status.value = 1;
+      setpoa();
 
-            }
-            syncpoint()
-        };
-        const deepcopy = (o1: any, o2: any) => {
-            for (let k in o2) {
-                if (typeof o2[k] === 'object') {
-                    o1[k] = {};
-                    deepcopy(o1[k], o2[k]);
-                } else {
-                    o1[k] = o2[k];
-                }
-            }
+      setTimeout(() => {
+        ste_status.value = 0;
+      }, 100);
+    });
+
+    const use_server_config = () => {
+      for (let index = 0; index < fourpostion.value.length; index++) {
+        defaultfourpostion.value[index].x = fourpostion.value[index].x;
+        defaultfourpostion.value[index].y = fourpostion.value[index].y;
+        defaultfour.value[index].x = config.point4[index].def_x;
+        defaultfour.value[index].y = config.point4[index].def_y;
+        four[index].x = config.point4[index].x;
+        four[index].y = config.point4[index].y;
+      }
+    };
+
+    const setpoa = () => {
+      points[0].x = 0;
+      points[0].y = 0;
+
+      points[1].x = div.value.offsetWidth - 25;
+      points[1].y = 0;
+
+      points[2].x = 0;
+      points[2].y = div.value.offsetHeight - 25;
+
+      points[3].x = div.value.offsetWidth - 25;
+      points[3].y = div.value.offsetHeight - 25;
+
+      fourpostion.value[0].x = 0;
+      fourpostion.value[0].y = 0;
+
+      fourpostion.value[1].x = div.value.offsetWidth - 25;
+      fourpostion.value[1].y = 0;
+
+      fourpostion.value[2].x = 0;
+      fourpostion.value[2].y = div.value.offsetHeight - 25;
+
+      fourpostion.value[3].x = div.value.offsetWidth - 25;
+      fourpostion.value[3].y = div.value.offsetHeight - 25;
+
+      Proportion.value.x = config.width / (div.value.offsetWidth - 25);
+      Proportion.value.y = config.height / (div.value.offsetHeight - 25);
+      for (let index = 0; index < fourpostion.value.length; index++) {
+        defaultfourpostion.value[index].x = fourpostion.value[index].x;
+        defaultfourpostion.value[index].y = fourpostion.value[index].y;
+        defaultfour.value[index].x = config.point4[index].def_x;
+        defaultfour.value[index].y = config.point4[index].def_y;
+        four[index].x = config.point4[index].x;
+        four[index].y = config.point4[index].y;
+      }
+      if (
+        sessionStorage.FourPointCalibration &&
+        sessionStorage.FourPointCalibration.length > 0
+      ) {
+        set_cache.value = JSON.parse(sessionStorage.FourPointCalibration);
+        use_set_cache();
+      } else {
+      }
+      set_point_x();
+    };
+    watch(
+      () => four[0],
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion && ste_status.value == 0)
+          set?.setBlendingCorrection(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            4,
+            1,
+            Number(newVal.x),
+            Number(newVal.y)
+          );
+        if (!isactivearray.value[0]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          points[0].x = x;
+          points[0].y = y;
+          isshowarray.value[0] = false;
+          isactivearray.value[0] = false;
+          setTimeout(() => {
+            isshowarray.value[0] = true;
+          }, 100);
         }
-        const save_set_cache = () => {
-            set_cache.value[selectedprojector.value] = JSON.stringify(four);
+        save_set_cache();
+      },
+      { deep: true }
+    );
+    watch(
+      () => four[1],
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion && ste_status.value == 0)
+          set?.setBlendingCorrection(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            4,
+            2,
+            Number(newVal.x),
+            Number(newVal.y)
+          );
+        if (!isactivearray.value[1]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          points[1].x = x;
+          points[1].y = y;
+          isshowarray.value[1] = false;
+          isactivearray.value[1] = false;
+          setTimeout(() => {
+            isshowarray.value[1] = true;
+          }, 100);
         }
-        onBeforeUnmount(() => {
-            sessionStorage.FourPointCalibration = JSON.stringify(set_cache.value)
-        })
-        ///
-        const activeMouseDown = (index: number) => {
-            isactivearray.value[index] = true
+        save_set_cache();
+      },
+      { deep: true }
+    );
+    watch(
+      () => four[2],
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion && ste_status.value == 0)
+          set?.setBlendingCorrection(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            4,
+            3,
+            Number(newVal.x),
+            Number(newVal.y)
+          );
+        if (!isactivearray.value[2]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = Math.ceil(
+            config.height / Proportion.value.y - newVal.y / Proportion.value.y
+          );
+
+          points[2].x = x;
+          points[2].y = y;
+          isshowarray.value[2] = false;
+          setTimeout(() => {
+            isshowarray.value[2] = true;
+          }, 100);
         }
-        const mouseUpHandler = (index: number) => {
-            isactivearray.value[index] = false
+        save_set_cache();
+      },
+      { deep: true }
+    );
+    watch(
+      () => four[3],
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion && ste_status.value == 0)
+          set?.setBlendingCorrection(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            4,
+            4,
+            Number(newVal.x),
+            Number(newVal.y)
+          );
+        if (!isactivearray.value[3]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = Math.ceil(
+            config.height / Proportion.value.y - newVal.y / Proportion.value.y
+          );
+
+          points[3].x = x;
+          points[3].y = y;
+          isshowarray.value[3] = false;
+          setTimeout(() => {
+            isshowarray.value[3] = true;
+          }, 100);
         }
-        onMounted(() => {
-            ste_status.value = 1;
-            setpoa();
+        save_set_cache();
+      },
+      { deep: true }
+    );
 
-            setTimeout(() => {
-                ste_status.value = 0;
-            }, 100);
-        })
-
-        const use_server_config = () => {
-            for (let index = 0; index < fourpostion.value.length; index++) {
-                defaultfourpostion.value[index].x = fourpostion.value[index].x;
-                defaultfourpostion.value[index].y = fourpostion.value[index].y;
-                defaultfour.value[index].x = config.point4[index].def_x
-                defaultfour.value[index].y = config.point4[index].def_y
-                four[index].x = config.point4[index].x
-                four[index].y = config.point4[index].y
-            }
+    watch(
+      () => configselsect,
+      (newVal, oldVal) => {
+        let tmp = JSON.parse($store.state.fusion_configuration);
+        let fortmp = null;
+        let i;
+        for (i of tmp.projectors) {
+          if (
+            i.col === $store.getters.GetTheCurrentlySelectedCamera[1] &&
+            i.row === $store.getters.GetTheCurrentlySelectedCamera[0]
+          ) {
+            fortmp = JSON.parse(JSON.stringify(i));
+          }
         }
+        ste_status.value = 1;
+        config = JSON.parse(JSON.stringify(fortmp));
+        use_server_config();
+        use_set_cache();
+        setTimeout(() => {
+          ste_status.value = 0;
+        }, 100);
+        set_point_x();
+      },
+      { deep: true }
+    );
 
-        const setpoa = () => {
+    //为了加载 缓存的配置时 同步点的位置
+    const syncpoint = () => {
+      for (let index = 0; index < fourpostion.value.length; index++) {
+        isactivearray.value[index] = false;
+      }
+    };
+    //手动同步 
+    const set_point_x = () => {
+      let x = Math.ceil(four[0].x / Proportion.value.x);
+      let y = Math.ceil((config.height - four[0].y) / Proportion.value.y);
+      set_point(0, x, y);
 
-            points[0].x = 0
-            points[0].y = 0
+      x = Math.ceil(four[1].x / Proportion.value.x);
+      y = Math.ceil((config.height - four[1].y) / Proportion.value.y);
+      set_point(1, x, y);
 
-            points[1].x = div.value.offsetWidth - 25
-            points[1].y = 0
+      x = Math.ceil(four[2].x / Proportion.value.x);
+      y = Math.ceil(
+        config.height / Proportion.value.y - four[2].y / Proportion.value.y
+      );
+      set_point(2, x, y);
 
-            points[2].x = 0
-            points[2].y = div.value.offsetHeight - 25
+      x = Math.ceil(four[3].x / Proportion.value.x);
+      y = Math.ceil(
+        config.height / Proportion.value.y - four[3].y / Proportion.value.y
+      );
+      set_point(3, x, y);
+    };
 
-            points[3].x = div.value.offsetWidth - 25
-            points[3].y = div.value.offsetHeight - 25
+    const set_point = (index: number, x: number, y: number) => {
+      points[index].x = x;
+      points[index].y = y;
+      isshowarray.value[index] = false;
+      isactivearray.value[index] = false;
+      setTimeout(() => {
+        isshowarray.value[index] = true;
+      }, 100);
+    };
+    const reset = (index: number) => {
+      fourpostion.value[index].x = defaultfourpostion.value[index].x;
+      fourpostion.value[index].y = defaultfourpostion.value[index].y;
 
+      four[index].x = config.point4[index].def_x;
+      four[index].y = config.point4[index].def_y;
 
+      set?.setBlendingCorrection(
+        $store.getters.GetTheCurrentlySelectedCamera[0],
+        $store.getters.GetTheCurrentlySelectedCamera[1],
+        4,
+        index + 1,
+        Number(config.point4[index].def_x),
+        Number(config.point4[index].def_y)
+      );
 
-            fourpostion.value[0].x = 0
-            fourpostion.value[0].y = 0
+      isshowarray.value[index] = false;
+      setTimeout(() => {
+        isshowarray.value[index] = true;
+      }, 100);
+    };
 
-            fourpostion.value[1].x = div.value.offsetWidth - 25
-            fourpostion.value[1].y = 0
+    const resetall = () => {
+      for (let index = 0; index < fourpostion.value.length; index++) {
+        reset(index);
+      }
+    };
 
-            fourpostion.value[2].x = 0
-            fourpostion.value[2].y = div.value.offsetHeight - 25
+    const moveHandler_1 = (data: any) => {
+      let x = Math.ceil(
+        (data.left - fourpostion.value[0].x) * Proportion.value.x + 0
+      );
+      let y = Math.ceil(
+        config.height - data.top * Proportion.value.y - fourpostion.value[0].y
+      );
 
-            fourpostion.value[3].x = div.value.offsetWidth - 25
-            fourpostion.value[3].y = div.value.offsetHeight - 25
-
-            Proportion.value.x = config.width / (div.value.offsetWidth - 25)
-            Proportion.value.y = config.height / (div.value.offsetHeight - 25)
-            for (let index = 0; index < fourpostion.value.length; index++) {
-                defaultfourpostion.value[index].x = fourpostion.value[index].x;
-                defaultfourpostion.value[index].y = fourpostion.value[index].y;
-                defaultfour.value[index].x = config.point4[index].def_x
-                defaultfour.value[index].y = config.point4[index].def_y
-                four[index].x = config.point4[index].x
-                four[index].y = config.point4[index].y
-            }
-            if (sessionStorage.FourPointCalibration && sessionStorage.FourPointCalibration.length > 0) {
-                set_cache.value = JSON.parse(sessionStorage.FourPointCalibration);
-                use_set_cache()
-            } else {
-
-            }
-            set_point_x()
-            //syncpoint()
-
-        }
-        watch(() => four[0], (newVal, oldVal) => {
-            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 1, Number(newVal.x), Number(newVal.y));
-            if (!isactivearray.value[0]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                points[0].x = x
-                points[0].y = y
-                isshowarray.value[0] = false
-                isactivearray.value[0] = false
-                setTimeout(() => {
-                    isshowarray.value[0] = true
-                }, 100);
-
-            }
-            save_set_cache()
-        }, { deep: true })
-        watch(() => four[1], (newVal, oldVal) => {
-            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 2, Number(newVal.x), Number(newVal.y));
-            if (!isactivearray.value[1]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                points[1].x = x
-                points[1].y = y
-                isshowarray.value[1] = false
-                isactivearray.value[1] = false
-                setTimeout(() => {
-                    isshowarray.value[1] = true
-                }, 100);
-
-            }
-            save_set_cache()
-        }, { deep: true })
-        watch(() => four[2], (newVal, oldVal) => {
-            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 3, Number(newVal.x), Number(newVal.y));
-            if (!isactivearray.value[2]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil((config.height / Proportion.value.y) - (newVal.y / Proportion.value.y));
-
-                points[2].x = x
-                points[2].y = y
-                isshowarray.value[2] = false
-                setTimeout(() => {
-                    isshowarray.value[2] = true
-                }, 100);
-
-            }
-            save_set_cache()
-        }, { deep: true })
-        watch(() => four[3], (newVal, oldVal) => {
-            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 4, Number(newVal.x), Number(newVal.y));
-            if (!isactivearray.value[3]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil((config.height / Proportion.value.y) - (newVal.y / Proportion.value.y));
-
-                points[3].x = x
-                points[3].y = y
-                isshowarray.value[3] = false
-                setTimeout(() => {
-                    isshowarray.value[3] = true
-                }, 100);
-
-            }
-            save_set_cache()
-        }, { deep: true })
-
-
-        watch(() => configselsect, (newVal, oldVal) => {
-            let tmp = JSON.parse($store.state.fusion_configuration);
-            let fortmp = null
-            let i
-            for (i of tmp.projectors) {
-                if (i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && i.row === $store.getters.GetTheCurrentlySelectedCamera[0]) {
-                    fortmp = JSON.parse(JSON.stringify(i))
-                }
-            }
-            ste_status.value = 1;
-            config = JSON.parse(JSON.stringify(fortmp))
-            //setpoa();
-            use_server_config()
-            use_set_cache()
-            setTimeout(() => {
-                ste_status.value = 0;
-            }, 100);
-            set_point_x()
-        }, { deep: true })
-
-        //为了加载 缓存的配置时 同步点的位置
-        const syncpoint = () => {
-            for (let index = 0; index < fourpostion.value.length; index++) {
-                isactivearray.value[index] = false
-            }
-        }
-        //手动同步 我裂开
-        const set_point_x = () => {
-            //console.log("kaishi jisuan ")
-            let x = Math.ceil(four[0].x/ Proportion.value.x);
-            let y = Math.ceil(((config.height - four[0].y) / Proportion.value.y));
-            set_point(0,x,y);
-
-            x = Math.ceil(four[1].x / Proportion.value.x);
-            y = Math.ceil(((config.height - four[1].y) / Proportion.value.y));
-            set_point(1,x,y);
-
-            x = Math.ceil(four[2].x / Proportion.value.x);
-            y = Math.ceil((config.height / Proportion.value.y) - (four[2].y / Proportion.value.y));
-            set_point(2,x,y);
-
-            x = Math.ceil(four[3].x / Proportion.value.x);
-            y = Math.ceil((config.height / Proportion.value.y) - (four[3].y / Proportion.value.y));
-            set_point(3,x,y);
-        }
-
-        const set_point = (index:number,x:number,y:number) => {
-            
-            points[index].x = x
-            points[index].y = y
-            isshowarray.value[index] = false
-            isactivearray.value[index] = false
-            setTimeout(() => {
-                isshowarray.value[index] = true
-            }, 100);
-        }
-        const reset = (index: number) => {
-            fourpostion.value[index].x = defaultfourpostion.value[index].x;
-            fourpostion.value[index].y = defaultfourpostion.value[index].y;
-
-            four[index].x = config.point4[index].def_x
-            four[index].y = config.point4[index].def_y
-
-            set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, index + 1, Number(config.point4[index].def_x), Number(config.point4[index].def_y));
-
-            isshowarray.value[index] = false
-            setTimeout(() => {
-                isshowarray.value[index] = true
-            }, 100);
-
-        }
-
-        const resetall = () => {
-            for (let index = 0; index < fourpostion.value.length; index++) {
-                reset(index)
-            }
-
-        }
-
-        const moveHandler_1 = (data: any) => {
-            let x = Math.ceil((data.left - fourpostion.value[0].x) * Proportion.value.x + 0);
-            let y = Math.ceil((config.height - data.top * Proportion.value.y - fourpostion.value[0].y));
-
-            four[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            four[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-            isactivearray.value[0] = true
-            save_set_cache()
-        }
-        const moveHandler_2 = (data: any) => {
-            let x = Math.ceil((data.left - fourpostion.value[1].x) * Proportion.value.x + config.width);
-            let y = Math.ceil((config.height - data.top * Proportion.value.y - fourpostion.value[1].y));
-            four[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            four[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-            save_set_cache()
-        }
-        const moveHandler_3 = (data: any) => {
-            let x = Math.ceil((data.left - fourpostion.value[2].x) * Proportion.value.x);
-            let y = Math.abs(Math.ceil((data.top - fourpostion.value[2].y) * Proportion.value.y));
-            four[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            four[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-            save_set_cache()
-        }
-        const moveHandler_4 = (data: any) => {
-            let x = Math.ceil((data.left - fourpostion.value[3].x) * Proportion.value.x + config.width);
-            let y = Math.abs(Math.ceil((data.top - fourpostion.value[3].y) * Proportion.value.y));
-            four[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            four[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-            save_set_cache()
-        }
-            //窗口变动重新渲染
+      four[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+      four[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      isactivearray.value[0] = true;
+      save_set_cache();
+    };
+    const moveHandler_2 = (data: any) => {
+      let x = Math.ceil(
+        (data.left - fourpostion.value[1].x) * Proportion.value.x + config.width
+      );
+      let y = Math.ceil(
+        config.height - data.top * Proportion.value.y - fourpostion.value[1].y
+      );
+      four[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+      four[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      save_set_cache();
+    };
+    const moveHandler_3 = (data: any) => {
+      let x = Math.ceil(
+        (data.left - fourpostion.value[2].x) * Proportion.value.x
+      );
+      let y = Math.abs(
+        Math.ceil((data.top - fourpostion.value[2].y) * Proportion.value.y)
+      );
+      four[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+      four[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      save_set_cache();
+    };
+    const moveHandler_4 = (data: any) => {
+      let x = Math.ceil(
+        (data.left - fourpostion.value[3].x) * Proportion.value.x + config.width
+      );
+      let y = Math.abs(
+        Math.ceil((data.top - fourpostion.value[3].y) * Proportion.value.y)
+      );
+      four[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+      four[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      save_set_cache();
+    };
+    //窗口变动重新渲染
     onMounted(() => {
       //监听窗口变化
       window.onresize = () => {
         return (() => {
-            ste_status.value = 1;
-            setpoa();
+          ste_status.value = 1;
+          setpoa();
 
-            setTimeout(() => {
-                ste_status.value = 0;
-            }, 100);
+          setTimeout(() => {
+            ste_status.value = 0;
+          }, 100);
         })();
       };
     });
-        return {
-            div,
-            fourpostion,
-            reset,
-            resetall,
-            moveHandler_1,
-            moveHandler_2,
-            moveHandler_3,
-            moveHandler_4,
-            four,
-            save,
-            isshowarray,
-            isactivearray,
-            activeMouseDown,
-            mouseUpHandler,
-            points
-        };
-    },
+    return {
+      div,
+      fourpostion,
+      reset,
+      resetall,
+      moveHandler_1,
+      moveHandler_2,
+      moveHandler_3,
+      moveHandler_4,
+      four,
+      save,
+      isshowarray,
+      isactivearray,
+      activeMouseDown,
+      mouseUpHandler,
+      points,
+    };
+  },
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 690d5dc..f92783c 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -1,25 +1,37 @@
 <template>
   <div class="row">
     <div class="col-12">
-      <!-- <p class="text-center">{{ $t('Set the fusion band width') }}</p> -->
-      <div style="height: 1rem;"></div>
+      <div style="height: 1rem"></div>
       <div class="row">
         <div class="col-12">
           <div class="row">
             <div class="col-4 offset-4">
               <div class="row">
                 <div class="col-3">
-                  <q-toggle class="float-right" v-model="array[0].isshow" label="" />
+                  <q-toggle
+                    class="float-right"
+                    v-model="array[0].isshow"
+                    label=""
+                  />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :autofocus="group == 0" :bg-color="group == 0 ? 'cyan-1' : ''"
-                    @focus="group = 0" v-model="array[0].value" :label="$t('upper fusion zone parameters')" lazy-rules
+                  <q-input
+                    filled
+                    type="number"
+                    :autofocus="group == 0"
+                    :bg-color="group == 0 ? 'cyan-1' : ''"
+                    @focus="group = 0"
+                    v-model="array[0].value"
+                    :label="$t('upper fusion zone parameters')"
+                    lazy-rules
                     :rules="[
                       (val) =>
-                        (val !== null && val !== '') || $t('Please enter a number'),
+                        (val !== null && val !== '') ||
+                        $t('Please enter a number'),
                       (val) =>
                         (val > -1 && val < 1080) || $t('Please enter 0-100'),
-                    ]" />
+                    ]"
+                  />
                 </div>
               </div>
             </div>
@@ -30,34 +42,60 @@
             <div class="col-6">
               <div class="row">
                 <div class="col-3">
-                  <q-toggle class="float-right" v-model="array[1].isshow" label="" />
+                  <q-toggle
+                    class="float-right"
+                    v-model="array[1].isshow"
+                    label=""
+                  />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :autofocus="group == 1" :bg-color="group == 1 ? 'cyan-1' : ''"
-                    @focus="group = 1" v-model="array[1].value" :label="$t('Left fusion Band Parameters')" lazy-rules
+                  <q-input
+                    filled
+                    type="number"
+                    :autofocus="group == 1"
+                    :bg-color="group == 1 ? 'cyan-1' : ''"
+                    @focus="group = 1"
+                    v-model="array[1].value"
+                    :label="$t('Left fusion Band Parameters')"
+                    lazy-rules
                     :rules="[
                       (val) =>
-                        (val !== null && val !== '') || $t('Please enter a number'),
+                        (val !== null && val !== '') ||
+                        $t('Please enter a number'),
                       (val) =>
                         (val > -1 && val < 1920) || $t('Please enter 0-100'),
-                    ]" />
+                    ]"
+                  />
                 </div>
               </div>
             </div>
             <div class="col-6">
               <div class="row">
                 <div class="col-3">
-                  <q-toggle class="float-right" v-model="array[2].isshow" label="" />
+                  <q-toggle
+                    class="float-right"
+                    v-model="array[2].isshow"
+                    label=""
+                  />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :autofocus="group == 2" :bg-color="group == 2 ? 'cyan-1' : ''"
-                    @focus="group = 2" v-model="array[2].value" :label="$t('Right fusion Band Parameters')" lazy-rules
+                  <q-input
+                    filled
+                    type="number"
+                    :autofocus="group == 2"
+                    :bg-color="group == 2 ? 'cyan-1' : ''"
+                    @focus="group = 2"
+                    v-model="array[2].value"
+                    :label="$t('Right fusion Band Parameters')"
+                    lazy-rules
                     :rules="[
                       (val) =>
-                        (val !== null && val !== '') || $t('Please enter a number'),
+                        (val !== null && val !== '') ||
+                        $t('Please enter a number'),
                       (val) =>
                         (val > -1 && val < 1920) || $t('Please enter 0-100'),
-                    ]" />
+                    ]"
+                  />
                 </div>
               </div>
             </div>
@@ -68,51 +106,94 @@
             <div class="col-4 offset-4">
               <div class="row">
                 <div class="col-3">
-                  <q-toggle class="float-right" v-model="array[3].isshow" label="" />
+                  <q-toggle
+                    class="float-right"
+                    v-model="array[3].isshow"
+                    label=""
+                  />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :autofocus="group == 3" :bg-color="group == 3 ? 'cyan-1' : ''"
-                    @focus="group = 3" v-model="array[3].value" :label="$t('Lower fusion Zone Parameters')" lazy-rules
+                  <q-input
+                    filled
+                    type="number"
+                    :autofocus="group == 3"
+                    :bg-color="group == 3 ? 'cyan-1' : ''"
+                    @focus="group = 3"
+                    v-model="array[3].value"
+                    :label="$t('Lower fusion Zone Parameters')"
+                    lazy-rules
                     :rules="[
                       (val) =>
-                        (val !== null && val !== '') || $t('Please enter a number'),
+                        (val !== null && val !== '') ||
+                        $t('Please enter a number'),
                       (val) =>
                         (val > -1 && val < 1080) || $t('Please enter 0-100'),
-                    ]" />
+                    ]"
+                  />
                 </div>
               </div>
             </div>
           </div>
         </div>
-
       </div>
     </div>
     <div class="col-4 offset-4" v-if="group != 4">
-      <p class="text-center">{{ $t('Set Fusion Band Parameters') }}</p>
+      <p class="text-center">{{ $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"
-            vertical reverse label-always />
+          <q-slider
+            v-model="array[group].alpha"
+            :min="0.0"
+            @change="chang('alpha')"
+            :max="1"
+            :step="0.01"
+            color="green"
+            vertical
+            reverse
+            label-always
+          />
           <p class="text-center">alpha</p>
         </div>
 
         <div>
-          <q-slider v-model="array[group].p" :min="0" @change="chang('p')" :max="2.5" :step="0.01" color="green"
-            vertical reverse label-always />
+          <q-slider
+            v-model="array[group].p"
+            :min="0"
+            @change="chang('p')"
+            :max="2.5"
+            :step="0.01"
+            color="green"
+            vertical
+            reverse
+            label-always
+          />
           <p class="text-center">p</p>
         </div>
 
         <div>
-          <q-slider v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="2.5" :step="0.01" color="green"
-            vertical reverse label-always />
+          <q-slider
+            v-model="array[group].gamma"
+            :min="0"
+            @change="chang('gamma')"
+            :max="2.5"
+            :step="0.01"
+            color="green"
+            vertical
+            reverse
+            label-always
+          />
           <p class="text-center">gamma</p>
         </div>
       </div>
     </div>
-    
   </div>
   <div>
-    <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
+    <q-btn
+      color="white"
+      @click="resetall"
+      text-color="black"
+      :label="$t('resetall')"
+    />
   </div>
 </template>
 
@@ -155,77 +236,92 @@ export default defineComponent({
       { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
     ]);
     //正确的 索引编号
-    let arr = [1, 0, 2, 3]
+    let arr = [1, 0, 2, 3];
     let serverconfig = JSON.parse($store.state.fusion_configuration);
     const selectedprojector = computed(() => {
-      return $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col + $store.getters.GetTheCurrentlySelectedCamera[1]
-    })
+      return (
+        $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col +
+        $store.getters.GetTheCurrentlySelectedCamera[1]
+      );
+    });
     const ste_status = ref(0);
     const use_set_cache = () => {
       if (set_cache.value[selectedprojector.value] != null) {
         let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
-        deepcopy(array, tmp)
+        deepcopy(array, tmp);
       }
     };
     const deepcopy = (o1: any, o2: any) => {
       for (let k in o2) {
-        if (typeof o2[k] === 'object') {
+        if (typeof o2[k] === "object") {
           o1[k] = {};
           deepcopy(o1[k], o2[k]);
         } else {
           o1[k] = o2[k];
         }
       }
-    }
+    };
     const save_set_cache = () => {
       set_cache.value[selectedprojector.value] = JSON.stringify(array);
-    }
+    };
     let config = JSON.parse($store.state.fusion_configuration).projectors[0];
-    const configselsect = computed(() => { return $store.state.selected_projector })
-    watch(() => configselsect, (newVal, oldVal) => {
-      let tmp = JSON.parse($store.state.fusion_configuration);
-      let fortmp = null
-      let i
-      for (i of tmp.projectors) {
-        if (i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && i.row === $store.getters.GetTheCurrentlySelectedCamera[0]) {
-          fortmp = JSON.parse(JSON.stringify(i))
+    const configselsect = computed(() => {
+      return $store.state.selected_projector;
+    });
+    watch(
+      () => configselsect,
+      (newVal, oldVal) => {
+        let tmp = JSON.parse($store.state.fusion_configuration);
+        let fortmp = null;
+        let i;
+        for (i of tmp.projectors) {
+          if (
+            i.col === $store.getters.GetTheCurrentlySelectedCamera[1] &&
+            i.row === $store.getters.GetTheCurrentlySelectedCamera[0]
+          ) {
+            fortmp = JSON.parse(JSON.stringify(i));
+          }
         }
-      }
-      ste_status.value = 1;
+        ste_status.value = 1;
 
-      config = JSON.parse(JSON.stringify(fortmp))
-      use_server_config()
-      use_set_cache()
-      setTimeout(() => {
-        ste_status.value = 0;
-      }, 100);
-      setnowindex()
-    }, { deep: true })
+        config = JSON.parse(JSON.stringify(fortmp));
+        use_server_config();
+        use_set_cache();
+        setTimeout(() => {
+          ste_status.value = 0;
+        }, 100);
+        setnowindex();
+      },
+      { deep: true }
+    );
 
     const chang = (type: string) => {
       if (type == "alpha") {
-        if ($store.state.enablefusion) set?.setBlendingAlphaParam(
-          $store.getters.GetTheCurrentlySelectedCamera[0],
-          $store.getters.GetTheCurrentlySelectedCamera[1],
-          arr[group.value],
-          array[arr[group.value]].alpha
-        );
+        if ($store.state.enablefusion)
+          set?.setBlendingAlphaParam(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            arr[group.value],
+            array[arr[group.value]].alpha
+          );
       }
       if (type == "p") {
-        if ($store.state.enablefusion) set?.setBlendingPowerParam(
-          $store.getters.GetTheCurrentlySelectedCamera[0],
-          $store.getters.GetTheCurrentlySelectedCamera[1],
-          arr[group.value],
-          array[arr[group.value]].p
-        );
+        if ($store.state.enablefusion)
+          set?.setBlendingPowerParam(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            arr[group.value],
+            array[arr[group.value]].p
+          );
       }
       if (type == "gamma") {
-        if ($store.state.enablefusion) set?.setBlendingGammaParam(
-          $store.getters.GetTheCurrentlySelectedCamera[0],
-          $store.getters.GetTheCurrentlySelectedCamera[1],
-          arr[group.value],
-          array[arr[group.value]].gamma
-        );
+        if ($store.state.enablefusion)
+          set?.setBlendingGammaParam(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            arr[group.value],
+            array[arr[group.value]].gamma
+          );
       }
       save_set_cache();
     };
@@ -240,152 +336,212 @@ export default defineComponent({
         }
       }
       if (sum == 1) {
-        group.value = indexx
+        group.value = indexx;
       } else {
-        group.value = 4
+        group.value = 4;
       }
-    }
+    };
 
-
-    //接受 赋值
     const setconfig = (config: any) => {
       let tmp = JSON.parse(config);
-      let fortmp = null
-      let i
+      let fortmp = null;
+      let i;
       for (i of tmp.projectors) {
-        if (i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && i.row === $store.getters.GetTheCurrentlySelectedCamera[0]) {
-          fortmp = JSON.parse(JSON.stringify(i))
+        if (
+          i.col === $store.getters.GetTheCurrentlySelectedCamera[1] &&
+          i.row === $store.getters.GetTheCurrentlySelectedCamera[0]
+        ) {
+          fortmp = JSON.parse(JSON.stringify(i));
         }
       }
       ste_status.value = 1;
-      config = JSON.parse(JSON.stringify(fortmp))
-      //手动对应数据索引
+      config = JSON.parse(JSON.stringify(fortmp));
       for (let index = 0; index < array.length - 1; index++) {
-        array[arr[index]].gamma = config.params[index].gamma.toFixed(2)
-        array[arr[index]].alpha = config.params[index].alpha.toFixed(2)
-        array[arr[index]].p = config.params[index].power.toFixed(2)
-        array[arr[index]].isshow = config.params[index].enable
-        array[arr[index]].value = Number(config.params[index].size)
+        array[arr[index]].gamma = config.params[index].gamma.toFixed(2);
+        array[arr[index]].alpha = config.params[index].alpha.toFixed(2);
+        array[arr[index]].p = config.params[index].power.toFixed(2);
+        array[arr[index]].isshow = config.params[index].enable;
+        array[arr[index]].value = Number(config.params[index].size);
       }
 
       setTimeout(() => {
         ste_status.value = 0;
       }, 100);
-      setnowindex()
-    }
+      setnowindex();
+    };
     const startconfig = () => {
-      //手动对应数据索引
       for (let index = 0; index < array.length - 1; index++) {
-        array[arr[index]].gamma = config.params[index].gamma.toFixed(2)
-        array[arr[index]].alpha = config.params[index].alpha.toFixed(2)
-        array[arr[index]].p = config.params[index].power.toFixed(2)
-        array[arr[index]].isshow = config.params[index].enable
-        array[arr[index]].value = Number(config.params[index].size)
+        array[arr[index]].gamma = config.params[index].gamma.toFixed(2);
+        array[arr[index]].alpha = config.params[index].alpha.toFixed(2);
+        array[arr[index]].p = config.params[index].power.toFixed(2);
+        array[arr[index]].isshow = config.params[index].enable;
+        array[arr[index]].value = Number(config.params[index].size);
       }
-      if (sessionStorage.FusionLocale) set_cache.value = JSON.parse(sessionStorage.FusionLocale); use_set_cache()
-      setnowindex()
-    }
+      if (sessionStorage.FusionLocale)
+        set_cache.value = JSON.parse(sessionStorage.FusionLocale);
+      use_set_cache();
+      setnowindex();
+    };
     const use_server_config = () => {
       for (let index = 0; index < array.length - 1; index++) {
-        array[arr[index]].gamma = config.params[index].gamma.toFixed(2)
-        array[arr[index]].alpha = config.params[index].alpha.toFixed(2)
-        array[arr[index]].p = config.params[index].power.toFixed(2)
-        array[arr[index]].isshow = config.params[index].enable
-        array[arr[index]].value = Number(config.params[index].size)
+        array[arr[index]].gamma = config.params[index].gamma.toFixed(2);
+        array[arr[index]].alpha = config.params[index].alpha.toFixed(2);
+        array[arr[index]].p = config.params[index].power.toFixed(2);
+        array[arr[index]].isshow = config.params[index].enable;
+        array[arr[index]].value = Number(config.params[index].size);
       }
-    }
-    startconfig()
+    };
+    startconfig();
     onBeforeUnmount(() => {
-      sessionStorage.FusionLocale = JSON.stringify(set_cache.value)
-    })
+      sessionStorage.FusionLocale = JSON.stringify(set_cache.value);
+    });
 
     watch(
       () => array[0].value,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 1, array[0].isshow, Number(array[0].value));
-        save_set_cache()
+        if ($store.state.enablefusion)
+          set?.SetBlendingOverlap(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            1,
+            array[0].isshow,
+            Number(array[0].value)
+          );
+        save_set_cache();
       },
       { deep: true }
     );
     watch(
       () => array[1].value,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 0, array[1].isshow, Number(array[1].value));
-        save_set_cache()
+        if ($store.state.enablefusion)
+          set?.SetBlendingOverlap(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            0,
+            array[1].isshow,
+            Number(array[1].value)
+          );
+        save_set_cache();
       },
       { deep: true }
     );
     watch(
       () => array[2].value,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 2, array[2].isshow, Number(array[2].value));
-        save_set_cache()
+        if ($store.state.enablefusion)
+          set?.SetBlendingOverlap(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            2,
+            array[2].isshow,
+            Number(array[2].value)
+          );
+        save_set_cache();
       },
       { deep: true }
     );
     watch(
       () => array[3].value,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 3, array[3].isshow, Number(array[3].value));
-        save_set_cache()
+        if ($store.state.enablefusion)
+          set?.SetBlendingOverlap(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            3,
+            array[3].isshow,
+            Number(array[3].value)
+          );
+        save_set_cache();
       },
       { deep: true }
     );
 
-    ////
+
     watch(
       () => array[0].isshow,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 1, array[0].isshow, Number(array[0].value));
-        save_set_cache()
+        if ($store.state.enablefusion)
+          set?.SetBlendingOverlap(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            1,
+            array[0].isshow,
+            Number(array[0].value)
+          );
+        save_set_cache();
       },
       { deep: true }
     );
     watch(
       () => array[1].isshow,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 0, array[1].isshow, Number(array[1].value));
-        save_set_cache()
+        if ($store.state.enablefusion)
+          set?.SetBlendingOverlap(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            0,
+            array[1].isshow,
+            Number(array[1].value)
+          );
+        save_set_cache();
       },
       { deep: true }
     );
     watch(
       () => array[2].isshow,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 2, array[2].isshow, Number(array[2].value));
-        save_set_cache()
+        if ($store.state.enablefusion)
+          set?.SetBlendingOverlap(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            2,
+            array[2].isshow,
+            Number(array[2].value)
+          );
+        save_set_cache();
       },
       { deep: true }
     );
     watch(
       () => array[3].isshow,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 3, array[3].isshow, Number(array[3].value));
-        save_set_cache()
+        if ($store.state.enablefusion)
+          set?.SetBlendingOverlap(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            3,
+            array[3].isshow,
+            Number(array[3].value)
+          );
+        save_set_cache();
       },
       { deep: true }
     );
 
-    ////
 
     watch(
       () => enablefusion,
       (newVal, oldVal) => {
-        $store.commit('setenablefusion', newVal.value);
+        $store.commit("setenablefusion", newVal.value);
         set?.EnableBlending(newVal.value);
-      }, { deep: true }
+      },
+      { deep: true }
     );
     const changenablefusion = () => {
-      $store.commit('setenablefusion', enablefusion.value);
-    }
+      $store.commit("setenablefusion", enablefusion.value);
+    };
     let resnewdata = null;
     const resetall = () => {
       try {
-        set?.GetBlendingConfig("").then((res) => { resnewdata = res?.config; setconfig(resnewdata) })
+        set?.GetBlendingConfig("").then((res) => {
+          resnewdata = res?.config;
+          setconfig(resnewdata);
+        });
       } catch (error) {
-        console.log("ResetBlendingConfig error")
+        console.log("ResetBlendingConfig error");
       }
-    }
+    };
     return {
       group,
       array,
@@ -394,7 +550,7 @@ export default defineComponent({
       changenablefusion,
       selectedprojector,
       resetall,
-      set_cache
+      set_cache,
     };
   },
 });
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index f4c6c51..d182277 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -1,548 +1,1052 @@
 <template>
-    <div class="row">
-        <div class="col-4">
-            <div class="row">
-                <div class="col-6"></div>
-                <div class="col-3"><q-input filled type="number" class="q-pt-md" @focus="isactivearray[0] = false"
-                        :dense="true" v-model="nine[0].x" label="x" lazy-rules />
-                    <q-input filled type="number" class="q-pt-md" @focus="isactivearray[0] = false" :dense="true"
-                        v-model="nine[0].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(0)" text-color="black" :label="$t('reset') +$t('point') +'1'" />
-                </div>
-            </div>
-        </div>
-        <div class="col-4">
-
-            <div class="row">
-                <div class="col-5"></div>
-                <div class="col-3"> <q-input filled type="number" class="q-pt-md" @focus="isactivearray[1] = false"
-                        :dense="true" v-model="nine[1].x" label="x" lazy-rules />
-                    <q-input filled type="number" class="q-pt-md" @focus="isactivearray[1] = false" :dense="true"
-                        v-model="nine[1].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(1)" text-color="black" :label="$t('reset') +$t('point') +'2'" />
-                </div>
-
-                <div class="col-3" style="margin-left: 5px;"> <q-input filled type="number" class="q-pt-md"
-                        :dense="true" v-model="nine[4].x" label="x" @focus="isactivearray[4] = false" lazy-rules />
-                    <q-input filled type="number" class="q-pt-md" :dense="true" v-model="nine[4].y" label="y"
-                        @focus="isactivearray[4] = false" lazy-rules />
-                    <q-btn color="white" @click="reset(4)" text-color="black" :label="$t('reset') +$t('point') +'5'" />
-                </div>
-            </div>
-        </div>
-        <div class="col-4">
-            <div class="row">
-                <div class="col-4"></div>
-                <div class="col-3"> <q-input filled type="number" @focus="isactivearray[2] = false" class="q-pt-md"
-                        :dense="true" v-model="nine[2].x" label="x" lazy-rules />
-                    <q-input filled type="number" class="q-pt-md" @focus="isactivearray[2] = false" :dense="true"
-                        v-model="nine[2].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(2)" text-color="black" :label="$t('reset') +$t('point') +'3'" />
-                </div>
-            </div>
-
-        </div>
-        <div class="col-2">
-            <div class="row" style="margin-top: 10vh;">
-                <div class="col-6"></div>
-                <div class="col-6"> <q-input filled type="number" @focus="isactivearray[3] = false" class="q-pt-md"
-                        :dense="true" v-model="nine[3].x" label="x" lazy-rules />
-                    <q-input filled type="number" class="q-pt-md" @focus="isactivearray[3] = false" :dense="true"
-                        v-model="nine[3].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(3)" text-color="black" :label="$t('reset') +$t('point') +'4'" />
-                </div>
-            </div>
-
-        </div>
-        <div class="col-8">
-            <div ref="div" style="background-color: #7fffd4;height: 40vh;">
-                <div style="position:absolute;">
-                    <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="20"
-                        :x="ninepostion[0].x" :y="ninepostion[0].y" @mousedown="activeMouseDown(0)" :isResizable="false"
-                        @moveHandler="moveHandler_1"><span>{{ $t('point') }}1</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="20"
-                        :x="ninepostion[1].x" :y="ninepostion[1].y" @mousedown="activeMouseDown(1)" :isResizable="false"
-                        @moveHandler="moveHandler_2"><span>{{ $t('point') }}2</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="20"
-                        :x="ninepostion[2].x" :y="ninepostion[2].y" @mousedown="activeMouseDown(2)" :isResizable="false"
-                        @moveHandler="moveHandler_3"><span>{{ $t('point') }}3</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="20"
-                        :x="ninepostion[3].x" :y="ninepostion[3].y" @mousedown="activeMouseDown(3)" :isResizable="false"
-                        @moveHandler="moveHandler_4"><span>{{ $t('point') }}4</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="20"
-                        :x="ninepostion[4].x" :y="ninepostion[4].y" @mousedown="activeMouseDown(4)" :isResizable="false"
-                        @moveHandler="moveHandler_5"><span>{{ $t('point') }}5</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="30" :h="20"
-                        :x="ninepostion[5].x" :y="ninepostion[5].y" @mousedown="activeMouseDown(5)" :isResizable="false"
-                        @moveHandler="moveHandler_6"><span>{{ $t('point') }}6</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="30" :h="20"
-                        :x="ninepostion[6].x" :y="ninepostion[6].y" @mousedown="activeMouseDown(6)" :isResizable="false"
-                        @moveHandler="moveHandler_7"><span>{{ $t('point') }}7</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="30" :h="20"
-                        :x="ninepostion[7].x" :y="ninepostion[7].y" @mousedown="activeMouseDown(7)" :isResizable="false"
-                        @moveHandler="moveHandler_8"><span>{{ $t('point') }}8</span> </vue3ResizeDrag>
-                    <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="30" :h="20"
-                        :x="ninepostion[8].x" :y="ninepostion[8].y" @mousedown="activeMouseDown(8)" :isResizable="false"
-                        @moveHandler="moveHandler_9"><span>{{ $t('point') }}9</span> </vue3ResizeDrag>
-                </div>
-            </div>
-        </div>
-        <div class="col-2">
-            <div class="row" style="margin-top: 10vh;">
-                <div class="col-6"> <q-input filled type="number" @focus="isactivearray[5] = false" class="q-pt-md"
-                        :dense="true" v-model="nine[5].x" label="x" lazy-rules />
-                    <q-input filled type="number" class="q-pt-md" @focus="isactivearray[5] = false" :dense="true"
-                        v-model="nine[5].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(5)" text-color="black" :label="$t('reset') +$t('point') +'6'" />
-                </div>
-            </div>
-
-        </div>
-        <div class="col-4">
-            <div class="row">
-                <div class="col-6"> <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
-                </div>
-                <div class="col-3"> <q-input filled type="number" @focus="isactivearray[6] = false" class="q-pt-md"
-                        :dense="true" v-model="nine[6].x" label="x" lazy-rules />
-                    <q-input filled type="number" class="q-pt-md" @focus="isactivearray[6] = false" :dense="true"
-                        v-model="nine[6].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(6)" text-color="black" :label="$t('reset') +$t('point') +'7'" />
-                </div>
-            </div>
-
-        </div>
-        <div class="col-4">
-            <div class="row">
-                <div class="col-6"></div>
-                <div class="col-3"> <q-input filled type="number" @focus="isactivearray[7] = false" class="q-pt-md"
-                        :dense="true" v-model="nine[7].x" label="x" lazy-rules />
-                    <q-input filled type="number" class="q-pt-md" @focus="isactivearray[7] = false" :dense="true"
-                        v-model="nine[7].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(7)" text-color="black" :label="$t('reset') +$t('point') +'8'" />
-                </div>
-            </div>
-
-        </div>
-        <div class="col-4">
-            <div class="row">
-                <div class="col-4"></div>
-                <div class="col-3"> <q-input filled type="number" @focus="isactivearray[8] = false" class="q-pt-md"
-                        :dense="true" v-model="nine[8].x" label="x" lazy-rules />
-                    <q-input filled type="number" class="q-pt-md" @focus="isactivearray[8] = false" :dense="true"
-                        v-model="nine[8].y" label="y" lazy-rules />
-                    <q-btn color="white" @click="reset(8)" text-color="black" :label="$t('reset') +$t('point') +'9'" />
-                </div>
-            </div>
-
+  <div class="row">
+    <div class="col-4">
+      <div class="row">
+        <div class="col-6"></div>
+        <div class="col-3">
+          <q-input
+            filled
+            type="number"
+            class="q-pt-md"
+            @focus="isactivearray[0] = false"
+            :dense="true"
+            v-model="nine[0].x"
+            label="x"
+            lazy-rules
+          />
+          <q-input
+            filled
+            type="number"
+            class="q-pt-md"
+            @focus="isactivearray[0] = false"
+            :dense="true"
+            v-model="nine[0].y"
+            label="y"
+            lazy-rules
+          />
+          <q-btn
+            color="white"
+            @click="reset(0)"
+            text-color="black"
+            :label="$t('reset') + $t('point') + '1'"
+          />
         </div>
+      </div>
     </div>
+    <div class="col-4">
+      <div class="row">
+        <div class="col-5"></div>
+        <div class="col-3">
+          <q-input
+            filled
+            type="number"
+            class="q-pt-md"
+            @focus="isactivearray[1] = false"
+            :dense="true"
+            v-model="nine[1].x"
+            label="x"
+            lazy-rules
+          />
+          <q-input
+            filled
+            type="number"
+            class="q-pt-md"
+            @focus="isactivearray[1] = false"
+            :dense="true"
+            v-model="nine[1].y"
+            label="y"
+            lazy-rules
+          />
+          <q-btn
+            color="white"
+            @click="reset(1)"
+            text-color="black"
+            :label="$t('reset') + $t('point') + '2'"
+          />
+        </div>
+
+        <div class="col-3" style="margin-left: 5px">
+          <q-input
+            filled
+            type="number"
+            class="q-pt-md"
+            :dense="true"
+            v-model="nine[4].x"
+            label="x"
+            @focus="isactivearray[4] = false"
+            lazy-rules
+          />
+          <q-input
+            filled
+            type="number"
+            class="q-pt-md"
+            :dense="true"
+            v-model="nine[4].y"
+            label="y"
+            @focus="isactivearray[4] = false"
+            lazy-rules
+          />
+          <q-btn
+            color="white"
+            @click="reset(4)"
+            text-color="black"
+            :label="$t('reset') + $t('point') + '5'"
+          />
+        </div>
+      </div>
+    </div>
+    <div class="col-4">
+      <div class="row">
+        <div class="col-4"></div>
+        <div class="col-3">
+          <q-input
+            filled
+            type="number"
+            @focus="isactivearray[2] = false"
+            class="q-pt-md"
+            :dense="true"
+            v-model="nine[2].x"
+            label="x"
+            lazy-rules
+          />
+          <q-input
+            filled
+            type="number"
+            class="q-pt-md"
+            @focus="isactivearray[2] = false"
+            :dense="true"
+            v-model="nine[2].y"
+            label="y"
+            lazy-rules
+          />
+          <q-btn
+            color="white"
+            @click="reset(2)"
+            text-color="black"
+            :label="$t('reset') + $t('point') + '3'"
+          />
+        </div>
+      </div>
+    </div>
+    <div class="col-2">
+      <div class="row" style="margin-top: 10vh">
+        <div class="col-6"></div>
+        <div class="col-6">
+          <q-input
+            filled
+            type="number"
+            @focus="isactivearray[3] = false"
+            class="q-pt-md"
+            :dense="true"
+            v-model="nine[3].x"
+            label="x"
+            lazy-rules
+          />
+          <q-input
+            filled
+            type="number"
+            class="q-pt-md"
+            @focus="isactivearray[3] = false"
+            :dense="true"
+            v-model="nine[3].y"
+            label="y"
+            lazy-rules
+          />
+          <q-btn
+            color="white"
+            @click="reset(3)"
+            text-color="black"
+            :label="$t('reset') + $t('point') + '4'"
+          />
+        </div>
+      </div>
+    </div>
+    <div class="col-8">
+      <div ref="div" style="background-color: #7fffd4; height: 40vh">
+        <div style="position: absolute">
+          <vue3ResizeDrag
+            :isActive="isactivearray[0]"
+            v-if="isshowarray[0]"
+            :w="30"
+            :h="20"
+            :x="ninepostion[0].x"
+            :y="ninepostion[0].y"
+            @mousedown="activeMouseDown(0)"
+            :isResizable="false"
+            @moveHandler="moveHandler_1"
+            ><span>{{ $t("point") }}1</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[1]"
+            v-if="isshowarray[1]"
+            :w="30"
+            :h="20"
+            :x="ninepostion[1].x"
+            :y="ninepostion[1].y"
+            @mousedown="activeMouseDown(1)"
+            :isResizable="false"
+            @moveHandler="moveHandler_2"
+            ><span>{{ $t("point") }}2</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[2]"
+            v-if="isshowarray[2]"
+            :w="30"
+            :h="20"
+            :x="ninepostion[2].x"
+            :y="ninepostion[2].y"
+            @mousedown="activeMouseDown(2)"
+            :isResizable="false"
+            @moveHandler="moveHandler_3"
+            ><span>{{ $t("point") }}3</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[3]"
+            v-if="isshowarray[3]"
+            :w="30"
+            :h="20"
+            :x="ninepostion[3].x"
+            :y="ninepostion[3].y"
+            @mousedown="activeMouseDown(3)"
+            :isResizable="false"
+            @moveHandler="moveHandler_4"
+            ><span>{{ $t("point") }}4</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[4]"
+            v-if="isshowarray[4]"
+            :w="30"
+            :h="20"
+            :x="ninepostion[4].x"
+            :y="ninepostion[4].y"
+            @mousedown="activeMouseDown(4)"
+            :isResizable="false"
+            @moveHandler="moveHandler_5"
+            ><span>{{ $t("point") }}5</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[5]"
+            v-if="isshowarray[5]"
+            :w="30"
+            :h="20"
+            :x="ninepostion[5].x"
+            :y="ninepostion[5].y"
+            @mousedown="activeMouseDown(5)"
+            :isResizable="false"
+            @moveHandler="moveHandler_6"
+            ><span>{{ $t("point") }}6</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[6]"
+            v-if="isshowarray[6]"
+            :w="30"
+            :h="20"
+            :x="ninepostion[6].x"
+            :y="ninepostion[6].y"
+            @mousedown="activeMouseDown(6)"
+            :isResizable="false"
+            @moveHandler="moveHandler_7"
+            ><span>{{ $t("point") }}7</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[7]"
+            v-if="isshowarray[7]"
+            :w="30"
+            :h="20"
+            :x="ninepostion[7].x"
+            :y="ninepostion[7].y"
+            @mousedown="activeMouseDown(7)"
+            :isResizable="false"
+            @moveHandler="moveHandler_8"
+            ><span>{{ $t("point") }}8</span>
+          </vue3ResizeDrag>
+          <vue3ResizeDrag
+            :isActive="isactivearray[8]"
+            v-if="isshowarray[8]"
+            :w="30"
+            :h="20"
+            :x="ninepostion[8].x"
+            :y="ninepostion[8].y"
+            @mousedown="activeMouseDown(8)"
+            :isResizable="false"
+            @moveHandler="moveHandler_9"
+            ><span>{{ $t("point") }}9</span>
+          </vue3ResizeDrag>
+        </div>
+      </div>
+    </div>
+    <div class="col-2">
+      <div class="row" style="margin-top: 10vh">
+        <div class="col-6">
+          <q-input
+            filled
+            type="number"
+            @focus="isactivearray[5] = false"
+            class="q-pt-md"
+            :dense="true"
+            v-model="nine[5].x"
+            label="x"
+            lazy-rules
+          />
+          <q-input
+            filled
+            type="number"
+            class="q-pt-md"
+            @focus="isactivearray[5] = false"
+            :dense="true"
+            v-model="nine[5].y"
+            label="y"
+            lazy-rules
+          />
+          <q-btn
+            color="white"
+            @click="reset(5)"
+            text-color="black"
+            :label="$t('reset') + $t('point') + '6'"
+          />
+        </div>
+      </div>
+    </div>
+    <div class="col-4">
+      <div class="row">
+        <div class="col-6">
+          <q-btn
+            color="white"
+            @click="resetall"
+            text-color="black"
+            :label="$t('resetall')"
+          />
+        </div>
+        <div class="col-3">
+          <q-input
+            filled
+            type="number"
+            @focus="isactivearray[6] = false"
+            class="q-pt-md"
+            :dense="true"
+            v-model="nine[6].x"
+            label="x"
+            lazy-rules
+          />
+          <q-input
+            filled
+            type="number"
+            class="q-pt-md"
+            @focus="isactivearray[6] = false"
+            :dense="true"
+            v-model="nine[6].y"
+            label="y"
+            lazy-rules
+          />
+          <q-btn
+            color="white"
+            @click="reset(6)"
+            text-color="black"
+            :label="$t('reset') + $t('point') + '7'"
+          />
+        </div>
+      </div>
+    </div>
+    <div class="col-4">
+      <div class="row">
+        <div class="col-6"></div>
+        <div class="col-3">
+          <q-input
+            filled
+            type="number"
+            @focus="isactivearray[7] = false"
+            class="q-pt-md"
+            :dense="true"
+            v-model="nine[7].x"
+            label="x"
+            lazy-rules
+          />
+          <q-input
+            filled
+            type="number"
+            class="q-pt-md"
+            @focus="isactivearray[7] = false"
+            :dense="true"
+            v-model="nine[7].y"
+            label="y"
+            lazy-rules
+          />
+          <q-btn
+            color="white"
+            @click="reset(7)"
+            text-color="black"
+            :label="$t('reset') + $t('point') + '8'"
+          />
+        </div>
+      </div>
+    </div>
+    <div class="col-4">
+      <div class="row">
+        <div class="col-4"></div>
+        <div class="col-3">
+          <q-input
+            filled
+            type="number"
+            @focus="isactivearray[8] = false"
+            class="q-pt-md"
+            :dense="true"
+            v-model="nine[8].x"
+            label="x"
+            lazy-rules
+          />
+          <q-input
+            filled
+            type="number"
+            class="q-pt-md"
+            @focus="isactivearray[8] = false"
+            :dense="true"
+            v-model="nine[8].y"
+            label="y"
+            lazy-rules
+          />
+          <q-btn
+            color="white"
+            @click="reset(8)"
+            text-color="black"
+            :label="$t('reset') + $t('point') + '9'"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
-<style scoped>
-
-</style>
+<style scoped></style>
 <script lang="ts">
 import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
 import GlobalData from "src/common/GlobalData";
-import { defineComponent, ref, watch, computed, defineProps, withDefaults, onMounted, onBeforeUnmount, reactive } from "vue";
+import {
+  defineComponent,
+  ref,
+  watch,
+  computed,
+  defineProps,
+  withDefaults,
+  onMounted,
+  onBeforeUnmount,
+  reactive,
+} from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
 
-
 export default defineComponent({
-    name: "ComponentSurfaceCorrection",
-    components: {
-        vue3ResizeDrag
-    },
-    setup() {
-        let $store = useStore();
-        let $t = useI18n();
-        let config = JSON.parse($store.state.fusion_configuration).projectors[0];
-        const configselsect = computed(() => { return $store.state.selected_projector })
-        let Proportion = ref({ x: 0, y: 0 });
-        let centor = ref({ x: 0, y: 0 });
-        const div = ref();
-        let nine = reactive([{ x: 0, y: 1080 }, { x: 960, y: 1920 }, { x: 1920, y: 1080 }, { x: 0, y: 540 }, { x: 960, y: 540 }, { x: 1920, y: 540 }, { x: 0, y: 0 }, { x: 960, y: 0 }, { x: 1920, y: 0 }]);
-        let defaultnine = ref([{ x: 0, y: 1080 }, { x: 960, y: 1920 }, { x: 1920, y: 1080 }, { x: 0, y: 540 }, { x: 960, y: 540 }, { x: 1920, y: 540 }, { x: 0, y: 0 }, { x: 960, y: 0 }, { x: 1920, y: 0 }]);
-        const activeMouseDown = (index: number) => {
-            isactivearray.value[index] = true
-        }
-        //用于计算当前投影仪的索引
-        let serverconfig = JSON.parse($store.state.fusion_configuration);
-        const selectedprojector = computed(() => {
-            return $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col + $store.getters.GetTheCurrentlySelectedCamera[1]
-        })
-        const set_cache: any = ref([]);
-        //
-        const ste_status = ref(0);
-        const isshowarray = ref([true, true, true, true, true, true, true, true, true,])
-        const isactivearray = ref([true, true, true, true, true, true, true, true, true,])
-        let ninepostion: any = ref([{ x: 0, y: 1920 }, { x: 960, y: 1920 }, { x: 1080, y: 1920 }, { x: 0, y: 540 }, { x: 960, y: 540 }, { x: 1080, y: 540 }, { x: 0, y: 0 }, { x: 540, y: 0 }, { x: 1080, y: 0 }]);
-        let defaultninepostion: any = ref([{ x: 0, y: 1920 }, { x: 960, y: 1920 }, { x: 1080, y: 1920 }, { x: 0, y: 540 }, { x: 960, y: 540 }, { x: 1080, y: 540 }, { x: 0, y: 0 }, { x: 540, y: 0 }, { x: 1080, y: 0 }]);
-        const moveHandler_1 = (data: any) => {
-            let x = Math.ceil((data.left - ninepostion.value[0].x) * Proportion.value.x);
-            let y = config.height - Math.ceil((data.top - ninepostion.value[0].y) * Proportion.value.y);
-            nine[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y
-            save_set_cache()
-        }
-        const moveHandler_2 = (data: any) => {
-            let x = config.width / 2 + Math.ceil((data.left - ninepostion.value[1].x) * centor.value.x);
-            let y = config.height - Math.ceil((data.top - ninepostion.value[1].y) * Proportion.value.y);
-            nine[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y
-            save_set_cache()
-        }
-        const moveHandler_3 = (data: any) => {
-            let x = config.width + Math.ceil((data.left - ninepostion.value[2].x) * Proportion.value.x);
-            let y = config.height - Math.ceil((data.top - ninepostion.value[2].y) * Proportion.value.y);
-            nine[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y
-            save_set_cache()
-        }
-        const moveHandler_4 = (data: any) => {
-            let x = Math.ceil((data.left - ninepostion.value[3].x) * Proportion.value.x);
-            let y = config.height / 2 - Math.ceil((data.top - ninepostion.value[3].y) * Proportion.value.y);
-            nine[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y
-            save_set_cache()
-        }
-        const moveHandler_5 = (data: any) => {
-            let x = config.width / 2 + Math.ceil((data.left - ninepostion.value[4].x) * centor.value.x);
-            let y = config.height / 2 - Math.ceil((data.top - ninepostion.value[4].y) * Proportion.value.y);
-            nine[4].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine[4].y = y > config.height ? config.height : y && y < 0 ? 0 : y
-            save_set_cache()
-        }
-        const moveHandler_6 = (data: any) => {
-            let x = config.width + Math.ceil((data.left - ninepostion.value[5].x) * Proportion.value.x);
-            let y = config.height / 2 - Math.ceil((data.top - ninepostion.value[5].y) * Proportion.value.y);
-            nine[5].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine[5].y = y > config.height ? config.height : y && y < 0 ? 0 : y
-            save_set_cache()
-        }
-        const moveHandler_7 = (data: any) => {
-            let x = Math.ceil((data.left - ninepostion.value[6].x) * Proportion.value.x);
-            let y = Math.abs(Math.ceil((data.top - ninepostion.value[6].y) * Proportion.value.y));
-            nine[6].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine[6].y = y > config.height ? config.height : y && y < 0 ? 0 : y
-            save_set_cache()
-        }
-        const moveHandler_8 = (data: any) => {
-            let x = config.width / 2 + Math.ceil((data.left - ninepostion.value[7].x) * Proportion.value.x);
-            let y = Math.abs(Math.ceil((data.top - ninepostion.value[7].y) * Proportion.value.y));;
-            nine[7].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine[7].y = y > config.height ? config.height : y && y < 0 ? 0 : y
-            save_set_cache()
-        }
-        const moveHandler_9 = (data: any) => {
-            let x = config.width + Math.ceil((data.left - ninepostion.value[8].x) * Proportion.value.x);
-            let y = Math.abs(Math.ceil((data.top - ninepostion.value[8].y) * Proportion.value.y));
-            nine[8].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-            nine[8].y = y > config.height ? config.height : y && y < 0 ? 0 : y
-            save_set_cache()
-        }
+  name: "ComponentSurfaceCorrection",
+  components: {
+    vue3ResizeDrag,
+  },
+  setup() {
+    let $store = useStore();
+    let $t = useI18n();
+    let config = JSON.parse($store.state.fusion_configuration).projectors[0];
+    const configselsect = computed(() => {
+      return $store.state.selected_projector;
+    });
+    let Proportion = ref({ x: 0, y: 0 });
+    let centor = ref({ x: 0, y: 0 });
+    const div = ref();
+    let nine = reactive([
+      { x: 0, y: 1080 },
+      { x: 960, y: 1920 },
+      { x: 1920, y: 1080 },
+      { x: 0, y: 540 },
+      { x: 960, y: 540 },
+      { x: 1920, y: 540 },
+      { x: 0, y: 0 },
+      { x: 960, y: 0 },
+      { x: 1920, y: 0 },
+    ]);
+    let defaultnine = ref([
+      { x: 0, y: 1080 },
+      { x: 960, y: 1920 },
+      { x: 1920, y: 1080 },
+      { x: 0, y: 540 },
+      { x: 960, y: 540 },
+      { x: 1920, y: 540 },
+      { x: 0, y: 0 },
+      { x: 960, y: 0 },
+      { x: 1920, y: 0 },
+    ]);
+    const activeMouseDown = (index: number) => {
+      isactivearray.value[index] = true;
+    };
+    //用于计算当前投影仪的索引
+    let serverconfig = JSON.parse($store.state.fusion_configuration);
+    const selectedprojector = computed(() => {
+      return (
+        $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col +
+        $store.getters.GetTheCurrentlySelectedCamera[1]
+      );
+    });
+    const set_cache: any = ref([]);
+    const ste_status = ref(0);
+    const isshowarray = ref([
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+    ]);
+    const isactivearray = ref([
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+    ]);
+    let ninepostion: any = ref([
+      { x: 0, y: 1920 },
+      { x: 960, y: 1920 },
+      { x: 1080, y: 1920 },
+      { x: 0, y: 540 },
+      { x: 960, y: 540 },
+      { x: 1080, y: 540 },
+      { x: 0, y: 0 },
+      { x: 540, y: 0 },
+      { x: 1080, y: 0 },
+    ]);
+    let defaultninepostion: any = ref([
+      { x: 0, y: 1920 },
+      { x: 960, y: 1920 },
+      { x: 1080, y: 1920 },
+      { x: 0, y: 540 },
+      { x: 960, y: 540 },
+      { x: 1080, y: 540 },
+      { x: 0, y: 0 },
+      { x: 540, y: 0 },
+      { x: 1080, y: 0 },
+    ]);
+    const moveHandler_1 = (data: any) => {
+      let x = Math.ceil(
+        (data.left - ninepostion.value[0].x) * Proportion.value.x
+      );
+      let y =
+        config.height -
+        Math.ceil((data.top - ninepostion.value[0].y) * Proportion.value.y);
+      nine[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+      nine[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      save_set_cache();
+    };
+    const moveHandler_2 = (data: any) => {
+      let x =
+        config.width / 2 +
+        Math.ceil((data.left - ninepostion.value[1].x) * centor.value.x);
+      let y =
+        config.height -
+        Math.ceil((data.top - ninepostion.value[1].y) * Proportion.value.y);
+      nine[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+      nine[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      save_set_cache();
+    };
+    const moveHandler_3 = (data: any) => {
+      let x =
+        config.width +
+        Math.ceil((data.left - ninepostion.value[2].x) * Proportion.value.x);
+      let y =
+        config.height -
+        Math.ceil((data.top - ninepostion.value[2].y) * Proportion.value.y);
+      nine[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+      nine[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      save_set_cache();
+    };
+    const moveHandler_4 = (data: any) => {
+      let x = Math.ceil(
+        (data.left - ninepostion.value[3].x) * Proportion.value.x
+      );
+      let y =
+        config.height / 2 -
+        Math.ceil((data.top - ninepostion.value[3].y) * Proportion.value.y);
+      nine[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+      nine[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      save_set_cache();
+    };
+    const moveHandler_5 = (data: any) => {
+      let x =
+        config.width / 2 +
+        Math.ceil((data.left - ninepostion.value[4].x) * centor.value.x);
+      let y =
+        config.height / 2 -
+        Math.ceil((data.top - ninepostion.value[4].y) * Proportion.value.y);
+      nine[4].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+      nine[4].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      save_set_cache();
+    };
+    const moveHandler_6 = (data: any) => {
+      let x =
+        config.width +
+        Math.ceil((data.left - ninepostion.value[5].x) * Proportion.value.x);
+      let y =
+        config.height / 2 -
+        Math.ceil((data.top - ninepostion.value[5].y) * Proportion.value.y);
+      nine[5].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+      nine[5].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      save_set_cache();
+    };
+    const moveHandler_7 = (data: any) => {
+      let x = Math.ceil(
+        (data.left - ninepostion.value[6].x) * Proportion.value.x
+      );
+      let y = Math.abs(
+        Math.ceil((data.top - ninepostion.value[6].y) * Proportion.value.y)
+      );
+      nine[6].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+      nine[6].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      save_set_cache();
+    };
+    const moveHandler_8 = (data: any) => {
+      let x =
+        config.width / 2 +
+        Math.ceil((data.left - ninepostion.value[7].x) * Proportion.value.x);
+      let y = Math.abs(
+        Math.ceil((data.top - ninepostion.value[7].y) * Proportion.value.y)
+      );
+      nine[7].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+      nine[7].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      save_set_cache();
+    };
+    const moveHandler_9 = (data: any) => {
+      let x =
+        config.width +
+        Math.ceil((data.left - ninepostion.value[8].x) * Proportion.value.x);
+      let y = Math.abs(
+        Math.ceil((data.top - ninepostion.value[8].y) * Proportion.value.y)
+      );
+      nine[8].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+      nine[8].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      save_set_cache();
+    };
 
+    //为了加载 缓存的配置时 同步点的位置
+    const syncpoint = () => {
+      for (let index = 0; index < ninepostion.value.length; index++) {
+        isactivearray.value[index] = false;
+      }
+    };
 
-        //为了加载 缓存的配置时 同步点的位置
-        const syncpoint = () => {
-            for (let index = 0; index < ninepostion.value.length; index++) {
-                isactivearray.value[index] = false
-            }
+    const use_set_cache = () => {
+      if (set_cache.value[selectedprojector.value] != null) {
+        let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
+        deepcopy(nine, tmp);
+      }
+      syncpoint();
+    };
+    const deepcopy = (o1: any, o2: any) => {
+      for (let k in o2) {
+        if (typeof o2[k] === "object") {
+          o1[k] = {};
+          deepcopy(o1[k], o2[k]);
+        } else {
+          o1[k] = o2[k];
         }
+      }
+    };
+    const save_set_cache = () => {
+      set_cache.value[selectedprojector.value] = JSON.stringify(nine);
+    };
+    onBeforeUnmount(() => {
+      if (set_cache.value[selectedprojector.value] != null) {
+        sessionStorage.SurfaceCorrection = JSON.stringify(set_cache.value);
+      }
+    });
 
-        const use_set_cache = () => {
-            if (set_cache.value[selectedprojector.value] != null) {
-                let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
-                deepcopy(nine, tmp)
-            }
-            syncpoint()
-        };
-        const deepcopy = (o1: any, o2: any) => {
-            for (let k in o2) {
-                if (typeof o2[k] === 'object') {
-                    o1[k] = {};
-                    deepcopy(o1[k], o2[k]);
-                } else {
-                    o1[k] = o2[k];
-                }
-            }
+    watch(
+      () => configselsect,
+      (newVal, oldVal) => {
+        let tmp = JSON.parse($store.state.fusion_configuration);
+        let fortmp = null;
+        let i;
+        for (i of tmp.projectors) {
+          if (
+            i.col === $store.getters.GetTheCurrentlySelectedCamera[1] &&
+            i.row === $store.getters.GetTheCurrentlySelectedCamera[0]
+          ) {
+            fortmp = JSON.parse(JSON.stringify(i));
+          }
         }
-        const save_set_cache = () => {
-            set_cache.value[selectedprojector.value] = JSON.stringify(nine);
+        ste_status.value = 1;
+        config = JSON.parse(JSON.stringify(fortmp));
+        use_server_config();
+        use_set_cache();
+        setTimeout(() => {
+          ste_status.value = 0;
+        }, 100);
+      },
+      { deep: true }
+    );
+    onMounted(() => {
+      ste_status.value = 1;
+      startpostion();
+      for (let index = 0; index < defaultninepostion.value.length; index++) {
+        defaultninepostion.value[index].x = ninepostion.value[index].x;
+        defaultninepostion.value[index].y = ninepostion.value[index].y;
+        defaultnine.value[index].x = config.point9[index].def_x;
+        defaultnine.value[index].y = config.point9[index].def_y;
+      }
+      setninepostion();
+      use_set_cache();
+      setTimeout(() => {
+        ste_status.value = 0;
+      }, 100);
+    });
+
+    //窗口变动重新渲染
+    onMounted(() => {
+      window.onresize = () => {
+        return (() => {
+          ste_status.value = 1;
+          startpostion();
+          for (
+            let index = 0;
+            index < defaultninepostion.value.length;
+            index++
+          ) {
+            defaultninepostion.value[index].x = ninepostion.value[index].x;
+            defaultninepostion.value[index].y = ninepostion.value[index].y;
+            defaultnine.value[index].x = config.point9[index].def_x;
+            defaultnine.value[index].y = config.point9[index].def_y;
+          }
+          setninepostion();
+          use_set_cache();
+          setTimeout(() => {
+            ste_status.value = 0;
+          }, 100);
+        })();
+      };
+    });
+
+    const setninepostion = () => {
+      for (let index = 0; index < defaultninepostion.value.length; index++) {
+        nine[index].x = config.point9[index].x;
+        nine[index].y = config.point9[index].y;
+      }
+    };
+    const startpostion = () => {
+      ninepostion.value[0].x = 0;
+      ninepostion.value[0].y = 0;
+
+      ninepostion.value[1].x = div.value.offsetWidth / 2 - 25;
+      ninepostion.value[1].y = 0;
+
+      ninepostion.value[2].x = div.value.offsetWidth - 25;
+      ninepostion.value[2].y = 0;
+
+      ninepostion.value[3].x = 0;
+      ninepostion.value[3].y = div.value.offsetHeight / 2 - 8;
+
+      ninepostion.value[4].x = div.value.offsetWidth / 2 - 25;
+      ninepostion.value[4].y = div.value.offsetHeight / 2 - 8;
+
+      ninepostion.value[5].x = div.value.offsetWidth - 25;
+      ninepostion.value[5].y = div.value.offsetHeight / 2;
+
+      ninepostion.value[6].x = 0;
+      ninepostion.value[6].y = div.value.offsetHeight - 25;
+
+      ninepostion.value[7].x = div.value.offsetWidth / 2 - 8;
+      ninepostion.value[7].y = div.value.offsetHeight - 25;
+
+      ninepostion.value[8].x = div.value.offsetWidth - 25;
+      ninepostion.value[8].y = div.value.offsetHeight - 25;
+
+      Proportion.value.x = config.width / (div.value.offsetWidth - 25);
+      Proportion.value.y = config.height / (div.value.offsetHeight - 25);
+
+      centor.value.x = (config.width * 2) / (div.value.offsetWidth + 25);
+      centor.value.y = (config.height * 2) / (div.value.offsetHeight + 25);
+
+      for (let index = 0; index < defaultninepostion.value.length; index++) {
+        defaultninepostion.value[index].x = ninepostion.value[index].x;
+        defaultninepostion.value[index].y = ninepostion.value[index].y;
+        defaultnine.value[index].x = nine[index].x;
+        defaultnine.value[index].y = nine[index].y;
+      }
+      if (sessionStorage.SurfaceCorrection) {
+        set_cache.value = JSON.parse(sessionStorage.SurfaceCorrection);
+        use_set_cache();
+      } else {
+      }
+      syncpoint();
+    };
+    const use_server_config = () => {
+      for (let index = 0; index < defaultninepostion.value.length; index++) {
+        defaultninepostion.value[index].x = ninepostion.value[index].x;
+        defaultninepostion.value[index].y = ninepostion.value[index].y;
+        defaultnine.value[index].x = nine[index].x;
+        defaultnine.value[index].y = nine[index].y;
+        nine[index].x = config.point9[index].x;
+        nine[index].y = config.point9[index].y;
+      }
+    };
+    const reset = (index: number) => {
+      ninepostion.value[index].x = defaultninepostion.value[index].x;
+      ninepostion.value[index].y = defaultninepostion.value[index].y;
+
+      nine[index].x = config.point9[index].def_x;
+      nine[index].y = config.point9[index].def_y;
+
+      set?.setBlendingCorrection(
+        $store.getters.GetTheCurrentlySelectedCamera[0],
+        $store.getters.GetTheCurrentlySelectedCamera[1],
+        9,
+        index + 1,
+        Number(config.point9[index].def_x),
+        Number(config.point9[index].def_y)
+      );
+
+      isshowarray.value[index] = false;
+      setTimeout(() => {
+        isshowarray.value[index] = true;
+      }, 100);
+    };
+    const resetall = () => {
+      for (let index = 0; index < nine.length; index++) {
+        reset(index);
+      }
+    };
+    watch(
+      () => nine[0],
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion && ste_status.value == 0)
+          set?.setBlendingCorrection(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            9,
+            1,
+            Number(newVal.x),
+            Number(newVal.y)
+          );
+
+        if (!isactivearray.value[0]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          setdianposin(0, x, y);
         }
-        onBeforeUnmount(() => {
-            if (set_cache.value[selectedprojector.value] != null) {
-                sessionStorage.SurfaceCorrection = JSON.stringify(set_cache.value)
-            }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+    watch(
+      () => nine[1],
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion && ste_status.value == 0)
+          set?.setBlendingCorrection(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            9,
+            2,
+            Number(newVal.x),
+            Number(newVal.y)
+          );
 
-        })
-
-        watch(() => configselsect, (newVal, oldVal) => {
-            let tmp = JSON.parse($store.state.fusion_configuration);
-            let fortmp = null
-            let i
-            for (i of tmp.projectors) {
-                if (i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && i.row === $store.getters.GetTheCurrentlySelectedCamera[0]) {
-                    fortmp = JSON.parse(JSON.stringify(i))
-                }
-            }
-            ste_status.value = 1;
-            config = JSON.parse(JSON.stringify(fortmp))
-            use_server_config()
-            use_set_cache()
-            setTimeout(() => {
-                ste_status.value = 0;
-            }, 100);
-        }, { deep: true })
-        onMounted(() => {
-            ste_status.value = 1;
-            startpostion();
-            for (let index = 0; index < defaultninepostion.value.length; index++) {
-                defaultninepostion.value[index].x = ninepostion.value[index].x;
-                defaultninepostion.value[index].y = ninepostion.value[index].y;
-                defaultnine.value[index].x = config.point9[index].def_x
-                defaultnine.value[index].y = config.point9[index].def_y
-            }
-            setninepostion();
-            //syncpoint()
-            use_set_cache()
-            setTimeout(() => {
-                ste_status.value = 0;
-            }, 100);
-        })
-
-        //窗口变动重新渲染
-        onMounted(() => {
-            //监听窗口变化
-            window.onresize = () => {
-                return (() => {
-                    ste_status.value = 1;
-                    startpostion();
-                    for (let index = 0; index < defaultninepostion.value.length; index++) {
-                        defaultninepostion.value[index].x = ninepostion.value[index].x;
-                        defaultninepostion.value[index].y = ninepostion.value[index].y;
-                        defaultnine.value[index].x = config.point9[index].def_x
-                        defaultnine.value[index].y = config.point9[index].def_y
-                    }
-                    setninepostion();
-                    //syncpoint()
-                    use_set_cache()
-                    setTimeout(() => {
-                        ste_status.value = 0;
-                    }, 100);
-                })();
-            };
+        if (!isactivearray.value[1]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          setdianposin(1, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+    watch(
+      () => nine[2],
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion && ste_status.value == 0)
+          set?.setBlendingCorrection(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            9,
+            3,
+            Number(newVal.x),
+            Number(newVal.y)
+          );
+        if (!isactivearray.value[2]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          setdianposin(2, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+    watch(
+      () => nine[3],
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion && ste_status.value == 0)
+          set?.setBlendingCorrection(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            9,
+            4,
+            Number(newVal.x),
+            Number(newVal.y)
+          );
+        if (!isactivearray.value[3]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          setdianposin(3, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+    watch(
+      () => nine[4],
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion && ste_status.value == 0)
+          set?.setBlendingCorrection(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            9,
+            5,
+            Number(newVal.x),
+            Number(newVal.y)
+          );
+        if (!isactivearray.value[4]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          setdianposin(4, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+    watch(
+      () => nine[5],
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion && ste_status.value == 0)
+          set?.setBlendingCorrection(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            9,
+            6,
+            Number(newVal.x),
+            Number(newVal.y)
+          );
+        if (!isactivearray.value[5]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          setdianposin(5, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+    watch(
+      () => nine[6],
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion && ste_status.value == 0)
+          set?.setBlendingCorrection(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            9,
+            7,
+            Number(newVal.x),
+            Number(newVal.y)
+          );
+        if (!isactivearray.value[6]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          setdianposin(6, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+    watch(
+      () => nine[7],
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion && ste_status.value == 0)
+          set?.setBlendingCorrection(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            9,
+            8,
+            Number(newVal.x),
+            Number(newVal.y)
+          );
+        if (!isactivearray.value[7]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          setdianposin(7, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+    watch(
+      () => nine[8],
+      (newVal, oldVal) => {
+        if ($store.state.enablefusion && ste_status.value == 0)
+          set?.setBlendingCorrection(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            9,
+            9,
+            Number(newVal.x),
+            Number(newVal.y)
+          );
+        if (!isactivearray.value[8]) {
+          let x = Math.ceil(newVal.x / Proportion.value.x);
+          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
+          setdianposin(8, x, y);
+        }
+        save_set_cache();
+      },
+      { deep: true }
+    );
+    let model = ref(null);
+    let set = GlobalData.getInstance().getCurrentClient();
+    const setdianposin = (index: number, x: number, y: number) => {
+      ninepostion.value[index].x = x;
+      ninepostion.value[index].y = y;
+      isshowarray.value[index] = false;
+      isactivearray.value[index] = false;
+      setTimeout(() => {
+        isshowarray.value[index] = true;
+      }, 100);
+    };
+    const save = () => {
+      set?.SaveBlendingConfig("");
+      setTimeout(() => {
+        set?.GetBlendingConfig("").then((res) => {
+          $store.commit("setfusion_configuration", res?.config);
         });
-
-        const setninepostion = () => {
-            for (let index = 0; index < defaultninepostion.value.length; index++) {
-                nine[index].x = config.point9[index].x
-                nine[index].y = config.point9[index].y
-            }
-        }
-        const startpostion = () => {
-            ninepostion.value[0].x = 0
-            ninepostion.value[0].y = 0
-
-            ninepostion.value[1].x = div.value.offsetWidth / 2 - 25
-            ninepostion.value[1].y = 0
-
-            ninepostion.value[2].x = div.value.offsetWidth - 25
-            ninepostion.value[2].y = 0
-
-            ninepostion.value[3].x = 0
-            ninepostion.value[3].y = div.value.offsetHeight / 2 - 8
-
-            ninepostion.value[4].x = div.value.offsetWidth / 2 - 25
-            ninepostion.value[4].y = div.value.offsetHeight / 2 - 8
-
-            ninepostion.value[5].x = div.value.offsetWidth - 25
-            ninepostion.value[5].y = div.value.offsetHeight / 2
-
-            ninepostion.value[6].x = 0
-            ninepostion.value[6].y = div.value.offsetHeight - 25
-
-            ninepostion.value[7].x = div.value.offsetWidth / 2 - 8
-            ninepostion.value[7].y = div.value.offsetHeight - 25
-
-            ninepostion.value[8].x = div.value.offsetWidth - 25
-            ninepostion.value[8].y = div.value.offsetHeight - 25
-
-            Proportion.value.x = config.width / (div.value.offsetWidth - 25)
-            Proportion.value.y = config.height / (div.value.offsetHeight - 25)
-
-            centor.value.x = config.width * 2 / (div.value.offsetWidth + 25)
-            centor.value.y = config.height * 2 / (div.value.offsetHeight + 25)
-
-            for (let index = 0; index < defaultninepostion.value.length; index++) {
-                defaultninepostion.value[index].x = ninepostion.value[index].x;
-                defaultninepostion.value[index].y = ninepostion.value[index].y;
-                defaultnine.value[index].x = nine[index].x
-                defaultnine.value[index].y = nine[index].y
-            }
-            if (sessionStorage.SurfaceCorrection) {
-                set_cache.value = JSON.parse(sessionStorage.SurfaceCorrection);
-                use_set_cache()
-            } else {
-
-            }
-            syncpoint()
-        }
-        const use_server_config = () => {
-            for (let index = 0; index < defaultninepostion.value.length; index++) {
-                defaultninepostion.value[index].x = ninepostion.value[index].x;
-                defaultninepostion.value[index].y = ninepostion.value[index].y;
-                defaultnine.value[index].x = nine[index].x
-                defaultnine.value[index].y = nine[index].y
-                nine[index].x = config.point9[index].x
-                nine[index].y = config.point9[index].y
-            }
-        }
-        const reset = (index: number) => {
-            ninepostion.value[index].x = defaultninepostion.value[index].x;
-            ninepostion.value[index].y = defaultninepostion.value[index].y;
-
-            nine[index].x = config.point9[index].def_x
-            nine[index].y = config.point9[index].def_y
-
-            set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, index + 1, Number(config.point9[index].def_x), Number(config.point9[index].def_y));
-
-            isshowarray.value[index] = false
-            setTimeout(() => {
-                isshowarray.value[index] = true
-            }, 100);
-        }
-        const resetall = () => {
-            for (let index = 0; index < nine.length; index++) {
-                reset(index)
-            }
-        }
-        watch(() => nine[0], (newVal, oldVal) => {
-            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 1, Number(newVal.x), Number(newVal.y));
-
-            if (!isactivearray.value[0]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                setdianposin(0, x, y)
-            }
-            save_set_cache()
-
-        }, { deep: true })
-        watch(() => nine[1], (newVal, oldVal) => {
-            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 2, Number(newVal.x), Number(newVal.y));
-
-            if (!isactivearray.value[1]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                setdianposin(1, x, y)
-            }
-            save_set_cache()
-
-        }, { deep: true })
-        watch(() => nine[2], (newVal, oldVal) => {
-            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 3, Number(newVal.x), Number(newVal.y));
-            if (!isactivearray.value[2]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                setdianposin(2, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-        watch(() => nine[3], (newVal, oldVal) => {
-            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 4, Number(newVal.x), Number(newVal.y));
-            if (!isactivearray.value[3]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                setdianposin(3, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-        watch(() => nine[4], (newVal, oldVal) => {
-            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 5, Number(newVal.x), Number(newVal.y));
-            if (!isactivearray.value[4]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                setdianposin(4, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-        watch(() => nine[5], (newVal, oldVal) => {
-            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 6, Number(newVal.x), Number(newVal.y));
-            if (!isactivearray.value[5]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                setdianposin(5, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-        watch(() => nine[6], (newVal, oldVal) => {
-            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 7, Number(newVal.x), Number(newVal.y));
-            if (!isactivearray.value[6]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                setdianposin(6, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-        watch(() => nine[7], (newVal, oldVal) => {
-            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 8, Number(newVal.x), Number(newVal.y));
-            if (!isactivearray.value[7]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                setdianposin(7, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-        watch(() => nine[8], (newVal, oldVal) => {
-            if ($store.state.enablefusion && ste_status.value == 0) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 9, Number(newVal.x), Number(newVal.y));
-            if (!isactivearray.value[8]) {
-                let x = Math.ceil(newVal.x / Proportion.value.x);
-                let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
-                setdianposin(8, x, y)
-            }
-            save_set_cache()
-        }, { deep: true })
-        let model = ref(null);
-        let set = GlobalData.getInstance().getCurrentClient();
-        const setdianposin = (index: number, x: number, y: number) => {
-            ninepostion.value[index].x = x
-            ninepostion.value[index].y = y
-            isshowarray.value[index] = false
-            isactivearray.value[index] = false
-            setTimeout(() => {
-                isshowarray.value[index] = true
-            }, 100);
-
-        }
-        const save = () => {
-            set?.SaveBlendingConfig("")
-            setTimeout(() => {
-                set?.GetBlendingConfig("").then((res) => { $store.commit("setfusion_configuration", res?.config); })
-            }, 1000);
-        }
-        return {
-            model,
-            save,
-            nine,
-            moveHandler_1,
-            moveHandler_2,
-            moveHandler_3,
-            moveHandler_4,
-            moveHandler_5,
-            moveHandler_6,
-            moveHandler_7,
-            moveHandler_8,
-            moveHandler_9,
-            div,
-            resetall,
-            ninepostion,
-            reset,
-            isshowarray,
-            isactivearray,
-            activeMouseDown,
-            set_cache
-        };
-    },
+      }, 1000);
+    };
+    return {
+      model,
+      save,
+      nine,
+      moveHandler_1,
+      moveHandler_2,
+      moveHandler_3,
+      moveHandler_4,
+      moveHandler_5,
+      moveHandler_6,
+      moveHandler_7,
+      moveHandler_8,
+      moveHandler_9,
+      div,
+      resetall,
+      ninepostion,
+      reset,
+      isshowarray,
+      isactivearray,
+      activeMouseDown,
+      set_cache,
+    };
+  },
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 03b730a..e7f20f7 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -1,11 +1,15 @@
 <template>
-  <q-dialog persistent v-model="show_dialog" @keydown="
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @keydown="
     (evt: any) => {
       if (evt.keyCode == 27) {
         show_dialog = false;
       }
     }
-  ">
+  "
+  >
     <q-card class="overflow-hidden" style="max-width: 90vw; height: 90vh">
       <q-form>
         <q-card-section class="q-ma-none q-pa-sm">
@@ -15,7 +19,14 @@
             </div>
 
             <q-space />
-            <q-btn flat round icon="close" color="red" @click="clear()" v-close-popup>
+            <q-btn
+              flat
+              round
+              icon="close"
+              color="red"
+              @click="clear()"
+              v-close-popup
+            >
               <q-tooltip>
                 {{ $t("close") }}
               </q-tooltip>
@@ -27,23 +38,36 @@
         <q-separator />
         <!-- height: 80vh -->
         <q-card-section class="scroll" style="width: 80vw">
-          <div class="row" style="border: 1px solid #b0bec5;text-align: center;">
-            <div class="col-3" style="border-right: 1px solid #b0bec5;">
+          <div
+            class="row"
+            style="border: 1px solid #b0bec5; text-align: center"
+          >
+            <div class="col-3" style="border-right: 1px solid #b0bec5">
               <p class="text-center">{{ $t("Projector") }}</p>
               <!-- row 在前col在后 -->
               <div v-for="(item, index_row) in config.row">
-                <projector-item v-for="(item, index_col) in config.col" class="w-100"
-                  :llabel="$t('Projector') + (index_row * config.col + index_col + 1)"
-                  :lvalue="index_row + '/' + index_col"></projector-item>
+                <projector-item
+                  v-for="(item, index_col) in config.col"
+                  class="w-100"
+                  :llabel="
+                    $t('Projector') + (index_row * config.col + index_col + 1)
+                  "
+                  :lvalue="index_row + '/' + index_col"
+                ></projector-item>
               </div>
 
               <div class="col-12" style="text-align: center">
-                {{ $t('Whether to enable integration') }}<q-checkbox v-model="EnableBlending" />
+                {{ $t("Whether to enable integration")
+                }}<q-checkbox v-model="EnableBlending" />
               </div>
             </div>
             <div class="col-9">
               <div class="q-ta-md">
-                <q-btn-toggle :disable="!$store.state.enablefusion" no-caps v-model="options" toggle-color="primary"
+                <q-btn-toggle
+                  :disable="!$store.state.enablefusion"
+                  no-caps
+                  v-model="options"
+                  toggle-color="primary"
                   :options="[
                     { label: $t('FusionLocale'), value: 'FusionLocale' },
                     {
@@ -59,10 +83,11 @@
                       value: 'DensityCorrection',
                     },
                     // { label: $t('GridSettings'), value: 'GridSettings' },
-                  ]" />
+                  ]"
+                />
               </div>
               <div style="min-height: 72vh">
-                <component :is="options"  />
+                <component :is="options" />
               </div>
             </div>
           </div>
@@ -71,8 +96,22 @@
         <q-separator />
 
         <q-card-actions align="right">
-          <q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup @click="$store.commit('setSelectedProjector','0/0');" />
-          <q-btn flat :label="$t('save config')" no-caps color="primary" @click="save" v-close-popup />
+          <q-btn
+            flat
+            :label="$t('Cancel')"
+            no-caps
+            color="primary"
+            v-close-popup
+            @click="$store.commit('setSelectedProjector', '0/0')"
+          />
+          <q-btn
+            flat
+            :label="$t('save config')"
+            no-caps
+            color="primary"
+            @click="save"
+            v-close-popup
+          />
         </q-card-actions>
       </q-form>
     </q-card>
@@ -134,10 +173,6 @@ export default defineComponent({
       show_dialog.value = true;
     };
 
-
-
-
-    //投影机数量
     const config = ref({ col: 0, row: 0 });
     const EnableBlending = ref(false);
     let optionsstr = ref();
@@ -167,49 +202,58 @@ export default defineComponent({
         position: "top",
         timeout: 1500,
       });
-    }
+    };
     const save = () => {
-      set?.SaveBlendingConfig("")
-      show_dialog.value = false
-      clear()
-      set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); EnableBlending.value = tmp.enable; $store.commit("setEnablefusion", tmp.enable); config.value.col = tmp.col; config.value.row = tmp.row; $store.commit("setfusion_configuration", res?.config); })
-      $store.commit('setSelectedProjector','0/0');
-    }
-    const getconfig=()=>{
+      set?.SaveBlendingConfig("");
+      show_dialog.value = false;
+      clear();
+      set?.GetBlendingConfig("").then((res) => {
+        let tmp = JSON.parse(res ? res.config : "");
+        EnableBlending.value = tmp.enable;
+        $store.commit("setEnablefusion", tmp.enable);
+        config.value.col = tmp.col;
+        config.value.row = tmp.row;
+        $store.commit("setfusion_configuration", res?.config);
+      });
+      $store.commit("setSelectedProjector", "0/0");
+    };
+    const getconfig = () => {
       try {
-        set?.GetBlendingConfig("").then((res)=>{})
-        set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); $store.commit("setEnablefusion", tmp.enable); $store.commit("setfusion_configuration", res?.config); })
-      } catch (error) {
-        
-      }
-      
-    }
+        set?.GetBlendingConfig("").then((res) => {});
+        set?.GetBlendingConfig("").then((res) => {
+          let tmp = JSON.parse(res ? res.config : "");
+          $store.commit("setEnablefusion", tmp.enable);
+          $store.commit("setfusion_configuration", res?.config);
+        });
+      } catch (error) {}
+    };
     const clear = () => {
-      $store.commit('setSelectedProjector','0/0');
+      $store.commit("setSelectedProjector", "0/0");
       setTimeout(() => {
-        sessionStorage.removeItem('FusionLocale')
-        sessionStorage.removeItem('SurfaceCorrection')
-        sessionStorage.removeItem('DensityCorrection')
-        sessionStorage.removeItem('FourPointCalibration')
-      }, 500)
-      getconfig()
-    }
+        sessionStorage.removeItem("FusionLocale");
+        sessionStorage.removeItem("SurfaceCorrection");
+        sessionStorage.removeItem("DensityCorrection");
+        sessionStorage.removeItem("FourPointCalibration");
+      }, 500);
+      getconfig();
+    };
 
     onBeforeMount(() => {
       setTimeout(() => {
         try {
-          set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); EnableBlending.value = tmp.enable; $store.commit("setEnablefusion", tmp.enable); config.value.col = tmp.col; config.value.row = tmp.row; $store.commit("setfusion_configuration", res?.config); })
+          set?.GetBlendingConfig("").then((res) => {
+            let tmp = JSON.parse(res ? res.config : "");
+            EnableBlending.value = tmp.enable;
+            $store.commit("setEnablefusion", tmp.enable);
+            config.value.col = tmp.col;
+            config.value.row = tmp.row;
+            $store.commit("setfusion_configuration", res?.config);
+          });
         } catch (error) {
-          //let textdata="{\"col\":2,\"enable\":true,\"projectors\":[{\"col\":0,\"height\":1080,\"hor_density\":[{\"def_x\":0,\"def_y\":540,\"number\":1,\"x\":0,\"y\":540},{\"def_x\":480,\"def_y\":540,\"number\":2,\"x\":480,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":1440,\"def_y\":540,\"number\":4,\"x\":1440,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":5,\"x\":1920,\"y\":540}],\"params\":[{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0}],\"point4\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":2,\"x\":1171,\"y\":712},{\"def_x\":0,\"def_y\":0,\"number\":3,\"x\":0,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":4,\"x\":1920,\"y\":0}],\"point9\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":960,\"def_y\":1080,\"number\":2,\"x\":960,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":3,\"x\":1920,\"y\":1080},{\"def_x\":0,\"def_y\":540,\"number\":4,\"x\":0,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":5,\"x\":960,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":6,\"x\":1920,\"y\":540},{\"def_x\":0,\"def_y\":0,\"number\":7,\"x\":0,\"y\":0},{\"def_x\":960,\"def_y\":0,\"number\":8,\"x\":960,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":9,\"x\":1920,\"y\":0}],\"row\":0,\"ver_density\":[{\"def_x\":960,\"def_y\":1080,\"number\":1,\"x\":960,\"y\":1080},{\"def_x\":960,\"def_y\":810,\"number\":2,\"x\":960,\"y\":810},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":960,\"def_y\":270,\"number\":4,\"x\":960,\"y\":270},{\"def_x\":960,\"def_y\":0,\"number\":5,\"x\":960,\"y\":0}],\"width\":1920},{\"col\":1,\"height\":1080,\"hor_density\":[{\"def_x\":0,\"def_y\":540,\"number\":1,\"x\":0,\"y\":540},{\"def_x\":480,\"def_y\":540,\"number\":2,\"x\":480,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":1440,\"def_y\":540,\"number\":4,\"x\":1440,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":5,\"x\":1920,\"y\":540}],\"params\":[{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0}],\"point4\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":2,\"x\":1920,\"y\":1080},{\"def_x\":0,\"def_y\":0,\"number\":3,\"x\":0,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":4,\"x\":1920,\"y\":0}],\"point9\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":960,\"def_y\":1080,\"number\":2,\"x\":960,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":3,\"x\":1920,\"y\":1080},{\"def_x\":0,\"def_y\":540,\"number\":4,\"x\":0,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":5,\"x\":960,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":6,\"x\":1920,\"y\":540},{\"def_x\":0,\"def_y\":0,\"number\":7,\"x\":0,\"y\":0},{\"def_x\":960,\"def_y\":0,\"number\":8,\"x\":960,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":9,\"x\":1920,\"y\":0}],\"row\":0,\"ver_density\":[{\"def_x\":960,\"def_y\":1080,\"number\":1,\"x\":960,\"y\":1080},{\"def_x\":960,\"def_y\":810,\"number\":2,\"x\":960,\"y\":810},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":960,\"def_y\":270,\"number\":4,\"x\":960,\"y\":270},{\"def_x\":960,\"def_y\":0,\"number\":5,\"x\":960,\"y\":0}],\"width\":1920}],\"row\":1,\"screen_height\":0,\"screen_width\":0}"
-          //let tmp=JSON.parse(textdata);EnableBlending.value=tmp.enable;$store.commit("setEnablefusion", tmp.enable);config.value.col=tmp.col;config.value.row=tmp.row;$store.commit("setfusion_configuration", textdata)
-          //set?.GetBlendingConfig("").then((res)=>{let tmp=JSON.parse(res?res.config:"");EnableBlending.value=tmp.enable;$store.commit("setEnablefusion", tmp.enable);config.value.col=tmp.col;config.value.row=tmp.row;$store.commit("setfusion_configuration", res?.config);})
-          // console.log("data is false")
-          erroe()
+          erroe();
         }
-
-
       }, 1000);
-    })
+    });
     return {
       clear,
       show_dialog,
@@ -218,7 +262,7 @@ export default defineComponent({
       showDialog,
       EnableBlending,
       config,
-      save
+      save,
     };
   },
 });
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index 52151ba..d40812e 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -1,6 +1,10 @@
 <template>
   <div>
-    <q-toolbar style="background-color: #3e9acd" class="shadow-2 text-white" @dragstart.prevent>
+    <q-toolbar
+      style="background-color: #3e9acd"
+      class="shadow-2 text-white"
+      @dragstart.prevent
+    >
       <q-btn-dropdown
         v-if="false"
         v-touch-hold:10000.mouse="handleHold"
@@ -288,7 +292,11 @@
         :label="$t('other setting')"
         class="q-mr-sm"
       >
-        <q-list style="background-color: #3e9acd" class="shadow-2 text-white" @dragstart.prevent>
+        <q-list
+          style="background-color: #3e9acd"
+          class="shadow-2 text-white"
+          @dragstart.prevent
+        >
           <q-item
             clickable
             :disable="!$store.state.power_state"
@@ -412,7 +420,10 @@
           <q-item
             clickable
             v-close-popup
-            @click="$refs.fusion_settings_dialog.showDialog();getconfig()"
+            @click="
+              $refs.fusion_settings_dialog.showDialog();
+              getconfig();
+            "
           >
             <q-item-section avatar>
               <!-- <q-icon name="devices" /> -->
@@ -457,7 +468,11 @@
         <q-item-section avatar style="margin-right: 0px; padding-right: 0px">
           <!-- <q-icon class="text-white rotate" name="img:svgs/fan.svg" /> -->
           <!-- <q-icon class="text-white rotate" name="img:new_icon/fan.png" /> -->
-          <q-icon class="text-white" :style="{'animation':fan}" name="img:new_icon/fan.png" />
+          <q-icon
+            class="text-white"
+            :style="{ animation: fan }"
+            name="img:new_icon/fan.png"
+          />
         </q-item-section>
         <q-item-section style="margin-left: -25px">
           {{ $store.state.fan_temp.toFixed(1) }} ℃
@@ -491,7 +506,7 @@
   <fusion-settings-dialog ref="fusion_settings_dialog" />
 </template>
 
-<style >
+<style>
 @keyframes rotate {
   0% {
     transform: rotate(0);
@@ -589,22 +604,21 @@ export default defineComponent({
     const plan_running = computed(
       () => $store.state.current_running_plan.trim() != ""
     );
-    const fan = computed(
-      () => {
-        let wendu:any=($store.state.fan_temp).toFixed(1)
-        let sulv:any=(1-(wendu/150))
-        return 'rotate '+sulv+'s linear infinite'
-      }
-    );
-    const getconfig=()=>{
+    const fan = computed(() => {
+      let wendu: any = $store.state.fan_temp.toFixed(1);
+      let sulv: any = 1 - wendu / 150;
+      return "rotate " + sulv + "s linear infinite";
+    });
+    const getconfig = () => {
       try {
-        set?.GetBlendingConfig("").then((res)=>{})
-        set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); $store.commit("setEnablefusion", tmp.enable); $store.commit("setfusion_configuration", res?.config); })
-      } catch (error) {
-        
-      }
-      
-    }
+        set?.GetBlendingConfig("").then((res) => {});
+        set?.GetBlendingConfig("").then((res) => {
+          let tmp = JSON.parse(res ? res.config : "");
+          $store.commit("setEnablefusion", tmp.enable);
+          $store.commit("setfusion_configuration", res?.config);
+        });
+      } catch (error) {}
+    };
     const checkRegistered = () => {
       if (
         GlobalData.getInstance().getCurrentClient()?.is_connected &&

From bd8be8954aecd9f330709858fa8243c8fb0b2cf8 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 13 Jan 2023 17:10:30 +0800
Subject: [PATCH 15/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E6=97=B6=E5=8F=98=E6=88=90=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/FusionLocale.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index f92783c..6ea453a 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -302,7 +302,7 @@ export default defineComponent({
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
             arr[group.value],
-            array[arr[group.value]].alpha
+            Number(array[group.value].alpha)
           );
       }
       if (type == "p") {
@@ -311,7 +311,7 @@ export default defineComponent({
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
             arr[group.value],
-            array[arr[group.value]].p
+            Number(array[group.value].p)
           );
       }
       if (type == "gamma") {
@@ -320,7 +320,7 @@ export default defineComponent({
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
             arr[group.value],
-            array[arr[group.value]].gamma
+            Number(array[group.value].gamma)
           );
       }
       save_set_cache();

From 97c52eabb289d76b82bb0ace9e0765b1bf2878c7 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sat, 14 Jan 2023 11:05:26 +0800
Subject: [PATCH 16/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=A1=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 12 +++++++++++-
 src/i18n/en-US/index.ts                 |  3 ++-
 src/i18n/zh-CN/index.ts                 |  3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index e7f20f7..81323ca 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -96,6 +96,8 @@
         <q-separator />
 
         <q-card-actions align="right">
+          <span>{{$t('Whether to hide the desktop')}}</span><q-checkbox style="justify-content: flex-start;" v-model="hide_desktop_value" @click="send_hide_desktop" />
+          <div class="q-space" data-v-39efcd1f=""></div>
           <q-btn
             flat
             :label="$t('Cancel')"
@@ -172,11 +174,15 @@ export default defineComponent({
     const showDialog = async () => {
       show_dialog.value = true;
     };
-
+    const send_hide_desktop=()=>{
+      set?.SetBlendingOption(0,hide_desktop_value.value?1:0)
+    }
     const config = ref({ col: 0, row: 0 });
     const EnableBlending = ref(false);
     let optionsstr = ref();
     optionsstr.value = "FusionLocale";
+    const hide_desktop_value=ref(true)
+    const hide_desktop_id=ref(0)
     const options = computed({
       get() {
         return optionsstr.value;
@@ -224,6 +230,8 @@ export default defineComponent({
           let tmp = JSON.parse(res ? res.config : "");
           $store.commit("setEnablefusion", tmp.enable);
           $store.commit("setfusion_configuration", res?.config);
+          hide_desktop_id.value=tmp.options[0]
+          hide_desktop_value.value=tmp.options[1]==0?false:true
         });
       } catch (error) {}
     };
@@ -255,6 +263,8 @@ export default defineComponent({
       }, 1000);
     });
     return {
+      send_hide_desktop,
+      hide_desktop_value,
       clear,
       show_dialog,
       options,
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 422363a..01fc330 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -423,5 +423,6 @@ export default {
   "Projector":"Projector",
   "resetall":"reset all",
   "save config":"save config",
-  "Whether to enable integration":"Whether to enable integration"
+  "Whether to enable integration":"Whether to enable integration",
+  "Whether to hide the desktop":"Whether to hide the desktop"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 8baec0c..40142e7 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -692,5 +692,6 @@ export default {
   "Projector":"投影机",
   "resetall":"重置所有",
   "save config":"保存配置",
-  "Whether to enable integration":"是否启用融合"
+  "Whether to enable integration":"是否启用融合",
+  "Whether to hide the desktop":"是否隐藏桌面"
 };

From e9f0be260784f3af7a4be80a940da6ecd4fe6703 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sat, 14 Jan 2023 13:24:27 +0800
Subject: [PATCH 17/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/SurfaceCorrection.vue      |  4 +--
 src/components/FusionSettingsDialog.vue       | 28 +++++++++++++------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index d182277..4223f03 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -542,7 +542,7 @@ export default defineComponent({
     const moveHandler_2 = (data: any) => {
       let x =
         config.width / 2 +
-        Math.ceil((data.left - ninepostion.value[1].x) * centor.value.x);
+        Math.ceil((data.left - ninepostion.value[1].x) * Proportion.value.x);
       let y =
         config.height -
         Math.ceil((data.top - ninepostion.value[1].y) * Proportion.value.y);
@@ -575,7 +575,7 @@ export default defineComponent({
     const moveHandler_5 = (data: any) => {
       let x =
         config.width / 2 +
-        Math.ceil((data.left - ninepostion.value[4].x) * centor.value.x);
+        Math.ceil((data.left - ninepostion.value[4].x) * Proportion.value.x);
       let y =
         config.height / 2 -
         Math.ceil((data.top - ninepostion.value[4].y) * Proportion.value.y);
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 81323ca..87f61a8 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -10,7 +10,7 @@
     }
   "
   >
-    <q-card class="overflow-hidden" style="max-width: 90vw; height: 90vh">
+    <q-card class="" style="max-width: 90vw">
       <q-form>
         <q-card-section class="q-ma-none q-pa-sm">
           <div class="row">
@@ -96,7 +96,12 @@
         <q-separator />
 
         <q-card-actions align="right">
-          <span>{{$t('Whether to hide the desktop')}}</span><q-checkbox style="justify-content: flex-start;" v-model="hide_desktop_value" @click="send_hide_desktop" />
+          <span>{{ $t("Whether to hide the desktop") }}</span
+          ><q-checkbox
+            style="justify-content: flex-start"
+            v-model="hide_desktop_value"
+            @click="send_hide_desktop"
+          />
           <div class="q-space" data-v-39efcd1f=""></div>
           <q-btn
             flat
@@ -174,15 +179,15 @@ export default defineComponent({
     const showDialog = async () => {
       show_dialog.value = true;
     };
-    const send_hide_desktop=()=>{
-      set?.SetBlendingOption(0,hide_desktop_value.value?1:0)
-    }
+    const send_hide_desktop = () => {
+      set?.SetBlendingOption(0, hide_desktop_value.value ? 1 : 0);
+    };
     const config = ref({ col: 0, row: 0 });
     const EnableBlending = ref(false);
     let optionsstr = ref();
     optionsstr.value = "FusionLocale";
-    const hide_desktop_value=ref(true)
-    const hide_desktop_id=ref(0)
+    const hide_desktop_value = ref(true);
+    const hide_desktop_id = ref(0);
     const options = computed({
       get() {
         return optionsstr.value;
@@ -230,8 +235,6 @@ export default defineComponent({
           let tmp = JSON.parse(res ? res.config : "");
           $store.commit("setEnablefusion", tmp.enable);
           $store.commit("setfusion_configuration", res?.config);
-          hide_desktop_id.value=tmp.options[0]
-          hide_desktop_value.value=tmp.options[1]==0?false:true
         });
       } catch (error) {}
     };
@@ -262,6 +265,13 @@ export default defineComponent({
         }
       }, 1000);
     });
+    onMounted(() => {
+      set?.GetBlendingConfig("").then((res) => {
+        let tmp = JSON.parse(res ? res.config : "");
+        hide_desktop_id.value = tmp.options[0];
+        hide_desktop_value.value = tmp.options[1] == 0 ? false : true;
+      });
+    });
     return {
       send_hide_desktop,
       hide_desktop_value,

From 086df914862f543d54bf52efd7259e996b48e8ec Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sat, 14 Jan 2023 13:31:29 +0800
Subject: [PATCH 18/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E7=BC=93=E5=AD=98=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=87=8D=E7=BD=AE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/FourPointCalibration.vue | 4 ++--
 src/components/FusionSettings/SurfaceCorrection.vue    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 71ffb4a..85c3db8 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -314,8 +314,8 @@ export default defineComponent({
 
     const use_server_config = () => {
       for (let index = 0; index < fourpostion.value.length; index++) {
-        defaultfourpostion.value[index].x = fourpostion.value[index].x;
-        defaultfourpostion.value[index].y = fourpostion.value[index].y;
+        // defaultfourpostion.value[index].x = fourpostion.value[index].x;
+        // defaultfourpostion.value[index].y = fourpostion.value[index].y;
         defaultfour.value[index].x = config.point4[index].def_x;
         defaultfour.value[index].y = config.point4[index].def_y;
         four[index].x = config.point4[index].x;
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 4223f03..10c7b54 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -781,8 +781,8 @@ export default defineComponent({
     };
     const use_server_config = () => {
       for (let index = 0; index < defaultninepostion.value.length; index++) {
-        defaultninepostion.value[index].x = ninepostion.value[index].x;
-        defaultninepostion.value[index].y = ninepostion.value[index].y;
+        // defaultninepostion.value[index].x = ninepostion.value[index].x;
+        // defaultninepostion.value[index].y = ninepostion.value[index].y;
         defaultnine.value[index].x = nine[index].x;
         defaultnine.value[index].y = nine[index].y;
         nine[index].x = config.point9[index].x;

From e76fc75f488b1eaff79b9ee24849f4b9ad1fcfd6 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sat, 14 Jan 2023 13:47:01 +0800
Subject: [PATCH 19/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E6=8A=95=E5=BD=B1=E6=9C=BA=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/DensityCorrection.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index ba6d0d9..cd86907 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -502,6 +502,7 @@ export default defineComponent({
         setTimeout(() => {
           ste_status.value = 0;
         }, 100);
+        syncpoint();
       },
       { deep: true }
     );

From c52654e124c9f5ec9b222cee45607c7390062709 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sat, 14 Jan 2023 17:00:48 +0800
Subject: [PATCH 20/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=89=80=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 377 ++++--------------
 .../FusionSettings/FourPointCalibration.vue   |   2 +-
 src/components/FusionSettingsDialog.vue       |  88 ++--
 src/i18n/en-US/index.ts                       |   3 +-
 src/i18n/zh-CN/index.ts                       |   3 +-
 5 files changed, 117 insertions(+), 356 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index cd86907..7f84177 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -2,130 +2,47 @@
   <div class="row">
     <div class="col-1"></div>
     <div class="col-8 q-pt-md">
-      <div
-        ref="div"
-        style="width: 100%; background-color: aquamarine; height: 100%"
-      >
+      <div ref="div" style="width: 100%; background-color: aquamarine; height: 100%">
         <div style="position: absolute">
-          <vue3ResizeDrag
-            :isActive="isactivearray[0]"
-            v-if="isshowarray[0]"
-            :w="30"
-            :h="20"
-            :x="point_postion[0].x"
-            :y="point_postion[0].y"
-            @mousedown="isactivearray[0] = true"
-            :isResizable="false"
-            @moveHandler="moveHandler($event, 0)"
-            ><span>v1</span>
+          <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="20" :x="point_postion[0].x"
+            :y="point_postion[0].y" @mousedown="isactivearray[0] = true" :isResizable="false"
+            @moveHandler="moveHandler($event, 0)"><span>v1</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[1]"
-            v-if="isshowarray[1]"
-            :w="30"
-            :h="20"
-            :x="point_postion[1].x"
-            :y="point_postion[1].y"
-            @mousedown="isactivearray[1] = true"
-            :isResizable="false"
-            @moveHandler="moveHandler($event, 1)"
-            ><span>v2</span>
+          <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="20" :x="point_postion[1].x"
+            :y="point_postion[1].y" @mousedown="isactivearray[1] = true" :isResizable="false"
+            @moveHandler="moveHandler($event, 1)"><span>v2</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[2]"
-            v-if="isshowarray[2]"
-            :w="30"
-            :h="20"
-            :x="point_postion[2].x"
-            :y="point_postion[2].y"
-            @mousedown="isactivearray[2] = true"
-            :isResizable="false"
-            @moveHandler="moveHandler($event, 2)"
-            ><span>v3</span>
+          <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="20" :x="point_postion[2].x"
+            :y="point_postion[2].y" @mousedown="isactivearray[2] = true" :isResizable="false"
+            @moveHandler="moveHandler($event, 2)"><span>v3</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[3]"
-            v-if="isshowarray[3]"
-            :w="30"
-            :h="20"
-            :x="point_postion[3].x"
-            :y="point_postion[3].y"
-            @mousedown="isactivearray[3] = true"
-            :isResizable="false"
-            @moveHandler="moveHandler($event, 3)"
-            ><span>v4</span>
+          <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="20" :x="point_postion[3].x"
+            :y="point_postion[3].y" @mousedown="isactivearray[3] = true" :isResizable="false"
+            @moveHandler="moveHandler($event, 3)"><span>v4</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[4]"
-            v-if="isshowarray[4]"
-            :w="30"
-            :h="20"
-            :x="point_postion[4].x"
-            :y="point_postion[4].y"
-            @mousedown="isactivearray[4] = true"
-            :isResizable="false"
-            @moveHandler="moveHandler($event, 4)"
-            ><span>v5</span>
+          <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="20" :x="point_postion[4].x"
+            :y="point_postion[4].y" @mousedown="isactivearray[4] = true" :isResizable="false"
+            @moveHandler="moveHandler($event, 4)"><span>v5</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[5]"
-            v-if="isshowarray[5]"
-            :w="30"
-            :h="20"
-            :x="point_postion[5].x"
-            :y="point_postion[5].y"
-            @mousedown="isactivearray[5] = true"
-            :isResizable="false"
-            @moveHandler="moveHandler($event, 5)"
-            ><span>h1</span>
+          <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="30" :h="20" :x="point_postion[5].x"
+            :y="point_postion[5].y" @mousedown="isactivearray[5] = true" :isResizable="false"
+            @moveHandler="moveHandler($event, 5)"><span>h1</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[6]"
-            v-if="isshowarray[6]"
-            :w="30"
-            :h="20"
-            :x="point_postion[6].x"
-            :y="point_postion[6].y"
-            @mousedown="isactivearray[6] = true"
-            :isResizable="false"
-            @moveHandler="moveHandler($event, 6)"
-            ><span>h2</span>
+          <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="30" :h="20" :x="point_postion[6].x"
+            :y="point_postion[6].y" @mousedown="isactivearray[6] = true" :isResizable="false"
+            @moveHandler="moveHandler($event, 6)"><span>h2</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[7]"
-            v-if="isshowarray[7]"
-            :w="30"
-            :h="20"
-            :x="point_postion[7].x"
-            :y="point_postion[7].y"
-            @mousedown="isactivearray[7] = true"
-            :isResizable="false"
-            @moveHandler="moveHandler($event, 7)"
-            ><span>h3</span>
+          <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="30" :h="20" :x="point_postion[7].x"
+            :y="point_postion[7].y" @mousedown="isactivearray[7] = true" :isResizable="false"
+            @moveHandler="moveHandler($event, 7)"><span>h3</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[8]"
-            v-if="isshowarray[8]"
-            :w="30"
-            :h="20"
-            :x="point_postion[8].x"
-            :y="point_postion[8].y"
-            @mousedown="isactivearray[8] = true"
-            :isResizable="false"
-            @moveHandler="moveHandler($event, 8)"
-            ><span>h4</span>
+          <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="30" :h="20" :x="point_postion[8].x"
+            :y="point_postion[8].y" @mousedown="isactivearray[8] = true" :isResizable="false"
+            @moveHandler="moveHandler($event, 8)"><span>h4</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[9]"
-            v-if="isshowarray[9]"
-            :w="35"
-            :h="20"
-            :x="point_postion[9].x"
-            :y="point_postion[9].y"
-            @mousedown="isactivearray[9] = true"
-            :isResizable="false"
-            @moveHandler="moveHandler($event, 9)"
-            ><span>h5</span>
+          <vue3ResizeDrag :isActive="isactivearray[9]" v-if="isshowarray[9]" :w="35" :h="20" :x="point_postion[9].x"
+            :y="point_postion[9].y" @mousedown="isactivearray[9] = true" :isResizable="false"
+            @moveHandler="moveHandler($event, 9)"><span>h5</span>
           </vue3ResizeDrag>
         </div>
       </div>
@@ -136,22 +53,9 @@
           <div class="row">
             <div class="col-2"></div>
             <div class="col-8">
-              <q-input
-                @focus="isactivearray[0] = false"
-                filled
-                type="number"
-                class="q-pt-md"
-                :dense="true"
-                v-model="value[0].y"
-                label="y"
-                lazy-rules
-              />
-              <q-btn
-                color="white"
-                @click="reset(0)"
-                text-color="black"
-                :label="$t('reset') + ' v1'"
-              />
+              <q-input @focus="isactivearray[0] = false" filled type="number" class="q-pt-md" :dense="true"
+                v-model="value[0].y" label="y" lazy-rules />
+              <q-btn color="white" @click="reset(0)" text-color="black" :label="$t('reset') + ' v1'" />
             </div>
           </div>
         </div>
@@ -159,22 +63,9 @@
           <div class="row">
             <div class="col-2"></div>
             <div class="col-8">
-              <q-input
-                @focus="isactivearray[1] = false"
-                filled
-                type="number"
-                class="q-pt-md"
-                :dense="true"
-                v-model="value[1].y"
-                label="y"
-                lazy-rules
-              />
-              <q-btn
-                color="white"
-                @click="reset(1)"
-                text-color="black"
-                :label="$t('reset') + ' v2'"
-              />
+              <q-input @focus="isactivearray[1] = false" filled type="number" class="q-pt-md" :dense="true"
+                v-model="value[1].y" label="y" lazy-rules />
+              <q-btn color="white" @click="reset(1)" text-color="black" :label="$t('reset') + ' v2'" />
             </div>
           </div>
         </div>
@@ -182,22 +73,9 @@
           <div class="row">
             <div class="col-2"></div>
             <div class="col-8">
-              <q-input
-                @focus="isactivearray[2] = false"
-                filled
-                type="number"
-                class="q-pt-md"
-                :dense="true"
-                v-model="value[2].y"
-                label="y"
-                lazy-rules
-              />
-              <q-btn
-                color="white"
-                @click="reset(2)"
-                text-color="black"
-                :label="$t('reset') + ' v3'"
-              />
+              <q-input @focus="isactivearray[2] = false" filled type="number" class="q-pt-md" :dense="true"
+                v-model="value[2].y" label="y" lazy-rules />
+              <q-btn color="white" @click="reset(2)" text-color="black" :label="$t('reset') + ' v3'" />
             </div>
           </div>
         </div>
@@ -205,22 +83,9 @@
           <div class="row">
             <div class="col-2"></div>
             <div class="col-8">
-              <q-input
-                @focus="isactivearray[3] = false"
-                filled
-                type="number"
-                class="q-pt-md"
-                :dense="true"
-                v-model="value[3].y"
-                label="y"
-                lazy-rules
-              />
-              <q-btn
-                color="white"
-                @click="reset(3)"
-                text-color="black"
-                :label="$t('reset') + ' v4'"
-              />
+              <q-input @focus="isactivearray[3] = false" filled type="number" class="q-pt-md" :dense="true"
+                v-model="value[3].y" label="y" lazy-rules />
+              <q-btn color="white" @click="reset(3)" text-color="black" :label="$t('reset') + ' v4'" />
             </div>
           </div>
         </div>
@@ -228,22 +93,9 @@
           <div class="row">
             <div class="col-2"></div>
             <div class="col-8">
-              <q-input
-                @focus="isactivearray[4] = false"
-                filled
-                type="number"
-                class="q-pt-md"
-                :dense="true"
-                v-model="value[4].y"
-                label="y"
-                lazy-rules
-              />
-              <q-btn
-                color="white"
-                @click="reset(4)"
-                text-color="black"
-                :label="$t('reset') + ' v5'"
-              />
+              <q-input @focus="isactivearray[4] = false" filled type="number" class="q-pt-md" :dense="true"
+                v-model="value[4].y" label="y" lazy-rules />
+              <q-btn color="white" @click="reset(4)" text-color="black" :label="$t('reset') + ' v5'" />
             </div>
           </div>
         </div>
@@ -253,98 +105,33 @@
     <div class="col-11">
       <div class="row">
         <div class="col-1">
-          <q-input
-            filled
-            @focus="isactivearray[5] = false"
-            type="number"
-            class="q-pt-md"
-            :dense="true"
-            v-model="value[5].x"
-            label="x"
-            lazy-rules
-          />
-          <q-btn
-            color="white"
-            @click="reset(5)"
-            text-color="black"
-            :label="$t('reset') + ' h1'"
-          />
+          <q-input filled @focus="isactivearray[5] = false" type="number" class="q-pt-md" :dense="true"
+            v-model="value[5].x" label="x" lazy-rules />
+          <q-btn color="white" @click="reset(5)" text-color="black" :label="$t('reset') + ' h1'" />
         </div>
         <div class="col-1"></div>
         <div class="col-1">
-          <q-input
-            filled
-            @focus="isactivearray[6] = false"
-            type="number"
-            class="q-pt-md"
-            :dense="true"
-            v-model="value[6].x"
-            label="x"
-            lazy-rules
-          />
-          <q-btn
-            color="white"
-            @click="reset(6)"
-            text-color="black"
-            :label="$t('reset') + ' h2'"
-          />
+          <q-input filled @focus="isactivearray[6] = false" type="number" class="q-pt-md" :dense="true"
+            v-model="value[6].x" label="x" lazy-rules />
+          <q-btn color="white" @click="reset(6)" text-color="black" :label="$t('reset') + ' h2'" />
         </div>
         <div class="col-1"></div>
         <div class="col-1">
-          <q-input
-            filled
-            @focus="isactivearray[7] = false"
-            type="number"
-            class="q-pt-md"
-            :dense="true"
-            v-model="value[7].x"
-            label="x"
-            lazy-rules
-          />
-          <q-btn
-            color="white"
-            @click="reset(7)"
-            text-color="black"
-            :label="$t('reset') + ' h3'"
-          />
+          <q-input filled @focus="isactivearray[7] = false" type="number" class="q-pt-md" :dense="true"
+            v-model="value[7].x" label="x" lazy-rules />
+          <q-btn color="white" @click="reset(7)" text-color="black" :label="$t('reset') + ' h3'" />
         </div>
         <div class="col-1"></div>
         <div class="col-1">
-          <q-input
-            filled
-            @focus="isactivearray[8] = false"
-            type="number"
-            class="q-pt-md"
-            :dense="true"
-            v-model="value[8].x"
-            label="x"
-            lazy-rules
-          />
-          <q-btn
-            color="white"
-            @click="reset(8)"
-            text-color="black"
-            :label="$t('reset') + ' h4'"
-          />
+          <q-input filled @focus="isactivearray[8] = false" type="number" class="q-pt-md" :dense="true"
+            v-model="value[8].x" label="x" lazy-rules />
+          <q-btn color="white" @click="reset(8)" text-color="black" :label="$t('reset') + ' h4'" />
         </div>
         <div class="col-1"></div>
         <div class="col-1">
-          <q-input
-            filled
-            @focus="isactivearray[9] = false"
-            type="number"
-            class="q-pt-md"
-            :dense="true"
-            v-model="value[9].x"
-            label="x"
-            lazy-rules
-          />
-          <q-btn
-            color="white"
-            @click="reset(9)"
-            text-color="black"
-            :label="$t('reset') + ' h5'"
-          />
+          <q-input filled @focus="isactivearray[9] = false" type="number" class="q-pt-md" :dense="true"
+            v-model="value[9].x" label="x" lazy-rules />
+          <q-btn color="white" @click="reset(9)" text-color="black" :label="$t('reset') + ' h5'" />
         </div>
         <div class="col-1"></div>
         <div class="col-1 q-pt-xl">
@@ -360,7 +147,9 @@
   </div>
 </template>
 
-<style scoped></style>
+<style scoped>
+
+</style>
 <script lang="ts">
 import {
   defineComponent,
@@ -668,24 +457,26 @@ export default defineComponent({
     onMounted(() => {
       window.onresize = () => {
         return (() => {
-          initialization();
-          Proportion.value.x = config.width / (div.value.offsetWidth - 25);
-          Proportion.value.y = config.height / (div.value.offsetHeight - 25);
-          let Width = (div.value.offsetWidth - 25) / 4;
-          let Height = (div.value.offsetHeight - 25) / 4;
-          for (
-            let index = 0;
-            index < config.hor_density.length + config.ver_density.length;
-            index++
-          ) {
-            if (index < 5) {
-              point_postion[index].y = default_location[index].y =
-                Height * index;
-              point_postion[index].x = default_location[index].x = Width * 2;
-            } else {
-              point_postion[index].y = default_location[index].y = Height * 2;
-              point_postion[index].x = default_location[index].x =
-                Width * (index - 5);
+          if (div != null) {
+            initialization();
+            Proportion.value.x = config.width / (div.value.offsetWidth - 25);
+            Proportion.value.y = config.height / (div.value.offsetHeight - 25);
+            let Width = (div.value.offsetWidth - 25) / 4;
+            let Height = (div.value.offsetHeight - 25) / 4;
+            for (
+              let index = 0;
+              index < config.hor_density.length + config.ver_density.length;
+              index++
+            ) {
+              if (index < 5) {
+                point_postion[index].y = default_location[index].y =
+                  Height * index;
+                point_postion[index].x = default_location[index].x = Width * 2;
+              } else {
+                point_postion[index].y = default_location[index].y = Height * 2;
+                point_postion[index].x = default_location[index].x =
+                  Width * (index - 5);
+              }
             }
           }
         })();
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 85c3db8..aa86ce7 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -625,7 +625,7 @@ export default defineComponent({
       window.onresize = () => {
         return (() => {
           ste_status.value = 1;
-          setpoa();
+          if(div!=null)setpoa();
 
           setTimeout(() => {
             ste_status.value = 0;
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 87f61a8..03a71d1 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -1,15 +1,11 @@
 <template>
-  <q-dialog
-    persistent
-    v-model="show_dialog"
-    @keydown="
+  <q-dialog persistent v-model="show_dialog" @keydown="
     (evt: any) => {
       if (evt.keyCode == 27) {
         show_dialog = false;
       }
     }
-  "
-  >
+  ">
     <q-card class="" style="max-width: 90vw">
       <q-form>
         <q-card-section class="q-ma-none q-pa-sm">
@@ -19,14 +15,7 @@
             </div>
 
             <q-space />
-            <q-btn
-              flat
-              round
-              icon="close"
-              color="red"
-              @click="clear()"
-              v-close-popup
-            >
+            <q-btn flat round icon="close" color="red" @click="clear()" v-close-popup>
               <q-tooltip>
                 {{ $t("close") }}
               </q-tooltip>
@@ -38,36 +27,25 @@
         <q-separator />
         <!-- height: 80vh -->
         <q-card-section class="scroll" style="width: 80vw">
-          <div
-            class="row"
-            style="border: 1px solid #b0bec5; text-align: center"
-          >
+          <div class="row" style="border: 1px solid #b0bec5; text-align: center">
             <div class="col-3" style="border-right: 1px solid #b0bec5">
               <p class="text-center">{{ $t("Projector") }}</p>
               <!-- row 在前col在后 -->
               <div v-for="(item, index_row) in config.row">
-                <projector-item
-                  v-for="(item, index_col) in config.col"
-                  class="w-100"
-                  :llabel="
-                    $t('Projector') + (index_row * config.col + index_col + 1)
-                  "
-                  :lvalue="index_row + '/' + index_col"
-                ></projector-item>
+                <projector-item v-for="(item, index_col) in config.col" class="w-100" :llabel="
+                  $t('Projector') + (index_row * config.col + index_col + 1)
+                " :lvalue="index_row + '/' + index_col"></projector-item>
               </div>
 
               <div class="col-12" style="text-align: center">
-                {{ $t("Whether to enable integration")
+                {{
+                  $t("Whether to enable integration")
                 }}<q-checkbox v-model="EnableBlending" />
               </div>
             </div>
             <div class="col-9">
               <div class="q-ta-md">
-                <q-btn-toggle
-                  :disable="!$store.state.enablefusion"
-                  no-caps
-                  v-model="options"
-                  toggle-color="primary"
+                <q-btn-toggle :disable="!$store.state.enablefusion" no-caps v-model="options" toggle-color="primary"
                   :options="[
                     { label: $t('FusionLocale'), value: 'FusionLocale' },
                     {
@@ -83,11 +61,10 @@
                       value: 'DensityCorrection',
                     },
                     // { label: $t('GridSettings'), value: 'GridSettings' },
-                  ]"
-                />
+                  ]" />
               </div>
               <div style="min-height: 72vh">
-                <component :is="options" />
+                <component  :is="options" />
               </div>
             </div>
           </div>
@@ -96,29 +73,14 @@
         <q-separator />
 
         <q-card-actions align="right">
-          <span>{{ $t("Whether to hide the desktop") }}</span
-          ><q-checkbox
-            style="justify-content: flex-start"
-            v-model="hide_desktop_value"
-            @click="send_hide_desktop"
-          />
+          <span>{{ $t("Whether to hide the desktop") }}</span><q-checkbox style="justify-content: flex-start"
+            v-model="hide_desktop_value" @click="send_hide_desktop" />
+            <div class="q-space" data-v-39efcd1f=""></div>
+          <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall config')" />
           <div class="q-space" data-v-39efcd1f=""></div>
-          <q-btn
-            flat
-            :label="$t('Cancel')"
-            no-caps
-            color="primary"
-            v-close-popup
-            @click="$store.commit('setSelectedProjector', '0/0')"
-          />
-          <q-btn
-            flat
-            :label="$t('save config')"
-            no-caps
-            color="primary"
-            @click="save"
-            v-close-popup
-          />
+          <q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup
+            @click="$store.commit('setSelectedProjector', '0/0')" />
+          <q-btn flat :label="$t('save config')" no-caps color="primary" @click="save" v-close-popup />
         </q-card-actions>
       </q-form>
     </q-card>
@@ -182,6 +144,9 @@ export default defineComponent({
     const send_hide_desktop = () => {
       set?.SetBlendingOption(0, hide_desktop_value.value ? 1 : 0);
     };
+    const resetall=()=>{
+      set?.ResetBlendingConfig()
+    }
     const config = ref({ col: 0, row: 0 });
     const EnableBlending = ref(false);
     let optionsstr = ref();
@@ -230,13 +195,12 @@ export default defineComponent({
     };
     const getconfig = () => {
       try {
-        set?.GetBlendingConfig("").then((res) => {});
         set?.GetBlendingConfig("").then((res) => {
           let tmp = JSON.parse(res ? res.config : "");
           $store.commit("setEnablefusion", tmp.enable);
           $store.commit("setfusion_configuration", res?.config);
         });
-      } catch (error) {}
+      } catch (error) { }
     };
     const clear = () => {
       $store.commit("setSelectedProjector", "0/0");
@@ -266,11 +230,14 @@ export default defineComponent({
       }, 1000);
     });
     onMounted(() => {
-      set?.GetBlendingConfig("").then((res) => {
+      setTimeout(() => {
+        set?.GetBlendingConfig("").then((res) => {
         let tmp = JSON.parse(res ? res.config : "");
         hide_desktop_id.value = tmp.options[0];
         hide_desktop_value.value = tmp.options[1] == 0 ? false : true;
+        console.log(tmp)
       });
+      }, 1000);
     });
     return {
       send_hide_desktop,
@@ -283,6 +250,7 @@ export default defineComponent({
       EnableBlending,
       config,
       save,
+      resetall
     };
   },
 });
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 01fc330..c635144 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -424,5 +424,6 @@ export default {
   "resetall":"reset all",
   "save config":"save config",
   "Whether to enable integration":"Whether to enable integration",
-  "Whether to hide the desktop":"Whether to hide the desktop"
+  "Whether to hide the desktop":"Whether to hide the desktop",
+  "resetall config":"resetall config",
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 40142e7..a05f97f 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -693,5 +693,6 @@ export default {
   "resetall":"重置所有",
   "save config":"保存配置",
   "Whether to enable integration":"是否启用融合",
-  "Whether to hide the desktop":"是否隐藏桌面"
+  "Whether to hide the desktop":"是否隐藏桌面",
+  "resetall config":"重置所有配置",
 };

From 066d97efb16228fa426aea0be843abaa95452193 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sat, 14 Jan 2023 17:49:41 +0800
Subject: [PATCH 21/78] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=BE=AE=E8=B0=83=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/FusionLocale.vue           | 181 +++++++-----------
 1 file changed, 72 insertions(+), 109 deletions(-)

diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 6ea453a..a1910ba 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -8,30 +8,18 @@
             <div class="col-4 offset-4">
               <div class="row">
                 <div class="col-3">
-                  <q-toggle
-                    class="float-right"
-                    v-model="array[0].isshow"
-                    label=""
-                  />
+                  <q-toggle class="float-right" v-model="array[0].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input
-                    filled
-                    type="number"
-                    :autofocus="group == 0"
-                    :bg-color="group == 0 ? 'cyan-1' : ''"
-                    @focus="group = 0"
-                    v-model="array[0].value"
-                    :label="$t('upper fusion zone parameters')"
-                    lazy-rules
+                  <q-input filled type="number" :autofocus="group == 0" :bg-color="group == 0 ? 'cyan-1' : ''"
+                    @focus="group = 0" v-model="array[0].value" :label="$t('upper fusion zone parameters')" lazy-rules
                     :rules="[
                       (val) =>
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
                         (val > -1 && val < 1080) || $t('Please enter 0-100'),
-                    ]"
-                  />
+                    ]" />
                 </div>
               </div>
             </div>
@@ -42,60 +30,36 @@
             <div class="col-6">
               <div class="row">
                 <div class="col-3">
-                  <q-toggle
-                    class="float-right"
-                    v-model="array[1].isshow"
-                    label=""
-                  />
+                  <q-toggle class="float-right" v-model="array[1].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input
-                    filled
-                    type="number"
-                    :autofocus="group == 1"
-                    :bg-color="group == 1 ? 'cyan-1' : ''"
-                    @focus="group = 1"
-                    v-model="array[1].value"
-                    :label="$t('Left fusion Band Parameters')"
-                    lazy-rules
+                  <q-input filled type="number" :autofocus="group == 1" :bg-color="group == 1 ? 'cyan-1' : ''"
+                    @focus="group = 1" v-model="array[1].value" :label="$t('Left fusion Band Parameters')" lazy-rules
                     :rules="[
                       (val) =>
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
                         (val > -1 && val < 1920) || $t('Please enter 0-100'),
-                    ]"
-                  />
+                    ]" />
                 </div>
               </div>
             </div>
             <div class="col-6">
               <div class="row">
                 <div class="col-3">
-                  <q-toggle
-                    class="float-right"
-                    v-model="array[2].isshow"
-                    label=""
-                  />
+                  <q-toggle class="float-right" v-model="array[2].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input
-                    filled
-                    type="number"
-                    :autofocus="group == 2"
-                    :bg-color="group == 2 ? 'cyan-1' : ''"
-                    @focus="group = 2"
-                    v-model="array[2].value"
-                    :label="$t('Right fusion Band Parameters')"
-                    lazy-rules
+                  <q-input filled type="number" :autofocus="group == 2" :bg-color="group == 2 ? 'cyan-1' : ''"
+                    @focus="group = 2" v-model="array[2].value" :label="$t('Right fusion Band Parameters')" lazy-rules
                     :rules="[
                       (val) =>
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
                         (val > -1 && val < 1920) || $t('Please enter 0-100'),
-                    ]"
-                  />
+                    ]" />
                 </div>
               </div>
             </div>
@@ -106,30 +70,18 @@
             <div class="col-4 offset-4">
               <div class="row">
                 <div class="col-3">
-                  <q-toggle
-                    class="float-right"
-                    v-model="array[3].isshow"
-                    label=""
-                  />
+                  <q-toggle class="float-right" v-model="array[3].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input
-                    filled
-                    type="number"
-                    :autofocus="group == 3"
-                    :bg-color="group == 3 ? 'cyan-1' : ''"
-                    @focus="group = 3"
-                    v-model="array[3].value"
-                    :label="$t('Lower fusion Zone Parameters')"
-                    lazy-rules
+                  <q-input filled type="number" :autofocus="group == 3" :bg-color="group == 3 ? 'cyan-1' : ''"
+                    @focus="group = 3" v-model="array[3].value" :label="$t('Lower fusion Zone Parameters')" lazy-rules
                     :rules="[
                       (val) =>
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
                         (val > -1 && val < 1080) || $t('Please enter 0-100'),
-                    ]"
-                  />
+                    ]" />
                 </div>
               </div>
             </div>
@@ -141,59 +93,33 @@
       <p class="text-center">{{ $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"
-            vertical
-            reverse
-            label-always
-          />
+          <div><q-icon size="1.5rem" name="arrow_upward" @click="add('alpha')"></q-icon></div>
+          <q-slider v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
+            vertical reverse label-always />
+          <div><q-icon size="1.5rem" name="south"  @click="reduce('alpha')"></q-icon></div>
           <p class="text-center">alpha</p>
         </div>
 
         <div>
-          <q-slider
-            v-model="array[group].p"
-            :min="0"
-            @change="chang('p')"
-            :max="2.5"
-            :step="0.01"
-            color="green"
-            vertical
-            reverse
-            label-always
-          />
+          <div><q-icon size="1.5rem" name="arrow_upward" @click="add('p')"></q-icon></div>
+          <q-slider v-model="array[group].p" :min="0" @change="chang('p')" :max="2.5" :step="0.01" color="green"
+            vertical reverse label-always />
+          <div><q-icon size="1.5rem" name="south"  @click="reduce('p')"></q-icon></div>
           <p class="text-center">p</p>
         </div>
 
         <div>
-          <q-slider
-            v-model="array[group].gamma"
-            :min="0"
-            @change="chang('gamma')"
-            :max="2.5"
-            :step="0.01"
-            color="green"
-            vertical
-            reverse
-            label-always
-          />
+          <div><q-icon size="1.5rem" name="arrow_upward" @click="add('gamma')" ></q-icon></div>
+          <q-slider v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="2.5" :step="0.01" color="green"
+            vertical reverse label-always />
+          <div><q-icon size="1.5rem" name="south" @click="reduce('gamma')"></q-icon></div>
           <p class="text-center">gamma</p>
         </div>
       </div>
     </div>
   </div>
   <div>
-    <q-btn
-      color="white"
-      @click="resetall"
-      text-color="black"
-      :label="$t('resetall')"
-    />
+    <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
   </div>
 </template>
 
@@ -218,6 +144,7 @@ import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
 import GlobalData from "src/common/GlobalData";
 import { number } from "@intlify/core-base";
+import { switchCase } from "@babel/types";
 
 export default defineComponent({
   name: "ComponentFusionLocale",
@@ -244,6 +171,40 @@ export default defineComponent({
         $store.getters.GetTheCurrentlySelectedCamera[1]
       );
     });
+    const add = (type: string) => {
+      let tmp:Number;
+      tmp=0.01;
+      switch (type) {
+        case "alpha":
+        array[group.value].alpha=Number((array[group.value].alpha+=tmp).toFixed(2))
+          break;
+        case "p":
+        array[group.value].p=Number((array[group.value].p+=tmp).toFixed(2))
+          break;
+        case "gamma":
+        array[group.value].gamma=Number((array[group.value].gamma+=tmp).toFixed(2))
+          break;
+        default:
+          break;
+      }
+    }
+    const reduce = (type: string) => {
+      let tmp:Number;
+      tmp=-0.01;
+      switch (type) {
+        case "alpha":
+        array[group.value].alpha=Number((array[group.value].alpha+=tmp).toFixed(2))
+          break;
+        case "p":
+        array[group.value].p=Number((array[group.value].p+=tmp).toFixed(2))
+          break;
+        case "gamma":
+        array[group.value].gamma=Number((array[group.value].gamma+=tmp).toFixed(2))
+          break;
+        default:
+          break;
+      }
+    }
     const ste_status = ref(0);
     const use_set_cache = () => {
       if (set_cache.value[selectedprojector.value] != null) {
@@ -357,9 +318,9 @@ export default defineComponent({
       ste_status.value = 1;
       config = JSON.parse(JSON.stringify(fortmp));
       for (let index = 0; index < array.length - 1; index++) {
-        array[arr[index]].gamma = config.params[index].gamma.toFixed(2);
-        array[arr[index]].alpha = config.params[index].alpha.toFixed(2);
-        array[arr[index]].p = config.params[index].power.toFixed(2);
+        array[arr[index]].gamma = Number(config.params[index].gamma.toFixed(2));
+        array[arr[index]].alpha = Number(config.params[index].alpha.toFixed(2));
+        array[arr[index]].p = Number(config.params[index].power.toFixed(2));
         array[arr[index]].isshow = config.params[index].enable;
         array[arr[index]].value = Number(config.params[index].size);
       }
@@ -371,9 +332,9 @@ export default defineComponent({
     };
     const startconfig = () => {
       for (let index = 0; index < array.length - 1; index++) {
-        array[arr[index]].gamma = config.params[index].gamma.toFixed(2);
-        array[arr[index]].alpha = config.params[index].alpha.toFixed(2);
-        array[arr[index]].p = config.params[index].power.toFixed(2);
+        array[arr[index]].gamma = Number(config.params[index].gamma.toFixed(2));
+        array[arr[index]].alpha = Number(config.params[index].alpha.toFixed(2));
+        array[arr[index]].p = Number(config.params[index].power.toFixed(2));
         array[arr[index]].isshow = config.params[index].enable;
         array[arr[index]].value = Number(config.params[index].size);
       }
@@ -551,6 +512,8 @@ export default defineComponent({
       selectedprojector,
       resetall,
       set_cache,
+      reduce,
+      add
     };
   },
 });

From bc64cbceff89fbd73121687a632817f538e2b320 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sat, 14 Jan 2023 19:34:21 +0800
Subject: [PATCH 22/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=AE=E8=B0=83bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/FusionLocale.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index a1910ba..5dced7e 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -93,26 +93,26 @@
       <p class="text-center">{{ $t("Set Fusion Band Parameters") }}</p>
       <div style="display: flex; justify-content: space-evenly">
         <div>
-          <div><q-icon size="1.5rem" name="arrow_upward" @click="add('alpha')"></q-icon></div>
+          <div><q-btn color="white" @click="add('alpha')" text-color="black" label="↑" /></div>
           <q-slider v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
             vertical reverse label-always />
-          <div><q-icon size="1.5rem" name="south"  @click="reduce('alpha')"></q-icon></div>
+            <div><q-btn color="white" @click="reduce('alpha')" text-color="black" label="↓" /></div>
           <p class="text-center">alpha</p>
         </div>
 
         <div>
-          <div><q-icon size="1.5rem" name="arrow_upward" @click="add('p')"></q-icon></div>
+          <div><q-btn color="white" @click="add('p')" text-color="black" label="↑" /></div>
           <q-slider v-model="array[group].p" :min="0" @change="chang('p')" :max="2.5" :step="0.01" color="green"
             vertical reverse label-always />
-          <div><q-icon size="1.5rem" name="south"  @click="reduce('p')"></q-icon></div>
+            <div><q-btn color="white" @click="reduce('p')" text-color="black" label="↓" /></div>
           <p class="text-center">p</p>
         </div>
 
         <div>
-          <div><q-icon size="1.5rem" name="arrow_upward" @click="add('gamma')" ></q-icon></div>
+          <div><q-btn color="white" @click="add('gamma')" text-color="black" label="↑" /></div>
           <q-slider v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="2.5" :step="0.01" color="green"
             vertical reverse label-always />
-          <div><q-icon size="1.5rem" name="south" @click="reduce('gamma')"></q-icon></div>
+            <div><q-btn color="white" @click="reduce('gamma')" text-color="black" label="↓" /></div>
           <p class="text-center">gamma</p>
         </div>
       </div>
@@ -345,9 +345,9 @@ export default defineComponent({
     };
     const use_server_config = () => {
       for (let index = 0; index < array.length - 1; index++) {
-        array[arr[index]].gamma = config.params[index].gamma.toFixed(2);
-        array[arr[index]].alpha = config.params[index].alpha.toFixed(2);
-        array[arr[index]].p = config.params[index].power.toFixed(2);
+        array[arr[index]].gamma = Number(config.params[index].gamma.toFixed(2));
+        array[arr[index]].alpha = Number(config.params[index].alpha.toFixed(2));
+        array[arr[index]].p = Number(config.params[index].power.toFixed(2));
         array[arr[index]].isshow = config.params[index].enable;
         array[arr[index]].value = Number(config.params[index].size);
       }

From ddb5e158005ee5b6efc5623d1bc8c04e69dce5cb Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sat, 14 Jan 2023 19:52:05 +0800
Subject: [PATCH 23/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=A1=8C=E9=9D=A2=E6=95=B0=E6=8D=AE=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 03a71d1..ae8c6ce 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -233,9 +233,9 @@ export default defineComponent({
       setTimeout(() => {
         set?.GetBlendingConfig("").then((res) => {
         let tmp = JSON.parse(res ? res.config : "");
-        hide_desktop_id.value = tmp.options[0];
-        hide_desktop_value.value = tmp.options[1] == 0 ? false : true;
-        console.log(tmp)
+        hide_desktop_id.value = tmp.options[0][0];
+        hide_desktop_value.value = tmp.options[0][1] == 0 ? false : true;
+        //console.log(tmp.options[0][1])
       });
       }, 1000);
     });

From ee96b91aefe81e0a5f713f65bbd992db58695a27 Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Tue, 17 Jan 2023 19:18:57 +0800
Subject: [PATCH 24/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E8=9E=8D=E5=90=88=E5=8F=82=E6=95=B0=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 301 +++++++++++++-----------
 src/entities/WSProtocol.ts              |   2 +-
 src/i18n/en-US/index.ts                 |   1 +
 src/i18n/zh-CN/index.ts                 |   1 +
 4 files changed, 163 insertions(+), 142 deletions(-)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index ae8c6ce..0a2d564 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -75,6 +75,9 @@
         <q-card-actions align="right">
           <span>{{ $t("Whether to hide the desktop") }}</span><q-checkbox style="justify-content: flex-start"
             v-model="hide_desktop_value" @click="send_hide_desktop" />
+          <span>{{ $t("disable blending params") }}</span>
+          <q-checkbox style="justify-content: flex-start"
+            v-model="disable_blending_params" @click="send_disable_blending_params" />
             <div class="q-space" data-v-39efcd1f=""></div>
           <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall config')" />
           <div class="q-space" data-v-39efcd1f=""></div>
@@ -98,7 +101,7 @@
 </style>
 
 <script lang="ts">
-import {
+  import {
   defineComponent,
   ref,
   Ref,
@@ -106,152 +109,168 @@ import {
   computed,
   onMounted,
   onBeforeMount,
-} from "vue";
-import { useStore } from "src/store";
-import { useQuasar, copyToClipboard } from "quasar";
-import { useI18n } from "vue-i18n";
-import GlobalData from "src/common/GlobalData";
-import { Protocol } from "src/entities/WSProtocol";
-import { EDeviceAttribute } from "src/entities/EDeviceAttribute";
+  } from "vue";
+  import { useStore } from "src/store";
+  import { useQuasar, copyToClipboard } from "quasar";
+  import { useI18n } from "vue-i18n";
+  import GlobalData from "src/common/GlobalData";
+  import { Protocol } from "src/entities/WSProtocol";
+  import { EDeviceAttribute } from "src/entities/EDeviceAttribute";
 
-import ProjectorItem from "src/components/FusionSettings/ProjectorItem.vue";
+  import ProjectorItem from "src/components/FusionSettings/ProjectorItem.vue";
 
-import FusionLocale from "src/components/FusionSettings/FusionLocale.vue";
-import FourPointCalibration from "src/components/FusionSettings/FourPointCalibration.vue";
-import GridSettings from "src/components/FusionSettings/GridSettings.vue";
-import SurfaceCorrection from "src/components/FusionSettings/SurfaceCorrection.vue";
-import DensityCorrection from "src/components/FusionSettings/DensityCorrection.vue";
+  import FusionLocale from "src/components/FusionSettings/FusionLocale.vue";
+  import FourPointCalibration from "src/components/FusionSettings/FourPointCalibration.vue";
+  import GridSettings from "src/components/FusionSettings/GridSettings.vue";
+  import SurfaceCorrection from "src/components/FusionSettings/SurfaceCorrection.vue";
+  import DensityCorrection from "src/components/FusionSettings/DensityCorrection.vue";
 
-export default defineComponent({
+  export default defineComponent({
   name: "ComponentFusionSettingsDialog",
   components: {
-    ProjectorItem,
-    FusionLocale,
-    FourPointCalibration,
-    GridSettings,
-    SurfaceCorrection,
-    DensityCorrection,
+  ProjectorItem,
+  FusionLocale,
+  FourPointCalibration,
+  GridSettings,
+  SurfaceCorrection,
+  DensityCorrection,
   },
   setup() {
-    let set = GlobalData.getInstance().getCurrentClient();
-    let $store = useStore();
-    let $q = useQuasar();
-    let $t = useI18n();
-    let show_dialog = ref(false);
-    const showDialog = async () => {
-      show_dialog.value = true;
-    };
-    const send_hide_desktop = () => {
-      set?.SetBlendingOption(0, hide_desktop_value.value ? 1 : 0);
-    };
-    const resetall=()=>{
-      set?.ResetBlendingConfig()
-    }
-    const config = ref({ col: 0, row: 0 });
-    const EnableBlending = ref(false);
-    let optionsstr = ref();
-    optionsstr.value = "FusionLocale";
-    const hide_desktop_value = ref(true);
-    const hide_desktop_id = ref(0);
-    const options = computed({
-      get() {
-        return optionsstr.value;
-      },
-      set(newValue) {
-        optionsstr.value = newValue;
-      },
-    });
-    watch(
-      () => EnableBlending,
-      (newVal, oldVal) => {
-        $store.commit("setEnablefusion", newVal.value);
-        set?.EnableBlending(newVal.value);
-      },
-      { deep: true }
-    );
-
-    const erroe = () => {
-      $q.notify({
-        color: "negative",
-        icon: "warning",
-        message: "数据获取失败!",
-        position: "top",
-        timeout: 1500,
-      });
-    };
-    const save = () => {
-      set?.SaveBlendingConfig("");
-      show_dialog.value = false;
-      clear();
-      set?.GetBlendingConfig("").then((res) => {
-        let tmp = JSON.parse(res ? res.config : "");
-        EnableBlending.value = tmp.enable;
-        $store.commit("setEnablefusion", tmp.enable);
-        config.value.col = tmp.col;
-        config.value.row = tmp.row;
-        $store.commit("setfusion_configuration", res?.config);
-      });
-      $store.commit("setSelectedProjector", "0/0");
-    };
-    const getconfig = () => {
-      try {
-        set?.GetBlendingConfig("").then((res) => {
-          let tmp = JSON.parse(res ? res.config : "");
-          $store.commit("setEnablefusion", tmp.enable);
-          $store.commit("setfusion_configuration", res?.config);
-        });
-      } catch (error) { }
-    };
-    const clear = () => {
-      $store.commit("setSelectedProjector", "0/0");
-      setTimeout(() => {
-        sessionStorage.removeItem("FusionLocale");
-        sessionStorage.removeItem("SurfaceCorrection");
-        sessionStorage.removeItem("DensityCorrection");
-        sessionStorage.removeItem("FourPointCalibration");
-      }, 500);
-      getconfig();
-    };
-
-    onBeforeMount(() => {
-      setTimeout(() => {
-        try {
-          set?.GetBlendingConfig("").then((res) => {
-            let tmp = JSON.parse(res ? res.config : "");
-            EnableBlending.value = tmp.enable;
-            $store.commit("setEnablefusion", tmp.enable);
-            config.value.col = tmp.col;
-            config.value.row = tmp.row;
-            $store.commit("setfusion_configuration", res?.config);
-          });
-        } catch (error) {
-          erroe();
-        }
-      }, 1000);
-    });
-    onMounted(() => {
-      setTimeout(() => {
-        set?.GetBlendingConfig("").then((res) => {
-        let tmp = JSON.parse(res ? res.config : "");
-        hide_desktop_id.value = tmp.options[0][0];
-        hide_desktop_value.value = tmp.options[0][1] == 0 ? false : true;
-        //console.log(tmp.options[0][1])
-      });
-      }, 1000);
-    });
-    return {
-      send_hide_desktop,
-      hide_desktop_value,
-      clear,
-      show_dialog,
-      options,
-      copyToClipboard,
-      showDialog,
-      EnableBlending,
-      config,
-      save,
-      resetall
-    };
+  let set = GlobalData.getInstance().getCurrentClient();
+  let $store = useStore();
+  let $q = useQuasar();
+  let $t = useI18n();
+  let show_dialog = ref(false);
+  const showDialog = async () => {
+  show_dialog.value = true;
+  };
+  const send_hide_desktop = () => {
+  set?.SetBlendingOption(0, hide_desktop_value.value ? 1 : 0);
+  };
+  const send_disable_blending_params = () => {
+  set?.SetBlendingOption(1, disable_blending_params.value ? 1 : 0);
+  };
+  const resetall=()=>{
+  set?.ResetBlendingConfig()
+  }
+  const config = ref({ col: 0, row: 0 });
+  const EnableBlending = ref(false);
+  let optionsstr = ref();
+  optionsstr.value = "FusionLocale";
+  const hide_desktop_value = ref(true);
+  const disable_blending_params = ref(false);
+  const options = computed({
+  get() {
+  return optionsstr.value;
   },
-});
+  set(newValue) {
+  optionsstr.value = newValue;
+  },
+  });
+  watch(
+  () => EnableBlending,
+  (newVal, oldVal) => {
+  $store.commit("setEnablefusion", newVal.value);
+  set?.EnableBlending(newVal.value);
+  },
+  { deep: true }
+  );
+
+  const erroe = () => {
+  $q.notify({
+  color: "negative",
+  icon: "warning",
+  message: "数据获取失败!",
+  position: "top",
+  timeout: 1500,
+  });
+  };
+  const save = () => {
+  set?.SaveBlendingConfig("");
+  show_dialog.value = false;
+  clear();
+  set?.GetBlendingConfig("").then((res) => {
+  let tmp = JSON.parse(res ? res.config : "");
+  EnableBlending.value = tmp.enable;
+  $store.commit("setEnablefusion", tmp.enable);
+  config.value.col = tmp.col;
+  config.value.row = tmp.row;
+  $store.commit("setfusion_configuration", res?.config);
+  });
+  $store.commit("setSelectedProjector", "0/0");
+  };
+  const getconfig = () => {
+  try {
+  set?.GetBlendingConfig("").then((res) => {
+  let tmp = JSON.parse(res ? res.config : "");
+  $store.commit("setEnablefusion", tmp.enable);
+  $store.commit("setfusion_configuration", res?.config);
+  });
+  } catch (error) { }
+  };
+  const clear = () => {
+  $store.commit("setSelectedProjector", "0/0");
+  setTimeout(() => {
+  sessionStorage.removeItem("FusionLocale");
+  sessionStorage.removeItem("SurfaceCorrection");
+  sessionStorage.removeItem("DensityCorrection");
+  sessionStorage.removeItem("FourPointCalibration");
+  }, 500);
+  getconfig();
+  };
+
+  onBeforeMount(() => {
+  setTimeout(() => {
+  try {
+  set?.GetBlendingConfig("").then((res) => {
+  let tmp = JSON.parse(res ? res.config : "");
+  EnableBlending.value = tmp.enable;
+  $store.commit("setEnablefusion", tmp.enable);
+  config.value.col = tmp.col;
+  config.value.row = tmp.row;
+  $store.commit("setfusion_configuration", res?.config);
+  });
+  } catch (error) {
+  erroe();
+  }
+  }, 1000);
+  });
+  onMounted(() => {
+  setTimeout(() => {
+  set?.GetBlendingConfig("").then((res) => {
+  let tmp = JSON.parse(res ? res.config : "");
+  //console.log(tmp.options[0][1])
+  let local_options = [ [ref(0), hide_desktop_value], [ref(1), disable_blending_params] ];
+  let k:any;
+  for(k in local_options) {
+    let local_opt = local_options[k];
+    let ii:any;
+    for(ii in tmp.options){
+      let opt = tmp.options[ii];
+      if (2 == opt.length && local_opt[0].value == opt[0]){
+        local_opt[1].value = (opt[1] == 0 ? false : true);
+        break;
+      }
+    }
+  }
+  });
+  }, 1000);
+  });
+  return {
+  send_hide_desktop,
+  hide_desktop_value,
+  send_disable_blending_params,
+  disable_blending_params,
+  clear,
+  show_dialog,
+  options,
+  copyToClipboard,
+  showDialog,
+  EnableBlending,
+  config,
+  save,
+  resetall
+  };
+  },
+  });
 </script>
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index 5f88bf8..ec7d2f3 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -657,7 +657,7 @@ export namespace Protocol {
       Commands.kSaveBlendingConfig,
       Commands.kSetBlendingHorDensity,
       Commands.kSetBlendingVerDensity,
-      Commands.kResetBlending,
+      Commands.kResetBlending,
       Commands.kSetBlendingOption,
     ]);
     public static get AllCommands() {
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index c635144..93a3f87 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -426,4 +426,5 @@ export default {
   "Whether to enable integration":"Whether to enable integration",
   "Whether to hide the desktop":"Whether to hide the desktop",
   "resetall config":"resetall config",
+  "disable blending params":"Dsable blending params",
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index a05f97f..334ebc5 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -695,4 +695,5 @@ export default {
   "Whether to enable integration":"是否启用融合",
   "Whether to hide the desktop":"是否隐藏桌面",
   "resetall config":"重置所有配置",
+  "disable blending params":"禁用融合参数",
 };

From 1862b885b3848a47c5d3f52b269a6e41f25ba0d4 Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Wed, 18 Jan 2023 18:00:17 +0800
Subject: [PATCH 25/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=9E=8D=E5=90=88=E7=BD=91=E6=A0=BC=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 29 ++++++++++++++++---------
 src/i18n/en-US/index.ts                 |  1 +
 src/i18n/zh-CN/index.ts                 |  1 +
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 0a2d564..5e881ea 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -78,6 +78,9 @@
           <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" />
             <div class="q-space" data-v-39efcd1f=""></div>
           <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall config')" />
           <div class="q-space" data-v-39efcd1f=""></div>
@@ -150,6 +153,9 @@
   const send_disable_blending_params = () => {
   set?.SetBlendingOption(1, disable_blending_params.value ? 1 : 0);
   };
+  const send_show_blending_grids = () => {
+  set?.SetBlendingOption(1000, show_blending_grids.value ? 1 : 0);
+  };
   const resetall=()=>{
   set?.ResetBlendingConfig()
   }
@@ -159,6 +165,7 @@
   optionsstr.value = "FusionLocale";
   const hide_desktop_value = ref(true);
   const disable_blending_params = ref(false);
+  const show_blending_grids = ref(false);
   const options = computed({
   get() {
   return optionsstr.value;
@@ -240,18 +247,18 @@
   set?.GetBlendingConfig("").then((res) => {
   let tmp = JSON.parse(res ? res.config : "");
   //console.log(tmp.options[0][1])
-  let local_options = [ [ref(0), hide_desktop_value], [ref(1), disable_blending_params] ];
+  let local_options = [ [ref(0), hide_desktop_value], [ref(1), disable_blending_params], [ref(1000), show_blending_grids] ];
   let k:any;
   for(k in local_options) {
-    let local_opt = local_options[k];
-    let ii:any;
-    for(ii in tmp.options){
-      let opt = tmp.options[ii];
-      if (2 == opt.length && local_opt[0].value == opt[0]){
-        local_opt[1].value = (opt[1] == 0 ? false : true);
-        break;
-      }
-    }
+  let local_opt = local_options[k];
+  let ii:any;
+  for(ii in tmp.options){
+  let opt = tmp.options[ii];
+  if (2 == opt.length && local_opt[0].value == opt[0]){
+  local_opt[1].value = (opt[1] == 0 ? false : true);
+  break;
+  }
+  }
   }
   });
   }, 1000);
@@ -261,6 +268,8 @@
   hide_desktop_value,
   send_disable_blending_params,
   disable_blending_params,
+  send_show_blending_grids,
+  show_blending_grids,
   clear,
   show_dialog,
   options,
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 93a3f87..6fa556b 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -427,4 +427,5 @@ export default {
   "Whether to hide the desktop":"Whether to hide the desktop",
   "resetall config":"resetall config",
   "disable blending params":"Dsable blending params",
+  "show blending grids":"show grids",
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 334ebc5..45439e2 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -696,4 +696,5 @@ export default {
   "Whether to hide the desktop":"是否隐藏桌面",
   "resetall config":"重置所有配置",
   "disable blending params":"禁用融合参数",
+  "show blending grids":"显示网格",
 };

From 5f03edeb6c438f8e976f33df971d1c83abbd7930 Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Wed, 18 Jan 2023 20:09:23 +0800
Subject: [PATCH 26/78] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=8F=82=E6=95=B0=E6=94=B9=E4=B8=BA=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/ClientConnection.ts          |  4 ++--
 src/components/FusionSettingsDialog.vue | 30 ++++++++++++++-----------
 src/entities/WSProtocol.ts              | 12 +++++-----
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index 9ba1fc0..37f7795 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -1476,8 +1476,8 @@ export default class ClientConnection {
   }
 
   public async SetBlendingOption(
-    id: number,
-    value: number
+    id: string,
+    value: string
   ) {
     return await this.doRpc<Protocol.NoneResponse>(
       new Protocol.SetBlendingOptionRequestEntity(
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 5e881ea..3604d88 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -148,13 +148,13 @@
   show_dialog.value = true;
   };
   const send_hide_desktop = () => {
-  set?.SetBlendingOption(0, hide_desktop_value.value ? 1 : 0);
+  set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0");
   };
   const send_disable_blending_params = () => {
-  set?.SetBlendingOption(1, disable_blending_params.value ? 1 : 0);
+  set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0");
   };
   const send_show_blending_grids = () => {
-  set?.SetBlendingOption(1000, show_blending_grids.value ? 1 : 0);
+  set?.SetBlendingOption(show_blending_grids_id.value, show_blending_grids.value ? "1" : "0");
   };
   const resetall=()=>{
   set?.ResetBlendingConfig()
@@ -163,8 +163,11 @@
   const EnableBlending = ref(false);
   let optionsstr = ref();
   optionsstr.value = "FusionLocale";
-  const hide_desktop_value = ref(true);
+  const hide_desktop_value_id = ref("0");
+  const hide_desktop_value = ref(false);
+  const disable_blending_params_id = ref("1");
   const disable_blending_params = ref(false);
+  const show_blending_grids_id = ref("show_blending_grids");
   const show_blending_grids = ref(false);
   const options = computed({
   get() {
@@ -247,18 +250,19 @@
   set?.GetBlendingConfig("").then((res) => {
   let tmp = JSON.parse(res ? res.config : "");
   //console.log(tmp.options[0][1])
-  let local_options = [ [ref(0), hide_desktop_value], [ref(1), disable_blending_params], [ref(1000), show_blending_grids] ];
+  let local_options = [
+  [hide_desktop_value_id, hide_desktop_value],
+  [disable_blending_params_id, disable_blending_params],
+  [show_blending_grids_id, show_blending_grids]
+  ];
   let k:any;
   for(k in local_options) {
   let local_opt = local_options[k];
-  let ii:any;
-  for(ii in tmp.options){
-  let opt = tmp.options[ii];
-  if (2 == opt.length && local_opt[0].value == opt[0]){
-  local_opt[1].value = (opt[1] == 0 ? false : true);
-  break;
-  }
-  }
+  let opt = tmp.options[(<any>local_opt[0].value)];
+    if (opt)
+    {
+      local_opt[1].value = ("0" == opt || "false" == opt.toLowerCase() ? false : true);
+    }
   }
   });
   }, 1000);
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index ec7d2f3..be1d1d2 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -3469,8 +3469,8 @@ export namespace Protocol {
 
   export class SetBlendingOptionRequestEntity extends PacketEntity {
     constructor(
-      id: number,
-      value: number,
+      id: string,
+      value: string,
       rpc_id = 0
     ) {
       super();
@@ -3478,10 +3478,10 @@ export namespace Protocol {
       super.flag = PacketEntity.FLAG_REQUEST;
       super.rpc_id = rpc_id;
 
-      this.id = id ?? 0;
-      this.value = value ?? 0;
+      this.id = id ?? "";
+      this.value = value ?? "";
     }
-    id = 0;
-    value = 0;
+    id;
+    value;
   }
 }

From e8f2d4eb9c3994e8bf246284fb6c88562909b96a Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Thu, 19 Jan 2023 11:21:18 +0800
Subject: [PATCH 27/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 3604d88..43ccf0e 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -167,7 +167,7 @@
   const hide_desktop_value = ref(false);
   const disable_blending_params_id = ref("1");
   const disable_blending_params = ref(false);
-  const show_blending_grids_id = ref("show_blending_grids");
+  const show_blending_grids_id = ref("blending_grids_show");
   const show_blending_grids = ref(false);
   const options = computed({
   get() {

From 08bbfd9b7338f676200b4f5957e144c0867cd3dd Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Sat, 28 Jan 2023 14:08:18 +0800
Subject: [PATCH 28/78] =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=AA=97=E5=8F=A3=E6=97=B6=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=88=A0=E6=A0=BC=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 43ccf0e..8dd3879 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -219,6 +219,8 @@
   } catch (error) { }
   };
   const clear = () => {
+  show_blending_grids.value = false;
+  send_show_blending_grids();
   $store.commit("setSelectedProjector", "0/0");
   setTimeout(() => {
   sessionStorage.removeItem("FusionLocale");

From 48f5a8a25c9abe2af169378348c71ef0440a581a Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sat, 28 Jan 2023 14:22:55 +0800
Subject: [PATCH 29/78] =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 43ccf0e..44378b1 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -60,7 +60,7 @@
                       label: $t('DensityCorrection'),
                       value: 'DensityCorrection',
                     },
-                    // { label: $t('GridSettings'), value: 'GridSettings' },
+                    { label: $t('GridSettings'), value: 'GridSettings' },
                   ]" />
               </div>
               <div style="min-height: 72vh">

From ee4166abc3387582a65566cbd03c3a24adf4c1f2 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sun, 29 Jan 2023 13:34:54 +0800
Subject: [PATCH 30/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/FusionLocale.vue           |  78 ++++--
 .../FusionSettings/GridSettings.vue           | 236 ++++++++++++------
 src/i18n/en-US/index.ts                       |   4 +
 src/i18n/zh-CN/index.ts                       |   4 +
 4 files changed, 238 insertions(+), 84 deletions(-)

diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 5dced7e..80ddd9c 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -61,6 +61,7 @@
                         (val > -1 && val < 1920) || $t('Please enter 0-100'),
                     ]" />
                 </div>
+                <div class="col-3"><span>{{$t('Whether to operate synchronously')}}</span><q-checkbox v-model="auto_sync" /></div>
               </div>
             </div>
           </div>
@@ -96,7 +97,7 @@
           <div><q-btn color="white" @click="add('alpha')" text-color="black" label="↑" /></div>
           <q-slider v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
             vertical reverse label-always />
-            <div><q-btn color="white" @click="reduce('alpha')" text-color="black" label="↓" /></div>
+          <div><q-btn color="white" @click="reduce('alpha')" text-color="black" label="↓" /></div>
           <p class="text-center">alpha</p>
         </div>
 
@@ -104,7 +105,7 @@
           <div><q-btn color="white" @click="add('p')" text-color="black" label="↑" /></div>
           <q-slider v-model="array[group].p" :min="0" @change="chang('p')" :max="2.5" :step="0.01" color="green"
             vertical reverse label-always />
-            <div><q-btn color="white" @click="reduce('p')" text-color="black" label="↓" /></div>
+          <div><q-btn color="white" @click="reduce('p')" text-color="black" label="↓" /></div>
           <p class="text-center">p</p>
         </div>
 
@@ -112,7 +113,7 @@
           <div><q-btn color="white" @click="add('gamma')" text-color="black" label="↑" /></div>
           <q-slider v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="2.5" :step="0.01" color="green"
             vertical reverse label-always />
-            <div><q-btn color="white" @click="reduce('gamma')" text-color="black" label="↓" /></div>
+          <div><q-btn color="white" @click="reduce('gamma')" text-color="black" label="↓" /></div>
           <p class="text-center">gamma</p>
         </div>
       </div>
@@ -162,6 +163,7 @@ export default defineComponent({
       { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
       { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
     ]);
+    const auto_sync=ref(false)
     //正确的 索引编号
     let arr = [1, 0, 2, 3];
     let serverconfig = JSON.parse($store.state.fusion_configuration);
@@ -172,34 +174,34 @@ export default defineComponent({
       );
     });
     const add = (type: string) => {
-      let tmp:Number;
-      tmp=0.01;
+      let tmp: Number;
+      tmp = 0.01;
       switch (type) {
         case "alpha":
-        array[group.value].alpha=Number((array[group.value].alpha+=tmp).toFixed(2))
+          array[group.value].alpha = Number((array[group.value].alpha += tmp).toFixed(2))
           break;
         case "p":
-        array[group.value].p=Number((array[group.value].p+=tmp).toFixed(2))
+          array[group.value].p = Number((array[group.value].p += tmp).toFixed(2))
           break;
         case "gamma":
-        array[group.value].gamma=Number((array[group.value].gamma+=tmp).toFixed(2))
+          array[group.value].gamma = Number((array[group.value].gamma += tmp).toFixed(2))
           break;
         default:
           break;
       }
     }
     const reduce = (type: string) => {
-      let tmp:Number;
-      tmp=-0.01;
+      let tmp: Number;
+      tmp = -0.01;
       switch (type) {
         case "alpha":
-        array[group.value].alpha=Number((array[group.value].alpha+=tmp).toFixed(2))
+          array[group.value].alpha = Number((array[group.value].alpha += tmp).toFixed(2))
           break;
         case "p":
-        array[group.value].p=Number((array[group.value].p+=tmp).toFixed(2))
+          array[group.value].p = Number((array[group.value].p += tmp).toFixed(2))
           break;
         case "gamma":
-        array[group.value].gamma=Number((array[group.value].gamma+=tmp).toFixed(2))
+          array[group.value].gamma = Number((array[group.value].gamma += tmp).toFixed(2))
           break;
         default:
           break;
@@ -368,6 +370,7 @@ export default defineComponent({
             array[0].isshow,
             Number(array[0].value)
           );
+
         save_set_cache();
       },
       { deep: true }
@@ -383,6 +386,7 @@ export default defineComponent({
             array[1].isshow,
             Number(array[1].value)
           );
+          if(auto_sync.value)left_right_auto_add(newVal-oldVal);
         save_set_cache();
       },
       { deep: true }
@@ -398,6 +402,7 @@ export default defineComponent({
             array[2].isshow,
             Number(array[2].value)
           );
+          if(auto_sync.value)left_right_auto_add(newVal-oldVal);
         save_set_cache();
       },
       { deep: true }
@@ -445,6 +450,7 @@ export default defineComponent({
             array[1].isshow,
             Number(array[1].value)
           );
+          if(auto_sync.value)left_right_auto_add(0);
         save_set_cache();
       },
       { deep: true }
@@ -460,6 +466,7 @@ export default defineComponent({
             array[2].isshow,
             Number(array[2].value)
           );
+          if(auto_sync.value)left_right_auto_add(0);
         save_set_cache();
       },
       { deep: true }
@@ -503,6 +510,48 @@ export default defineComponent({
         console.log("ResetBlendingConfig error");
       }
     };
+    const left_right_auto_add = (difference: number) => {
+
+      let tmpobjall = JSON.parse($store.state.fusion_configuration)
+      if ($store.getters.GetTheCurrentlySelectedCamera[1] == 0) {
+
+        let tmp = set_cache.value[1] == null ? tmpobjall.projectors[1].params : JSON.parse(set_cache.value[1]);
+        let set_cache_tmp: any = []
+        if (tmp[1].hasOwnProperty("power")) {
+          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) }
+            set_cache_tmp.push(tmpobj)
+          }
+        } else {
+          set_cache_tmp = tmp
+        }
+        if (ste_status.value == 0) {
+          set_cache_tmp[1].value = Number(set_cache_tmp[1].value) + difference
+          set_cache_tmp[1].isshow = array[2].isshow
+          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);
+        }
+      }
+      if ($store.getters.GetTheCurrentlySelectedCamera[1] == 1) {
+
+        let tmp = set_cache.value[0] == null ? tmpobjall.projectors[0].params : JSON.parse(set_cache.value[0]);
+        let set_cache_tmp: any = []
+        if (tmp[0].hasOwnProperty("power")) {
+          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) }
+            set_cache_tmp.push(tmpobj)
+          }
+        } else {
+          set_cache_tmp = tmp
+        }
+        if (ste_status.value == 0) {
+          set_cache_tmp[2].value = Number(set_cache_tmp[2].value) + difference
+          set_cache_tmp[2].isshow = array[1].isshow
+          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);
+        }
+      }
+    }
     return {
       group,
       array,
@@ -513,7 +562,8 @@ export default defineComponent({
       resetall,
       set_cache,
       reduce,
-      add
+      add,
+      auto_sync
     };
   },
 });
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 3554aa3..539170e 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -1,86 +1,182 @@
 <template>
-    <div class="row">
+  <div class="row">
+    <div class="col-12">
+      <div class="row">
         <div class="col-12">
-            <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]" :options="options" :dense="true"
-                                :options-dense="true" label="单元行数" /> </div><q-checkbox v-model="RowsColumns[0]" />
-                    </div>
-                </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]" :options="options" :dense="true"
-                                :options-dense="true" label="单元列数" /> </div><q-checkbox v-model="RowsColumns[1]" />
-                    </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="row"><div class="col-4"><span>网格颜色</span></div><div class="col-8" @click="isshowhex=true;index=0" :style="{'background-color':color[0]}"></div></div></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="row"><div class="col-4"><span>背景颜色</span></div><div class="col-8"  @click="isshowhex=true;index=1" :style="{'background-color':color[1]}"></div></div></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="row"><div class="col-4"><span>中心线颜色</span></div><div class="col-8" @click="isshowhex=true;index=2" :style="{'background-color':color[2]}"></div></div></div><q-checkbox v-model="RowsColumns[2]" />
-                    </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="row"><div class="col-4"><span>中心圆颜色</span></div><div class="col-8"  @click="isshowhex=true;index=3" :style="{'background-color':color[3]}"></div></div></div><q-checkbox v-model="RowsColumns[3]" />
-                    </div>
-                </div>
-            </div>
+          <div class="row">
+            <div class="col-4"></div>
+            <div class="col-4 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]" />
+          </div>
         </div>
-        <div v-if="isshowhex" style="margin: 0 auto;text-align: center;"><q-color no-header-tabs  no-footer v-model="color[index]" class="my-picker" /> <q-btn style="margin-top: 0.5rem;" color="white" @click="isshowhex=false" class=" q-pt-sm" text-color="black" label="提交" /></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]"
+                @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]" />
+          </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="row">
+                <div class="col-4"><span>{{ $t('line color') }}</span></div>
+                <div class="col-8 border" @click="isshowhex = true; index = 0" :style="{ 'background-color': color[0] }"></div>
+              </div>
+            </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="row">
+                <div class="col-4"><span>{{ $t('background color') }}</span></div>
+                <div class="col-8 border" @click="isshowhex = true; index = 1" :style="{ 'background-color': color[1] }"></div>
+              </div>
+            </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="row">
+                <div class="col-4"><span>{{ $t('center line color') }}</span></div>
+                <div class="col-8 border" @click="isshowhex = true; index = 2" :style="{ 'background-color': color[2] }"></div>
+              </div>
+            </div>
+            <div><q-checkbox v-model="RowsColumns[2]" @update:model-value="send_off(2)" /></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="row">
+                <div class="col-4"><span>{{ $t('center circle color') }}</span></div>
+                <div class="col-8 border" @click="isshowhex = true; index = 3" :style="{ 'background-color': color[3] }"></div>
+              </div>
+            </div>
+            <div><q-checkbox v-model="RowsColumns[3]" @update:model-value="send_off(3)" /></div>
+          </div>
+        </div> -->
+      </div>
     </div>
+    <div v-if="isshowhex" style="margin: 0 auto;text-align: center;"><q-color no-header-tabs no-footer
+        v-model="color[index]" class="my-picker" /> <q-btn style="margin-top: 0.5rem;" color="white" @click="submit"
+        class=" q-pt-sm" text-color="black" :label="$t('submit')" /></div>
+  </div>
 </template>
 
 <style scoped>
-
+.border{
+  border: 1px solid;
+}
 </style>
 
 <script lang="ts">
 import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
-import { defineComponent, ref,reactive } from "vue";
+import { defineComponent, ref, reactive } from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
-
+import GlobalData from "src/common/GlobalData";
 
 export default defineComponent({
-    name: "ComponentGridSettings",
-    components:{
-        vue3ResizeDrag
-    },
-    setup() {
-        let $store = useStore();
-        let $t = useI18n();
-        const RowsColumns=reactive([false,false,false,false]);
-        const hex=ref("")
-        const isshowhex=ref(false);
-        const index=ref(0);
-        const color=reactive(["#000","#000","#000","#000"]);
-        let model = reactive([10,10]);
-        let options = ref(['10', '20', '30', '40', '50']);
-        return {
-            model,
-            options,
-            hex,
-            RowsColumns,
-            isshowhex,
-            index,
-            color,
-        };
-    },
+  name: "ComponentGridSettings",
+  components: {
+    vue3ResizeDrag
+  },
+  setup() {
+    let set = GlobalData.getInstance().getCurrentClient();
+    let $store = useStore();
+    let $t = useI18n();
+    const RowsColumns = reactive([false, false, false, false]);
+    const hex = ref("")
+    const isshowhex = ref(false);
+    const index = ref(0);
+    const color = reactive(["#ffffff", "#CCCCCC", "#000", "#000"]);
+    let model = reactive([20, 40]);
+    let options = ref([10, 20, 30, 40, 50]);
+    const submit = () => {
+      isshowhex.value = false
+      switch (index.value) {
+        case 0:
+          set?.SetBlendingOption("blending_grids_line_color", color[index.value]);
+          break;
+        case 1:
+          set?.SetBlendingOption("blending_grids_background_color", color[index.value]);
+          break;
+        case 2:
+          //set?.SetBlendingOption("blending_grids_line_color",color[index.value]);
+          break;
+        case 3:
+          //set?.SetBlendingOption("blending_grids_line_color",color[index.value]);
+          break;
+        default:
+          break;
+      }
+    }
+    const update_row_col = (type: number, value: number) => {
+      switch (type) {
+        case 0:
+          set?.SetBlendingOption("blending_grids_row", value + "");
+          break;
+        case 1:
+          set?.SetBlendingOption("blending_grids_column", value + "");
+          break;
+        default:
+          break;
+      }
+    }
+    const send_off = (type: number) => {
+      setTimeout(() => {
+        switch (type) {
+          case 0:
+            set?.SetBlendingOption("blending_grids_hide_row", RowsColumns[type] + "");
+            break;
+          case 1:
+            if (!RowsColumns[1]) RowsColumns[2] = false; RowsColumns[3] = false
+            set?.SetBlendingOption("blending_grids_hide_column", RowsColumns[type] + "");
+            break;
+          case 2:
+
+            break;
+          case 3:
+
+            break;
+          default:
+            break;
+        }
+      }, 100);
+    }
+    const use_server_config =()=>{
+      let server_conf=JSON.parse($store.state.fusion_configuration).options
+      model[0]=Number(server_conf.blending_grids_row)
+      model[1]=Number(server_conf.blending_grids_column)
+      color[0]=server_conf.blending_grids_line_color
+      RowsColumns[0]=server_conf.blending_grids_hide_row==="false"?false:true
+      RowsColumns[1]=server_conf.blending_grids_hide_column==="false"?false:true
+
+    }
+    use_server_config()
+    return {
+      model,
+      options,
+      hex,
+      submit,
+      RowsColumns,
+      isshowhex,
+      index,
+      color,
+      update_row_col,
+      send_off
+    };
+  },
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 6fa556b..e47a08f 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -428,4 +428,8 @@ export default {
   "resetall config":"resetall config",
   "disable blending params":"Dsable blending params",
   "show blending grids":"show grids",
+  "line color":"line color",
+  "center line color":"center line color",
+  "center circle color":"center circle color",
+  "Whether to operate synchronously":"Whether to operate synchronously"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 45439e2..e2e839d 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -697,4 +697,8 @@ export default {
   "resetall config":"重置所有配置",
   "disable blending params":"禁用融合参数",
   "show blending grids":"显示网格",
+  "line color":"线条颜色",
+  "center line color":"中心线颜色",
+  "center circle color":"中心圆颜色",
+  "Whether to operate synchronously":"是否同步操作"
 };

From 1e0e2a529cf422ccd81693cbd9ce7f38baa8859a Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sun, 29 Jan 2023 14:03:39 +0800
Subject: [PATCH 31/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=88=87=E6=8D=A2=E6=97=B6?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/FusionLocale.vue           |  15 +-
 .../FusionSettings/GridSettings.vue           |  47 ++-
 src/components/FusionSettingsDialog.vue       | 348 +++++++++---------
 3 files changed, 217 insertions(+), 193 deletions(-)

diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 80ddd9c..4067013 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -61,7 +61,8 @@
                         (val > -1 && val < 1920) || $t('Please enter 0-100'),
                     ]" />
                 </div>
-                <div class="col-3"><span>{{$t('Whether to operate synchronously')}}</span><q-checkbox v-model="auto_sync" /></div>
+                <div class="col-3"><span>{{ $t('Whether to operate synchronously') }}</span><q-checkbox
+                    v-model="auto_sync" /></div>
               </div>
             </div>
           </div>
@@ -163,7 +164,7 @@ export default defineComponent({
       { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
       { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
     ]);
-    const auto_sync=ref(false)
+    const auto_sync = ref(false)
     //正确的 索引编号
     let arr = [1, 0, 2, 3];
     let serverconfig = JSON.parse($store.state.fusion_configuration);
@@ -386,7 +387,7 @@ export default defineComponent({
             array[1].isshow,
             Number(array[1].value)
           );
-          if(auto_sync.value)left_right_auto_add(newVal-oldVal);
+        if (auto_sync.value) left_right_auto_add(newVal - oldVal);
         save_set_cache();
       },
       { deep: true }
@@ -402,7 +403,7 @@ export default defineComponent({
             array[2].isshow,
             Number(array[2].value)
           );
-          if(auto_sync.value)left_right_auto_add(newVal-oldVal);
+        if (auto_sync.value) left_right_auto_add(newVal - oldVal);
         save_set_cache();
       },
       { deep: true }
@@ -450,7 +451,7 @@ export default defineComponent({
             array[1].isshow,
             Number(array[1].value)
           );
-          if(auto_sync.value)left_right_auto_add(0);
+        if (auto_sync.value) left_right_auto_add(0);
         save_set_cache();
       },
       { deep: true }
@@ -466,7 +467,7 @@ export default defineComponent({
             array[2].isshow,
             Number(array[2].value)
           );
-          if(auto_sync.value)left_right_auto_add(0);
+        if (auto_sync.value) left_right_auto_add(0);
         save_set_cache();
       },
       { deep: true }
@@ -547,7 +548,7 @@ export default defineComponent({
         if (ste_status.value == 0) {
           set_cache_tmp[2].value = Number(set_cache_tmp[2].value) + difference
           set_cache_tmp[2].isshow = array[1].isshow
-          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);
         }
       }
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 539170e..38dcb58 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -26,7 +26,8 @@
             <div class="col-4 q-pt-sm">
               <div class="row">
                 <div class="col-4"><span>{{ $t('line color') }}</span></div>
-                <div class="col-8 border" @click="isshowhex = true; index = 0" :style="{ 'background-color': color[0] }"></div>
+                <div class="col-8 border" @click="isshowhex = true; index = 0"
+                  :style="{ 'background-color': color[0] }"></div>
               </div>
             </div>
           </div>
@@ -37,7 +38,8 @@
             <div class="col-4 q-pt-sm">
               <div class="row">
                 <div class="col-4"><span>{{ $t('background color') }}</span></div>
-                <div class="col-8 border" @click="isshowhex = true; index = 1" :style="{ 'background-color': color[1] }"></div>
+                <div class="col-8 border" @click="isshowhex = true; index = 1"
+                  :style="{ 'background-color': color[1] }"></div>
               </div>
             </div>
           </div>
@@ -75,17 +77,18 @@
 </template>
 
 <style scoped>
-.border{
+.border {
   border: 1px solid;
 }
 </style>
 
 <script lang="ts">
 import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
-import { defineComponent, ref, reactive } from "vue";
+import { defineComponent, ref, reactive, onBeforeUnmount } from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
 import GlobalData from "src/common/GlobalData";
+import { json } from "body-parser";
 
 export default defineComponent({
   name: "ComponentGridSettings",
@@ -155,16 +158,36 @@ export default defineComponent({
         }
       }, 100);
     }
-    const use_server_config =()=>{
-      let server_conf=JSON.parse($store.state.fusion_configuration).options
-      model[0]=Number(server_conf.blending_grids_row)
-      model[1]=Number(server_conf.blending_grids_column)
-      color[0]=server_conf.blending_grids_line_color
-      RowsColumns[0]=server_conf.blending_grids_hide_row==="false"?false:true
-      RowsColumns[1]=server_conf.blending_grids_hide_column==="false"?false:true
-
+    const use_server_config = () => {
+      let server_conf = JSON.parse($store.state.fusion_configuration).options
+      model[0] = Number(server_conf.blending_grids_row)
+      model[1] = Number(server_conf.blending_grids_column)
+      color[0] = server_conf.blending_grids_line_color
+      RowsColumns[0] = server_conf.blending_grids_hide_row === "false" ? false : true
+      RowsColumns[1] = server_conf.blending_grids_hide_column === "false" ? false : true
     }
     use_server_config()
+
+    onBeforeUnmount(() => {
+      set_sessionStorage()
+    });
+    const set_sessionStorage = () => {
+      let tmp = { RowsColumns: RowsColumns, color: color, model: model }
+      sessionStorage.GridSettings = JSON.stringify(tmp)
+    }
+    const get_sessionStorage = () => {
+      let tmp = JSON.parse(sessionStorage.GridSettings)
+      for (let index = 0; index < tmp.RowsColumns.length; index++) {
+        RowsColumns[index] = tmp.RowsColumns[index];
+      }
+      for (let index = 0; index < tmp.color.length; index++) {
+        color[index] = tmp.color[index];
+      }
+      for (let index = 0; index < tmp.model.length; index++) {
+        model[index] = tmp.model[index];
+      }
+    }
+    if (sessionStorage.GridSettings) get_sessionStorage()
     return {
       model,
       options,
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index adbee4e..29593fc 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -64,7 +64,7 @@
                   ]" />
               </div>
               <div style="min-height: 72vh">
-                <component  :is="options" />
+                <component :is="options" />
               </div>
             </div>
           </div>
@@ -76,12 +76,12 @@
           <span>{{ $t("Whether to hide the desktop") }}</span><q-checkbox style="justify-content: flex-start"
             v-model="hide_desktop_value" @click="send_hide_desktop" />
           <span>{{ $t("disable blending params") }}</span>
-          <q-checkbox style="justify-content: flex-start"
-            v-model="disable_blending_params" @click="send_disable_blending_params" />
+          <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" />
-            <div class="q-space" data-v-39efcd1f=""></div>
+          <q-checkbox style="justify-content: flex-start" v-model="show_blending_grids"
+            @click="send_show_blending_grids" />
+          <div class="q-space" data-v-39efcd1f=""></div>
           <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall config')" />
           <div class="q-space" data-v-39efcd1f=""></div>
           <q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup
@@ -104,7 +104,7 @@
 </style>
 
 <script lang="ts">
-  import {
+import {
   defineComponent,
   ref,
   Ref,
@@ -112,180 +112,180 @@
   computed,
   onMounted,
   onBeforeMount,
-  } from "vue";
-  import { useStore } from "src/store";
-  import { useQuasar, copyToClipboard } from "quasar";
-  import { useI18n } from "vue-i18n";
-  import GlobalData from "src/common/GlobalData";
-  import { Protocol } from "src/entities/WSProtocol";
-  import { EDeviceAttribute } from "src/entities/EDeviceAttribute";
+} from "vue";
+import { useStore } from "src/store";
+import { useQuasar, copyToClipboard } from "quasar";
+import { useI18n } from "vue-i18n";
+import GlobalData from "src/common/GlobalData";
+import { Protocol } from "src/entities/WSProtocol";
+import { EDeviceAttribute } from "src/entities/EDeviceAttribute";
 
-  import ProjectorItem from "src/components/FusionSettings/ProjectorItem.vue";
+import ProjectorItem from "src/components/FusionSettings/ProjectorItem.vue";
 
-  import FusionLocale from "src/components/FusionSettings/FusionLocale.vue";
-  import FourPointCalibration from "src/components/FusionSettings/FourPointCalibration.vue";
-  import GridSettings from "src/components/FusionSettings/GridSettings.vue";
-  import SurfaceCorrection from "src/components/FusionSettings/SurfaceCorrection.vue";
-  import DensityCorrection from "src/components/FusionSettings/DensityCorrection.vue";
+import FusionLocale from "src/components/FusionSettings/FusionLocale.vue";
+import FourPointCalibration from "src/components/FusionSettings/FourPointCalibration.vue";
+import GridSettings from "src/components/FusionSettings/GridSettings.vue";
+import SurfaceCorrection from "src/components/FusionSettings/SurfaceCorrection.vue";
+import DensityCorrection from "src/components/FusionSettings/DensityCorrection.vue";
 
-  export default defineComponent({
+export default defineComponent({
   name: "ComponentFusionSettingsDialog",
   components: {
-  ProjectorItem,
-  FusionLocale,
-  FourPointCalibration,
-  GridSettings,
-  SurfaceCorrection,
-  DensityCorrection,
+    ProjectorItem,
+    FusionLocale,
+    FourPointCalibration,
+    GridSettings,
+    SurfaceCorrection,
+    DensityCorrection,
   },
   setup() {
-  let set = GlobalData.getInstance().getCurrentClient();
-  let $store = useStore();
-  let $q = useQuasar();
-  let $t = useI18n();
-  let show_dialog = ref(false);
-  const showDialog = async () => {
-  show_dialog.value = true;
-  };
-  const send_hide_desktop = () => {
-  set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0");
-  };
-  const send_disable_blending_params = () => {
-  set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0");
-  };
-  const send_show_blending_grids = () => {
-  set?.SetBlendingOption(show_blending_grids_id.value, show_blending_grids.value ? "1" : "0");
-  };
-  const resetall=()=>{
-  set?.ResetBlendingConfig()
-  }
-  const config = ref({ col: 0, row: 0 });
-  const EnableBlending = ref(false);
-  let optionsstr = ref();
-  optionsstr.value = "FusionLocale";
-  const hide_desktop_value_id = ref("0");
-  const hide_desktop_value = ref(false);
-  const disable_blending_params_id = ref("1");
-  const disable_blending_params = ref(false);
-  const show_blending_grids_id = ref("blending_grids_show");
-  const show_blending_grids = ref(false);
-  const options = computed({
-  get() {
-  return optionsstr.value;
-  },
-  set(newValue) {
-  optionsstr.value = newValue;
-  },
-  });
-  watch(
-  () => EnableBlending,
-  (newVal, oldVal) => {
-  $store.commit("setEnablefusion", newVal.value);
-  set?.EnableBlending(newVal.value);
-  },
-  { deep: true }
-  );
-
-  const erroe = () => {
-  $q.notify({
-  color: "negative",
-  icon: "warning",
-  message: "数据获取失败!",
-  position: "top",
-  timeout: 1500,
-  });
-  };
-  const save = () => {
-  set?.SaveBlendingConfig("");
-  show_dialog.value = false;
-  clear();
-  set?.GetBlendingConfig("").then((res) => {
-  let tmp = JSON.parse(res ? res.config : "");
-  EnableBlending.value = tmp.enable;
-  $store.commit("setEnablefusion", tmp.enable);
-  config.value.col = tmp.col;
-  config.value.row = tmp.row;
-  $store.commit("setfusion_configuration", res?.config);
-  });
-  $store.commit("setSelectedProjector", "0/0");
-  };
-  const getconfig = () => {
-  try {
-  set?.GetBlendingConfig("").then((res) => {
-  let tmp = JSON.parse(res ? res.config : "");
-  $store.commit("setEnablefusion", tmp.enable);
-  $store.commit("setfusion_configuration", res?.config);
-  });
-  } catch (error) { }
-  };
-  const clear = () => {
-  show_blending_grids.value = false;
-  send_show_blending_grids();
-  $store.commit("setSelectedProjector", "0/0");
-  setTimeout(() => {
-  sessionStorage.removeItem("FusionLocale");
-  sessionStorage.removeItem("SurfaceCorrection");
-  sessionStorage.removeItem("DensityCorrection");
-  sessionStorage.removeItem("FourPointCalibration");
-  }, 500);
-  getconfig();
-  };
-
-  onBeforeMount(() => {
-  setTimeout(() => {
-  try {
-  set?.GetBlendingConfig("").then((res) => {
-  let tmp = JSON.parse(res ? res.config : "");
-  EnableBlending.value = tmp.enable;
-  $store.commit("setEnablefusion", tmp.enable);
-  config.value.col = tmp.col;
-  config.value.row = tmp.row;
-  $store.commit("setfusion_configuration", res?.config);
-  });
-  } catch (error) {
-  erroe();
-  }
-  }, 1000);
-  });
-  onMounted(() => {
-  setTimeout(() => {
-  set?.GetBlendingConfig("").then((res) => {
-  let tmp = JSON.parse(res ? res.config : "");
-  //console.log(tmp.options[0][1])
-  let local_options = [
-  [hide_desktop_value_id, hide_desktop_value],
-  [disable_blending_params_id, disable_blending_params],
-  [show_blending_grids_id, show_blending_grids]
-  ];
-  let k:any;
-  for(k in local_options) {
-  let local_opt = local_options[k];
-  let opt = tmp.options[(<any>local_opt[0].value)];
-    if (opt)
-    {
-      local_opt[1].value = ("0" == opt || "false" == opt.toLowerCase() ? false : true);
+    let set = GlobalData.getInstance().getCurrentClient();
+    let $store = useStore();
+    let $q = useQuasar();
+    let $t = useI18n();
+    let show_dialog = ref(false);
+    const showDialog = async () => {
+      show_dialog.value = true;
+    };
+    const send_hide_desktop = () => {
+      set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0");
+    };
+    const send_disable_blending_params = () => {
+      set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0");
+    };
+    const send_show_blending_grids = () => {
+      set?.SetBlendingOption(show_blending_grids_id.value, show_blending_grids.value ? "1" : "0");
+    };
+    const resetall = () => {
+      set?.ResetBlendingConfig()
     }
-  }
-  });
-  }, 1000);
-  });
-  return {
-  send_hide_desktop,
-  hide_desktop_value,
-  send_disable_blending_params,
-  disable_blending_params,
-  send_show_blending_grids,
-  show_blending_grids,
-  clear,
-  show_dialog,
-  options,
-  copyToClipboard,
-  showDialog,
-  EnableBlending,
-  config,
-  save,
-  resetall
-  };
+    const config = ref({ col: 0, row: 0 });
+    const EnableBlending = ref(false);
+    let optionsstr = ref();
+    optionsstr.value = "FusionLocale";
+    const hide_desktop_value_id = ref("0");
+    const hide_desktop_value = ref(false);
+    const disable_blending_params_id = ref("1");
+    const disable_blending_params = ref(false);
+    const show_blending_grids_id = ref("blending_grids_show");
+    const show_blending_grids = ref(false);
+    const options = computed({
+      get() {
+        return optionsstr.value;
+      },
+      set(newValue) {
+        optionsstr.value = newValue;
+      },
+    });
+    watch(
+      () => EnableBlending,
+      (newVal, oldVal) => {
+        $store.commit("setEnablefusion", newVal.value);
+        set?.EnableBlending(newVal.value);
+      },
+      { deep: true }
+    );
+
+    const erroe = () => {
+      $q.notify({
+        color: "negative",
+        icon: "warning",
+        message: "数据获取失败!",
+        position: "top",
+        timeout: 1500,
+      });
+    };
+    const save = () => {
+      set?.SaveBlendingConfig("");
+      show_dialog.value = false;
+      clear();
+      set?.GetBlendingConfig("").then((res) => {
+        let tmp = JSON.parse(res ? res.config : "");
+        EnableBlending.value = tmp.enable;
+        $store.commit("setEnablefusion", tmp.enable);
+        config.value.col = tmp.col;
+        config.value.row = tmp.row;
+        $store.commit("setfusion_configuration", res?.config);
+      });
+      $store.commit("setSelectedProjector", "0/0");
+    };
+    const getconfig = () => {
+      try {
+        set?.GetBlendingConfig("").then((res) => {
+          let tmp = JSON.parse(res ? res.config : "");
+          $store.commit("setEnablefusion", tmp.enable);
+          $store.commit("setfusion_configuration", res?.config);
+        });
+      } catch (error) { }
+    };
+    const clear = () => {
+      show_blending_grids.value = false;
+      send_show_blending_grids();
+      $store.commit("setSelectedProjector", "0/0");
+      setTimeout(() => {
+        sessionStorage.removeItem("FusionLocale");
+        sessionStorage.removeItem("SurfaceCorrection");
+        sessionStorage.removeItem("DensityCorrection");
+        sessionStorage.removeItem("FourPointCalibration");
+        sessionStorage.removeItem("GridSettings");
+      }, 500);
+      getconfig();
+    };
+
+    onBeforeMount(() => {
+      setTimeout(() => {
+        try {
+          set?.GetBlendingConfig("").then((res) => {
+            let tmp = JSON.parse(res ? res.config : "");
+            EnableBlending.value = tmp.enable;
+            $store.commit("setEnablefusion", tmp.enable);
+            config.value.col = tmp.col;
+            config.value.row = tmp.row;
+            $store.commit("setfusion_configuration", res?.config);
+          });
+        } catch (error) {
+          erroe();
+        }
+      }, 1000);
+    });
+    onMounted(() => {
+      setTimeout(() => {
+        set?.GetBlendingConfig("").then((res) => {
+          let tmp = JSON.parse(res ? res.config : "");
+          //console.log(tmp.options[0][1])
+          let local_options = [
+            [hide_desktop_value_id, hide_desktop_value],
+            [disable_blending_params_id, disable_blending_params],
+            [show_blending_grids_id, show_blending_grids]
+          ];
+          let k: any;
+          for (k in local_options) {
+            let local_opt = local_options[k];
+            let opt = tmp.options[(<any>local_opt[0].value)];
+            if (opt) {
+              local_opt[1].value = ("0" == opt || "false" == opt.toLowerCase() ? false : true);
+            }
+          }
+        });
+      }, 1000);
+    });
+    return {
+      send_hide_desktop,
+      hide_desktop_value,
+      send_disable_blending_params,
+      disable_blending_params,
+      send_show_blending_grids,
+      show_blending_grids,
+      clear,
+      show_dialog,
+      options,
+      copyToClipboard,
+      showDialog,
+      EnableBlending,
+      config,
+      save,
+      resetall
+    };
   },
-  });
+});
 </script>

From 21fc52f85b4a76e4f1ed87819b65059a2018607c Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sun, 29 Jan 2023 14:04:08 +0800
Subject: [PATCH 32/78] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 29593fc..017538d 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -252,7 +252,6 @@ export default defineComponent({
       setTimeout(() => {
         set?.GetBlendingConfig("").then((res) => {
           let tmp = JSON.parse(res ? res.config : "");
-          //console.log(tmp.options[0][1])
           let local_options = [
             [hide_desktop_value_id, hide_desktop_value],
             [disable_blending_params_id, disable_blending_params],

From 2de84af0fe676dcc9b14b1ecf084b074d587a985 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sun, 29 Jan 2023 16:52:38 +0800
Subject: [PATCH 33/78] =?UTF-8?q?=E9=92=88=E5=AF=B9=E4=BD=8E=E5=88=86?=
 =?UTF-8?q?=E8=BE=A8=E7=8E=87=E5=81=9A=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      |  53 +-
 .../FusionSettings/SurfaceCorrection.vue      | 464 ++++--------------
 src/components/FusionSettingsDialog.vue       |  21 +-
 3 files changed, 147 insertions(+), 391 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 7f84177..186c22a 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -55,7 +55,7 @@
             <div class="col-8">
               <q-input @focus="isactivearray[0] = false" filled type="number" class="q-pt-md" :dense="true"
                 v-model="value[0].y" label="y" lazy-rules />
-              <q-btn color="white" @click="reset(0)" text-color="black" :label="$t('reset') + ' v1'" />
+              <q-btn dense color="white" @click="reset(0)" text-color="black" :label="$t('reset') + ' v1'" />
             </div>
           </div>
         </div>
@@ -65,7 +65,7 @@
             <div class="col-8">
               <q-input @focus="isactivearray[1] = false" filled type="number" class="q-pt-md" :dense="true"
                 v-model="value[1].y" label="y" lazy-rules />
-              <q-btn color="white" @click="reset(1)" text-color="black" :label="$t('reset') + ' v2'" />
+              <q-btn dense color="white" @click="reset(1)" text-color="black" :label="$t('reset') + ' v2'" />
             </div>
           </div>
         </div>
@@ -75,7 +75,7 @@
             <div class="col-8">
               <q-input @focus="isactivearray[2] = false" filled type="number" class="q-pt-md" :dense="true"
                 v-model="value[2].y" label="y" lazy-rules />
-              <q-btn color="white" @click="reset(2)" text-color="black" :label="$t('reset') + ' v3'" />
+              <q-btn dense color="white" @click="reset(2)" text-color="black" :label="$t('reset') + ' v3'" />
             </div>
           </div>
         </div>
@@ -85,7 +85,7 @@
             <div class="col-8">
               <q-input @focus="isactivearray[3] = false" filled type="number" class="q-pt-md" :dense="true"
                 v-model="value[3].y" label="y" lazy-rules />
-              <q-btn color="white" @click="reset(3)" text-color="black" :label="$t('reset') + ' v4'" />
+              <q-btn dense color="white" @click="reset(3)" text-color="black" :label="$t('reset') + ' v4'" />
             </div>
           </div>
         </div>
@@ -95,7 +95,7 @@
             <div class="col-8">
               <q-input @focus="isactivearray[4] = false" filled type="number" class="q-pt-md" :dense="true"
                 v-model="value[4].y" label="y" lazy-rules />
-              <q-btn color="white" @click="reset(4)" text-color="black" :label="$t('reset') + ' v5'" />
+              <q-btn dense color="white" @click="reset(4)" text-color="black" :label="$t('reset') + ' v5'" />
             </div>
           </div>
         </div>
@@ -103,38 +103,38 @@
     </div>
     <div class="col-1"></div>
     <div class="col-11">
-      <div class="row">
-        <div class="col-1">
+      <div class="box">
+        <div class="box_son">
           <q-input filled @focus="isactivearray[5] = false" type="number" class="q-pt-md" :dense="true"
             v-model="value[5].x" label="x" lazy-rules />
-          <q-btn color="white" @click="reset(5)" text-color="black" :label="$t('reset') + ' h1'" />
+          <q-btn dense color="white" @click="reset(5)" text-color="black" :label="$t('reset') + ' h1'" />
         </div>
-        <div class="col-1"></div>
-        <div class="col-1">
+
+        <div class="box_son">
           <q-input filled @focus="isactivearray[6] = false" type="number" class="q-pt-md" :dense="true"
             v-model="value[6].x" label="x" lazy-rules />
-          <q-btn color="white" @click="reset(6)" text-color="black" :label="$t('reset') + ' h2'" />
+          <q-btn dense color="white" @click="reset(6)" text-color="black" :label="$t('reset') + ' h2'" />
         </div>
-        <div class="col-1"></div>
-        <div class="col-1">
+
+        <div class="box_son">
           <q-input filled @focus="isactivearray[7] = false" type="number" class="q-pt-md" :dense="true"
             v-model="value[7].x" label="x" lazy-rules />
-          <q-btn color="white" @click="reset(7)" text-color="black" :label="$t('reset') + ' h3'" />
+          <q-btn dense color="white" @click="reset(7)" text-color="black" :label="$t('reset') + ' h3'" />
         </div>
-        <div class="col-1"></div>
-        <div class="col-1">
+
+        <div class="box_son">
           <q-input filled @focus="isactivearray[8] = false" type="number" class="q-pt-md" :dense="true"
             v-model="value[8].x" label="x" lazy-rules />
-          <q-btn color="white" @click="reset(8)" text-color="black" :label="$t('reset') + ' h4'" />
+          <q-btn dense color="white" @click="reset(8)" text-color="black" :label="$t('reset') + ' h4'" />
         </div>
-        <div class="col-1"></div>
-        <div class="col-1">
+
+        <div class="box_son">
           <q-input filled @focus="isactivearray[9] = false" type="number" class="q-pt-md" :dense="true"
             v-model="value[9].x" label="x" lazy-rules />
-          <q-btn color="white" @click="reset(9)" text-color="black" :label="$t('reset') + ' h5'" />
+          <q-btn dense color="white" @click="reset(9)" text-color="black" :label="$t('reset') + ' h5'" />
         </div>
-        <div class="col-1"></div>
-        <div class="col-1 q-pt-xl">
+
+        <div class="box_son q-pt-xl">
           <q-btn
             color="white"
             @click="resetall"
@@ -148,7 +148,14 @@
 </template>
 
 <style scoped>
-
+.box{
+  display: flex;
+  justify-content:space-between;
+}
+.box_son{
+  width: 10rem;
+  padding-right: 1rem;
+}
 </style>
 <script lang="ts">
 import {
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 10c7b54..bda7ee3 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -3,420 +3,156 @@
     <div class="col-4">
       <div class="row">
         <div class="col-6"></div>
-        <div class="col-3">
-          <q-input
-            filled
-            type="number"
-            class="q-pt-md"
-            @focus="isactivearray[0] = false"
-            :dense="true"
-            v-model="nine[0].x"
-            label="x"
-            lazy-rules
-          />
-          <q-input
-            filled
-            type="number"
-            class="q-pt-md"
-            @focus="isactivearray[0] = false"
-            :dense="true"
-            v-model="nine[0].y"
-            label="y"
-            lazy-rules
-          />
-          <q-btn
-            color="white"
-            @click="reset(0)"
-            text-color="black"
-            :label="$t('reset') + $t('point') + '1'"
-          />
-        </div>
-      </div>
-    </div>
-    <div class="col-4">
-      <div class="row">
-        <div class="col-5"></div>
-        <div class="col-3">
-          <q-input
-            filled
-            type="number"
-            class="q-pt-md"
-            @focus="isactivearray[1] = false"
-            :dense="true"
-            v-model="nine[1].x"
-            label="x"
-            lazy-rules
-          />
-          <q-input
-            filled
-            type="number"
-            class="q-pt-md"
-            @focus="isactivearray[1] = false"
-            :dense="true"
-            v-model="nine[1].y"
-            label="y"
-            lazy-rules
-          />
-          <q-btn
-            color="white"
-            @click="reset(1)"
-            text-color="black"
-            :label="$t('reset') + $t('point') + '2'"
-          />
-        </div>
-
-        <div class="col-3" style="margin-left: 5px">
-          <q-input
-            filled
-            type="number"
-            class="q-pt-md"
-            :dense="true"
-            v-model="nine[4].x"
-            label="x"
-            @focus="isactivearray[4] = false"
-            lazy-rules
-          />
-          <q-input
-            filled
-            type="number"
-            class="q-pt-md"
-            :dense="true"
-            v-model="nine[4].y"
-            label="y"
-            @focus="isactivearray[4] = false"
-            lazy-rules
-          />
-          <q-btn
-            color="white"
-            @click="reset(4)"
-            text-color="black"
-            :label="$t('reset') + $t('point') + '5'"
-          />
+        <div class="col-6">
+          <q-input filled type="number" class="q-pb-xs q-pt-md" @focus="isactivearray[0] = false" :dense="true"
+            v-model="nine[0].x" label="x" lazy-rules />
+          <q-input filled type="number" class="" @focus="isactivearray[0] = false" :dense="true"
+            v-model="nine[0].y" label="y" lazy-rules />
+          <q-btn size="sm" dense color="white" @click="reset(0)" text-color="black" :label="$t('reset') + $t('point') + '1'" />
         </div>
       </div>
     </div>
     <div class="col-4">
       <div class="row">
         <div class="col-4"></div>
-        <div class="col-3">
-          <q-input
-            filled
-            type="number"
-            @focus="isactivearray[2] = false"
-            class="q-pt-md"
-            :dense="true"
-            v-model="nine[2].x"
-            label="x"
-            lazy-rules
-          />
-          <q-input
-            filled
-            type="number"
-            class="q-pt-md"
-            @focus="isactivearray[2] = false"
-            :dense="true"
-            v-model="nine[2].y"
-            label="y"
-            lazy-rules
-          />
-          <q-btn
-            color="white"
-            @click="reset(2)"
-            text-color="black"
-            :label="$t('reset') + $t('point') + '3'"
-          />
+        <div class="col-4">
+          <q-input filled type="number" class="q-pb-xs q-pt-md" @focus="isactivearray[1] = false" :dense="true"
+            v-model="nine[1].x" label="x" lazy-rules />
+          <q-input filled type="number" class="" @focus="isactivearray[1] = false" :dense="true"
+            v-model="nine[1].y" label="y" lazy-rules />
+          <q-btn size="sm" dense color="white" @click="reset(1)" text-color="black" :label="$t('reset') + $t('point') + '2'" />
+        </div>
+
+        <div class="col-4" style="padding-left: 2px">
+          <q-input filled type="number" class="q-pb-xs  q-pt-md" :dense="true" v-model="nine[4].x" label="x"
+            @focus="isactivearray[4] = false" lazy-rules />
+          <q-input filled type="number" class="" :dense="true" v-model="nine[4].y" label="y"
+            @focus="isactivearray[4] = false" lazy-rules />
+          <q-btn size="sm" dense color="white" @click="reset(4)" text-color="black" :label="$t('reset') + $t('point') + '5'" />
+        </div>
+      </div>
+    </div>
+    <div class="col-4">
+      <div class="row">
+        <div class="col-3"></div>
+        <div class="col-6">
+          <q-input filled type="number" @focus="isactivearray[2] = false" class="q-pb-xs q-pt-md" :dense="true"
+            v-model="nine[2].x" label="x" lazy-rules />
+          <q-input filled type="number" class="" @focus="isactivearray[2] = false" :dense="true"
+            v-model="nine[2].y" label="y" lazy-rules />
+          <q-btn size="sm" dense color="white" @click="reset(2)" text-color="black" :label="$t('reset') + $t('point') + '3'" />
         </div>
       </div>
     </div>
     <div class="col-2">
       <div class="row" style="margin-top: 10vh">
-        <div class="col-6"></div>
-        <div class="col-6">
-          <q-input
-            filled
-            type="number"
-            @focus="isactivearray[3] = false"
-            class="q-pt-md"
-            :dense="true"
-            v-model="nine[3].x"
-            label="x"
-            lazy-rules
-          />
-          <q-input
-            filled
-            type="number"
-            class="q-pt-md"
-            @focus="isactivearray[3] = false"
-            :dense="true"
-            v-model="nine[3].y"
-            label="y"
-            lazy-rules
-          />
-          <q-btn
-            color="white"
-            @click="reset(3)"
-            text-color="black"
-            :label="$t('reset') + $t('point') + '4'"
-          />
+        <div class="col-2"></div>
+        <div class="col-10">
+          <q-input filled type="number" @focus="isactivearray[3] = false" class="q-pb-xs q-pt-md" :dense="true"
+            v-model="nine[3].x" label="x" lazy-rules />
+          <q-input filled type="number" class="" @focus="isactivearray[3] = false" :dense="true"
+            v-model="nine[3].y" label="y" lazy-rules />
+          <q-btn size="sm" dense color="white" @click="reset(3)" text-color="black" :label="$t('reset') + $t('point') + '4'" />
         </div>
       </div>
     </div>
     <div class="col-8">
       <div ref="div" style="background-color: #7fffd4; height: 40vh">
         <div style="position: absolute">
-          <vue3ResizeDrag
-            :isActive="isactivearray[0]"
-            v-if="isshowarray[0]"
-            :w="30"
-            :h="20"
-            :x="ninepostion[0].x"
-            :y="ninepostion[0].y"
-            @mousedown="activeMouseDown(0)"
-            :isResizable="false"
-            @moveHandler="moveHandler_1"
-            ><span>{{ $t("point") }}1</span>
+          <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="20" :x="ninepostion[0].x"
+            :y="ninepostion[0].y" @mousedown="activeMouseDown(0)" :isResizable="false" @moveHandler="moveHandler_1">
+            <span>{{ $t("point") }}1</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[1]"
-            v-if="isshowarray[1]"
-            :w="30"
-            :h="20"
-            :x="ninepostion[1].x"
-            :y="ninepostion[1].y"
-            @mousedown="activeMouseDown(1)"
-            :isResizable="false"
-            @moveHandler="moveHandler_2"
-            ><span>{{ $t("point") }}2</span>
+          <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="20" :x="ninepostion[1].x"
+            :y="ninepostion[1].y" @mousedown="activeMouseDown(1)" :isResizable="false" @moveHandler="moveHandler_2">
+            <span>{{ $t("point") }}2</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[2]"
-            v-if="isshowarray[2]"
-            :w="30"
-            :h="20"
-            :x="ninepostion[2].x"
-            :y="ninepostion[2].y"
-            @mousedown="activeMouseDown(2)"
-            :isResizable="false"
-            @moveHandler="moveHandler_3"
-            ><span>{{ $t("point") }}3</span>
+          <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="20" :x="ninepostion[2].x"
+            :y="ninepostion[2].y" @mousedown="activeMouseDown(2)" :isResizable="false" @moveHandler="moveHandler_3">
+            <span>{{ $t("point") }}3</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[3]"
-            v-if="isshowarray[3]"
-            :w="30"
-            :h="20"
-            :x="ninepostion[3].x"
-            :y="ninepostion[3].y"
-            @mousedown="activeMouseDown(3)"
-            :isResizable="false"
-            @moveHandler="moveHandler_4"
-            ><span>{{ $t("point") }}4</span>
+          <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="20" :x="ninepostion[3].x"
+            :y="ninepostion[3].y" @mousedown="activeMouseDown(3)" :isResizable="false" @moveHandler="moveHandler_4">
+            <span>{{ $t("point") }}4</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[4]"
-            v-if="isshowarray[4]"
-            :w="30"
-            :h="20"
-            :x="ninepostion[4].x"
-            :y="ninepostion[4].y"
-            @mousedown="activeMouseDown(4)"
-            :isResizable="false"
-            @moveHandler="moveHandler_5"
-            ><span>{{ $t("point") }}5</span>
+          <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="20" :x="ninepostion[4].x"
+            :y="ninepostion[4].y" @mousedown="activeMouseDown(4)" :isResizable="false" @moveHandler="moveHandler_5">
+            <span>{{ $t("point") }}5</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[5]"
-            v-if="isshowarray[5]"
-            :w="30"
-            :h="20"
-            :x="ninepostion[5].x"
-            :y="ninepostion[5].y"
-            @mousedown="activeMouseDown(5)"
-            :isResizable="false"
-            @moveHandler="moveHandler_6"
-            ><span>{{ $t("point") }}6</span>
+          <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="30" :h="20" :x="ninepostion[5].x"
+            :y="ninepostion[5].y" @mousedown="activeMouseDown(5)" :isResizable="false" @moveHandler="moveHandler_6">
+            <span>{{ $t("point") }}6</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[6]"
-            v-if="isshowarray[6]"
-            :w="30"
-            :h="20"
-            :x="ninepostion[6].x"
-            :y="ninepostion[6].y"
-            @mousedown="activeMouseDown(6)"
-            :isResizable="false"
-            @moveHandler="moveHandler_7"
-            ><span>{{ $t("point") }}7</span>
+          <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="30" :h="20" :x="ninepostion[6].x"
+            :y="ninepostion[6].y" @mousedown="activeMouseDown(6)" :isResizable="false" @moveHandler="moveHandler_7">
+            <span>{{ $t("point") }}7</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[7]"
-            v-if="isshowarray[7]"
-            :w="30"
-            :h="20"
-            :x="ninepostion[7].x"
-            :y="ninepostion[7].y"
-            @mousedown="activeMouseDown(7)"
-            :isResizable="false"
-            @moveHandler="moveHandler_8"
-            ><span>{{ $t("point") }}8</span>
+          <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="30" :h="20" :x="ninepostion[7].x"
+            :y="ninepostion[7].y" @mousedown="activeMouseDown(7)" :isResizable="false" @moveHandler="moveHandler_8">
+            <span>{{ $t("point") }}8</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
-            :isActive="isactivearray[8]"
-            v-if="isshowarray[8]"
-            :w="30"
-            :h="20"
-            :x="ninepostion[8].x"
-            :y="ninepostion[8].y"
-            @mousedown="activeMouseDown(8)"
-            :isResizable="false"
-            @moveHandler="moveHandler_9"
-            ><span>{{ $t("point") }}9</span>
+          <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="30" :h="20" :x="ninepostion[8].x"
+            :y="ninepostion[8].y" @mousedown="activeMouseDown(8)" :isResizable="false" @moveHandler="moveHandler_9">
+            <span>{{ $t("point") }}9</span>
           </vue3ResizeDrag>
         </div>
       </div>
     </div>
     <div class="col-2">
       <div class="row" style="margin-top: 10vh">
-        <div class="col-6">
-          <q-input
-            filled
-            type="number"
-            @focus="isactivearray[5] = false"
-            class="q-pt-md"
-            :dense="true"
-            v-model="nine[5].x"
-            label="x"
-            lazy-rules
-          />
-          <q-input
-            filled
-            type="number"
-            class="q-pt-md"
-            @focus="isactivearray[5] = false"
-            :dense="true"
-            v-model="nine[5].y"
-            label="y"
-            lazy-rules
-          />
-          <q-btn
-            color="white"
-            @click="reset(5)"
-            text-color="black"
-            :label="$t('reset') + $t('point') + '6'"
-          />
+        <div class="col-10">
+          <q-input filled type="number" @focus="isactivearray[5] = false" class="q-pb-xs" :dense="true"
+            v-model="nine[5].x" label="x" lazy-rules />
+          <q-input filled type="number" class="" @focus="isactivearray[5] = false" :dense="true"
+            v-model="nine[5].y" label="y" lazy-rules />
+          <q-btn size="sm" dense color="white" @click="reset(5)" text-color="black" :label="$t('reset') + $t('point') + '6'" />
         </div>
       </div>
     </div>
     <div class="col-4">
       <div class="row">
         <div class="col-6">
-          <q-btn
-            color="white"
-            @click="resetall"
-            text-color="black"
-            :label="$t('resetall')"
-          />
+          <q-btn color="white"  @click="resetall" text-color="black" :label="$t('resetall')" />
         </div>
-        <div class="col-3">
-          <q-input
-            filled
-            type="number"
-            @focus="isactivearray[6] = false"
-            class="q-pt-md"
-            :dense="true"
-            v-model="nine[6].x"
-            label="x"
-            lazy-rules
-          />
-          <q-input
-            filled
-            type="number"
-            class="q-pt-md"
-            @focus="isactivearray[6] = false"
-            :dense="true"
-            v-model="nine[6].y"
-            label="y"
-            lazy-rules
-          />
-          <q-btn
-            color="white"
-            @click="reset(6)"
-            text-color="black"
-            :label="$t('reset') + $t('point') + '7'"
-          />
-        </div>
-      </div>
-    </div>
-    <div class="col-4">
-      <div class="row">
-        <div class="col-6"></div>
-        <div class="col-3">
-          <q-input
-            filled
-            type="number"
-            @focus="isactivearray[7] = false"
-            class="q-pt-md"
-            :dense="true"
-            v-model="nine[7].x"
-            label="x"
-            lazy-rules
-          />
-          <q-input
-            filled
-            type="number"
-            class="q-pt-md"
-            @focus="isactivearray[7] = false"
-            :dense="true"
-            v-model="nine[7].y"
-            label="y"
-            lazy-rules
-          />
-          <q-btn
-            color="white"
-            @click="reset(7)"
-            text-color="black"
-            :label="$t('reset') + $t('point') + '8'"
-          />
+        <div class="col-6">
+          <q-input filled type="number" @focus="isactivearray[6] = false" class="q-pb-xs" :dense="true"
+            v-model="nine[6].x" label="x" lazy-rules />
+          <q-input filled type="number" class="" @focus="isactivearray[6] = false" :dense="true"
+            v-model="nine[6].y" label="y" lazy-rules />
+          <q-btn size="sm" dense color="white" @click="reset(6)" text-color="black" :label="$t('reset') + $t('point') + '7'" />
         </div>
       </div>
     </div>
     <div class="col-4">
       <div class="row">
         <div class="col-4"></div>
-        <div class="col-3">
-          <q-input
-            filled
-            type="number"
-            @focus="isactivearray[8] = false"
-            class="q-pt-md"
-            :dense="true"
-            v-model="nine[8].x"
-            label="x"
-            lazy-rules
-          />
-          <q-input
-            filled
-            type="number"
-            class="q-pt-md"
-            @focus="isactivearray[8] = false"
-            :dense="true"
-            v-model="nine[8].y"
-            label="y"
-            lazy-rules
-          />
-          <q-btn
-            color="white"
-            @click="reset(8)"
-            text-color="black"
-            :label="$t('reset') + $t('point') + '9'"
-          />
+        <div class="col-6">
+          <q-input filled type="number" @focus="isactivearray[7] = false" class="q-pb-xs" :dense="true"
+            v-model="nine[7].x" label="x" lazy-rules />
+          <q-input filled type="number" class="" @focus="isactivearray[7] = false" :dense="true"
+            v-model="nine[7].y" label="y" lazy-rules />
+          <q-btn size="sm" dense color="white" @click="reset(7)" text-color="black" :label="$t('reset') + $t('point') + '8'" />
+        </div>
+      </div>
+    </div>
+    <div class="col-4">
+      <div class="row">
+        <div class="col-3"></div>
+        <div class="col-6">
+          <q-input filled type="number" @focus="isactivearray[8] = false" class="q-pb-xs" :dense="true"
+            v-model="nine[8].x" label="x" lazy-rules />
+          <q-input filled type="number" class="" @focus="isactivearray[8] = false" :dense="true"
+            v-model="nine[8].y" label="y" lazy-rules />
+          <q-btn size="sm" dense color="white" @click="reset(8)" text-color="black" :label="$t('reset') + $t('point') + '9'" />
         </div>
       </div>
     </div>
   </div>
 </template>
 
-<style scoped></style>
+<style scoped>
+
+</style>
 <script lang="ts">
 import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
 import GlobalData from "src/common/GlobalData";
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 017538d..9a6a359 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -85,11 +85,12 @@
           <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall config')" />
           <div class="q-space" data-v-39efcd1f=""></div>
           <q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup
-            @click="$store.commit('setSelectedProjector', '0/0')" />
-          <q-btn flat :label="$t('save config')" no-caps color="primary" @click="save" v-close-popup />
+            @click="$store.commit('setSelectedProjector', '0/0');"  />
+          <q-btn flat :label="$t('save config')"  no-caps color="primary" @click="save"  />
         </q-card-actions>
       </q-form>
     </q-card>
+
   </q-dialog>
 </template>
 
@@ -144,6 +145,7 @@ export default defineComponent({
     let $q = useQuasar();
     let $t = useI18n();
     let show_dialog = ref(false);
+    const save_name=ref("")
     const showDialog = async () => {
       show_dialog.value = true;
     };
@@ -169,6 +171,7 @@ export default defineComponent({
     const disable_blending_params = ref(false);
     const show_blending_grids_id = ref("blending_grids_show");
     const show_blending_grids = ref(false);
+    const medium = ref(false);
     const options = computed({
       get() {
         return optionsstr.value;
@@ -197,7 +200,7 @@ export default defineComponent({
     };
     const save = () => {
       set?.SaveBlendingConfig("");
-      show_dialog.value = false;
+      //show_dialog.value = false;
       clear();
       set?.GetBlendingConfig("").then((res) => {
         let tmp = JSON.parse(res ? res.config : "");
@@ -208,6 +211,7 @@ export default defineComponent({
         $store.commit("setfusion_configuration", res?.config);
       });
       $store.commit("setSelectedProjector", "0/0");
+      medium.value=true
     };
     const getconfig = () => {
       try {
@@ -268,6 +272,10 @@ export default defineComponent({
         });
       }, 1000);
     });
+    const save_cover_name=ref(" ")
+    const plan_list= [
+        'Google', 'Facebook', 'Twitter', 'Apple', 'Oracle'
+      ]
     return {
       send_hide_desktop,
       hide_desktop_value,
@@ -283,7 +291,12 @@ export default defineComponent({
       EnableBlending,
       config,
       save,
-      resetall
+      resetall,
+      medium,
+      save_name,
+      save_cover_name,
+      plan_list
+
     };
   },
 });

From 6765c47ef3be3c947faa53182e5411a777fa9c7c Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Mon, 30 Jan 2023 10:33:09 +0800
Subject: [PATCH 34/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=92=8C=E8=AF=BB=E5=8F=96=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/FourPointCalibration.vue   |  3 +-
 .../FusionSettings/FusionLocale.vue           |  4 +-
 src/components/FusionSettingsDialog.vue       | 63 ++++++++++++++++---
 src/i18n/en-US/index.ts                       |  9 ++-
 src/i18n/zh-CN/index.ts                       |  9 ++-
 5 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index aa86ce7..69160aa 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -207,7 +207,6 @@ import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
 import ClientConnection from "src/common/ClientConnection";
 import GlobalData from "src/common/GlobalData";
-import { json } from "body-parser";
 
 export default defineComponent({
   name: "ComponentFourPointCalibration",
@@ -513,7 +512,7 @@ export default defineComponent({
         isactivearray.value[index] = false;
       }
     };
-    //手动同步 
+    //手动同步
     const set_point_x = () => {
       let x = Math.ceil(four[0].x / Proportion.value.x);
       let y = Math.ceil((config.height - four[0].y) / Proportion.value.y);
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 4067013..59f4aac 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -190,6 +190,7 @@ export default defineComponent({
         default:
           break;
       }
+      save_set_cache()
     }
     const reduce = (type: string) => {
       let tmp: Number;
@@ -341,8 +342,7 @@ export default defineComponent({
         array[arr[index]].isshow = config.params[index].enable;
         array[arr[index]].value = Number(config.params[index].size);
       }
-      if (sessionStorage.FusionLocale)
-        set_cache.value = JSON.parse(sessionStorage.FusionLocale);
+      if (sessionStorage.FusionLocale)set_cache.value = JSON.parse(sessionStorage.FusionLocale);
       use_set_cache();
       setnowindex();
     };
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 9a6a359..2726173 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -84,13 +84,50 @@
           <div class="q-space" data-v-39efcd1f=""></div>
           <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall config')" />
           <div class="q-space" data-v-39efcd1f=""></div>
+          <q-btn flat :label="$t('Select saved configuration')" no-caps color="primary"
+            @click="select_configuration = true" />
           <q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup
-            @click="$store.commit('setSelectedProjector', '0/0');"  />
-          <q-btn flat :label="$t('save config')"  no-caps color="primary" @click="save"  />
+            @click="$store.commit('setSelectedProjector', '0/0');" />
+          <q-btn flat :label="$t('save config')" no-caps color="primary" @click="save" />
         </q-card-actions>
       </q-form>
     </q-card>
 
+    <q-dialog v-model="medium">
+      <q-card style="width: 700px; max-width: 80vw;">
+        <q-card-section>
+          <div class="text-h6">{{ $t('Whether to save the configuration') }}</div>
+        </q-card-section>
+        <q-card-section class="q-pt-none">
+          <q-input filled v-model="save_name" :label="$t('New Please enter a name')" />
+          <q-select v-show="save_name.length == 0" filled v-model="save_cover_name" :options="plan_list"
+          :label="$t('Please select an override')" />
+        </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')" color="primary" v-close-popup />
+        </q-card-actions>
+      </q-card>
+    </q-dialog>
+
+
+    <q-dialog v-model="select_configuration">
+      <q-card style="width: 700px; max-width: 80vw;">
+        <q-card-section>
+          <div class="text-h6">{{ $t('read saved configuration') }}</div>
+        </q-card-section>
+        <q-card-section class="q-pt-none">
+          <q-select filled v-model="select_configuration_name" :options="plan_list" :label="$t('please choose')" />
+        </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="apply_the_selected_configuration" color="primary" v-close-popup />
+        </q-card-actions>
+      </q-card>
+    </q-dialog>
+
+
+
   </q-dialog>
 </template>
 
@@ -145,10 +182,12 @@ export default defineComponent({
     let $q = useQuasar();
     let $t = useI18n();
     let show_dialog = ref(false);
-    const save_name=ref("")
+    const save_name = ref("")
     const showDialog = async () => {
       show_dialog.value = true;
     };
+    const select_configuration = ref(false)
+    const select_configuration_name = ref("")
     const send_hide_desktop = () => {
       set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0");
     };
@@ -211,7 +250,7 @@ export default defineComponent({
         $store.commit("setfusion_configuration", res?.config);
       });
       $store.commit("setSelectedProjector", "0/0");
-      medium.value=true
+      medium.value = true
     };
     const getconfig = () => {
       try {
@@ -272,10 +311,13 @@ export default defineComponent({
         });
       }, 1000);
     });
-    const save_cover_name=ref(" ")
-    const plan_list= [
-        'Google', 'Facebook', 'Twitter', 'Apple', 'Oracle'
-      ]
+    const save_cover_name = ref(" ")
+    const plan_list = [
+      'Google', 'Facebook', 'Twitter', 'Apple', 'Oracle'
+    ]
+    const apply_the_selected_configuration = () => {
+      //这里根据选择的配置 应用
+    }
     return {
       send_hide_desktop,
       hide_desktop_value,
@@ -295,7 +337,10 @@ export default defineComponent({
       medium,
       save_name,
       save_cover_name,
-      plan_list
+      plan_list,
+      select_configuration,
+      select_configuration_name,
+      apply_the_selected_configuration
 
     };
   },
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index e47a08f..8b1eeb7 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -431,5 +431,12 @@ export default {
   "line color":"line color",
   "center line color":"center line color",
   "center circle color":"center circle color",
-  "Whether to operate synchronously":"Whether to operate synchronously"
+  "Whether to operate synchronously":"Whether to operate synchronously",
+  "Select saved configuration":"Select saved configuration",
+  "read saved configuration":"read saved configuration",
+  "please choose":"please choose",
+  "save":"save",
+  "Whether to save the configuration":"Whether to save the configuration",
+  "New Please enter a name":"New Please enter a name",
+  "Please select an override":"Please select an override"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index e2e839d..8b11266 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -700,5 +700,12 @@ export default {
   "line color":"线条颜色",
   "center line color":"中心线颜色",
   "center circle color":"中心圆颜色",
-  "Whether to operate synchronously":"是否同步操作"
+  "Whether to operate synchronously":"是否同步操作",
+  "Select saved configuration":"选择保存的配置",
+  "read saved configuration":"读取保存的配置",
+  "please choose":"请选择",
+  "save":"保存",
+  "Whether to save the configuration":"是否保存配置",
+  "New Please enter a name":"新建 请输入名称",
+  "Please select an override":"请选择覆盖"
 };

From 3607edc45ae90921bba6f6767faa48995dbae1ec Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Mon, 30 Jan 2023 14:11:42 +0800
Subject: [PATCH 35/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddiv=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=A4=B1=E8=B4=A5=E6=97=B6=E5=8F=91=E5=87=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/FourPointCalibration.vue |  4 ++++
 src/components/FusionSettings/SurfaceCorrection.vue    | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 69160aa..75cf35a 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -323,6 +323,7 @@ export default defineComponent({
     };
 
     const setpoa = () => {
+      try {
       points[0].x = 0;
       points[0].y = 0;
 
@@ -366,6 +367,9 @@ export default defineComponent({
       } else {
       }
       set_point_x();
+    } catch (error) {
+
+      }
     };
     watch(
       () => four[0],
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index bda7ee3..48fa5ba 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -441,7 +441,8 @@ export default defineComponent({
     onMounted(() => {
       window.onresize = () => {
         return (() => {
-          ste_status.value = 1;
+          try {
+            ste_status.value = 1;
           startpostion();
           for (
             let index = 0;
@@ -458,6 +459,9 @@ export default defineComponent({
           setTimeout(() => {
             ste_status.value = 0;
           }, 100);
+          } catch (error) {
+
+          }
         })();
       };
     });
@@ -469,6 +473,7 @@ export default defineComponent({
       }
     };
     const startpostion = () => {
+      try {
       ninepostion.value[0].x = 0;
       ninepostion.value[0].y = 0;
 
@@ -514,6 +519,9 @@ export default defineComponent({
       } else {
       }
       syncpoint();
+    } catch (error) {
+
+      }
     };
     const use_server_config = () => {
       for (let index = 0; index < defaultninepostion.value.length; index++) {

From aadd5793278d5a9f00848fbfb1458ec44573b837 Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Sat, 28 Jan 2023 14:12:46 +0800
Subject: [PATCH 36/78] =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E8=AF=BB=E5=8F=96=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 2726173..4364f37 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -272,7 +272,6 @@ export default defineComponent({
         sessionStorage.removeItem("FourPointCalibration");
         sessionStorage.removeItem("GridSettings");
       }, 500);
-      getconfig();
     };
 
     onBeforeMount(() => {

From e7a3489054ded1801141968c88cfe49c00efdb44 Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Mon, 30 Jan 2023 17:18:11 +0800
Subject: [PATCH 37/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9id=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/GridSettings.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 38dcb58..685762e 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -141,11 +141,11 @@ export default defineComponent({
       setTimeout(() => {
         switch (type) {
           case 0:
-            set?.SetBlendingOption("blending_grids_hide_row", RowsColumns[type] + "");
+            set?.SetBlendingOption("blending_grids_show_row", RowsColumns[type] + "");
             break;
           case 1:
             if (!RowsColumns[1]) RowsColumns[2] = false; RowsColumns[3] = false
-            set?.SetBlendingOption("blending_grids_hide_column", RowsColumns[type] + "");
+            set?.SetBlendingOption("blending_grids_show_column", RowsColumns[type] + "");
             break;
           case 2:
 
@@ -163,8 +163,8 @@ export default defineComponent({
       model[0] = Number(server_conf.blending_grids_row)
       model[1] = Number(server_conf.blending_grids_column)
       color[0] = server_conf.blending_grids_line_color
-      RowsColumns[0] = server_conf.blending_grids_hide_row === "false" ? false : true
-      RowsColumns[1] = server_conf.blending_grids_hide_column === "false" ? false : true
+      RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true
+      RowsColumns[1] = server_conf.blending_grids_show_column === "false" ? false : true
     }
     use_server_config()
 

From 15bc9a11c962f211c6081f45937f3a01a07eb05f Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Mon, 30 Jan 2023 17:41:18 +0800
Subject: [PATCH 38/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileManageDialog.vue | 2691 +++++++++++++--------------
 1 file changed, 1345 insertions(+), 1346 deletions(-)

diff --git a/src/components/FileManageDialog.vue b/src/components/FileManageDialog.vue
index 5b198bb..f5df4af 100644
--- a/src/components/FileManageDialog.vue
+++ b/src/components/FileManageDialog.vue
@@ -1,1346 +1,1345 @@
-<template>
-  <q-dialog
-    persistent
-    v-model="show_dialog"
-    @before-hide="resetData"
-    @keydown="
-      (evt) => {
-        if (!loading && evt.keyCode == 27) {
-          show_dialog = false;
-        }
-      }
-    "
-  >
-    <q-card
-      class="overflow-hidden"
-      style="overflow-y: scroll; max-width: 70vw; max-height: 85vh"
-    >
-      <q-card-section class="q-ma-none q-pa-sm">
-        <div class="row">
-          <div v-if="status == 'select'" class="col-auto text-h6">
-            {{ $t("select file") }}({{ filters.join(";") }})
-          </div>
-          <div v-else class="col-auto text-h6">
-            {{ $t("file manage") }}
-          </div>
-          <q-space />
-          <div>
-            <q-btn
-              :loading="loading"
-              :disable="loading"
-              no-caps
-              flat
-              round
-              icon="close"
-              color="red"
-              v-close-popup
-            >
-              <q-tooltip>
-                {{ $t("close") }}
-              </q-tooltip>
-            </q-btn>
-          </div>
-        </div>
-      </q-card-section>
-
-      <q-separator />
-      <div class="row">
-        <div class="q-pa-md q-gutter-sm">
-          <q-breadcrumbs separator="/">
-            <q-breadcrumbs-el
-              :disable="uploading"
-              icon="home"
-              :label="default_path_label"
-              to="#"
-              @click="path = default_path"
-            />
-            <q-breadcrumbs-el
-              v-for="(item, index) of paths.slice(1)"
-              :key="index"
-              :label="item.name"
-              :disable="uploading"
-              to="#"
-              @click="path = item.path"
-            />
-          </q-breadcrumbs>
-        </div>
-      </div>
-      <q-separator />
-      <div class="row">
-        <q-btn-dropdown
-          stretch
-          flat
-          no-caps
-          :label="default_path_label"
-          :disable="uploading"
-        >
-          <q-list>
-            <q-item
-              v-for="(item, index) of disk_options"
-              :key="index"
-              clickable
-              v-close-popup
-              @click="default_path = item.value"
-            >
-              <q-item-section avatar>
-                <q-icon
-                  :name="item.label == $t('local disk') ? 'desktop_mac' : 'usb'"
-                />
-              </q-item-section>
-              <q-item-section> {{ item.label }} </q-item-section>
-            </q-item>
-          </q-list>
-        </q-btn-dropdown>
-        <q-btn
-          flat
-          icon="arrow_back"
-          no-caps
-          :disable="path.trim() == '' || uploading"
-          @click="backToParentPath"
-          :label="$t('back')"
-        >
-          <q-tooltip>
-            {{ $t("back") }}
-          </q-tooltip>
-        </q-btn>
-        <q-btn
-          flat
-          no-caps
-          icon="arrow_forward"
-          :disable="prev_path == '' || path == prev_path || uploading"
-          @click="(path = prev_path) && (prev_path = '')"
-          :label="$t('forward')"
-        >
-          <q-tooltip>
-            {{ $t("forward") }}
-          </q-tooltip>
-        </q-btn>
-        <q-btn
-          flat
-          icon="refresh"
-          no-caps
-          @click="refresh_file_list"
-          :disable="uploading"
-          :label="$t('refresh')"
-        >
-          <q-tooltip>
-            {{ $t("refresh") }}
-          </q-tooltip>
-        </q-btn>
-        <q-btn
-          flat
-          no-caps
-          icon="content_paste"
-          @click="pasteFile"
-          :disable="
-            !(clipboard && clipboard.type && clipboard.type != 'NONE') ||
-            path == clipboard.path
-          "
-          :label="$t('paste')"
-        >
-          <q-tooltip>
-            {{ $t("paste") }}
-          </q-tooltip>
-        </q-btn>
-        <q-btn
-          flat
-          icon="create_new_folder"
-          no-caps
-          @click="onCreateNewFolder"
-          :disable="loading || uploading"
-          :label="$t('create folder')"
-        >
-          <q-tooltip>
-            {{ $t("create folder") }}
-          </q-tooltip>
-        </q-btn>
-        <q-btn
-          flat
-          v-if="!uploading"
-          no-caps
-          icon="upload"
-          :label="$t('upload file')"
-          @click="uploading = true"
-        >
-          <q-tooltip>
-            {{ $t("upload file") }}
-          </q-tooltip>
-        </q-btn>
-        <q-btn
-          flat
-          icon="block"
-          no-caps
-          v-if="uploading"
-          :label="$t('cancel upload file')"
-          @click="uploading = false"
-        >
-          <q-tooltip>
-            {{ $t("cancel upload file") }}
-          </q-tooltip>
-        </q-btn>
-      </div>
-      <q-separator />
-
-      <q-card-section
-        style="width: 70vw; max-height: 85vh"
-        class="scroll q-pa-none q-ma-none"
-      >
-        {{}}
-        <q-table
-          :style="{
-            height:
-              ($q.platform.is.ipad && $store.state.landspace ? '61' : '68') +
-              'vh',
-          }"
-          class="q-mb-md"
-          v-show="!uploading"
-          :rows="files"
-          :columns="columns"
-          virtual-scroll
-          color="primary"
-          row-key="name"
-          :loading="loading"
-          :rows-per-page-options="[0]"
-          :virtual-scroll-sticky-size-start="48"
-          @row-contextmenu="onContextMenu"
-          @row-dblclick="onTableItemDBClick"
-        >
-          <template v-slot:loading>
-            <q-inner-loading showing color="primary" />
-          </template>
-          <template v-slot:body-cell="props">
-            <q-td :props="props">
-              <div v-if="props.col.name == 'name'">
-                <q-icon
-                  v-if="false && clipboard.name == props.value"
-                  :name="clipboard.type == 'COPY' ? 'file_copy' : 'content_cut'"
-                  style="color: #ffbe4a; font-size: 2.5em"
-                >
-                </q-icon>
-                <q-icon
-                  :name="props.row.is_directory ? 'folder' : 'description'"
-                  style="color: #ffbe4a; font-size: 2.5em"
-                ></q-icon>
-                {{
-                  props.value.length > 60
-                    ? props.value.substr(0, 60) + "..."
-                    : props.value
-                }}
-                <q-tooltip> {{ props.value }} </q-tooltip>
-              </div>
-              <div v-else-if="props.col.name == 'file_size'">
-                <span v-if="props.row.is_directory"> </span>
-                <span v-else>
-                  <span
-                    v-if="
-                      Math.floor(props.row.file_size / 1024 / 1024 / 1024) > 0
-                    "
-                  >
-                    {{
-                      (props.row.file_size / 1024 / 1024 / 1024).toFixed(2)
-                    }}GB
-                  </span>
-                  <span
-                    v-else-if="
-                      Math.floor(props.row.file_size / 1024 / 1024) > 0
-                    "
-                  >
-                    {{ (props.row.file_size / 1024 / 1024).toFixed(2) }}MB
-                  </span>
-                  <span v-else>
-                    {{ (props.row.file_size / 1024).toFixed(2) }} KB
-                  </span>
-                </span>
-              </div>
-              <div v-else-if="props.col.name != 'operator'">
-                {{ props.value }}
-              </div>
-              <div v-else>
-                <div v-if="status != 'select'">
-                  <div v-if="props.row.can_write">
-                    <a
-                      href="javascript:void(0)"
-                      @click="(evt) => renameFile(props.row)"
-                    >
-                      {{ $t("rename") }}
-                      <q-tooltip>
-                        {{ $t("click") }}{{ $t(" ") }}{{ $t("rename") }}
-                      </q-tooltip>
-                    </a>
-                    &nbsp;&nbsp;&nbsp;&nbsp;
-                    <a
-                      href="javascript:void(0)"
-                      @click="(evt) => copyFile(props.row)"
-                    >
-                      {{ $t("_copy2") }}
-                      <q-tooltip>
-                        {{ $t("click") }}{{ $t(" ") }}{{ $t("_copy2") }}
-                      </q-tooltip>
-                    </a>
-                    &nbsp;&nbsp;&nbsp;&nbsp;
-                    <a
-                      href="javascript:void(0)"
-                      @click="(evt) => cutFile(props.row)"
-                    >
-                      {{ $t("_cut2") }}
-                      <q-tooltip>
-                        {{ $t("click") }}{{ $t(" ") }}{{ $t("_cut2") }}
-                      </q-tooltip>
-                    </a>
-                    &nbsp;&nbsp;&nbsp;&nbsp;
-                    <a
-                      href="javascript:void(0)"
-                      @click="(evt) => deleteFile(props.row)"
-                    >
-                      {{ $t("delete") }}
-                      <q-tooltip>
-                        {{ $t("click") }}{{ $t(" ") }}{{ $t("delete") }}
-                      </q-tooltip>
-                    </a>
-                  </div>
-                </div>
-                <div v-else-if="!props.row.is_directory">
-                  <a
-                    href="javascript:void(0)"
-                    @click="(evt) => selectFile(props.row)"
-                  >
-                    {{ $t("select file") }}
-                    <q-tooltip>
-                      {{ $t("click") }}{{ $t(" ") }}{{ $t("select file") }}
-                    </q-tooltip>
-                  </a>
-                </div>
-              </div>
-            </q-td>
-          </template>
-          <template v-slot:pagination="scope">
-            <div class="col-2 text-h6">
-              {{ $t("file count") }}: {{ file_count }}
-            </div>
-            <div class="col-2 text-h6 q-mx-md">&nbsp;&nbsp;&nbsp;&nbsp;</div>
-            <div class="col-2 text-h6">
-              {{ $t("directoriy count") }}: {{ directory_count }}
-            </div>
-            <div
-              v-if="typeof free_space == 'number'"
-              class="col-2 text-h6 q-mx-md"
-            >
-              &nbsp;&nbsp;&nbsp;&nbsp;
-            </div>
-
-            <div class="col-2 text-h6" v-if="typeof free_space == 'number'">
-              {{ $t("free space") }}:
-              <span v-if="free_space / 1024 / 1024 / 1024 > 0">
-                {{ (free_space / 1024 / 1024 / 1024).toFixed(1) }}GB
-              </span>
-              <span v-else>
-                {{ (free_space / 1024 / 1024).toFixed(1) }}MB
-              </span>
-            </div>
-          </template>
-        </q-table>
-        <div v-show="uploading" class="row q-ma-sm">
-          <q-space />
-          <q-uploader
-            ref="uploader"
-            style="height: 69vh; width: 70%"
-            :disable="uploader_loading"
-            :url="getUrl"
-            method="post"
-            :headers="generatorFileUploadHeaders"
-            :label="$t('select file') + ':'"
-            :accept="uploader_accept"
-            @start="onStartUpload"
-            @uploaded="onUploaded"
-            @failed="onFailed"
-            @added="/*onFileAdded*/ null"
-          >
-          </q-uploader>
-          <q-space />
-        </div>
-      </q-card-section>
-    </q-card>
-  </q-dialog>
-  <div>
-    <q-menu :target="target_dom" v-model="show_context_menu">
-      <q-list>
-        <q-item
-          v-if="false"
-          clickable
-          v-close-popup
-          @click="(evt) => copyStringToClipboard(current_file.name)"
-        >
-          <q-item-section avatar><q-icon name="file_copy" /></q-item-section>
-          <q-item-section>{{ $t("copy name") }}</q-item-section>
-        </q-item>
-        <q-item
-          clickable
-          v-close-popup
-          @click="(evt) => copyFile(current_file)"
-        >
-          <q-item-section avatar><q-icon name="file_copy" /></q-item-section>
-          <q-item-section>{{ $t("_copy2") }}</q-item-section>
-        </q-item>
-        <q-item clickable v-close-popup @click="(evt) => cutFile(current_file)">
-          <q-item-section avatar><q-icon name="content_cut" /></q-item-section>
-          <q-item-section>{{ $t("_cut2") }}</q-item-section>
-        </q-item>
-        <q-item
-          v-if="false"
-          :disable="
-            !(clipboard && clipboard.type && clipboard.type != 'NONE') ||
-            path == clipboard.path
-          "
-          clickable
-          v-close-popup
-          @click="(evt) => pasteFile()"
-        >
-          <q-item-section avatar
-            ><q-icon name="content_paste"
-          /></q-item-section>
-          <q-item-section>{{ $t("paste") }}</q-item-section>
-        </q-item>
-        <q-item
-          clickable
-          v-close-popup
-          v-if="current_file && current_file.can_write && status != 'select'"
-          @click="(evt) => renameFile(current_file)"
-        >
-          <q-item-section avatar><q-icon name="edit" /></q-item-section>
-          <q-item-section>{{ $t("rename") }}</q-item-section>
-        </q-item>
-        <q-item
-          clickable
-          v-close-popup
-          v-if="current_file && current_file.can_write && status != 'select'"
-          @click="(evt) => deleteFile(current_file)"
-        >
-          <q-item-section avatar
-            ><q-icon name="delete" color="red"
-          /></q-item-section>
-          <q-item-section>{{ $t("delete") }}</q-item-section>
-        </q-item>
-        <q-item
-          clickable
-          v-close-popup
-          v-if="status == 'select' && !current_file.is_directory"
-          @click="(evt) => selectFile(current_file)"
-        >
-          <q-item-section avatar><q-icon name="attach_file" /></q-item-section>
-          <q-item-section>{{ $t("select file") }}</q-item-section>
-        </q-item>
-      </q-list>
-    </q-menu>
-  </div>
-</template>
-
-<style scoped>
-.disable_tree {
-  background: #9e9e9e;
-  cursor: wait;
-  pointer-events: none;
-}
-
-.limit_text_length {
-  overflow: auto;
-  white-space: nowrap;
-  text-overflow: clip;
-  max-width: 20vw;
-}
-
-a,
-a:active,
-a:visited,
-a:link,
-a:focus {
-  color: #428bca;
-  outline: none;
-  background: none;
-  text-decoration: none;
-}
-
-a:hover {
-  outline: none;
-  background: none;
-  text-decoration: underline;
-}
-</style>
-
-<script lang="ts">
-import {
-  defineComponent,
-  ref,
-  Ref,
-  reactive,
-  watch,
-  computed,
-  nextTick,
-} from "vue";
-import { useStore } from "src/store";
-import { useQuasar, date, copyToClipboard } from "quasar";
-import { useI18n } from "vue-i18n";
-import { api } from "boot/axios";
-import GlobalData from "src/common/GlobalData";
-import FileEntity from "src/entities/FileEntity";
-import { HttpProtocol } from "src/entities/HttpProtocol";
-import NormalResult from "src/entities/NormalResult";
-import { Protocol } from "src/entities/WSProtocol";
-import FileSuffixHelper from "src/common/FileSuffixHelper";
-
-class _BreadcrumbItem {
-  name: string = "";
-  path: string = "";
-
-  constructor(name?: string, path?: string) {
-    this.name = name ?? "";
-    this.path = path ?? "";
-
-    if (this.path == "/" || this.path == "\\") {
-      this.path = "";
-    }
-  }
-}
-
-class _ClipboardType {
-  static kTypeNone = "NONE";
-  static kTypeCopy = "COPY";
-  static kTypeCut = "CUT";
-
-  name: string = "";
-  path: string = "";
-  type: string = _ClipboardType.kTypeNone;
-  is_directory = false;
-
-  get full_path() {
-    return this.path + "/" + this.name;
-  }
-
-  clear() {
-    this.name = "";
-    this.path = "";
-    this.type = _ClipboardType.kTypeNone;
-  }
-}
-
-export default defineComponent({
-  name: "ComponentFileManageDialog",
-
-  setup() {
-    let $store = useStore();
-    let $q = useQuasar();
-    let $t = useI18n();
-
-    let show_dialog = ref(false);
-    let loading = ref(false);
-    let uploader_loading = ref(false);
-    let uploader_accept = ref("*");
-    let uploading = ref(false);
-    let files = ref(<FileEntity[]>[]);
-    let show_context_menu = ref(false);
-    let target_dom: any = ref(undefined);
-    let current_file = ref(new FileEntity());
-    let default_path_label = ref($t.t("local disk"));
-    let default_path = ref("media");
-    let path = ref(default_path.value);
-    let prev_path = ref("");
-    let paths = ref([new _BreadcrumbItem("root", "")]);
-    let status = ref("normal");
-    let upload_url = ref("");
-    let uploader: any = ref(null);
-    let resolve: any = null;
-    let resolve_value: any = null;
-    const filters: Ref<string[]> = ref([]);
-
-    const free_space = ref(0);
-    const file_count = ref(0);
-    const directory_count = ref(0);
-
-    const clipboard = reactive(new _ClipboardType()); // 剪切板全路径
-
-    const disk_options = ref([
-      {
-        label: $t.t("local disk"),
-        value: "media",
-      },
-    ]);
-
-    const columns = [
-      {
-        align: "left",
-        name: "name",
-        required: true,
-        label: $t.t("file name"),
-        field: "name",
-        sortable: true,
-      },
-      {
-        name: "file_size",
-        align: "center",
-        label: $t.t("file size"),
-        field: (val: FileEntity) =>
-          val.is_directory ? null : Math.ceil((val ? val.file_size : 0) / 1024),
-        format: (val: any) => (val != null ? `${val} KB` : ""),
-        sortable: true,
-      },
-      {
-        name: "last_edit_time",
-        align: "center",
-        label: $t.t("last edit time"),
-        field: (val: FileEntity) =>
-          date.formatDate(
-            new Date((val ? val.last_edit_time : 0) * 1000),
-            "YYYY-MM-DD HH:mm:ss"
-          ),
-        format: (val: any) => `${val}`,
-        sortable: true,
-      },
-      /*{
-        name: "can_read",
-        align: "center",
-        label: $t.t("can read"),
-        field: (val: FileEntity) => val && val.can_read,
-        format: (val: any) => `${$t.t(val ? "can true" : "can false")}`,
-        sortable: true,
-      },
-      {
-        name: "can_write",
-        align: "center",
-        label: $t.t("can write"),
-        field: (val: FileEntity) => val && val.can_write,
-        format: (val: any) => `${$t.t(val ? "can true" : "can false")}`,
-        sortable: true,
-      },
-      {
-        name: "can_exec",
-        align: "center",
-        label: $t.t("can exec"),
-        field: (val: FileEntity) => val && val.can_exec,
-        format: (val: any) => `${$t.t(val ? "can true" : "can false")}`,
-        sortable: true,
-      },*/
-      {
-        align: "center",
-        name: "operator",
-        label: $t.t("operator"),
-      },
-    ];
-
-    const _request_list_files = async (path: string) => {
-      loading.value = true;
-      let client = GlobalData.getInstance().getCurrentClient();
-      if (client) {
-        let url = new URL(client.url);
-        url.port =
-          GlobalData.getInstance().applicationConfig?.httpserver_port ??
-          HttpProtocol.DefaultHttpPort.toString();
-        url.pathname = HttpProtocol.RequestPathListFile;
-        url.protocol = "http:";
-        url.searchParams.append("path", path);
-        return await api.get(url.toString());
-      }
-      loading.value = false;
-      return null;
-    };
-
-    const _show_files = (response: any) => {
-      if (response) {
-        if (response.status == 200) {
-          interface IRsponseData {
-            files: FileEntity[];
-            free: number;
-          }
-          let file_entitys: FileEntity[] = [];
-          let free = 0;
-
-          if (Array.isArray(response.data)) {
-            file_entitys = response.data as FileEntity[];
-          } else {
-            const resposne_data = response.data as IRsponseData;
-            file_entitys = resposne_data.files;
-            free = resposne_data.free;
-          }
-          free_space.value = free;
-          if (Array.isArray(file_entitys)) {
-            directory_count.value = 0;
-            file_count.value = 0;
-            if (filters.value.length == 0) {
-              files.value = file_entitys;
-              for (const item of file_entitys) {
-                if (item) {
-                  if (item.is_directory) {
-                    ++directory_count.value;
-                  } else {
-                    ++file_count.value;
-                  }
-                }
-              }
-            } else {
-              files.value = [];
-              for (const item of file_entitys) {
-                if (item) {
-                  if (item.is_directory) {
-                    files.value.push(item);
-                    ++directory_count.value;
-                  } else {
-                    for (const filter of filters.value) {
-                      if (item.name.toLowerCase().endsWith(filter)) {
-                        files.value.push(item);
-                        ++file_count.value;
-                        break;
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          } else {
-            console.error("data is not typeof FileEntity!", response);
-          }
-        } else {
-          console.warn(response);
-        }
-      }
-      loading.value = false;
-    };
-
-    const refresh_file_list_async = async () => {
-      const response = await _request_list_files(path.value);
-      _show_files(response);
-    };
-
-    const refresh_file_list = () => {
-      refresh_file_list_async();
-    };
-
-    const parseFilter = (filter?: string) => {
-      filters.value = [];
-      if (filter == null || typeof filter == "undefined") {
-        return;
-      }
-
-      if (filter) {
-        for (const item of filter.split(";")) {
-          if (item && item.length > 0) {
-            filters.value.push(item);
-          }
-        }
-      }
-    };
-
-    const selectFile = async (file: FileEntity) => {
-      resolve_value = {
-        file,
-        path: path.value,
-      };
-      show_dialog.value = false;
-    };
-
-    watch(
-      () => path.value,
-      (newValue: string, oldValue: string) => {
-        if (!newValue) {
-          path.value = oldValue ?? default_path.value;
-          return;
-        }
-        paths.value = [];
-        let parent_item = null;
-        const root_flag =
-          path.value.startsWith("/") || path.value.startsWith("\\");
-        for (let item of newValue.split("/")) {
-          if (item.trim() == "") {
-            parent_item = null;
-            continue;
-          }
-
-          let temp: _BreadcrumbItem = new _BreadcrumbItem(
-            item,
-            (parent_item ? parent_item.path + "/" : "") + item
-          );
-          if (!parent_item && root_flag) {
-            temp.path = "/" + temp.path;
-          }
-
-          paths.value.push(temp);
-          parent_item = temp;
-        }
-        if (paths.value.length < 1) {
-          paths.value.push(new _BreadcrumbItem("local disk", "media"));
-        }
-        refresh_file_list();
-      }
-    );
-
-    watch(
-      () => status.value,
-      (newValue: string) => {
-        switch (newValue) {
-          case undefined:
-          case null:
-            status.value = "normal";
-            break;
-          case "normal":
-          case "select":
-            break;
-          default:
-            console.log("status error!", status.value);
-            status.value = "normal";
-        }
-      }
-    );
-
-    watch(
-      () => default_path.value,
-      (newValue: string) => {
-        let item = disk_options.value.find((item) => item.value == newValue);
-        if (item && item.value && item.label) {
-          default_path_label.value = item.label;
-          path.value = default_path.value;
-        }
-      }
-    );
-
-    const refresh_usb_devices = async () => {
-      try {
-        const response = await GlobalData.getInstance()
-          .getCurrentClient()
-          ?.getUsbDevices();
-        if (response) {
-          disk_options.value = [
-            {
-              label: $t.t("local disk"),
-              value: "media",
-            },
-          ];
-
-          for (let item of response.usb_list) {
-            disk_options.value.push({
-              label: $t.t(item),
-              value: "/" + item,
-            });
-          }
-        }
-      } catch (e) {
-        console.log(e);
-      }
-    };
-
-    // 后缀名限制
-    // watch(
-    //   () => filters.value,
-    //   () => {
-    //     if ($store.state.advanced_debug && filters.value.length != 0) {
-    //       filters.value = [];
-    //     }
-    //   }
-    // );
-
-    return {
-      show_dialog,
-      loading,
-      uploader_loading,
-      uploader_accept,
-      uploading,
-      files,
-      columns,
-      show_context_menu,
-      default_path,
-      default_path_label,
-      path,
-      prev_path,
-      paths,
-      free_space,
-      file_count,
-      directory_count,
-      target_dom,
-      upload_url,
-      uploader,
-      disk_options,
-      current_file,
-      clipboard,
-      refresh_file_list,
-      refresh_file_list_async,
-      status,
-      filters,
-      showDialogAsync(
-        in_status: string,
-        no_filter = true,
-        video_filter = false,
-        image_filter = false
-      ) {
-        return new Promise((_resolve, _reject) => {
-          status.value = in_status;
-          {
-            let filter = "";
-            if (!no_filter) {
-              if (video_filter) {
-                filter += FileSuffixHelper.videoSuffix;
-              }
-              if (image_filter) {
-                filter += FileSuffixHelper.imageSuffix;
-              }
-            }
-            parseFilter(filter);
-            if (filter === "") {
-              uploader_accept.value = "*";
-            } else {
-              uploader_accept.value = filter.replace(/;/g, ",");
-            }
-          }
-
-          refresh_usb_devices();
-          refresh_file_list();
-          show_dialog.value = true;
-          resolve = _resolve;
-        });
-      },
-      generatorFileUploadHeaders(files: File[]) {
-        if (files.length > 0) {
-          return [
-            {
-              name: HttpProtocol.kHeaderXProductName,
-              value: HttpProtocol.getProductName($store),
-            },
-            {
-              name: HttpProtocol.kHeaderXFileLength,
-              value: files[0].size,
-            },
-          ];
-        }
-        return [];
-      },
-      resetData() {
-        loading.value = false;
-        uploading.value = false;
-        files.value = [];
-        path.value = default_path.value;
-        status.value = "normal";
-        upload_url.value = "";
-        target_dom.value = undefined;
-        clipboard.clear();
-        if (resolve) {
-          resolve(resolve_value);
-        }
-        resolve_value = null;
-      },
-      async onCreateNewFolder() {
-        let url = GlobalData.getInstance().createCurrentRequestUrl();
-        if (url) {
-          $q.dialog({
-            title: $t.t("create folder"),
-            message: $t.t("input folder name") + ":",
-            prompt: {
-              model: "",
-              isValid: (val: string) => !!val && val.trim().length > 0,
-              type: "text",
-            },
-            ok: {
-              label: $t.t("ok"),
-              noCaps: true,
-              flat: true,
-            },
-            cancel: {
-              label: $t.t("cancel"),
-              noCaps: true,
-              flat: true,
-            },
-            persistent: true,
-          }).onOk(async (data: string) => {
-            if (url) {
-              url.pathname = HttpProtocol.RequestPathCreateDirectory;
-              let response = (
-                await api.post(url.toString(), {
-                  base_dir: path.value,
-                  dir_name: data,
-                })
-              ).data as NormalResult;
-              if (response && response.success) {
-                refresh_file_list();
-                $q.notify({
-                  type: "positive",
-                  message: $t.t("create folder") + $t.t("success") + "!",
-                  position: "top",
-                  timeout: 1500,
-                });
-              } else {
-                $q.notify({
-                  type: "warning",
-                  message:
-                    $t.t("create folder") +
-                    $t.t("fail") +
-                    "!" +
-                    (response ? response.message : ""),
-                  position: "top",
-                  timeout: 1500,
-                });
-              }
-            }
-          });
-        }
-      },
-      selectFile,
-      async deleteFile(file: FileEntity) {
-        let url = GlobalData.getInstance().createCurrentRequestUrl();
-        if (url) {
-          url.pathname = HttpProtocol.RequestPathDeleteFile;
-          let response = null;
-          try {
-            response = (
-              await api.delete(url.toString(), {
-                data: {
-                  base_dir: path.value,
-                  file_name: file.name,
-                },
-              })
-            ).data as NormalResult;
-          } catch (e) {
-            console.log(e);
-          }
-          if (response && response.success) {
-            refresh_file_list();
-            $q.notify({
-              type: "positive",
-              message: $t.t("delete file") + $t.t("success") + "!",
-              position: "top",
-              timeout: 1500,
-            });
-          } else {
-            $q.notify({
-              type: "warning",
-              message:
-                $t.t("delete file") +
-                $t.t("fail") +
-                "!" +
-                (response ? response.message : ""),
-              position: "top",
-              timeout: 1500,
-            });
-          }
-        }
-      },
-      renameFile(file: FileEntity) {
-        let url = GlobalData.getInstance().createCurrentRequestUrl();
-        if (url) {
-          $q.dialog({
-            title: $t.t("rename"),
-            message: $t.t("input new file name") + ":",
-            prompt: {
-              model: file.name,
-              isValid: (val: string) => !!val && val.trim().length > 0,
-              type: "text",
-            },
-            ok: {
-              label: $t.t("ok"),
-              noCaps: true,
-              flat: true,
-            },
-            cancel: {
-              label: $t.t("cancel"),
-              noCaps: true,
-              flat: true,
-            },
-            persistent: true,
-          }).onOk(async (data: string) => {
-            if (data == file.name) {
-              return;
-            }
-            if (url) {
-              url.pathname = HttpProtocol.RequestPathRenameFile;
-              url.searchParams.append(
-                "type",
-                HttpProtocol.RequestPathRenameFile
-              );
-
-              let response = (
-                await api.put(url.toString(), {
-                  base_dir: path.value,
-                  file_name: file.name,
-                  new_file_name: data,
-                })
-              ).data as NormalResult;
-              if (response && response.success) {
-                refresh_file_list();
-                $q.notify({
-                  type: "positive",
-                  message: $t.t("file rename") + $t.t("success") + "!",
-                  position: "top",
-                  timeout: 1500,
-                });
-              } else {
-                $q.notify({
-                  type: "warning",
-                  message:
-                    $t.t("file rename") +
-                    $t.t("fail") +
-                    "!" +
-                    (response ? response.message : ""),
-                  position: "top",
-                  timeout: 1500,
-                });
-              }
-            }
-          });
-        }
-      },
-      copyStringToClipboard(value: string) {
-        copyToClipboard(value);
-      },
-      onContextMenu(evt: PointerEvent, row: FileEntity, index: number) {
-        evt.preventDefault();
-        evt.stopPropagation();
-
-        target_dom.value = evt.srcElement;
-        current_file.value = row;
-        if (row.can_write) {
-          show_context_menu.value = true;
-        }
-      },
-      onTableItemDBClick(evt: PointerEvent, row: FileEntity, index: number) {
-        if (row && row.is_directory) {
-          path.value += "/" + row.name;
-        } else if (status.value == "select" && !row.is_directory) {
-          selectFile(row);
-        }
-      },
-      backToParentPath() {
-        const pos = path.value.lastIndexOf("/");
-        if (pos != -1) {
-          prev_path.value = path.value;
-          path.value = path.value.substr(0, pos);
-        }
-      },
-      getUrl(file: File[]) {
-        let url = GlobalData.getInstance().createCurrentRequestUrl();
-        if (url) {
-          url.pathname = HttpProtocol.RequestUploadFile;
-          url.searchParams.append("type", HttpProtocol.HttpUploadTypeNormal);
-          url.searchParams.append("base_dir", path.value);
-          return url.toString();
-        }
-        return "#";
-      },
-      onStartUpload() {
-        loading.value = true;
-      },
-      async onFileAdded(files: File[] | File) {
-        setTimeout(async () => {
-          const onError = async (file: File | null) => {
-            await nextTick(() => {});
-            uploader.value.reset();
-
-            $q.notify({
-              color: "negative",
-              icon: "warning",
-              message: $t.t("load file error") + "!",
-              position: "top",
-              timeout: 3000,
-            });
-          };
-
-          let file: File | null = null;
-
-          try {
-            if (Array.isArray(files)) {
-              if (files.length > 0) {
-                file = files[0];
-              }
-            } else {
-              file = files;
-            }
-            if (file) {
-              const file_name = file.name;
-              const blob = file.slice(0, 1024 * 1024 * 1); // 1 MB
-              uploader_loading.value = true;
-
-              try {
-                let url = GlobalData.getInstance().createCurrentRequestUrl();
-                if (url) {
-                  url.pathname = HttpProtocol.RequestPathCheckFileSupport;
-
-                  // if (FileSuffixHelper.isVideoPath(file_name)) {
-
-                  // }
-                  const data = new FormData();
-                  data.append(
-                    "file",
-                    new File([blob], file_name, {
-                      lastModified: file.lastModified,
-                    })
-                  );
-                  const response = await api.post(url.toString(), data, {
-                    headers: {
-                      "Content-Type": "multipart/form-data",
-                    },
-                  });
-
-                  if (response && response.data && response.data.is_support) {
-                  } else {
-                    onError(file);
-                  }
-                  console.log(response);
-                } else {
-                  throw "";
-                }
-              } catch (e) {
-                console.error(e);
-                onError(file);
-              }
-              uploader_loading.value = false;
-              return;
-            }
-          } catch (e) {
-            console.error(e);
-            onError(file);
-          }
-        }, 1);
-      },
-      onUploaded() {
-        uploading.value = false;
-        uploader.value.reset();
-        refresh_file_list();
-
-        $q.notify({
-          type: "positive",
-          message: $t.t("file upload") + $t.t("success") + "!",
-          position: "top",
-          timeout: 1500,
-        });
-        loading.value = false;
-      },
-      onFailed(info: any) {
-        console.log(info);
-        $q.notify({
-          type: "warning",
-          message: $t.t("file upload") + $t.t("fail") + "!",
-          position: "top",
-          timeout: 1500,
-        });
-        loading.value = false;
-        loading.value = false;
-      },
-      copyFile(file: FileEntity) {
-        if (file) {
-          clipboard.name = file.name;
-          clipboard.path = path.value;
-          clipboard.type = _ClipboardType.kTypeCopy;
-          clipboard.is_directory = file.is_directory;
-          $q.notify({
-            color: "positive",
-            icon: "done",
-            html: true,
-            message:
-              $t.t("copy to colipboard success") +
-              "!" +
-              "<br />" +
-              $t.t(
-                "please use the paste command to paste to another directory"
-              ) +
-              "!",
-            position: "top",
-            timeout: 1500,
-          });
-        }
-      },
-      cutFile(file: FileEntity) {
-        if (file) {
-          clipboard.name = file.name;
-          clipboard.path = path.value;
-          clipboard.type = _ClipboardType.kTypeCut;
-          clipboard.is_directory = file.is_directory;
-          $q.notify({
-            color: "positive",
-            icon: "done",
-            html: true,
-            message:
-              $t.t("cut to colipboard success") +
-              "!" +
-              "<br />" +
-              $t.t(
-                "please use the paste command to paste to another directory"
-              ) +
-              "!",
-            position: "top",
-            timeout: 1500,
-          });
-        }
-      },
-      pasteFile() {
-        if (clipboard && clipboard.type) {
-          let operator_type = "NONE";
-          if (clipboard.type == _ClipboardType.kTypeCopy) {
-            operator_type =
-              Protocol.FileOperatorRequestEntity.kOperatorTypeCopy;
-          } else if (clipboard.type == _ClipboardType.kTypeCut) {
-            operator_type = Protocol.FileOperatorRequestEntity.kOperatorTypeCut;
-          }
-          $q.dialog({
-            title: $t.t("Confirm"),
-            html: true,
-            message:
-              (clipboard.type == _ClipboardType.kTypeCopy
-                ? $t.t("_copy2")
-                : $t.t("_cut2")) +
-              (clipboard.is_directory ? $t.t("directory") : $t.t("file")) +
-              $t.t("from") +
-              ' "' +
-              clipboard.full_path +
-              '" ' +
-              $t.t("to") +
-              ' "' +
-              (path.value + "/" + clipboard.name) +
-              '"' +
-              "<br/>" +
-              "<span style='color:red;'>" +
-              $t.t(
-                "if the file size is too large, wait for the result patiently. don't refresh the page or perform other operations during the process. otherwise, unexpected consequences may occur"
-              ) +
-              "!" +
-              "</span>",
-            ok: {
-              label: $t.t("ok"),
-              noCaps: true,
-              flat: true,
-            },
-            cancel: {
-              label: $t.t("cancel"),
-              noCaps: true,
-              flat: true,
-            },
-            persistent: true,
-          }).onOk(async () => {
-            let success = false;
-            loading.value = true;
-
-            try {
-              const reponse = await GlobalData.getInstance()
-                .getCurrentClient()
-                ?.fileOperator(
-                  clipboard.full_path,
-                  path.value + "/" + clipboard.name,
-                  operator_type
-                );
-              success = reponse?.success ?? false;
-            } catch {}
-            loading.value = false;
-            if (success) {
-              refresh_file_list_async();
-            }
-            $q.notify({
-              color: success ? "positive" : "negative",
-              icon: success ? "done" : "warning",
-              message:
-                (clipboard.type == _ClipboardType.kTypeCopy
-                  ? $t.t("_copy2")
-                  : $t.t("_cut2")) +
-                (clipboard.is_directory ? $t.t("directory") : $t.t("file")) +
-                (success ? $t.t("success") : $t.t("fail")) +
-                "!",
-              position: "top",
-              timeout: 1500,
-            });
-          });
-        }
-      },
-    };
-  },
-});
-</script>
+<template>
+  <q-dialog
+    persistent
+    v-model="show_dialog"
+    @before-hide="resetData"
+    @keydown="
+      (evt) => {
+        if (!loading && evt.keyCode == 27) {
+          show_dialog = false;
+        }
+      }
+    "
+  >
+    <q-card
+      class="overflow-hidden"
+      style="overflow-y: scroll; max-width: 70vw; max-height: 85vh"
+    >
+      <q-card-section class="q-ma-none q-pa-sm">
+        <div class="row">
+          <div v-if="status == 'select'" class="col-auto text-h6">
+            {{ $t("select file") }}({{ filters.join(";") }})
+          </div>
+          <div v-else class="col-auto text-h6">
+            {{ $t("file manage") }}
+          </div>
+          <q-space />
+          <div>
+            <q-btn
+              :loading="loading"
+              :disable="loading"
+              no-caps
+              flat
+              round
+              icon="close"
+              color="red"
+              v-close-popup
+            >
+              <q-tooltip>
+                {{ $t("close") }}
+              </q-tooltip>
+            </q-btn>
+          </div>
+        </div>
+      </q-card-section>
+
+      <q-separator />
+      <div class="row">
+        <div class="q-pa-md q-gutter-sm">
+          <q-breadcrumbs separator="/">
+            <q-breadcrumbs-el
+              :disable="uploading"
+              icon="home"
+              :label="default_path_label"
+              to="#"
+              @click="path = default_path"
+            />
+            <q-breadcrumbs-el
+              v-for="(item, index) of paths.slice(1)"
+              :key="index"
+              :label="item.name"
+              :disable="uploading"
+              to="#"
+              @click="path = item.path"
+            />
+          </q-breadcrumbs>
+        </div>
+      </div>
+      <q-separator />
+      <div class="row">
+        <q-btn-dropdown
+          stretch
+          flat
+          no-caps
+          :label="default_path_label"
+          :disable="uploading"
+        >
+          <q-list>
+            <q-item
+              v-for="(item, index) of disk_options"
+              :key="index"
+              clickable
+              v-close-popup
+              @click="default_path = item.value"
+            >
+              <q-item-section avatar>
+                <q-icon
+                  :name="item.label == $t('local disk') ? 'desktop_mac' : 'usb'"
+                />
+              </q-item-section>
+              <q-item-section> {{ item.label }} </q-item-section>
+            </q-item>
+          </q-list>
+        </q-btn-dropdown>
+        <q-btn
+          flat
+          icon="arrow_back"
+          no-caps
+          :disable="path.trim() == '' || uploading"
+          @click="backToParentPath"
+          :label="$t('back')"
+        >
+          <q-tooltip>
+            {{ $t("back") }}
+          </q-tooltip>
+        </q-btn>
+        <q-btn
+          flat
+          no-caps
+          icon="arrow_forward"
+          :disable="prev_path == '' || path == prev_path || uploading"
+          @click="(path = prev_path) && (prev_path = '')"
+          :label="$t('forward')"
+        >
+          <q-tooltip>
+            {{ $t("forward") }}
+          </q-tooltip>
+        </q-btn>
+        <q-btn
+          flat
+          icon="refresh"
+          no-caps
+          @click="refresh_file_list"
+          :disable="uploading"
+          :label="$t('refresh')"
+        >
+          <q-tooltip>
+            {{ $t("refresh") }}
+          </q-tooltip>
+        </q-btn>
+        <q-btn
+          flat
+          no-caps
+          icon="content_paste"
+          @click="pasteFile"
+          :disable="
+            !(clipboard && clipboard.type && clipboard.type != 'NONE') ||
+            path == clipboard.path
+          "
+          :label="$t('paste')"
+        >
+          <q-tooltip>
+            {{ $t("paste") }}
+          </q-tooltip>
+        </q-btn>
+        <q-btn
+          flat
+          icon="create_new_folder"
+          no-caps
+          @click="onCreateNewFolder"
+          :disable="loading || uploading"
+          :label="$t('create folder')"
+        >
+          <q-tooltip>
+            {{ $t("create folder") }}
+          </q-tooltip>
+        </q-btn>
+        <q-btn
+          flat
+          v-if="!uploading"
+          no-caps
+          icon="upload"
+          :label="$t('upload file')"
+          @click="uploading = true"
+        >
+          <q-tooltip>
+            {{ $t("upload file") }}
+          </q-tooltip>
+        </q-btn>
+        <q-btn
+          flat
+          icon="block"
+          no-caps
+          v-if="uploading"
+          :label="$t('cancel upload file')"
+          @click="uploading = false"
+        >
+          <q-tooltip>
+            {{ $t("cancel upload file") }}
+          </q-tooltip>
+        </q-btn>
+      </div>
+      <q-separator />
+
+      <q-card-section
+        style="width: 70vw; max-height: 85vh"
+        class="scroll q-pa-none q-ma-none"
+      >
+        {{}}
+        <q-table
+          :style="{
+            height:
+              ($q.platform.is.ipad && $store.state.landspace ? '61' : '68') +
+              'vh',
+          }"
+          v-show="!uploading"
+          :rows="files"
+          :columns="columns"
+          virtual-scroll
+          color="primary"
+          row-key="name"
+          :loading="loading"
+          :rows-per-page-options="[0]"
+          :virtual-scroll-sticky-size-start="48"
+          @row-contextmenu="onContextMenu"
+          @row-dblclick="onTableItemDBClick"
+        >
+          <template v-slot:loading>
+            <q-inner-loading showing color="primary" />
+          </template>
+          <template v-slot:body-cell="props">
+            <q-td :props="props">
+              <div v-if="props.col.name == 'name'">
+                <q-icon
+                  v-if="false && clipboard.name == props.value"
+                  :name="clipboard.type == 'COPY' ? 'file_copy' : 'content_cut'"
+                  style="color: #ffbe4a; font-size: 2.5em"
+                >
+                </q-icon>
+                <q-icon
+                  :name="props.row.is_directory ? 'folder' : 'description'"
+                  style="color: #ffbe4a; font-size: 2.5em"
+                ></q-icon>
+                {{
+                  props.value.length > 60
+                    ? props.value.substr(0, 60) + "..."
+                    : props.value
+                }}
+                <q-tooltip> {{ props.value }} </q-tooltip>
+              </div>
+              <div v-else-if="props.col.name == 'file_size'">
+                <span v-if="props.row.is_directory"> </span>
+                <span v-else>
+                  <span
+                    v-if="
+                      Math.floor(props.row.file_size / 1024 / 1024 / 1024) > 0
+                    "
+                  >
+                    {{
+                      (props.row.file_size / 1024 / 1024 / 1024).toFixed(2)
+                    }}GB
+                  </span>
+                  <span
+                    v-else-if="
+                      Math.floor(props.row.file_size / 1024 / 1024) > 0
+                    "
+                  >
+                    {{ (props.row.file_size / 1024 / 1024).toFixed(2) }}MB
+                  </span>
+                  <span v-else>
+                    {{ (props.row.file_size / 1024).toFixed(2) }} KB
+                  </span>
+                </span>
+              </div>
+              <div v-else-if="props.col.name != 'operator'">
+                {{ props.value }}
+              </div>
+              <div v-else>
+                <div v-if="status != 'select'">
+                  <div v-if="props.row.can_write">
+                    <a
+                      href="javascript:void(0)"
+                      @click="(evt) => renameFile(props.row)"
+                    >
+                      {{ $t("rename") }}
+                      <q-tooltip>
+                        {{ $t("click") }}{{ $t(" ") }}{{ $t("rename") }}
+                      </q-tooltip>
+                    </a>
+                    &nbsp;&nbsp;&nbsp;&nbsp;
+                    <a
+                      href="javascript:void(0)"
+                      @click="(evt) => copyFile(props.row)"
+                    >
+                      {{ $t("_copy2") }}
+                      <q-tooltip>
+                        {{ $t("click") }}{{ $t(" ") }}{{ $t("_copy2") }}
+                      </q-tooltip>
+                    </a>
+                    &nbsp;&nbsp;&nbsp;&nbsp;
+                    <a
+                      href="javascript:void(0)"
+                      @click="(evt) => cutFile(props.row)"
+                    >
+                      {{ $t("_cut2") }}
+                      <q-tooltip>
+                        {{ $t("click") }}{{ $t(" ") }}{{ $t("_cut2") }}
+                      </q-tooltip>
+                    </a>
+                    &nbsp;&nbsp;&nbsp;&nbsp;
+                    <a
+                      href="javascript:void(0)"
+                      @click="(evt) => deleteFile(props.row)"
+                    >
+                      {{ $t("delete") }}
+                      <q-tooltip>
+                        {{ $t("click") }}{{ $t(" ") }}{{ $t("delete") }}
+                      </q-tooltip>
+                    </a>
+                  </div>
+                </div>
+                <div v-else-if="!props.row.is_directory">
+                  <a
+                    href="javascript:void(0)"
+                    @click="(evt) => selectFile(props.row)"
+                  >
+                    {{ $t("select file") }}
+                    <q-tooltip>
+                      {{ $t("click") }}{{ $t(" ") }}{{ $t("select file") }}
+                    </q-tooltip>
+                  </a>
+                </div>
+              </div>
+            </q-td>
+          </template>
+          <template v-slot:pagination="scope">
+            <div class="col-2 text-h6">
+              {{ $t("file count") }}: {{ file_count }}
+            </div>
+            <div class="col-2 text-h6 q-mx-md">&nbsp;&nbsp;&nbsp;&nbsp;</div>
+            <div class="col-2 text-h6">
+              {{ $t("directoriy count") }}: {{ directory_count }}
+            </div>
+            <div
+              v-if="typeof free_space == 'number'"
+              class="col-2 text-h6 q-mx-md"
+            >
+              &nbsp;&nbsp;&nbsp;&nbsp;
+            </div>
+
+            <div class="col-2 text-h6" v-if="typeof free_space == 'number'">
+              {{ $t("free space") }}:
+              <span v-if="free_space / 1024 / 1024 / 1024 > 0">
+                {{ (free_space / 1024 / 1024 / 1024).toFixed(1) }}GB
+              </span>
+              <span v-else>
+                {{ (free_space / 1024 / 1024).toFixed(1) }}MB
+              </span>
+            </div>
+          </template>
+        </q-table>
+        <div v-show="uploading" class="row q-ma-sm">
+          <q-space />
+          <q-uploader
+            ref="uploader"
+            style="height: 69vh; width: 70%"
+            :disable="uploader_loading"
+            :url="getUrl"
+            method="post"
+            :headers="generatorFileUploadHeaders"
+            :label="$t('select file') + ':'"
+            :accept="uploader_accept"
+            @start="onStartUpload"
+            @uploaded="onUploaded"
+            @failed="onFailed"
+            @added="/*onFileAdded*/ null"
+          >
+          </q-uploader>
+          <q-space />
+        </div>
+      </q-card-section>
+    </q-card>
+  </q-dialog>
+  <div>
+    <q-menu :target="target_dom" v-model="show_context_menu">
+      <q-list>
+        <q-item
+          v-if="false"
+          clickable
+          v-close-popup
+          @click="(evt) => copyStringToClipboard(current_file.name)"
+        >
+          <q-item-section avatar><q-icon name="file_copy" /></q-item-section>
+          <q-item-section>{{ $t("copy name") }}</q-item-section>
+        </q-item>
+        <q-item
+          clickable
+          v-close-popup
+          @click="(evt) => copyFile(current_file)"
+        >
+          <q-item-section avatar><q-icon name="file_copy" /></q-item-section>
+          <q-item-section>{{ $t("_copy2") }}</q-item-section>
+        </q-item>
+        <q-item clickable v-close-popup @click="(evt) => cutFile(current_file)">
+          <q-item-section avatar><q-icon name="content_cut" /></q-item-section>
+          <q-item-section>{{ $t("_cut2") }}</q-item-section>
+        </q-item>
+        <q-item
+          v-if="false"
+          :disable="
+            !(clipboard && clipboard.type && clipboard.type != 'NONE') ||
+            path == clipboard.path
+          "
+          clickable
+          v-close-popup
+          @click="(evt) => pasteFile()"
+        >
+          <q-item-section avatar
+            ><q-icon name="content_paste"
+          /></q-item-section>
+          <q-item-section>{{ $t("paste") }}</q-item-section>
+        </q-item>
+        <q-item
+          clickable
+          v-close-popup
+          v-if="current_file && current_file.can_write && status != 'select'"
+          @click="(evt) => renameFile(current_file)"
+        >
+          <q-item-section avatar><q-icon name="edit" /></q-item-section>
+          <q-item-section>{{ $t("rename") }}</q-item-section>
+        </q-item>
+        <q-item
+          clickable
+          v-close-popup
+          v-if="current_file && current_file.can_write && status != 'select'"
+          @click="(evt) => deleteFile(current_file)"
+        >
+          <q-item-section avatar
+            ><q-icon name="delete" color="red"
+          /></q-item-section>
+          <q-item-section>{{ $t("delete") }}</q-item-section>
+        </q-item>
+        <q-item
+          clickable
+          v-close-popup
+          v-if="status == 'select' && !current_file.is_directory"
+          @click="(evt) => selectFile(current_file)"
+        >
+          <q-item-section avatar><q-icon name="attach_file" /></q-item-section>
+          <q-item-section>{{ $t("select file") }}</q-item-section>
+        </q-item>
+      </q-list>
+    </q-menu>
+  </div>
+</template>
+
+<style scoped>
+.disable_tree {
+  background: #9e9e9e;
+  cursor: wait;
+  pointer-events: none;
+}
+
+.limit_text_length {
+  overflow: auto;
+  white-space: nowrap;
+  text-overflow: clip;
+  max-width: 20vw;
+}
+
+a,
+a:active,
+a:visited,
+a:link,
+a:focus {
+  color: #428bca;
+  outline: none;
+  background: none;
+  text-decoration: none;
+}
+
+a:hover {
+  outline: none;
+  background: none;
+  text-decoration: underline;
+}
+</style>
+
+<script lang="ts">
+import {
+  defineComponent,
+  ref,
+  Ref,
+  reactive,
+  watch,
+  computed,
+  nextTick,
+} from "vue";
+import { useStore } from "src/store";
+import { useQuasar, date, copyToClipboard } from "quasar";
+import { useI18n } from "vue-i18n";
+import { api } from "boot/axios";
+import GlobalData from "src/common/GlobalData";
+import FileEntity from "src/entities/FileEntity";
+import { HttpProtocol } from "src/entities/HttpProtocol";
+import NormalResult from "src/entities/NormalResult";
+import { Protocol } from "src/entities/WSProtocol";
+import FileSuffixHelper from "src/common/FileSuffixHelper";
+
+class _BreadcrumbItem {
+  name: string = "";
+  path: string = "";
+
+  constructor(name?: string, path?: string) {
+    this.name = name ?? "";
+    this.path = path ?? "";
+
+    if (this.path == "/" || this.path == "\\") {
+      this.path = "";
+    }
+  }
+}
+
+class _ClipboardType {
+  static kTypeNone = "NONE";
+  static kTypeCopy = "COPY";
+  static kTypeCut = "CUT";
+
+  name: string = "";
+  path: string = "";
+  type: string = _ClipboardType.kTypeNone;
+  is_directory = false;
+
+  get full_path() {
+    return this.path + "/" + this.name;
+  }
+
+  clear() {
+    this.name = "";
+    this.path = "";
+    this.type = _ClipboardType.kTypeNone;
+  }
+}
+
+export default defineComponent({
+  name: "ComponentFileManageDialog",
+
+  setup() {
+    let $store = useStore();
+    let $q = useQuasar();
+    let $t = useI18n();
+
+    let show_dialog = ref(false);
+    let loading = ref(false);
+    let uploader_loading = ref(false);
+    let uploader_accept = ref("*");
+    let uploading = ref(false);
+    let files = ref(<FileEntity[]>[]);
+    let show_context_menu = ref(false);
+    let target_dom: any = ref(undefined);
+    let current_file = ref(new FileEntity());
+    let default_path_label = ref($t.t("local disk"));
+    let default_path = ref("media");
+    let path = ref(default_path.value);
+    let prev_path = ref("");
+    let paths = ref([new _BreadcrumbItem("root", "")]);
+    let status = ref("normal");
+    let upload_url = ref("");
+    let uploader: any = ref(null);
+    let resolve: any = null;
+    let resolve_value: any = null;
+    const filters: Ref<string[]> = ref([]);
+
+    const free_space = ref(0);
+    const file_count = ref(0);
+    const directory_count = ref(0);
+
+    const clipboard = reactive(new _ClipboardType()); // 剪切板全路径
+
+    const disk_options = ref([
+      {
+        label: $t.t("local disk"),
+        value: "media",
+      },
+    ]);
+
+    const columns = [
+      {
+        align: "left",
+        name: "name",
+        required: true,
+        label: $t.t("file name"),
+        field: "name",
+        sortable: true,
+      },
+      {
+        name: "file_size",
+        align: "center",
+        label: $t.t("file size"),
+        field: (val: FileEntity) =>
+          val.is_directory ? null : Math.ceil((val ? val.file_size : 0) / 1024),
+        format: (val: any) => (val != null ? `${val} KB` : ""),
+        sortable: true,
+      },
+      {
+        name: "last_edit_time",
+        align: "center",
+        label: $t.t("last edit time"),
+        field: (val: FileEntity) =>
+          date.formatDate(
+            new Date((val ? val.last_edit_time : 0) * 1000),
+            "YYYY-MM-DD HH:mm:ss"
+          ),
+        format: (val: any) => `${val}`,
+        sortable: true,
+      },
+      /*{
+        name: "can_read",
+        align: "center",
+        label: $t.t("can read"),
+        field: (val: FileEntity) => val && val.can_read,
+        format: (val: any) => `${$t.t(val ? "can true" : "can false")}`,
+        sortable: true,
+      },
+      {
+        name: "can_write",
+        align: "center",
+        label: $t.t("can write"),
+        field: (val: FileEntity) => val && val.can_write,
+        format: (val: any) => `${$t.t(val ? "can true" : "can false")}`,
+        sortable: true,
+      },
+      {
+        name: "can_exec",
+        align: "center",
+        label: $t.t("can exec"),
+        field: (val: FileEntity) => val && val.can_exec,
+        format: (val: any) => `${$t.t(val ? "can true" : "can false")}`,
+        sortable: true,
+      },*/
+      {
+        align: "center",
+        name: "operator",
+        label: $t.t("operator"),
+      },
+    ];
+
+    const _request_list_files = async (path: string) => {
+      loading.value = true;
+      let client = GlobalData.getInstance().getCurrentClient();
+      if (client) {
+        let url = new URL(client.url);
+        url.port =
+          GlobalData.getInstance().applicationConfig?.httpserver_port ??
+          HttpProtocol.DefaultHttpPort.toString();
+        url.pathname = HttpProtocol.RequestPathListFile;
+        url.protocol = "http:";
+        url.searchParams.append("path", path);
+        return await api.get(url.toString());
+      }
+      loading.value = false;
+      return null;
+    };
+
+    const _show_files = (response: any) => {
+      if (response) {
+        if (response.status == 200) {
+          interface IRsponseData {
+            files: FileEntity[];
+            free: number;
+          }
+          let file_entitys: FileEntity[] = [];
+          let free = 0;
+
+          if (Array.isArray(response.data)) {
+            file_entitys = response.data as FileEntity[];
+          } else {
+            const resposne_data = response.data as IRsponseData;
+            file_entitys = resposne_data.files;
+            free = resposne_data.free;
+          }
+          free_space.value = free;
+          if (Array.isArray(file_entitys)) {
+            directory_count.value = 0;
+            file_count.value = 0;
+            if (filters.value.length == 0) {
+              files.value = file_entitys;
+              for (const item of file_entitys) {
+                if (item) {
+                  if (item.is_directory) {
+                    ++directory_count.value;
+                  } else {
+                    ++file_count.value;
+                  }
+                }
+              }
+            } else {
+              files.value = [];
+              for (const item of file_entitys) {
+                if (item) {
+                  if (item.is_directory) {
+                    files.value.push(item);
+                    ++directory_count.value;
+                  } else {
+                    for (const filter of filters.value) {
+                      if (item.name.toLowerCase().endsWith(filter)) {
+                        files.value.push(item);
+                        ++file_count.value;
+                        break;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          } else {
+            console.error("data is not typeof FileEntity!", response);
+          }
+        } else {
+          console.warn(response);
+        }
+      }
+      loading.value = false;
+    };
+
+    const refresh_file_list_async = async () => {
+      const response = await _request_list_files(path.value);
+      _show_files(response);
+    };
+
+    const refresh_file_list = () => {
+      refresh_file_list_async();
+    };
+
+    const parseFilter = (filter?: string) => {
+      filters.value = [];
+      if (filter == null || typeof filter == "undefined") {
+        return;
+      }
+
+      if (filter) {
+        for (const item of filter.split(";")) {
+          if (item && item.length > 0) {
+            filters.value.push(item);
+          }
+        }
+      }
+    };
+
+    const selectFile = async (file: FileEntity) => {
+      resolve_value = {
+        file,
+        path: path.value,
+      };
+      show_dialog.value = false;
+    };
+
+    watch(
+      () => path.value,
+      (newValue: string, oldValue: string) => {
+        if (!newValue) {
+          path.value = oldValue ?? default_path.value;
+          return;
+        }
+        paths.value = [];
+        let parent_item = null;
+        const root_flag =
+          path.value.startsWith("/") || path.value.startsWith("\\");
+        for (let item of newValue.split("/")) {
+          if (item.trim() == "") {
+            parent_item = null;
+            continue;
+          }
+
+          let temp: _BreadcrumbItem = new _BreadcrumbItem(
+            item,
+            (parent_item ? parent_item.path + "/" : "") + item
+          );
+          if (!parent_item && root_flag) {
+            temp.path = "/" + temp.path;
+          }
+
+          paths.value.push(temp);
+          parent_item = temp;
+        }
+        if (paths.value.length < 1) {
+          paths.value.push(new _BreadcrumbItem("local disk", "media"));
+        }
+        refresh_file_list();
+      }
+    );
+
+    watch(
+      () => status.value,
+      (newValue: string) => {
+        switch (newValue) {
+          case undefined:
+          case null:
+            status.value = "normal";
+            break;
+          case "normal":
+          case "select":
+            break;
+          default:
+            console.log("status error!", status.value);
+            status.value = "normal";
+        }
+      }
+    );
+
+    watch(
+      () => default_path.value,
+      (newValue: string) => {
+        let item = disk_options.value.find((item) => item.value == newValue);
+        if (item && item.value && item.label) {
+          default_path_label.value = item.label;
+          path.value = default_path.value;
+        }
+      }
+    );
+
+    const refresh_usb_devices = async () => {
+      try {
+        const response = await GlobalData.getInstance()
+          .getCurrentClient()
+          ?.getUsbDevices();
+        if (response) {
+          disk_options.value = [
+            {
+              label: $t.t("local disk"),
+              value: "media",
+            },
+          ];
+
+          for (let item of response.usb_list) {
+            disk_options.value.push({
+              label: $t.t(item),
+              value: "/" + item,
+            });
+          }
+        }
+      } catch (e) {
+        console.log(e);
+      }
+    };
+
+    // 后缀名限制
+    // watch(
+    //   () => filters.value,
+    //   () => {
+    //     if ($store.state.advanced_debug && filters.value.length != 0) {
+    //       filters.value = [];
+    //     }
+    //   }
+    // );
+
+    return {
+      show_dialog,
+      loading,
+      uploader_loading,
+      uploader_accept,
+      uploading,
+      files,
+      columns,
+      show_context_menu,
+      default_path,
+      default_path_label,
+      path,
+      prev_path,
+      paths,
+      free_space,
+      file_count,
+      directory_count,
+      target_dom,
+      upload_url,
+      uploader,
+      disk_options,
+      current_file,
+      clipboard,
+      refresh_file_list,
+      refresh_file_list_async,
+      status,
+      filters,
+      showDialogAsync(
+        in_status: string,
+        no_filter = true,
+        video_filter = false,
+        image_filter = false
+      ) {
+        return new Promise((_resolve, _reject) => {
+          status.value = in_status;
+          {
+            let filter = "";
+            if (!no_filter) {
+              if (video_filter) {
+                filter += FileSuffixHelper.videoSuffix;
+              }
+              if (image_filter) {
+                filter += FileSuffixHelper.imageSuffix;
+              }
+            }
+            parseFilter(filter);
+            if (filter === "") {
+              uploader_accept.value = "*";
+            } else {
+              uploader_accept.value = filter.replace(/;/g, ",");
+            }
+          }
+
+          refresh_usb_devices();
+          refresh_file_list();
+          show_dialog.value = true;
+          resolve = _resolve;
+        });
+      },
+      generatorFileUploadHeaders(files: File[]) {
+        if (files.length > 0) {
+          return [
+            {
+              name: HttpProtocol.kHeaderXProductName,
+              value: HttpProtocol.getProductName($store),
+            },
+            {
+              name: HttpProtocol.kHeaderXFileLength,
+              value: files[0].size,
+            },
+          ];
+        }
+        return [];
+      },
+      resetData() {
+        loading.value = false;
+        uploading.value = false;
+        files.value = [];
+        path.value = default_path.value;
+        status.value = "normal";
+        upload_url.value = "";
+        target_dom.value = undefined;
+        clipboard.clear();
+        if (resolve) {
+          resolve(resolve_value);
+        }
+        resolve_value = null;
+      },
+      async onCreateNewFolder() {
+        let url = GlobalData.getInstance().createCurrentRequestUrl();
+        if (url) {
+          $q.dialog({
+            title: $t.t("create folder"),
+            message: $t.t("input folder name") + ":",
+            prompt: {
+              model: "",
+              isValid: (val: string) => !!val && val.trim().length > 0,
+              type: "text",
+            },
+            ok: {
+              label: $t.t("ok"),
+              noCaps: true,
+              flat: true,
+            },
+            cancel: {
+              label: $t.t("cancel"),
+              noCaps: true,
+              flat: true,
+            },
+            persistent: true,
+          }).onOk(async (data: string) => {
+            if (url) {
+              url.pathname = HttpProtocol.RequestPathCreateDirectory;
+              let response = (
+                await api.post(url.toString(), {
+                  base_dir: path.value,
+                  dir_name: data,
+                })
+              ).data as NormalResult;
+              if (response && response.success) {
+                refresh_file_list();
+                $q.notify({
+                  type: "positive",
+                  message: $t.t("create folder") + $t.t("success") + "!",
+                  position: "top",
+                  timeout: 1500,
+                });
+              } else {
+                $q.notify({
+                  type: "warning",
+                  message:
+                    $t.t("create folder") +
+                    $t.t("fail") +
+                    "!" +
+                    (response ? response.message : ""),
+                  position: "top",
+                  timeout: 1500,
+                });
+              }
+            }
+          });
+        }
+      },
+      selectFile,
+      async deleteFile(file: FileEntity) {
+        let url = GlobalData.getInstance().createCurrentRequestUrl();
+        if (url) {
+          url.pathname = HttpProtocol.RequestPathDeleteFile;
+          let response = null;
+          try {
+            response = (
+              await api.delete(url.toString(), {
+                data: {
+                  base_dir: path.value,
+                  file_name: file.name,
+                },
+              })
+            ).data as NormalResult;
+          } catch (e) {
+            console.log(e);
+          }
+          if (response && response.success) {
+            refresh_file_list();
+            $q.notify({
+              type: "positive",
+              message: $t.t("delete file") + $t.t("success") + "!",
+              position: "top",
+              timeout: 1500,
+            });
+          } else {
+            $q.notify({
+              type: "warning",
+              message:
+                $t.t("delete file") +
+                $t.t("fail") +
+                "!" +
+                (response ? response.message : ""),
+              position: "top",
+              timeout: 1500,
+            });
+          }
+        }
+      },
+      renameFile(file: FileEntity) {
+        let url = GlobalData.getInstance().createCurrentRequestUrl();
+        if (url) {
+          $q.dialog({
+            title: $t.t("rename"),
+            message: $t.t("input new file name") + ":",
+            prompt: {
+              model: file.name,
+              isValid: (val: string) => !!val && val.trim().length > 0,
+              type: "text",
+            },
+            ok: {
+              label: $t.t("ok"),
+              noCaps: true,
+              flat: true,
+            },
+            cancel: {
+              label: $t.t("cancel"),
+              noCaps: true,
+              flat: true,
+            },
+            persistent: true,
+          }).onOk(async (data: string) => {
+            if (data == file.name) {
+              return;
+            }
+            if (url) {
+              url.pathname = HttpProtocol.RequestPathRenameFile;
+              url.searchParams.append(
+                "type",
+                HttpProtocol.RequestPathRenameFile
+              );
+
+              let response = (
+                await api.put(url.toString(), {
+                  base_dir: path.value,
+                  file_name: file.name,
+                  new_file_name: data,
+                })
+              ).data as NormalResult;
+              if (response && response.success) {
+                refresh_file_list();
+                $q.notify({
+                  type: "positive",
+                  message: $t.t("file rename") + $t.t("success") + "!",
+                  position: "top",
+                  timeout: 1500,
+                });
+              } else {
+                $q.notify({
+                  type: "warning",
+                  message:
+                    $t.t("file rename") +
+                    $t.t("fail") +
+                    "!" +
+                    (response ? response.message : ""),
+                  position: "top",
+                  timeout: 1500,
+                });
+              }
+            }
+          });
+        }
+      },
+      copyStringToClipboard(value: string) {
+        copyToClipboard(value);
+      },
+      onContextMenu(evt: PointerEvent, row: FileEntity, index: number) {
+        evt.preventDefault();
+        evt.stopPropagation();
+
+        target_dom.value = evt.srcElement;
+        current_file.value = row;
+        if (row.can_write) {
+          show_context_menu.value = true;
+        }
+      },
+      onTableItemDBClick(evt: PointerEvent, row: FileEntity, index: number) {
+        if (row && row.is_directory) {
+          path.value += "/" + row.name;
+        } else if (status.value == "select" && !row.is_directory) {
+          selectFile(row);
+        }
+      },
+      backToParentPath() {
+        const pos = path.value.lastIndexOf("/");
+        if (pos != -1) {
+          prev_path.value = path.value;
+          path.value = path.value.substr(0, pos);
+        }
+      },
+      getUrl(file: File[]) {
+        let url = GlobalData.getInstance().createCurrentRequestUrl();
+        if (url) {
+          url.pathname = HttpProtocol.RequestUploadFile;
+          url.searchParams.append("type", HttpProtocol.HttpUploadTypeNormal);
+          url.searchParams.append("base_dir", path.value);
+          return url.toString();
+        }
+        return "#";
+      },
+      onStartUpload() {
+        loading.value = true;
+      },
+      async onFileAdded(files: File[] | File) {
+        setTimeout(async () => {
+          const onError = async (file: File | null) => {
+            await nextTick(() => {});
+            uploader.value.reset();
+
+            $q.notify({
+              color: "negative",
+              icon: "warning",
+              message: $t.t("load file error") + "!",
+              position: "top",
+              timeout: 3000,
+            });
+          };
+
+          let file: File | null = null;
+
+          try {
+            if (Array.isArray(files)) {
+              if (files.length > 0) {
+                file = files[0];
+              }
+            } else {
+              file = files;
+            }
+            if (file) {
+              const file_name = file.name;
+              const blob = file.slice(0, 1024 * 1024 * 1); // 1 MB
+              uploader_loading.value = true;
+
+              try {
+                let url = GlobalData.getInstance().createCurrentRequestUrl();
+                if (url) {
+                  url.pathname = HttpProtocol.RequestPathCheckFileSupport;
+
+                  // if (FileSuffixHelper.isVideoPath(file_name)) {
+
+                  // }
+                  const data = new FormData();
+                  data.append(
+                    "file",
+                    new File([blob], file_name, {
+                      lastModified: file.lastModified,
+                    })
+                  );
+                  const response = await api.post(url.toString(), data, {
+                    headers: {
+                      "Content-Type": "multipart/form-data",
+                    },
+                  });
+
+                  if (response && response.data && response.data.is_support) {
+                  } else {
+                    onError(file);
+                  }
+                  console.log(response);
+                } else {
+                  throw "";
+                }
+              } catch (e) {
+                console.error(e);
+                onError(file);
+              }
+              uploader_loading.value = false;
+              return;
+            }
+          } catch (e) {
+            console.error(e);
+            onError(file);
+          }
+        }, 1);
+      },
+      onUploaded() {
+        uploading.value = false;
+        uploader.value.reset();
+        refresh_file_list();
+
+        $q.notify({
+          type: "positive",
+          message: $t.t("file upload") + $t.t("success") + "!",
+          position: "top",
+          timeout: 1500,
+        });
+        loading.value = false;
+      },
+      onFailed(info: any) {
+        console.log(info);
+        $q.notify({
+          type: "warning",
+          message: $t.t("file upload") + $t.t("fail") + "!",
+          position: "top",
+          timeout: 1500,
+        });
+        loading.value = false;
+        loading.value = false;
+      },
+      copyFile(file: FileEntity) {
+        if (file) {
+          clipboard.name = file.name;
+          clipboard.path = path.value;
+          clipboard.type = _ClipboardType.kTypeCopy;
+          clipboard.is_directory = file.is_directory;
+          $q.notify({
+            color: "positive",
+            icon: "done",
+            html: true,
+            message:
+              $t.t("copy to colipboard success") +
+              "!" +
+              "<br />" +
+              $t.t(
+                "please use the paste command to paste to another directory"
+              ) +
+              "!",
+            position: "top",
+            timeout: 1500,
+          });
+        }
+      },
+      cutFile(file: FileEntity) {
+        if (file) {
+          clipboard.name = file.name;
+          clipboard.path = path.value;
+          clipboard.type = _ClipboardType.kTypeCut;
+          clipboard.is_directory = file.is_directory;
+          $q.notify({
+            color: "positive",
+            icon: "done",
+            html: true,
+            message:
+              $t.t("cut to colipboard success") +
+              "!" +
+              "<br />" +
+              $t.t(
+                "please use the paste command to paste to another directory"
+              ) +
+              "!",
+            position: "top",
+            timeout: 1500,
+          });
+        }
+      },
+      pasteFile() {
+        if (clipboard && clipboard.type) {
+          let operator_type = "NONE";
+          if (clipboard.type == _ClipboardType.kTypeCopy) {
+            operator_type =
+              Protocol.FileOperatorRequestEntity.kOperatorTypeCopy;
+          } else if (clipboard.type == _ClipboardType.kTypeCut) {
+            operator_type = Protocol.FileOperatorRequestEntity.kOperatorTypeCut;
+          }
+          $q.dialog({
+            title: $t.t("Confirm"),
+            html: true,
+            message:
+              (clipboard.type == _ClipboardType.kTypeCopy
+                ? $t.t("_copy2")
+                : $t.t("_cut2")) +
+              (clipboard.is_directory ? $t.t("directory") : $t.t("file")) +
+              $t.t("from") +
+              ' "' +
+              clipboard.full_path +
+              '" ' +
+              $t.t("to") +
+              ' "' +
+              (path.value + "/" + clipboard.name) +
+              '"' +
+              "<br/>" +
+              "<span style='color:red;'>" +
+              $t.t(
+                "if the file size is too large, wait for the result patiently. don't refresh the page or perform other operations during the process. otherwise, unexpected consequences may occur"
+              ) +
+              "!" +
+              "</span>",
+            ok: {
+              label: $t.t("ok"),
+              noCaps: true,
+              flat: true,
+            },
+            cancel: {
+              label: $t.t("cancel"),
+              noCaps: true,
+              flat: true,
+            },
+            persistent: true,
+          }).onOk(async () => {
+            let success = false;
+            loading.value = true;
+
+            try {
+              const reponse = await GlobalData.getInstance()
+                .getCurrentClient()
+                ?.fileOperator(
+                  clipboard.full_path,
+                  path.value + "/" + clipboard.name,
+                  operator_type
+                );
+              success = reponse?.success ?? false;
+            } catch {}
+            loading.value = false;
+            if (success) {
+              refresh_file_list_async();
+            }
+            $q.notify({
+              color: success ? "positive" : "negative",
+              icon: success ? "done" : "warning",
+              message:
+                (clipboard.type == _ClipboardType.kTypeCopy
+                  ? $t.t("_copy2")
+                  : $t.t("_cut2")) +
+                (clipboard.is_directory ? $t.t("directory") : $t.t("file")) +
+                (success ? $t.t("success") : $t.t("fail")) +
+                "!",
+              position: "top",
+              timeout: 1500,
+            });
+          });
+        }
+      },
+    };
+  },
+});
+</script>

From 104a5cead659adaa61709255347a0e0d5daa548f Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Mon, 30 Jan 2023 18:14:33 +0800
Subject: [PATCH 39/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E8=9E=8D=E5=90=88=E5=9C=BA=E6=99=AF=E5=90=8D=E7=A7=B0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=8A=E5=BA=94=E7=94=A8=E8=9E=8D=E5=90=88=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/ClientConnection.ts | 12 ++++++++++
 src/entities/WSProtocol.ts     | 43 ++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index 37f7795..1ab590a 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -1487,6 +1487,18 @@ export default class ClientConnection {
     );
   }
 
+  public async EnumBlendingScene() {
+    return await this.doRpc<Protocol.EnumBlendingSceneResponseEntity>(
+      new Protocol.EnumBlendingSceneRequestEntity()
+    );
+  }
+
+  public async ApplyBlendingScene(name: string) {
+    return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
+      new Protocol.ApplyBlendingSceneRequestEntity(name)
+    );
+  }
+
   public destory() {
     this.ws?.close();
     if (this.ws) {
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index be1d1d2..fc74613 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -526,6 +526,12 @@ export namespace Protocol {
     public static get kSetBlendingOption() {
       return Commands.PROTOCOL_PREFIX + "SetBlendingOption";
     }
+    public static get kEnumBlendingScene() {
+      return Commands.PROTOCOL_PREFIX + "EnumBlendingScene";
+    }
+    public static get kApplyBlendingScene() {
+      return Commands.PROTOCOL_PREFIX + "ApplyBlendingScene";
+    }
 
     static _all_commands = new Set([
       Commands.kUnKnowCommand,
@@ -659,6 +665,8 @@ export namespace Protocol {
       Commands.kSetBlendingVerDensity,
       Commands.kResetBlending,
       Commands.kSetBlendingOption,
+      Commands.kEnumBlendingScene,
+      Commands.kApplyBlendingScene,
     ]);
     public static get AllCommands() {
       return this._all_commands;
@@ -3484,4 +3492,39 @@ export namespace Protocol {
     id;
     value;
   }
+
+  export class EnumBlendingSceneResponseEntity extends PacketEntity {
+    constructor() {
+      super();
+      super.flag = PacketEntity.FLAG_RESPONSE;
+    }
+
+    scenes = [];
+  }
+
+  export class EnumBlendingSceneRequestEntity extends PacketEntity {
+    constructor(
+      rpc_id = 0
+    ) {
+      super();
+      super.command = Commands.kEnumBlendingScene;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      super.rpc_id = rpc_id;
+    }
+  }
+
+  export class ApplyBlendingSceneRequestEntity extends PacketEntity {
+    constructor(
+      name: string,
+      rpc_id = 0
+    ) {
+      super();
+      super.command = Commands.kApplyBlendingScene;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      super.rpc_id = rpc_id;
+
+      this.name = name ?? "";
+    }
+    name;
+  }
 }

From 6723d28701fe48d2d27a9c7263cecdcf8e173221 Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Tue, 31 Jan 2023 10:34:43 +0800
Subject: [PATCH 40/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9id=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 4364f37..f2f3263 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -204,7 +204,7 @@ export default defineComponent({
     const EnableBlending = ref(false);
     let optionsstr = ref();
     optionsstr.value = "FusionLocale";
-    const hide_desktop_value_id = ref("0");
+    const hide_desktop_value_id = ref("debug@show_mask");
     const hide_desktop_value = ref(false);
     const disable_blending_params_id = ref("1");
     const disable_blending_params = ref(false);

From 2586774c4a453f53e65cfb3c27c5c7c39e3e3b57 Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cloudview.work>
Date: Tue, 31 Jan 2023 10:54:20 +0800
Subject: [PATCH 41/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=80=E5=A4=A7?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/FusionLocale.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 59f4aac..2fe8eef 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -104,7 +104,7 @@
 
         <div>
           <div><q-btn color="white" @click="add('p')" text-color="black" label="↑" /></div>
-          <q-slider v-model="array[group].p" :min="0" @change="chang('p')" :max="2.5" :step="0.01" color="green"
+          <q-slider v-model="array[group].p" :min="0" @change="chang('p')" :max="16" :step="0.01" color="green"
             vertical reverse label-always />
           <div><q-btn color="white" @click="reduce('p')" text-color="black" label="↓" /></div>
           <p class="text-center">p</p>
@@ -112,7 +112,7 @@
 
         <div>
           <div><q-btn color="white" @click="add('gamma')" text-color="black" label="↑" /></div>
-          <q-slider v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="2.5" :step="0.01" color="green"
+          <q-slider v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green"
             vertical reverse label-always />
           <div><q-btn color="white" @click="reduce('gamma')" text-color="black" label="↓" /></div>
           <p class="text-center">gamma</p>

From 361c2c06c50c3edb70d12e4fcc3d312051cb3547 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Wed, 1 Feb 2023 15:01:00 +0800
Subject: [PATCH 42/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0125=E7=BC=A9=E6=94=BE?=
 =?UTF-8?q?=E4=B8=8B=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=BB=91=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 97 ++++++++++--------
 .../FusionSettings/FourPointCalibration.vue   | 43 ++++----
 .../FusionSettings/FusionLocale.vue           | 28 +++---
 .../FusionSettings/GridSettings.vue           | 26 +----
 .../FusionSettings/SurfaceCorrection.vue      | 66 +++++++------
 src/components/FusionSettingsDialog.vue       | 98 ++++++++++++++-----
 src/i18n/zh-CN/index.ts                       |  2 +-
 7 files changed, 210 insertions(+), 150 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 186c22a..9ea2ef0 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -2,47 +2,47 @@
   <div class="row">
     <div class="col-1"></div>
     <div class="col-8 q-pt-md">
-      <div ref="div" style="width: 100%; background-color: aquamarine; height: 100%">
+      <div ref="div" style="width: 100%; background-color: #646464; height: 100%">
         <div style="position: absolute">
-          <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="20" :x="point_postion[0].x"
+          <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="30" :x="point_postion[0].x"
             :y="point_postion[0].y" @mousedown="isactivearray[0] = true" :isResizable="false"
-            @moveHandler="moveHandler($event, 0)"><span>v1</span>
+            @moveHandler="moveHandler($event, 0)"><p  class="p0 vcolro">↑</p><p class="vcolro p0">V1</p><p class=" vcolro p0">↓</p>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="20" :x="point_postion[1].x"
+          <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="30" :x="point_postion[1].x"
             :y="point_postion[1].y" @mousedown="isactivearray[1] = true" :isResizable="false"
-            @moveHandler="moveHandler($event, 1)"><span>v2</span>
+            @moveHandler="moveHandler($event, 1)"><p  class="p0 vcolro">↑</p><p class="vcolro p0">V2</p><p class="p0 vcolro">↓</p>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="20" :x="point_postion[2].x"
+          <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="30" :x="point_postion[2].x"
             :y="point_postion[2].y" @mousedown="isactivearray[2] = true" :isResizable="false"
-            @moveHandler="moveHandler($event, 2)"><span>v3</span>
+            @moveHandler="moveHandler($event, 2)"><p  class="p0 vcolro">↑</p><p class="vcolro p0">V3</p><p class="p0 vcolro">↓</p>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="20" :x="point_postion[3].x"
+          <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="30" :x="point_postion[3].x"
             :y="point_postion[3].y" @mousedown="isactivearray[3] = true" :isResizable="false"
-            @moveHandler="moveHandler($event, 3)"><span>v4</span>
+            @moveHandler="moveHandler($event, 3)"><p  class="p0 vcolro">↑</p><p class="vcolro p0">V4</p><p class="p0 vcolro">↓</p>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="20" :x="point_postion[4].x"
+          <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="30" :x="point_postion[4].x"
             :y="point_postion[4].y" @mousedown="isactivearray[4] = true" :isResizable="false"
-            @moveHandler="moveHandler($event, 4)"><span>v5</span>
+            @moveHandler="moveHandler($event, 4)"><p  class="p0 vcolro">↑</p><p class="vcolro p0">V5</p><p class="p0 vcolro">↓</p>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="30" :h="20" :x="point_postion[5].x"
+          <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="40" :h="20" :x="point_postion[5].x"
             :y="point_postion[5].y" @mousedown="isactivearray[5] = true" :isResizable="false"
-            @moveHandler="moveHandler($event, 5)"><span>h1</span>
+            @moveHandler="moveHandler($event, 5)"><span class="hcolro">←H1→</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="30" :h="20" :x="point_postion[6].x"
+          <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="40" :h="20" :x="point_postion[6].x"
             :y="point_postion[6].y" @mousedown="isactivearray[6] = true" :isResizable="false"
-            @moveHandler="moveHandler($event, 6)"><span>h2</span>
+            @moveHandler="moveHandler($event, 6)"><span class="hcolro">←H2→</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="30" :h="20" :x="point_postion[7].x"
+          <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="40" :h="20" :x="point_postion[7].x"
             :y="point_postion[7].y" @mousedown="isactivearray[7] = true" :isResizable="false"
-            @moveHandler="moveHandler($event, 7)"><span>h3</span>
+            @moveHandler="moveHandler($event, 7)"><span class="hcolro">←H3→</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="30" :h="20" :x="point_postion[8].x"
+          <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="40" :h="20" :x="point_postion[8].x"
             :y="point_postion[8].y" @mousedown="isactivearray[8] = true" :isResizable="false"
-            @moveHandler="moveHandler($event, 8)"><span>h4</span>
+            @moveHandler="moveHandler($event, 8)"><span class="hcolro">←H4→</span>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[9]" v-if="isshowarray[9]" :w="35" :h="20" :x="point_postion[9].x"
+          <vue3ResizeDrag :isActive="isactivearray[9]" v-if="isshowarray[9]" :w="40" :h="20" :x="point_postion[9].x"
             :y="point_postion[9].y" @mousedown="isactivearray[9] = true" :isResizable="false"
-            @moveHandler="moveHandler($event, 9)"><span>h5</span>
+            @moveHandler="moveHandler($event, 9)"><span class="hcolro">←H5→</span>
           </vue3ResizeDrag>
         </div>
       </div>
@@ -55,7 +55,7 @@
             <div class="col-8">
               <q-input @focus="isactivearray[0] = false" filled type="number" class="q-pt-md" :dense="true"
                 v-model="value[0].y" label="y" lazy-rules />
-              <q-btn dense color="white" @click="reset(0)" text-color="black" :label="$t('reset') + ' v1'" />
+              <q-btn  size="sm" color="white" @click="reset(0)" text-color="black" :label="$t('reset') + ' v1'" />
             </div>
           </div>
         </div>
@@ -65,7 +65,7 @@
             <div class="col-8">
               <q-input @focus="isactivearray[1] = false" filled type="number" class="q-pt-md" :dense="true"
                 v-model="value[1].y" label="y" lazy-rules />
-              <q-btn dense color="white" @click="reset(1)" text-color="black" :label="$t('reset') + ' v2'" />
+              <q-btn  size="sm" color="white" @click="reset(1)" text-color="black" :label="$t('reset') + ' v2'" />
             </div>
           </div>
         </div>
@@ -75,7 +75,7 @@
             <div class="col-8">
               <q-input @focus="isactivearray[2] = false" filled type="number" class="q-pt-md" :dense="true"
                 v-model="value[2].y" label="y" lazy-rules />
-              <q-btn dense color="white" @click="reset(2)" text-color="black" :label="$t('reset') + ' v3'" />
+              <q-btn  size="sm" color="white" @click="reset(2)" text-color="black" :label="$t('reset') + ' v3'" />
             </div>
           </div>
         </div>
@@ -85,7 +85,7 @@
             <div class="col-8">
               <q-input @focus="isactivearray[3] = false" filled type="number" class="q-pt-md" :dense="true"
                 v-model="value[3].y" label="y" lazy-rules />
-              <q-btn dense color="white" @click="reset(3)" text-color="black" :label="$t('reset') + ' v4'" />
+              <q-btn  size="sm" color="white" @click="reset(3)" text-color="black" :label="$t('reset') + ' v4'" />
             </div>
           </div>
         </div>
@@ -95,7 +95,7 @@
             <div class="col-8">
               <q-input @focus="isactivearray[4] = false" filled type="number" class="q-pt-md" :dense="true"
                 v-model="value[4].y" label="y" lazy-rules />
-              <q-btn dense color="white" @click="reset(4)" text-color="black" :label="$t('reset') + ' v5'" />
+              <q-btn  size="sm" color="white" @click="reset(4)" text-color="black" :label="$t('reset') + ' v5'" />
             </div>
           </div>
         </div>
@@ -107,31 +107,31 @@
         <div class="box_son">
           <q-input filled @focus="isactivearray[5] = false" type="number" class="q-pt-md" :dense="true"
             v-model="value[5].x" label="x" lazy-rules />
-          <q-btn dense color="white" @click="reset(5)" text-color="black" :label="$t('reset') + ' h1'" />
+          <q-btn  size="sm" color="white" @click="reset(5)" text-color="black" :label="$t('reset') + ' h1'" />
         </div>
 
         <div class="box_son">
           <q-input filled @focus="isactivearray[6] = false" type="number" class="q-pt-md" :dense="true"
             v-model="value[6].x" label="x" lazy-rules />
-          <q-btn dense color="white" @click="reset(6)" text-color="black" :label="$t('reset') + ' h2'" />
+          <q-btn  size="sm" color="white" @click="reset(6)" text-color="black" :label="$t('reset') + ' h2'" />
         </div>
 
         <div class="box_son">
           <q-input filled @focus="isactivearray[7] = false" type="number" class="q-pt-md" :dense="true"
             v-model="value[7].x" label="x" lazy-rules />
-          <q-btn dense color="white" @click="reset(7)" text-color="black" :label="$t('reset') + ' h3'" />
+          <q-btn  size="sm" color="white" @click="reset(7)" text-color="black" :label="$t('reset') + ' h3'" />
         </div>
 
         <div class="box_son">
           <q-input filled @focus="isactivearray[8] = false" type="number" class="q-pt-md" :dense="true"
             v-model="value[8].x" label="x" lazy-rules />
-          <q-btn dense color="white" @click="reset(8)" text-color="black" :label="$t('reset') + ' h4'" />
+          <q-btn  size="sm" color="white" @click="reset(8)" text-color="black" :label="$t('reset') + ' h4'" />
         </div>
 
         <div class="box_son">
           <q-input filled @focus="isactivearray[9] = false" type="number" class="q-pt-md" :dense="true"
             v-model="value[9].x" label="x" lazy-rules />
-          <q-btn dense color="white" @click="reset(9)" text-color="black" :label="$t('reset') + ' h5'" />
+          <q-btn  size="sm" color="white" @click="reset(9)" text-color="black" :label="$t('reset') + ' h5'" />
         </div>
 
         <div class="box_son q-pt-xl">
@@ -156,6 +156,18 @@
   width: 10rem;
   padding-right: 1rem;
 }
+.vcolro{
+  color: #d50000;
+}
+.hcolro{
+  color: #00c853;
+  font-size: 5px;
+}
+.p0{
+  margin: 0;
+  padding: 0;
+  line-height: 8px;
+}
 </style>
 <script lang="ts">
 import {
@@ -440,10 +452,10 @@ export default defineComponent({
 
     onMounted(() => {
       initialization();
-      Proportion.value.x = config.width / (div.value.offsetWidth - 25);
-      Proportion.value.y = config.height / (div.value.offsetHeight - 25);
-      let Width = (div.value.offsetWidth - 25) / 4;
-      let Height = (div.value.offsetHeight - 25) / 4;
+      Proportion.value.x = config.width / (div.value.offsetWidth - 40);
+      Proportion.value.y = config.height / (div.value.offsetHeight - 30);
+      let Width = (div.value.offsetWidth - 40) / 4;
+      let Height = (div.value.offsetHeight - 30) / 4;
       for (
         let index = 0;
         index < config.hor_density.length + config.ver_density.length;
@@ -466,10 +478,10 @@ export default defineComponent({
         return (() => {
           if (div != null) {
             initialization();
-            Proportion.value.x = config.width / (div.value.offsetWidth - 25);
-            Proportion.value.y = config.height / (div.value.offsetHeight - 25);
-            let Width = (div.value.offsetWidth - 25) / 4;
-            let Height = (div.value.offsetHeight - 25) / 4;
+            Proportion.value.x = config.width / (div.value.offsetWidth - 40);
+            Proportion.value.y = config.height / (div.value.offsetHeight - 30);
+            let Width = (div.value.offsetWidth - 40) / 4;
+            let Height = (div.value.offsetHeight - 30) / 4;
             for (
               let index = 0;
               index < config.hor_density.length + config.ver_density.length;
@@ -664,7 +676,11 @@ export default defineComponent({
       }
       save_set_cache();
     };
-
+    const creat_svg=(index:Number,type:string):string=>{
+      //btoa(unescape(encodeURIComponent(str)))
+      //'data:image/svg+xml;base64,'+btoa(`<svg width="50" height="50"xmlns="http://www.w3.org/2000/svg"><text font-size="14" fill="#d50000"><tspan x="3" y="10">↑</tspan><tspan x="0" y="20">v${index}</tspan><tspan x="3" y="30">↓</tspan></text></svg>`)
+      return type=='h'?`data:image/svg+xml,%3Csvg width='50' height='14' xmlns='http://www.w3.org/2000/svg'%3E%3Ctext x='50%25' y='50%25' font-size='14' fill='%2300c853' font-family='system-ui, sans-serif' text-anchor='middle' dominant-baseline='middle'%3E←h${index}→%3C/text%3E%3C/svg%3E`:'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTQiIGhlaWdodD0iNTAiCiAgICB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogICAgPHRleHQgZm9udC1zaXplPSIxNCIgZmlsbD0iI2Q1MDAwMCI+CiAgICAgICAgPHRzcGFuIHg9IjMiIHk9IjEwIj7ihpE8L3RzcGFuPgogICAgICAgIDx0c3BhbiB4PSIwIiB5PSIyMCI+djE8L3RzcGFuPgogICAgICAgIDx0c3BhbiB4PSIzIiB5PSIzMCI+4oaTPC90c3Bhbj4KICAgIDwvdGV4dD4KPC9zdmc+'
+    }
     initialization();
     return {
       model,
@@ -678,6 +694,7 @@ export default defineComponent({
       isshowarray,
       isactivearray,
       save,
+      creat_svg
     };
   },
 });
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 75cf35a..8e79fb7 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -4,7 +4,7 @@
       <q-input
         filled
         type="number"
-        class="q-pt-md"
+        class="q-pt-xs"
         style="text-align: center"
         :dense="true"
         @focus="isactivearray[0] = false"
@@ -15,7 +15,7 @@
       <q-input
         filled
         type="number"
-        class="q-pt-md"
+        class="q-pt-xs"
         :dense="true"
         @focus="isactivearray[0] = false"
         v-model="four[0].y"
@@ -23,6 +23,7 @@
         lazy-rules
       />
       <q-btn
+      size="sm" dense
         color="white"
         @click="reset(0)"
         text-color="black"
@@ -34,7 +35,7 @@
       <q-input
         filled
         type="number"
-        class="q-pt-md"
+        class="q-pt-xs"
         :dense="true"
         @focus="isactivearray[1] = false"
         v-model="four[1].x"
@@ -44,7 +45,7 @@
       <q-input
         filled
         type="number"
-        class="q-pt-md"
+        class="q-pt-xs"
         :dense="true"
         @focus="isactivearray[1] = false"
         v-model="four[1].y"
@@ -52,6 +53,7 @@
         lazy-rules
       />
       <q-btn
+      size="sm" dense
         color="white"
         @click="reset(1)"
         text-color="black"
@@ -61,59 +63,59 @@
 
     <div class="col-2"></div>
     <div class="col-8">
-      <div ref="div" style="background-color: #7fffd4; height: 40vh">
+      <div ref="div" style="background-color: #646464; height: 40vh">
         <div style="position: absolute">
           <vue3ResizeDrag
             v-if="isshowarray[0]"
             :isActive="isactivearray[0]"
             @mousedown="activeMouseDown(0)"
             @mouseUpHandler="mouseUpHandler(0)"
-            :w="30"
+            :w="20"
             :h="20"
             :x="points[0].x"
             :y="points[0].y"
             :isResizable="false"
             @moveHandler="moveHandler_1"
-            ><span>{{ $t("point") }}1</span>
+            ><div class="point">1</div>
           </vue3ResizeDrag>
           <vue3ResizeDrag
             v-if="isshowarray[1]"
             :isActive="isactivearray[1]"
             @mousedown="activeMouseDown(1)"
             @mouseUpHandler="mouseUpHandler(1)"
-            :w="30"
+            :w="20"
             :h="20"
             :x="points[1].x"
             :y="points[1].y"
             :isResizable="false"
             @moveHandler="moveHandler_2"
-            ><span>{{ $t("point") }}2</span>
+            ><div class="point">2</div>
           </vue3ResizeDrag>
           <vue3ResizeDrag
             v-if="isshowarray[2]"
             :isActive="isactivearray[2]"
             @mousedown="activeMouseDown(2)"
             @mouseUpHandler="mouseUpHandler(2)"
-            :w="30"
+            :w="20"
             :h="20"
             :x="points[2].x"
             :y="points[2].y"
             :isResizable="false"
             @moveHandler="moveHandler_3"
-            ><span>{{ $t("point") }}3</span>
+            ><div class="point">3</div>
           </vue3ResizeDrag>
           <vue3ResizeDrag
             v-if="isshowarray[3]"
             :isActive="isactivearray[3]"
             @mousedown="activeMouseDown(3)"
             @mouseUpHandler="mouseUpHandler(3)"
-            :w="30"
+            :w="20"
             :h="20"
             :x="points[3].x"
             :y="points[3].y"
             :isResizable="false"
             @moveHandler="moveHandler_4"
-            ><span>{{ $t("point") }}4</span>
+            ><div class="point">4</div>
           </vue3ResizeDrag>
         </div>
       </div>
@@ -124,7 +126,7 @@
       <q-input
         filled
         type="number"
-        class="q-pt-md"
+        class="q-pt-xs"
         :dense="true"
         @focus="isactivearray[2] = false"
         v-model="four[2].x"
@@ -134,7 +136,7 @@
       <q-input
         filled
         type="number"
-        class="q-pt-md"
+        class="q-pt-xs"
         :dense="true"
         @focus="isactivearray[2] = false"
         v-model="four[2].y"
@@ -142,6 +144,7 @@
         lazy-rules
       />
       <q-btn
+      size="sm" dense
         color="white"
         @click="reset(2)"
         text-color="black"
@@ -150,6 +153,7 @@
     </div>
     <div class="col-8">
       <q-btn
+      size="sm" dense
         color="white"
         @click="resetall"
         text-color="black"
@@ -160,7 +164,7 @@
       <q-input
         filled
         type="number"
-        class="q-pt-md"
+        class=""
         :dense="true"
         @focus="isactivearray[3] = false"
         v-model="four[3].x"
@@ -178,6 +182,7 @@
         lazy-rules
       />
       <q-btn
+      size="sm" dense
         color="white"
         @click="reset(3)"
         text-color="black"
@@ -187,7 +192,11 @@
   </div>
 </template>
 
-<style scoped></style>
+<style scoped>
+.point{
+  width: 100%;height: 100%;border-radius: 50%;background: #0000ff;color: aliceblue;
+}
+</style>
 <script lang="ts">
 import vue3ResizeDrag from "src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
 import { dom } from "quasar";
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 2fe8eef..1fd4470 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -11,7 +11,7 @@
                   <q-toggle class="float-right" v-model="array[0].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :autofocus="group == 0" :bg-color="group == 0 ? 'cyan-1' : ''"
+                  <q-input dense filled type="number" :autofocus="group == 0" :bg-color="group == 0 ? 'cyan-1' : ''"
                     @focus="group = 0" v-model="array[0].value" :label="$t('upper fusion zone parameters')" lazy-rules
                     :rules="[
                       (val) =>
@@ -33,7 +33,7 @@
                   <q-toggle class="float-right" v-model="array[1].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :autofocus="group == 1" :bg-color="group == 1 ? 'cyan-1' : ''"
+                  <q-input dense filled type="number" :autofocus="group == 1" :bg-color="group == 1 ? 'cyan-1' : ''"
                     @focus="group = 1" v-model="array[1].value" :label="$t('Left fusion Band Parameters')" lazy-rules
                     :rules="[
                       (val) =>
@@ -51,7 +51,7 @@
                   <q-toggle class="float-right" v-model="array[2].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :autofocus="group == 2" :bg-color="group == 2 ? 'cyan-1' : ''"
+                  <q-input dense filled type="number" :autofocus="group == 2" :bg-color="group == 2 ? 'cyan-1' : ''"
                     @focus="group = 2" v-model="array[2].value" :label="$t('Right fusion Band Parameters')" lazy-rules
                     :rules="[
                       (val) =>
@@ -75,7 +75,7 @@
                   <q-toggle class="float-right" v-model="array[3].isshow" label="" />
                 </div>
                 <div class="col-6">
-                  <q-input filled type="number" :autofocus="group == 3" :bg-color="group == 3 ? 'cyan-1' : ''"
+                  <q-input dense filled type="number" :autofocus="group == 3" :bg-color="group == 3 ? 'cyan-1' : ''"
                     @focus="group = 3" v-model="array[3].value" :label="$t('Lower fusion Zone Parameters')" lazy-rules
                     :rules="[
                       (val) =>
@@ -92,29 +92,29 @@
       </div>
     </div>
     <div class="col-4 offset-4" v-if="group != 4">
-      <p class="text-center">{{ $t("Set Fusion Band Parameters") }}</p>
+      <p class="text-center" style="margin: 0 0 8;">{{ $t("Set Fusion Band Parameters") }}</p>
       <div style="display: flex; justify-content: space-evenly">
         <div>
-          <div><q-btn color="white" @click="add('alpha')" text-color="black" label="↑" /></div>
-          <q-slider v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
+          <div><q-btn size="sm"  color="white" @click="add('alpha')" text-color="black" label="↑" /></div>
+          <q-slider style="height: 10rem;"  v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
             vertical reverse label-always />
-          <div><q-btn color="white" @click="reduce('alpha')" text-color="black" label="↓" /></div>
+          <div><q-btn size="sm"  color="white" @click="reduce('alpha')" text-color="black" label="↓" /></div>
           <p class="text-center">alpha</p>
         </div>
 
         <div>
-          <div><q-btn color="white" @click="add('p')" text-color="black" label="↑" /></div>
-          <q-slider v-model="array[group].p" :min="0" @change="chang('p')" :max="16" :step="0.01" color="green"
+          <div><q-btn size="sm"  color="white" @click="add('p')" text-color="black" label="↑" /></div>
+          <q-slider style="height: 10rem;" v-model="array[group].p" :min="0" @change="chang('p')" :max="16" :step="0.01" color="green"
             vertical reverse label-always />
-          <div><q-btn color="white" @click="reduce('p')" text-color="black" label="↓" /></div>
+          <div><q-btn size="sm"  color="white" @click="reduce('p')" text-color="black" label="↓" /></div>
           <p class="text-center">p</p>
         </div>
 
         <div>
-          <div><q-btn color="white" @click="add('gamma')" text-color="black" label="↑" /></div>
-          <q-slider v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green"
+          <div><q-btn size="sm"  color="white" @click="add('gamma')" text-color="black" label="↑" /></div>
+          <q-slider style="height: 10rem;" v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green"
             vertical reverse label-always />
-          <div><q-btn color="white" @click="reduce('gamma')" text-color="black" label="↓" /></div>
+          <div><q-btn size="sm"  color="white" @click="reduce('gamma')" text-color="black" label="↓" /></div>
           <p class="text-center">gamma</p>
         </div>
       </div>
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 685762e..a6fed78 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -44,30 +44,6 @@
             </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="row">
-                <div class="col-4"><span>{{ $t('center line color') }}</span></div>
-                <div class="col-8 border" @click="isshowhex = true; index = 2" :style="{ 'background-color': color[2] }"></div>
-              </div>
-            </div>
-            <div><q-checkbox v-model="RowsColumns[2]" @update:model-value="send_off(2)" /></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="row">
-                <div class="col-4"><span>{{ $t('center circle color') }}</span></div>
-                <div class="col-8 border" @click="isshowhex = true; index = 3" :style="{ 'background-color': color[3] }"></div>
-              </div>
-            </div>
-            <div><q-checkbox v-model="RowsColumns[3]" @update:model-value="send_off(3)" /></div>
-          </div>
-        </div> -->
       </div>
     </div>
     <div v-if="isshowhex" style="margin: 0 auto;text-align: center;"><q-color no-header-tabs no-footer
@@ -163,8 +139,10 @@ export default defineComponent({
       model[0] = Number(server_conf.blending_grids_row)
       model[1] = Number(server_conf.blending_grids_column)
       color[0] = server_conf.blending_grids_line_color
+
       RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true
       RowsColumns[1] = server_conf.blending_grids_show_column === "false" ? false : true
+
     }
     use_server_config()
 
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 48fa5ba..7c4a83a 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -57,43 +57,43 @@
       </div>
     </div>
     <div class="col-8">
-      <div ref="div" style="background-color: #7fffd4; height: 40vh">
+      <div ref="div" style="background-color: #646464; height: 40vh">
         <div style="position: absolute">
-          <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="20" :x="ninepostion[0].x"
+          <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="20" :h="20" :x="ninepostion[0].x"
             :y="ninepostion[0].y" @mousedown="activeMouseDown(0)" :isResizable="false" @moveHandler="moveHandler_1">
-            <span>{{ $t("point") }}1</span>
+            <div class="point">1</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="20" :x="ninepostion[1].x"
+          <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="20" :h="20" :x="ninepostion[1].x"
             :y="ninepostion[1].y" @mousedown="activeMouseDown(1)" :isResizable="false" @moveHandler="moveHandler_2">
-            <span>{{ $t("point") }}2</span>
+            <div class="point">2</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="20" :x="ninepostion[2].x"
+          <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="20" :h="20" :x="ninepostion[2].x"
             :y="ninepostion[2].y" @mousedown="activeMouseDown(2)" :isResizable="false" @moveHandler="moveHandler_3">
-            <span>{{ $t("point") }}3</span>
+            <div class="point">3</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="20" :x="ninepostion[3].x"
+          <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="20" :h="20" :x="ninepostion[3].x"
             :y="ninepostion[3].y" @mousedown="activeMouseDown(3)" :isResizable="false" @moveHandler="moveHandler_4">
-            <span>{{ $t("point") }}4</span>
+            <div class="point">4</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="20" :x="ninepostion[4].x"
+          <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="20" :h="20" :x="ninepostion[4].x"
             :y="ninepostion[4].y" @mousedown="activeMouseDown(4)" :isResizable="false" @moveHandler="moveHandler_5">
-            <span>{{ $t("point") }}5</span>
+            <div class="point">5</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="30" :h="20" :x="ninepostion[5].x"
+          <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="20" :h="20" :x="ninepostion[5].x"
             :y="ninepostion[5].y" @mousedown="activeMouseDown(5)" :isResizable="false" @moveHandler="moveHandler_6">
-            <span>{{ $t("point") }}6</span>
+            <div class="point">6</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="30" :h="20" :x="ninepostion[6].x"
+          <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="20" :h="20" :x="ninepostion[6].x"
             :y="ninepostion[6].y" @mousedown="activeMouseDown(6)" :isResizable="false" @moveHandler="moveHandler_7">
-            <span>{{ $t("point") }}7</span>
+            <div class="point">7</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="30" :h="20" :x="ninepostion[7].x"
+          <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="20" :h="20" :x="ninepostion[7].x"
             :y="ninepostion[7].y" @mousedown="activeMouseDown(7)" :isResizable="false" @moveHandler="moveHandler_8">
-            <span>{{ $t("point") }}8</span>
+            <div class="point">8</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="30" :h="20" :x="ninepostion[8].x"
+          <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="20" :h="20" :x="ninepostion[8].x"
             :y="ninepostion[8].y" @mousedown="activeMouseDown(8)" :isResizable="false" @moveHandler="moveHandler_9">
-            <span>{{ $t("point") }}9</span>
+            <div class="point">9</div>
           </vue3ResizeDrag>
         </div>
       </div>
@@ -151,7 +151,9 @@
 </template>
 
 <style scoped>
-
+.point{
+  width: 100%;height: 100%;border-radius: 50%;background: #00ff00;color: aliceblue;
+}
 </style>
 <script lang="ts">
 import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
@@ -477,35 +479,35 @@ export default defineComponent({
       ninepostion.value[0].x = 0;
       ninepostion.value[0].y = 0;
 
-      ninepostion.value[1].x = div.value.offsetWidth / 2 - 25;
+      ninepostion.value[1].x = div.value.offsetWidth / 2 - 20;
       ninepostion.value[1].y = 0;
 
-      ninepostion.value[2].x = div.value.offsetWidth - 25;
+      ninepostion.value[2].x = div.value.offsetWidth - 20;
       ninepostion.value[2].y = 0;
 
       ninepostion.value[3].x = 0;
       ninepostion.value[3].y = div.value.offsetHeight / 2 - 8;
 
-      ninepostion.value[4].x = div.value.offsetWidth / 2 - 25;
+      ninepostion.value[4].x = div.value.offsetWidth / 2 - 20;
       ninepostion.value[4].y = div.value.offsetHeight / 2 - 8;
 
-      ninepostion.value[5].x = div.value.offsetWidth - 25;
+      ninepostion.value[5].x = div.value.offsetWidth - 20;
       ninepostion.value[5].y = div.value.offsetHeight / 2;
 
       ninepostion.value[6].x = 0;
-      ninepostion.value[6].y = div.value.offsetHeight - 25;
+      ninepostion.value[6].y = div.value.offsetHeight - 20;
 
       ninepostion.value[7].x = div.value.offsetWidth / 2 - 8;
-      ninepostion.value[7].y = div.value.offsetHeight - 25;
+      ninepostion.value[7].y = div.value.offsetHeight - 20;
 
-      ninepostion.value[8].x = div.value.offsetWidth - 25;
-      ninepostion.value[8].y = div.value.offsetHeight - 25;
+      ninepostion.value[8].x = div.value.offsetWidth - 20;
+      ninepostion.value[8].y = div.value.offsetHeight - 20;
 
-      Proportion.value.x = config.width / (div.value.offsetWidth - 25);
-      Proportion.value.y = config.height / (div.value.offsetHeight - 25);
+      Proportion.value.x = config.width / (div.value.offsetWidth - 20);
+      Proportion.value.y = config.height / (div.value.offsetHeight - 20);
 
-      centor.value.x = (config.width * 2) / (div.value.offsetWidth + 25);
-      centor.value.y = (config.height * 2) / (div.value.offsetHeight + 25);
+      centor.value.x = (config.width * 2) / (div.value.offsetWidth + 20);
+      centor.value.y = (config.height * 2) / (div.value.offsetHeight + 20);
 
       for (let index = 0; index < defaultninepostion.value.length; index++) {
         defaultninepostion.value[index].x = ninepostion.value[index].x;
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index f2f3263..7aefb92 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -4,9 +4,12 @@
       if (evt.keyCode == 27) {
         show_dialog = false;
       }
+      if (evt.keyCode == 17) {
+        record_times++
+      }
     }
   ">
-    <q-card class="" style="max-width: 90vw">
+    <q-card class="" style="max-width: 90vw;padding: 0;">
       <q-form>
         <q-card-section class="q-ma-none q-pa-sm">
           <div class="row">
@@ -15,20 +18,19 @@
             </div>
 
             <q-space />
-            <q-btn flat round icon="close" color="red" @click="clear()" v-close-popup>
+            <q-btn size="sm" dense flat round icon="close" color="red" @click="clear()" v-close-popup>
               <q-tooltip>
                 {{ $t("close") }}
               </q-tooltip>
             </q-btn>
-            <div></div>
           </div>
         </q-card-section>
 
         <q-separator />
         <!-- height: 80vh -->
-        <q-card-section class="scroll" style="width: 80vw">
+        <q-card-section class="scroll" style="width: 60vw;padding: 0;">
           <div class="row" style="border: 1px solid #b0bec5; text-align: center">
-            <div class="col-3" style="border-right: 1px solid #b0bec5">
+            <div class="col-2" style="border-right: 1px solid #b0bec5">
               <p class="text-center">{{ $t("Projector") }}</p>
               <!-- row 在前col在后 -->
               <div v-for="(item, index_row) in config.row">
@@ -43,7 +45,7 @@
                 }}<q-checkbox v-model="EnableBlending" />
               </div>
             </div>
-            <div class="col-9">
+            <div class="col-10">
               <div class="q-ta-md">
                 <q-btn-toggle :disable="!$store.state.enablefusion" no-caps v-model="options" toggle-color="primary"
                   :options="[
@@ -73,15 +75,17 @@
         <q-separator />
 
         <q-card-actions align="right">
-          <span>{{ $t("Whether to hide the desktop") }}</span><q-checkbox style="justify-content: flex-start"
-            v-model="hide_desktop_value" @click="send_hide_desktop" />
-          <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" />
+            <span  v-show="isdebug">{{ $t("Whether to hide the desktop") }}</span><q-checkbox  v-show="isdebug" style="justify-content: flex-start"
+              v-model="hide_desktop_value" @click="send_hide_desktop" />
+            <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" />
           <div class="q-space" data-v-39efcd1f=""></div>
+          <div v-show="!isdebug" class="q-space" data-v-39efcd1f=""></div>
+          <div v-show="!isdebug" class="q-space" data-v-39efcd1f=""></div>
           <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall config')" />
           <div class="q-space" data-v-39efcd1f=""></div>
           <q-btn flat :label="$t('Select saved configuration')" no-caps color="primary"
@@ -99,13 +103,13 @@
           <div class="text-h6">{{ $t('Whether to save the configuration') }}</div>
         </q-card-section>
         <q-card-section class="q-pt-none">
-          <q-input filled v-model="save_name" :label="$t('New Please enter a name')" />
-          <q-select v-show="save_name.length == 0" filled v-model="save_cover_name" :options="plan_list"
-          :label="$t('Please select an override')" />
+          <q-select filled :model-value="save_cover_name" use-input hide-selected fill-input input-debounce="0"
+            :options="plan_list_op" @filter="filterFn" @input-value="setModel">
+          </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')" color="primary" v-close-popup />
+          <q-btn flat :label="$t('save')" @click="saveconfig" color="primary" v-close-popup />
         </q-card-actions>
       </q-card>
     </q-dialog>
@@ -241,6 +245,7 @@ export default defineComponent({
       set?.SaveBlendingConfig("");
       //show_dialog.value = false;
       clear();
+      save_cover_name.value = save_name.value = ''
       set?.GetBlendingConfig("").then((res) => {
         let tmp = JSON.parse(res ? res.config : "");
         EnableBlending.value = tmp.enable;
@@ -262,6 +267,7 @@ export default defineComponent({
       } catch (error) { }
     };
     const clear = () => {
+      record_times.value = 0
       show_blending_grids.value = false;
       send_show_blending_grids();
       $store.commit("setSelectedProjector", "0/0");
@@ -310,14 +316,59 @@ export default defineComponent({
         });
       }, 1000);
     });
-    const save_cover_name = ref(" ")
+    const save_cover_name = ref("")
     const plan_list = [
-      'Google', 'Facebook', 'Twitter', 'Apple', 'Oracle'
+      '1'
     ]
     const apply_the_selected_configuration = () => {
       //这里根据选择的配置 应用
+
+      //console.log(select_configuration_name.value)
+      set?.ApplyBlendingScene(select_configuration_name.value);
+
+      let tmp = options.value
+      options.value = ""
+      getconfig()
+      setTimeout(() => {
+        options.value = tmp
+      }, 100);
     }
+    const plan_list_op = ref(plan_list)
+    const filterFn = (val: any, update: any, abort: any) => {
+      update(() => {
+        const needle = val.toLocaleLowerCase()
+        plan_list_op.value = plan_list.filter(v => v.toLocaleLowerCase().indexOf(needle) > -1)
+      })
+    }
+    const record_times = ref(0)
+    const setModel = (val: string) => {
+      save_cover_name.value = val
+    }
+
+    const get_scenes = () => {
+      set?.EnumBlendingScene().then((res) => {
+        if (res == null || res.scenes.length == 0) return
+        plan_list.splice(0, plan_list.length);
+        for (let index = 0; index < res.scenes.length; index++) {
+          plan_list.push(res.scenes[index]);
+        }
+      })
+    }
+    get_scenes()
+    const saveconfig = () => {
+      //save_cover_name
+
+    }
+    const isdebug = computed(() => {
+      let tmp = JSON.parse($store.state.fusion_configuration)
+      let str ='debug@show_mask'
+      return tmp.options[str]=='1'|| record_times.value>2
+    })
+
+
     return {
+      filterFn,
+      setModel,
       send_hide_desktop,
       hide_desktop_value,
       send_disable_blending_params,
@@ -339,8 +390,11 @@ export default defineComponent({
       plan_list,
       select_configuration,
       select_configuration_name,
-      apply_the_selected_configuration
-
+      apply_the_selected_configuration,
+      plan_list_op,
+      record_times,
+      saveconfig,
+      isdebug
     };
   },
 });
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 8b11266..9b8ae26 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -707,5 +707,5 @@ export default {
   "save":"保存",
   "Whether to save the configuration":"是否保存配置",
   "New Please enter a name":"新建 请输入名称",
-  "Please select an override":"请选择覆盖"
+  "Please select an override":"请选择覆盖",
 };

From deeb73cf265401413568c6a574921e2cdc723a72 Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cxte.com.cn>
Date: Thu, 2 Feb 2023 09:38:36 +0800
Subject: [PATCH 43/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=9E=8D=E5=90=88=E5=9C=BA=E6=99=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/ClientConnection.ts |  6 ++++++
 src/entities/WSProtocol.ts     | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index 1ab590a..78a7e26 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -1499,6 +1499,12 @@ export default class ClientConnection {
     );
   }
 
+  public async DeleteBlendingScene(name: string) {
+    return await this.doRpc<Protocol.RpcBlendingResponseEntity>(
+      new Protocol.ApplyBlendingSceneRequestEntity(name)
+    );
+  }
+
   public destory() {
     this.ws?.close();
     if (this.ws) {
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index fc74613..f327322 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -532,6 +532,9 @@ export namespace Protocol {
     public static get kApplyBlendingScene() {
       return Commands.PROTOCOL_PREFIX + "ApplyBlendingScene";
     }
+    public static get kDeleteBlendingScene() {
+      return Commands.PROTOCOL_PREFIX + "DeleteBlendingScene";
+    }
 
     static _all_commands = new Set([
       Commands.kUnKnowCommand,
@@ -667,6 +670,7 @@ export namespace Protocol {
       Commands.kSetBlendingOption,
       Commands.kEnumBlendingScene,
       Commands.kApplyBlendingScene,
+      Commands.kDeleteBlendingScene,
     ]);
     public static get AllCommands() {
       return this._all_commands;
@@ -3223,6 +3227,15 @@ export namespace Protocol {
     lb_l = 0;
   }
 
+  export class RpcBlendingResponseEntity extends PacketEntity {
+    constructor() {
+      super();
+      super.flag = PacketEntity.FLAG_RESPONSE;
+    }
+
+    success = false;
+  }
+
   /** */
   export class SetBlendingCorrectionRequestEntity extends PacketEntity {
     constructor(
@@ -3527,4 +3540,19 @@ export namespace Protocol {
     }
     name;
   }
+
+  export class DeleteBlendingSceneRequestEntity extends PacketEntity {
+    constructor(
+      name: string,
+      rpc_id = 0
+    ) {
+      super();
+      super.command = Commands.kDeleteBlendingScene;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      super.rpc_id = rpc_id;
+
+      this.name = name ?? "";
+    }
+    name;
+  }
 }

From 1bee760998dcbf157bdb3a0bbf7e9443469fd90e Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 2 Feb 2023 11:24:28 +0800
Subject: [PATCH 44/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/ClientConnection.ts          | 3046 +++++++++++------------
 src/components/FusionSettingsDialog.vue |  153 +-
 src/i18n/en-US/index.ts                 |    4 +-
 src/i18n/zh-CN/index.ts                 |    2 +
 4 files changed, 1636 insertions(+), 1569 deletions(-)

diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index 78a7e26..92d2257 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -1,1523 +1,1523 @@
-import { ConnectTableEntity } from "src/entities/ConnectTableEntity";
-import { PollingEntity } from "src/entities/PollingEntity";
-import ReconnectingWebSocket from "reconnecting-websocket";
-import NormalWindowRequestEntity from "src/entities/NormalWindowRequestEntity";
-import { PlanEntity } from "src/entities/PlanEntity";
-import { SignalSourceEntity } from "src/entities/SignalSourceEntity";
-import { StringKeyValueEntity } from "src/entities/StringKeyValueEntity";
-import SubtitleEntity from "src/entities/SubtitleEntity";
-import { Protocol } from "src/entities/WSProtocol";
-import EventBus, { EventNamesDefine } from "./EventBus";
-import { EdgeBlendingPoint } from "src/entities/EdgeBlendingEntities";
-import { ExternalControlTableEntity } from "src/entities/ExternalControlTableEntity";
-import { SerialPortConfigEntity } from "src/entities/SerialPortConfigEntity";
-import TimingTaskEntity from "src/entities/TimingTaskEntity";
-import JointActionEquipmentTableEntity from "src/entities/JointActionEquipmentTableEntity";
-import { CustomProtocol } from "src/entities/WSProtocolCustom";
-import ClientConnectionCustom from "./ClientConnectionCustom";
-import MagicWallConfig from "src/entities/MagicWallConfig";
-
-class _RpcInfo {
-  send_timestamp: number;
-  timeout_timestamp: number;
-  callback: (is_fail: boolean, packet: Protocol.Commands, data: string) => void;
-
-  constructor(
-    timeout_timestamp: number,
-    callback: (
-      is_fail: boolean,
-      packet: Protocol.Commands,
-      data: string
-    ) => void
-  ) {
-    this.timeout_timestamp = timeout_timestamp;
-    this.send_timestamp = new Date().getTime();
-    this.callback = callback;
-  }
-
-  public reject() {
-    this.callback(true, new Protocol.Commands(), "");
-  }
-
-  public reslove(is_fail: boolean, packet: Protocol.Commands, data: string) {
-    this.callback(is_fail, packet, data);
-  }
-}
-
-export default class ClientConnection {
-  ws: ReconnectingWebSocket | null = null;
-  url = "";
-  user_name = "";
-  password = "";
-  _is_login = false;
-  _rpc_id_counter = 0;
-  rpc_map = new Map<number, _RpcInfo>();
-
-  custom_connection: ClientConnectionCustom = new ClientConnectionCustom(this);
-
-  public login_callback:
-    | ((this: ClientConnection, logined: boolean) => void)
-    | null = null;
-
-  constructor(
-    url: string,
-    user_name?: string | null,
-    password?: string | null
-  ) {
-    this.url = url;
-    this.user_name = user_name ?? "";
-    this.password = password ?? "";
-
-    if (this.ws) {
-      this.ws.close();
-    }
-    this.ws = new ReconnectingWebSocket(url);
-
-    this.initializeWs();
-
-    setInterval(() => {
-      this.checkRpcTimeout();
-    }, 1000);
-  }
-
-  get is_connected() {
-    return this.ws && this.ws.readyState == WebSocket.OPEN;
-  }
-
-  get is_login() {
-    return this._is_login;
-  }
-
-  get customConnection() {
-    return this.custom_connection ?? new ClientConnectionCustom(this);
-  }
-
-  checkRpcTimeout() {
-    const current_datetime = new Date().getTime();
-    this.rpc_map.forEach((v, k, m) => {
-      if (current_datetime - v.send_timestamp > v.timeout_timestamp) {
-        v.reject();
-        m.delete(k);
-      }
-    });
-  }
-
-  initializeWs() {
-    if (this.ws) {
-      this.ws.onclose = (ev) => {
-        this.onClose(ev);
-      };
-      this.ws.onerror = (ev) => {
-        this.onError(ev);
-      };
-      this.ws.onopen = (ev) => {
-        this.onOpen(ev);
-      };
-      this.ws.onmessage = (ev) => {
-        this.onMessage(ev);
-      };
-    }
-  }
-
-  login() {
-    if (this.is_connected) {
-      const request = new Protocol.LoginRequest(this.user_name, this.password);
-      this.ws?.send(JSON.stringify(request));
-    }
-  }
-
-  onClose(ev: any) {
-    this._is_login = false;
-    EventBus.getInstance().emit(EventNamesDefine.WebSocketClose, this);
-  }
-
-  onError(ev: any) {
-    this._is_login = false;
-    EventBus.getInstance().emit(EventNamesDefine.WebSocketError, this);
-  }
-
-  onOpen(ev: any) {
-    this._is_login = false;
-    this.login();
-  }
-
-  onMessage(ev: MessageEvent) {
-    try {
-      const packet = JSON.parse(ev.data) as Protocol.PacketEntity;
-
-      if (packet) {
-        if (packet.has_exception) {
-          console.error(ev.data);
-          this.rpc_map.get(packet.rpc_id)?.reject();
-          this.rpc_map.delete(packet.rpc_id);
-        }
-        if (
-          Protocol.Commands.AllCommands.has(packet.command) ||
-          CustomProtocol.Commands.AllCommands.has(packet.command)
-        ) {
-          if (
-            packet.flag == Protocol.PacketEntity.FLAG_RESPONSE ||
-            packet.flag == Protocol.PacketEntity.FLAG_NOTIFY
-          ) {
-            if (packet.command == Protocol.Commands.kLogin) {
-              const login_response = JSON.parse(
-                ev.data
-              ) as Protocol.LoginResponse;
-              if (login_response) {
-                this._is_login =
-                  !login_response.has_exception && login_response.success;
-                if (this.is_login) {
-                  EventBus.getInstance().emit(
-                    EventNamesDefine.WebSocketConnected,
-                    this
-                  );
-                }
-                if (
-                  this.login_callback &&
-                  typeof this.login_callback == "function"
-                ) {
-                  this.login_callback(this._is_login);
-                }
-              }
-            } else if (this.rpc_map.has(packet.rpc_id)) {
-              this.rpc_map.get(packet.rpc_id)?.reslove(false, packet, ev.data);
-              this.rpc_map.delete(packet.rpc_id);
-            } else {
-              EventBus.getInstance().emit(
-                packet.flag == Protocol.PacketEntity.FLAG_NOTIFY
-                  ? EventNamesDefine.NotifyMessage
-                  : packet.flag == Protocol.PacketEntity.FLAG_RESPONSE
-                  ? EventNamesDefine.ResponseMessage
-                  : EventNamesDefine.UnKnow,
-                {
-                  packet: packet,
-                  data: ev.data,
-                }
-              );
-            }
-          }
-        } else {
-          console.error("unknow command: " + packet.command, packet);
-        }
-      }
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async doRpc<_ResponseType>(
-    request: Protocol.PacketEntity
-  ): Promise<_ResponseType | null> {
-    return new Promise((resolve, reject) => {
-      const rpc_id = ++this._rpc_id_counter;
-      if (this.rpc_map.has(rpc_id)) {
-        this.rpc_map.get(rpc_id)?.reject();
-        this.rpc_map.delete(rpc_id);
-      }
-      request.rpc_id = rpc_id;
-      this.rpc_map.set(
-        rpc_id,
-        new _RpcInfo(
-          request.timeout,
-          (is_fail: boolean, packet: Protocol.Commands, data: string) => {
-            if (is_fail) {
-              reject();
-            } else {
-              try {
-                const response = JSON.parse(data) as _ResponseType;
-                if (response) {
-                  resolve(response);
-                } else {
-                  reject();
-                }
-              } catch {
-                reject();
-              }
-            }
-          }
-        )
-      );
-      if (request) {
-        request.timeout;
-      }
-      this.ws?.send(JSON.stringify(request));
-    });
-  }
-
-  public async getSignalSources() {
-    try {
-      return await this.doRpc<Protocol.GetSignalSourcesResponse>(
-        new Protocol.GetSignalSourcesRequest()
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async addSignalSourceGroup(parent_uuid: string, name: string) {
-    try {
-      return await this.doRpc<Protocol.AddSignalSourceGroupResponseEntity>(
-        new Protocol.AddSignalSourceGroupRequestEntity(0, parent_uuid, name)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async editSignalSourceGroup(
-    uuid: string,
-    name: string,
-    parent_uuid: string
-  ) {
-    try {
-      return await this.doRpc<Protocol.EditSignalSourceGroupResponseEntity>(
-        new Protocol.EditSignalSourceGroupRequestEntity(
-          0,
-          uuid,
-          name,
-          parent_uuid
-        )
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async deleteSignalSourceGroup(uuid: string) {
-    try {
-      return await this.doRpc<Protocol.DeleteSignalSourceGroupResponseEntity>(
-        new Protocol.DeleteSignalSourceGroupRequestEntity(0, uuid)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async addSignalSource(item: SignalSourceEntity) {
-    try {
-      return await this.doRpc<Protocol.AddSignalSourceResponseEntity>(
-        new Protocol.AddSignalSourceRequestEntity(0, item)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async editSignalSource(item: SignalSourceEntity) {
-    try {
-      return await this.doRpc<Protocol.EditSignalSourceResponseEntity>(
-        new Protocol.EditSignalSourceRequestEntity(0, item)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async deleteSignalSource(uuid: string) {
-    try {
-      return await this.doRpc<Protocol.DeleteSignalSourceResponseEntity>(
-        new Protocol.DeleteSignalSourceRequestEntity(0, uuid)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async getModes() {
-    try {
-      return await this.doRpc<Protocol.GetModesResponseEntity>(
-        new Protocol.GetModesRequestEntity()
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async addPlanGroup(group_uuid: string, name: string) {
-    try {
-      return await this.doRpc<Protocol.AddPlanGroupResponseEntity>(
-        new Protocol.AddPlanGroupRequestEntity(0, group_uuid, name)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async editPlanGroup(uuid: string, name: string, parent_uuid: string) {
-    try {
-      return await this.doRpc<Protocol.EditPlanGroupResponseEntity>(
-        new Protocol.EditPlanGroupRequestEntity(0, uuid, name, parent_uuid)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async deletePlanGroup(uuid: string) {
-    try {
-      return await this.doRpc<Protocol.DeletePlanGroupResponseEntity>(
-        new Protocol.DeletePlanGroupRequestEntity(0, uuid)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async addPlan(entity?: PlanEntity) {
-    try {
-      return await this.doRpc<Protocol.AddPlanResponseEntity>(
-        new Protocol.AddPlanRequestEntity(0, entity)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async editPlan(entity?: PlanEntity) {
-    try {
-      return await this.doRpc<Protocol.EditPlanResponseEntity>(
-        new Protocol.EditPlanRequestEntity(0, entity)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async deletePlan(uuid: string) {
-    try {
-      return await this.doRpc<Protocol.DeletePlanResponseEntity>(
-        new Protocol.DeletePlanRequestEntity(0, uuid)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async deletePollingGroup(uuid: string) {
-    try {
-      return await this.doRpc<Protocol.DeletePollingGroupResponseEntity>(
-        new Protocol.DeletePollingGroupRequestEntity(0, uuid)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async addPolling(
-    group_uuid: string,
-    name: string,
-    datas: StringKeyValueEntity[]
-  ) {
-    try {
-      return await this.doRpc<Protocol.AddPollingResponseEntity>(
-        new Protocol.AddPollingRequestEntity(0, group_uuid, name, datas, "")
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async editPolling(entity: PollingEntity) {
-    try {
-      return await this.doRpc<Protocol.EditPollingResponseEntity>(
-        new Protocol.EditPollingRequestEntity(0, entity)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async deletePolling(uuid: string) {
-    try {
-      return await this.doRpc<Protocol.DeletePollingResponseEntity>(
-        new Protocol.DeletePollingRequestEntity(0, uuid)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async getCurrentRunningPlan() {
-    try {
-      return await this.doRpc<Protocol.GetCurrentRunningPlanResponseEntity>(
-        new Protocol.GetCurrentRunningPlanRequestEntity(0)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public runPlan(uuid: string) {
-    this.ws?.send(JSON.stringify(new Protocol.RunPlanRequestEntity(uuid)));
-  }
-
-  public stopCurrentRunningPlan() {
-    this.ws?.send(
-      JSON.stringify(new Protocol.StopCurrentRunningPlanRequestEntity())
-    );
-  }
-
-  public async getPlans() {
-    try {
-      return await this.doRpc<Protocol.GetPlansResponseEntity>(
-        new Protocol.GetPlansRequestEntity()
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async addModeGroup(group_uuid: string, name: string) {
-    try {
-      return await this.doRpc<Protocol.AddModeGroupResponseEntity>(
-        new Protocol.AddModeGroupRequestEntity(0, group_uuid, name)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async editModeGroup(uuid: string, name: string, parent_uuid: string) {
-    try {
-      return await this.doRpc<Protocol.EditModeGroupResponseEntity>(
-        new Protocol.EditModeGroupRequestEntity(0, uuid, name, parent_uuid)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async updateModeWindowList(uuid: string) {
-    try {
-      return await this.doRpc<Protocol.UpdateModeWindowListResponseEntity>(
-        new Protocol.UpdateModeWindowListRequestEntity(0, uuid)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async deleteModeGroup(uuid: string) {
-    try {
-      return await this.doRpc<Protocol.DeleteModeGroupResponseEntity>(
-        new Protocol.DeleteModeGroupRequestEntity(0, uuid)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async addMode(
-    group_uuid?: string,
-    name?: string,
-    index?: number,
-    joint_action_equipments?: StringKeyValueEntity[]
-  ) {
-    try {
-      return await this.doRpc<Protocol.AddModeResponseEntity>(
-        new Protocol.AddModeRequestEntity(
-          0,
-          name,
-          group_uuid,
-          index,
-          joint_action_equipments
-        )
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async editMode(
-    uuid?: string,
-    name?: string,
-    index?: number,
-    group_uuid?: string,
-    joint_action_equipments?: StringKeyValueEntity[]
-  ) {
-    try {
-      return await this.doRpc<Protocol.EditModeResponseEntity>(
-        new Protocol.EditModeRequestEntity(
-          0,
-          name,
-          uuid,
-          index,
-          group_uuid,
-          joint_action_equipments
-        )
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async deleteMode(uuid: string) {
-    try {
-      return await this.doRpc<Protocol.DeleteModeResponseEntity>(
-        new Protocol.DeleteModeRequestEntity(0, uuid)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public callMode(uuid: string) {
-    this.ws?.send(JSON.stringify(new Protocol.CallModeRequestEntity(uuid)));
-  }
-
-  public cleanBrowserCache() {
-    this.ws?.send(
-      JSON.stringify(
-        new Protocol.NormalRequestEntity(Protocol.Commands.kCleanBrowserCache)
-      )
-    );
-  }
-
-  public async getApplicationSettins() {
-    try {
-      return await this.doRpc<Protocol.GetApplicationConfigResponseEntity>(
-        new Protocol.GetApplicationConfigRequestEntity()
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async getWindows() {
-    try {
-      return await this.doRpc<Protocol.GetWindowsResponseEntity>(
-        new Protocol.GetWindowsRequestEntity()
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async getDeviceAttribute() {
-    try {
-      return await this.doRpc<Protocol.GetDeviceAttributeResponseEntity>(
-        new Protocol.GetDeviceAttributeRequestEntity()
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public setDeviceAttribute(attribute: number) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.SetDeviceAttributeRequestEntity(attribute))
-    );
-  }
-
-  public moveWindow(window_id: number, x: number, y: number) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.MoveWindowRequestEntity(window_id, x, y))
-    );
-  }
-
-  public resizeWindow(window_id: number, width: number, height: number) {
-    this.ws?.send(
-      JSON.stringify(
-        new Protocol.ResizeWindowRequestEntity(window_id, width, height)
-      )
-    );
-  }
-
-  public setWindowGeometry(
-    window_id: number,
-    x: number,
-    y: number,
-    width: number,
-    height: number,
-    limit: boolean = true
-  ) {
-    this.ws?.send(
-      JSON.stringify(
-        new Protocol.SetWindowGeometryRequestEntity(
-          window_id,
-          x,
-          y,
-          width,
-          height,
-          limit
-        )
-      )
-    );
-  }
-
-  public closeWindow(window_id: number) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.CloseWindowRequestEntity(window_id))
-    );
-  }
-
-  public openWindow(data: Protocol.OpenWindowRequestEntity) {
-    this.ws?.send(JSON.stringify(data));
-  }
-
-  public replaceWindow(data: Protocol.ReplaceWindowRequestEntity) {
-    this.ws?.send(JSON.stringify(data));
-  }
-
-  public replaceWindow2(
-    window_id: number,
-    signal_source: string,
-    polling?: boolean,
-    ext_data?: string
-  ) {
-    this.replaceWindow(
-      new Protocol.ReplaceWindowRequestEntity(
-        window_id,
-        signal_source,
-        polling,
-        ext_data
-      )
-    );
-  }
-
-  public openPolling(data: Protocol.OpenPollingRequestEntity) {
-    this.ws?.send(JSON.stringify(data));
-  }
-
-  public focusIn(window_id: number) {
-    this.ws?.send(
-      JSON.stringify(
-        new NormalWindowRequestEntity(Protocol.Commands.kTopWindow, window_id)
-      )
-    );
-  }
-
-  public lowerWindow(window_id: number) {
-    this.ws?.send(
-      JSON.stringify(
-        new NormalWindowRequestEntity(Protocol.Commands.kLowerWindow, window_id)
-      )
-    );
-  }
-
-  public setWallRowCol(wall_row: number, wall_col: number) {
-    this.ws?.send(
-      JSON.stringify(
-        new Protocol.SetApplicationConfigRequestEntity(
-          0,
-          "wall_row_col",
-          wall_row.toString() + "X" + wall_col.toString()
-        )
-      )
-    );
-  }
-
-  public setUserName(user_name: string) {
-    this.ws?.send(
-      JSON.stringify(
-        new Protocol.SetApplicationConfigRequestEntity(
-          0,
-          "user_name",
-          user_name
-        )
-      )
-    );
-  }
-
-  public setPassword(password: string) {
-    this.ws?.send(
-      JSON.stringify(
-        new Protocol.SetApplicationConfigRequestEntity(0, "password", password)
-      )
-    );
-  }
-
-  public setSpecialVideoLayoutRotation(rotation: string) {
-    this.ws?.send(
-      JSON.stringify(
-        new Protocol.SetApplicationConfigRequestEntity(
-          0,
-          "special_video_layout_rotation",
-          rotation
-        )
-      )
-    );
-  }
-
-  public setWebsocketPort(port: number) {
-    this.ws?.send(
-      JSON.stringify(
-        new Protocol.SetApplicationConfigRequestEntity(
-          0,
-          "websocket_port",
-          port.toString()
-        )
-      )
-    );
-  }
-
-  public setHttpPort(port: number) {
-    this.ws?.send(
-      JSON.stringify(
-        new Protocol.SetApplicationConfigRequestEntity(
-          0,
-          "httpserver_port",
-          port.toString()
-        )
-      )
-    );
-  }
-
-  public setPowerOnPlan(uuid: string) {
-    this.ws?.send(
-      JSON.stringify(
-        new Protocol.SetApplicationConfigRequestEntity(0, "power_on_plan", uuid)
-      )
-    );
-  }
-
-  public windowFitGrid(window_id: number) {
-    this.ws?.send(
-      JSON.stringify(
-        new NormalWindowRequestEntity(
-          Protocol.Commands.kWindowFitGrid,
-          window_id
-        )
-      )
-    );
-  }
-
-  public windowFullScreen(window_id: number, full_screen: boolean) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.WindowFullScreen(window_id, full_screen))
-    );
-  }
-
-  public async getSubtitle() {
-    try {
-      return await this.doRpc<Protocol.GetSubtitleResponseEntity>(
-        new Protocol.GetSubtitleRequestEntity(0)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async getRegisterInfo() {
-    try {
-      return await this.doRpc<Protocol.GetRegisterInfoResponseEntity>(
-        new Protocol.GetRegisterInfoRequestEntity(0)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async registerDevice(
-    register_code: string,
-    active_code: string,
-    online: boolean,
-    active_forever: boolean,
-    secret_key?: string,
-    hour?: number
-  ) {
-    try {
-      return await this.doRpc<Protocol.RegisterDeviceResponseEntity>(
-        new Protocol.RegisterDeviceRequestEntity(
-          register_code,
-          active_code,
-          online,
-          active_forever,
-          secret_key,
-          hour,
-          0
-        )
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async setSubtitle(subtitle: SubtitleEntity) {
-    try {
-      return await this.doRpc<Protocol.SetSubtitleResponseEntity>(
-        new Protocol.SetSubtitleRequestEntity(0, subtitle)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async setSystemNetwork(
-    request: Protocol.SetSystemNetworkRequestEntity
-  ) {
-    return await this.doRpc<Protocol.SetSystemNetworkResponseEntity>(request);
-  }
-  public async setSystemGraphics(
-    request: Protocol.SetSystemGraphicsRequestEntity
-  ) {
-    return await this.doRpc<Protocol.SetSystemGraphicsResponseEntity>(request);
-  }
-  public async setSystemOther(request: Protocol.SetSystemOtherRequestEntity) {
-    return await this.doRpc<Protocol.SetSystemOtherResponseEntity>(request);
-  }
-  public async getSupportResolutions() {
-    try {
-      return await this.doRpc<Protocol.GetSupportResolutionsResponseEntity>(
-        new Protocol.GetSupportResolutionsRequestEntity(0)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async getOutputBoardSetting() {
-    try {
-      return await this.doRpc<Protocol.GetOutputBoardSettingResponseEntity>(
-        new Protocol.GetOutputBoardSettingRequestEntity(0)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async setOutputBoardSetting(
-    request: Protocol.SetOutputBoardSettingRequestEntity
-  ) {
-    try {
-      return await this.doRpc<Protocol.SetOutputBoardSettingResponseEntity>(
-        request
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async switchOutputBoardSplitState() {
-    try {
-      this.ws?.send(
-        JSON.stringify(new Protocol.SwitchOutputBoardSplitStateRequestEntity())
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async restoreOutputBoard() {
-    try {
-      return await this.doRpc<Protocol.RestoreOutputBoardResponseEntity>(
-        new Protocol.RestoreOutputBoardRequestEntity(0)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async setOutputBoardSpliceIndex(
-    device_index: number,
-    splice_index: number
-  ) {
-    try {
-      return await this.doRpc<Protocol.RpcOutputBoardSpliceIndexResponseEntity>(
-        new Protocol.RpcOutputBoardSpliceIndexRequestEntity(
-          device_index,
-          splice_index
-        )
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async setWindowVolume(window_id: number, volume: number) {
-    this.ws?.send(
-      JSON.stringify(
-        new Protocol.SetWindowVolumeRequestEntity(window_id, volume, 0)
-      )
-    );
-  }
-
-  public async unmuteWindow(window_id: number) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.UnMuteWindowRequestEntity(window_id, 0))
-    );
-  }
-
-  public async muteWindow(window_id: number) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.MuteWindowRequestEntity(window_id, 0))
-    );
-  }
-
-  public async playWindow(window_id: number) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.PlayWindowRequestEntity(window_id, 0))
-    );
-  }
-
-  public async windowPlayNext(window_id: number) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.WindowPlayNextRequestEntity(window_id, 0))
-    );
-  }
-
-  public async windowPlayPrev(window_id: number) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.WindowPlayPrevRequestEntity(window_id, 0))
-    );
-  }
-
-  public async pauseWindow(window_id: number) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.PauseWindowRequestEntity(window_id, 0))
-    );
-  }
-
-  public async startPolling(window_id: number) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.StartPollingRequestEntity(window_id))
-    );
-  }
-
-  public async stopPolling(window_id: number) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.StopPollingRequestEntity(window_id))
-    );
-  }
-
-  public async setWindowPollingData(
-    window_id: number,
-    name: string,
-    datas?: StringKeyValueEntity[]
-  ) {
-    return await this.doRpc<Protocol.SetWindowPollingDataResponseEntity>(
-      new Protocol.SetWindowPollingDataRequestEntity(window_id, name, datas)
-    );
-  }
-
-  public async getBuildInfo() {
-    return await this.doRpc<Protocol.GetBuildInfoResponseEntity>(
-      new Protocol.GetBuildInfoRequestEntity(0)
-    );
-  }
-
-  public async getSystemTimes() {
-    return await this.doRpc<Protocol.GetSystemTimesResponseEntity>(
-      new Protocol.GetSystemTimesRequestEntity(0)
-    );
-  }
-
-  public restoreDevice(delete_upload: boolean = false) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.RestoreDeviceRequestEntity(delete_upload))
-    );
-  }
-
-  public restartDevice(delay_ms?: number) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.RestartDeviceRequestEntity(delay_ms))
-    );
-  }
-
-  public async getUsbDevices() {
-    try {
-      return await this.doRpc<Protocol.GetUsbDevicesResponseEntity>(
-        new Protocol.GetUsbDevicesRequestEntity(0)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async getPollings() {
-    try {
-      return await this.doRpc<Protocol.GetPollingsResponseEntity>(
-        new Protocol.GetPollingsRequestEntity()
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async fileOperator(
-    from_path: string,
-    to_path: string,
-    operator_type: string,
-    force_operator: boolean = true
-  ) {
-    try {
-      return await this.doRpc<Protocol.FileOperatorResponseEntity>(
-        new Protocol.FileOperatorRequestEntity(
-          from_path,
-          to_path,
-          operator_type,
-          force_operator
-        )
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async getEdgeBlendingInfo() {
-    return await this.doRpc<Protocol.GetEdgeBlendingInfoResponseEntity>(
-      new Protocol.GetEdgeBlendingInfoRequestEntity(0)
-    );
-  }
-
-  public async setEdgeBlendingInfo(
-    enable_blending: boolean,
-    enable_correct: boolean,
-    width: number,
-    height: number,
-    col: number,
-    row: number,
-    point_count: number
-  ) {
-    return await this.doRpc<Protocol.SetEdgeBlendingInfoResponseEntity>(
-      new Protocol.SetEdgeBlendingInfoRequestEntity(
-        enable_blending,
-        enable_correct,
-        width,
-        height,
-        col,
-        row,
-        point_count,
-        0
-      )
-    );
-  }
-
-  public async wakeUpDevice() {
-    return await this.doRpc<Protocol.SetDevicePowerResponseEntity>(
-      new Protocol.SetDevicePowerRequestEntity(
-        Protocol.SetDevicePowerRequestEntity.kPowerStatePowerOn
-      )
-    );
-  }
-
-  public async deviceStandByMode() {
-    return await this.doRpc<Protocol.SetDevicePowerResponseEntity>(
-      new Protocol.SetDevicePowerRequestEntity(
-        Protocol.SetDevicePowerRequestEntity.kPowerStateStandBy
-      )
-    );
-  }
-
-  public async getExternalControlDatas() {
-    return await this.doRpc<Protocol.RpcGetExternalControlDatasResponseEntity>(
-      new Protocol.RpcGetExternalControlDatasRequestEntity()
-    );
-  }
-
-  public async deleteExternalControlData(number: number) {
-    return await this.doRpc<Protocol.RpcDeleteExternalControlDataResponseEntity>(
-      new Protocol.RpcDeleteExternalControlDataRequestEntity(number)
-    );
-  }
-
-  public async editExternalControlData(entity: ExternalControlTableEntity) {
-    return await this.doRpc<Protocol.RpcEditExternalControlDataResponseEntity>(
-      new Protocol.RpcEditExternalControlDataRequestEntity(entity)
-    );
-  }
-
-  public async addExternalControlData(entity: ExternalControlTableEntity) {
-    return await this.doRpc<Protocol.RpcAddExternalControlDataResponseEntity>(
-      new Protocol.RpcAddExternalControlDataRequestEntity(entity)
-    );
-  }
-
-  public async getExternalControlSerialPortConfig() {
-    return await this.doRpc<Protocol.RpcGetExternalControlSerialPortConfigResponseEntity>(
-      new Protocol.RpcGetExternalControlSerialPortConfigRequestEntity()
-    );
-  }
-
-  public async setExternalControlSerialPortConfig(
-    serial_port: SerialPortConfigEntity,
-    tcp_address: string,
-    tcp_port: number,
-    udp_address: string,
-    udp_port: number,
-    current_type: string
-  ) {
-    return await this.doRpc<Protocol.RpcSetExternalControlSerialPortConfigResponseEntity>(
-      new Protocol.RpcSetExternalControlSerialPortConfigRequestEntity(
-        serial_port,
-        tcp_address,
-        tcp_port,
-        udp_address,
-        udp_port,
-        current_type
-      )
-    );
-  }
-
-  public async callExternalControlData(number: number) {
-    return await this.doRpc<Protocol.RpcCallExternalControlDataResponseEntity>(
-      new Protocol.RpcCallExternalControlDataRequestEntity(number)
-    );
-  }
-
-  public setEdgeBlendingPoint(point: EdgeBlendingPoint) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.SetEdgeBlendingPointRequestEntity(point))
-    );
-  }
-
-  public setServerLanguage(language: string) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.SetLanguageRequestEntity(language))
-    );
-  }
-
-  public async getConnectList() {
-    return await this.doRpc<Protocol.GetConnectionListResponseEntity>(
-      new Protocol.GetConnectionListRequestEntity()
-    );
-  }
-  public async setConnectItem(entity: ConnectTableEntity) {
-    return await this.doRpc<Protocol.SetConnectionItemResponseEntity>(
-      new Protocol.SetConnectionItemRequestEntity(entity)
-    );
-  }
-
-  public async setHdmiRotation(rotation: number) {
-    this.ws?.send(
-      JSON.stringify(new Protocol.SetHDMIRotationRequestEntity(rotation))
-    );
-  }
-
-  public async getTimingTasks() {
-    try {
-      return await this.doRpc<Protocol.GetTimingTasksResponseEntity>(
-        new Protocol.GetTimingTasksRequestEntity()
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async addTimingTask(task: TimingTaskEntity) {
-    try {
-      return await this.doRpc<Protocol.AddTimingTaskResponseEntity>(
-        new Protocol.AddTimingTaskRequestEntity(task)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async editTimingTask(task: TimingTaskEntity) {
-    try {
-      return await this.doRpc<Protocol.EditTimingTaskResponseEntity>(
-        new Protocol.EditTimingTaskRequestEntity(task)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-  public async deleteTimingTask(uuid: string) {
-    try {
-      return await this.doRpc<Protocol.DeleteTimingTaskResponseEntity>(
-        new Protocol.DeleteTimingTaskRequestEntity(uuid)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async getSystemNetworkInfo() {
-    try {
-      return await this.doRpc<Protocol.GetSystemNetworkInfoResponseEntity>(
-        new Protocol.GetSystemNetworkInfoRequestEntity()
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async getMagicWallConfig() {
-    try {
-      return await this.doRpc<Protocol.RpcGetMagicWallConfigResponseEntity>(
-        new Protocol.RpcGetMagicWallConfigRequestEntity()
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async setMagicWallConfig(config: MagicWallConfig) {
-    try {
-      return await this.doRpc<Protocol.RpcSetMagicWallConfigResponseEntity>(
-        new Protocol.RpcSetMagicWallConfigRequestEntity(config)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async testA(
-    x: number,
-    y: number,
-    w: number,
-    h: number,
-    angle: number
-  ) {
-    try {
-      return await this.doRpc<Protocol.RpcTestAResponseEntity>(
-        new Protocol.RpcTestARequestEntity(x, y, w, h, angle)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async setHdmiInDecodeType(index: number, type: string) {
-    try {
-      return await this.doRpc<Protocol.SetHdmiInDecodeTypeResponseEntity>(
-        new Protocol.SetHdmiInDecodeTypeRequestEntity(index, type)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async setHdmiInAudioDevice(index: number, type: string) {
-    try {
-      return await this.doRpc<Protocol.SetHdmiInAudioDeviceResponseEntity>(
-        new Protocol.SetHdmiInAudioDeviceRequestEntity(index, type)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async getCityList(language?: string) {
-    try {
-      return await this.doRpc<Protocol.GetCityListResponseEntity>(
-        new Protocol.GetCityListRequestEntity(language)
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async getPowerState() {
-    try {
-      return await this.doRpc<Protocol.GetPowerStateResponseEntity>(
-        new Protocol.GetPowerStateRequestEntity()
-      );
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  public async getJointActionEquipments() {
-    return await this.doRpc<Protocol.GetJointActionEquipmentResponseEntity>(
-      new Protocol.GetJointActionEquipmentRequestEntity()
-    );
-  }
-
-  public async setJointActionEquipment(
-    entity: JointActionEquipmentTableEntity
-  ) {
-    return await this.doRpc<Protocol.SetJointActionEquipmentResponseEntity>(
-      new Protocol.SetJointActionEquipmentRequestEntity(entity)
-    );
-  }
-
-  public async deleteJointActionEquipment(uuid: string) {
-    return await this.doRpc<Protocol.DeleteJointActionEquipmentResponseEntity>(
-      new Protocol.DeleteJointActionEquipmentRequestEntity(uuid)
-    );
-  }
-
-  public async setBlendingCorrection(
-    row: number,
-    column: number,
-    correction_type: number,
-    control_point: number,
-    x: number,
-    y: number
-  ) {
-    return await this.doRpc<Protocol.NoneResponse>(
-      new Protocol.SetBlendingCorrectionRequestEntity(
-        row,
-        column,
-        correction_type,
-        control_point,
-        x,
-        y
-      )
-    );
-  }
-
-  public async setBlendingAlphaParam(
-    row: number,
-    column: number,
-    location: number,
-    value: number
-  ) {
-    return await this.doRpc<Protocol.NoneResponse>(
-      new Protocol.SetBlendingAlphaParamRequestEntity(
-        row,
-        column,
-        location,
-        value
-      )
-    );
-  }
-
-  public async setBlendingPowerParam(
-    row: number,
-    column: number,
-    location: number,
-    value: number
-  ) {
-    return await this.doRpc<Protocol.NoneResponse>(
-      new Protocol.SetBlendingPowerParamRequestEntity(
-        row,
-        column,
-        location,
-        value
-      )
-    );
-  }
-
-  public async setBlendingGammaParam(
-    row: number,
-    column: number,
-    location: number,
-    value: number
-  ) {
-    return await this.doRpc<Protocol.NoneResponse>(
-      new Protocol.SetBlendingGammaParamRequestEntity(
-        row,
-        column,
-        location,
-        value
-      )
-    );
-  }
-
-  public async EnableBlending(
-    enable: boolean
-  ) {
-    return await this.doRpc<Protocol.NoneResponse>(
-      new Protocol.EnableBlendingRequestEntity(
-        enable
-      )
-    );
-  }
-
-  public async SetBlendingOverlap(
-    row: number,
-    column: number,
-    location: number,
-    enable: boolean,
-    width: number
-  ) {
-    return await this.doRpc<Protocol.NoneResponse>(
-      new Protocol.SetBlendingOverlapRequestEntity(
-        row,
-        column,
-        location,
-        enable,
-        width
-      )
-    );
-  }
-
-  public async GetBlendingConfig(name: string) {
-    return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
-      new Protocol.GetBlendingConfigRequestEntity(name)
-    );
-  }
-
-  public async SaveBlendingConfig(name: string) {
-    return await this.doRpc<Protocol.SaveBlendingConfigResponseEntity>(
-      new Protocol.SaveBlendingConfigRequestEntity(name)
-    );
-  }
-
-  public async SetBlendingHorDensity(
-    row: number,
-    column: number,
-    control_point: number,
-    value: number
-  ) {
-    return await this.doRpc<Protocol.NoneResponse>(
-      new Protocol.SetBlendingHorDensityRequestEntity(
-        row,
-        column,
-        control_point,
-        value
-      )
-    );
-  }
-
-  public async SetBlendingVerDensity(
-    row: number,
-    column: number,
-    control_point: number,
-    value: number
-  ) {
-    return await this.doRpc<Protocol.NoneResponse>(
-      new Protocol.SetBlendingVerDensityRequestEntity(
-        row,
-        column,
-        control_point,
-        value
-      )
-    );
-  }
-
-  public async ResetBlendingConfig() {
-    return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
-      new Protocol.ResetBlendingConfigRequestEntity()
-    );
-  }
-
-  public async SetBlendingOption(
-    id: string,
-    value: string
-  ) {
-    return await this.doRpc<Protocol.NoneResponse>(
-      new Protocol.SetBlendingOptionRequestEntity(
-        id,
-        value
-      )
-    );
-  }
-
-  public async EnumBlendingScene() {
-    return await this.doRpc<Protocol.EnumBlendingSceneResponseEntity>(
-      new Protocol.EnumBlendingSceneRequestEntity()
-    );
-  }
-
-  public async ApplyBlendingScene(name: string) {
-    return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
-      new Protocol.ApplyBlendingSceneRequestEntity(name)
-    );
-  }
-
-  public async DeleteBlendingScene(name: string) {
-    return await this.doRpc<Protocol.RpcBlendingResponseEntity>(
-      new Protocol.ApplyBlendingSceneRequestEntity(name)
-    );
-  }
-
-  public destory() {
-    this.ws?.close();
-    if (this.ws) {
-      this.ws.onclose = null;
-      this.ws.onerror = null;
-      this.ws.onopen = null;
-      this.ws.onmessage = null;
-    }
-    this.ws = null;
-  }
-}
-
-export interface NotifyMessage {
-  packet: Protocol.PacketEntity;
-  data: string;
-}
+import { ConnectTableEntity } from "src/entities/ConnectTableEntity";
+import { PollingEntity } from "src/entities/PollingEntity";
+import ReconnectingWebSocket from "reconnecting-websocket";
+import NormalWindowRequestEntity from "src/entities/NormalWindowRequestEntity";
+import { PlanEntity } from "src/entities/PlanEntity";
+import { SignalSourceEntity } from "src/entities/SignalSourceEntity";
+import { StringKeyValueEntity } from "src/entities/StringKeyValueEntity";
+import SubtitleEntity from "src/entities/SubtitleEntity";
+import { Protocol } from "src/entities/WSProtocol";
+import EventBus, { EventNamesDefine } from "./EventBus";
+import { EdgeBlendingPoint } from "src/entities/EdgeBlendingEntities";
+import { ExternalControlTableEntity } from "src/entities/ExternalControlTableEntity";
+import { SerialPortConfigEntity } from "src/entities/SerialPortConfigEntity";
+import TimingTaskEntity from "src/entities/TimingTaskEntity";
+import JointActionEquipmentTableEntity from "src/entities/JointActionEquipmentTableEntity";
+import { CustomProtocol } from "src/entities/WSProtocolCustom";
+import ClientConnectionCustom from "./ClientConnectionCustom";
+import MagicWallConfig from "src/entities/MagicWallConfig";
+
+class _RpcInfo {
+  send_timestamp: number;
+  timeout_timestamp: number;
+  callback: (is_fail: boolean, packet: Protocol.Commands, data: string) => void;
+
+  constructor(
+    timeout_timestamp: number,
+    callback: (
+      is_fail: boolean,
+      packet: Protocol.Commands,
+      data: string
+    ) => void
+  ) {
+    this.timeout_timestamp = timeout_timestamp;
+    this.send_timestamp = new Date().getTime();
+    this.callback = callback;
+  }
+
+  public reject() {
+    this.callback(true, new Protocol.Commands(), "");
+  }
+
+  public reslove(is_fail: boolean, packet: Protocol.Commands, data: string) {
+    this.callback(is_fail, packet, data);
+  }
+}
+
+export default class ClientConnection {
+  ws: ReconnectingWebSocket | null = null;
+  url = "";
+  user_name = "";
+  password = "";
+  _is_login = false;
+  _rpc_id_counter = 0;
+  rpc_map = new Map<number, _RpcInfo>();
+
+  custom_connection: ClientConnectionCustom = new ClientConnectionCustom(this);
+
+  public login_callback:
+    | ((this: ClientConnection, logined: boolean) => void)
+    | null = null;
+
+  constructor(
+    url: string,
+    user_name?: string | null,
+    password?: string | null
+  ) {
+    this.url = url;
+    this.user_name = user_name ?? "";
+    this.password = password ?? "";
+
+    if (this.ws) {
+      this.ws.close();
+    }
+    this.ws = new ReconnectingWebSocket(url);
+
+    this.initializeWs();
+
+    setInterval(() => {
+      this.checkRpcTimeout();
+    }, 1000);
+  }
+
+  get is_connected() {
+    return this.ws && this.ws.readyState == WebSocket.OPEN;
+  }
+
+  get is_login() {
+    return this._is_login;
+  }
+
+  get customConnection() {
+    return this.custom_connection ?? new ClientConnectionCustom(this);
+  }
+
+  checkRpcTimeout() {
+    const current_datetime = new Date().getTime();
+    this.rpc_map.forEach((v, k, m) => {
+      if (current_datetime - v.send_timestamp > v.timeout_timestamp) {
+        v.reject();
+        m.delete(k);
+      }
+    });
+  }
+
+  initializeWs() {
+    if (this.ws) {
+      this.ws.onclose = (ev) => {
+        this.onClose(ev);
+      };
+      this.ws.onerror = (ev) => {
+        this.onError(ev);
+      };
+      this.ws.onopen = (ev) => {
+        this.onOpen(ev);
+      };
+      this.ws.onmessage = (ev) => {
+        this.onMessage(ev);
+      };
+    }
+  }
+
+  login() {
+    if (this.is_connected) {
+      const request = new Protocol.LoginRequest(this.user_name, this.password);
+      this.ws?.send(JSON.stringify(request));
+    }
+  }
+
+  onClose(ev: any) {
+    this._is_login = false;
+    EventBus.getInstance().emit(EventNamesDefine.WebSocketClose, this);
+  }
+
+  onError(ev: any) {
+    this._is_login = false;
+    EventBus.getInstance().emit(EventNamesDefine.WebSocketError, this);
+  }
+
+  onOpen(ev: any) {
+    this._is_login = false;
+    this.login();
+  }
+
+  onMessage(ev: MessageEvent) {
+    try {
+      const packet = JSON.parse(ev.data) as Protocol.PacketEntity;
+
+      if (packet) {
+        if (packet.has_exception) {
+          console.error(ev.data);
+          this.rpc_map.get(packet.rpc_id)?.reject();
+          this.rpc_map.delete(packet.rpc_id);
+        }
+        if (
+          Protocol.Commands.AllCommands.has(packet.command) ||
+          CustomProtocol.Commands.AllCommands.has(packet.command)
+        ) {
+          if (
+            packet.flag == Protocol.PacketEntity.FLAG_RESPONSE ||
+            packet.flag == Protocol.PacketEntity.FLAG_NOTIFY
+          ) {
+            if (packet.command == Protocol.Commands.kLogin) {
+              const login_response = JSON.parse(
+                ev.data
+              ) as Protocol.LoginResponse;
+              if (login_response) {
+                this._is_login =
+                  !login_response.has_exception && login_response.success;
+                if (this.is_login) {
+                  EventBus.getInstance().emit(
+                    EventNamesDefine.WebSocketConnected,
+                    this
+                  );
+                }
+                if (
+                  this.login_callback &&
+                  typeof this.login_callback == "function"
+                ) {
+                  this.login_callback(this._is_login);
+                }
+              }
+            } else if (this.rpc_map.has(packet.rpc_id)) {
+              this.rpc_map.get(packet.rpc_id)?.reslove(false, packet, ev.data);
+              this.rpc_map.delete(packet.rpc_id);
+            } else {
+              EventBus.getInstance().emit(
+                packet.flag == Protocol.PacketEntity.FLAG_NOTIFY
+                  ? EventNamesDefine.NotifyMessage
+                  : packet.flag == Protocol.PacketEntity.FLAG_RESPONSE
+                  ? EventNamesDefine.ResponseMessage
+                  : EventNamesDefine.UnKnow,
+                {
+                  packet: packet,
+                  data: ev.data,
+                }
+              );
+            }
+          }
+        } else {
+          console.error("unknow command: " + packet.command, packet);
+        }
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async doRpc<_ResponseType>(
+    request: Protocol.PacketEntity
+  ): Promise<_ResponseType | null> {
+    return new Promise((resolve, reject) => {
+      const rpc_id = ++this._rpc_id_counter;
+      if (this.rpc_map.has(rpc_id)) {
+        this.rpc_map.get(rpc_id)?.reject();
+        this.rpc_map.delete(rpc_id);
+      }
+      request.rpc_id = rpc_id;
+      this.rpc_map.set(
+        rpc_id,
+        new _RpcInfo(
+          request.timeout,
+          (is_fail: boolean, packet: Protocol.Commands, data: string) => {
+            if (is_fail) {
+              reject();
+            } else {
+              try {
+                const response = JSON.parse(data) as _ResponseType;
+                if (response) {
+                  resolve(response);
+                } else {
+                  reject();
+                }
+              } catch {
+                reject();
+              }
+            }
+          }
+        )
+      );
+      if (request) {
+        request.timeout;
+      }
+      this.ws?.send(JSON.stringify(request));
+    });
+  }
+
+  public async getSignalSources() {
+    try {
+      return await this.doRpc<Protocol.GetSignalSourcesResponse>(
+        new Protocol.GetSignalSourcesRequest()
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async addSignalSourceGroup(parent_uuid: string, name: string) {
+    try {
+      return await this.doRpc<Protocol.AddSignalSourceGroupResponseEntity>(
+        new Protocol.AddSignalSourceGroupRequestEntity(0, parent_uuid, name)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async editSignalSourceGroup(
+    uuid: string,
+    name: string,
+    parent_uuid: string
+  ) {
+    try {
+      return await this.doRpc<Protocol.EditSignalSourceGroupResponseEntity>(
+        new Protocol.EditSignalSourceGroupRequestEntity(
+          0,
+          uuid,
+          name,
+          parent_uuid
+        )
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async deleteSignalSourceGroup(uuid: string) {
+    try {
+      return await this.doRpc<Protocol.DeleteSignalSourceGroupResponseEntity>(
+        new Protocol.DeleteSignalSourceGroupRequestEntity(0, uuid)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async addSignalSource(item: SignalSourceEntity) {
+    try {
+      return await this.doRpc<Protocol.AddSignalSourceResponseEntity>(
+        new Protocol.AddSignalSourceRequestEntity(0, item)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async editSignalSource(item: SignalSourceEntity) {
+    try {
+      return await this.doRpc<Protocol.EditSignalSourceResponseEntity>(
+        new Protocol.EditSignalSourceRequestEntity(0, item)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async deleteSignalSource(uuid: string) {
+    try {
+      return await this.doRpc<Protocol.DeleteSignalSourceResponseEntity>(
+        new Protocol.DeleteSignalSourceRequestEntity(0, uuid)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async getModes() {
+    try {
+      return await this.doRpc<Protocol.GetModesResponseEntity>(
+        new Protocol.GetModesRequestEntity()
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async addPlanGroup(group_uuid: string, name: string) {
+    try {
+      return await this.doRpc<Protocol.AddPlanGroupResponseEntity>(
+        new Protocol.AddPlanGroupRequestEntity(0, group_uuid, name)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async editPlanGroup(uuid: string, name: string, parent_uuid: string) {
+    try {
+      return await this.doRpc<Protocol.EditPlanGroupResponseEntity>(
+        new Protocol.EditPlanGroupRequestEntity(0, uuid, name, parent_uuid)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async deletePlanGroup(uuid: string) {
+    try {
+      return await this.doRpc<Protocol.DeletePlanGroupResponseEntity>(
+        new Protocol.DeletePlanGroupRequestEntity(0, uuid)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async addPlan(entity?: PlanEntity) {
+    try {
+      return await this.doRpc<Protocol.AddPlanResponseEntity>(
+        new Protocol.AddPlanRequestEntity(0, entity)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async editPlan(entity?: PlanEntity) {
+    try {
+      return await this.doRpc<Protocol.EditPlanResponseEntity>(
+        new Protocol.EditPlanRequestEntity(0, entity)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async deletePlan(uuid: string) {
+    try {
+      return await this.doRpc<Protocol.DeletePlanResponseEntity>(
+        new Protocol.DeletePlanRequestEntity(0, uuid)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async deletePollingGroup(uuid: string) {
+    try {
+      return await this.doRpc<Protocol.DeletePollingGroupResponseEntity>(
+        new Protocol.DeletePollingGroupRequestEntity(0, uuid)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async addPolling(
+    group_uuid: string,
+    name: string,
+    datas: StringKeyValueEntity[]
+  ) {
+    try {
+      return await this.doRpc<Protocol.AddPollingResponseEntity>(
+        new Protocol.AddPollingRequestEntity(0, group_uuid, name, datas, "")
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async editPolling(entity: PollingEntity) {
+    try {
+      return await this.doRpc<Protocol.EditPollingResponseEntity>(
+        new Protocol.EditPollingRequestEntity(0, entity)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async deletePolling(uuid: string) {
+    try {
+      return await this.doRpc<Protocol.DeletePollingResponseEntity>(
+        new Protocol.DeletePollingRequestEntity(0, uuid)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async getCurrentRunningPlan() {
+    try {
+      return await this.doRpc<Protocol.GetCurrentRunningPlanResponseEntity>(
+        new Protocol.GetCurrentRunningPlanRequestEntity(0)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public runPlan(uuid: string) {
+    this.ws?.send(JSON.stringify(new Protocol.RunPlanRequestEntity(uuid)));
+  }
+
+  public stopCurrentRunningPlan() {
+    this.ws?.send(
+      JSON.stringify(new Protocol.StopCurrentRunningPlanRequestEntity())
+    );
+  }
+
+  public async getPlans() {
+    try {
+      return await this.doRpc<Protocol.GetPlansResponseEntity>(
+        new Protocol.GetPlansRequestEntity()
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async addModeGroup(group_uuid: string, name: string) {
+    try {
+      return await this.doRpc<Protocol.AddModeGroupResponseEntity>(
+        new Protocol.AddModeGroupRequestEntity(0, group_uuid, name)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async editModeGroup(uuid: string, name: string, parent_uuid: string) {
+    try {
+      return await this.doRpc<Protocol.EditModeGroupResponseEntity>(
+        new Protocol.EditModeGroupRequestEntity(0, uuid, name, parent_uuid)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async updateModeWindowList(uuid: string) {
+    try {
+      return await this.doRpc<Protocol.UpdateModeWindowListResponseEntity>(
+        new Protocol.UpdateModeWindowListRequestEntity(0, uuid)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async deleteModeGroup(uuid: string) {
+    try {
+      return await this.doRpc<Protocol.DeleteModeGroupResponseEntity>(
+        new Protocol.DeleteModeGroupRequestEntity(0, uuid)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async addMode(
+    group_uuid?: string,
+    name?: string,
+    index?: number,
+    joint_action_equipments?: StringKeyValueEntity[]
+  ) {
+    try {
+      return await this.doRpc<Protocol.AddModeResponseEntity>(
+        new Protocol.AddModeRequestEntity(
+          0,
+          name,
+          group_uuid,
+          index,
+          joint_action_equipments
+        )
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async editMode(
+    uuid?: string,
+    name?: string,
+    index?: number,
+    group_uuid?: string,
+    joint_action_equipments?: StringKeyValueEntity[]
+  ) {
+    try {
+      return await this.doRpc<Protocol.EditModeResponseEntity>(
+        new Protocol.EditModeRequestEntity(
+          0,
+          name,
+          uuid,
+          index,
+          group_uuid,
+          joint_action_equipments
+        )
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async deleteMode(uuid: string) {
+    try {
+      return await this.doRpc<Protocol.DeleteModeResponseEntity>(
+        new Protocol.DeleteModeRequestEntity(0, uuid)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public callMode(uuid: string) {
+    this.ws?.send(JSON.stringify(new Protocol.CallModeRequestEntity(uuid)));
+  }
+
+  public cleanBrowserCache() {
+    this.ws?.send(
+      JSON.stringify(
+        new Protocol.NormalRequestEntity(Protocol.Commands.kCleanBrowserCache)
+      )
+    );
+  }
+
+  public async getApplicationSettins() {
+    try {
+      return await this.doRpc<Protocol.GetApplicationConfigResponseEntity>(
+        new Protocol.GetApplicationConfigRequestEntity()
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async getWindows() {
+    try {
+      return await this.doRpc<Protocol.GetWindowsResponseEntity>(
+        new Protocol.GetWindowsRequestEntity()
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async getDeviceAttribute() {
+    try {
+      return await this.doRpc<Protocol.GetDeviceAttributeResponseEntity>(
+        new Protocol.GetDeviceAttributeRequestEntity()
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public setDeviceAttribute(attribute: number) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.SetDeviceAttributeRequestEntity(attribute))
+    );
+  }
+
+  public moveWindow(window_id: number, x: number, y: number) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.MoveWindowRequestEntity(window_id, x, y))
+    );
+  }
+
+  public resizeWindow(window_id: number, width: number, height: number) {
+    this.ws?.send(
+      JSON.stringify(
+        new Protocol.ResizeWindowRequestEntity(window_id, width, height)
+      )
+    );
+  }
+
+  public setWindowGeometry(
+    window_id: number,
+    x: number,
+    y: number,
+    width: number,
+    height: number,
+    limit: boolean = true
+  ) {
+    this.ws?.send(
+      JSON.stringify(
+        new Protocol.SetWindowGeometryRequestEntity(
+          window_id,
+          x,
+          y,
+          width,
+          height,
+          limit
+        )
+      )
+    );
+  }
+
+  public closeWindow(window_id: number) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.CloseWindowRequestEntity(window_id))
+    );
+  }
+
+  public openWindow(data: Protocol.OpenWindowRequestEntity) {
+    this.ws?.send(JSON.stringify(data));
+  }
+
+  public replaceWindow(data: Protocol.ReplaceWindowRequestEntity) {
+    this.ws?.send(JSON.stringify(data));
+  }
+
+  public replaceWindow2(
+    window_id: number,
+    signal_source: string,
+    polling?: boolean,
+    ext_data?: string
+  ) {
+    this.replaceWindow(
+      new Protocol.ReplaceWindowRequestEntity(
+        window_id,
+        signal_source,
+        polling,
+        ext_data
+      )
+    );
+  }
+
+  public openPolling(data: Protocol.OpenPollingRequestEntity) {
+    this.ws?.send(JSON.stringify(data));
+  }
+
+  public focusIn(window_id: number) {
+    this.ws?.send(
+      JSON.stringify(
+        new NormalWindowRequestEntity(Protocol.Commands.kTopWindow, window_id)
+      )
+    );
+  }
+
+  public lowerWindow(window_id: number) {
+    this.ws?.send(
+      JSON.stringify(
+        new NormalWindowRequestEntity(Protocol.Commands.kLowerWindow, window_id)
+      )
+    );
+  }
+
+  public setWallRowCol(wall_row: number, wall_col: number) {
+    this.ws?.send(
+      JSON.stringify(
+        new Protocol.SetApplicationConfigRequestEntity(
+          0,
+          "wall_row_col",
+          wall_row.toString() + "X" + wall_col.toString()
+        )
+      )
+    );
+  }
+
+  public setUserName(user_name: string) {
+    this.ws?.send(
+      JSON.stringify(
+        new Protocol.SetApplicationConfigRequestEntity(
+          0,
+          "user_name",
+          user_name
+        )
+      )
+    );
+  }
+
+  public setPassword(password: string) {
+    this.ws?.send(
+      JSON.stringify(
+        new Protocol.SetApplicationConfigRequestEntity(0, "password", password)
+      )
+    );
+  }
+
+  public setSpecialVideoLayoutRotation(rotation: string) {
+    this.ws?.send(
+      JSON.stringify(
+        new Protocol.SetApplicationConfigRequestEntity(
+          0,
+          "special_video_layout_rotation",
+          rotation
+        )
+      )
+    );
+  }
+
+  public setWebsocketPort(port: number) {
+    this.ws?.send(
+      JSON.stringify(
+        new Protocol.SetApplicationConfigRequestEntity(
+          0,
+          "websocket_port",
+          port.toString()
+        )
+      )
+    );
+  }
+
+  public setHttpPort(port: number) {
+    this.ws?.send(
+      JSON.stringify(
+        new Protocol.SetApplicationConfigRequestEntity(
+          0,
+          "httpserver_port",
+          port.toString()
+        )
+      )
+    );
+  }
+
+  public setPowerOnPlan(uuid: string) {
+    this.ws?.send(
+      JSON.stringify(
+        new Protocol.SetApplicationConfigRequestEntity(0, "power_on_plan", uuid)
+      )
+    );
+  }
+
+  public windowFitGrid(window_id: number) {
+    this.ws?.send(
+      JSON.stringify(
+        new NormalWindowRequestEntity(
+          Protocol.Commands.kWindowFitGrid,
+          window_id
+        )
+      )
+    );
+  }
+
+  public windowFullScreen(window_id: number, full_screen: boolean) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.WindowFullScreen(window_id, full_screen))
+    );
+  }
+
+  public async getSubtitle() {
+    try {
+      return await this.doRpc<Protocol.GetSubtitleResponseEntity>(
+        new Protocol.GetSubtitleRequestEntity(0)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async getRegisterInfo() {
+    try {
+      return await this.doRpc<Protocol.GetRegisterInfoResponseEntity>(
+        new Protocol.GetRegisterInfoRequestEntity(0)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async registerDevice(
+    register_code: string,
+    active_code: string,
+    online: boolean,
+    active_forever: boolean,
+    secret_key?: string,
+    hour?: number
+  ) {
+    try {
+      return await this.doRpc<Protocol.RegisterDeviceResponseEntity>(
+        new Protocol.RegisterDeviceRequestEntity(
+          register_code,
+          active_code,
+          online,
+          active_forever,
+          secret_key,
+          hour,
+          0
+        )
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async setSubtitle(subtitle: SubtitleEntity) {
+    try {
+      return await this.doRpc<Protocol.SetSubtitleResponseEntity>(
+        new Protocol.SetSubtitleRequestEntity(0, subtitle)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async setSystemNetwork(
+    request: Protocol.SetSystemNetworkRequestEntity
+  ) {
+    return await this.doRpc<Protocol.SetSystemNetworkResponseEntity>(request);
+  }
+  public async setSystemGraphics(
+    request: Protocol.SetSystemGraphicsRequestEntity
+  ) {
+    return await this.doRpc<Protocol.SetSystemGraphicsResponseEntity>(request);
+  }
+  public async setSystemOther(request: Protocol.SetSystemOtherRequestEntity) {
+    return await this.doRpc<Protocol.SetSystemOtherResponseEntity>(request);
+  }
+  public async getSupportResolutions() {
+    try {
+      return await this.doRpc<Protocol.GetSupportResolutionsResponseEntity>(
+        new Protocol.GetSupportResolutionsRequestEntity(0)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async getOutputBoardSetting() {
+    try {
+      return await this.doRpc<Protocol.GetOutputBoardSettingResponseEntity>(
+        new Protocol.GetOutputBoardSettingRequestEntity(0)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async setOutputBoardSetting(
+    request: Protocol.SetOutputBoardSettingRequestEntity
+  ) {
+    try {
+      return await this.doRpc<Protocol.SetOutputBoardSettingResponseEntity>(
+        request
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async switchOutputBoardSplitState() {
+    try {
+      this.ws?.send(
+        JSON.stringify(new Protocol.SwitchOutputBoardSplitStateRequestEntity())
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async restoreOutputBoard() {
+    try {
+      return await this.doRpc<Protocol.RestoreOutputBoardResponseEntity>(
+        new Protocol.RestoreOutputBoardRequestEntity(0)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async setOutputBoardSpliceIndex(
+    device_index: number,
+    splice_index: number
+  ) {
+    try {
+      return await this.doRpc<Protocol.RpcOutputBoardSpliceIndexResponseEntity>(
+        new Protocol.RpcOutputBoardSpliceIndexRequestEntity(
+          device_index,
+          splice_index
+        )
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async setWindowVolume(window_id: number, volume: number) {
+    this.ws?.send(
+      JSON.stringify(
+        new Protocol.SetWindowVolumeRequestEntity(window_id, volume, 0)
+      )
+    );
+  }
+
+  public async unmuteWindow(window_id: number) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.UnMuteWindowRequestEntity(window_id, 0))
+    );
+  }
+
+  public async muteWindow(window_id: number) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.MuteWindowRequestEntity(window_id, 0))
+    );
+  }
+
+  public async playWindow(window_id: number) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.PlayWindowRequestEntity(window_id, 0))
+    );
+  }
+
+  public async windowPlayNext(window_id: number) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.WindowPlayNextRequestEntity(window_id, 0))
+    );
+  }
+
+  public async windowPlayPrev(window_id: number) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.WindowPlayPrevRequestEntity(window_id, 0))
+    );
+  }
+
+  public async pauseWindow(window_id: number) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.PauseWindowRequestEntity(window_id, 0))
+    );
+  }
+
+  public async startPolling(window_id: number) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.StartPollingRequestEntity(window_id))
+    );
+  }
+
+  public async stopPolling(window_id: number) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.StopPollingRequestEntity(window_id))
+    );
+  }
+
+  public async setWindowPollingData(
+    window_id: number,
+    name: string,
+    datas?: StringKeyValueEntity[]
+  ) {
+    return await this.doRpc<Protocol.SetWindowPollingDataResponseEntity>(
+      new Protocol.SetWindowPollingDataRequestEntity(window_id, name, datas)
+    );
+  }
+
+  public async getBuildInfo() {
+    return await this.doRpc<Protocol.GetBuildInfoResponseEntity>(
+      new Protocol.GetBuildInfoRequestEntity(0)
+    );
+  }
+
+  public async getSystemTimes() {
+    return await this.doRpc<Protocol.GetSystemTimesResponseEntity>(
+      new Protocol.GetSystemTimesRequestEntity(0)
+    );
+  }
+
+  public restoreDevice(delete_upload: boolean = false) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.RestoreDeviceRequestEntity(delete_upload))
+    );
+  }
+
+  public restartDevice(delay_ms?: number) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.RestartDeviceRequestEntity(delay_ms))
+    );
+  }
+
+  public async getUsbDevices() {
+    try {
+      return await this.doRpc<Protocol.GetUsbDevicesResponseEntity>(
+        new Protocol.GetUsbDevicesRequestEntity(0)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async getPollings() {
+    try {
+      return await this.doRpc<Protocol.GetPollingsResponseEntity>(
+        new Protocol.GetPollingsRequestEntity()
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async fileOperator(
+    from_path: string,
+    to_path: string,
+    operator_type: string,
+    force_operator: boolean = true
+  ) {
+    try {
+      return await this.doRpc<Protocol.FileOperatorResponseEntity>(
+        new Protocol.FileOperatorRequestEntity(
+          from_path,
+          to_path,
+          operator_type,
+          force_operator
+        )
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async getEdgeBlendingInfo() {
+    return await this.doRpc<Protocol.GetEdgeBlendingInfoResponseEntity>(
+      new Protocol.GetEdgeBlendingInfoRequestEntity(0)
+    );
+  }
+
+  public async setEdgeBlendingInfo(
+    enable_blending: boolean,
+    enable_correct: boolean,
+    width: number,
+    height: number,
+    col: number,
+    row: number,
+    point_count: number
+  ) {
+    return await this.doRpc<Protocol.SetEdgeBlendingInfoResponseEntity>(
+      new Protocol.SetEdgeBlendingInfoRequestEntity(
+        enable_blending,
+        enable_correct,
+        width,
+        height,
+        col,
+        row,
+        point_count,
+        0
+      )
+    );
+  }
+
+  public async wakeUpDevice() {
+    return await this.doRpc<Protocol.SetDevicePowerResponseEntity>(
+      new Protocol.SetDevicePowerRequestEntity(
+        Protocol.SetDevicePowerRequestEntity.kPowerStatePowerOn
+      )
+    );
+  }
+
+  public async deviceStandByMode() {
+    return await this.doRpc<Protocol.SetDevicePowerResponseEntity>(
+      new Protocol.SetDevicePowerRequestEntity(
+        Protocol.SetDevicePowerRequestEntity.kPowerStateStandBy
+      )
+    );
+  }
+
+  public async getExternalControlDatas() {
+    return await this.doRpc<Protocol.RpcGetExternalControlDatasResponseEntity>(
+      new Protocol.RpcGetExternalControlDatasRequestEntity()
+    );
+  }
+
+  public async deleteExternalControlData(number: number) {
+    return await this.doRpc<Protocol.RpcDeleteExternalControlDataResponseEntity>(
+      new Protocol.RpcDeleteExternalControlDataRequestEntity(number)
+    );
+  }
+
+  public async editExternalControlData(entity: ExternalControlTableEntity) {
+    return await this.doRpc<Protocol.RpcEditExternalControlDataResponseEntity>(
+      new Protocol.RpcEditExternalControlDataRequestEntity(entity)
+    );
+  }
+
+  public async addExternalControlData(entity: ExternalControlTableEntity) {
+    return await this.doRpc<Protocol.RpcAddExternalControlDataResponseEntity>(
+      new Protocol.RpcAddExternalControlDataRequestEntity(entity)
+    );
+  }
+
+  public async getExternalControlSerialPortConfig() {
+    return await this.doRpc<Protocol.RpcGetExternalControlSerialPortConfigResponseEntity>(
+      new Protocol.RpcGetExternalControlSerialPortConfigRequestEntity()
+    );
+  }
+
+  public async setExternalControlSerialPortConfig(
+    serial_port: SerialPortConfigEntity,
+    tcp_address: string,
+    tcp_port: number,
+    udp_address: string,
+    udp_port: number,
+    current_type: string
+  ) {
+    return await this.doRpc<Protocol.RpcSetExternalControlSerialPortConfigResponseEntity>(
+      new Protocol.RpcSetExternalControlSerialPortConfigRequestEntity(
+        serial_port,
+        tcp_address,
+        tcp_port,
+        udp_address,
+        udp_port,
+        current_type
+      )
+    );
+  }
+
+  public async callExternalControlData(number: number) {
+    return await this.doRpc<Protocol.RpcCallExternalControlDataResponseEntity>(
+      new Protocol.RpcCallExternalControlDataRequestEntity(number)
+    );
+  }
+
+  public setEdgeBlendingPoint(point: EdgeBlendingPoint) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.SetEdgeBlendingPointRequestEntity(point))
+    );
+  }
+
+  public setServerLanguage(language: string) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.SetLanguageRequestEntity(language))
+    );
+  }
+
+  public async getConnectList() {
+    return await this.doRpc<Protocol.GetConnectionListResponseEntity>(
+      new Protocol.GetConnectionListRequestEntity()
+    );
+  }
+  public async setConnectItem(entity: ConnectTableEntity) {
+    return await this.doRpc<Protocol.SetConnectionItemResponseEntity>(
+      new Protocol.SetConnectionItemRequestEntity(entity)
+    );
+  }
+
+  public async setHdmiRotation(rotation: number) {
+    this.ws?.send(
+      JSON.stringify(new Protocol.SetHDMIRotationRequestEntity(rotation))
+    );
+  }
+
+  public async getTimingTasks() {
+    try {
+      return await this.doRpc<Protocol.GetTimingTasksResponseEntity>(
+        new Protocol.GetTimingTasksRequestEntity()
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async addTimingTask(task: TimingTaskEntity) {
+    try {
+      return await this.doRpc<Protocol.AddTimingTaskResponseEntity>(
+        new Protocol.AddTimingTaskRequestEntity(task)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async editTimingTask(task: TimingTaskEntity) {
+    try {
+      return await this.doRpc<Protocol.EditTimingTaskResponseEntity>(
+        new Protocol.EditTimingTaskRequestEntity(task)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+  public async deleteTimingTask(uuid: string) {
+    try {
+      return await this.doRpc<Protocol.DeleteTimingTaskResponseEntity>(
+        new Protocol.DeleteTimingTaskRequestEntity(uuid)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async getSystemNetworkInfo() {
+    try {
+      return await this.doRpc<Protocol.GetSystemNetworkInfoResponseEntity>(
+        new Protocol.GetSystemNetworkInfoRequestEntity()
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async getMagicWallConfig() {
+    try {
+      return await this.doRpc<Protocol.RpcGetMagicWallConfigResponseEntity>(
+        new Protocol.RpcGetMagicWallConfigRequestEntity()
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async setMagicWallConfig(config: MagicWallConfig) {
+    try {
+      return await this.doRpc<Protocol.RpcSetMagicWallConfigResponseEntity>(
+        new Protocol.RpcSetMagicWallConfigRequestEntity(config)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async testA(
+    x: number,
+    y: number,
+    w: number,
+    h: number,
+    angle: number
+  ) {
+    try {
+      return await this.doRpc<Protocol.RpcTestAResponseEntity>(
+        new Protocol.RpcTestARequestEntity(x, y, w, h, angle)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async setHdmiInDecodeType(index: number, type: string) {
+    try {
+      return await this.doRpc<Protocol.SetHdmiInDecodeTypeResponseEntity>(
+        new Protocol.SetHdmiInDecodeTypeRequestEntity(index, type)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async setHdmiInAudioDevice(index: number, type: string) {
+    try {
+      return await this.doRpc<Protocol.SetHdmiInAudioDeviceResponseEntity>(
+        new Protocol.SetHdmiInAudioDeviceRequestEntity(index, type)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async getCityList(language?: string) {
+    try {
+      return await this.doRpc<Protocol.GetCityListResponseEntity>(
+        new Protocol.GetCityListRequestEntity(language)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async getPowerState() {
+    try {
+      return await this.doRpc<Protocol.GetPowerStateResponseEntity>(
+        new Protocol.GetPowerStateRequestEntity()
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async getJointActionEquipments() {
+    return await this.doRpc<Protocol.GetJointActionEquipmentResponseEntity>(
+      new Protocol.GetJointActionEquipmentRequestEntity()
+    );
+  }
+
+  public async setJointActionEquipment(
+    entity: JointActionEquipmentTableEntity
+  ) {
+    return await this.doRpc<Protocol.SetJointActionEquipmentResponseEntity>(
+      new Protocol.SetJointActionEquipmentRequestEntity(entity)
+    );
+  }
+
+  public async deleteJointActionEquipment(uuid: string) {
+    return await this.doRpc<Protocol.DeleteJointActionEquipmentResponseEntity>(
+      new Protocol.DeleteJointActionEquipmentRequestEntity(uuid)
+    );
+  }
+
+  public async setBlendingCorrection(
+    row: number,
+    column: number,
+    correction_type: number,
+    control_point: number,
+    x: number,
+    y: number
+  ) {
+    return await this.doRpc<Protocol.NoneResponse>(
+      new Protocol.SetBlendingCorrectionRequestEntity(
+        row,
+        column,
+        correction_type,
+        control_point,
+        x,
+        y
+      )
+    );
+  }
+
+  public async setBlendingAlphaParam(
+    row: number,
+    column: number,
+    location: number,
+    value: number
+  ) {
+    return await this.doRpc<Protocol.NoneResponse>(
+      new Protocol.SetBlendingAlphaParamRequestEntity(
+        row,
+        column,
+        location,
+        value
+      )
+    );
+  }
+
+  public async setBlendingPowerParam(
+    row: number,
+    column: number,
+    location: number,
+    value: number
+  ) {
+    return await this.doRpc<Protocol.NoneResponse>(
+      new Protocol.SetBlendingPowerParamRequestEntity(
+        row,
+        column,
+        location,
+        value
+      )
+    );
+  }
+
+  public async setBlendingGammaParam(
+    row: number,
+    column: number,
+    location: number,
+    value: number
+  ) {
+    return await this.doRpc<Protocol.NoneResponse>(
+      new Protocol.SetBlendingGammaParamRequestEntity(
+        row,
+        column,
+        location,
+        value
+      )
+    );
+  }
+
+  public async EnableBlending(
+    enable: boolean
+  ) {
+    return await this.doRpc<Protocol.NoneResponse>(
+      new Protocol.EnableBlendingRequestEntity(
+        enable
+      )
+    );
+  }
+
+  public async SetBlendingOverlap(
+    row: number,
+    column: number,
+    location: number,
+    enable: boolean,
+    width: number
+  ) {
+    return await this.doRpc<Protocol.NoneResponse>(
+      new Protocol.SetBlendingOverlapRequestEntity(
+        row,
+        column,
+        location,
+        enable,
+        width
+      )
+    );
+  }
+
+  public async GetBlendingConfig(name: string) {
+    return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
+      new Protocol.GetBlendingConfigRequestEntity(name)
+    );
+  }
+
+  public async SaveBlendingConfig(name: string) {
+    return await this.doRpc<Protocol.SaveBlendingConfigResponseEntity>(
+      new Protocol.SaveBlendingConfigRequestEntity(name)
+    );
+  }
+
+  public async SetBlendingHorDensity(
+    row: number,
+    column: number,
+    control_point: number,
+    value: number
+  ) {
+    return await this.doRpc<Protocol.NoneResponse>(
+      new Protocol.SetBlendingHorDensityRequestEntity(
+        row,
+        column,
+        control_point,
+        value
+      )
+    );
+  }
+
+  public async SetBlendingVerDensity(
+    row: number,
+    column: number,
+    control_point: number,
+    value: number
+  ) {
+    return await this.doRpc<Protocol.NoneResponse>(
+      new Protocol.SetBlendingVerDensityRequestEntity(
+        row,
+        column,
+        control_point,
+        value
+      )
+    );
+  }
+
+  public async ResetBlendingConfig() {
+    return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
+      new Protocol.ResetBlendingConfigRequestEntity()
+    );
+  }
+
+  public async SetBlendingOption(
+    id: string,
+    value: string
+  ) {
+    return await this.doRpc<Protocol.NoneResponse>(
+      new Protocol.SetBlendingOptionRequestEntity(
+        id,
+        value
+      )
+    );
+  }
+
+  public async EnumBlendingScene() {
+    return await this.doRpc<Protocol.EnumBlendingSceneResponseEntity>(
+      new Protocol.EnumBlendingSceneRequestEntity()
+    );
+  }
+
+  public async ApplyBlendingScene(name: string) {
+    return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
+      new Protocol.ApplyBlendingSceneRequestEntity(name)
+    );
+  }
+
+  public async DeleteBlendingScene(name: string) {
+    return await this.doRpc<Protocol.RpcBlendingResponseEntity>(
+      new Protocol.DeleteBlendingSceneRequestEntity(name)
+    );
+  }
+
+  public destory() {
+    this.ws?.close();
+    if (this.ws) {
+      this.ws.onclose = null;
+      this.ws.onerror = null;
+      this.ws.onopen = null;
+      this.ws.onmessage = null;
+    }
+    this.ws = null;
+  }
+}
+
+export interface NotifyMessage {
+  packet: Protocol.PacketEntity;
+  data: string;
+}
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 7aefb92..38a993c 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -75,21 +75,21 @@
         <q-separator />
 
         <q-card-actions align="right">
-            <span  v-show="isdebug">{{ $t("Whether to hide the desktop") }}</span><q-checkbox  v-show="isdebug" style="justify-content: flex-start"
-              v-model="hide_desktop_value" @click="send_hide_desktop" />
-            <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" />
+          <span v-show="isdebug">{{ $t("Whether to hide the desktop") }}</span><q-checkbox v-show="isdebug"
+            style="justify-content: flex-start" v-model="hide_desktop_value" @click="send_hide_desktop" />
+          <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" />
           <div class="q-space" data-v-39efcd1f=""></div>
           <div v-show="!isdebug" class="q-space" data-v-39efcd1f=""></div>
           <div v-show="!isdebug" class="q-space" data-v-39efcd1f=""></div>
           <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall config')" />
           <div class="q-space" data-v-39efcd1f=""></div>
           <q-btn flat :label="$t('Select saved configuration')" no-caps color="primary"
-            @click="select_configuration = true" />
+            @click="select_configuration = true;get_scenes()" />
           <q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup
             @click="$store.commit('setSelectedProjector', '0/0');" />
           <q-btn flat :label="$t('save config')" no-caps color="primary" @click="save" />
@@ -105,6 +105,16 @@
         <q-card-section class="q-pt-none">
           <q-select filled :model-value="save_cover_name" use-input hide-selected fill-input input-debounce="0"
             :options="plan_list_op" @filter="filterFn" @input-value="setModel">
+            <template v-slot:option="{ itemProps, opt, selected, toggleOption }">
+          <q-item v-bind="itemProps">
+            <q-item-section>
+              <q-item-label v-html="opt" />
+            </q-item-section>
+            <q-item-section side>
+              <q-icon name="clear" @click="del_scenes(opt)"></q-icon>
+            </q-item-section>
+          </q-item>
+        </template>
           </q-select>
         </q-card-section>
         <q-card-actions align="right" class="bg-white text-teal">
@@ -121,16 +131,40 @@
           <div class="text-h6">{{ $t('read saved configuration') }}</div>
         </q-card-section>
         <q-card-section class="q-pt-none">
-          <q-select filled v-model="select_configuration_name" :options="plan_list" :label="$t('please choose')" />
+          <q-select filled v-model="select_configuration_name" :options="plan_list" :label="$t('please choose')" >
+            <template v-slot:option="{ itemProps, opt, selected, toggleOption }">
+          <q-item v-bind="itemProps">
+            <q-item-section>
+              <q-item-label v-html="opt" />
+            </q-item-section>
+            <q-item-section side>
+              <q-icon name="clear" @click="del_scenes(opt)"></q-icon>
+            </q-item-section>
+          </q-item>
+        </template>
+          </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('ok')" @click="apply_the_selected_configuration" color="primary" v-close-popup />
+          <q-btn flat :label="$t('apply')" @click="apply_the_selected_configuration" color="primary" v-close-popup />
         </q-card-actions>
       </q-card>
     </q-dialog>
 
-
+    <q-dialog v-model="del_dialog">
+      <q-card style="width: 700px; max-width: 80vw;">
+        <q-card-section>
+          <div class="text-h6">{{ $t('confirm delete') }}</div>
+        </q-card-section>
+        <q-card-section class="q-pt-none">
+          {{ $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-card-actions>
+      </q-card>
+    </q-dialog>
 
   </q-dialog>
 </template>
@@ -191,6 +225,7 @@ export default defineComponent({
       show_dialog.value = true;
     };
     const select_configuration = ref(false)
+    const del_dialog = ref(false)
     const select_configuration_name = ref("")
     const send_hide_desktop = () => {
       set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0");
@@ -242,20 +277,9 @@ export default defineComponent({
       });
     };
     const save = () => {
-      set?.SaveBlendingConfig("");
-      //show_dialog.value = false;
-      clear();
-      save_cover_name.value = save_name.value = ''
-      set?.GetBlendingConfig("").then((res) => {
-        let tmp = JSON.parse(res ? res.config : "");
-        EnableBlending.value = tmp.enable;
-        $store.commit("setEnablefusion", tmp.enable);
-        config.value.col = tmp.col;
-        config.value.row = tmp.row;
-        $store.commit("setfusion_configuration", res?.config);
-      });
-      $store.commit("setSelectedProjector", "0/0");
       medium.value = true
+      //读取场景
+      get_scenes()
     };
     const getconfig = () => {
       try {
@@ -280,6 +304,17 @@ export default defineComponent({
       }, 500);
     };
 
+
+    const get_scenes = () => {
+      set?.EnumBlendingScene().then((res) => {
+        if (res == null || res.scenes.length == 0) return
+        plan_list.splice(0, plan_list.length);
+        for (let index = 0; index < res.scenes.length; index++) {
+          plan_list.push(res.scenes[index]);
+        }
+      })
+    }
+
     onBeforeMount(() => {
       setTimeout(() => {
         try {
@@ -324,14 +359,30 @@ export default defineComponent({
       //这里根据选择的配置 应用
 
       //console.log(select_configuration_name.value)
-      set?.ApplyBlendingScene(select_configuration_name.value);
+      set?.ApplyBlendingScene(select_configuration_name.value).then((res) => {
+        let tmp = JSON.parse(res ? res.config : "");
+        EnableBlending.value = tmp.enable;
+        $store.commit("setEnablefusion", tmp.enable);
+        config.value.col = tmp.col;
+        config.value.row = tmp.row;
+        $store.commit("setfusion_configuration", res?.config);
+      });
 
       let tmp = options.value
       options.value = ""
-      getconfig()
+      //getconfig()
+      $store.commit("setSelectedProjector", "0/0");
       setTimeout(() => {
+        sessionStorage.removeItem("FusionLocale");
+        sessionStorage.removeItem("SurfaceCorrection");
+        sessionStorage.removeItem("DensityCorrection");
+        sessionStorage.removeItem("FourPointCalibration");
+        sessionStorage.removeItem("GridSettings");
         options.value = tmp
-      }, 100);
+      }, 800);
+      // setTimeout(() => {
+      //   options.value = tmp
+      // }, 100);
     }
     const plan_list_op = ref(plan_list)
     const filterFn = (val: any, update: any, abort: any) => {
@@ -345,28 +396,39 @@ export default defineComponent({
       save_cover_name.value = val
     }
 
-    const get_scenes = () => {
-      set?.EnumBlendingScene().then((res) => {
-        if (res == null || res.scenes.length == 0) return
-        plan_list.splice(0, plan_list.length);
-        for (let index = 0; index < res.scenes.length; index++) {
-          plan_list.push(res.scenes[index]);
-        }
-      })
-    }
-    get_scenes()
     const saveconfig = () => {
-      //save_cover_name
-
+      set?.SaveBlendingConfig(save_cover_name.value);
+      clear();
+      save_cover_name.value = save_name.value = ''
+      set?.GetBlendingConfig("").then((res) => {
+        let tmp = JSON.parse(res ? res.config : "");
+        EnableBlending.value = tmp.enable;
+        $store.commit("setEnablefusion", tmp.enable);
+        config.value.col = tmp.col;
+        config.value.row = tmp.row;
+        $store.commit("setfusion_configuration", res?.config);
+      });
+      $store.commit("setSelectedProjector", "0/0");
     }
     const isdebug = computed(() => {
       let tmp = JSON.parse($store.state.fusion_configuration)
-      let str ='debug@show_mask'
-      return tmp.options[str]=='1'|| record_times.value>2
+      let str = 'debug@show_mask'
+      return tmp.options[str] == '1' || record_times.value > 2
     })
-
-
+    const name_to_be_deleted=ref("");
+    const del_scenes=(name:string)=>{
+      del_dialog.value=true;
+      name_to_be_deleted.value=name;
+    }
+    const dialog_del_scenes=()=>{
+      set?.DeleteBlendingScene(name_to_be_deleted.value);
+      plan_list.splice(plan_list.findIndex(item => item === name_to_be_deleted.value), 1)
+    }
     return {
+      name_to_be_deleted,
+      dialog_del_scenes,
+      get_scenes,
+      del_scenes,
       filterFn,
       setModel,
       send_hide_desktop,
@@ -394,7 +456,8 @@ export default defineComponent({
       plan_list_op,
       record_times,
       saveconfig,
-      isdebug
+      isdebug,
+      del_dialog
     };
   },
 });
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 8b1eeb7..2c004f3 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -438,5 +438,7 @@ export default {
   "save":"save",
   "Whether to save the configuration":"Whether to save the configuration",
   "New Please enter a name":"New Please enter a name",
-  "Please select an override":"Please select an override"
+  "Please select an override":"Please select an override",
+  "confirm delete":"confirm delete",
+  "delete or not":"delete or not"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 9b8ae26..dce6078 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -708,4 +708,6 @@ export default {
   "Whether to save the configuration":"是否保存配置",
   "New Please enter a name":"新建 请输入名称",
   "Please select an override":"请选择覆盖",
+  "confirm delete":"确定删除",
+  "Whether to delete":"是否删除"
 };

From f44f60d038e9ca6f6a367f49507075a4131b91ef Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 2 Feb 2023 15:48:40 +0800
Subject: [PATCH 45/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/Debugging.vue   | 82 +++++++++++++++++++
 .../FusionSettings/DebuggingItem.vue          | 63 ++++++++++++++
 .../FusionSettings/DensityCorrection.vue      |  6 --
 src/components/FusionSettingsDialog.vue       | 68 ++++++++-------
 src/i18n/en-US/index.ts                       |  7 +-
 src/i18n/zh-CN/index.ts                       |  7 +-
 6 files changed, 190 insertions(+), 43 deletions(-)
 create mode 100644 src/components/FusionSettings/Debugging.vue
 create mode 100644 src/components/FusionSettings/DebuggingItem.vue

diff --git a/src/components/FusionSettings/Debugging.vue b/src/components/FusionSettings/Debugging.vue
new file mode 100644
index 0000000..3f9777b
--- /dev/null
+++ b/src/components/FusionSettings/Debugging.vue
@@ -0,0 +1,82 @@
+<template>
+  <div>
+    <q-list dense bordered separator>
+      <q-item clickable v-ripple  v-for="(item, index) in data">
+        <q-item-section >
+          <DebuggingItem :name="Object.keys(item)[0]" :value="Object.values(item)[0]">
+          </DebuggingItem>
+        </q-item-section>
+      </q-item>
+      <q-item clickable v-ripple  v-for="(item, index) in btn">
+        <q-item-section >
+            <div><q-btn color="white" text-color="black" @click="send_btn(Object.keys(item)[0])" :label="$t(btn_name(Object.keys(item)[0]))" /></div>
+        </q-item-section>
+      </q-item>
+    </q-list>
+  </div>
+</template>
+
+
+<script lang="ts">
+import {
+  defineComponent,
+  ref,
+  watch,
+  computed,
+  defineProps,
+  withDefaults,
+  reactive,
+  onMounted,
+  onBeforeUnmount,
+} from "vue";
+import { useStore } from "src/store";
+import { useI18n } from "vue-i18n";
+import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
+import GlobalData from "src/common/GlobalData";
+import DebuggingItem from "src/components/FusionSettings/DebuggingItem.vue";
+export default defineComponent({
+  name: "Debugging",
+  components: {
+    vue3ResizeDrag,
+    DebuggingItem
+  },
+  setup() {
+    let set = GlobalData.getInstance().getCurrentClient();
+    let $store = useStore();
+    let $t = useI18n();
+    const data = computed(() => {
+      let array = [];
+      let tmp = JSON.parse($store.state.fusion_configuration).options
+      for (let key in tmp) {
+        if (key.indexOf("@") != -1&&key.indexOf("@btn") == -1) {
+          array.push({ [key]: tmp[key] })
+        }
+      }
+      return array
+    })
+    const btn = computed(() => {
+      let array = [];
+      let tmp = JSON.parse($store.state.fusion_configuration).options
+      for (let key in tmp) {
+        if (key.indexOf("@btn") != -1) {
+          array.push({ [key]: tmp[key] })
+        }
+      }
+      return array
+    })
+
+    const btn_name=(name:string):string=>{
+      return name.split("@")[2]
+    }
+    const send_btn=(name:string)=>{
+      set?.SetBlendingOption(name,"1");
+    }
+    return {
+      btn_name,
+      send_btn,
+      data,
+      btn
+    }
+  }
+})
+</script>
diff --git a/src/components/FusionSettings/DebuggingItem.vue b/src/components/FusionSettings/DebuggingItem.vue
new file mode 100644
index 0000000..7b65ed5
--- /dev/null
+++ b/src/components/FusionSettings/DebuggingItem.vue
@@ -0,0 +1,63 @@
+<template>
+  <div><span>{{ $t(show_name) }}</span> <q-checkbox v-model="val" @click="send" /></div>
+</template>
+
+
+<script lang="ts">
+import {
+  defineComponent,
+  ref,
+  watch,
+  computed,
+  defineProps,
+  withDefaults,
+  reactive,
+  onMounted,
+  onBeforeUnmount,
+} from "vue";
+import { useStore } from "src/store";
+import { useI18n } from "vue-i18n";
+import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
+import GlobalData from "src/common/GlobalData";
+export default defineComponent({
+  name: "DebuggingItem",
+  components: {
+    vue3ResizeDrag,
+  },
+  props: {
+    name: {
+      type: String,
+      default: ''
+    },
+    value: {
+      type: String,
+      default: ''
+    }
+  },
+  setup(props) {
+    let set = GlobalData.getInstance().getCurrentClient();
+    let $store = useStore();
+    let $t = useI18n();
+    const val = ref(false)
+    const show_name = computed(() => {
+      let tmp=""
+      if(props.name.indexOf("@") != -1){
+        tmp=props.name.split("@")[1]
+      }else{
+        tmp=props.name
+      }
+      return tmp
+    })
+    val.value=props.value=="1"?true:false
+    const send = () => {
+      set?.SetBlendingOption(props.name, val.value ? "1" : "0");
+    }
+    return {
+      send,
+      val,
+      show_name,
+      ...props
+    }
+  }
+})
+</script>
diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 9ea2ef0..6eaea61 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -676,11 +676,6 @@ export default defineComponent({
       }
       save_set_cache();
     };
-    const creat_svg=(index:Number,type:string):string=>{
-      //btoa(unescape(encodeURIComponent(str)))
-      //'data:image/svg+xml;base64,'+btoa(`<svg width="50" height="50"xmlns="http://www.w3.org/2000/svg"><text font-size="14" fill="#d50000"><tspan x="3" y="10">↑</tspan><tspan x="0" y="20">v${index}</tspan><tspan x="3" y="30">↓</tspan></text></svg>`)
-      return type=='h'?`data:image/svg+xml,%3Csvg width='50' height='14' xmlns='http://www.w3.org/2000/svg'%3E%3Ctext x='50%25' y='50%25' font-size='14' fill='%2300c853' font-family='system-ui, sans-serif' text-anchor='middle' dominant-baseline='middle'%3E←h${index}→%3C/text%3E%3C/svg%3E`:'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTQiIGhlaWdodD0iNTAiCiAgICB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogICAgPHRleHQgZm9udC1zaXplPSIxNCIgZmlsbD0iI2Q1MDAwMCI+CiAgICAgICAgPHRzcGFuIHg9IjMiIHk9IjEwIj7ihpE8L3RzcGFuPgogICAgICAgIDx0c3BhbiB4PSIwIiB5PSIyMCI+djE8L3RzcGFuPgogICAgICAgIDx0c3BhbiB4PSIzIiB5PSIzMCI+4oaTPC90c3Bhbj4KICAgIDwvdGV4dD4KPC9zdmc+'
-    }
     initialization();
     return {
       model,
@@ -694,7 +689,6 @@ export default defineComponent({
       isshowarray,
       isactivearray,
       save,
-      creat_svg
     };
   },
 });
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 38a993c..5232926 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -64,6 +64,10 @@
                     },
                     { label: $t('GridSettings'), value: 'GridSettings' },
                   ]" />
+                <q-btn-toggle   v-show="isdebug" no-caps v-model="options" toggle-color="primary"
+                  :options="[
+                    { label: $t('debugging'), value: 'Debugging' }
+                  ]" />
               </div>
               <div style="min-height: 72vh">
                 <component :is="options" />
@@ -75,8 +79,6 @@
         <q-separator />
 
         <q-card-actions align="right">
-          <span v-show="isdebug">{{ $t("Whether to hide the desktop") }}</span><q-checkbox v-show="isdebug"
-            style="justify-content: flex-start" v-model="hide_desktop_value" @click="send_hide_desktop" />
           <span>{{ $t("disable blending params") }}</span>
           <q-checkbox style="justify-content: flex-start" v-model="disable_blending_params"
             @click="send_disable_blending_params" />
@@ -84,8 +86,7 @@
           <q-checkbox style="justify-content: flex-start" v-model="show_blending_grids"
             @click="send_show_blending_grids" />
           <div class="q-space" data-v-39efcd1f=""></div>
-          <div v-show="!isdebug" class="q-space" data-v-39efcd1f=""></div>
-          <div v-show="!isdebug" 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')" />
           <div class="q-space" data-v-39efcd1f=""></div>
           <q-btn flat :label="$t('Select saved configuration')" no-caps color="primary"
@@ -203,6 +204,7 @@ import FourPointCalibration from "src/components/FusionSettings/FourPointCalibra
 import GridSettings from "src/components/FusionSettings/GridSettings.vue";
 import SurfaceCorrection from "src/components/FusionSettings/SurfaceCorrection.vue";
 import DensityCorrection from "src/components/FusionSettings/DensityCorrection.vue";
+import Debugging from "src/components/FusionSettings/Debugging.vue";
 
 export default defineComponent({
   name: "ComponentFusionSettingsDialog",
@@ -213,6 +215,7 @@ export default defineComponent({
     GridSettings,
     SurfaceCorrection,
     DensityCorrection,
+    Debugging
   },
   setup() {
     let set = GlobalData.getInstance().getCurrentClient();
@@ -227,9 +230,9 @@ export default defineComponent({
     const select_configuration = ref(false)
     const del_dialog = ref(false)
     const select_configuration_name = ref("")
-    const send_hide_desktop = () => {
-      set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0");
-    };
+    // const send_hide_desktop = () => {
+    //   set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0");
+    // };
     const send_disable_blending_params = () => {
       set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0");
     };
@@ -243,8 +246,8 @@ export default defineComponent({
     const EnableBlending = ref(false);
     let optionsstr = ref();
     optionsstr.value = "FusionLocale";
-    const hide_desktop_value_id = ref("debug@show_mask");
-    const hide_desktop_value = ref(false);
+    // const hide_desktop_value_id = ref("debug@show_mask");
+    // const hide_desktop_value = ref(false);
     const disable_blending_params_id = ref("1");
     const disable_blending_params = ref(false);
     const show_blending_grids_id = ref("blending_grids_show");
@@ -302,6 +305,7 @@ export default defineComponent({
         sessionStorage.removeItem("FourPointCalibration");
         sessionStorage.removeItem("GridSettings");
       }, 500);
+      options.value="FusionLocale"
     };
 
 
@@ -318,14 +322,7 @@ export default defineComponent({
     onBeforeMount(() => {
       setTimeout(() => {
         try {
-          set?.GetBlendingConfig("").then((res) => {
-            let tmp = JSON.parse(res ? res.config : "");
-            EnableBlending.value = tmp.enable;
-            $store.commit("setEnablefusion", tmp.enable);
-            config.value.col = tmp.col;
-            config.value.row = tmp.row;
-            $store.commit("setfusion_configuration", res?.config);
-          });
+
         } catch (error) {
           erroe();
         }
@@ -336,7 +333,7 @@ export default defineComponent({
         set?.GetBlendingConfig("").then((res) => {
           let tmp = JSON.parse(res ? res.config : "");
           let local_options = [
-            [hide_desktop_value_id, hide_desktop_value],
+            // [hide_desktop_value_id, hide_desktop_value],
             [disable_blending_params_id, disable_blending_params],
             [show_blending_grids_id, show_blending_grids]
           ];
@@ -348,17 +345,21 @@ export default defineComponent({
               local_opt[1].value = ("0" == opt || "false" == opt.toLowerCase() ? false : true);
             }
           }
+            EnableBlending.value = tmp.enable;
+            $store.commit("setEnablefusion", tmp.enable);
+            config.value.col = tmp.col;
+            config.value.row = tmp.row;
+            $store.commit("setfusion_configuration", res?.config);
+
         });
       }, 1000);
     });
     const save_cover_name = ref("")
     const plan_list = [
-      '1'
+      ''
     ]
     const apply_the_selected_configuration = () => {
       //这里根据选择的配置 应用
-
-      //console.log(select_configuration_name.value)
       set?.ApplyBlendingScene(select_configuration_name.value).then((res) => {
         let tmp = JSON.parse(res ? res.config : "");
         EnableBlending.value = tmp.enable;
@@ -370,7 +371,6 @@ export default defineComponent({
 
       let tmp = options.value
       options.value = ""
-      //getconfig()
       $store.commit("setSelectedProjector", "0/0");
       setTimeout(() => {
         sessionStorage.removeItem("FusionLocale");
@@ -380,9 +380,6 @@ export default defineComponent({
         sessionStorage.removeItem("GridSettings");
         options.value = tmp
       }, 800);
-      // setTimeout(() => {
-      //   options.value = tmp
-      // }, 100);
     }
     const plan_list_op = ref(plan_list)
     const filterFn = (val: any, update: any, abort: any) => {
@@ -400,16 +397,17 @@ export default defineComponent({
       set?.SaveBlendingConfig(save_cover_name.value);
       clear();
       save_cover_name.value = save_name.value = ''
-      set?.GetBlendingConfig("").then((res) => {
-        let tmp = JSON.parse(res ? res.config : "");
-        EnableBlending.value = tmp.enable;
-        $store.commit("setEnablefusion", tmp.enable);
-        config.value.col = tmp.col;
-        config.value.row = tmp.row;
-        $store.commit("setfusion_configuration", res?.config);
-      });
+      // set?.GetBlendingConfig("").then((res) => {
+      //   let tmp = JSON.parse(res ? res.config : "");
+      //   EnableBlending.value = tmp.enable;
+      //   $store.commit("setEnablefusion", tmp.enable);
+      //   config.value.col = tmp.col;
+      //   config.value.row = tmp.row;
+      //   $store.commit("setfusion_configuration", res?.config);
+      // });
       $store.commit("setSelectedProjector", "0/0");
     }
+
     const isdebug = computed(() => {
       let tmp = JSON.parse($store.state.fusion_configuration)
       let str = 'debug@show_mask'
@@ -431,8 +429,8 @@ export default defineComponent({
       del_scenes,
       filterFn,
       setModel,
-      send_hide_desktop,
-      hide_desktop_value,
+      // send_hide_desktop,
+      // hide_desktop_value,
       send_disable_blending_params,
       disable_blending_params,
       send_show_blending_grids,
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 2c004f3..e097f76 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -440,5 +440,10 @@ export default {
   "New Please enter a name":"New Please enter a name",
   "Please select an override":"Please select an override",
   "confirm delete":"confirm delete",
-  "delete or not":"delete or not"
+  "delete or not":"delete or not",
+  "debugging":"debugging",
+  "disable_blending":"disable blending",
+  "disable_clip":"disable clip",
+  "show_mask":"show desktop",
+  "save_bmp":"save bmp"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index dce6078..a916e4d 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -709,5 +709,10 @@ export default {
   "New Please enter a name":"新建 请输入名称",
   "Please select an override":"请选择覆盖",
   "confirm delete":"确定删除",
-  "Whether to delete":"是否删除"
+  "Whether to delete":"是否删除",
+  "debugging":"调试",
+  "disable_blending":"禁用混合",
+  "disable_clip":"禁用裁剪",
+  "show_mask":"显示桌面",
+  "save_bmp":"保存BMP"
 };

From 09f20b41239bbedec0f377fa1e6f555651bb615f Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 2 Feb 2023 16:21:37 +0800
Subject: [PATCH 46/78] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/Debugging.vue | 63 ++++++++++++---------
 src/components/FusionSettingsDialog.vue     | 17 ------
 2 files changed, 36 insertions(+), 44 deletions(-)

diff --git a/src/components/FusionSettings/Debugging.vue b/src/components/FusionSettings/Debugging.vue
index 3f9777b..ad7014d 100644
--- a/src/components/FusionSettings/Debugging.vue
+++ b/src/components/FusionSettings/Debugging.vue
@@ -1,22 +1,31 @@
 <template>
   <div>
     <q-list dense bordered separator>
-      <q-item clickable v-ripple  v-for="(item, index) in data">
-        <q-item-section >
-          <DebuggingItem :name="Object.keys(item)[0]" :value="Object.values(item)[0]">
+      <q-item clickable v-ripple v-for="(item, index) in data">
+        <q-item-section>
+          <DebuggingItem
+            :name="Object.keys(item)[0]"
+            :value="Object.values(item)[0]"
+          >
           </DebuggingItem>
         </q-item-section>
       </q-item>
-      <q-item clickable v-ripple  v-for="(item, index) in btn">
-        <q-item-section >
-            <div><q-btn color="white" text-color="black" @click="send_btn(Object.keys(item)[0])" :label="$t(btn_name(Object.keys(item)[0]))" /></div>
+      <q-item clickable v-ripple v-for="(item, index) in btn">
+        <q-item-section>
+          <div>
+            <q-btn
+              color="white"
+              text-color="black"
+              @click="send_btn(Object.keys(item)[0])"
+              :label="$t(btn_name(Object.keys(item)[0]))"
+            />
+          </div>
         </q-item-section>
       </q-item>
     </q-list>
   </div>
 </template>
 
-
 <script lang="ts">
 import {
   defineComponent,
@@ -38,7 +47,7 @@ export default defineComponent({
   name: "Debugging",
   components: {
     vue3ResizeDrag,
-    DebuggingItem
+    DebuggingItem,
   },
   setup() {
     let set = GlobalData.getInstance().getCurrentClient();
@@ -46,37 +55,37 @@ export default defineComponent({
     let $t = useI18n();
     const data = computed(() => {
       let array = [];
-      let tmp = JSON.parse($store.state.fusion_configuration).options
+      let tmp = JSON.parse($store.state.fusion_configuration).options;
       for (let key in tmp) {
-        if (key.indexOf("@") != -1&&key.indexOf("@btn") == -1) {
-          array.push({ [key]: tmp[key] })
+        if (key.indexOf("@") != -1 && key.indexOf("@btn") == -1) {
+          array.push({ [key]: tmp[key] });
         }
       }
-      return array
-    })
+      return array;
+    });
     const btn = computed(() => {
       let array = [];
-      let tmp = JSON.parse($store.state.fusion_configuration).options
+      let tmp = JSON.parse($store.state.fusion_configuration).options;
       for (let key in tmp) {
         if (key.indexOf("@btn") != -1) {
-          array.push({ [key]: tmp[key] })
+          array.push({ [key]: tmp[key] });
         }
       }
-      return array
-    })
+      return array;
+    });
 
-    const btn_name=(name:string):string=>{
-      return name.split("@")[2]
-    }
-    const send_btn=(name:string)=>{
-      set?.SetBlendingOption(name,"1");
-    }
+    const btn_name = (name: string): string => {
+      return name.split("@")[2];
+    };
+    const send_btn = (name: string) => {
+      set?.SetBlendingOption(name, "1");
+    };
     return {
       btn_name,
       send_btn,
       data,
-      btn
-    }
-  }
-})
+      btn,
+    };
+  },
+});
 </script>
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 5232926..e187f58 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -230,9 +230,6 @@ export default defineComponent({
     const select_configuration = ref(false)
     const del_dialog = ref(false)
     const select_configuration_name = ref("")
-    // const send_hide_desktop = () => {
-    //   set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0");
-    // };
     const send_disable_blending_params = () => {
       set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0");
     };
@@ -246,8 +243,6 @@ export default defineComponent({
     const EnableBlending = ref(false);
     let optionsstr = ref();
     optionsstr.value = "FusionLocale";
-    // const hide_desktop_value_id = ref("debug@show_mask");
-    // const hide_desktop_value = ref(false);
     const disable_blending_params_id = ref("1");
     const disable_blending_params = ref(false);
     const show_blending_grids_id = ref("blending_grids_show");
@@ -333,7 +328,6 @@ export default defineComponent({
         set?.GetBlendingConfig("").then((res) => {
           let tmp = JSON.parse(res ? res.config : "");
           let local_options = [
-            // [hide_desktop_value_id, hide_desktop_value],
             [disable_blending_params_id, disable_blending_params],
             [show_blending_grids_id, show_blending_grids]
           ];
@@ -359,7 +353,6 @@ export default defineComponent({
       ''
     ]
     const apply_the_selected_configuration = () => {
-      //这里根据选择的配置 应用
       set?.ApplyBlendingScene(select_configuration_name.value).then((res) => {
         let tmp = JSON.parse(res ? res.config : "");
         EnableBlending.value = tmp.enable;
@@ -397,14 +390,6 @@ export default defineComponent({
       set?.SaveBlendingConfig(save_cover_name.value);
       clear();
       save_cover_name.value = save_name.value = ''
-      // set?.GetBlendingConfig("").then((res) => {
-      //   let tmp = JSON.parse(res ? res.config : "");
-      //   EnableBlending.value = tmp.enable;
-      //   $store.commit("setEnablefusion", tmp.enable);
-      //   config.value.col = tmp.col;
-      //   config.value.row = tmp.row;
-      //   $store.commit("setfusion_configuration", res?.config);
-      // });
       $store.commit("setSelectedProjector", "0/0");
     }
 
@@ -429,8 +414,6 @@ export default defineComponent({
       del_scenes,
       filterFn,
       setModel,
-      // send_hide_desktop,
-      // hide_desktop_value,
       send_disable_blending_params,
       disable_blending_params,
       send_show_blending_grids,

From 6e04641016f52b3ac2640c1f61ad3f007a17c09a Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cxte.com.cn>
Date: Thu, 2 Feb 2023 18:53:50 +0800
Subject: [PATCH 47/78] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/GridSettings.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index a6fed78..5fe5153 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -136,8 +136,8 @@ export default defineComponent({
     }
     const use_server_config = () => {
       let server_conf = JSON.parse($store.state.fusion_configuration).options
-      model[0] = Number(server_conf.blending_grids_row)
-      model[1] = Number(server_conf.blending_grids_column)
+      model[0] = server_conf.blending_grids_row ? Number(server_conf.blending_grids_row) : 20;
+      model[1] = server_conf.blending_grids_column ? Number(server_conf.blending_grids_column) : 40;
       color[0] = server_conf.blending_grids_line_color
 
       RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true

From e388f61a9ce1aa2d2132f4a46c623eecf32a98ae Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cxte.com.cn>
Date: Thu, 2 Feb 2023 19:10:09 +0800
Subject: [PATCH 48/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en-US/index.ts | 2 +-
 src/i18n/zh-CN/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index e097f76..59a8084 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -444,6 +444,6 @@ export default {
   "debugging":"debugging",
   "disable_blending":"disable blending",
   "disable_clip":"disable clip",
-  "show_mask":"show desktop",
+  "show_mask":"hide desktop",
   "save_bmp":"save bmp"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index a916e4d..49d81a1 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -713,6 +713,6 @@ export default {
   "debugging":"调试",
   "disable_blending":"禁用混合",
   "disable_clip":"禁用裁剪",
-  "show_mask":"显示桌面",
+  "show_mask":"隐藏桌面",
   "save_bmp":"保存BMP"
 };

From 1e19299d1f10920295d1fa55f221d64abd41e1b7 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 09:28:29 +0800
Subject: [PATCH 49/78] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E8=AE=BE=E7=BD=AEui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/GridSettings.vue           | 64 +++++++++++++------
 1 file changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index a6fed78..f594b57 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -24,11 +24,29 @@
           <div class="row" style="min-height: 40px;">
             <div class="col-4"></div>
             <div class="col-4 q-pt-sm">
-              <div class="row">
-                <div class="col-4"><span>{{ $t('line color') }}</span></div>
-                <div class="col-8 border" @click="isshowhex = true; index = 0"
-                  :style="{ 'background-color': color[0] }"></div>
-              </div>
+              <q-item>
+              <q-item-section avatar class="head_1">
+                {{ $t("line color") }}
+              </q-item-section>
+              <q-item-section>
+                <q-input
+                  v-model="color[0]"
+                  :rules="['anyColor']"
+                >
+                  <template v-slot:append>
+                    <q-icon name="colorize" class="cursor-pointer" @click="index = 0">
+                      <q-popup-proxy
+                        cover
+                        transition-show="scale"
+                        transition-hide="scale"
+                      >
+                        <q-color v-model="color[0]" @change="submit" />
+                      </q-popup-proxy>
+                    </q-icon>
+                  </template>
+                </q-input>
+              </q-item-section>
+            </q-item>
             </div>
           </div>
         </div>
@@ -36,19 +54,34 @@
           <div class="row" style="min-height: 40px;">
             <div class="col-4"></div>
             <div class="col-4 q-pt-sm">
-              <div class="row">
-                <div class="col-4"><span>{{ $t('background color') }}</span></div>
-                <div class="col-8 border" @click="isshowhex = true; index = 1"
-                  :style="{ 'background-color': color[1] }"></div>
-              </div>
+              <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>
     </div>
-    <div v-if="isshowhex" style="margin: 0 auto;text-align: center;"><q-color no-header-tabs no-footer
-        v-model="color[index]" class="my-picker" /> <q-btn style="margin-top: 0.5rem;" color="white" @click="submit"
-        class=" q-pt-sm" text-color="black" :label="$t('submit')" /></div>
   </div>
 </template>
 
@@ -76,14 +109,11 @@ export default defineComponent({
     let $store = useStore();
     let $t = useI18n();
     const RowsColumns = reactive([false, false, false, false]);
-    const hex = ref("")
-    const isshowhex = ref(false);
     const index = ref(0);
     const color = reactive(["#ffffff", "#CCCCCC", "#000", "#000"]);
     let model = reactive([20, 40]);
     let options = ref([10, 20, 30, 40, 50]);
     const submit = () => {
-      isshowhex.value = false
       switch (index.value) {
         case 0:
           set?.SetBlendingOption("blending_grids_line_color", color[index.value]);
@@ -169,10 +199,8 @@ export default defineComponent({
     return {
       model,
       options,
-      hex,
       submit,
       RowsColumns,
-      isshowhex,
       index,
       color,
       update_row_col,

From fe3d2695a1d844d058abd43185e403b4756b3218 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 09:35:21 +0800
Subject: [PATCH 50/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index e187f58..82aa9a9 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -388,9 +388,6 @@ export default defineComponent({
 
     const saveconfig = () => {
       set?.SaveBlendingConfig(save_cover_name.value);
-      clear();
-      save_cover_name.value = save_name.value = ''
-      $store.commit("setSelectedProjector", "0/0");
     }
 
     const isdebug = computed(() => {

From 86834823b7658a4d3cb3cff70b6d317d0e5400d1 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 09:55:28 +0800
Subject: [PATCH 51/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=97=B6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettingsDialog.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 82aa9a9..ce064f5 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -309,19 +309,19 @@ export default defineComponent({
         if (res == null || res.scenes.length == 0) return
         plan_list.splice(0, plan_list.length);
         for (let index = 0; index < res.scenes.length; index++) {
-          plan_list.push(res.scenes[index]);
+          plan_list[index]=(res.scenes[index]);
         }
       })
     }
 
     onBeforeMount(() => {
-      setTimeout(() => {
-        try {
+      // setTimeout(() => {
+      //   try {
 
-        } catch (error) {
-          erroe();
-        }
-      }, 1000);
+      //   } catch (error) {
+      //     erroe();
+      //   }
+      // }, 1000);
     });
     onMounted(() => {
       setTimeout(() => {
@@ -346,6 +346,7 @@ export default defineComponent({
             $store.commit("setfusion_configuration", res?.config);
 
         });
+        get_scenes()
       }, 1000);
     });
     const save_cover_name = ref("")

From 08c19d630de7b779ca015f16f7774210f231f89c Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 10:37:22 +0800
Subject: [PATCH 52/78] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BF=BB=E8=AF=91=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BD=91=E6=A0=BC=E8=A1=8C=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/FusionLocale.vue | 11 ++++++-----
 src/components/FusionSettings/GridSettings.vue |  4 ++--
 src/i18n/en-US/index.ts                        | 14 +++++++-------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 1fd4470..c845938 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -18,7 +18,7 @@
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
-                        (val > -1 && val < 1080) || $t('Please enter 0-100'),
+                        (val > -1 && val < config.height) || $t('Please enter 0-100'),
                     ]" />
                 </div>
               </div>
@@ -40,7 +40,7 @@
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
-                        (val > -1 && val < 1920) || $t('Please enter 0-100'),
+                        (val > -1 && val < config.width) || $t('Please enter 0-100'),
                     ]" />
                 </div>
               </div>
@@ -58,7 +58,7 @@
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
-                        (val > -1 && val < 1920) || $t('Please enter 0-100'),
+                        (val > -1 && val < config.width) || $t('Please enter 0-100'),
                     ]" />
                 </div>
                 <div class="col-3"><span>{{ $t('Whether to operate synchronously') }}</span><q-checkbox
@@ -82,7 +82,7 @@
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
-                        (val > -1 && val < 1080) || $t('Please enter 0-100'),
+                        (val > -1 && val < config.height) || $t('Please enter 0-100'),
                     ]" />
                 </div>
               </div>
@@ -564,7 +564,8 @@ export default defineComponent({
       set_cache,
       reduce,
       add,
-      auto_sync
+      auto_sync,
+      config
     };
   },
 });
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 0da8ea9..10c71ad 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -166,8 +166,8 @@ export default defineComponent({
     }
     const use_server_config = () => {
       let server_conf = JSON.parse($store.state.fusion_configuration).options
-      model[0] = server_conf.blending_grids_row ? Number(server_conf.blending_grids_row) : 20;
-      model[1] = server_conf.blending_grids_column ? Number(server_conf.blending_grids_column) : 40;
+      model[0] = server_conf.blending_grids_row!=null ? Number(server_conf.blending_grids_row) : 20;
+      model[1] = server_conf.blending_grids_column!=null ? Number(server_conf.blending_grids_column) : 40;
       color[0] = server_conf.blending_grids_line_color
 
       RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 59a8084..b56efd6 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -404,7 +404,7 @@ export default {
   "Please input vaild host. example: 192.168.1.1 or 192.168.1.1:8080":
     "Please Input Vaild Host. Example: 192.168.1.1 or 192.168.1.1:8080",
   "equipment data": "Equipment Data",
-  "fusion settings":"fusion settings",
+  "fusion settings":"Fusion Settings",
   "FusionLocale":"Fusion Locale",
   "FourPointCalibration":"Four Pint Calibration",
   "SurfaceCorrection":"Surface Correction",
@@ -412,7 +412,7 @@ export default {
   "GridSettings":"Grid Settings",
   "point":"dot",
   "reset":"reset",
-  "upper fusion zone parameters":"upper fusion zone parameters",
+  "upper fusion zone parameters":"Upper Fusion Zone Parameters",
   "Left fusion Band Parameters":"Left Fusion Band Parameters",
   "Lower fusion Zone Parameters":"Lower Fusion Zone Parameters",
   "Right fusion Band Parameters":"Right Fusion Band Parameters",
@@ -422,20 +422,20 @@ export default {
   "Set Fusion Band Parameters":"Set Fusion Band Parameters",
   "Projector":"Projector",
   "resetall":"reset all",
-  "save config":"save config",
+  "save config":"Save Config",
   "Whether to enable integration":"Whether to enable integration",
   "Whether to hide the desktop":"Whether to hide the desktop",
   "resetall config":"resetall config",
   "disable blending params":"Dsable blending params",
-  "show blending grids":"show grids",
-  "line color":"line color",
+  "show blending grids":"Show Grids",
+  "line color":"Line Color",
   "center line color":"center line color",
   "center circle color":"center circle color",
   "Whether to operate synchronously":"Whether to operate synchronously",
-  "Select saved configuration":"Select saved configuration",
+  "Select saved configuration":"Select saved Configuration",
   "read saved configuration":"read saved configuration",
   "please choose":"please choose",
-  "save":"save",
+  "save":"Save",
   "Whether to save the configuration":"Whether to save the configuration",
   "New Please enter a name":"New Please enter a name",
   "Please select an override":"Please select an override",

From 13d71b2a6bb897db82b967d01a75e9ee8e6019a1 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 11:12:16 +0800
Subject: [PATCH 53/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=96=8F=E5=AF=86?=
 =?UTF-8?q?=E6=A0=A1=E6=AD=A3=E7=82=B9=E4=B8=8D=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue        | 17 +++++++++++++++++
 src/i18n/en-US/index.ts                         |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 6eaea61..90d89f8 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -261,6 +261,20 @@ export default defineComponent({
     const ste_status = ref(0);
     //为了加载 缓存的配置时 同步点的位置
     const syncpoint = () => {
+      let x = 0
+      let y = 0
+      for (let index = 0; index < 5; index++) {
+        x = default_location[index].x;
+        y = Math.ceil((config.height - value[index].y) / Proportion.value.y);
+        setdianposin(index, x, y);
+      }
+
+      for (let index = 5; index < 10; index++) {
+        x = Math.ceil(value[index].x / Proportion.value.x);
+        y = default_location[5].y;
+        setdianposin(index, x, y);
+      }
+
       for (let index = 0; index < value.length; index++) {
         isactivearray.value[index] = false;
       }
@@ -450,6 +464,7 @@ export default defineComponent({
       }
     };
 
+
     onMounted(() => {
       initialization();
       Proportion.value.x = config.width / (div.value.offsetWidth - 40);
@@ -470,6 +485,8 @@ export default defineComponent({
             Width * (index - 5);
         }
       }
+      use_server_config();
+      syncpoint();
     });
 
     //窗口变动重新渲染
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index b56efd6..4fefa64 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -441,7 +441,7 @@ export default {
   "Please select an override":"Please select an override",
   "confirm delete":"confirm delete",
   "delete or not":"delete or not",
-  "debugging":"debugging",
+  "debugging":"Debugging",
   "disable_blending":"disable blending",
   "disable_clip":"disable clip",
   "show_mask":"hide desktop",

From 17b91ca8eef3393544d828f031e500386659e422 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 13:49:06 +0800
Subject: [PATCH 54/78] =?UTF-8?q?=E5=85=81=E8=AE=B89=E7=82=B9=E6=A0=A1?=
 =?UTF-8?q?=E6=AD=A37-9=E7=82=B9=E4=B8=BA=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/FusionLocale.vue           | 26 +++++++++++++------
 .../FusionSettings/SurfaceCorrection.vue      |  9 ++++---
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index c845938..67fdb46 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -387,7 +387,7 @@ export default defineComponent({
             array[1].isshow,
             Number(array[1].value)
           );
-        if (auto_sync.value) left_right_auto_add(newVal - oldVal);
+        if (auto_sync.value) left_right_auto_add(newVal);
         save_set_cache();
       },
       { deep: true }
@@ -403,7 +403,7 @@ export default defineComponent({
             array[2].isshow,
             Number(array[2].value)
           );
-        if (auto_sync.value) left_right_auto_add(newVal - oldVal);
+        if (auto_sync.value) left_right_auto_add(newVal);
         save_set_cache();
       },
       { deep: true }
@@ -451,7 +451,7 @@ export default defineComponent({
             array[1].isshow,
             Number(array[1].value)
           );
-        if (auto_sync.value) left_right_auto_add(0);
+        if (auto_sync.value) left_right_auto_add(-1);
         save_set_cache();
       },
       { deep: true }
@@ -467,7 +467,7 @@ export default defineComponent({
             array[2].isshow,
             Number(array[2].value)
           );
-        if (auto_sync.value) left_right_auto_add(0);
+        if (auto_sync.value) left_right_auto_add(-1);
         save_set_cache();
       },
       { deep: true }
@@ -527,8 +527,13 @@ export default defineComponent({
           set_cache_tmp = tmp
         }
         if (ste_status.value == 0) {
-          set_cache_tmp[1].value = Number(set_cache_tmp[1].value) + difference
-          set_cache_tmp[1].isshow = array[2].isshow
+          //set_cache_tmp[1].value = Number(set_cache_tmp[1].value) + difference
+
+          if(difference==-1){
+            set_cache_tmp[1].isshow = array[2].isshow
+          }else{
+            set_cache_tmp[1].value = difference
+          }
           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);
         }
@@ -546,8 +551,13 @@ export default defineComponent({
           set_cache_tmp = tmp
         }
         if (ste_status.value == 0) {
-          set_cache_tmp[2].value = Number(set_cache_tmp[2].value) + difference
-          set_cache_tmp[2].isshow = array[1].isshow
+          //set_cache_tmp[2].value = Number(set_cache_tmp[2].value) + difference
+
+          if(difference==-1){
+            set_cache_tmp[2].isshow = array[1].isshow
+          }else{
+            set_cache_tmp[2].value = difference
+          }
           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);
         }
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 7c4a83a..1037a5d 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -339,8 +339,9 @@ export default defineComponent({
       let y = Math.abs(
         Math.ceil((data.top - ninepostion.value[6].y) * Proportion.value.y)
       );
+      if(data.top>ninepostion.value[6].y)y= Math.ceil((ninepostion.value[6].y-data.top ) * Proportion.value.y)
       nine[6].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[6].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      nine[6].y = y > config.height ? config.height : y;
       save_set_cache();
     };
     const moveHandler_8 = (data: any) => {
@@ -350,8 +351,9 @@ export default defineComponent({
       let y = Math.abs(
         Math.ceil((data.top - ninepostion.value[7].y) * Proportion.value.y)
       );
+      if(data.top>ninepostion.value[7].y)y= Math.ceil((ninepostion.value[7].y-data.top ) * Proportion.value.y)
       nine[7].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[7].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      nine[7].y = y > config.height ? config.height : y ;
       save_set_cache();
     };
     const moveHandler_9 = (data: any) => {
@@ -361,8 +363,9 @@ export default defineComponent({
       let y = Math.abs(
         Math.ceil((data.top - ninepostion.value[8].y) * Proportion.value.y)
       );
+      if(data.top>ninepostion.value[8].y)y= Math.ceil((ninepostion.value[8].y-data.top ) * Proportion.value.y)
       nine[8].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[8].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      nine[8].y = y > config.height ? config.height : y ;
       save_set_cache();
     };
 

From b17435d0dd9de7a2634901e90709801b1b3537aa Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 14:00:18 +0800
Subject: [PATCH 55/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B9=9D=E7=82=B9?=
 =?UTF-8?q?=E6=A0=A1=E6=AD=A3=E5=88=86=E8=BE=A8=E7=8E=87=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BB=8E=E6=9C=8D=E5=8A=A1=E7=AB=AF=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/SurfaceCorrection.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 1037a5d..1c558e1 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -515,8 +515,8 @@ export default defineComponent({
       for (let index = 0; index < defaultninepostion.value.length; index++) {
         defaultninepostion.value[index].x = ninepostion.value[index].x;
         defaultninepostion.value[index].y = ninepostion.value[index].y;
-        defaultnine.value[index].x = nine[index].x;
-        defaultnine.value[index].y = nine[index].y;
+        defaultnine.value[index].x =  config.point9[index].def_x;
+        defaultnine.value[index].y =  config.point9[index].def_y;
       }
       if (sessionStorage.SurfaceCorrection) {
         set_cache.value = JSON.parse(sessionStorage.SurfaceCorrection);
@@ -532,8 +532,8 @@ export default defineComponent({
       for (let index = 0; index < defaultninepostion.value.length; index++) {
         // defaultninepostion.value[index].x = ninepostion.value[index].x;
         // defaultninepostion.value[index].y = ninepostion.value[index].y;
-        defaultnine.value[index].x = nine[index].x;
-        defaultnine.value[index].y = nine[index].y;
+        defaultnine.value[index].x =  config.point9[index].def_x;
+        defaultnine.value[index].y =  config.point9[index].def_y;
         nine[index].x = config.point9[index].x;
         nine[index].y = config.point9[index].y;
       }

From fed77c3e81273bbabf557a9323d4e583294abefe Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 17:21:36 +0800
Subject: [PATCH 56/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=87=E6=8D=A2=E6=97=B6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/Debugging.vue   |  1 +
 .../FusionSettings/DebuggingItem.vue          | 35 ++++++++++
 src/components/FusionSettingsDialog.vue       | 68 ++++++++++---------
 src/i18n/en-US/index.ts                       |  3 +-
 src/i18n/zh-CN/index.ts                       |  3 +-
 5 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/src/components/FusionSettings/Debugging.vue b/src/components/FusionSettings/Debugging.vue
index ad7014d..b1a0d7f 100644
--- a/src/components/FusionSettings/Debugging.vue
+++ b/src/components/FusionSettings/Debugging.vue
@@ -50,6 +50,7 @@ export default defineComponent({
     DebuggingItem,
   },
   setup() {
+
     let set = GlobalData.getInstance().getCurrentClient();
     let $store = useStore();
     let $t = useI18n();
diff --git a/src/components/FusionSettings/DebuggingItem.vue b/src/components/FusionSettings/DebuggingItem.vue
index 7b65ed5..1e4bdd1 100644
--- a/src/components/FusionSettings/DebuggingItem.vue
+++ b/src/components/FusionSettings/DebuggingItem.vue
@@ -51,7 +51,42 @@ export default defineComponent({
     val.value=props.value=="1"?true:false
     const send = () => {
       set?.SetBlendingOption(props.name, val.value ? "1" : "0");
+
     }
+    const use_sessionStorage=()=>{
+      if(sessionStorage.Debugging){
+        let tmp=JSON.parse(sessionStorage.Debugging);
+        for (let index = 0;index < tmp.length; index++) {
+          if(Object.keys(tmp[index])[0]==props.name){
+            val.value=Object.values(tmp[index])[0]=="1"?true:false
+            break
+          }
+        }
+      }
+    }
+    onMounted(()=>{
+      use_sessionStorage()
+    })
+    onBeforeUnmount(() => {
+        let key=props.name
+        let value=val.value
+      if(sessionStorage.Debugging){
+        let tmp=JSON.parse(sessionStorage.Debugging);
+        let count=0;
+        for (let index = 0;index < tmp.length; index++) {
+          if(Object.keys(tmp[index])[0]==key){
+            tmp[index]={[key]:value}
+            break
+          }
+          count=index
+        }
+        if(count==tmp.length-1)tmp.push({[key]:value});
+        sessionStorage.Debugging = JSON.stringify(tmp);
+      }else{
+        sessionStorage.Debugging = JSON.stringify([{[key]:value}]);
+      }
+
+    });
     return {
       send,
       val,
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index ce064f5..796596b 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -237,8 +237,31 @@ export default defineComponent({
       set?.SetBlendingOption(show_blending_grids_id.value, show_blending_grids.value ? "1" : "0");
     };
     const resetall = () => {
-      set?.ResetBlendingConfig()
+      set?.ResetBlendingConfig().then((res) => {
+        let tmp = JSON.parse(res ? res.config : "");
+        EnableBlending.value = tmp.enable;
+        $store.commit("setEnablefusion", tmp.enable);
+        config.value.col = tmp.col;
+        config.value.row = tmp.row;
+        $store.commit("setfusion_configuration", res?.config);
+      });
+      let tmp = options.value
+      options.value = ""
+      $store.commit("setSelectedProjector", "0/0");
+      setTimeout(() => {
+        clear_sessionStorage()
+        options.value = tmp
+      }, 300);
     }
+    const clear_sessionStorage=()=>{
+        sessionStorage.removeItem("FusionLocale");
+        sessionStorage.removeItem("SurfaceCorrection");
+        sessionStorage.removeItem("DensityCorrection");
+        sessionStorage.removeItem("FourPointCalibration");
+        sessionStorage.removeItem("GridSettings");
+        sessionStorage.removeItem("Debugging");
+    }
+
     const config = ref({ col: 0, row: 0 });
     const EnableBlending = ref(false);
     let optionsstr = ref();
@@ -265,15 +288,6 @@ export default defineComponent({
       { deep: true }
     );
 
-    const erroe = () => {
-      $q.notify({
-        color: "negative",
-        icon: "warning",
-        message: "数据获取失败!",
-        position: "top",
-        timeout: 1500,
-      });
-    };
     const save = () => {
       medium.value = true
       //读取场景
@@ -294,11 +308,7 @@ export default defineComponent({
       send_show_blending_grids();
       $store.commit("setSelectedProjector", "0/0");
       setTimeout(() => {
-        sessionStorage.removeItem("FusionLocale");
-        sessionStorage.removeItem("SurfaceCorrection");
-        sessionStorage.removeItem("DensityCorrection");
-        sessionStorage.removeItem("FourPointCalibration");
-        sessionStorage.removeItem("GridSettings");
+        clear_sessionStorage()
       }, 500);
       options.value="FusionLocale"
     };
@@ -314,15 +324,6 @@ export default defineComponent({
       })
     }
 
-    onBeforeMount(() => {
-      // setTimeout(() => {
-      //   try {
-
-      //   } catch (error) {
-      //     erroe();
-      //   }
-      // }, 1000);
-    });
     onMounted(() => {
       setTimeout(() => {
         set?.GetBlendingConfig("").then((res) => {
@@ -355,7 +356,7 @@ export default defineComponent({
     ]
     const apply_the_selected_configuration = () => {
       set?.ApplyBlendingScene(select_configuration_name.value).then((res) => {
-        let tmp = JSON.parse(res ? res.config : "");
+        let tmp = JSON.parse(res ? res.config : "{}");
         EnableBlending.value = tmp.enable;
         $store.commit("setEnablefusion", tmp.enable);
         config.value.col = tmp.col;
@@ -367,13 +368,10 @@ export default defineComponent({
       options.value = ""
       $store.commit("setSelectedProjector", "0/0");
       setTimeout(() => {
-        sessionStorage.removeItem("FusionLocale");
-        sessionStorage.removeItem("SurfaceCorrection");
-        sessionStorage.removeItem("DensityCorrection");
-        sessionStorage.removeItem("FourPointCalibration");
-        sessionStorage.removeItem("GridSettings");
+        clear_sessionStorage()
         options.value = tmp
       }, 800);
+      getconfig()
     }
     const plan_list_op = ref(plan_list)
     const filterFn = (val: any, update: any, abort: any) => {
@@ -392,9 +390,13 @@ export default defineComponent({
     }
 
     const isdebug = computed(() => {
-      let tmp = JSON.parse($store.state.fusion_configuration)
-      let str = 'debug@show_mask'
-      return tmp.options[str] == '1' || record_times.value > 2
+      try {
+        let tmp = JSON.parse($store.state.fusion_configuration)
+        return record_times.value > 2
+      } catch (error) {
+
+      }
+
     })
     const name_to_be_deleted=ref("");
     const del_scenes=(name:string)=>{
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 4fefa64..e9ff0cc 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -445,5 +445,6 @@ export default {
   "disable_blending":"disable blending",
   "disable_clip":"disable clip",
   "show_mask":"hide desktop",
-  "save_bmp":"save bmp"
+  "save_bmp":"save bmp",
+  "disable_blending_params":"disable blending params"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 49d81a1..eda3390 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -714,5 +714,6 @@ export default {
   "disable_blending":"禁用混合",
   "disable_clip":"禁用裁剪",
   "show_mask":"隐藏桌面",
-  "save_bmp":"保存BMP"
+  "save_bmp":"保存BMP",
+  "disable_blending_params":"禁用融合参数"
 };

From a9f61b1651338095a6e4115fa2c0cc7e5c5104cd Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 19:01:51 +0800
Subject: [PATCH 57/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=9C=A8=E7=95=8C=E9=9D=A2=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=90=8E=E5=86=8D=E6=AC=A1=E6=89=93=E5=BC=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/FusionLocale.vue | 8 +++++++-
 src/components/FusionSettingsDialog.vue        | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 67fdb46..b310983 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -141,6 +141,7 @@ import {
   withDefaults,
   onBeforeUnmount,
   reactive,
+onMounted,
 } from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
@@ -190,6 +191,7 @@ export default defineComponent({
         default:
           break;
       }
+      chang(type)
       save_set_cache()
     }
     const reduce = (type: string) => {
@@ -208,6 +210,8 @@ export default defineComponent({
         default:
           break;
       }
+      chang(type)
+      save_set_cache()
     }
     const ste_status = ref(0);
     const use_set_cache = () => {
@@ -355,7 +359,9 @@ export default defineComponent({
         array[arr[index]].value = Number(config.params[index].size);
       }
     };
-    startconfig();
+    onMounted(() => {
+      startconfig();
+    }),
     onBeforeUnmount(() => {
       sessionStorage.FusionLocale = JSON.stringify(set_cache.value);
     });
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 796596b..cf4bfe3 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -310,6 +310,7 @@ export default defineComponent({
       setTimeout(() => {
         clear_sessionStorage()
       }, 500);
+      getconfig()
       options.value="FusionLocale"
     };
 

From 93c3a89a6dc2b909a5ddadfdf6eb0f5ff4a2f686 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 20:05:10 +0800
Subject: [PATCH 58/78] =?UTF-8?q?=E5=8A=A0=E5=85=A5=20=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=8A=95=E5=BD=B1=E6=9C=BA=20=E9=80=89=E6=8B=A9=E8=B0=83?=
 =?UTF-8?q?=E8=8A=82=E9=A1=B5=E9=9D=A2=20=E9=80=89=E6=8B=A9=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      |  29 +++--
 .../FusionSettings/FourPointCalibration.vue   |   1 +
 .../FusionSettings/FusionLocale.vue           |  33 +++--
 .../FusionSettings/GridSettings.vue           |   2 +-
 .../FusionSettings/SurfaceCorrection.vue      |   1 +
 src/components/FusionSettingsDialog.vue       | 117 +++++++++++-------
 6 files changed, 114 insertions(+), 69 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 90d89f8..295648c 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -5,43 +5,43 @@
       <div ref="div" style="width: 100%; background-color: #646464; height: 100%">
         <div style="position: absolute">
           <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="30" :x="point_postion[0].x"
-            :y="point_postion[0].y" @mousedown="isactivearray[0] = true" :isResizable="false"
+            :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>
           </vue3ResizeDrag>
           <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="30" :x="point_postion[1].x"
-            :y="point_postion[1].y" @mousedown="isactivearray[1] = true" :isResizable="false"
+            :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>
           </vue3ResizeDrag>
           <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="30" :x="point_postion[2].x"
-            :y="point_postion[2].y" @mousedown="isactivearray[2] = true" :isResizable="false"
+            :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>
           </vue3ResizeDrag>
           <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="30" :x="point_postion[3].x"
-            :y="point_postion[3].y" @mousedown="isactivearray[3] = true" :isResizable="false"
+            :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>
           </vue3ResizeDrag>
           <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="30" :x="point_postion[4].x"
-            :y="point_postion[4].y" @mousedown="isactivearray[4] = true" :isResizable="false"
+            :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>
           </vue3ResizeDrag>
           <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="40" :h="20" :x="point_postion[5].x"
-            :y="point_postion[5].y" @mousedown="isactivearray[5] = true" :isResizable="false"
+            :y="point_postion[5].y" @mousedown="activeMouseDown(5)" :isResizable="false"
             @moveHandler="moveHandler($event, 5)"><span class="hcolro">←H1→</span>
           </vue3ResizeDrag>
           <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="40" :h="20" :x="point_postion[6].x"
-            :y="point_postion[6].y" @mousedown="isactivearray[6] = true" :isResizable="false"
+            :y="point_postion[6].y" @mousedown="activeMouseDown(6)" :isResizable="false"
             @moveHandler="moveHandler($event, 6)"><span class="hcolro">←H2→</span>
           </vue3ResizeDrag>
           <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="40" :h="20" :x="point_postion[7].x"
-            :y="point_postion[7].y" @mousedown="isactivearray[7] = true" :isResizable="false"
+            :y="point_postion[7].y" @mousedown="activeMouseDown(7)" :isResizable="false"
             @moveHandler="moveHandler($event, 7)"><span class="hcolro">←H3→</span>
           </vue3ResizeDrag>
           <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="40" :h="20" :x="point_postion[8].x"
-            :y="point_postion[8].y" @mousedown="isactivearray[8] = true" :isResizable="false"
+            :y="point_postion[8].y" @mousedown="activeMouseDown(8)" :isResizable="false"
             @moveHandler="moveHandler($event, 8)"><span class="hcolro">←H4→</span>
           </vue3ResizeDrag>
           <vue3ResizeDrag :isActive="isactivearray[9]" v-if="isshowarray[9]" :w="40" :h="20" :x="point_postion[9].x"
-            :y="point_postion[9].y" @mousedown="isactivearray[9] = true" :isResizable="false"
+            :y="point_postion[9].y" @mousedown="activeMouseDown(9)" :isResizable="false"
             @moveHandler="moveHandler($event, 9)"><span class="hcolro">←H5→</span>
           </vue3ResizeDrag>
         </div>
@@ -693,8 +693,17 @@ export default defineComponent({
       }
       save_set_cache();
     };
+    const activeMouseDown = (index: number) => {
+      isactivearray.value[index] = true;
+      if(index>=5){
+        set?.SetBlendingOption("blending_grids_select_point",`density_h:${index-4}`)
+      }else{
+        set?.SetBlendingOption("blending_grids_select_point",`density_v:${index+1}`)
+      }
+    };
     initialization();
     return {
+      activeMouseDown,
       model,
       options,
       value,
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 8e79fb7..660a574 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -307,6 +307,7 @@ export default defineComponent({
     });
     const activeMouseDown = (index: number) => {
       isactivearray.value[index] = true;
+      set?.SetBlendingOption("blending_grids_select_point",`4:${index+1}`)
     };
     const mouseUpHandler = (index: number) => {
       isactivearray.value[index] = false;
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index b310983..4f8d7ce 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -18,7 +18,7 @@
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
-                        (val > -1 && val < config.height) || $t('Please enter 0-100'),
+                        (val >= 0 && val < config.height) || $t('Please enter 0-100'),
                     ]" />
                 </div>
               </div>
@@ -40,7 +40,7 @@
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
-                        (val > -1 && val < config.width) || $t('Please enter 0-100'),
+                        (val >= 0 && val < config.width) || $t('Please enter 0-100'),
                     ]" />
                 </div>
               </div>
@@ -58,7 +58,7 @@
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
-                        (val > -1 && val < config.width) || $t('Please enter 0-100'),
+                        (val >= 0 && val < config.width) || $t('Please enter 0-100'),
                     ]" />
                 </div>
                 <div class="col-3"><span>{{ $t('Whether to operate synchronously') }}</span><q-checkbox
@@ -82,7 +82,7 @@
                         (val !== null && val !== '') ||
                         $t('Please enter a number'),
                       (val) =>
-                        (val > -1 && val < config.height) || $t('Please enter 0-100'),
+                        (val >= 0 && val < config.height) || $t('Please enter 0-100'),
                     ]" />
                 </div>
               </div>
@@ -95,26 +95,26 @@
       <p class="text-center" style="margin: 0 0 8;">{{ $t("Set Fusion Band Parameters") }}</p>
       <div style="display: flex; justify-content: space-evenly">
         <div>
-          <div><q-btn size="sm"  color="white" @click="add('alpha')" text-color="black" label="↑" /></div>
-          <q-slider style="height: 10rem;"  v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
+          <div class="btn_bottom"><q-btn size="sm"  color="white" @click="add('alpha')" text-color="black" label="↑" /></div>
+          <q-slider track-size="'10vh'"  v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
             vertical reverse label-always />
-          <div><q-btn size="sm"  color="white" @click="reduce('alpha')" text-color="black" label="↓" /></div>
+          <div  class="btn_top"><q-btn size="sm"  color="white" @click="reduce('alpha')" text-color="black" label="↓" /></div>
           <p class="text-center">alpha</p>
         </div>
 
         <div>
-          <div><q-btn size="sm"  color="white" @click="add('p')" text-color="black" label="↑" /></div>
-          <q-slider style="height: 10rem;" v-model="array[group].p" :min="0" @change="chang('p')" :max="16" :step="0.01" color="green"
+          <div class="btn_bottom"><q-btn size="sm"  color="white" @click="add('p')" text-color="black" label="↑" /></div>
+          <q-slider track-size="'10vh'" v-model="array[group].p" :min="0" @change="chang('p')" :max="16" :step="0.01" color="green"
             vertical reverse label-always />
-          <div><q-btn size="sm"  color="white" @click="reduce('p')" text-color="black" label="↓" /></div>
+          <div  class="btn_top"><q-btn size="sm"  color="white" @click="reduce('p')" text-color="black" label="↓" /></div>
           <p class="text-center">p</p>
         </div>
 
         <div>
-          <div><q-btn size="sm"  color="white" @click="add('gamma')" text-color="black" label="↑" /></div>
-          <q-slider style="height: 10rem;" v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green"
+          <div class="btn_bottom"><q-btn size="sm"  color="white" @click="add('gamma')" text-color="black" label="↑" /></div>
+          <q-slider track-size="'10vh'" v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green"
             vertical reverse label-always />
-          <div><q-btn size="sm"  color="white" @click="reduce('gamma')" text-color="black" label="↓" /></div>
+          <div class="btn_top"><q-btn size="sm"  color="white" @click="reduce('gamma')" text-color="black" label="↓" /></div>
           <p class="text-center">gamma</p>
         </div>
       </div>
@@ -129,6 +129,13 @@
 .boder {
   border: 2px solid #0000;
 }
+.btn_bottom{
+  margin-bottom: 0.5rem;
+}
+.btn_top{
+  margin-top: 0.3rem;
+}
+
 </style>
 
 <script lang="ts">
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 10c71ad..1830bc4 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -169,7 +169,7 @@ export default defineComponent({
       model[0] = server_conf.blending_grids_row!=null ? Number(server_conf.blending_grids_row) : 20;
       model[1] = server_conf.blending_grids_column!=null ? Number(server_conf.blending_grids_column) : 40;
       color[0] = server_conf.blending_grids_line_color
-
+      color[1] = server_conf.blending_grids_background_color
       RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true
       RowsColumns[1] = server_conf.blending_grids_show_column === "false" ? false : true
 
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 1c558e1..2bfa2e0 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -211,6 +211,7 @@ export default defineComponent({
     ]);
     const activeMouseDown = (index: number) => {
       isactivearray.value[index] = true;
+      set?.SetBlendingOption("blending_grids_select_point",`9:${index+1}`)
     };
     //用于计算当前投影仪的索引
     let serverconfig = JSON.parse($store.state.fusion_configuration);
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index cf4bfe3..a98329b 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -36,7 +36,8 @@
               <div v-for="(item, index_row) in config.row">
                 <projector-item v-for="(item, index_col) in config.col" class="w-100" :llabel="
                   $t('Projector') + (index_row * config.col + index_col + 1)
-                " :lvalue="index_row + '/' + index_col"></projector-item>
+                " :lvalue="index_row + '/' + index_col"
+                  @click="currently_selected_projector(index_row + '-' + index_col)"></projector-item>
               </div>
 
               <div class="col-12" style="text-align: center">
@@ -64,10 +65,9 @@
                     },
                     { label: $t('GridSettings'), value: 'GridSettings' },
                   ]" />
-                <q-btn-toggle   v-show="isdebug" no-caps v-model="options" toggle-color="primary"
-                  :options="[
-                    { label: $t('debugging'), value: 'Debugging' }
-                  ]" />
+                <q-btn-toggle v-show="isdebug" no-caps v-model="options" toggle-color="primary" :options="[
+                  { label: $t('debugging'), value: 'Debugging' }
+                ]" />
               </div>
               <div style="min-height: 72vh">
                 <component :is="options" />
@@ -86,11 +86,11 @@
           <q-checkbox style="justify-content: flex-start" v-model="show_blending_grids"
             @click="send_show_blending_grids" />
           <div class="q-space" data-v-39efcd1f=""></div>
-          <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')" />
           <div class="q-space" data-v-39efcd1f=""></div>
           <q-btn flat :label="$t('Select saved configuration')" no-caps color="primary"
-            @click="select_configuration = true;get_scenes()" />
+            @click="select_configuration = true; get_scenes()" />
           <q-btn flat :label="$t('Cancel')" no-caps color="primary" v-close-popup
             @click="$store.commit('setSelectedProjector', '0/0');" />
           <q-btn flat :label="$t('save config')" no-caps color="primary" @click="save" />
@@ -107,15 +107,15 @@
           <q-select filled :model-value="save_cover_name" use-input hide-selected fill-input input-debounce="0"
             :options="plan_list_op" @filter="filterFn" @input-value="setModel">
             <template v-slot:option="{ itemProps, opt, selected, toggleOption }">
-          <q-item v-bind="itemProps">
-            <q-item-section>
-              <q-item-label v-html="opt" />
-            </q-item-section>
-            <q-item-section side>
-              <q-icon name="clear" @click="del_scenes(opt)"></q-icon>
-            </q-item-section>
-          </q-item>
-        </template>
+              <q-item v-bind="itemProps">
+                <q-item-section>
+                  <q-item-label v-html="opt" />
+                </q-item-section>
+                <q-item-section side>
+                  <q-icon name="clear" @click="del_scenes(opt)"></q-icon>
+                </q-item-section>
+              </q-item>
+            </template>
           </q-select>
         </q-card-section>
         <q-card-actions align="right" class="bg-white text-teal">
@@ -132,17 +132,17 @@
           <div class="text-h6">{{ $t('read saved configuration') }}</div>
         </q-card-section>
         <q-card-section class="q-pt-none">
-          <q-select filled v-model="select_configuration_name" :options="plan_list" :label="$t('please choose')" >
+          <q-select filled v-model="select_configuration_name" :options="plan_list" :label="$t('please choose')">
             <template v-slot:option="{ itemProps, opt, selected, toggleOption }">
-          <q-item v-bind="itemProps">
-            <q-item-section>
-              <q-item-label v-html="opt" />
-            </q-item-section>
-            <q-item-section side>
-              <q-icon name="clear" @click="del_scenes(opt)"></q-icon>
-            </q-item-section>
-          </q-item>
-        </template>
+              <q-item v-bind="itemProps">
+                <q-item-section>
+                  <q-item-label v-html="opt" />
+                </q-item-section>
+                <q-item-section side>
+                  <q-icon name="clear" @click="del_scenes(opt)"></q-icon>
+                </q-item-section>
+              </q-item>
+            </template>
           </q-select>
         </q-card-section>
         <q-card-actions align="right" class="bg-white text-teal">
@@ -253,13 +253,13 @@ export default defineComponent({
         options.value = tmp
       }, 300);
     }
-    const clear_sessionStorage=()=>{
-        sessionStorage.removeItem("FusionLocale");
-        sessionStorage.removeItem("SurfaceCorrection");
-        sessionStorage.removeItem("DensityCorrection");
-        sessionStorage.removeItem("FourPointCalibration");
-        sessionStorage.removeItem("GridSettings");
-        sessionStorage.removeItem("Debugging");
+    const clear_sessionStorage = () => {
+      sessionStorage.removeItem("FusionLocale");
+      sessionStorage.removeItem("SurfaceCorrection");
+      sessionStorage.removeItem("DensityCorrection");
+      sessionStorage.removeItem("FourPointCalibration");
+      sessionStorage.removeItem("GridSettings");
+      sessionStorage.removeItem("Debugging");
     }
 
     const config = ref({ col: 0, row: 0 });
@@ -288,6 +288,28 @@ export default defineComponent({
       { deep: true }
     );
 
+    watch(() => optionsstr,
+      (newVal) => {
+        let tmp = ""
+        switch (newVal.value) {
+          case 'FusionLocale':
+            tmp = '0'
+            break;
+          case 'FourPointCalibration':
+            tmp = '4'
+            break;
+          case 'SurfaceCorrection':
+            tmp = '9'
+            break;
+          case 'DensityCorrection':
+            tmp = 'density'
+            break;
+          default:
+            break;
+        }
+        set?.SetBlendingOption("blending_grids_select_ui", tmp)
+      },
+      { deep: true })
     const save = () => {
       medium.value = true
       //读取场景
@@ -311,7 +333,7 @@ export default defineComponent({
         clear_sessionStorage()
       }, 500);
       getconfig()
-      options.value="FusionLocale"
+      options.value = "FusionLocale"
     };
 
 
@@ -320,7 +342,7 @@ export default defineComponent({
         if (res == null || res.scenes.length == 0) return
         plan_list.splice(0, plan_list.length);
         for (let index = 0; index < res.scenes.length; index++) {
-          plan_list[index]=(res.scenes[index]);
+          plan_list[index] = (res.scenes[index]);
         }
       })
     }
@@ -341,14 +363,15 @@ export default defineComponent({
               local_opt[1].value = ("0" == opt || "false" == opt.toLowerCase() ? false : true);
             }
           }
-            EnableBlending.value = tmp.enable;
-            $store.commit("setEnablefusion", tmp.enable);
-            config.value.col = tmp.col;
-            config.value.row = tmp.row;
-            $store.commit("setfusion_configuration", res?.config);
+          EnableBlending.value = tmp.enable;
+          $store.commit("setEnablefusion", tmp.enable);
+          config.value.col = tmp.col;
+          config.value.row = tmp.row;
+          $store.commit("setfusion_configuration", res?.config);
 
         });
         get_scenes()
+        set?.SetBlendingOption("blending_grids_select_ui", '0')
       }, 1000);
     });
     const save_cover_name = ref("")
@@ -399,16 +422,20 @@ export default defineComponent({
       }
 
     })
-    const name_to_be_deleted=ref("");
-    const del_scenes=(name:string)=>{
-      del_dialog.value=true;
-      name_to_be_deleted.value=name;
+    const name_to_be_deleted = ref("");
+    const del_scenes = (name: string) => {
+      del_dialog.value = true;
+      name_to_be_deleted.value = name;
     }
-    const dialog_del_scenes=()=>{
+    const dialog_del_scenes = () => {
       set?.DeleteBlendingScene(name_to_be_deleted.value);
       plan_list.splice(plan_list.findIndex(item => item === name_to_be_deleted.value), 1)
     }
+    const currently_selected_projector = (value: string) => {
+      set?.SetBlendingOption('blending_grids_select_projector', value);
+    }
     return {
+      currently_selected_projector,
       name_to_be_deleted,
       dialog_del_scenes,
       get_scenes,

From 7141313c8c8398b99f1ef77495a2ded32a6a3968 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Mon, 6 Feb 2023 10:49:55 +0800
Subject: [PATCH 59/78] =?UTF-8?q?=E4=BC=98=E5=8C=96ui=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 41 ++++++++++-------
 .../FusionSettings/FourPointCalibration.vue   | 23 +++++++---
 .../FusionSettings/FusionLocale.vue           | 45 ++++++++++++++-----
 .../FusionSettings/SurfaceCorrection.vue      | 29 +++++++-----
 src/i18n/en-US/index.ts                       |  3 +-
 src/i18n/zh-CN/index.ts                       |  3 +-
 6 files changed, 100 insertions(+), 44 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 295648c..1328b76 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -4,43 +4,43 @@
     <div class="col-8 q-pt-md">
       <div ref="div" style="width: 100%; background-color: #646464; height: 100%">
         <div style="position: absolute">
-          <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="30" :h="30" :x="point_postion[0].x"
+          <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>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="30" :h="30" :x="point_postion[1].x"
+          <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>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="30" :h="30" :x="point_postion[2].x"
+          <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>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="30" :h="30" :x="point_postion[3].x"
+          <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>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="30" :h="30" :x="point_postion[4].x"
+          <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>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="40" :h="20" :x="point_postion[5].x"
+          <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>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="40" :h="20" :x="point_postion[6].x"
+          <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>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="40" :h="20" :x="point_postion[7].x"
+          <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>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="40" :h="20" :x="point_postion[8].x"
+          <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>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[9]" v-if="isshowarray[9]" :w="40" :h="20" :x="point_postion[9].x"
+          <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>
           </vue3ResizeDrag>
@@ -168,6 +168,9 @@
   padding: 0;
   line-height: 8px;
 }
+.action{
+  background-color: aqua;
+}
 </style>
 <script lang="ts">
 import {
@@ -193,6 +196,7 @@ export default defineComponent({
   setup() {
     let $store = useStore();
     let $t = useI18n();
+    const now_index = ref(0);
     const value = reactive([
       { x: 0, y: 0, number: 0 },
       { x: 0, y: 0, number: 0 },
@@ -303,6 +307,9 @@ export default defineComponent({
     onBeforeUnmount(() => {
       sessionStorage.DensityCorrection = JSON.stringify(set_cache.value);
     });
+    watch(()=>now_index,(newval,oldval)=>{
+      now_index.value>5?set?.SetBlendingOption("blending_grids_select_point",`density_h:${now_index.value-4}`):set?.SetBlendingOption("blending_grids_select_point",`density_v:${now_index.value+1}`)
+    },{ deep: true })
     watch(
       () => configselsect,
       (newVal, oldVal) => {
@@ -527,6 +534,7 @@ export default defineComponent({
       setTimeout(() => {
         isshowarray.value[index] = true;
       }, 100);
+      now_index.value=index
     };
     watch(
       () => value[0],
@@ -537,6 +545,7 @@ export default defineComponent({
           let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
           setdianposin(0, x, y);
         }
+        now_index.value=0
         save_set_cache();
       },
       { deep: true }
@@ -695,14 +704,16 @@ export default defineComponent({
     };
     const activeMouseDown = (index: number) => {
       isactivearray.value[index] = true;
-      if(index>=5){
-        set?.SetBlendingOption("blending_grids_select_point",`density_h:${index-4}`)
-      }else{
-        set?.SetBlendingOption("blending_grids_select_point",`density_v:${index+1}`)
-      }
+      // if(index>=5){
+      //   set?.SetBlendingOption("blending_grids_select_point",`density_h:${index-4}`)
+      // }else{
+      //   set?.SetBlendingOption("blending_grids_select_point",`density_v:${index+1}`)
+      // }
+      now_index.value=index
     };
     initialization();
     return {
+      now_index,
       activeMouseDown,
       model,
       options,
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 660a574..d1c2334 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -65,7 +65,7 @@
     <div class="col-8">
       <div ref="div" style="background-color: #646464; height: 40vh">
         <div style="position: absolute">
-          <vue3ResizeDrag
+          <vue3ResizeDrag style="border: 0;" :class="[now_index==0?'action':'']"
             v-if="isshowarray[0]"
             :isActive="isactivearray[0]"
             @mousedown="activeMouseDown(0)"
@@ -78,7 +78,7 @@
             @moveHandler="moveHandler_1"
             ><div class="point">1</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
+          <vue3ResizeDrag style="border: 0;"  :class="[now_index==1?'action':'']"
             v-if="isshowarray[1]"
             :isActive="isactivearray[1]"
             @mousedown="activeMouseDown(1)"
@@ -91,7 +91,7 @@
             @moveHandler="moveHandler_2"
             ><div class="point">2</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
+          <vue3ResizeDrag style="border: 0;"  :class="[now_index==2?'action':'']"
             v-if="isshowarray[2]"
             :isActive="isactivearray[2]"
             @mousedown="activeMouseDown(2)"
@@ -104,7 +104,7 @@
             @moveHandler="moveHandler_3"
             ><div class="point">3</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag
+          <vue3ResizeDrag style="border: 0;"  :class="[now_index==3?'action':'']"
             v-if="isshowarray[3]"
             :isActive="isactivearray[3]"
             @mousedown="activeMouseDown(3)"
@@ -196,6 +196,9 @@
 .point{
   width: 100%;height: 100%;border-radius: 50%;background: #0000ff;color: aliceblue;
 }
+.action{
+  background-color: aqua;
+}
 </style>
 <script lang="ts">
 import vue3ResizeDrag from "src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
@@ -271,6 +274,7 @@ export default defineComponent({
       { x: 0, y: 0 },
       { x: 0, y: 0 },
     ]); //点的位置
+    const now_index=ref(0)
     const isshowarray = ref([true, true, true, true]);
     const isactivearray = ref([true, true, true, true]);
     const ste_status = ref(0);
@@ -307,7 +311,7 @@ export default defineComponent({
     });
     const activeMouseDown = (index: number) => {
       isactivearray.value[index] = true;
-      set?.SetBlendingOption("blending_grids_select_point",`4:${index+1}`)
+      now_index.value=index
     };
     const mouseUpHandler = (index: number) => {
       isactivearray.value[index] = false;
@@ -404,6 +408,7 @@ export default defineComponent({
             isshowarray.value[0] = true;
           }, 100);
         }
+        now_index.value=0
         save_set_cache();
       },
       { deep: true }
@@ -431,6 +436,7 @@ export default defineComponent({
             isshowarray.value[1] = true;
           }, 100);
         }
+        now_index.value=1
         save_set_cache();
       },
       { deep: true }
@@ -460,6 +466,7 @@ export default defineComponent({
             isshowarray.value[2] = true;
           }, 100);
         }
+        now_index.value=2
         save_set_cache();
       },
       { deep: true }
@@ -489,6 +496,7 @@ export default defineComponent({
             isshowarray.value[3] = true;
           }, 100);
         }
+        now_index.value=3
         save_set_cache();
       },
       { deep: true }
@@ -519,7 +527,9 @@ export default defineComponent({
       },
       { deep: true }
     );
-
+    watch(()=>now_index,(newval,oldval)=>{
+      set?.SetBlendingOption("blending_grids_select_point",`4:${now_index.value+1}`)
+    },{ deep: true })
     //为了加载 缓存的配置时 同步点的位置
     const syncpoint = () => {
       for (let index = 0; index < fourpostion.value.length; index++) {
@@ -647,6 +657,7 @@ export default defineComponent({
       };
     });
     return {
+      now_index,
       div,
       fourpostion,
       reset,
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 4f8d7ce..9ebd166 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -91,30 +91,53 @@
         </div>
       </div>
     </div>
-    <div class="col-4 offset-4" v-if="group != 4">
+    <div class="col-12" v-if="group != 4">
       <p class="text-center" style="margin: 0 0 8;">{{ $t("Set Fusion Band Parameters") }}</p>
       <div style="display: flex; justify-content: space-evenly">
         <div>
-          <div class="btn_bottom"><q-btn size="sm"  color="white" @click="add('alpha')" text-color="black" label="↑" /></div>
-          <q-slider track-size="'10vh'"  v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
+          <!-- <div class="btn_bottom"><q-btn size="sm"  color="white" @click="add('alpha')" text-color="black" label="↑" /></div> -->
+          <q-slider v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
             vertical reverse label-always />
-          <div  class="btn_top"><q-btn size="sm"  color="white" @click="reduce('alpha')" text-color="black" label="↓" /></div>
+          <!-- <div  class="btn_top"><q-btn size="sm"  color="white" @click="reduce('alpha')" text-color="black" label="↓" /></div> -->
+          <div> <q-input dense filled type="number"  step="0.1" v-model="array[group].alpha" label="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'),
+              ]" /></div>
           <p class="text-center">alpha</p>
         </div>
 
         <div>
-          <div class="btn_bottom"><q-btn size="sm"  color="white" @click="add('p')" text-color="black" label="↑" /></div>
-          <q-slider track-size="'10vh'" v-model="array[group].p" :min="0" @change="chang('p')" :max="16" :step="0.01" color="green"
+          <!-- <div class="btn_bottom"><q-btn size="sm"  color="white" @click="add('p')" text-color="black" label="↑" /></div> -->
+          <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  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"
+              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'),
+              ]" /></div>
           <p class="text-center">p</p>
         </div>
 
         <div>
-          <div class="btn_bottom"><q-btn size="sm"  color="white" @click="add('gamma')" text-color="black" label="↑" /></div>
-          <q-slider track-size="'10vh'" v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green"
-            vertical reverse label-always />
-          <div class="btn_top"><q-btn size="sm"  color="white" @click="reduce('gamma')" text-color="black" label="↓" /></div>
+          <!-- <div class="btn_bottom"><q-btn size="sm"  color="white" @click="add('gamma')" text-color="black" label="↑" /></div> -->
+          <q-slider  v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green" vertical reverse label-always />
+          <!-- <div class="btn_top"><q-btn size="sm"  color="white" @click="reduce('gamma')" text-color="black" label="↓" /></div> -->
+          <div> <q-input dense filled type="number"  step="0.1" v-model="array[group].gamma" label="gamma"
+              lazy-rules :rules="[
+                (val) =>
+                  (val !== null && val !== '') ||
+                  $t('Please enter a number'),
+                (val) =>
+                  (val >= 0 && val <= 16) || $t('Please enter 0-100'),
+              ]" /></div>
           <p class="text-center">gamma</p>
         </div>
       </div>
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 2bfa2e0..cb5346a 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -59,39 +59,39 @@
     <div class="col-8">
       <div ref="div" style="background-color: #646464; height: 40vh">
         <div style="position: absolute">
-          <vue3ResizeDrag :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="20" :h="20" :x="ninepostion[0].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==0?'action':'']" :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="20" :h="20" :x="ninepostion[0].x"
             :y="ninepostion[0].y" @mousedown="activeMouseDown(0)" :isResizable="false" @moveHandler="moveHandler_1">
             <div class="point">1</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="20" :h="20" :x="ninepostion[1].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==1?'action':'']" :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="20" :h="20" :x="ninepostion[1].x"
             :y="ninepostion[1].y" @mousedown="activeMouseDown(1)" :isResizable="false" @moveHandler="moveHandler_2">
             <div class="point">2</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="20" :h="20" :x="ninepostion[2].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==2?'action':'']" :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="20" :h="20" :x="ninepostion[2].x"
             :y="ninepostion[2].y" @mousedown="activeMouseDown(2)" :isResizable="false" @moveHandler="moveHandler_3">
             <div class="point">3</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="20" :h="20" :x="ninepostion[3].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==3?'action':'']" :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="20" :h="20" :x="ninepostion[3].x"
             :y="ninepostion[3].y" @mousedown="activeMouseDown(3)" :isResizable="false" @moveHandler="moveHandler_4">
             <div class="point">4</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="20" :h="20" :x="ninepostion[4].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==4?'action':'']" :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="20" :h="20" :x="ninepostion[4].x"
             :y="ninepostion[4].y" @mousedown="activeMouseDown(4)" :isResizable="false" @moveHandler="moveHandler_5">
             <div class="point">5</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="20" :h="20" :x="ninepostion[5].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==5?'action':'']" :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="20" :h="20" :x="ninepostion[5].x"
             :y="ninepostion[5].y" @mousedown="activeMouseDown(5)" :isResizable="false" @moveHandler="moveHandler_6">
             <div class="point">6</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="20" :h="20" :x="ninepostion[6].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==6?'action':'']" :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="20" :h="20" :x="ninepostion[6].x"
             :y="ninepostion[6].y" @mousedown="activeMouseDown(6)" :isResizable="false" @moveHandler="moveHandler_7">
             <div class="point">7</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="20" :h="20" :x="ninepostion[7].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==7?'action':'']" :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="20" :h="20" :x="ninepostion[7].x"
             :y="ninepostion[7].y" @mousedown="activeMouseDown(7)" :isResizable="false" @moveHandler="moveHandler_8">
             <div class="point">8</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="20" :h="20" :x="ninepostion[8].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==8?'action':'']" :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="20" :h="20" :x="ninepostion[8].x"
             :y="ninepostion[8].y" @mousedown="activeMouseDown(8)" :isResizable="false" @moveHandler="moveHandler_9">
             <div class="point">9</div>
           </vue3ResizeDrag>
@@ -154,6 +154,9 @@
 .point{
   width: 100%;height: 100%;border-radius: 50%;background: #00ff00;color: aliceblue;
 }
+.action{
+  background-color: aqua;
+}
 </style>
 <script lang="ts">
 import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
@@ -187,6 +190,7 @@ export default defineComponent({
     let Proportion = ref({ x: 0, y: 0 });
     let centor = ref({ x: 0, y: 0 });
     const div = ref();
+    const now_index = ref(0);
     let nine = reactive([
       { x: 0, y: 1080 },
       { x: 960, y: 1920 },
@@ -211,7 +215,7 @@ export default defineComponent({
     ]);
     const activeMouseDown = (index: number) => {
       isactivearray.value[index] = true;
-      set?.SetBlendingOption("blending_grids_select_point",`9:${index+1}`)
+      now_index.value=index
     };
     //用于计算当前投影仪的索引
     let serverconfig = JSON.parse($store.state.fusion_configuration);
@@ -766,6 +770,7 @@ export default defineComponent({
       setTimeout(() => {
         isshowarray.value[index] = true;
       }, 100);
+      now_index.value=index
     };
     const save = () => {
       set?.SaveBlendingConfig("");
@@ -775,7 +780,11 @@ export default defineComponent({
         });
       }, 1000);
     };
+    watch(()=>now_index,(newval,oldval)=>{
+      set?.SetBlendingOption("blending_grids_select_point",`9:${now_index.value+1}`)
+    },{ deep: true })
     return {
+      now_index,
       model,
       save,
       nine,
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index e9ff0cc..7fdfb92 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -446,5 +446,6 @@ export default {
   "disable_clip":"disable clip",
   "show_mask":"hide desktop",
   "save_bmp":"save bmp",
-  "disable_blending_params":"disable blending params"
+  "disable_blending_params":"disable blending params",
+  "Please enter a value within the range":"Please enter a value within the range"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index eda3390..88d1ad7 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -715,5 +715,6 @@ export default {
   "disable_clip":"禁用裁剪",
   "show_mask":"隐藏桌面",
   "save_bmp":"保存BMP",
-  "disable_blending_params":"禁用融合参数"
+  "disable_blending_params":"禁用融合参数",
+  "Please enter a value within the range":"请输入范围内的值"
 };

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 60/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=97=B6=E5=8F=91=E9=80=81=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=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("");

From 5addd49c3a1e9f3a73554b64e53a2ecb08bb37cb Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Tue, 7 Feb 2023 09:31:58 +0800
Subject: [PATCH 61/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=B8=8D=E4=BF=9D=E5=AD=98bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/DensityCorrection.vue |  5 +++--
 src/components/FusionSettings/FusionLocale.vue      | 12 +++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 9da15fb..9b0cf29 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -166,7 +166,6 @@
 .p0{
   margin: 0;
   padding: 0;
-  line-height: 8px;
 }
 .action{
   background-color: aqua;
@@ -247,7 +246,7 @@ export default defineComponent({
       { x: 0, y: 0 },
       { x: 0, y: 0 },
     ]);
-    // const max
+     const max_x_y=reactive([0,0])
     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 });
@@ -475,6 +474,8 @@ export default defineComponent({
 
     onMounted(() => {
       initialization();
+      max_x_y[0]=div.value.offsetWidth-25
+      max_x_y[1]=div.value.offsetHeight-15
       Proportion.value.x = config.width / (div.value.offsetWidth - 40);
       Proportion.value.y = config.height / (div.value.offsetHeight - 30);
       let Width = (div.value.offsetWidth - 40) / 4;
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 6ed7320..876431c 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -95,11 +95,9 @@
       <p class="text-center" style="margin: 0 0 8;">{{ $t("Set Fusion Band Parameters") }}</p>
       <div style="display: flex; justify-content: space-evenly">
         <div>
-          <!-- <div class="btn_bottom"><q-btn size="sm"  color="white" @click="add('alpha')" text-color="black" label="↑" /></div> -->
           <q-slider v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
             vertical reverse label-always />
-          <!-- <div  class="btn_top"><q-btn size="sm"  color="white" @click="reduce('alpha')" text-color="black" label="↓" /></div> -->
-          <div> <q-input dense filled type="number"  step="0.1" v-model="array[group].alpha" label="alpha"
+          <div> <q-input dense filled type="number" max="1" min="0"   step="0.1" v-model="array[group].alpha" label="alpha"
               lazy-rules :rules="[
                 (val) =>
                   (val !== null && val !== '') ||
@@ -111,11 +109,9 @@
         </div>
 
         <div>
-          <!-- <div class="btn_bottom"><q-btn size="sm"  color="white" @click="add('p')" text-color="black" label="↑" /></div> -->
           <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" @update:model-value="()=>{}"   step="0.1" v-model="array[group].p" label="p"
+          <div> <q-input dense filled type="number" max="16" min="0" step="0.1" v-model="array[group].p" label="p"
               lazy-rules :rules="[
                 (val) =>
                   (val !== null && val !== '') ||
@@ -127,10 +123,8 @@
         </div>
 
         <div>
-          <!-- <div class="btn_bottom"><q-btn size="sm"  color="white" @click="add('gamma')" text-color="black" label="↑" /></div> -->
           <q-slider  v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green" vertical reverse label-always />
-          <!-- <div class="btn_top"><q-btn size="sm"  color="white" @click="reduce('gamma')" text-color="black" label="↓" /></div> -->
-          <div> <q-input dense filled type="number"  step="0.1" v-model="array[group].gamma" label="gamma"
+          <div> <q-input dense filled type="number" max="16" min="0"  step="0.1" v-model="array[group].gamma" label="gamma"
               lazy-rules :rules="[
                 (val) =>
                   (val !== null && val !== '') ||

From f6dd438627cc54f2b4a2c42139da441b1e7824da Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Tue, 7 Feb 2023 16:59:58 +0800
Subject: [PATCH 62/78] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E9=87=8D=E5=86=99=E7=96=8F=E5=AF=86=E6=A0=A1?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +
 .../FusionSettings/DensityCorrection.vue      | 629 ++++++------------
 .../FusionSettings/GridSettings.vue           |   8 +-
 src/components/FusionSettingsDialog.vue       |  24 +
 src/i18n/en-US/index.ts                       |   4 +-
 src/i18n/zh-CN/index.ts                       |   4 +-
 6 files changed, 240 insertions(+), 431 deletions(-)

diff --git a/package.json b/package.json
index 4ee6320..a725a2a 100644
--- a/package.json
+++ b/package.json
@@ -26,8 +26,10 @@
     "update": "^0.7.4",
     "v-viewer": "^3.0.9",
     "vue": "^3.0.0",
+    "vue-drag-resize": "^1.5.4",
     "vue-i18n": "^9.1.9",
     "vue-router": "^4.0.0",
+    "vue3-draggable-resizable": "^1.6.5",
     "vuex": "^4.0.1",
     "zrender": "^5.3.1"
   },
diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 9b0cf29..61e2d13 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -4,98 +4,47 @@
     <div class="col-8 q-pt-md">
       <div ref="div" style="width: 100%; background-color: #646464; height: 100%">
         <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="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="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="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="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="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>
-          </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>
-          </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>
-          </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>
-          </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>
-          </vue3ResizeDrag>
+          <Vue3DraggableResizable v-for="(item, index) in config.ver_density.length" :initW="20" :initH="20"
+            :resizable="false" :x="0" v-model:y="point_postion[index].y" :disabledX="true"
+            @activated="now_index = index" @dragging="dragStartHandle($event, index, 'v')">
+            <span>v{{
+              index+ 1
+            }}</span>
+          </Vue3DraggableResizable>
+          <Vue3DraggableResizable v-for="(item, index) in config.ver_density.length" :initW="20" :initH="20"
+            :resizable="false" :x="max_x_y[0]" v-model:y="point_postion[index].y" @activated="now_index = index"
+            @dragging="dragStartHandle($event, index, 'v')">
+            <span>v{{
+              index+ 1
+            }}</span>
+          </Vue3DraggableResizable>
+          <Vue3DraggableResizable v-for="(item, index) in config.hor_density.length" :initW="20" :initH="20"
+            :resizable="false" v-model:x="point_postion[index + 5].x" :y="-20" @activated="now_index = index + 5"
+            :disabledY="true" @dragging="dragStartHandle($event, index + 5, 'h')">
+            <span>h{{
+              index+ 1
+            }}</span>
+          </Vue3DraggableResizable>
+          <Vue3DraggableResizable v-for="(item, index) in config.hor_density.length" :initW="20" :initH="20"
+            :resizable="false" v-model:x="point_postion[index + 5].x" @activated="now_index = index + 5"
+            :y="max_x_y[1] + 20" @dragging="dragStartHandle($event, index + 5, 'h')">
+            <span>h{{
+              index+ 1
+            }}</span>
+          </Vue3DraggableResizable>
         </div>
       </div>
     </div>
     <div class="col-3 q-pt-md">
       <div class="row">
-        <div class="col-12">
+        <div class="col-12" v-for="(item, index) in 5">
           <div class="row">
             <div class="col-2"></div>
             <div class="col-8">
-              <q-input @focus="isactivearray[0] = false" filled type="number" class="q-pt-md" :dense="true"
-                v-model="value[0].y" label="y" lazy-rules />
-              <q-btn  size="sm" color="white" @click="reset(0)" text-color="black" :label="$t('reset') + ' v1'" />
-            </div>
-          </div>
-        </div>
-        <div class="col-12">
-          <div class="row">
-            <div class="col-2"></div>
-            <div class="col-8">
-              <q-input @focus="isactivearray[1] = false" filled type="number" class="q-pt-md" :dense="true"
-                v-model="value[1].y" label="y" lazy-rules />
-              <q-btn  size="sm" color="white" @click="reset(1)" text-color="black" :label="$t('reset') + ' v2'" />
-            </div>
-          </div>
-        </div>
-        <div class="col-12">
-          <div class="row">
-            <div class="col-2"></div>
-            <div class="col-8">
-              <q-input @focus="isactivearray[2] = false" filled type="number" class="q-pt-md" :dense="true"
-                v-model="value[2].y" label="y" lazy-rules />
-              <q-btn  size="sm" color="white" @click="reset(2)" text-color="black" :label="$t('reset') + ' v3'" />
-            </div>
-          </div>
-        </div>
-        <div class="col-12">
-          <div class="row">
-            <div class="col-2"></div>
-            <div class="col-8">
-              <q-input @focus="isactivearray[3] = false" filled type="number" class="q-pt-md" :dense="true"
-                v-model="value[3].y" label="y" lazy-rules />
-              <q-btn  size="sm" color="white" @click="reset(3)" text-color="black" :label="$t('reset') + ' v4'" />
-            </div>
-          </div>
-        </div>
-        <div class="col-12">
-          <div class="row">
-            <div class="col-2"></div>
-            <div class="col-8">
-              <q-input @focus="isactivearray[4] = false" filled type="number" class="q-pt-md" :dense="true"
-                v-model="value[4].y" label="y" lazy-rules />
-              <q-btn  size="sm" color="white" @click="reset(4)" text-color="black" :label="$t('reset') + ' v5'" />
+              <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[index].y"
+                @update:model-value="chang(index, $event)" label="y" lazy-rules />
+              <q-btn size="sm" color="white" @click="reset(index)" text-color="black"
+                :label="$t('reset') + `v${index + 1}`" />
             </div>
           </div>
         </div>
@@ -104,70 +53,66 @@
     <div class="col-1"></div>
     <div class="col-11">
       <div class="box">
-        <div class="box_son">
-          <q-input filled @focus="isactivearray[5] = false" type="number" class="q-pt-md" :dense="true"
-            v-model="value[5].x" label="x" lazy-rules />
-          <q-btn  size="sm" color="white" @click="reset(5)" text-color="black" :label="$t('reset') + ' h1'" />
+        <div class="box_son" v-for="(item, index) in 5">
+          <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[index + 5].x" label="x"
+            @update:model-value="chang(index + 5, $event)" lazy-rules />
+          <q-btn size="sm" color="white" @click="reset(index + 5)" text-color="black"
+            :label="$t('reset') + `h${index + 1}`" />
         </div>
-
-        <div class="box_son">
-          <q-input filled @focus="isactivearray[6] = false" type="number" class="q-pt-md" :dense="true"
-            v-model="value[6].x" label="x" lazy-rules />
-          <q-btn  size="sm" color="white" @click="reset(6)" text-color="black" :label="$t('reset') + ' h2'" />
-        </div>
-
-        <div class="box_son">
-          <q-input filled @focus="isactivearray[7] = false" type="number" class="q-pt-md" :dense="true"
-            v-model="value[7].x" label="x" lazy-rules />
-          <q-btn  size="sm" color="white" @click="reset(7)" text-color="black" :label="$t('reset') + ' h3'" />
-        </div>
-
-        <div class="box_son">
-          <q-input filled @focus="isactivearray[8] = false" type="number" class="q-pt-md" :dense="true"
-            v-model="value[8].x" label="x" lazy-rules />
-          <q-btn  size="sm" color="white" @click="reset(8)" text-color="black" :label="$t('reset') + ' h4'" />
-        </div>
-
-        <div class="box_son">
-          <q-input filled @focus="isactivearray[9] = false" type="number" class="q-pt-md" :dense="true"
-            v-model="value[9].x" label="x" lazy-rules />
-          <q-btn  size="sm" color="white" @click="reset(9)" text-color="black" :label="$t('reset') + ' h5'" />
-        </div>
-
         <div class="box_son q-pt-xl">
-          <q-btn
-            color="white"
-            @click="resetall"
-            text-color="black"
-            :label="$t('resetall')"
-          />
+          <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
         </div>
       </div>
     </div>
   </div>
+  <div>
+      <div class="row">
+        <div class="col-1"></div>
+        <div class="col-2"> <q-select class="q-pt-md" :dense="true" filled v-model="options_model_v" :options="options_v" emit-value
+            map-options /></div>
+        <div class="col-2"> <q-input filled type="number" class="q-pt-md" :dense="true"
+            v-model="value[options_model_v].y" @update:model-value="chang(options_model_v, $event)" lazy-rules />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-1"></div>
+        <div class="col-2"> <q-select class="q-pt-md" :dense="true" filled v-model="options_model_h" :options="options_h" emit-value
+            map-options /></div>
+        <div class="col-2"> <q-input filled type="number" class="q-pt-md" :dense="true"
+            v-model="value[options_model_h].x" @update:model-value="chang(options_model_h+5, $event)" lazy-rules />
+        </div>
+      </div>
+
+    </div>
 </template>
 
 <style scoped>
-.box{
+.box {
   display: flex;
-  justify-content:space-between;
+  justify-content: space-between;
 }
-.box_son{
+
+.box_son {
   width: 10rem;
   padding-right: 1rem;
 }
-.vcolro{
+
+.vcolro {
   color: #d50000;
 }
-.hcolro{
+
+.hcolro {
   color: #00c853;
   font-size: 5px;
 }
-.p0{
+
+.p0 {
   margin: 0;
   padding: 0;
+  line-height: 8px;
 }
-.action{
+
+.action {
   background-color: aqua;
 }
 </style>
@@ -187,15 +132,22 @@ import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
 import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
 import GlobalData from "src/common/GlobalData";
+import Vue3DraggableResizable from 'vue3-draggable-resizable'
+import 'vue3-draggable-resizable/dist/Vue3DraggableResizable.css'
+import { type } from "os";
+import { number } from "@intlify/core-base";
 export default defineComponent({
   name: "ComponentDensityCorrection",
   components: {
     vue3ResizeDrag,
+    Vue3DraggableResizable
   },
   setup() {
     let $store = useStore();
     let $t = useI18n();
     const now_index = ref(0);
+    const max_x_y = reactive([0, 0]);
+    const now_adjust = ref("v")
     const value = reactive([
       { x: 0, y: 0, number: 0 },
       { x: 0, y: 0, number: 0 },
@@ -208,32 +160,13 @@ export default defineComponent({
       { x: 0, y: 0, number: 0 },
       { x: 0, y: 0, number: 0 },
     ]);
+    //为动态添加做准备
+    const value_h = reactive([]);
+    const value_v = reactive([]);
+    const default_location_v = reactive([]);
+    const default_location_h = reactive([]);
     let model = ref(null);
     const div = ref();
-    const isshowarray = ref([
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-    ]);
-    const isactivearray = ref([
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-    ]);
     const default_location: any = reactive([
       { x: 0, y: 0 },
       { x: 0, y: 0 },
@@ -246,8 +179,6 @@ export default defineComponent({
       { x: 0, y: 0 },
       { x: 0, y: 0 },
     ]);
-     const max_x_y=reactive([0,0])
-    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 });
     const configselsect = computed(() => {
@@ -263,34 +194,38 @@ export default defineComponent({
     });
     const set_cache: any = ref([]);
     const ste_status = ref(0);
-    //为了加载 缓存的配置时 同步点的位置
-    const syncpoint = () => {
+
+    const chang = (index: number, $event: any) => {
       let x = 0
       let y = 0
-      for (let index = 0; index < 5; index++) {
-        x = default_location[index].x;
-        y = Math.ceil((config.height - value[index].y) / Proportion.value.y);
-        setdianposin(index, x, y);
+      if (index < 5) {
+        x = default_location[9].y;
+        y = Math.ceil((config.height - $event) / Proportion.value.y);
+        send_configuration(index, $event)
+      } else {
+        x = Math.ceil($event / Proportion.value.x);
+        y = default_location[0].x;
+        send_configuration(index, $event)
       }
+      point_postion[index].x = Number(x)
+      point_postion[index].y = Number(y)
+      now_index.value = index
+    }
 
-      for (let index = 5; index < 10; index++) {
-        x = Math.ceil(value[index].x / Proportion.value.x);
-        y = default_location[5].y;
-        setdianposin(index, x, y);
+    const asyncpoint = (index: number, $event: any) => {
+      let x = 0
+      let y = 0
+      if (index < 5) {
+        x = default_location[9].y;
+        y = Math.ceil((config.height - $event) / Proportion.value.y);
+      } else {
+        x = Math.ceil($event / Proportion.value.x);
+        y = default_location[0].x;
       }
+      point_postion[index].x = Number(x)
+      point_postion[index].y = Number(y)
+    }
 
-      for (let index = 0; index < value.length; index++) {
-        isactivearray.value[index] = false;
-      }
-    };
-
-    const use_set_cache = () => {
-      if (set_cache.value[selectedprojector.value] != null) {
-        let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
-        deepcopy(value, tmp);
-        syncpoint();
-      }
-    };
     const deepcopy = (o1: any, o2: any) => {
       for (let k in o2) {
         if (typeof o2[k] === "object") {
@@ -307,9 +242,9 @@ export default defineComponent({
     onBeforeUnmount(() => {
       sessionStorage.DensityCorrection = JSON.stringify(set_cache.value);
     });
-    watch(()=>now_index,(newval,oldval)=>{
-      now_index.value>5?set?.SetBlendingOption("blending_grids_select_point",`density_h:${now_index.value-4}`):set?.SetBlendingOption("blending_grids_select_point",`density_v:${now_index.value+1}`)
-    },{ deep: true })
+    watch(() => now_index, (newval, oldval) => {
+      now_index.value > 5 ? set?.SetBlendingOption("blending_grids_select_point", `density_h:${now_index.value - 4}`) : set?.SetBlendingOption("blending_grids_select_point", `density_v:${now_index.value + 1}`)
+    }, { deep: true })
     watch(
       () => configselsect,
       (newVal, oldVal) => {
@@ -331,19 +266,19 @@ export default defineComponent({
         setTimeout(() => {
           ste_status.value = 0;
         }, 100);
-        syncpoint();
       },
       { deep: true }
     );
+
     const initialization = () => {
       ste_status.value = 1;
       for (let index = 0; index < config.hor_density.length; index++) {
         value[index].x = config.ver_density[index].x;
         value[index].y = config.ver_density[index].y;
-        value[index].number = config.ver_density[index].number;
+        value[index].number = config.ver_density[index].control_point;
         value[index + 5].x = config.hor_density[index].x;
         value[index + 5].y = config.hor_density[index].y;
-        value[index + 5].number = config.hor_density[index].number;
+        value[index + 5].number = config.hor_density[index].control_point;
       }
       if (
         sessionStorage.DensityCorrection &&
@@ -353,12 +288,20 @@ export default defineComponent({
         use_set_cache();
       } else {
       }
-      syncpoint();
       setTimeout(() => {
         ste_status.value = 0;
       }, 100);
     };
 
+    const use_set_cache = () => {
+      if (set_cache.value[selectedprojector.value] != null) {
+        let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
+        deepcopy(value, tmp);
+      }
+      for (let index = 0; index < 10; index++) {
+        asyncpoint(index, index < 5 ? value[index].y : value[index].x)
+      }
+    };
     const resetall = () => {
       for (
         let index = 0;
@@ -392,10 +335,7 @@ export default defineComponent({
 
       point_postion[index].y = default_location[index].y;
       point_postion[index].x = default_location[index].x;
-      isshowarray.value[index] = false;
-      setTimeout(() => {
-        isshowarray.value[index] = true;
-      }, 100);
+      save_set_cache()
     };
     const point_postion: any = reactive([
       { x: 0, y: 0 },
@@ -419,46 +359,6 @@ export default defineComponent({
       }, 1000);
     };
 
-    const moveHandler = ($event: any, index: number) => {
-      let x = 0;
-      let y = 0;
-      switch (index) {
-        case 0:
-        case 1:
-        case 2:
-        case 3:
-        case 4:
-          x =
-            config.width / 2 +
-            Math.ceil(
-              ($event.left - default_location[index].x) * Proportion.value.x
-            );
-          y =
-            config.height -
-            (config.height / 4) * index -
-            Math.ceil(
-              ($event.top - default_location[index].y) * Proportion.value.y
-            );
-          break;
-        case 5:
-        case 6:
-        case 7:
-        case 8:
-        case 9:
-          x = Math.ceil($event.left * Proportion.value.x);
-          y =
-            config.height / 2 -
-            Math.ceil(
-              ($event.top - default_location[index].y) * Proportion.value.y
-            );
-
-          break;
-        default:
-      }
-      value[index].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      value[index].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-      save_set_cache();
-    };
 
     const use_server_config = () => {
       for (let index = 0; index < config.hor_density.length; index++) {
@@ -469,29 +369,29 @@ export default defineComponent({
         value[index + 5].y = config.hor_density[index].y;
         value[index + 5].number = config.hor_density[index].number;
       }
+      for (let index = 0; index < 10; index++) {
+        asyncpoint(index, index < 5 ? value[index].y : value[index].x)
+
+      }
     };
 
 
     onMounted(() => {
       initialization();
-      max_x_y[0]=div.value.offsetWidth-25
-      max_x_y[1]=div.value.offsetHeight-15
-      Proportion.value.x = config.width / (div.value.offsetWidth - 40);
-      Proportion.value.y = config.height / (div.value.offsetHeight - 30);
-      let Width = (div.value.offsetWidth - 40) / 4;
-      let Height = (div.value.offsetHeight - 30) / 4;
-      for (
-        let index = 0;
-        index < config.hor_density.length + config.ver_density.length;
-        index++
-      ) {
+      Proportion.value.x = config.width / (div.value.offsetWidth - 20);
+      Proportion.value.y = config.height / (div.value.offsetHeight - 20);
+      let Width = (div.value.offsetWidth - 20) / 4;
+      let Height = (div.value.offsetHeight - 20) / 4;
+
+      max_x_y[0] = div.value.offsetWidth - 20
+      max_x_y[1] = div.value.offsetHeight - 20
+      for (let index = 0; index < 10; index++) {
         if (index < 5) {
           point_postion[index].y = default_location[index].y = Height * index;
-          point_postion[index].x = default_location[index].x = Width * 2;
+          point_postion[index].x = default_location[index].x = 0;
         } else {
-          point_postion[index].y = default_location[index].y = Height * 2;
-          point_postion[index].x = default_location[index].x =
-            Width * (index - 5);
+          point_postion[index].y = default_location[index].y = 0;
+          point_postion[index].x = default_location[index].x = Width * (index - 5);
         }
       }
       use_server_config();
@@ -503,7 +403,9 @@ export default defineComponent({
         use_set_cache();
       } else {
       }
-      syncpoint();
+
+
+
     });
 
     //窗口变动重新渲染
@@ -512,229 +414,106 @@ export default defineComponent({
         return (() => {
           if (div != null) {
             initialization();
-            Proportion.value.x = config.width / (div.value.offsetWidth - 40);
+            Proportion.value.x = config.width / (div.value.offsetWidth - 20);
             Proportion.value.y = config.height / (div.value.offsetHeight - 30);
-            let Width = (div.value.offsetWidth - 40) / 4;
-            let Height = (div.value.offsetHeight - 30) / 4;
-            for (
-              let index = 0;
-              index < config.hor_density.length + config.ver_density.length;
-              index++
-            ) {
+            let Width = (div.value.offsetWidth - 20) / 4;
+            let Height = (div.value.offsetHeight - 20) / 4;
+
+            max_x_y[0] = div.value.offsetWidth - 20
+            max_x_y[1] = div.value.offsetHeight - 20
+            for (let index = 0; index < 10; index++) {
               if (index < 5) {
-                point_postion[index].y = default_location[index].y =
-                  Height * index;
-                point_postion[index].x = default_location[index].x = Width * 2;
+                point_postion[index].y = default_location[index].y = Height * index;
+                point_postion[index].x = default_location[index].x = 0;
               } else {
-                point_postion[index].y = default_location[index].y = Height * 2;
-                point_postion[index].x = default_location[index].x =
-                  Width * (index - 5);
+                point_postion[index].y = default_location[index].y = 0;
+                point_postion[index].x = default_location[index].x = Width * (index - 5);
               }
             }
           }
         })();
       };
     });
-
-    const setdianposin = (index: number, x: number, y: number) => {
-      point_postion[index].x = x;
-      point_postion[index].y = y;
-      isshowarray.value[index] = false;
-      isactivearray.value[index] = false;
-      setTimeout(() => {
-        isshowarray.value[index] = true;
-      }, 100);
-      if(ste_status.value == 0)now_index.value=index
-    };
-    watch(
-      () => value[0],
-      (newVal, oldVal) => {
-        send_configuration(1, newVal.y, newVal.number);
-        if (!isactivearray.value[0]) {
-          let x = default_location[0].x;
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          setdianposin(0, x, y);
-        }
-        now_index.value=0
-        save_set_cache();
-      },
-      { deep: true }
-    );
-
-    watch(
-      () => value[1],
-      (newVal, oldVal) => {
-        send_configuration(2, newVal.y, newVal.number);
-        if (!isactivearray.value[1]) {
-          let x = default_location[1].x;
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          setdianposin(1, x, y);
-        }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-
-    watch(
-      () => value[2],
-      (newVal, oldVal) => {
-        send_configuration(3, newVal.y, newVal.number);
-        if (!isactivearray.value[2]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          setdianposin(2, x, y);
-        }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-
-    watch(
-      () => value[3],
-      (newVal, oldVal) => {
-        send_configuration(4, newVal.y, newVal.number);
-        if (!isactivearray.value[3]) {
-          let x = default_location[3].x;
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          setdianposin(3, x, y);
-        }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-
-    watch(
-      () => value[4],
-      (newVal, oldVal) => {
-        send_configuration(5, newVal.y, newVal.number);
-        if (!isactivearray.value[4]) {
-          let x = default_location[4].x;
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          setdianposin(4, x, y);
-        }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-
-
-    watch(
-      () => value[5],
-      (newVal, oldVal) => {
-        send_configuration(6, newVal.x, newVal.number);
-        if (!isactivearray.value[5]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = default_location[5].y;
-          setdianposin(5, x, y);
-        }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-
-    watch(
-      () => value[6],
-      (newVal, oldVal) => {
-        send_configuration(7, newVal.x, newVal.number);
-        if (!isactivearray.value[6]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = default_location[6].y;
-          setdianposin(6, x, y);
-        }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-
-    watch(
-      () => value[7],
-      (newVal, oldVal) => {
-        send_configuration(8, newVal.x, newVal.number);
-        if (!isactivearray.value[7]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = default_location[7].y;
-          setdianposin(7, x, y);
-        }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-
-    watch(
-      () => value[8],
-      (newVal, oldVal) => {
-        send_configuration(9, newVal.x, newVal.number);
-        if (!isactivearray.value[8]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = default_location[8].y;
-          setdianposin(8, x, y);
-        }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-
-    watch(
-      () => value[9],
-      (newVal, oldVal) => {
-        send_configuration(10, newVal.x, newVal.number);
-        if (!isactivearray.value[9]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = default_location[9].y;
-          setdianposin(9, x, y);
-        }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-
     const send_configuration = (
       index: number,
       value: number,
-      number: number
     ) => {
       if (ste_status.value == 0) {
         if (index <= 5) {
           set?.SetBlendingVerDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            index,
+            index + 1,
             Number(value)
           );
         } else {
           set?.SetBlendingHorDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            index - 5,
+            index - 4,
             Number(value)
           );
         }
       }
       save_set_cache();
     };
-    const activeMouseDown = (index: number) => {
-      isactivearray.value[index] = true;
-      // if(index>=5){
-      //   set?.SetBlendingOption("blending_grids_select_point",`density_h:${index-4}`)
-      // }else{
-      //   set?.SetBlendingOption("blending_grids_select_point",`density_v:${index+1}`)
-      // }
-      now_index.value=index
-    };
     initialization();
+    const dragStartHandle = ($event: any, index: number, type: string) => {
+      let obj_x = $event.x
+      let obj_y = $event.y
+      if (type == 'h') {
+        let x =
+          config.width / 4 * (index - 5) +
+          Math.ceil(
+            (obj_x - default_location[index].x) * Proportion.value.x
+          );
+        let y =
+          config.height -
+          (config.height / 4) * index -
+          Math.ceil(
+            (obj_y - default_location[index].y) * Proportion.value.y
+          );
+        value[index].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+        send_configuration(index, x)
+      }
+      if (type == 'v') {
+        let x = Math.ceil(obj_x * Proportion.value.x);
+        let y =
+          config.height -
+          (config.height / 4) * index -
+          Math.ceil(
+            (obj_y - default_location[index].y) * Proportion.value.y
+          );
+        value[index].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+        send_configuration(index, y)
+      }
+    }
+    const options_v: any = reactive([]);
+    const options_h: any = reactive([]);
+    const options_model_v = ref(0)
+    const options_model_h = ref(5)
+    for (let index = 0; index < 5; index++) {
+      options_v.push({ "label": `v${index + 1}`, value: index })
+      options_h.push({ "label": `h${index + 1}`, value: index + 5 })
+    }
     return {
+      options_model_v,
+      options_model_h,
+      options_v,
+      options_h,
+      config,
+      now_adjust,
+      set_cache,
+      chang,
+      max_x_y,
+      dragStartHandle,
       now_index,
-      activeMouseDown,
       model,
-      options,
       value,
       reset,
       resetall,
       point_postion,
-      moveHandler,
       div,
-      isshowarray,
-      isactivearray,
       save,
     };
   },
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 1830bc4..9c7313b 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -166,10 +166,10 @@ export default defineComponent({
     }
     const use_server_config = () => {
       let server_conf = JSON.parse($store.state.fusion_configuration).options
-      model[0] = server_conf.blending_grids_row!=null ? Number(server_conf.blending_grids_row) : 20;
-      model[1] = server_conf.blending_grids_column!=null ? Number(server_conf.blending_grids_column) : 40;
-      color[0] = server_conf.blending_grids_line_color
-      color[1] = server_conf.blending_grids_background_color
+      model[0] = server_conf.blending_grids_row ?? 20;
+      model[1] = server_conf.blending_grids_column ?? 40;
+      color[0] = server_conf.blending_grids_line_color ?? "#ffffff"
+      color[1] = server_conf.blending_grids_background_color ?? "#00ff5e"
       RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true
       RowsColumns[1] = server_conf.blending_grids_show_column === "false" ? false : true
 
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index a98329b..a5461ed 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -234,6 +234,25 @@ export default defineComponent({
       set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0");
     };
     const send_show_blending_grids = () => {
+      let tmp = ""
+        switch (optionsstr.value) {
+          case 'FusionLocale':
+            tmp = '0'
+            break;
+          case 'FourPointCalibration':
+            tmp = '4'
+            break;
+          case 'SurfaceCorrection':
+            tmp = '9'
+            break;
+          case 'DensityCorrection':
+            tmp = 'density'
+            break;
+          default:
+            break;
+        }
+      set?.SetBlendingOption("blending_grids_select_ui", tmp)
+      set?.SetBlendingOption('blending_grids_select_projector', now_selsect_projector.value);
       set?.SetBlendingOption(show_blending_grids_id.value, show_blending_grids.value ? "1" : "0");
     };
     const resetall = () => {
@@ -310,6 +329,9 @@ export default defineComponent({
         set?.SetBlendingOption("blending_grids_select_ui", tmp)
       },
       { deep: true })
+
+
+
     const save = () => {
       medium.value = true
       //读取场景
@@ -431,8 +453,10 @@ export default defineComponent({
       set?.DeleteBlendingScene(name_to_be_deleted.value);
       plan_list.splice(plan_list.findIndex(item => item === name_to_be_deleted.value), 1)
     }
+    const now_selsect_projector=ref("0-0")
     const currently_selected_projector = (value: string) => {
       set?.SetBlendingOption('blending_grids_select_projector', value);
+      now_selsect_projector.value=value
     }
     return {
       currently_selected_projector,
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 7fdfb92..f118879 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -447,5 +447,7 @@ export default {
   "show_mask":"hide desktop",
   "save_bmp":"save bmp",
   "disable_blending_params":"disable blending params",
-  "Please enter a value within the range":"Please enter a value within the range"
+  "Please enter a value within the range":"Please enter a value within the range",
+  "vertical correction":"vertical correction",
+  "horizontal correction":"horizontal correction"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 88d1ad7..585cefc 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -716,5 +716,7 @@ export default {
   "show_mask":"隐藏桌面",
   "save_bmp":"保存BMP",
   "disable_blending_params":"禁用融合参数",
-  "Please enter a value within the range":"请输入范围内的值"
+  "Please enter a value within the range":"请输入范围内的值",
+  "vertical correction":"垂直校正",
+  "horizontal correction":"水平校正"
 };

From c7eb71ee72c7e9bdfb4d261ccb07171467b4e0d3 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Wed, 8 Feb 2023 15:20:20 +0800
Subject: [PATCH 63/78] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=AF=B94=E7=82=B9?=
 =?UTF-8?q?=E6=A0=A1=E6=AD=A3=E7=9A=84=E9=94=AE=E7=9B=98=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      |  36 +-
 .../FusionSettings/FourPointCalibration.vue   | 367 +++++++-----------
 .../FusionSettings/FusionLocale.vue           |   8 +-
 .../FusionSettings/GridSettings.vue           | 121 +++---
 .../FusionSettings/SurfaceCorrection.vue      |  34 +-
 src/i18n/en-US/index.ts                       |   3 +-
 src/i18n/zh-CN/index.ts                       |   3 +-
 7 files changed, 257 insertions(+), 315 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 61e2d13..98852ee 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -4,28 +4,28 @@
     <div class="col-8 q-pt-md">
       <div ref="div" style="width: 100%; background-color: #646464; height: 100%">
         <div style="position: absolute">
-          <Vue3DraggableResizable v-for="(item, index) in config.ver_density.length" :initW="20" :initH="20"
+          <Vue3DraggableResizable :class="[options_model_v==index?'action':'']" v-for="(item, index) in config.ver_density.length" :initW="20" :initH="20"
             :resizable="false" :x="0" v-model:y="point_postion[index].y" :disabledX="true"
             @activated="now_index = index" @dragging="dragStartHandle($event, index, 'v')">
             <span>v{{
               index+ 1
             }}</span>
           </Vue3DraggableResizable>
-          <Vue3DraggableResizable v-for="(item, index) in config.ver_density.length" :initW="20" :initH="20"
+          <Vue3DraggableResizable :class="[options_model_v==index?'action':'']" v-for="(item, index) in config.ver_density.length" :initW="20" :initH="20"
             :resizable="false" :x="max_x_y[0]" v-model:y="point_postion[index].y" @activated="now_index = index"
             @dragging="dragStartHandle($event, index, 'v')">
             <span>v{{
               index+ 1
             }}</span>
           </Vue3DraggableResizable>
-          <Vue3DraggableResizable v-for="(item, index) in config.hor_density.length" :initW="20" :initH="20"
+          <Vue3DraggableResizable :class="[options_model_h==index+5?'action':'']" v-for="(item, index) in config.hor_density.length" :initW="20" :initH="20"
             :resizable="false" v-model:x="point_postion[index + 5].x" :y="-20" @activated="now_index = index + 5"
             :disabledY="true" @dragging="dragStartHandle($event, index + 5, 'h')">
             <span>h{{
               index+ 1
             }}</span>
           </Vue3DraggableResizable>
-          <Vue3DraggableResizable v-for="(item, index) in config.hor_density.length" :initW="20" :initH="20"
+          <Vue3DraggableResizable :class="[options_model_h==index+5?'action':'']" v-for="(item, index) in config.hor_density.length" :initW="20" :initH="20"
             :resizable="false" v-model:x="point_postion[index + 5].x" @activated="now_index = index + 5"
             :y="max_x_y[1] + 20" @dragging="dragStartHandle($event, index + 5, 'h')">
             <span>h{{
@@ -68,18 +68,24 @@
   <div>
       <div class="row">
         <div class="col-1"></div>
-        <div class="col-2"> <q-select class="q-pt-md" :dense="true" filled v-model="options_model_v" :options="options_v" emit-value
+        <div class="col-2"> <q-select class="q-pt-md" label="水平" :dense="true" filled v-model="options_model_v" :options="options_v" emit-value
             map-options /></div>
         <div class="col-2"> <q-input filled type="number" class="q-pt-md" :dense="true"
             v-model="value[options_model_v].y" @update:model-value="chang(options_model_v, $event)" lazy-rules />
         </div>
+        <div class="q-pt-md">
+          <q-btn color="white" @click="reset(options_model_v)" text-color="black" :label="$t('reset')" />
+        </div>
       </div>
       <div class="row">
         <div class="col-1"></div>
-        <div class="col-2"> <q-select class="q-pt-md" :dense="true" filled v-model="options_model_h" :options="options_h" emit-value
+        <div class="col-2"> <q-select class="q-pt-md"  label="垂直" :dense="true" filled v-model="options_model_h" :options="options_h" emit-value
             map-options /></div>
         <div class="col-2"> <q-input filled type="number" class="q-pt-md" :dense="true"
-            v-model="value[options_model_h].x" @update:model-value="chang(options_model_h+5, $event)" lazy-rules />
+            v-model="value[options_model_h].x" @update:model-value="chang(options_model_h, $event)" lazy-rules />
+        </div>
+        <div class="q-pt-md">
+          <q-btn  color="white" @click="reset(options_model_v)" text-color="black" :label="$t('reset')" />
         </div>
       </div>
 
@@ -201,11 +207,11 @@ export default defineComponent({
       if (index < 5) {
         x = default_location[9].y;
         y = Math.ceil((config.height - $event) / Proportion.value.y);
-        send_configuration(index, $event)
+        send_configuration(index, $event,'v')
       } else {
         x = Math.ceil($event / Proportion.value.x);
         y = default_location[0].x;
-        send_configuration(index, $event)
+        send_configuration(index-5, $event,'h')
       }
       point_postion[index].x = Number(x)
       point_postion[index].y = Number(y)
@@ -437,20 +443,22 @@ export default defineComponent({
     const send_configuration = (
       index: number,
       value: number,
+      type:string,
     ) => {
       if (ste_status.value == 0) {
-        if (index <= 5) {
+        if (type=='v') {
           set?.SetBlendingVerDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
             index + 1,
             Number(value)
           );
-        } else {
+        }
+        if (type=='h') {
           set?.SetBlendingHorDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            index - 4,
+            index -4,
             Number(value)
           );
         }
@@ -474,7 +482,7 @@ export default defineComponent({
             (obj_y - default_location[index].y) * Proportion.value.y
           );
         value[index].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-        send_configuration(index, x)
+        send_configuration(index, x,'h')
       }
       if (type == 'v') {
         let x = Math.ceil(obj_x * Proportion.value.x);
@@ -485,7 +493,7 @@ export default defineComponent({
             (obj_y - default_location[index].y) * Proportion.value.y
           );
         value[index].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-        send_configuration(index, y)
+        send_configuration(index, y,'v')
       }
     }
     const options_v: any = reactive([]);
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index d1c2334..d879f86 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -1,121 +1,46 @@
 <template>
   <div class="row">
     <div class="col-2">
-      <q-input
-        filled
-        type="number"
-        class="q-pt-xs"
-        style="text-align: center"
-        :dense="true"
-        @focus="isactivearray[0] = false"
-        v-model="four[0].x"
-        label="x"
-        lazy-rules
-      />
-      <q-input
-        filled
-        type="number"
-        class="q-pt-xs"
-        :dense="true"
-        @focus="isactivearray[0] = false"
-        v-model="four[0].y"
-        label="y"
-        lazy-rules
-      />
-      <q-btn
-      size="sm" dense
-        color="white"
-        @click="reset(0)"
-        text-color="black"
-        :label="$t('reset') + $t('point') + '1'"
-      />
+      <q-input filled type="number" class="q-pt-xs" style="text-align: center" :dense="true"
+        @focus="isactivearray[0] = false" v-model="four[0].x" label="x" lazy-rules />
+      <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[0] = false" v-model="four[0].y"
+        label="y" lazy-rules />
+      <q-btn size="sm" dense color="white" @click="reset(0)" text-color="black"
+        :label="$t('reset') + $t('point') + '1'" />
     </div>
     <div class="col-8"></div>
     <div class="col-2">
-      <q-input
-        filled
-        type="number"
-        class="q-pt-xs"
-        :dense="true"
-        @focus="isactivearray[1] = false"
-        v-model="four[1].x"
-        label="x"
-        lazy-rules
-      />
-      <q-input
-        filled
-        type="number"
-        class="q-pt-xs"
-        :dense="true"
-        @focus="isactivearray[1] = false"
-        v-model="four[1].y"
-        label="y"
-        lazy-rules
-      />
-      <q-btn
-      size="sm" dense
-        color="white"
-        @click="reset(1)"
-        text-color="black"
-        :label="$t('reset') + $t('point') + '2'"
-      />
+      <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[1] = false" v-model="four[1].x"
+        label="x" lazy-rules />
+      <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[1] = false" v-model="four[1].y"
+        label="y" lazy-rules />
+      <q-btn size="sm" dense color="white" @click="reset(1)" text-color="black"
+        :label="$t('reset') + $t('point') + '2'" />
     </div>
 
     <div class="col-2"></div>
     <div class="col-8">
       <div ref="div" style="background-color: #646464; height: 40vh">
         <div style="position: absolute">
-          <vue3ResizeDrag style="border: 0;" :class="[now_index==0?'action':'']"
-            v-if="isshowarray[0]"
-            :isActive="isactivearray[0]"
-            @mousedown="activeMouseDown(0)"
-            @mouseUpHandler="mouseUpHandler(0)"
-            :w="20"
-            :h="20"
-            :x="points[0].x"
-            :y="points[0].y"
-            :isResizable="false"
-            @moveHandler="moveHandler_1"
-            ><div class="point">1</div>
+          <vue3ResizeDrag style="border: 0;" :class="[now_index == 0 ? 'action' : '']" v-if="isshowarray[0]"
+            :isActive="isactivearray[0]" @mousedown="activeMouseDown(0)" @mouseUpHandler="mouseUpHandler(0)" :w="20"
+            :h="20" :x="points[0].x" :y="points[0].y" :isResizable="false" @moveHandler="moveHandler_1">
+            <div class="point">1</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag style="border: 0;"  :class="[now_index==1?'action':'']"
-            v-if="isshowarray[1]"
-            :isActive="isactivearray[1]"
-            @mousedown="activeMouseDown(1)"
-            @mouseUpHandler="mouseUpHandler(1)"
-            :w="20"
-            :h="20"
-            :x="points[1].x"
-            :y="points[1].y"
-            :isResizable="false"
-            @moveHandler="moveHandler_2"
-            ><div class="point">2</div>
+          <vue3ResizeDrag style="border: 0;" :class="[now_index == 1 ? 'action' : '']" v-if="isshowarray[1]"
+            :isActive="isactivearray[1]" @mousedown="activeMouseDown(1)" @mouseUpHandler="mouseUpHandler(1)" :w="20"
+            :h="20" :x="points[1].x" :y="points[1].y" :isResizable="false" @moveHandler="moveHandler_2">
+            <div class="point">2</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag style="border: 0;"  :class="[now_index==2?'action':'']"
-            v-if="isshowarray[2]"
-            :isActive="isactivearray[2]"
-            @mousedown="activeMouseDown(2)"
-            @mouseUpHandler="mouseUpHandler(2)"
-            :w="20"
-            :h="20"
-            :x="points[2].x"
-            :y="points[2].y"
-            :isResizable="false"
-            @moveHandler="moveHandler_3"
-            ><div class="point">3</div>
+          <vue3ResizeDrag style="border: 0;" :class="[now_index == 2 ? 'action' : '']" v-if="isshowarray[2]"
+            :isActive="isactivearray[2]" @mousedown="activeMouseDown(2)" @mouseUpHandler="mouseUpHandler(2)" :w="20"
+            :h="20" :x="points[2].x" :y="points[2].y" :isResizable="false" @moveHandler="moveHandler_3">
+            <div class="point">3</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag style="border: 0;"  :class="[now_index==3?'action':'']"
-            v-if="isshowarray[3]"
-            :isActive="isactivearray[3]"
-            @mousedown="activeMouseDown(3)"
-            @mouseUpHandler="mouseUpHandler(3)"
-            :w="20"
-            :h="20"
-            :x="points[3].x"
-            :y="points[3].y"
-            :isResizable="false"
-            @moveHandler="moveHandler_4"
-            ><div class="point">4</div>
+          <vue3ResizeDrag style="border: 0;" :class="[now_index == 3 ? 'action' : '']" v-if="isshowarray[3]"
+            :isActive="isactivearray[3]" @mousedown="activeMouseDown(3)" @mouseUpHandler="mouseUpHandler(3)" :w="20"
+            :h="20" :x="points[3].x" :y="points[3].y" :isResizable="false" @moveHandler="moveHandler_4">
+            <div class="point">4</div>
           </vue3ResizeDrag>
         </div>
       </div>
@@ -123,80 +48,37 @@
     <div class="col-2"></div>
 
     <div class="col-2">
-      <q-input
-        filled
-        type="number"
-        class="q-pt-xs"
-        :dense="true"
-        @focus="isactivearray[2] = false"
-        v-model="four[2].x"
-        label="x"
-        lazy-rules
-      />
-      <q-input
-        filled
-        type="number"
-        class="q-pt-xs"
-        :dense="true"
-        @focus="isactivearray[2] = false"
-        v-model="four[2].y"
-        label="y"
-        lazy-rules
-      />
-      <q-btn
-      size="sm" dense
-        color="white"
-        @click="reset(2)"
-        text-color="black"
-        :label="$t('reset') + $t('point') + '3'"
-      />
+      <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[2] = false" v-model="four[2].x"
+        label="x" lazy-rules />
+      <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[2] = false" v-model="four[2].y"
+        label="y" lazy-rules />
+      <q-btn size="sm" dense color="white" @click="reset(2)" text-color="black"
+        :label="$t('reset') + $t('point') + '3'" />
     </div>
     <div class="col-8">
-      <q-btn
-      size="sm" dense
-        color="white"
-        @click="resetall"
-        text-color="black"
-        :label="$t('resetall')"
-      />
+      <q-btn size="sm" dense color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
     </div>
     <div class="col-2">
-      <q-input
-        filled
-        type="number"
-        class=""
-        :dense="true"
-        @focus="isactivearray[3] = false"
-        v-model="four[3].x"
-        label="x"
-        lazy-rules
-      />
-      <q-input
-        filled
-        type="number"
-        class="q-pt-md"
-        :dense="true"
-        @focus="isactivearray[3] = false"
-        v-model="four[3].y"
-        label="y"
-        lazy-rules
-      />
-      <q-btn
-      size="sm" dense
-        color="white"
-        @click="reset(3)"
-        text-color="black"
-        :label="$t('reset') + $t('point') + '4'"
-      />
+      <q-input filled type="number" class="" :dense="true" @focus="isactivearray[3] = false" v-model="four[3].x"
+        label="x" lazy-rules />
+      <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[3] = false" v-model="four[3].y"
+        label="y" lazy-rules />
+      <q-btn size="sm" dense color="white" @click="reset(3)" text-color="black"
+        :label="$t('reset') + $t('point') + '4'" />
     </div>
   </div>
 </template>
 
 <style scoped>
-.point{
-  width: 100%;height: 100%;border-radius: 50%;background: #0000ff;color: aliceblue;
+.point {
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+  background: #0000ff;
+  color: aliceblue;
 }
-.action{
+
+.action {
   background-color: aqua;
 }
 </style>
@@ -219,6 +101,7 @@ import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
 import ClientConnection from "src/common/ClientConnection";
 import GlobalData from "src/common/GlobalData";
+import { Console } from "console";
 
 export default defineComponent({
   name: "ComponentFourPointCalibration",
@@ -274,7 +157,7 @@ export default defineComponent({
       { x: 0, y: 0 },
       { x: 0, y: 0 },
     ]); //点的位置
-    const now_index=ref(0)
+    const now_index = ref(0)
     const isshowarray = ref([true, true, true, true]);
     const isactivearray = ref([true, true, true, true]);
     const ste_status = ref(0);
@@ -311,13 +194,53 @@ export default defineComponent({
     });
     const activeMouseDown = (index: number) => {
       isactivearray.value[index] = true;
-      now_index.value=index
+      now_index.value = index
     };
     const mouseUpHandler = (index: number) => {
       isactivearray.value[index] = false;
     };
+    const keyDown = () => {
+      document.onkeydown = (e) => {
+
+
+        // let x = Math.ceil(four[now_index.value].x / Proportion.value.x);
+        // let y = Math.ceil((config.height - four[now_index.value].y) / Proportion.value.y);
+        // points[now_index.value].x!=x?points[now_index.value].x = x:''
+        // points[now_index.value].y!= y?points[now_index.value].y = y:''
+
+        let e1 = e || window.event || arguments.callee.caller.arguments[0]
+        switch (e.code) {
+          case "KeyW":
+            points[now_index.value].x
+            points[now_index.value].y--
+            break;
+          case "KeyA":
+            points[now_index.value].x--;
+            points[now_index.value].y
+            break;
+          case "KeyS":
+            points[now_index.value].x;
+            points[now_index.value].y++
+            break;
+          case "KeyD":
+            points[now_index.value].x++;
+            points[now_index.value].y
+            break;
+          default:
+            break;
+        }
+        let tmp = { left: points[now_index.value].x, top: points[now_index.value].y }
+        eval(`moveHandler_${now_index.value+1}(tmp)`);
+        isactivearray.value[now_index.value] = false;
+        isshowarray.value[now_index.value] = false;
+        setTimeout(() => {
+          isshowarray.value[now_index.value] = true;
+        }, 100);
+      }
+    }
     onMounted(() => {
       ste_status.value = 1;
+      keyDown()
       setpoa();
 
       setTimeout(() => {
@@ -327,8 +250,6 @@ export default defineComponent({
 
     const use_server_config = () => {
       for (let index = 0; index < fourpostion.value.length; index++) {
-        // defaultfourpostion.value[index].x = fourpostion.value[index].x;
-        // defaultfourpostion.value[index].y = fourpostion.value[index].y;
         defaultfour.value[index].x = config.point4[index].def_x;
         defaultfour.value[index].y = config.point4[index].def_y;
         four[index].x = config.point4[index].x;
@@ -338,50 +259,50 @@ export default defineComponent({
 
     const setpoa = () => {
       try {
-      points[0].x = 0;
-      points[0].y = 0;
+        points[0].x = 0;
+        points[0].y = 0;
 
-      points[1].x = div.value.offsetWidth - 25;
-      points[1].y = 0;
+        points[1].x = div.value.offsetWidth - 25;
+        points[1].y = 0;
 
-      points[2].x = 0;
-      points[2].y = div.value.offsetHeight - 25;
+        points[2].x = 0;
+        points[2].y = div.value.offsetHeight - 25;
 
-      points[3].x = div.value.offsetWidth - 25;
-      points[3].y = div.value.offsetHeight - 25;
+        points[3].x = div.value.offsetWidth - 25;
+        points[3].y = div.value.offsetHeight - 25;
 
-      fourpostion.value[0].x = 0;
-      fourpostion.value[0].y = 0;
+        fourpostion.value[0].x = 0;
+        fourpostion.value[0].y = 0;
 
-      fourpostion.value[1].x = div.value.offsetWidth - 25;
-      fourpostion.value[1].y = 0;
+        fourpostion.value[1].x = div.value.offsetWidth - 25;
+        fourpostion.value[1].y = 0;
 
-      fourpostion.value[2].x = 0;
-      fourpostion.value[2].y = div.value.offsetHeight - 25;
+        fourpostion.value[2].x = 0;
+        fourpostion.value[2].y = div.value.offsetHeight - 25;
 
-      fourpostion.value[3].x = div.value.offsetWidth - 25;
-      fourpostion.value[3].y = div.value.offsetHeight - 25;
+        fourpostion.value[3].x = div.value.offsetWidth - 25;
+        fourpostion.value[3].y = div.value.offsetHeight - 25;
 
-      Proportion.value.x = config.width / (div.value.offsetWidth - 25);
-      Proportion.value.y = config.height / (div.value.offsetHeight - 25);
-      for (let index = 0; index < fourpostion.value.length; index++) {
-        defaultfourpostion.value[index].x = fourpostion.value[index].x;
-        defaultfourpostion.value[index].y = fourpostion.value[index].y;
-        defaultfour.value[index].x = config.point4[index].def_x;
-        defaultfour.value[index].y = config.point4[index].def_y;
-        four[index].x = config.point4[index].x;
-        four[index].y = config.point4[index].y;
-      }
-      if (
-        sessionStorage.FourPointCalibration &&
-        sessionStorage.FourPointCalibration.length > 0
-      ) {
-        set_cache.value = JSON.parse(sessionStorage.FourPointCalibration);
-        use_set_cache();
-      } else {
-      }
-      set_point_x();
-    } catch (error) {
+        Proportion.value.x = config.width / (div.value.offsetWidth - 25);
+        Proportion.value.y = config.height / (div.value.offsetHeight - 25);
+        for (let index = 0; index < fourpostion.value.length; index++) {
+          defaultfourpostion.value[index].x = fourpostion.value[index].x;
+          defaultfourpostion.value[index].y = fourpostion.value[index].y;
+          defaultfour.value[index].x = config.point4[index].def_x;
+          defaultfour.value[index].y = config.point4[index].def_y;
+          four[index].x = config.point4[index].x;
+          four[index].y = config.point4[index].y;
+        }
+        if (
+          sessionStorage.FourPointCalibration &&
+          sessionStorage.FourPointCalibration.length > 0
+        ) {
+          set_cache.value = JSON.parse(sessionStorage.FourPointCalibration);
+          use_set_cache();
+        } else {
+        }
+        set_point_x();
+      } catch (error) {
 
       }
     };
@@ -408,7 +329,7 @@ export default defineComponent({
             isshowarray.value[0] = true;
           }, 100);
         }
-        now_index.value=0
+        now_index.value = 0
         save_set_cache();
       },
       { deep: true }
@@ -436,7 +357,7 @@ export default defineComponent({
             isshowarray.value[1] = true;
           }, 100);
         }
-        now_index.value=1
+        now_index.value = 1
         save_set_cache();
       },
       { deep: true }
@@ -466,7 +387,7 @@ export default defineComponent({
             isshowarray.value[2] = true;
           }, 100);
         }
-        now_index.value=2
+        now_index.value = 2
         save_set_cache();
       },
       { deep: true }
@@ -496,7 +417,7 @@ export default defineComponent({
             isshowarray.value[3] = true;
           }, 100);
         }
-        now_index.value=3
+        now_index.value = 3
         save_set_cache();
       },
       { deep: true }
@@ -527,9 +448,9 @@ export default defineComponent({
       },
       { deep: true }
     );
-    watch(()=>now_index,(newval,oldval)=>{
-      set?.SetBlendingOption("blending_grids_select_point",`4:${now_index.value+1}`)
-    },{ deep: true })
+    watch(() => now_index, (newval, oldval) => {
+      set?.SetBlendingOption("blending_grids_select_point", `4:${now_index.value + 1}`)
+    }, { deep: true })
     //为了加载 缓存的配置时 同步点的位置
     const syncpoint = () => {
       for (let index = 0; index < fourpostion.value.length; index++) {
@@ -597,10 +518,10 @@ export default defineComponent({
     };
 
     const moveHandler_1 = (data: any) => {
-      let x = Math.ceil(
+      let x = Math.round(
         (data.left - fourpostion.value[0].x) * Proportion.value.x + 0
       );
-      let y = Math.ceil(
+      let y = Math.round(
         config.height - data.top * Proportion.value.y - fourpostion.value[0].y
       );
 
@@ -610,10 +531,10 @@ export default defineComponent({
       save_set_cache();
     };
     const moveHandler_2 = (data: any) => {
-      let x = Math.ceil(
+      let x = Math.round(
         (data.left - fourpostion.value[1].x) * Proportion.value.x + config.width
       );
-      let y = Math.ceil(
+      let y = Math.round(
         config.height - data.top * Proportion.value.y - fourpostion.value[1].y
       );
       four[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
@@ -621,22 +542,22 @@ export default defineComponent({
       save_set_cache();
     };
     const moveHandler_3 = (data: any) => {
-      let x = Math.ceil(
+      let x = Math.round(
         (data.left - fourpostion.value[2].x) * Proportion.value.x
       );
       let y = Math.abs(
-        Math.ceil((data.top - fourpostion.value[2].y) * Proportion.value.y)
+        Math.round((data.top - fourpostion.value[2].y) * Proportion.value.y)
       );
       four[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
       four[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
       save_set_cache();
     };
     const moveHandler_4 = (data: any) => {
-      let x = Math.ceil(
+      let x = Math.round(
         (data.left - fourpostion.value[3].x) * Proportion.value.x + config.width
       );
       let y = Math.abs(
-        Math.ceil((data.top - fourpostion.value[3].y) * Proportion.value.y)
+        Math.round((data.top - fourpostion.value[3].y) * Proportion.value.y)
       );
       four[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
       four[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
@@ -648,7 +569,7 @@ export default defineComponent({
       window.onresize = () => {
         return (() => {
           ste_status.value = 1;
-          if(div!=null)setpoa();
+          if (div != null) setpoa();
 
           setTimeout(() => {
             ste_status.value = 0;
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 876431c..f4b534c 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -97,7 +97,7 @@
         <div>
           <q-slider v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
             vertical reverse label-always />
-          <div> <q-input dense filled type="number" max="1" min="0"   step="0.1" v-model="array[group].alpha" label="alpha"
+          <div> <q-input dense filled type="number" max="1" min="0"   step="0.1"  @update:model-value="chang('alpha')" v-model="array[group].alpha" label="alpha"
               lazy-rules :rules="[
                 (val) =>
                   (val !== null && val !== '') ||
@@ -111,7 +111,7 @@
         <div>
           <q-slider  v-model="array[group].p" :min="0" @change="chang('p')" :max="16" :step="0.01" color="green"
             vertical reverse label-always />
-          <div> <q-input dense filled type="number" max="16" min="0" step="0.1" v-model="array[group].p" label="p"
+          <div> <q-input dense filled type="number" max="16" min="0" step="0.1" @update:model-value="chang('p')" v-model="array[group].p" label="p"
               lazy-rules :rules="[
                 (val) =>
                   (val !== null && val !== '') ||
@@ -124,13 +124,13 @@
 
         <div>
           <q-slider  v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green" vertical reverse label-always />
-          <div> <q-input dense filled type="number" max="16" min="0"  step="0.1" v-model="array[group].gamma" label="gamma"
+          <div> <q-input dense filled type="number" max="16" min="0"  step="0.1"  @update:model-value="chang('gamma')" v-model="array[group].gamma" label="gamma"
               lazy-rules :rules="[
                 (val) =>
                   (val !== null && val !== '') ||
                   $t('Please enter a number'),
                 (val) =>
-                  (val >= 0 && val <= 16) || $t('Please enter 0-100'),
+                  (val >= 0 && val <= 16) || $t('Please enter a value within the range'),
               ]" /></div>
           <p class="text-center">gamma</p>
         </div>
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 9c7313b..6e4a9b5 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -20,33 +20,34 @@
               v-model="RowsColumns[1]" />
           </div>
         </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]"
+                @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">
               <q-item>
-              <q-item-section avatar class="head_1">
-                {{ $t("line color") }}
-              </q-item-section>
-              <q-item-section>
-                <q-input
-                  v-model="color[0]"
-                  :rules="['anyColor']"
-                >
-                  <template v-slot:append>
-                    <q-icon name="colorize" class="cursor-pointer" @click="index = 0">
-                      <q-popup-proxy
-                        cover
-                        transition-show="scale"
-                        transition-hide="scale"
-                      >
-                        <q-color v-model="color[0]" @change="submit" />
-                      </q-popup-proxy>
-                    </q-icon>
-                  </template>
-                </q-input>
-              </q-item-section>
-            </q-item>
+                <q-item-section avatar class="head_1">
+                  {{ $t("line color") }}
+                </q-item-section>
+                <q-item-section>
+                  <q-input v-model="color[0]" :rules="['anyColor']">
+                    <template v-slot:append>
+                      <q-icon name="colorize" class="cursor-pointer" @click="index = 0">
+                        <q-popup-proxy cover transition-show="scale" transition-hide="scale">
+                          <q-color v-model="color[0]" @change="submit" />
+                        </q-popup-proxy>
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </q-item-section>
+              </q-item>
             </div>
           </div>
         </div>
@@ -55,31 +56,48 @@
             <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>
+                <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">
+              <q-item>
+                <q-item-section avatar class="head_1">
+                  {{ $t("center line color") }}
+                </q-item-section>
+                <q-item-section>
+                  <q-input v-model="color[2]" :rules="['anyColor']">
+                    <template v-slot:append>
+                      <q-icon name="colorize" class="cursor-pointer" @click="index = 2">
+                        <q-popup-proxy cover transition-show="scale" transition-hide="scale">
+                          <q-color v-model="color[2]" @change="submit" />
+                        </q-popup-proxy>
+                      </q-icon>
+                    </template>
+                  </q-input>
+                </q-item-section>
+              </q-item>
+            </div>
+            <div class="col-2"><q-checkbox class="q-pt-md" @update:model-value="send_off(2)" v-model="RowsColumns[2]" /></div>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -111,8 +129,9 @@ export default defineComponent({
     const RowsColumns = reactive([false, false, false, false]);
     const index = ref(0);
     const color = reactive(["#ffffff", "#CCCCCC", "#000", "#000"]);
-    let model = reactive([20, 40]);
+    let model = reactive([20, 40, 20]);
     let options = ref([10, 20, 30, 40, 50]);
+    let line_width_options = ref([2,4,6,8,10, 20, 30, 40, 50]);
     const submit = () => {
       switch (index.value) {
         case 0:
@@ -122,7 +141,7 @@ export default defineComponent({
           set?.SetBlendingOption("blending_grids_background_color", color[index.value]);
           break;
         case 2:
-          //set?.SetBlendingOption("blending_grids_line_color",color[index.value]);
+          set?.SetBlendingOption("blending_grids_center_line_color",color[index.value]);
           break;
         case 3:
           //set?.SetBlendingOption("blending_grids_line_color",color[index.value]);
@@ -139,6 +158,9 @@ export default defineComponent({
         case 1:
           set?.SetBlendingOption("blending_grids_column", value + "");
           break;
+        case 2:
+          set?.SetBlendingOption("blending_grids_line_width", value + "");
+          break;
         default:
           break;
       }
@@ -154,7 +176,7 @@ export default defineComponent({
             set?.SetBlendingOption("blending_grids_show_column", RowsColumns[type] + "");
             break;
           case 2:
-
+            set?.SetBlendingOption("blending_grids_show_center_line", RowsColumns[type] + "");
             break;
           case 3:
 
@@ -168,11 +190,13 @@ export default defineComponent({
       let server_conf = JSON.parse($store.state.fusion_configuration).options
       model[0] = server_conf.blending_grids_row ?? 20;
       model[1] = server_conf.blending_grids_column ?? 40;
+      model[2] = server_conf.blending_grids_line_width ?? 6;
       color[0] = server_conf.blending_grids_line_color ?? "#ffffff"
       color[1] = server_conf.blending_grids_background_color ?? "#00ff5e"
+      color[2] = server_conf.blending_grids_center_line_color ?? "#3358de"
       RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true
       RowsColumns[1] = server_conf.blending_grids_show_column === "false" ? false : true
-
+      RowsColumns[2] = server_conf.blending_grids_show_center_line === "false" ? false : true
     }
     use_server_config()
 
@@ -197,6 +221,7 @@ export default defineComponent({
     }
     if (sessionStorage.GridSettings) get_sessionStorage()
     return {
+      line_width_options,
       model,
       options,
       submit,
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 6e5af40..63c8213 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -188,7 +188,6 @@ export default defineComponent({
       return $store.state.selected_projector;
     });
     let Proportion = ref({ x: 0, y: 0 });
-    let centor = ref({ x: 0, y: 0 });
     const div = ref();
     const now_index = ref(0);
     let nine = reactive([
@@ -434,12 +433,6 @@ export default defineComponent({
     onMounted(() => {
       ste_status.value = 1;
       startpostion();
-      for (let index = 0; index < defaultninepostion.value.length; index++) {
-        defaultninepostion.value[index].x = ninepostion.value[index].x;
-        defaultninepostion.value[index].y = ninepostion.value[index].y;
-        defaultnine.value[index].x = config.point9[index].def_x;
-        defaultnine.value[index].y = config.point9[index].def_y;
-      }
       setninepostion();
       use_set_cache();
       setTimeout(() => {
@@ -464,7 +457,7 @@ export default defineComponent({
             defaultnine.value[index].x = config.point9[index].def_x;
             defaultnine.value[index].y = config.point9[index].def_y;
           }
-          setninepostion();
+          //setninepostion();
           use_set_cache();
           setTimeout(() => {
             ste_status.value = 0;
@@ -487,35 +480,33 @@ export default defineComponent({
       ninepostion.value[0].x = 0;
       ninepostion.value[0].y = 0;
 
-      ninepostion.value[1].x = div.value.offsetWidth / 2 - 20;
+      ninepostion.value[1].x = div.value.offsetWidth / 2 - 20;  //
       ninepostion.value[1].y = 0;
 
-      ninepostion.value[2].x = div.value.offsetWidth - 20;
+      ninepostion.value[2].x = div.value.offsetWidth - 10;
       ninepostion.value[2].y = 0;
 
       ninepostion.value[3].x = 0;
-      ninepostion.value[3].y = div.value.offsetHeight / 2 - 8;
+      ninepostion.value[3].y = div.value.offsetHeight / 2 - 20;
 
-      ninepostion.value[4].x = div.value.offsetWidth / 2 - 20;
-      ninepostion.value[4].y = div.value.offsetHeight / 2 - 8;
+      ninepostion.value[4].x = div.value.offsetWidth / 2 - 20; //
+      ninepostion.value[4].y = div.value.offsetHeight / 2 - 20;
 
-      ninepostion.value[5].x = div.value.offsetWidth - 20;
-      ninepostion.value[5].y = div.value.offsetHeight / 2;
+      ninepostion.value[5].x = div.value.offsetWidth - 10;
+      ninepostion.value[5].y = div.value.offsetHeight / 2 -20;
 
       ninepostion.value[6].x = 0;
       ninepostion.value[6].y = div.value.offsetHeight - 20;
 
-      ninepostion.value[7].x = div.value.offsetWidth / 2 - 8;
+      ninepostion.value[7].x = div.value.offsetWidth / 2 - 20; //
       ninepostion.value[7].y = div.value.offsetHeight - 20;
 
-      ninepostion.value[8].x = div.value.offsetWidth - 20;
+      ninepostion.value[8].x = div.value.offsetWidth - 10;
       ninepostion.value[8].y = div.value.offsetHeight - 20;
 
       Proportion.value.x = config.width / (div.value.offsetWidth - 20);
       Proportion.value.y = config.height / (div.value.offsetHeight - 20);
 
-      centor.value.x = (config.width * 2) / (div.value.offsetWidth + 20);
-      centor.value.y = (config.height * 2) / (div.value.offsetHeight + 20);
 
       for (let index = 0; index < defaultninepostion.value.length; index++) {
         defaultninepostion.value[index].x = ninepostion.value[index].x;
@@ -526,7 +517,6 @@ export default defineComponent({
       if (sessionStorage.SurfaceCorrection) {
         set_cache.value = JSON.parse(sessionStorage.SurfaceCorrection);
         use_set_cache();
-      } else {
       }
       syncpoint();
     } catch (error) {
@@ -535,8 +525,6 @@ export default defineComponent({
     };
     const use_server_config = () => {
       for (let index = 0; index < defaultninepostion.value.length; index++) {
-        // defaultninepostion.value[index].x = ninepostion.value[index].x;
-        // defaultninepostion.value[index].y = ninepostion.value[index].y;
         defaultnine.value[index].x =  config.point9[index].def_x;
         defaultnine.value[index].y =  config.point9[index].def_y;
         nine[index].x = config.point9[index].x;
@@ -544,8 +532,6 @@ export default defineComponent({
       }
     };
     const reset = (index: number) => {
-      ninepostion.value[index].x = defaultninepostion.value[index].x;
-      ninepostion.value[index].y = defaultninepostion.value[index].y;
 
       nine[index].x = config.point9[index].def_x;
       nine[index].y = config.point9[index].def_y;
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index f118879..38aedd5 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -449,5 +449,6 @@ export default {
   "disable_blending_params":"disable blending params",
   "Please enter a value within the range":"Please enter a value within the range",
   "vertical correction":"vertical correction",
-  "horizontal correction":"horizontal correction"
+  "horizontal correction":"horizontal correction",
+  "line width":"line width"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 585cefc..7b8aed8 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -718,5 +718,6 @@ export default {
   "disable_blending_params":"禁用融合参数",
   "Please enter a value within the range":"请输入范围内的值",
   "vertical correction":"垂直校正",
-  "horizontal correction":"水平校正"
+  "horizontal correction":"水平校正",
+  "line width":"线宽"
 };

From 063d9d865271bf1c05401398990f52729c10b1ff Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Wed, 8 Feb 2023 15:33:12 +0800
Subject: [PATCH 64/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D4=E7=82=B9=E6=A0=A1?=
 =?UTF-8?q?=E6=AD=A3=E5=85=88=E6=8B=96=E5=8A=A8=E5=9C=A8=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E9=94=AE=E7=9B=98=E7=A7=BB=E5=8A=A8=E6=97=B6=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/FourPointCalibration.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index d879f86..6a231b8 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -528,6 +528,9 @@ export default defineComponent({
       four[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
       four[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
       isactivearray.value[0] = true;
+      points[now_index.value].x = data.left
+      points[now_index.value].y = data.top
+
       save_set_cache();
     };
     const moveHandler_2 = (data: any) => {
@@ -539,6 +542,8 @@ export default defineComponent({
       );
       four[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
       four[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      points[now_index.value].x = data.left
+      points[now_index.value].y = data.top
       save_set_cache();
     };
     const moveHandler_3 = (data: any) => {
@@ -550,6 +555,8 @@ export default defineComponent({
       );
       four[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
       four[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      points[now_index.value].x = data.left
+      points[now_index.value].y = data.top
       save_set_cache();
     };
     const moveHandler_4 = (data: any) => {
@@ -561,6 +568,8 @@ export default defineComponent({
       );
       four[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
       four[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+      points[now_index.value].x = data.left
+      points[now_index.value].y = data.top
       save_set_cache();
     };
     //窗口变动重新渲染

From b00fb02efb3539c1655d1c00bbc3570204bfa07e Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Wed, 8 Feb 2023 17:51:10 +0800
Subject: [PATCH 65/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E6=8A=95=E5=BD=B1=E4=BB=AA=E6=97=B6=E5=8F=91=E9=80=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 60 +++++++++++--------
 .../FusionSettings/FourPointCalibration.vue   |  1 +
 .../FusionSettings/FusionLocale.vue           | 21 ++++---
 src/i18n/en-US/index.ts                       |  4 +-
 src/i18n/zh-CN/index.ts                       |  4 +-
 5 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 98852ee..ada101b 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -4,30 +4,30 @@
     <div class="col-8 q-pt-md">
       <div ref="div" style="width: 100%; background-color: #646464; height: 100%">
         <div style="position: absolute">
-          <Vue3DraggableResizable :class="[options_model_v==index?'action':'']" v-for="(item, index) in config.ver_density.length" :initW="20" :initH="20"
+          <Vue3DraggableResizable  :class="[options_model_v==index?'action':'point']" v-for="(item, index) in config.ver_density.length" :initW="20" :initH="20"
             :resizable="false" :x="0" v-model:y="point_postion[index].y" :disabledX="true"
-            @activated="now_index = index" @dragging="dragStartHandle($event, index, 'v')">
+            @activated="now_index =options_model_v= index" @click="options_model_v = index" @dragging="dragStartHandle($event, index, 'v')">
             <span>v{{
               index+ 1
             }}</span>
           </Vue3DraggableResizable>
-          <Vue3DraggableResizable :class="[options_model_v==index?'action':'']" v-for="(item, index) in config.ver_density.length" :initW="20" :initH="20"
-            :resizable="false" :x="max_x_y[0]" v-model:y="point_postion[index].y" @activated="now_index = index"
+          <Vue3DraggableResizable :class="[options_model_v==index?'action':'point']" v-for="(item, index) in config.ver_density.length" :initW="20" :initH="20"
+            :resizable="false" :x="max_x_y[0]"  @click="options_model_v = index"   v-model:y="point_postion[index].y" @activated="now_index =options_model_v= index"
             @dragging="dragStartHandle($event, index, 'v')">
             <span>v{{
               index+ 1
             }}</span>
           </Vue3DraggableResizable>
-          <Vue3DraggableResizable :class="[options_model_h==index+5?'action':'']" v-for="(item, index) in config.hor_density.length" :initW="20" :initH="20"
-            :resizable="false" v-model:x="point_postion[index + 5].x" :y="-20" @activated="now_index = index + 5"
-            :disabledY="true" @dragging="dragStartHandle($event, index + 5, 'h')">
+          <Vue3DraggableResizable :class="[options_model_h==index+5?'action':'point']" v-for="(item, index) in config.hor_density.length" :initW="20" :initH="20"
+            :resizable="false" v-model:x="point_postion[index + 5].x" :y="-20" @activated="now_index =options_model_h = index + 5"
+            :disabledY="true"  @click="options_model_h = index+5 "   @dragging="dragStartHandle($event, index, 'h')">
             <span>h{{
               index+ 1
             }}</span>
           </Vue3DraggableResizable>
-          <Vue3DraggableResizable :class="[options_model_h==index+5?'action':'']" v-for="(item, index) in config.hor_density.length" :initW="20" :initH="20"
-            :resizable="false" v-model:x="point_postion[index + 5].x" @activated="now_index = index + 5"
-            :y="max_x_y[1] + 20" @dragging="dragStartHandle($event, index + 5, 'h')">
+          <Vue3DraggableResizable :class="[options_model_h==index+5?'action':'point']" v-for="(item, index) in config.hor_density.length" :initW="20" :initH="20"
+            :resizable="false" v-model:x="point_postion[index + 5].x" @activated="now_index =options_model_h= index + 5"
+            :y="max_x_y[1] + 20" @click="options_model_h = index+5"  @dragging="dragStartHandle($event, index, 'h')">
             <span>h{{
               index+ 1
             }}</span>
@@ -42,7 +42,7 @@
             <div class="col-2"></div>
             <div class="col-8">
               <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[index].y"
-                @update:model-value="chang(index, $event)" label="y" lazy-rules />
+                @update:model-value="chang(index, $event,'v')" label="y" lazy-rules />
               <q-btn size="sm" color="white" @click="reset(index)" text-color="black"
                 :label="$t('reset') + `v${index + 1}`" />
             </div>
@@ -55,7 +55,7 @@
       <div class="box">
         <div class="box_son" v-for="(item, index) in 5">
           <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[index + 5].x" label="x"
-            @update:model-value="chang(index + 5, $event)" lazy-rules />
+            @update:model-value="chang(index + 5, $event,'h')" lazy-rules />
           <q-btn size="sm" color="white" @click="reset(index + 5)" text-color="black"
             :label="$t('reset') + `h${index + 1}`" />
         </div>
@@ -68,10 +68,10 @@
   <div>
       <div class="row">
         <div class="col-1"></div>
-        <div class="col-2"> <q-select class="q-pt-md" label="水平" :dense="true" filled v-model="options_model_v" :options="options_v" emit-value
+        <div class="col-2"> <q-select class="q-pt-md" :label="$t('level')" :dense="true" filled v-model="options_model_v" :options="options_v" emit-value
             map-options /></div>
         <div class="col-2"> <q-input filled type="number" class="q-pt-md" :dense="true"
-            v-model="value[options_model_v].y" @update:model-value="chang(options_model_v, $event)" lazy-rules />
+            v-model="value[options_model_v].y" @update:model-value="chang(options_model_v, $event,'v')" lazy-rules />
         </div>
         <div class="q-pt-md">
           <q-btn color="white" @click="reset(options_model_v)" text-color="black" :label="$t('reset')" />
@@ -79,13 +79,13 @@
       </div>
       <div class="row">
         <div class="col-1"></div>
-        <div class="col-2"> <q-select class="q-pt-md"  label="垂直" :dense="true" filled v-model="options_model_h" :options="options_h" emit-value
+        <div class="col-2"> <q-select class="q-pt-md"  :label="$t('vertical')" :dense="true" filled v-model="options_model_h" :options="options_h" emit-value
             map-options /></div>
         <div class="col-2"> <q-input filled type="number" class="q-pt-md" :dense="true"
-            v-model="value[options_model_h].x" @update:model-value="chang(options_model_h, $event)" lazy-rules />
+            v-model="value[options_model_h].x" @update:model-value="chang(options_model_h, $event,'h')" lazy-rules />
         </div>
         <div class="q-pt-md">
-          <q-btn  color="white" @click="reset(options_model_v)" text-color="black" :label="$t('reset')" />
+          <q-btn  color="white" @click="reset(options_model_h)" text-color="black" :label="$t('reset')" />
         </div>
       </div>
 
@@ -119,7 +119,12 @@
 }
 
 .action {
-  background-color: aqua;
+  background-color: rgb(27, 180, 111);
+  border-radius: 50%;
+}
+.point{
+  background-color: rgb(186, 245, 245);
+  border-radius: 50%;
 }
 </style>
 <script lang="ts">
@@ -201,17 +206,19 @@ export default defineComponent({
     const set_cache: any = ref([]);
     const ste_status = ref(0);
 
-    const chang = (index: number, $event: any) => {
+    const chang = (index: number, $event: any,type:string) => {
       let x = 0
       let y = 0
-      if (index < 5) {
+      if (type=='v') {
         x = default_location[9].y;
         y = Math.ceil((config.height - $event) / Proportion.value.y);
         send_configuration(index, $event,'v')
+        options_model_v.value=index
       } else {
         x = Math.ceil($event / Proportion.value.x);
         y = default_location[0].x;
-        send_configuration(index-5, $event,'h')
+        send_configuration(index, $event,'h')
+        options_model_h.value=index
       }
       point_postion[index].x = Number(x)
       point_postion[index].y = Number(y)
@@ -249,7 +256,7 @@ export default defineComponent({
       sessionStorage.DensityCorrection = JSON.stringify(set_cache.value);
     });
     watch(() => now_index, (newval, oldval) => {
-      now_index.value > 5 ? set?.SetBlendingOption("blending_grids_select_point", `density_h:${now_index.value - 4}`) : set?.SetBlendingOption("blending_grids_select_point", `density_v:${now_index.value + 1}`)
+      now_index.value > 4 ? set?.SetBlendingOption("blending_grids_select_point", `density_h:${now_index.value - 4}`) : set?.SetBlendingOption("blending_grids_select_point", `density_v:${now_index.value + 1}`)
     }, { deep: true })
     watch(
       () => configselsect,
@@ -450,7 +457,7 @@ export default defineComponent({
           set?.SetBlendingVerDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            index + 1,
+            index+1,
             Number(value)
           );
         }
@@ -458,7 +465,7 @@ export default defineComponent({
           set?.SetBlendingHorDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            index -4,
+            index-4,
             Number(value)
           );
         }
@@ -471,7 +478,7 @@ export default defineComponent({
       let obj_y = $event.y
       if (type == 'h') {
         let x =
-          config.width / 4 * (index - 5) +
+
           Math.ceil(
             (obj_x - default_location[index].x) * Proportion.value.x
           );
@@ -481,7 +488,8 @@ export default defineComponent({
           Math.ceil(
             (obj_y - default_location[index].y) * Proportion.value.y
           );
-        value[index].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+          console.log(index, x,'h')
+        value[index+5].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
         send_configuration(index, x,'h')
       }
       if (type == 'v') {
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 6a231b8..03864f1 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -449,6 +449,7 @@ export default defineComponent({
       { deep: true }
     );
     watch(() => now_index, (newval, oldval) => {
+      if(ste_status.value == 1)return
       set?.SetBlendingOption("blending_grids_select_point", `4:${now_index.value + 1}`)
     }, { deep: true })
     //为了加载 缓存的配置时 同步点的位置
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index f4b534c..79618a0 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -289,6 +289,7 @@ export default defineComponent({
     );
 
     const chang = (type: string) => {
+      if(ste_status.value == 1)return
       if (type == "alpha") {
         if ($store.state.enablefusion)
           set?.setBlendingAlphaParam(
@@ -384,7 +385,11 @@ export default defineComponent({
       }
     };
     onMounted(() => {
+      ste_status.value = 1;
       startconfig();
+      setTimeout(() => {
+        ste_status.value = 0;
+      }, 100);
     }),
     onBeforeUnmount(() => {
       sessionStorage.FusionLocale = JSON.stringify(set_cache.value);
@@ -393,7 +398,7 @@ export default defineComponent({
     watch(
       () => array[0].value,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion)
+        if ($store.state.enablefusion&&ste_status.value==0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -409,7 +414,7 @@ export default defineComponent({
     watch(
       () => array[1].value,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion)
+        if ($store.state.enablefusion&&ste_status.value==0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -425,7 +430,7 @@ export default defineComponent({
     watch(
       () => array[2].value,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion)
+        if ($store.state.enablefusion&&ste_status.value==0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -441,7 +446,7 @@ export default defineComponent({
     watch(
       () => array[3].value,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion)
+        if ($store.state.enablefusion&&ste_status.value==0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -458,7 +463,7 @@ export default defineComponent({
     watch(
       () => array[0].isshow,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion)
+        if ($store.state.enablefusion&&ste_status.value==0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -473,7 +478,7 @@ export default defineComponent({
     watch(
       () => array[1].isshow,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion)
+        if ($store.state.enablefusion&&ste_status.value==0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -489,7 +494,7 @@ export default defineComponent({
     watch(
       () => array[2].isshow,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion)
+        if ($store.state.enablefusion&&ste_status.value==0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -505,7 +510,7 @@ export default defineComponent({
     watch(
       () => array[3].isshow,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion)
+        if ($store.state.enablefusion&&ste_status.value==0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 38aedd5..e4b5f13 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -450,5 +450,7 @@ export default {
   "Please enter a value within the range":"Please enter a value within the range",
   "vertical correction":"vertical correction",
   "horizontal correction":"horizontal correction",
-  "line width":"line width"
+  "line width":"line width",
+  "level":"level",
+  "vertical":"vertical"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 7b8aed8..6db32db 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -719,5 +719,7 @@ export default {
   "Please enter a value within the range":"请输入范围内的值",
   "vertical correction":"垂直校正",
   "horizontal correction":"水平校正",
-  "line width":"线宽"
+  "line width":"线宽",
+  "level":"水平",
+  "vertical":"垂直"
 };

From 0e413d7aee360567c21ce816c782847bcbcd9cfd Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cxte.com.cn>
Date: Thu, 9 Feb 2023 09:28:10 +0800
Subject: [PATCH 66/78] =?UTF-8?q?=E8=9E=8D=E5=90=88=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 42 ++++++++++++-------
 .../FusionSettings/FourPointCalibration.vue   | 29 ++++++++-----
 .../FusionSettings/GridSettings.vue           |  6 +--
 .../FusionSettings/SurfaceCorrection.vue      | 29 ++++++++-----
 src/components/FusionSettingsDialog.vue       |  8 ++--
 5 files changed, 72 insertions(+), 42 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 98852ee..06aced7 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -314,29 +314,41 @@ export default defineComponent({
         index < config.hor_density.length + config.ver_density.length;
         index++
       ) {
-        reset(index);
-      }
+        reset(index, false);
+      }	  
+	  set?.SetBlendingVerDensity(
+          $store.getters.GetTheCurrentlySelectedCamera[0],
+          $store.getters.GetTheCurrentlySelectedCamera[1],
+          -1, 0
+        );
     };
-    const reset = (index: number) => {
+    const reset = (index: number, send: boolean) => {
+	  send = send?? true;
       if (index > 4) {
         value[index].x = config.hor_density[index - 5].def_x;
         value[index].y = config.hor_density[index - 5].def_y;
 
-        set?.SetBlendingHorDensity(
-          $store.getters.GetTheCurrentlySelectedCamera[0],
-          $store.getters.GetTheCurrentlySelectedCamera[1],
-          index - 5 + 1,
-          Number(value[index].x)
-        );
+        if (send)
+		{
+		  set?.SetBlendingHorDensity(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            index - 5 + 1,
+            Number(value[index].x)
+          );
+		}
       } else {
         value[index].x = config.ver_density[index].def_x;
         value[index].y = config.ver_density[index].def_y;
-        set?.SetBlendingVerDensity(
-          $store.getters.GetTheCurrentlySelectedCamera[0],
-          $store.getters.GetTheCurrentlySelectedCamera[1],
-          index + 1,
-          Number(value[index].y)
-        );
+		if (send)
+		{
+          set?.SetBlendingVerDensity(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            index + 1,
+            Number(value[index].y)
+          );
+		}
       }
 
       point_postion[index].y = default_location[index].y;
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 6a231b8..7c9efe4 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -489,21 +489,25 @@ export default defineComponent({
         isshowarray.value[index] = true;
       }, 100);
     };
-    const reset = (index: number) => {
+    const reset = (index: number, send: boolean) => {
+	  send = send?? true;
       fourpostion.value[index].x = defaultfourpostion.value[index].x;
       fourpostion.value[index].y = defaultfourpostion.value[index].y;
 
       four[index].x = config.point4[index].def_x;
       four[index].y = config.point4[index].def_y;
 
-      set?.setBlendingCorrection(
-        $store.getters.GetTheCurrentlySelectedCamera[0],
-        $store.getters.GetTheCurrentlySelectedCamera[1],
-        4,
-        index + 1,
-        Number(config.point4[index].def_x),
-        Number(config.point4[index].def_y)
-      );
+	  if (send)
+	  {
+         set?.setBlendingCorrection(
+           $store.getters.GetTheCurrentlySelectedCamera[0],
+           $store.getters.GetTheCurrentlySelectedCamera[1],
+           4,
+           index + 1,
+           Number(config.point4[index].def_x),
+           Number(config.point4[index].def_y)
+         );
+	  }
 
       isshowarray.value[index] = false;
       setTimeout(() => {
@@ -513,8 +517,13 @@ export default defineComponent({
 
     const resetall = () => {
       for (let index = 0; index < fourpostion.value.length; index++) {
-        reset(index);
+        reset(index, false);
       }
+	  set?.setBlendingCorrection(
+        $store.getters.GetTheCurrentlySelectedCamera[0],
+        $store.getters.GetTheCurrentlySelectedCamera[1],
+        4, 0, 0, 0
+      );
     };
 
     const moveHandler_1 = (data: any) => {
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 6e4a9b5..c0ec2e7 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -141,7 +141,7 @@ export default defineComponent({
           set?.SetBlendingOption("blending_grids_background_color", color[index.value]);
           break;
         case 2:
-          set?.SetBlendingOption("blending_grids_center_line_color",color[index.value]);
+          set?.SetBlendingOption("blending_grids_ellipse_line_color",color[index.value]);
           break;
         case 3:
           //set?.SetBlendingOption("blending_grids_line_color",color[index.value]);
@@ -192,8 +192,8 @@ export default defineComponent({
       model[1] = server_conf.blending_grids_column ?? 40;
       model[2] = server_conf.blending_grids_line_width ?? 6;
       color[0] = server_conf.blending_grids_line_color ?? "#ffffff"
-      color[1] = server_conf.blending_grids_background_color ?? "#00ff5e"
-      color[2] = server_conf.blending_grids_center_line_color ?? "#3358de"
+      color[1] = server_conf.blending_grids_background_color ?? "#7f7f7f"
+      color[2] = server_conf.blending_grids_ellipse_line_color ?? "#0000ff"
       RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true
       RowsColumns[1] = server_conf.blending_grids_show_column === "false" ? false : true
       RowsColumns[2] = server_conf.blending_grids_show_center_line === "false" ? false : true
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 63c8213..75848bc 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -531,19 +531,23 @@ export default defineComponent({
         nine[index].y = config.point9[index].y;
       }
     };
-    const reset = (index: number) => {
+    const reset = (index: number, send: boolean) => {
+	  send = send?? true;
 
       nine[index].x = config.point9[index].def_x;
       nine[index].y = config.point9[index].def_y;
 
-      set?.setBlendingCorrection(
-        $store.getters.GetTheCurrentlySelectedCamera[0],
-        $store.getters.GetTheCurrentlySelectedCamera[1],
-        9,
-        index + 1,
-        Number(config.point9[index].def_x),
-        Number(config.point9[index].def_y)
-      );
+	  if (send)
+	  {
+        set?.setBlendingCorrection(
+          $store.getters.GetTheCurrentlySelectedCamera[0],
+          $store.getters.GetTheCurrentlySelectedCamera[1],
+          9,
+          index + 1,
+          Number(config.point9[index].def_x),
+          Number(config.point9[index].def_y)
+        );
+	  }
 
       isshowarray.value[index] = false;
       setTimeout(() => {
@@ -552,8 +556,13 @@ export default defineComponent({
     };
     const resetall = () => {
       for (let index = 0; index < nine.length; index++) {
-        reset(index);
+        reset(index, false);
       }
+      set?.setBlendingCorrection(
+        $store.getters.GetTheCurrentlySelectedCamera[0],
+        $store.getters.GetTheCurrentlySelectedCamera[1],
+        9, 0, 0, 0
+      );
     };
     watch(
       () => nine[0],
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index a5461ed..8d555a8 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -285,7 +285,7 @@ export default defineComponent({
     const EnableBlending = ref(false);
     let optionsstr = ref();
     optionsstr.value = "FusionLocale";
-    const disable_blending_params_id = ref("1");
+    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);
@@ -312,7 +312,7 @@ export default defineComponent({
         let tmp = ""
         switch (newVal.value) {
           case 'FusionLocale':
-            tmp = '0'
+            tmp = "blending"
             break;
           case 'FourPointCalibration':
             tmp = '4'
@@ -326,7 +326,7 @@ export default defineComponent({
           default:
             break;
         }
-        set?.SetBlendingOption("blending_grids_select_ui", tmp)
+		if (tmp.length) set?.SetBlendingOption("blending_grids_select_ui", tmp)
       },
       { deep: true })
 
@@ -393,7 +393,7 @@ export default defineComponent({
 
         });
         get_scenes()
-        set?.SetBlendingOption("blending_grids_select_ui", '0')
+        set?.SetBlendingOption("blending_grids_select_ui", "blending")
       }, 1000);
     });
     const save_cover_name = ref("")

From fa0194d4b919cee60248a5c25f7b9d35c95c8029 Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cxte.com.cn>
Date: Thu, 9 Feb 2023 09:50:54 +0800
Subject: [PATCH 67/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/GridSettings.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index c0ec2e7..0b18b4d 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -176,7 +176,7 @@ export default defineComponent({
             set?.SetBlendingOption("blending_grids_show_column", RowsColumns[type] + "");
             break;
           case 2:
-            set?.SetBlendingOption("blending_grids_show_center_line", RowsColumns[type] + "");
+            set?.SetBlendingOption("blending_grids_show_ellipse", RowsColumns[type] + "");
             break;
           case 3:
 
@@ -196,7 +196,7 @@ export default defineComponent({
       color[2] = server_conf.blending_grids_ellipse_line_color ?? "#0000ff"
       RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true
       RowsColumns[1] = server_conf.blending_grids_show_column === "false" ? false : true
-      RowsColumns[2] = server_conf.blending_grids_show_center_line === "false" ? false : true
+      RowsColumns[2] = server_conf.blending_grids_show_ellipse === "false" ? false : true
     }
     use_server_config()
 

From 34aba5bcf49f1805d5d7281401bf158604067ffe Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 9 Feb 2023 10:17:41 +0800
Subject: [PATCH 68/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9B=E7=82=B9?=
 =?UTF-8?q?=E6=A0=A1=E6=AD=A3=E9=87=8D=E7=BD=AE=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/FourPointCalibration.vue   |  28 ++--
 .../FusionSettings/FusionLocale.vue           | 137 ++++++++----------
 .../FusionSettings/GridSettings.vue           |   2 +-
 .../FusionSettings/SurfaceCorrection.vue      |  57 ++++----
 src/i18n/en-US/index.ts                       |   3 +-
 src/i18n/zh-CN/index.ts                       |   3 +-
 6 files changed, 107 insertions(+), 123 deletions(-)

diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 03864f1..faa7db8 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -22,25 +22,25 @@
     <div class="col-8">
       <div ref="div" style="background-color: #646464; height: 40vh">
         <div style="position: absolute">
-          <vue3ResizeDrag style="border: 0;" :class="[now_index == 0 ? 'action' : '']" v-if="isshowarray[0]"
+          <vue3ResizeDrag style="border: 0;" :class="[now_index == 0 ? 'action' : 'point']" v-if="isshowarray[0]"
             :isActive="isactivearray[0]" @mousedown="activeMouseDown(0)" @mouseUpHandler="mouseUpHandler(0)" :w="20"
             :h="20" :x="points[0].x" :y="points[0].y" :isResizable="false" @moveHandler="moveHandler_1">
-            <div class="point">1</div>
+            <div >1</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag style="border: 0;" :class="[now_index == 1 ? 'action' : '']" v-if="isshowarray[1]"
+          <vue3ResizeDrag style="border: 0;" :class="[now_index == 1 ? 'action' : 'point']" v-if="isshowarray[1]"
             :isActive="isactivearray[1]" @mousedown="activeMouseDown(1)" @mouseUpHandler="mouseUpHandler(1)" :w="20"
             :h="20" :x="points[1].x" :y="points[1].y" :isResizable="false" @moveHandler="moveHandler_2">
-            <div class="point">2</div>
+            <div >2</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag style="border: 0;" :class="[now_index == 2 ? 'action' : '']" v-if="isshowarray[2]"
+          <vue3ResizeDrag style="border: 0;" :class="[now_index == 2 ? 'action' : 'point']" v-if="isshowarray[2]"
             :isActive="isactivearray[2]" @mousedown="activeMouseDown(2)" @mouseUpHandler="mouseUpHandler(2)" :w="20"
             :h="20" :x="points[2].x" :y="points[2].y" :isResizable="false" @moveHandler="moveHandler_3">
-            <div class="point">3</div>
+            <div >3</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag style="border: 0;" :class="[now_index == 3 ? 'action' : '']" v-if="isshowarray[3]"
+          <vue3ResizeDrag style="border: 0;" :class="[now_index == 3 ? 'action' : 'point']" v-if="isshowarray[3]"
             :isActive="isactivearray[3]" @mousedown="activeMouseDown(3)" @mouseUpHandler="mouseUpHandler(3)" :w="20"
             :h="20" :x="points[3].x" :y="points[3].y" :isResizable="false" @moveHandler="moveHandler_4">
-            <div class="point">4</div>
+            <div >4</div>
           </vue3ResizeDrag>
         </div>
       </div>
@@ -59,7 +59,7 @@
       <q-btn size="sm" dense color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
     </div>
     <div class="col-2">
-      <q-input filled type="number" class="" :dense="true" @focus="isactivearray[3] = false" v-model="four[3].x"
+      <q-input filled type="number"  :dense="true" @focus="isactivearray[3] = false" v-model="four[3].x"
         label="x" lazy-rules />
       <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[3] = false" v-model="four[3].y"
         label="y" lazy-rules />
@@ -71,14 +71,13 @@
 
 <style scoped>
 .point {
-  width: 100%;
-  height: 100%;
   border-radius: 50%;
   background: #0000ff;
   color: aliceblue;
 }
 
 .action {
+  border-radius: 50%;
   background-color: aqua;
 }
 </style>
@@ -202,12 +201,6 @@ export default defineComponent({
     const keyDown = () => {
       document.onkeydown = (e) => {
 
-
-        // let x = Math.ceil(four[now_index.value].x / Proportion.value.x);
-        // let y = Math.ceil((config.height - four[now_index.value].y) / Proportion.value.y);
-        // points[now_index.value].x!=x?points[now_index.value].x = x:''
-        // points[now_index.value].y!= y?points[now_index.value].y = y:''
-
         let e1 = e || window.event || arguments.callee.caller.arguments[0]
         switch (e.code) {
           case "KeyW":
@@ -491,6 +484,7 @@ export default defineComponent({
       }, 100);
     };
     const reset = (index: number) => {
+      isactivearray.value[index] = false;
       fourpostion.value[index].x = defaultfourpostion.value[index].x;
       fourpostion.value[index].y = defaultfourpostion.value[index].y;
 
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 79618a0..9988d5b 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -97,48 +97,47 @@
         <div>
           <q-slider v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
             vertical reverse label-always />
-          <div> <q-input dense filled type="number" max="1" min="0"   step="0.1"  @update:model-value="chang('alpha')" v-model="array[group].alpha" label="alpha"
-              lazy-rules :rules="[
+          <div> <q-input dense filled type="number" max="1" min="0" step="0.1" @update:model-value="chang('alpha')"
+              v-model="array[group].alpha" label="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'),
-              ]" /></div>
-          <p class="text-center">alpha</p>
+              ]" /><q-btn color="white" @click="reset('alpha')" text-color="black" :label="$t('reset')" /></div>
         </div>
 
         <div>
-          <q-slider  v-model="array[group].p" :min="0" @change="chang('p')" :max="16" :step="0.01" color="green"
+          <q-slider v-model="array[group].p" :min="0" @change="chang('p')" :max="16" :step="0.01" color="green" vertical
+            reverse label-always />
+          <div> <q-input dense filled type="number" max="16" min="0" step="0.1" @update:model-value="chang('p')"
+              v-model="array[group].p" label="Power" 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-btn color="white" @click="reset('p')" text-color="black" :label="$t('reset')" /></div>
+        </div>
+
+        <div>
+          <q-slider v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green"
             vertical reverse label-always />
-          <div> <q-input dense filled type="number" max="16" min="0" step="0.1" @update:model-value="chang('p')" v-model="array[group].p" label="p"
-              lazy-rules :rules="[
+          <div> <q-input dense filled type="number" max="16" min="0" step="0.1" @update:model-value="chang('gamma')"
+              v-model="array[group].gamma" label="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'),
-              ]" /></div>
-          <p class="text-center">p</p>
-        </div>
-
-        <div>
-          <q-slider  v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green" vertical reverse label-always />
-          <div> <q-input dense filled type="number" max="16" min="0"  step="0.1"  @update:model-value="chang('gamma')" v-model="array[group].gamma" label="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'),
-              ]" /></div>
-          <p class="text-center">gamma</p>
+              ]" /><q-btn color="white" @click="reset('gamma')" text-color="black" :label="$t('reset')" /></div>
         </div>
       </div>
     </div>
   </div>
-  <div>
-    <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
+
+    <div style="position: relative;">
+      <q-checkbox left-label  v-model="auxiliary_line" @update:model-value="(value, evt)=>{send_auxiliary_line(value)}" :label="$t('auxiliary lines')"/>
   </div>
 </template>
 
@@ -146,13 +145,18 @@
 .boder {
   border: 2px solid #0000;
 }
-.btn_bottom{
+
+.btn_bottom {
   margin-bottom: 0.5rem;
 }
-.btn_top{
+
+.btn_top {
   margin-top: 0.3rem;
 }
 
+p {
+  margin: 0;
+}
 </style>
 
 <script lang="ts">
@@ -165,7 +169,7 @@ import {
   withDefaults,
   onBeforeUnmount,
   reactive,
-onMounted,
+  onMounted,
 } from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
@@ -190,6 +194,10 @@ export default defineComponent({
       { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
     ]);
     const auto_sync = ref(false)
+    const auxiliary_line = ref(false)
+    const send_auxiliary_line=(val:boolean)=>{
+      set?.SetBlendingOption("blending_grids_assistant_lines",val?"1":"0");
+    }
     //正确的 索引编号
     let arr = [1, 0, 2, 3];
     let serverconfig = JSON.parse($store.state.fusion_configuration);
@@ -199,43 +207,21 @@ export default defineComponent({
         $store.getters.GetTheCurrentlySelectedCamera[1]
       );
     });
-    const add = (type: string) => {
-      let tmp: Number;
-      tmp = 0.01;
+    const reset = (type: string) => {
       switch (type) {
-        case "alpha":
-          array[group.value].alpha = Number((array[group.value].alpha += tmp).toFixed(2))
+        case 'gamma':
+        array[group.value].gamma=Number(config.params[group.value].def_gamma.toFixed(2));
           break;
-        case "p":
-          array[group.value].p = Number((array[group.value].p += tmp).toFixed(2))
+        case 'p':
+        array[group.value].p=Number(config.params[group.value].def_power.toFixed(2));
           break;
-        case "gamma":
-          array[group.value].gamma = Number((array[group.value].gamma += tmp).toFixed(2))
+        case 'alpha':
+        array[group.value].alpha=Number(config.params[group.value].def_alpha.toFixed(2));
           break;
         default:
           break;
       }
       chang(type)
-      save_set_cache()
-    }
-    const reduce = (type: string) => {
-      let tmp: Number;
-      tmp = -0.01;
-      switch (type) {
-        case "alpha":
-          array[group.value].alpha = Number((array[group.value].alpha += tmp).toFixed(2))
-          break;
-        case "p":
-          array[group.value].p = Number((array[group.value].p += tmp).toFixed(2))
-          break;
-        case "gamma":
-          array[group.value].gamma = Number((array[group.value].gamma += tmp).toFixed(2))
-          break;
-        default:
-          break;
-      }
-      chang(type)
-      save_set_cache()
     }
     const ste_status = ref(0);
     const use_set_cache = () => {
@@ -289,7 +275,7 @@ export default defineComponent({
     );
 
     const chang = (type: string) => {
-      if(ste_status.value == 1)return
+      if (ste_status.value == 1) return
       if (type == "alpha") {
         if ($store.state.enablefusion)
           set?.setBlendingAlphaParam(
@@ -371,7 +357,7 @@ export default defineComponent({
         array[arr[index]].isshow = config.params[index].enable;
         array[arr[index]].value = Number(config.params[index].size);
       }
-      if (sessionStorage.FusionLocale)set_cache.value = JSON.parse(sessionStorage.FusionLocale);
+      if (sessionStorage.FusionLocale) set_cache.value = JSON.parse(sessionStorage.FusionLocale);
       use_set_cache();
       setnowindex();
     };
@@ -391,14 +377,14 @@ export default defineComponent({
         ste_status.value = 0;
       }, 100);
     }),
-    onBeforeUnmount(() => {
-      sessionStorage.FusionLocale = JSON.stringify(set_cache.value);
-    });
+      onBeforeUnmount(() => {
+        sessionStorage.FusionLocale = JSON.stringify(set_cache.value);
+      });
 
     watch(
       () => array[0].value,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion&&ste_status.value==0)
+        if ($store.state.enablefusion && ste_status.value == 0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -414,7 +400,7 @@ export default defineComponent({
     watch(
       () => array[1].value,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion&&ste_status.value==0)
+        if ($store.state.enablefusion && ste_status.value == 0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -430,7 +416,7 @@ export default defineComponent({
     watch(
       () => array[2].value,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion&&ste_status.value==0)
+        if ($store.state.enablefusion && ste_status.value == 0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -446,7 +432,7 @@ export default defineComponent({
     watch(
       () => array[3].value,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion&&ste_status.value==0)
+        if ($store.state.enablefusion && ste_status.value == 0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -463,7 +449,7 @@ export default defineComponent({
     watch(
       () => array[0].isshow,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion&&ste_status.value==0)
+        if ($store.state.enablefusion && ste_status.value == 0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -478,7 +464,7 @@ export default defineComponent({
     watch(
       () => array[1].isshow,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion&&ste_status.value==0)
+        if ($store.state.enablefusion && ste_status.value == 0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -494,7 +480,7 @@ export default defineComponent({
     watch(
       () => array[2].isshow,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion&&ste_status.value==0)
+        if ($store.state.enablefusion && ste_status.value == 0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -510,7 +496,7 @@ export default defineComponent({
     watch(
       () => array[3].isshow,
       (newVal, oldVal) => {
-        if ($store.state.enablefusion&&ste_status.value==0)
+        if ($store.state.enablefusion && ste_status.value == 0)
           set?.SetBlendingOverlap(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
@@ -564,9 +550,9 @@ export default defineComponent({
         if (ste_status.value == 0) {
           //set_cache_tmp[1].value = Number(set_cache_tmp[1].value) + difference
 
-          if(difference==-1){
+          if (difference == -1) {
             set_cache_tmp[1].isshow = array[2].isshow
-          }else{
+          } else {
             set_cache_tmp[1].value = difference
           }
           set?.SetBlendingOverlap(0, 1, 0, set_cache_tmp[1].isshow, Number(set_cache_tmp[1].value));
@@ -588,9 +574,9 @@ export default defineComponent({
         if (ste_status.value == 0) {
           //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
-          }else{
+          } else {
             set_cache_tmp[2].value = difference
           }
           set?.SetBlendingOverlap(0, 0, 2, set_cache_tmp[2].isshow, Number(set_cache_tmp[2].value));
@@ -599,6 +585,7 @@ export default defineComponent({
       }
     }
     return {
+      send_auxiliary_line,
       group,
       array,
       chang,
@@ -607,8 +594,8 @@ export default defineComponent({
       selectedprojector,
       resetall,
       set_cache,
-      reduce,
-      add,
+      auxiliary_line,
+      reset,
       auto_sync,
       config
     };
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 6e4a9b5..56a2a81 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -193,7 +193,7 @@ export default defineComponent({
       model[2] = server_conf.blending_grids_line_width ?? 6;
       color[0] = server_conf.blending_grids_line_color ?? "#ffffff"
       color[1] = server_conf.blending_grids_background_color ?? "#00ff5e"
-      color[2] = server_conf.blending_grids_center_line_color ?? "#3358de"
+      color[2] = server_conf.blending_grids_center_line_color ?? "#00000"
       RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true
       RowsColumns[1] = server_conf.blending_grids_show_column === "false" ? false : true
       RowsColumns[2] = server_conf.blending_grids_show_center_line === "false" ? false : true
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 63c8213..f1bfb75 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -6,7 +6,7 @@
         <div class="col-6">
           <q-input filled type="number" class="q-pb-xs q-pt-md" @focus="isactivearray[0] = false" :dense="true"
             v-model="nine[0].x" label="x" lazy-rules />
-          <q-input filled type="number" class="" @focus="isactivearray[0] = false" :dense="true"
+          <q-input filled type="number"  @focus="isactivearray[0] = false" :dense="true"
             v-model="nine[0].y" label="y" lazy-rules />
           <q-btn size="sm" dense color="white" @click="reset(0)" text-color="black" :label="$t('reset') + $t('point') + '1'" />
         </div>
@@ -18,7 +18,7 @@
         <div class="col-4">
           <q-input filled type="number" class="q-pb-xs q-pt-md" @focus="isactivearray[1] = false" :dense="true"
             v-model="nine[1].x" label="x" lazy-rules />
-          <q-input filled type="number" class="" @focus="isactivearray[1] = false" :dense="true"
+          <q-input filled type="number"  @focus="isactivearray[1] = false" :dense="true"
             v-model="nine[1].y" label="y" lazy-rules />
           <q-btn size="sm" dense color="white" @click="reset(1)" text-color="black" :label="$t('reset') + $t('point') + '2'" />
         </div>
@@ -26,7 +26,7 @@
         <div class="col-4" style="padding-left: 2px">
           <q-input filled type="number" class="q-pb-xs  q-pt-md" :dense="true" v-model="nine[4].x" label="x"
             @focus="isactivearray[4] = false" lazy-rules />
-          <q-input filled type="number" class="" :dense="true" v-model="nine[4].y" label="y"
+          <q-input filled type="number"  :dense="true" v-model="nine[4].y" label="y"
             @focus="isactivearray[4] = false" lazy-rules />
           <q-btn size="sm" dense color="white" @click="reset(4)" text-color="black" :label="$t('reset') + $t('point') + '5'" />
         </div>
@@ -38,7 +38,7 @@
         <div class="col-6">
           <q-input filled type="number" @focus="isactivearray[2] = false" class="q-pb-xs q-pt-md" :dense="true"
             v-model="nine[2].x" label="x" lazy-rules />
-          <q-input filled type="number" class="" @focus="isactivearray[2] = false" :dense="true"
+          <q-input filled type="number"  @focus="isactivearray[2] = false" :dense="true"
             v-model="nine[2].y" label="y" lazy-rules />
           <q-btn size="sm" dense color="white" @click="reset(2)" text-color="black" :label="$t('reset') + $t('point') + '3'" />
         </div>
@@ -50,7 +50,7 @@
         <div class="col-10">
           <q-input filled type="number" @focus="isactivearray[3] = false" class="q-pb-xs q-pt-md" :dense="true"
             v-model="nine[3].x" label="x" lazy-rules />
-          <q-input filled type="number" class="" @focus="isactivearray[3] = false" :dense="true"
+          <q-input filled type="number"  @focus="isactivearray[3] = false" :dense="true"
             v-model="nine[3].y" label="y" lazy-rules />
           <q-btn size="sm" dense color="white" @click="reset(3)" text-color="black" :label="$t('reset') + $t('point') + '4'" />
         </div>
@@ -59,41 +59,41 @@
     <div class="col-8">
       <div ref="div" style="background-color: #646464; height: 40vh">
         <div style="position: absolute">
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==0?'action':'']" :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="20" :h="20" :x="ninepostion[0].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==0?'action':'point']" :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="20" :h="20" :x="ninepostion[0].x"
             :y="ninepostion[0].y" @mousedown="activeMouseDown(0)" :isResizable="false" @moveHandler="moveHandler_1">
-            <div class="point">1</div>
+            <div >1</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==1?'action':'']" :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="20" :h="20" :x="ninepostion[1].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==1?'action':'point']" :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="20" :h="20" :x="ninepostion[1].x"
             :y="ninepostion[1].y" @mousedown="activeMouseDown(1)" :isResizable="false" @moveHandler="moveHandler_2">
-            <div class="point">2</div>
+            <div >2</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==2?'action':'']" :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="20" :h="20" :x="ninepostion[2].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==2?'action':'point']" :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="20" :h="20" :x="ninepostion[2].x"
             :y="ninepostion[2].y" @mousedown="activeMouseDown(2)" :isResizable="false" @moveHandler="moveHandler_3">
-            <div class="point">3</div>
+            <div >3</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==3?'action':'']" :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="20" :h="20" :x="ninepostion[3].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==3?'action':'point']" :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="20" :h="20" :x="ninepostion[3].x"
             :y="ninepostion[3].y" @mousedown="activeMouseDown(3)" :isResizable="false" @moveHandler="moveHandler_4">
-            <div class="point">4</div>
+            <div >4</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==4?'action':'']" :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="20" :h="20" :x="ninepostion[4].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==4?'action':'point']" :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="20" :h="20" :x="ninepostion[4].x"
             :y="ninepostion[4].y" @mousedown="activeMouseDown(4)" :isResizable="false" @moveHandler="moveHandler_5">
-            <div class="point">5</div>
+            <div >5</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==5?'action':'']" :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="20" :h="20" :x="ninepostion[5].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==5?'action':'point']" :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="20" :h="20" :x="ninepostion[5].x"
             :y="ninepostion[5].y" @mousedown="activeMouseDown(5)" :isResizable="false" @moveHandler="moveHandler_6">
-            <div class="point">6</div>
+            <div >6</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==6?'action':'']" :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="20" :h="20" :x="ninepostion[6].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==6?'action':'point']" :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="20" :h="20" :x="ninepostion[6].x"
             :y="ninepostion[6].y" @mousedown="activeMouseDown(6)" :isResizable="false" @moveHandler="moveHandler_7">
-            <div class="point">7</div>
+            <div >7</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==7?'action':'']" :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="20" :h="20" :x="ninepostion[7].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==7?'action':'point']" :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="20" :h="20" :x="ninepostion[7].x"
             :y="ninepostion[7].y" @mousedown="activeMouseDown(7)" :isResizable="false" @moveHandler="moveHandler_8">
-            <div class="point">8</div>
+            <div >8</div>
           </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==8?'action':'']" :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="20" :h="20" :x="ninepostion[8].x"
+          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==8?'action':'point']" :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="20" :h="20" :x="ninepostion[8].x"
             :y="ninepostion[8].y" @mousedown="activeMouseDown(8)" :isResizable="false" @moveHandler="moveHandler_9">
-            <div class="point">9</div>
+            <div >9</div>
           </vue3ResizeDrag>
         </div>
       </div>
@@ -103,7 +103,7 @@
         <div class="col-10">
           <q-input filled type="number" @focus="isactivearray[5] = false" class="q-pb-xs" :dense="true"
             v-model="nine[5].x" label="x" lazy-rules />
-          <q-input filled type="number" class="" @focus="isactivearray[5] = false" :dense="true"
+          <q-input filled type="number"  @focus="isactivearray[5] = false" :dense="true"
             v-model="nine[5].y" label="y" lazy-rules />
           <q-btn size="sm" dense color="white" @click="reset(5)" text-color="black" :label="$t('reset') + $t('point') + '6'" />
         </div>
@@ -117,7 +117,7 @@
         <div class="col-6">
           <q-input filled type="number" @focus="isactivearray[6] = false" class="q-pb-xs" :dense="true"
             v-model="nine[6].x" label="x" lazy-rules />
-          <q-input filled type="number" class="" @focus="isactivearray[6] = false" :dense="true"
+          <q-input filled type="number"  @focus="isactivearray[6] = false" :dense="true"
             v-model="nine[6].y" label="y" lazy-rules />
           <q-btn size="sm" dense color="white" @click="reset(6)" text-color="black" :label="$t('reset') + $t('point') + '7'" />
         </div>
@@ -129,7 +129,7 @@
         <div class="col-6">
           <q-input filled type="number" @focus="isactivearray[7] = false" class="q-pb-xs" :dense="true"
             v-model="nine[7].x" label="x" lazy-rules />
-          <q-input filled type="number" class="" @focus="isactivearray[7] = false" :dense="true"
+          <q-input filled type="number"  @focus="isactivearray[7] = false" :dense="true"
             v-model="nine[7].y" label="y" lazy-rules />
           <q-btn size="sm" dense color="white" @click="reset(7)" text-color="black" :label="$t('reset') + $t('point') + '8'" />
         </div>
@@ -141,7 +141,7 @@
         <div class="col-6">
           <q-input filled type="number" @focus="isactivearray[8] = false" class="q-pb-xs" :dense="true"
             v-model="nine[8].x" label="x" lazy-rules />
-          <q-input filled type="number" class="" @focus="isactivearray[8] = false" :dense="true"
+          <q-input filled type="number"  @focus="isactivearray[8] = false" :dense="true"
             v-model="nine[8].y" label="y" lazy-rules />
           <q-btn size="sm" dense color="white" @click="reset(8)" text-color="black" :label="$t('reset') + $t('point') + '9'" />
         </div>
@@ -152,9 +152,10 @@
 
 <style scoped>
 .point{
-  width: 100%;height: 100%;border-radius: 50%;background: #00ff00;color: aliceblue;
+  border-radius: 50%;background: #00ff00;color: aliceblue;
 }
 .action{
+  border-radius: 50%;
   background-color: aqua;
 }
 </style>
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index e4b5f13..ef22767 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -452,5 +452,6 @@ export default {
   "horizontal correction":"horizontal correction",
   "line width":"line width",
   "level":"level",
-  "vertical":"vertical"
+  "vertical":"vertical",
+  "auxiliary lines":"auxiliary lines"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 6db32db..7b55ac1 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -721,5 +721,6 @@ export default {
   "horizontal correction":"水平校正",
   "line width":"线宽",
   "level":"水平",
-  "vertical":"垂直"
+  "vertical":"垂直",
+  "auxiliary lines":"辅助线"
 };

From e095bcb9fb8c1f652f2d8589c86295f2f561abe9 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 9 Feb 2023 11:12:11 +0800
Subject: [PATCH 69/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/FourPointCalibration.vue   |  8 ++---
 .../FusionSettings/FusionLocale.vue           | 30 +++++++------------
 .../FusionSettings/SurfaceCorrection.vue      | 18 +++++------
 3 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 7820a74..d8e9868 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -5,7 +5,7 @@
         @focus="isactivearray[0] = false" v-model="four[0].x" label="x" lazy-rules />
       <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[0] = false" v-model="four[0].y"
         label="y" lazy-rules />
-      <q-btn size="sm" dense color="white" @click="reset(0,true)" text-color="black"
+      <q-btn size="sm" dense color="white" @click="reset(0,false)" text-color="black"
         :label="$t('reset') + $t('point') + '1'" />
     </div>
     <div class="col-8"></div>
@@ -14,7 +14,7 @@
         label="x" lazy-rules />
       <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[1] = false" v-model="four[1].y"
         label="y" lazy-rules />
-      <q-btn size="sm" dense color="white" @click="reset(1,true)" text-color="black"
+      <q-btn size="sm" dense color="white" @click="reset(1,false)" text-color="black"
         :label="$t('reset') + $t('point') + '2'" />
     </div>
 
@@ -52,7 +52,7 @@
         label="x" lazy-rules />
       <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[2] = false" v-model="four[2].y"
         label="y" lazy-rules />
-      <q-btn size="sm" dense color="white" @click="reset(2,true)" text-color="black"
+      <q-btn size="sm" dense color="white" @click="reset(2,false)" text-color="black"
         :label="$t('reset') + $t('point') + '3'" />
     </div>
     <div class="col-8">
@@ -63,7 +63,7 @@
         label="x" lazy-rules />
       <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[3] = false" v-model="four[3].y"
         label="y" lazy-rules />
-      <q-btn size="sm" dense color="white" @click="reset(3,true)" text-color="black"
+      <q-btn size="sm" dense color="white" @click="reset(3,false)" text-color="black"
         :label="$t('reset') + $t('point') + '4'" />
     </div>
   </div>
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 9988d5b..2c0bbf4 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -97,47 +97,49 @@
         <div>
           <q-slider v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
             vertical reverse label-always />
-          <div> <q-input dense filled type="number" max="1" min="0" step="0.1" @update:model-value="chang('alpha')"
+          <div> <q-input dense filled hide-bottom-space type="number" max="1" min="0" step="0.1" @update:model-value="chang('alpha')"
               v-model="array[group].alpha" label="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-btn color="white" @click="reset('alpha')" text-color="black" :label="$t('reset')" /></div>
+              ]" /><q-btn style="margin-top: 0.5rem;" color="white" @click="reset('alpha')" text-color="black" :label="$t('reset')" /></div>
         </div>
 
         <div>
           <q-slider v-model="array[group].p" :min="0" @change="chang('p')" :max="16" :step="0.01" color="green" vertical
             reverse label-always />
-          <div> <q-input dense filled type="number" max="16" min="0" step="0.1" @update:model-value="chang('p')"
+          <div> <q-input dense filled hide-bottom-space type="number" max="16" min="0" step="0.1" @update:model-value="chang('p')"
               v-model="array[group].p" label="Power" 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-btn color="white" @click="reset('p')" text-color="black" :label="$t('reset')" /></div>
+              ]" /><q-btn style="margin-top: 0.5rem;"  color="white" @click="reset('p')" text-color="black" :label="$t('reset')" /></div>
         </div>
 
         <div>
           <q-slider v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green"
             vertical reverse label-always />
-          <div> <q-input dense filled type="number" max="16" min="0" step="0.1" @update:model-value="chang('gamma')"
+          <div>
+            <q-input  :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" label="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-btn color="white" @click="reset('gamma')" text-color="black" :label="$t('reset')" /></div>
+              ]" />
+              <q-btn  style="margin-top: 0.5rem;"  color="white" @click="reset('gamma')" text-color="black" :label="$t('reset')" /></div>
         </div>
       </div>
     </div>
   </div>
 
-    <div style="position: relative;">
-      <q-checkbox left-label  v-model="auxiliary_line" @update:model-value="(value, evt)=>{send_auxiliary_line(value)}" :label="$t('auxiliary lines')"/>
+    <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')"/>
   </div>
 </template>
 
@@ -521,17 +523,6 @@ export default defineComponent({
     const changenablefusion = () => {
       $store.commit("setenablefusion", enablefusion.value);
     };
-    let resnewdata = null;
-    const resetall = () => {
-      try {
-        set?.GetBlendingConfig("").then((res) => {
-          resnewdata = res?.config;
-          setconfig(resnewdata);
-        });
-      } catch (error) {
-        console.log("ResetBlendingConfig error");
-      }
-    };
     const left_right_auto_add = (difference: number) => {
 
       let tmpobjall = JSON.parse($store.state.fusion_configuration)
@@ -592,7 +583,6 @@ export default defineComponent({
       enablefusion,
       changenablefusion,
       selectedprojector,
-      resetall,
       set_cache,
       auxiliary_line,
       reset,
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index df319a9..0e3f299 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -8,7 +8,7 @@
             v-model="nine[0].x" label="x" lazy-rules />
           <q-input filled type="number"  @focus="isactivearray[0] = false" :dense="true"
             v-model="nine[0].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(0,true)" text-color="black" :label="$t('reset') + $t('point') + '1'" />
+          <q-btn size="sm" dense color="white" @click="reset(0,false)" text-color="black" :label="$t('reset') + $t('point') + '1'" />
         </div>
       </div>
     </div>
@@ -20,7 +20,7 @@
             v-model="nine[1].x" label="x" lazy-rules />
           <q-input filled type="number"  @focus="isactivearray[1] = false" :dense="true"
             v-model="nine[1].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(1,true)" text-color="black" :label="$t('reset') + $t('point') + '2'" />
+          <q-btn size="sm" dense color="white" @click="reset(1,false)" text-color="black" :label="$t('reset') + $t('point') + '2'" />
         </div>
 
         <div class="col-4" style="padding-left: 2px">
@@ -28,7 +28,7 @@
             @focus="isactivearray[4] = false" lazy-rules />
           <q-input filled type="number"  :dense="true" v-model="nine[4].y" label="y"
             @focus="isactivearray[4] = false" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(4,true)" text-color="black" :label="$t('reset') + $t('point') + '5'" />
+          <q-btn size="sm" dense color="white" @click="reset(4,false)" text-color="black" :label="$t('reset') + $t('point') + '5'" />
         </div>
       </div>
     </div>
@@ -40,7 +40,7 @@
             v-model="nine[2].x" label="x" lazy-rules />
           <q-input filled type="number"  @focus="isactivearray[2] = false" :dense="true"
             v-model="nine[2].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(2,true)" text-color="black" :label="$t('reset') + $t('point') + '3'" />
+          <q-btn size="sm" dense color="white" @click="reset(2,false)" text-color="black" :label="$t('reset') + $t('point') + '3'" />
         </div>
       </div>
     </div>
@@ -52,7 +52,7 @@
             v-model="nine[3].x" label="x" lazy-rules />
           <q-input filled type="number"  @focus="isactivearray[3] = false" :dense="true"
             v-model="nine[3].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(3,true)" text-color="black" :label="$t('reset') + $t('point') + '4'" />
+          <q-btn size="sm" dense color="white" @click="reset(3,false)" text-color="black" :label="$t('reset') + $t('point') + '4'" />
         </div>
       </div>
     </div>
@@ -105,7 +105,7 @@
             v-model="nine[5].x" label="x" lazy-rules />
           <q-input filled type="number"  @focus="isactivearray[5] = false" :dense="true"
             v-model="nine[5].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(5,true)" text-color="black" :label="$t('reset') + $t('point') + '6'" />
+          <q-btn size="sm" dense color="white" @click="reset(5,false)" text-color="black" :label="$t('reset') + $t('point') + '6'" />
         </div>
       </div>
     </div>
@@ -119,7 +119,7 @@
             v-model="nine[6].x" label="x" lazy-rules />
           <q-input filled type="number"  @focus="isactivearray[6] = false" :dense="true"
             v-model="nine[6].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(6,true)" text-color="black" :label="$t('reset') + $t('point') + '7'" />
+          <q-btn size="sm" dense color="white" @click="reset(6,false)" text-color="black" :label="$t('reset') + $t('point') + '7'" />
         </div>
       </div>
     </div>
@@ -131,7 +131,7 @@
             v-model="nine[7].x" label="x" lazy-rules />
           <q-input filled type="number"  @focus="isactivearray[7] = false" :dense="true"
             v-model="nine[7].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(7,true)" text-color="black" :label="$t('reset') + $t('point') + '8'" />
+          <q-btn size="sm" dense color="white" @click="reset(7,false)" text-color="black" :label="$t('reset') + $t('point') + '8'" />
         </div>
       </div>
     </div>
@@ -143,7 +143,7 @@
             v-model="nine[8].x" label="x" lazy-rules />
           <q-input filled type="number"  @focus="isactivearray[8] = false" :dense="true"
             v-model="nine[8].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(8,true)" text-color="black" :label="$t('reset') + $t('point') + '9'" />
+          <q-btn size="sm" dense color="white" @click="reset(8,false)" text-color="black" :label="$t('reset') + $t('point') + '9'" />
         </div>
       </div>
     </div>

From 112ea9195b196ba9475f775a6e207df78defb1b5 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 9 Feb 2023 14:28:33 +0800
Subject: [PATCH 70/78] =?UTF-8?q?=E6=9B=B4=E6=94=B9ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/FusionLocale.vue           | 66 +++++++++++--------
 .../FusionSettings/SurfaceCorrection.vue      |  2 +-
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 2c0bbf4..551d638 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -97,49 +97,61 @@
         <div>
           <q-slider v-model="array[group].alpha" :min="0.0" @change="chang('alpha')" :max="1" :step="0.01" color="green"
             vertical reverse label-always />
-          <div> <q-input dense filled hide-bottom-space type="number" max="1" min="0" step="0.1" @update:model-value="chang('alpha')"
-              v-model="array[group].alpha" label="Alpha" lazy-rules :rules="[
+          <div> <q-input 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="[
                 (val) =>
                   (val !== null && val !== '') ||
                   $t('Please enter a number'),
                 (val) =>
                   (val >= 0 && val <= 1) || $t('Please enter a value within the range'),
-              ]" /><q-btn style="margin-top: 0.5rem;" color="white" @click="reset('alpha')" text-color="black" :label="$t('reset')" /></div>
+              ]" />
+            <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')" />
+          </div>
         </div>
 
         <div>
           <q-slider v-model="array[group].p" :min="0" @change="chang('p')" :max="16" :step="0.01" color="green" vertical
             reverse label-always />
-          <div> <q-input dense filled hide-bottom-space type="number" max="16" min="0" step="0.1" @update:model-value="chang('p')"
-              v-model="array[group].p" label="Power" 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-btn style="margin-top: 0.5rem;"  color="white" @click="reset('p')" text-color="black" :label="$t('reset')" /></div>
-        </div>
-
-        <div>
-          <q-slider v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green"
-            vertical reverse label-always />
-          <div>
-            <q-input  :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" label="Gamma" lazy-rules :rules="[
+          <div> <q-input 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="[
                 (val) =>
                   (val !== null && val !== '') ||
                   $t('Please enter a number'),
                 (val) =>
                   (val >= 0 && val <= 16) || $t('Please enter a value within the range'),
               ]" />
-              <q-btn  style="margin-top: 0.5rem;"  color="white" @click="reset('gamma')" text-color="black" :label="$t('reset')" /></div>
+            <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')" />
+          </div>
+        </div>
+
+        <div>
+          <q-slider v-model="array[group].gamma" :min="0" @change="chang('gamma')" :max="16" :step="0.01" color="green"
+            vertical reverse label-always />
+          <div>
+            <q-input :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="[
+                (val) =>
+                  (val !== null && val !== '') ||
+                  $t('Please enter a number'),
+                (val) =>
+                  (val >= 0 && val <= 16) || $t('Please enter a value within the range'),
+              ]" />
+            <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')" />
+          </div>
         </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')"/>
+  <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')" />
   </div>
 </template>
 
@@ -197,8 +209,8 @@ export default defineComponent({
     ]);
     const auto_sync = ref(false)
     const auxiliary_line = ref(false)
-    const send_auxiliary_line=(val:boolean)=>{
-      set?.SetBlendingOption("blending_grids_assistant_lines",val?"1":"0");
+    const send_auxiliary_line = (val: boolean) => {
+      set?.SetBlendingOption("blending_grids_assistant_lines", val ? "1" : "0");
     }
     //正确的 索引编号
     let arr = [1, 0, 2, 3];
@@ -212,13 +224,13 @@ export default defineComponent({
     const reset = (type: string) => {
       switch (type) {
         case 'gamma':
-        array[group.value].gamma=Number(config.params[group.value].def_gamma.toFixed(2));
+          array[group.value].gamma = Number(config.params[group.value].def_gamma.toFixed(2));
           break;
         case 'p':
-        array[group.value].p=Number(config.params[group.value].def_power.toFixed(2));
+          array[group.value].p = Number(config.params[group.value].def_power.toFixed(2));
           break;
         case 'alpha':
-        array[group.value].alpha=Number(config.params[group.value].def_alpha.toFixed(2));
+          array[group.value].alpha = Number(config.params[group.value].def_alpha.toFixed(2));
           break;
         default:
           break;
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 0e3f299..67b9fda 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -458,7 +458,7 @@ export default defineComponent({
             defaultnine.value[index].x = config.point9[index].def_x;
             defaultnine.value[index].y = config.point9[index].def_y;
           }
-          //setninepostion();
+          setninepostion();
           use_set_cache();
           setTimeout(() => {
             ste_status.value = 0;

From c35349b6e47418fe23549130147198e6db033e96 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 9 Feb 2023 15:05:10 +0800
Subject: [PATCH 71/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=96=8F=E5=AF=86?=
 =?UTF-8?q?=E6=A0=A1=E6=AD=A3=E7=B4=A2=E5=BC=95=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/DensityCorrection.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 4311aca..a7dac59 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -477,7 +477,7 @@ export default defineComponent({
           set?.SetBlendingHorDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            index-4,
+            index>4?index-4:index+1,
             Number(value)
           );
         }
@@ -500,7 +500,6 @@ export default defineComponent({
           Math.ceil(
             (obj_y - default_location[index].y) * Proportion.value.y
           );
-          console.log(index, x,'h')
         value[index+5].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
         send_configuration(index, x,'h')
       }

From 15088f9d5e8383bc80f620bca89febf99b3b96e5 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 9 Feb 2023 16:57:08 +0800
Subject: [PATCH 72/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=96=8F=E5=AF=86?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=80=89=E6=8B=A9=E7=82=B9=E6=97=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E5=BD=93=E5=89=8D=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/DensityCorrection.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index a7dac59..e831486 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -68,7 +68,7 @@
   <div>
       <div class="row">
         <div class="col-1"></div>
-        <div class="col-2"> <q-select class="q-pt-md" :label="$t('level')" :dense="true" filled v-model="options_model_v" :options="options_v" emit-value
+        <div class="col-2"> <q-select class="q-pt-md" :label="$t('level')" @update:model-value="(val)=>{now_index=val}" :dense="true" filled v-model="options_model_v" :options="options_v" emit-value
             map-options /></div>
         <div class="col-2"> <q-input filled type="number" class="q-pt-md" :dense="true"
             v-model="value[options_model_v].y" @update:model-value="chang(options_model_v, $event,'v')" lazy-rules />
@@ -79,7 +79,7 @@
       </div>
       <div class="row">
         <div class="col-1"></div>
-        <div class="col-2"> <q-select class="q-pt-md"  :label="$t('vertical')" :dense="true" filled v-model="options_model_h" :options="options_h" emit-value
+        <div class="col-2"> <q-select class="q-pt-md"  :label="$t('vertical')" :dense="true" filled v-model="options_model_h" @update:model-value="(val)=>{now_index=val}" :options="options_h" emit-value
             map-options /></div>
         <div class="col-2"> <q-input filled type="number" class="q-pt-md" :dense="true"
             v-model="value[options_model_h].x" @update:model-value="chang(options_model_h, $event,'h')" lazy-rules />
@@ -195,6 +195,7 @@ export default defineComponent({
     const configselsect = computed(() => {
       return $store.state.selected_projector;
     });
+
     //用于计算当前投影仪的索引
     let serverconfig = JSON.parse($store.state.fusion_configuration);
     const selectedprojector = computed(() => {
@@ -542,6 +543,7 @@ export default defineComponent({
       point_postion,
       div,
       save,
+
     };
   },
 });

From e37999a9242dd4d2b10475ce34dfd2fc5c0192f6 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 10 Feb 2023 09:38:20 +0800
Subject: [PATCH 73/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BE=85=E5=8A=A9?=
 =?UTF-8?q?=E7=BA=BF=E5=92=8C=E6=9C=8D=E5=8A=A1=E7=AB=AF=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/FusionLocale.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 551d638..ad31408 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -371,6 +371,8 @@ export default defineComponent({
         array[arr[index]].isshow = config.params[index].enable;
         array[arr[index]].value = Number(config.params[index].size);
       }
+      let tmp = JSON.parse($store.state.fusion_configuration).options;
+      auxiliary_line.value=tmp.blending_grids_assistant_lines=="1"
       if (sessionStorage.FusionLocale) set_cache.value = JSON.parse(sessionStorage.FusionLocale);
       use_set_cache();
       setnowindex();

From b3cc026b414ae0552b941743880db347bae8fcda Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 10 Feb 2023 09:55:11 +0800
Subject: [PATCH 74/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=AE=E7=9B=98?=
 =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=AF=BC=E8=87=B4=E7=9A=84=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/FourPointCalibration.vue   | 68 ++++++++++---------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index d8e9868..e7ae201 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -5,7 +5,7 @@
         @focus="isactivearray[0] = false" v-model="four[0].x" label="x" lazy-rules />
       <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[0] = false" v-model="four[0].y"
         label="y" lazy-rules />
-      <q-btn size="sm" dense color="white" @click="reset(0,false)" text-color="black"
+      <q-btn size="sm" dense color="white" @click="reset(0, false)" text-color="black"
         :label="$t('reset') + $t('point') + '1'" />
     </div>
     <div class="col-8"></div>
@@ -14,7 +14,7 @@
         label="x" lazy-rules />
       <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[1] = false" v-model="four[1].y"
         label="y" lazy-rules />
-      <q-btn size="sm" dense color="white" @click="reset(1,false)" text-color="black"
+      <q-btn size="sm" dense color="white" @click="reset(1, false)" text-color="black"
         :label="$t('reset') + $t('point') + '2'" />
     </div>
 
@@ -25,22 +25,22 @@
           <vue3ResizeDrag style="border: 0;" :class="[now_index == 0 ? 'action' : 'point']" v-if="isshowarray[0]"
             :isActive="isactivearray[0]" @mousedown="activeMouseDown(0)" @mouseUpHandler="mouseUpHandler(0)" :w="20"
             :h="20" :x="points[0].x" :y="points[0].y" :isResizable="false" @moveHandler="moveHandler_1">
-            <div >1</div>
+            <div>1</div>
           </vue3ResizeDrag>
           <vue3ResizeDrag style="border: 0;" :class="[now_index == 1 ? 'action' : 'point']" v-if="isshowarray[1]"
             :isActive="isactivearray[1]" @mousedown="activeMouseDown(1)" @mouseUpHandler="mouseUpHandler(1)" :w="20"
             :h="20" :x="points[1].x" :y="points[1].y" :isResizable="false" @moveHandler="moveHandler_2">
-            <div >2</div>
+            <div>2</div>
           </vue3ResizeDrag>
           <vue3ResizeDrag style="border: 0;" :class="[now_index == 2 ? 'action' : 'point']" v-if="isshowarray[2]"
             :isActive="isactivearray[2]" @mousedown="activeMouseDown(2)" @mouseUpHandler="mouseUpHandler(2)" :w="20"
             :h="20" :x="points[2].x" :y="points[2].y" :isResizable="false" @moveHandler="moveHandler_3">
-            <div >3</div>
+            <div>3</div>
           </vue3ResizeDrag>
           <vue3ResizeDrag style="border: 0;" :class="[now_index == 3 ? 'action' : 'point']" v-if="isshowarray[3]"
             :isActive="isactivearray[3]" @mousedown="activeMouseDown(3)" @mouseUpHandler="mouseUpHandler(3)" :w="20"
             :h="20" :x="points[3].x" :y="points[3].y" :isResizable="false" @moveHandler="moveHandler_4">
-            <div >4</div>
+            <div>4</div>
           </vue3ResizeDrag>
         </div>
       </div>
@@ -52,15 +52,15 @@
         label="x" lazy-rules />
       <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[2] = false" v-model="four[2].y"
         label="y" lazy-rules />
-      <q-btn size="sm" dense color="white" @click="reset(2,false)" text-color="black"
+      <q-btn size="sm" dense color="white" @click="reset(2, false)" text-color="black"
         :label="$t('reset') + $t('point') + '3'" />
     </div>
     <div class="col-8">
       <q-btn size="sm" dense color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
     </div>
     <div class="col-2">
-      <q-input filled type="number"  :dense="true" @focus="isactivearray[3] = false" v-model="four[3].x"
-        label="x" lazy-rules />
+      <q-input filled type="number" :dense="true" @focus="isactivearray[3] = false" v-model="four[3].x" label="x"
+        lazy-rules />
       <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[3] = false" v-model="four[3].y"
         label="y" lazy-rules />
       <q-btn size="sm" dense color="white" @click="reset(3,false)" text-color="black"
@@ -200,7 +200,7 @@ export default defineComponent({
     };
     const keyDown = () => {
       document.onkeydown = (e) => {
-
+        let lock = 0
         let e1 = e || window.event || arguments.callee.caller.arguments[0]
         switch (e.code) {
           case "KeyW":
@@ -220,15 +220,19 @@ export default defineComponent({
             points[now_index.value].y
             break;
           default:
+            lock = 1
             break;
         }
-        let tmp = { left: points[now_index.value].x, top: points[now_index.value].y }
-        eval(`moveHandler_${now_index.value+1}(tmp)`);
-        isactivearray.value[now_index.value] = false;
-        isshowarray.value[now_index.value] = false;
-        setTimeout(() => {
-          isshowarray.value[now_index.value] = true;
-        }, 100);
+        if (lock == 0) {
+          let tmp = { left: points[now_index.value].x, top: points[now_index.value].y }
+          eval(`moveHandler_${now_index.value + 1}(tmp)`);
+          isactivearray.value[now_index.value] = false;
+          isshowarray.value[now_index.value] = false;
+          setTimeout(() => {
+            isshowarray.value[now_index.value] = true;
+          }, 100);
+        }
+
       }
     }
     onMounted(() => {
@@ -316,6 +320,7 @@ export default defineComponent({
           let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
           points[0].x = x;
           points[0].y = y;
+          console.log(points[0])
           isshowarray.value[0] = false;
           isactivearray.value[0] = false;
           setTimeout(() => {
@@ -442,7 +447,7 @@ export default defineComponent({
       { deep: true }
     );
     watch(() => now_index, (newval, oldval) => {
-      if(ste_status.value == 1)return
+      if (ste_status.value == 1) return
       set?.SetBlendingOption("blending_grids_select_point", `4:${now_index.value + 1}`)
     }, { deep: true })
     //为了加载 缓存的配置时 同步点的位置
@@ -484,25 +489,24 @@ export default defineComponent({
       }, 100);
     };
     const reset = (index: number, send: boolean) => {
-	  send = send?? true;
-    isactivearray.value[index] = false;
+      send = send ?? true;
+      isactivearray.value[index] = false;
       fourpostion.value[index].x = defaultfourpostion.value[index].x;
       fourpostion.value[index].y = defaultfourpostion.value[index].y;
 
       four[index].x = config.point4[index].def_x;
       four[index].y = config.point4[index].def_y;
 
-	  if (send)
-	  {
-         set?.setBlendingCorrection(
-           $store.getters.GetTheCurrentlySelectedCamera[0],
-           $store.getters.GetTheCurrentlySelectedCamera[1],
-           4,
-           index + 1,
-           Number(config.point4[index].def_x),
-           Number(config.point4[index].def_y)
-         );
-	  }
+      if (send) {
+        set?.setBlendingCorrection(
+          $store.getters.GetTheCurrentlySelectedCamera[0],
+          $store.getters.GetTheCurrentlySelectedCamera[1],
+          4,
+          index + 1,
+          Number(config.point4[index].def_x),
+          Number(config.point4[index].def_y)
+        );
+      }
 
       isshowarray.value[index] = false;
       setTimeout(() => {
@@ -514,7 +518,7 @@ export default defineComponent({
       for (let index = 0; index < fourpostion.value.length; index++) {
         reset(index, false);
       }
-	  set?.setBlendingCorrection(
+      set?.setBlendingCorrection(
         $store.getters.GetTheCurrentlySelectedCamera[0],
         $store.getters.GetTheCurrentlySelectedCamera[1],
         4, 0, 0, 0

From c88033899b7876f2628032664e535f53c9522598 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 10 Feb 2023 09:56:24 +0800
Subject: [PATCH 75/78] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FusionSettings/FourPointCalibration.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index e7ae201..33522dc 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -320,7 +320,6 @@ export default defineComponent({
           let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
           points[0].x = x;
           points[0].y = y;
-          console.log(points[0])
           isshowarray.value[0] = false;
           isactivearray.value[0] = false;
           setTimeout(() => {

From da82416bd1e71d05e7ed5a41726830bd9c987ef6 Mon Sep 17 00:00:00 2001
From: ljqing <ljqing@cxte.com.cn>
Date: Fri, 10 Feb 2023 14:07:33 +0800
Subject: [PATCH 76/78] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E7=82=B9=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/ClientConnection.ts                | 18 +++++
 .../FusionSettings/DensityCorrection.vue      |  5 ++
 .../FusionSettings/FourPointCalibration.vue   | 12 +--
 .../FusionSettings/SurfaceCorrection.vue      | 22 ++---
 src/entities/WSProtocol.ts                    | 81 +++++++++++++++++--
 5 files changed, 113 insertions(+), 25 deletions(-)

diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index 92d2257..fdd8eb6 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -1333,6 +1333,7 @@ export default class ClientConnection {
     row: number,
     column: number,
     correction_type: number,
+    control_point_count: number,
     control_point: number,
     x: number,
     y: number
@@ -1342,6 +1343,7 @@ export default class ClientConnection {
         row,
         column,
         correction_type,
+        control_point_count,
         control_point,
         x,
         y
@@ -1440,6 +1442,7 @@ export default class ClientConnection {
   public async SetBlendingHorDensity(
     row: number,
     column: number,
+    control_point_count: number,
     control_point: number,
     value: number
   ) {
@@ -1447,6 +1450,7 @@ export default class ClientConnection {
       new Protocol.SetBlendingHorDensityRequestEntity(
         row,
         column,
+        control_point_count,
         control_point,
         value
       )
@@ -1456,6 +1460,7 @@ export default class ClientConnection {
   public async SetBlendingVerDensity(
     row: number,
     column: number,
+    control_point_count: number,
     control_point: number,
     value: number
   ) {
@@ -1463,6 +1468,7 @@ export default class ClientConnection {
       new Protocol.SetBlendingVerDensityRequestEntity(
         row,
         column,
+        control_point_count,
         control_point,
         value
       )
@@ -1505,6 +1511,18 @@ export default class ClientConnection {
     );
   }
 
+  public async AddBlendingCtrlPoint(type: string, row: number, column: number, count: number) {
+    return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
+      new Protocol.AddBlendingCtrlPointRequestEntity(type, row, column, count)
+    );
+  }
+
+  public async DelBlendingCtrlPoint(type: string, row: number, column: number, count: number) {
+    return await this.doRpc<Protocol.GetBlendingConfigResponseEntity>(
+      new Protocol.DelBlendingCtrlPointRequestEntity(type, row, column, count)
+    );
+  }
+
   public destory() {
     this.ws?.close();
     if (this.ws) {
diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index e831486..f040a7a 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -327,6 +327,7 @@ export default defineComponent({
 	  set?.SetBlendingVerDensity(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
+		  5,
           -1, 0
         );
     };
@@ -341,6 +342,7 @@ export default defineComponent({
 		  set?.SetBlendingHorDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
+			5,
             index - 5 + 1,
             Number(value[index].x)
           );
@@ -353,6 +355,7 @@ export default defineComponent({
           set?.SetBlendingVerDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
+			5,
             index + 1,
             Number(value[index].y)
           );
@@ -470,6 +473,7 @@ export default defineComponent({
           set?.SetBlendingVerDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
+			5,
             index+1,
             Number(value)
           );
@@ -478,6 +482,7 @@ export default defineComponent({
           set?.SetBlendingHorDensity(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
+			5,
             index>4?index-4:index+1,
             Number(value)
           );
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 33522dc..772f124 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -310,7 +310,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            4,
+            4, 4,
             1,
             Number(newVal.x),
             Number(newVal.y)
@@ -338,7 +338,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            4,
+            4, 4,
             2,
             Number(newVal.x),
             Number(newVal.y)
@@ -366,7 +366,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            4,
+            4, 4,
             3,
             Number(newVal.x),
             Number(newVal.y)
@@ -396,7 +396,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            4,
+            4, 4,
             4,
             Number(newVal.x),
             Number(newVal.y)
@@ -500,7 +500,7 @@ export default defineComponent({
         set?.setBlendingCorrection(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
-          4,
+          4, 4,
           index + 1,
           Number(config.point4[index].def_x),
           Number(config.point4[index].def_y)
@@ -520,7 +520,7 @@ export default defineComponent({
       set?.setBlendingCorrection(
         $store.getters.GetTheCurrentlySelectedCamera[0],
         $store.getters.GetTheCurrentlySelectedCamera[1],
-        4, 0, 0, 0
+        4, 4, 0, 0, 0
       );
     };
 
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 67b9fda..71d21ad 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -543,7 +543,7 @@ export default defineComponent({
         set?.setBlendingCorrection(
           $store.getters.GetTheCurrentlySelectedCamera[0],
           $store.getters.GetTheCurrentlySelectedCamera[1],
-          9,
+          9, 9,
           index + 1,
           Number(config.point9[index].def_x),
           Number(config.point9[index].def_y)
@@ -562,7 +562,7 @@ export default defineComponent({
       set?.setBlendingCorrection(
         $store.getters.GetTheCurrentlySelectedCamera[0],
         $store.getters.GetTheCurrentlySelectedCamera[1],
-        9, 0, 0, 0
+        9, 9, 0, 0, 0
       );
     };
     watch(
@@ -572,7 +572,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             1,
             Number(newVal.x),
             Number(newVal.y)
@@ -594,7 +594,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             2,
             Number(newVal.x),
             Number(newVal.y)
@@ -616,7 +616,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             3,
             Number(newVal.x),
             Number(newVal.y)
@@ -637,7 +637,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             4,
             Number(newVal.x),
             Number(newVal.y)
@@ -658,7 +658,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             5,
             Number(newVal.x),
             Number(newVal.y)
@@ -679,7 +679,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             6,
             Number(newVal.x),
             Number(newVal.y)
@@ -700,7 +700,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             7,
             Number(newVal.x),
             Number(newVal.y)
@@ -721,7 +721,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             8,
             Number(newVal.x),
             Number(newVal.y)
@@ -742,7 +742,7 @@ export default defineComponent({
           set?.setBlendingCorrection(
             $store.getters.GetTheCurrentlySelectedCamera[0],
             $store.getters.GetTheCurrentlySelectedCamera[1],
-            9,
+            9, 9,
             9,
             Number(newVal.x),
             Number(newVal.y)
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index f327322..fcc6961 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -535,6 +535,12 @@ export namespace Protocol {
     public static get kDeleteBlendingScene() {
       return Commands.PROTOCOL_PREFIX + "DeleteBlendingScene";
     }
+    public static get kAddBlendingCtrlPoint() {
+      return Commands.PROTOCOL_PREFIX + "AddBlendingCtrlPoint";
+    }
+    public static get kDelBlendingCtrlPoint() {
+      return Commands.PROTOCOL_PREFIX + "DelBlendingCtrlPoint";
+    }
 
     static _all_commands = new Set([
       Commands.kUnKnowCommand,
@@ -671,6 +677,8 @@ export namespace Protocol {
       Commands.kEnumBlendingScene,
       Commands.kApplyBlendingScene,
       Commands.kDeleteBlendingScene,
+      Commands.kAddBlendingCtrlPoint,
+      Commands.kDelBlendingCtrlPoint,
     ]);
     public static get AllCommands() {
       return this._all_commands;
@@ -3242,6 +3250,7 @@ export namespace Protocol {
       row: number,
       column: number,
       correction_type: number,
+      control_point_count: number,
       control_point: number,
       x: number,
       y: number,
@@ -3256,12 +3265,14 @@ export namespace Protocol {
       this.y = y ?? 0;
       this.row = row ?? 0;
       this.column = column ?? 0;
-      this.correction_type = correction_type ?? 0;
+      this.correction_type = correction_type ?? 0;
+      this.control_point_count = control_point_count ?? 0;
       this.control_point = control_point ?? 0;
     }
     row = 0;
     column = 0;
-    correction_type = 0; //4：四点校正，9：曲面校正
+    correction_type = 0; //4：四点校正，9：曲面校正
+    control_point_count = 0;
     control_point = 0; //控制点编号，1开始，从上到下从左到右
     x = 0;
     y = 0;
@@ -3432,7 +3443,8 @@ export namespace Protocol {
   export class SetBlendingHorDensityRequestEntity extends PacketEntity {
     constructor(
       row: number,
-      column: number,
+      column: number,
+      control_point_count: number,
       control_point: number,
       value: number,
       rpc_id = 0
@@ -3443,12 +3455,14 @@ export namespace Protocol {
       super.rpc_id = rpc_id;
 
       this.row = row ?? 0;
-      this.column = column ?? 0;
+      this.column = column ?? 0;
+      this.control_point_count = control_point_count ?? 0;
       this.control_point = control_point ?? 0;
       this.value = value ?? 0;
     }
     row = 0;
-    column = 0;
+    column = 0;
+    control_point_count = 0;
     control_point = 0; //控制点编号，1开始，从上到下从左到右
     value = 0;
   }
@@ -3456,7 +3470,8 @@ export namespace Protocol {
   export class SetBlendingVerDensityRequestEntity extends PacketEntity {
     constructor(
       row: number,
-      column: number,
+      column: number,
+      control_point_count: number,
       control_point: number,
       value: number,
       rpc_id = 0
@@ -3467,12 +3482,14 @@ export namespace Protocol {
       super.rpc_id = rpc_id;
 
       this.row = row ?? 0;
-      this.column = column ?? 0;
+      this.column = column ?? 0;
+      this.control_point_count = control_point_count ?? 0;
       this.control_point = control_point ?? 0;
       this.value = value ?? 0;
     }
     row = 0;
-    column = 0;
+    column = 0;
+    control_point_count = 0;
     control_point = 0; //控制点编号，1开始，从上到下从左到右
     value = 0;
   }
@@ -3555,4 +3572,52 @@ export namespace Protocol {
     }
     name;
   }
+
+  export class AddBlendingCtrlPointRequestEntity extends PacketEntity {
+    constructor(
+      type: string,
+      row: number,
+      column: number,
+      count: number,
+      rpc_id = 0
+    ) {
+      super();
+      super.command = Commands.kAddBlendingCtrlPoint;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      super.rpc_id = rpc_id;
+
+      this.type = type ?? "";
+      this.row = row ?? 0;
+      this.column = column ?? 0;
+      this.count = count ?? 0;
+    }
+    type; //ver_density:垂直疏密，hor_density:水平疏密，9：曲面
+    row = 0;
+    column = 0;
+    count = 0; //控制点数量
+  }
+
+  export class DelBlendingCtrlPointRequestEntity extends PacketEntity {
+    constructor(
+      type: string,
+      row: number,
+      column: number,
+      count: number,
+      rpc_id = 0
+    ) {
+      super();
+      super.command = Commands.kDelBlendingCtrlPoint;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      super.rpc_id = rpc_id;
+
+      this.type = type ?? "";
+      this.row = row ?? 0;
+      this.column = column ?? 0;
+      this.count = count ?? 0;
+    }
+    type; //ver_density:垂直疏密，hor_density:水平疏密，9：曲面
+    row = 0;
+    column = 0;
+    count = 0; //控制点数量
+  }
 }

From dbecb1ff1572ae9cbe1c3e33eae1e6cbcde35cee Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Wed, 15 Feb 2023 09:34:42 +0800
Subject: [PATCH 77/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 1165 +++++++++++------
 .../FusionSettings/FourPointCalibration.vue   |  780 ++++-------
 .../FusionSettings/SurfaceCorrection.vue      | 1122 ++++++----------
 src/components/FusionSettingsDialog.vue       |    2 +-
 src/entities/DensityCorrection.ts             |    7 +
 src/entities/DensityCorrectionPoint.ts        |    7 +
 src/i18n/en-US/index.ts                       |   10 +-
 src/i18n/zh-CN/index.ts                       |   10 +-
 8 files changed, 1459 insertions(+), 1644 deletions(-)
 create mode 100644 src/entities/DensityCorrection.ts
 create mode 100644 src/entities/DensityCorrectionPoint.ts

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index f040a7a..f61e155 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -1,33 +1,39 @@
 <template>
   <div class="row">
     <div class="col-1"></div>
-    <div class="col-8 q-pt-md">
-      <div ref="div" style="width: 100%; background-color: #646464; height: 100%">
+    <div class="col-10 q-pt-md">
+      <div ref="div" style="width: 100%; background-color: #646464; height: 40vh">
         <div style="position: absolute">
-          <Vue3DraggableResizable  :class="[options_model_v==index?'action':'point']" v-for="(item, index) in config.ver_density.length" :initW="20" :initH="20"
-            :resizable="false" :x="0" v-model:y="point_postion[index].y" :disabledX="true"
-            @activated="now_index =options_model_v= index" @click="options_model_v = index" @dragging="dragStartHandle($event, index, 'v')">
+          <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'" @dragging="dragStartHandle($event, index, 'v')">
             <span>v{{
               index+ 1
             }}</span>
           </Vue3DraggableResizable>
-          <Vue3DraggableResizable :class="[options_model_v==index?'action':'point']" v-for="(item, index) in config.ver_density.length" :initW="20" :initH="20"
-            :resizable="false" :x="max_x_y[0]"  @click="options_model_v = index"   v-model:y="point_postion[index].y" @activated="now_index =options_model_v= index"
-            @dragging="dragStartHandle($event, index, 'v')">
+          <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'" @dragging="dragStartHandle($event, index, 'v')">
             <span>v{{
               index+ 1
             }}</span>
           </Vue3DraggableResizable>
-          <Vue3DraggableResizable :class="[options_model_h==index+5?'action':'point']" v-for="(item, index) in config.hor_density.length" :initW="20" :initH="20"
-            :resizable="false" v-model:x="point_postion[index + 5].x" :y="-20" @activated="now_index =options_model_h = index + 5"
-            :disabledY="true"  @click="options_model_h = index+5 "   @dragging="dragStartHandle($event, index, 'h')">
+          <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'" @dragging="dragStartHandle($event, index, 'h')">
             <span>h{{
               index+ 1
             }}</span>
           </Vue3DraggableResizable>
-          <Vue3DraggableResizable :class="[options_model_h==index+5?'action':'point']" v-for="(item, index) in config.hor_density.length" :initW="20" :initH="20"
-            :resizable="false" v-model:x="point_postion[index + 5].x" @activated="now_index =options_model_h= index + 5"
-            :y="max_x_y[1] + 20" @click="options_model_h = index+5"  @dragging="dragStartHandle($event, index, 'h')">
+          <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'" @dragging="dragStartHandle($event, index, 'h')">
             <span>h{{
               index+ 1
             }}</span>
@@ -35,163 +41,141 @@
         </div>
       </div>
     </div>
-    <div class="col-3 q-pt-md">
-      <div class="row">
-        <div class="col-12" v-for="(item, index) in 5">
-          <div class="row">
-            <div class="col-2"></div>
-            <div class="col-8">
-              <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[index].y"
-                @update:model-value="chang(index, $event,'v')" label="y" lazy-rules />
-              <q-btn size="sm" color="white" @click="reset(index,true)" text-color="black"
-                :label="$t('reset') + `v${index + 1}`" />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="col-1"></div>
-    <div class="col-11">
-      <div class="box">
-        <div class="box_son" v-for="(item, index) in 5">
-          <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[index + 5].x" label="x"
-            @update:model-value="chang(index + 5, $event,'h')" lazy-rules />
-          <q-btn size="sm" color="white" @click="reset(index + 5,true)" text-color="black"
-            :label="$t('reset') + `h${index + 1}`" />
-        </div>
-        <div class="box_son q-pt-xl">
-          <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
-        </div>
-      </div>
-    </div>
   </div>
   <div>
-      <div class="row">
-        <div class="col-1"></div>
-        <div class="col-2"> <q-select class="q-pt-md" :label="$t('level')" @update:model-value="(val)=>{now_index=val}" :dense="true" filled v-model="options_model_v" :options="options_v" emit-value
-            map-options /></div>
-        <div class="col-2"> <q-input filled type="number" class="q-pt-md" :dense="true"
-            v-model="value[options_model_v].y" @update:model-value="chang(options_model_v, $event,'v')" lazy-rules />
-        </div>
-        <div class="q-pt-md">
-          <q-btn color="white" @click="reset(options_model_v,true)" text-color="black" :label="$t('reset')" />
-        </div>
+    <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="row">
-        <div class="col-1"></div>
-        <div class="col-2"> <q-select class="q-pt-md"  :label="$t('vertical')" :dense="true" filled v-model="options_model_h" @update:model-value="(val)=>{now_index=val}" :options="options_h" emit-value
-            map-options /></div>
-        <div class="col-2"> <q-input filled type="number" class="q-pt-md" :dense="true"
-            v-model="value[options_model_h].x" @update:model-value="chang(options_model_h, $event,'h')" lazy-rules />
-        </div>
-        <div class="q-pt-md">
-          <q-btn  color="white" @click="reset(options_model_h,true)" text-color="black" :label="$t('reset')" />
-        </div>
-      </div>
-
+      <div class="col-5"><q-radio v-model="now_v_h" val="vertical" :label="$t('vertical')" /></div>
     </div>
+    <div class="row" v-show="now_v_h == 'vertical'">
+      <div class="col-1"></div>
+      <div class="col-2"> <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-input 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 />
+      </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')" />
+      </div>
+      <div class="col-2"> <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-1 q-pt-md "><q-btn color="white"
+          @click="add_dialog=true" text-color="black"
+          :label="$t('add control points')" /></div>
+      <div class="col-1 q-pt-md "><q-btn color="white" @click="() => { del_dialog = true }" text-color="black"
+          :label="$t('reduce control points')" /></div>
+    </div>
+    <div class="row" v-show="now_v_h == 'level'">
+      <div class="col-1"></div>
+      <div class="col-2"> <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-input 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 />
+      </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')" />
+      </div>
+      <div class="col-2"> <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-1 q-pt-md "><q-btn color="white"
+          @click="add_dialog=true" text-color="black"
+          :label="$t('add control points')" /></div>
+      <div class="col-1 q-pt-md "><q-btn color="white" @click="() => { del_dialog = true }" text-color="black"
+          :label="$t('reduce control points')" /></div>
+    </div>
+    <div class="q-pt-md"> <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" /></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')" />
+  </div>
+
+
+  <q-dialog v-model="del_dialog">
+    <q-card style="width: 700px; max-width: 80vw;">
+      <q-card-section>
+        <div class="text-h6">{{ $t('confirm delete') }}</div>
+      </q-card-section>
+      <q-card-section class="q-pt-none">
+        {{ $t('OK to delete you will lose the data you adjusted now') }}
+      </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="del" color="primary" v-close-popup />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+
+  <q-dialog v-model="add_dialog">
+    <q-card style="width: 700px; max-width: 80vw;">
+      <q-card-section>
+        <div class="text-h6">{{ $t('Whether to add control points') }}</div>
+      </q-card-section>
+      <q-card-section class="q-pt-none">
+        <q-input filled v-model="now_amount" type="number" :label="$t('Please enter the points you need to add')" />
+      </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="add" color="primary" v-close-popup />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+
 </template>
 
 <style scoped>
-.box {
-  display: flex;
-  justify-content: space-between;
-}
-
-.box_son {
-  width: 10rem;
-  padding-right: 1rem;
-}
-
-.vcolro {
-  color: #d50000;
-}
-
-.hcolro {
-  color: #00c853;
-  font-size: 5px;
-}
-
-.p0 {
-  margin: 0;
-  padding: 0;
-  line-height: 8px;
-}
-
 .action {
   background-color: rgb(27, 180, 111);
   border-radius: 50%;
 }
-.point{
+
+.point {
   background-color: rgb(186, 245, 245);
   border-radius: 50%;
 }
 </style>
+
 <script lang="ts">
 import {
   defineComponent,
-  ref,
-  watch,
-  computed,
-  defineProps,
-  withDefaults,
-  reactive,
   onMounted,
-  onBeforeUnmount,
+  ref,
+  computed,
+  watch,
+  nextTick,
+  onBeforeUnmount
 } from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
-import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
-import GlobalData from "src/common/GlobalData";
 import Vue3DraggableResizable from 'vue3-draggable-resizable'
 import 'vue3-draggable-resizable/dist/Vue3DraggableResizable.css'
-import { type } from "os";
-import { number } from "@intlify/core-base";
+
+
+import DensityCorrection from "src/entities/DensityCorrection";
+import DensityCorrectionPoint from "src/entities/DensityCorrectionPoint";
+import { config } from "process";
+import { QSelect, QInput, QBtn } from "quasar";
+import { div } from "zrender/lib/core/vector";
+import GlobalData from "src/common/GlobalData";
+
 export default defineComponent({
   name: "ComponentDensityCorrection",
   components: {
-    vue3ResizeDrag,
     Vue3DraggableResizable
   },
   setup() {
+    let set = GlobalData.getInstance().getCurrentClient();
     let $store = useStore();
     let $t = useI18n();
-    const now_index = ref(0);
-    const max_x_y = reactive([0, 0]);
-    const now_adjust = ref("v")
-    const value = reactive([
-      { x: 0, y: 0, number: 0 },
-      { x: 0, y: 0, number: 0 },
-      { x: 0, y: 0, number: 0 },
-      { x: 0, y: 0, number: 0 },
-      { x: 0, y: 0, number: 0 },
-      { x: 0, y: 0, number: 0 },
-      { x: 0, y: 0, number: 0 },
-      { x: 0, y: 0, number: 0 },
-      { x: 0, y: 0, number: 0 },
-      { x: 0, y: 0, number: 0 },
-    ]);
-    //为动态添加做准备
-    const value_h = reactive([]);
-    const value_v = reactive([]);
-    const default_location_v = reactive([]);
-    const default_location_h = reactive([]);
-    let model = ref(null);
-    const div = ref();
-    const default_location: any = reactive([
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-    ]);
+    const ste_status = ref(0);
     let config = JSON.parse($store.state.fusion_configuration).projectors[0];
-    let Proportion = ref({ x: 0, y: 0 });
     const configselsect = computed(() => {
       return $store.state.selected_projector;
     });
@@ -204,42 +188,14 @@ export default defineComponent({
         $store.getters.GetTheCurrentlySelectedCamera[1]
       );
     });
-    const set_cache: any = ref([]);
-    const ste_status = ref(0);
-
-    const chang = (index: number, $event: any,type:string) => {
-      let x = 0
-      let y = 0
-      if (type=='v') {
-        x = default_location[9].y;
-        y = Math.ceil((config.height - $event) / Proportion.value.y);
-        send_configuration(index, $event,'v')
-        options_model_v.value=index
-      } else {
-        x = Math.ceil($event / Proportion.value.x);
-        y = default_location[0].x;
-        send_configuration(index, $event,'h')
-        options_model_h.value=index
-      }
-      point_postion[index].x = Number(x)
-      point_postion[index].y = Number(y)
-      now_index.value = index
-    }
-
-    const asyncpoint = (index: number, $event: any) => {
-      let x = 0
-      let y = 0
-      if (index < 5) {
-        x = default_location[9].y;
-        y = Math.ceil((config.height - $event) / Proportion.value.y);
-      } else {
-        x = Math.ceil($event / Proportion.value.x);
-        y = default_location[0].x;
-      }
-      point_postion[index].x = Number(x)
-      point_postion[index].y = Number(y)
-    }
+    const now_v_h = ref("")
+    const value_h_point_amount = ref(5)
+    const value_v_point_amount = ref(5)
+    const add_dialog=ref(false)
+    const now_amount=ref(0)
 
+    const options_value_h_point_amount = ref(<string[]>[])
+    const options_value_v_point_amount = ref(<string[]>[])
     const deepcopy = (o1: any, o2: any) => {
       for (let k in o2) {
         if (typeof o2[k] === "object") {
@@ -250,15 +206,78 @@ export default defineComponent({
         }
       }
     };
+
+    const use_server_config = () => {
+      let a = 5
+      value_h.value = []
+      value_h_point.value = []
+      for (let index = 0; index < config.multi_hor_density[a].length; index++) {
+        let tmp: DensityCorrectionPoint = config.multi_hor_density[a][index];
+        value_h.value.push(tmp)
+        let x_y = coordinate_transformation_value_to_xy(tmp.x, tmp.y)
+        let def_x_f = coordinate_transformation_value_to_xy(tmp.def_x, tmp.def_y)
+        let tmp_point: DensityCorrectionPoint = {
+          control_point: tmp.control_point,
+          x: x_y.x,
+          y: x_y.y,
+          def_x: def_x_f.x,
+          def_y: def_x_f.y
+        }
+
+        value_h_point.value.push(tmp_point)
+      }
+
+
+      value_v.value = []
+      value_v_point.value = []
+      for (let index = 0; index < config.multi_ver_density[a].length; index++) {
+        let tmp: DensityCorrectionPoint = config.multi_ver_density[a][index];
+        value_v.value.push(tmp)
+        let x_y = coordinate_transformation_value_to_xy(tmp.x, tmp.y)
+        let def_x_f = coordinate_transformation_value_to_xy(tmp.def_x, tmp.def_y)
+        let tmp_point: DensityCorrectionPoint = {
+          control_point: tmp.control_point,
+          x: x_y.x,
+          y: x_y.y,
+          def_x: def_x_f.x,
+          def_y: def_x_f.y
+        }
+        value_v_point.value.push(tmp_point)
+      }
+
+    }
+
+    const use_set_cache = () => {
+      if (set_cache.value[selectedprojector.value] != null) {
+        let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
+        value_h.value = []
+        value_v.value = []
+        value_h_point.value = []
+        value_v_point.value = []
+        deepcopy(value_h.value, tmp.value_h)
+        deepcopy(value_v.value, tmp.value_v)
+        value_h_point_amount.value = Number(tmp.value_h_point_amount)
+        value_v_point_amount.value = Number(tmp.value_v_point_amount)
+        deepcopy(value_h_point.value, tmp.value_h_point)
+        deepcopy(value_v_point.value, tmp.value_v_point)
+        recalculate_coordinates()
+      }
+    }
+
+
     const save_set_cache = () => {
-      set_cache.value[selectedprojector.value] = JSON.stringify(value);
-    };
-    onBeforeUnmount(() => {
-      sessionStorage.DensityCorrection = JSON.stringify(set_cache.value);
-    });
-    watch(() => now_index, (newval, oldval) => {
-      now_index.value > 4 ? set?.SetBlendingOption("blending_grids_select_point", `density_h:${now_index.value - 4}`) : set?.SetBlendingOption("blending_grids_select_point", `density_v:${now_index.value + 1}`)
-    }, { deep: true })
+      let tmp = { value_h: value_h.value, value_v: value_v.value, value_v_point_amount: value_v_point_amount.value, value_h_point_amount: value_h_point_amount.value, value_v_point: value_v_point.value, value_h_point: value_h_point.value }
+      set_cache.value[selectedprojector.value] = JSON.stringify(tmp);
+    }
+
+
+
+
+    const auxiliary_line = ref(false)
+
+
+
+
     watch(
       () => configselsect,
       (newVal, oldVal) => {
@@ -277,6 +296,8 @@ export default defineComponent({
         config = JSON.parse(JSON.stringify(fortmp));
         use_server_config();
         use_set_cache();
+        options_value_h_point_amount.value = Object.keys(config.multi_hor_density)
+      options_value_v_point_amount.value = Object.keys(config.multi_ver_density)
         setTimeout(() => {
           ste_status.value = 0;
         }, 100);
@@ -284,272 +305,564 @@ export default defineComponent({
       { deep: true }
     );
 
-    const initialization = () => {
-      ste_status.value = 1;
-      for (let index = 0; index < config.hor_density.length; index++) {
-        value[index].x = config.ver_density[index].x;
-        value[index].y = config.ver_density[index].y;
-        value[index].number = config.ver_density[index].control_point;
-        value[index + 5].x = config.hor_density[index].x;
-        value[index + 5].y = config.hor_density[index].y;
-        value[index + 5].number = config.hor_density[index].control_point;
-      }
-      if (
-        sessionStorage.DensityCorrection &&
-        sessionStorage.DensityCorrection.length > 0
-      ) {
-        set_cache.value = JSON.parse(sessionStorage.DensityCorrection);
-        use_set_cache();
+
+
+    const set_cache: any = ref([]);
+    //值
+    let value_h = ref(<DensityCorrection[]>[]);
+    let value_v = ref(<DensityCorrection[]>[]);
+    //位置
+    let value_h_point = ref(<DensityCorrectionPoint[]>[]);
+    let value_v_point = ref(<DensityCorrectionPoint[]>[]);
+    /**
+     * 当前选中的点的索引
+     */
+    const options_model_v = ref(0)
+    const options_model_h = ref(0)
+
+    const div = ref();
+    const max = ref({ x: 0, y: 0 })
+    const point = ref({ w: 20, h: 20 })
+
+
+    watch(() => now_v_h, (newval, oldval) => {
+      if (newval.value == 'level') {
+        set?.SetBlendingOption("blending_grids_select_ui", "hor_density")
       } else {
+        set?.SetBlendingOption("blending_grids_select_ui", "ver_density")
       }
-      setTimeout(() => {
-        ste_status.value = 0;
-      }, 100);
-    };
-
-    const use_set_cache = () => {
-      if (set_cache.value[selectedprojector.value] != null) {
-        let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
-        deepcopy(value, tmp);
-      }
-      for (let index = 0; index < 10; index++) {
-        asyncpoint(index, index < 5 ? value[index].y : value[index].x)
-      }
-    };
-    const resetall = () => {
-      for (
-        let index = 0;
-        index < config.hor_density.length + config.ver_density.length;
-        index++
-      ) {
-        reset(index, false);
-      }
-	  set?.SetBlendingVerDensity(
-          $store.getters.GetTheCurrentlySelectedCamera[0],
-          $store.getters.GetTheCurrentlySelectedCamera[1],
-		  5,
-          -1, 0
-        );
-    };
-    const reset = (index: number, send: boolean) => {
-	  send = send?? true;
-      if (index > 4) {
-        value[index].x = config.hor_density[index - 5].def_x;
-        value[index].y = config.hor_density[index - 5].def_y;
-
-        if (send)
-		{
-		  set?.SetBlendingHorDensity(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-			5,
-            index - 5 + 1,
-            Number(value[index].x)
-          );
-		}
+    }, { deep: true })
+    watch(() => value_v_point_amount, (newval, oldval) => {
+      set?.SetBlendingOption("blending_grids_control_point_count", `${newval.value}`)
+      if (now_v_h.value == 'level') {
+        set?.SetBlendingOption("blending_grids_select_ui", "hor_density")
       } else {
-        value[index].x = config.ver_density[index].def_x;
-        value[index].y = config.ver_density[index].def_y;
-		if (send)
-		{
-          set?.SetBlendingVerDensity(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-			5,
-            index + 1,
-            Number(value[index].y)
-          );
-		}
+        set?.SetBlendingOption("blending_grids_select_ui", "ver_density")
       }
-
-      point_postion[index].y = default_location[index].y;
-      point_postion[index].x = default_location[index].x;
-      save_set_cache()
-    };
-    const point_postion: any = reactive([
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-    ]);
-    let set = GlobalData.getInstance().getCurrentClient();
-    const save = () => {
-      set?.SaveBlendingConfig("");
-      setTimeout(() => {
-        set?.GetBlendingConfig("").then((res) => {
-          $store.commit("setfusion_configuration", res?.config);
-        });
-      }, 1000);
-    };
-
-
-    const use_server_config = () => {
-      for (let index = 0; index < config.hor_density.length; index++) {
-        value[index].x = config.ver_density[index].x;
-        value[index].y = config.ver_density[index].y;
-        value[index].number = config.ver_density[index].number;
-        value[index + 5].x = config.hor_density[index].x;
-        value[index + 5].y = config.hor_density[index].y;
-        value[index + 5].number = config.hor_density[index].number;
-      }
-      for (let index = 0; index < 10; index++) {
-        asyncpoint(index, index < 5 ? value[index].y : value[index].x)
-
-      }
-    };
-
-
-    onMounted(() => {
-      initialization();
-      Proportion.value.x = config.width / (div.value.offsetWidth - 20);
-      Proportion.value.y = config.height / (div.value.offsetHeight - 20);
-      let Width = (div.value.offsetWidth - 20) / 4;
-      let Height = (div.value.offsetHeight - 20) / 4;
-
-      max_x_y[0] = div.value.offsetWidth - 20
-      max_x_y[1] = div.value.offsetHeight - 20
-      for (let index = 0; index < 10; index++) {
-        if (index < 5) {
-          point_postion[index].y = default_location[index].y = Height * index;
-          point_postion[index].x = default_location[index].x = 0;
-        } else {
-          point_postion[index].y = default_location[index].y = 0;
-          point_postion[index].x = default_location[index].x = Width * (index - 5);
-        }
-      }
-      use_server_config();
-      if (
-        sessionStorage.DensityCorrection &&
-        sessionStorage.DensityCorrection.length > 0
-      ) {
-        set_cache.value = JSON.parse(sessionStorage.DensityCorrection);
-        use_set_cache();
+    }, { deep: true })
+    watch(() => value_h_point_amount, (newval, oldval) => {
+      set?.SetBlendingOption("blending_grids_control_point_count", `${newval.value}`)
+      if (now_v_h.value == 'level') {
+        set?.SetBlendingOption("blending_grids_select_ui", "hor_density")
       } else {
+        set?.SetBlendingOption("blending_grids_select_ui", "ver_density")
       }
+    }, { deep: true })
+
+    watch(() => options_model_h, (newval, oldval) => {
+      set?.SetBlendingOption("blending_grids_select_point", `${value_h_point.value[newval.value].control_point}`)
+    }, { deep: true })
+    watch(() => options_model_v, (newval, oldval) => {
+      set?.SetBlendingOption("blending_grids_select_point", `${value_v_point.value[newval.value].control_point}`)
+    }, { deep: true })
+
+    /**
+     * 分辨率和页面的比例
+     */
+    let Proportion = ref({ x: 100, y: 1000 });
+    nextTick(() => {
+      max.value.x = div.value.offsetWidth
+      max.value.y = div.value.offsetHeight
+    })
 
 
+    const chang_point_amount = (val: number, type: string) => {
+      start_point(val, type)
+    }
 
-    });
-
-    //窗口变动重新渲染
-    onMounted(() => {
-      window.onresize = () => {
-        return (() => {
-          if (div != null) {
-            initialization();
-            Proportion.value.x = config.width / (div.value.offsetWidth - 20);
-            Proportion.value.y = config.height / (div.value.offsetHeight - 30);
-            let Width = (div.value.offsetWidth - 20) / 4;
-            let Height = (div.value.offsetHeight - 20) / 4;
-
-            max_x_y[0] = div.value.offsetWidth - 20
-            max_x_y[1] = div.value.offsetHeight - 20
-            for (let index = 0; index < 10; index++) {
-              if (index < 5) {
-                point_postion[index].y = default_location[index].y = Height * index;
-                point_postion[index].x = default_location[index].x = 0;
-              } else {
-                point_postion[index].y = default_location[index].y = 0;
-                point_postion[index].x = default_location[index].x = Width * (index - 5);
-              }
-            }
-          }
-        })();
-      };
-    });
-    const send_configuration = (
-      index: number,
-      value: number,
-      type:string,
-    ) => {
-      if (ste_status.value == 0) {
-        if (type=='v') {
-          set?.SetBlendingVerDensity(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-			5,
-            index+1,
-            Number(value)
-          );
-        }
-        if (type=='h') {
-          set?.SetBlendingHorDensity(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-			5,
-            index>4?index-4:index+1,
-            Number(value)
-          );
-        }
-      }
-      save_set_cache();
-    };
-    initialization();
     const dragStartHandle = ($event: any, index: number, type: string) => {
       let obj_x = $event.x
       let obj_y = $event.y
-      if (type == 'h') {
-        let x =
-
-          Math.ceil(
-            (obj_x - default_location[index].x) * Proportion.value.x
-          );
-        let y =
-          config.height -
-          (config.height / 4) * index -
-          Math.ceil(
-            (obj_y - default_location[index].y) * Proportion.value.y
-          );
-        value[index+5].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-        send_configuration(index, x,'h')
-      }
+      let tmp = coordinate_transformation_xy_to_value(obj_x, obj_y)
       if (type == 'v') {
-        let x = Math.ceil(obj_x * Proportion.value.x);
-        let y =
-          config.height -
-          (config.height / 4) * index -
-          Math.ceil(
-            (obj_y - default_location[index].y) * Proportion.value.y
-          );
-        value[index].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-        send_configuration(index, y,'v')
+        value_v.value[index].y = Math.trunc(tmp.y)
+        send_value(index, type, Math.trunc(tmp.y))
+      }
+      if (type == 'h') {
+        value_h.value[index].x = Math.trunc(tmp.x)
+        send_value(index, type, Math.trunc(tmp.x))
+      }
+      save_set_cache()
+    }
+
+    const chang = (index: number, $event: any, type: string) => {
+      $event = Number($event)
+      if (type == 'v') {
+        let tmp = coordinate_transformation_value_to_xy(0, $event)
+        value_v_point.value[index].y = Math.trunc(tmp.y)
+        send_value(index, type, Math.trunc(value_v.value[index].y))
+      }
+      if (type == 'h') {
+        let tmp = coordinate_transformation_value_to_xy($event, 0)
+        value_h_point.value[index].x = Math.trunc(tmp.x)
+        send_value(index, type, Math.trunc(value_h.value[index].x))
+      }
+      save_set_cache()
+    }
+    const options_v = computed(() => {
+      let tmp = []
+      for (let index = 0; index < Number(value_v_point_amount.value); index++) {
+        tmp.push({
+          label: `v${index + 1}`,
+          value: index,
+        })
+      }
+      return tmp
+    })
+    const options_h = computed(() => {
+      let tmp = []
+      for (let index = 0; index < Number(value_h_point_amount.value); index++) {
+        tmp.push({
+          label: `h${index + 1}`,
+          value: index,
+        })
+      }
+      return tmp
+    })
+
+    /**
+     * 将分辨率的坐标转换为 页面的坐标
+     * @param x x坐标
+     * @param y y坐标
+     */
+    const coordinate_transformation_value_to_xy = (x: number, y: number): { x: number, y: number } => {
+      x = x / Proportion.value.x
+      y = (config.height - y) / Proportion.value.y
+      return { x, y }
+    }
+
+
+    /**
+     * 将页面的坐标转换为 分辨率的坐标
+     * @param x x坐标
+     * @param y y坐标
+     */
+    const coordinate_transformation_xy_to_value = (x: number, y: number): { x: number, y: number } => {
+      x = x * Proportion.value.x
+      y = (max.value.y - y) * Proportion.value.y
+      return { x, y }
+    }
+
+    const start_point = (a: number, type: string) => {
+      if (type == 'h' || type == 'all') {
+        value_h.value = []
+        value_h_point.value = []
+        for (let index = 0; index < config.multi_hor_density[a].length; index++) {
+          let tmp: DensityCorrectionPoint = config.multi_hor_density[a][index];
+          value_h.value.push(tmp)
+          let x_y = coordinate_transformation_value_to_xy(tmp.x, tmp.y)
+          let def_x_f = coordinate_transformation_value_to_xy(tmp.def_x, tmp.def_y)
+          let tmp_point: DensityCorrectionPoint = {
+            control_point: tmp.control_point,
+            x: x_y.x,
+            y: x_y.y,
+            def_x: def_x_f.x,
+            def_y: def_x_f.y
+          }
+          value_h_point.value.push(tmp_point)
+        }
+      }
+      if (type == 'v' || type == 'all') {
+        value_v.value = []
+        value_v_point.value = []
+        for (let index = 0; index < config.multi_ver_density[a].length; index++) {
+          let tmp: DensityCorrectionPoint = config.multi_ver_density[a][index];
+          value_v.value.push(tmp)
+          let x_y = coordinate_transformation_value_to_xy(tmp.x, tmp.y)
+          let def_x_f = coordinate_transformation_value_to_xy(tmp.def_x, tmp.def_y)
+          let tmp_point: DensityCorrectionPoint = {
+            control_point: tmp.control_point,
+            x: x_y.x,
+            y: x_y.y,
+            def_x: def_x_f.x,
+            def_y: def_x_f.y
+          }
+          value_v_point.value.push(tmp_point)
+        }
+      }
+
+    }
+
+
+    const start = () => {
+      let tmp: DensityCorrectionPoint = { control_point: 0, x: 0, y: 0, def_x: 0, def_y: 0 };
+      value_v.value.push(tmp)
+      value_h.value.push(tmp)
+      value_v_point.value.push(tmp)
+      value_h_point.value.push(tmp)
+    }
+    start()
+    onMounted(() => {
+      Proportion.value.x = config.width / (div.value.offsetWidth - point.value.w)
+      Proportion.value.y = config.height / (div.value.offsetHeight - point.value.h)
+      options_value_h_point_amount.value = Object.keys(config.multi_hor_density)
+      options_value_v_point_amount.value = Object.keys(config.multi_ver_density)
+      let tmp = JSON.parse($store.state.fusion_configuration).options;
+      auxiliary_line.value = tmp.blending_grids_density_assistant_lines == "1"
+      now_v_h.value = "level"
+      start_point(5, 'all')
+      if (
+        sessionStorage.DensityCorrection &&
+        sessionStorage.DensityCorrection.length > 0
+      ) {
+        set_cache.value = JSON.parse(sessionStorage.DensityCorrection);
+        use_set_cache();
+      }
+      window.onresize = () => {
+        return (() => {
+          if (div != null) {
+            recalculate_coordinates()
+          }
+        })();
+      };
+    })
+
+    onBeforeUnmount(() => {
+      sessionStorage.DensityCorrection = JSON.stringify(set_cache.value);
+    });
+
+    const reset = (index: number, send: boolean, type: string) => {
+      if (type == 'v') {
+        value_v.value[index].x = value_v.value[index].def_x
+        value_v.value[index].y = value_v.value[index].def_y
+        chang(index, value_v.value[index].def_y, type)
+      }
+      if (type == 'h') {
+        value_h.value[index].x = value_h.value[index].def_x
+        value_h.value[index].y = value_h.value[index].def_y
+        chang(index, value_h.value[index].def_x, type)
+      }
+      save_set_cache()
+    }
+    const send_value = (index: number, type: string, value: number) => {
+      let row = $store.getters.GetTheCurrentlySelectedCamera[0]
+      let col = $store.getters.GetTheCurrentlySelectedCamera[1]
+      if (type == 'v') {
+        set?.SetBlendingVerDensity(row, col, Number(value_v_point_amount.value), index + 1, Number(value));
+      }
+      if (type == 'h') {
+        set?.SetBlendingHorDensity(row, col, Number(value_h_point_amount.value), index + 1, Number(value));
       }
     }
-    const options_v: any = reactive([]);
-    const options_h: any = reactive([]);
-    const options_model_v = ref(0)
-    const options_model_h = ref(5)
-    for (let index = 0; index < 5; index++) {
-      options_v.push({ "label": `v${index + 1}`, value: index })
-      options_h.push({ "label": `h${index + 1}`, value: index + 5 })
+    const resetall = () => {
+      switch (now_v_h.value) {
+        case 'vertical':
+          for (let index = 0; index < value_v_point_amount.value; index++) {
+            reset(index, true, 'v')
+          }
+          break;
+        case 'level':
+          for (let index = 0; index < value_h_point_amount.value; index++) {
+            reset(index, true, 'h')
+          }
+          break;
+        default:
+          break;
+      }
+
+
+    }
+    const del_dialog = ref(false)
+    const add_control_points = (amount: number, type: string) => {
+      if (amount < 5) return
+      let tmpconfig: any = null
+      let row = $store.getters.GetTheCurrentlySelectedCamera[0]
+      let col = $store.getters.GetTheCurrentlySelectedCamera[1]
+      switch (type) {
+        case 'v':
+          set?.AddBlendingCtrlPoint('ver_density', row, col, amount).then((res) => {
+            if (res == null || typeof (res) == "undefined") return
+            update(res?.config)
+            let tmp = JSON.parse(res?.config);
+            let fortmp = null;
+            let i;
+            for (i of tmp.projectors) {
+              if (
+                i.col === $store.getters.GetTheCurrentlySelectedCamera[1] &&
+                i.row === $store.getters.GetTheCurrentlySelectedCamera[0]
+              ) {
+                fortmp = JSON.parse(JSON.stringify(i));
+              }
+            }
+            ste_status.value = 1;
+            tmpconfig = JSON.parse(JSON.stringify(fortmp));
+            config = JSON.parse(JSON.stringify(fortmp));
+            options_value_v_point_amount.value = []
+            for (let key in tmpconfig.multi_ver_density) {
+              options_value_v_point_amount.value.push(key)
+            }
+
+            // console.log(amount)
+            // console.log(tmpconfig.multi_ver_density)
+            value_v_point_amount.value = amount
+            $store.commit("setfusion_configuration", res?.config);
+            value_v.value = []
+            value_v_point.value = []
+            for (let index = 0; index < tmpconfig.multi_ver_density[amount].length; index++) {
+              let tmp: DensityCorrectionPoint = tmpconfig.multi_ver_density[amount][index];
+              value_v.value.push(tmp)
+              let x_y = coordinate_transformation_value_to_xy(tmp.x, tmp.y)
+              let def_x_f = coordinate_transformation_value_to_xy(tmp.def_x, tmp.def_y)
+              let tmp_point: DensityCorrectionPoint = {
+                control_point: tmp.control_point,
+                x: x_y.x,
+                y: x_y.y,
+                def_x: def_x_f.x,
+                def_y: def_x_f.y
+              }
+              value_v_point.value.push(tmp_point)
+            }
+          });
+          break;
+        case 'h':
+          set?.AddBlendingCtrlPoint('hor_density', row, col, amount).then((res) => {
+            if (res == null || typeof (res) == "undefined") return
+            update(res?.config)
+            let tmp = JSON.parse(res?.config);
+            let fortmp = null;
+            let i;
+            for (i of tmp.projectors) {
+              if (
+                i.col === $store.getters.GetTheCurrentlySelectedCamera[1] &&
+                i.row === $store.getters.GetTheCurrentlySelectedCamera[0]
+              ) {
+                fortmp = JSON.parse(JSON.stringify(i));
+              }
+            }
+            ste_status.value = 1;
+            tmpconfig = JSON.parse(JSON.stringify(fortmp));
+            config = JSON.parse(JSON.stringify(fortmp));
+            options_value_h_point_amount.value = []
+            for (let key in tmpconfig.multi_hor_density) {
+              options_value_h_point_amount.value.push(key)
+            }
+            value_h_point_amount.value = amount
+            $store.commit("setfusion_configuration", res?.config);
+            value_h.value = []
+            value_h_point.value = []
+            for (let index = 0; index < tmpconfig.multi_hor_density[amount].length; index++) {
+              let tmp: DensityCorrectionPoint = tmpconfig.multi_hor_density[amount][index];
+              value_h.value.push(tmp)
+              let x_y = coordinate_transformation_value_to_xy(tmp.x, tmp.y)
+              let def_x_f = coordinate_transformation_value_to_xy(tmp.def_x, tmp.def_y)
+              let tmp_point: DensityCorrectionPoint = {
+                control_point: tmp.control_point,
+                x: x_y.x,
+                y: x_y.y,
+                def_x: def_x_f.x,
+                def_y: def_x_f.y
+              }
+              value_h_point.value.push(tmp_point)
+            }
+          });
+          break;
+        default:
+          break;
+      }
+
+    }
+
+    /**
+     * 更新比例 更新坐标
+     */
+    const recalculate_coordinates = () => {
+      try {
+        Proportion.value.x = config.width / (div.value.offsetWidth - point.value.w)
+        Proportion.value.y = config.height / (div.value.offsetHeight - point.value.h)
+        max.value.x = div.value.offsetWidth
+        max.value.y = div.value.offsetHeight
+        for (let index = 0; index < value_v_point_amount.value; index++) {
+          let x_y = coordinate_transformation_value_to_xy(value_v.value[index].x, value_v.value[index].y)
+          let def_x_f = coordinate_transformation_value_to_xy(value_v.value[index].def_x, value_v.value[index].def_y)
+          value_v_point.value[index].x = x_y.x
+          value_v_point.value[index].y = x_y.y
+          value_v_point.value[index].def_x = def_x_f.x
+          value_v_point.value[index].def_y = def_x_f.y
+        }
+        for (let index = 0; index < value_h_point_amount.value; index++) {
+          let x_y = coordinate_transformation_value_to_xy(value_h.value[index].x, value_h.value[index].y)
+          let def_x_f = coordinate_transformation_value_to_xy(value_h.value[index].def_x, value_h.value[index].def_y)
+          value_h_point.value[index].x = x_y.x
+          value_h_point.value[index].y = x_y.y
+          value_h_point.value[index].def_x = def_x_f.x
+          value_h_point.value[index].def_x = def_x_f.y
+        }
+      } catch (error) {
+
+      }
+    }
+
+
+    const reduce_control_points = (amount: number, type: string) => {
+      if (amount <= 5) return
+      let tmpconfig: any = null
+      let row = $store.getters.GetTheCurrentlySelectedCamera[0]
+      let col = $store.getters.GetTheCurrentlySelectedCamera[1]
+      switch (type) {
+        case 'v':
+          set?.DelBlendingCtrlPoint('ver_density', row, col, amount).then((res) => {
+            if (res == null || typeof (res) == "undefined") return
+            let tmp = JSON.parse(res?.config);
+            let fortmp = null;
+            let i;
+            for (i of tmp.projectors) {
+              if (
+                i.col === $store.getters.GetTheCurrentlySelectedCamera[1] &&
+                i.row === $store.getters.GetTheCurrentlySelectedCamera[0]
+              ) {
+                fortmp = JSON.parse(JSON.stringify(i));
+              }
+            }
+            ste_status.value = 1;
+            options_value_v_point_amount.value = []
+            tmpconfig = JSON.parse(JSON.stringify(fortmp));
+            config = JSON.parse(JSON.stringify(fortmp));
+            for (let key in tmpconfig.multi_ver_density) {
+              options_value_v_point_amount.value.push(key)
+            }
+            value_v_point_amount.value = Number(options_value_v_point_amount.value[options_value_v_point_amount.value.length-1])
+            amount=Number(options_value_v_point_amount.value[options_value_v_point_amount.value.length-1])
+            // console.log(tmpconfig.multi_ver_density)
+            // console.log(value_v_point_amount.value)
+            // console.log(amount,'a')
+            $store.commit("setfusion_configuration", res?.config);
+            value_v.value = []
+            value_v_point.value = []
+
+            for (let index = 0; index < tmpconfig.multi_ver_density[amount].length; index++) {
+              let tmp: DensityCorrectionPoint = config.multi_ver_density[amount][index];
+              value_v.value.push(tmp)
+              let x_y = coordinate_transformation_value_to_xy(tmp.x, tmp.y)
+              let def_x_f = coordinate_transformation_value_to_xy(tmp.def_x, tmp.def_y)
+              let tmp_point: DensityCorrectionPoint = {
+                control_point: tmp.control_point,
+                x: x_y.x,
+                y: x_y.y,
+                def_x: def_x_f.x,
+                def_y: def_x_f.y
+              }
+              value_v_point.value.push(tmp_point)
+            }
+            options_model_v.value=0
+          });
+          break;
+        case 'h':
+          set?.DelBlendingCtrlPoint('hor_density', row, col, amount).then((res) => {
+            if (res == null || typeof (res) == "undefined") return
+            let tmp = JSON.parse(res?.config);
+            let fortmp = null;
+            let i;
+            for (i of tmp.projectors) {
+              if (
+                i.col === $store.getters.GetTheCurrentlySelectedCamera[1] &&
+                i.row === $store.getters.GetTheCurrentlySelectedCamera[0]
+              ) {
+                fortmp = JSON.parse(JSON.stringify(i));
+              }
+            }
+            ste_status.value = 1;
+            tmpconfig = JSON.parse(JSON.stringify(fortmp));
+            config = JSON.parse(JSON.stringify(fortmp));
+            options_value_h_point_amount.value = []
+            for (let key in tmpconfig.multi_hor_density) {
+              options_value_h_point_amount.value.push(key)
+            }
+            value_h_point_amount.value = Number(options_value_h_point_amount.value[options_value_h_point_amount.value.length-1])
+            amount=Number(options_value_h_point_amount.value[options_value_h_point_amount.value.length-1])
+            //value_h_point_amount.value = amount
+            $store.commit("setfusion_configuration", res?.config);
+            value_h.value = []
+            value_h_point.value = []
+            // console.log(tmpconfig.multi_hor_density)
+
+            for (let index = 0; index < tmpconfig.multi_hor_density[amount].length; index++) {
+              let tmp: DensityCorrectionPoint = tmpconfig.multi_hor_density[amount][index];
+              value_h.value.push(tmp)
+              let x_y = coordinate_transformation_value_to_xy(tmp.x, tmp.y)
+              let def_x_f = coordinate_transformation_value_to_xy(tmp.def_x, tmp.def_y)
+              let tmp_point: DensityCorrectionPoint = {
+                control_point: tmp.control_point,
+                x: x_y.x,
+                y: x_y.y,
+                def_x: def_x_f.x,
+                def_y: def_x_f.y
+              }
+              value_h_point.value.push(tmp_point)
+            }
+            options_model_h.value=0
+          });
+          break;
+        default:
+          break;
+      }
+
+    }
+
+    const update = (config: string) => {
+      let tmp = JSON.parse($store.state.fusion_configuration);
+      let fortmp = null;
+      let i;
+      for (i of tmp.projectors) {
+        if (
+          i.col === $store.getters.GetTheCurrentlySelectedCamera[1] &&
+          i.row === $store.getters.GetTheCurrentlySelectedCamera[0]
+        ) {
+          fortmp = JSON.parse(JSON.stringify(i));
+        }
+      }
+      ste_status.value = 1;
+      config = JSON.parse(JSON.stringify(fortmp));
+      use_server_config();
+      use_set_cache();
+      setTimeout(() => {
+        ste_status.value = 0;
+      }, 100);
+    }
+    const send_auxiliary_line = (val: boolean) => {
+      set?.SetBlendingOption("blending_grids_density_assistant_lines", val ? "1" : "0");
+    }
+    const del = () => {
+      let tmp = now_v_h.value == "vertical" ? "v" : "h"
+      let amount = now_v_h.value == "vertical" ? value_v_point_amount.value : value_h_point_amount.value
+      reduce_control_points(Number(amount), tmp)
+    }
+    const add = () => {
+      let tmp = now_v_h.value == "vertical" ? "v" : "h"
+      add_control_points(Number(now_amount.value), tmp);
     }
     return {
+      resetall,
+      div,
+      max,
+      point,
       options_model_v,
       options_model_h,
+      value_h,
+      value_v,
+      value_h_point,
+      value_v_point,
+      dragStartHandle,
+      chang,
       options_v,
       options_h,
-      config,
-      now_adjust,
-      set_cache,
-      chang,
-      max_x_y,
-      dragStartHandle,
-      now_index,
-      model,
-      value,
       reset,
-      resetall,
-      point_postion,
-      div,
-      save,
+      options_value_h_point_amount,
+      options_value_v_point_amount,
+      value_h_point_amount,
+      value_v_point_amount,
+      chang_point_amount,
+      add_control_points,
+      now_v_h,
+      reduce_control_points,
+      send_auxiliary_line,
+      auxiliary_line,
+      del,
+      add,
+      del_dialog,
+      add_dialog,
+      now_amount
+    }
+  }
+})
 
-    };
-  },
-});
 </script>
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 772f124..88c0f28 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -1,120 +1,97 @@
 <template>
   <div class="row">
-    <div class="col-2">
-      <q-input filled type="number" class="q-pt-xs" style="text-align: center" :dense="true"
-        @focus="isactivearray[0] = false" v-model="four[0].x" label="x" lazy-rules />
-      <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[0] = false" v-model="four[0].y"
-        label="y" lazy-rules />
-      <q-btn size="sm" dense color="white" @click="reset(0, false)" text-color="black"
-        :label="$t('reset') + $t('point') + '1'" />
-    </div>
-    <div class="col-8"></div>
-    <div class="col-2">
-      <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[1] = false" v-model="four[1].x"
-        label="x" lazy-rules />
-      <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[1] = false" v-model="four[1].y"
-        label="y" lazy-rules />
-      <q-btn size="sm" dense color="white" @click="reset(1, false)" text-color="black"
-        :label="$t('reset') + $t('point') + '2'" />
-    </div>
-
-    <div class="col-2"></div>
-    <div class="col-8">
-      <div ref="div" style="background-color: #646464; height: 40vh">
+    <div class="col-1"></div>
+    <div class="col-10 q-pt-md">
+      <div ref="div" style="width: 100%; background-color: #646464; height: 40vh">
         <div style="position: absolute">
-          <vue3ResizeDrag style="border: 0;" :class="[now_index == 0 ? 'action' : 'point']" v-if="isshowarray[0]"
-            :isActive="isactivearray[0]" @mousedown="activeMouseDown(0)" @mouseUpHandler="mouseUpHandler(0)" :w="20"
-            :h="20" :x="points[0].x" :y="points[0].y" :isResizable="false" @moveHandler="moveHandler_1">
-            <div>1</div>
-          </vue3ResizeDrag>
-          <vue3ResizeDrag style="border: 0;" :class="[now_index == 1 ? 'action' : 'point']" v-if="isshowarray[1]"
-            :isActive="isactivearray[1]" @mousedown="activeMouseDown(1)" @mouseUpHandler="mouseUpHandler(1)" :w="20"
-            :h="20" :x="points[1].x" :y="points[1].y" :isResizable="false" @moveHandler="moveHandler_2">
-            <div>2</div>
-          </vue3ResizeDrag>
-          <vue3ResizeDrag style="border: 0;" :class="[now_index == 2 ? 'action' : 'point']" v-if="isshowarray[2]"
-            :isActive="isactivearray[2]" @mousedown="activeMouseDown(2)" @mouseUpHandler="mouseUpHandler(2)" :w="20"
-            :h="20" :x="points[2].x" :y="points[2].y" :isResizable="false" @moveHandler="moveHandler_3">
-            <div>3</div>
-          </vue3ResizeDrag>
-          <vue3ResizeDrag style="border: 0;" :class="[now_index == 3 ? 'action' : 'point']" v-if="isshowarray[3]"
-            :isActive="isactivearray[3]" @mousedown="activeMouseDown(3)" @mouseUpHandler="mouseUpHandler(3)" :w="20"
-            :h="20" :x="points[3].x" :y="points[3].y" :isResizable="false" @moveHandler="moveHandler_4">
-            <div>4</div>
-          </vue3ResizeDrag>
+          <Vue3DraggableResizable :class="[options_model == index ? 'action' : 'point']"
+            v-for="(item, index) in value_point.length" :initW="point.w"  :adsorbParent="false" :initH="point.h" :resizable="false"
+            v-model:x="value_point[index].x" v-model:y="value_point[index].y" @activated="options_model = index"
+            @click="options_model = index" @dragging="dragStartHandle($event, index)">
+            <span>{{
+              index+ 1
+            }}</span>
+          </Vue3DraggableResizable>
         </div>
       </div>
     </div>
-    <div class="col-2"></div>
+  </div>
+  <div>
+    <div class="row">
+      <div class="col-1"></div>
+      <div class="col-2 q-px-md"> <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"> <q-input 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 />
 
-    <div class="col-2">
-      <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[2] = false" v-model="four[2].x"
-        label="x" lazy-rules />
-      <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[2] = false" v-model="four[2].y"
-        label="y" lazy-rules />
-      <q-btn size="sm" dense color="white" @click="reset(2, false)" text-color="black"
-        :label="$t('reset') + $t('point') + '3'" />
-    </div>
-    <div class="col-8">
-      <q-btn size="sm" dense color="white" @click="resetall" text-color="black" :label="$t('resetall')" />
-    </div>
-    <div class="col-2">
-      <q-input filled type="number" :dense="true" @focus="isactivearray[3] = false" v-model="four[3].x" label="x"
-        lazy-rules />
-      <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[3] = false" v-model="four[3].y"
-        label="y" lazy-rules />
-      <q-btn size="sm" dense color="white" @click="reset(3,false)" text-color="black"
-        :label="$t('reset') + $t('point') + '4'" />
+      </div>
+      <div class="col-2 q-px-md"> <q-input 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 /></div>
+      <div class="q-pt-md col-2">
+        <q-btn color="white" @click="reset(options_model, true, 'h')" text-color="black" :label="$t('reset')" />
+      </div>
+      <div class="col-2 q-pt-md">
+        <div><q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" /></div>
+      </div>
     </div>
+
   </div>
 </template>
 
 <style scoped>
-.point {
+.action {
+  background-color: rgb(27, 180, 111);
   border-radius: 50%;
-  background: #0000ff;
-  color: aliceblue;
 }
 
-.action {
+.point {
+  background-color: rgb(186, 245, 245);
   border-radius: 50%;
-  background-color: aqua;
 }
 </style>
-<script lang="ts">
-import vue3ResizeDrag from "src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
-import { dom } from "quasar";
 
+<script lang="ts">
 import {
   defineComponent,
-  ref,
-  watch,
-  computed,
-  defineProps,
-  withDefaults,
   onMounted,
-  reactive,
-  onBeforeUnmount,
+  ref,
+  computed,
+  watch,
+  nextTick,
+  onBeforeUnmount
 } from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
-import ClientConnection from "src/common/ClientConnection";
+import Vue3DraggableResizable from 'vue3-draggable-resizable'
+import 'vue3-draggable-resizable/dist/Vue3DraggableResizable.css'
+
+
+import DensityCorrection from "src/entities/DensityCorrection";
+import DensityCorrectionPoint from "src/entities/DensityCorrectionPoint";
+import { config } from "process";
+import { QSelect, QInput, QBtn } from "quasar";
+import { div } from "zrender/lib/core/vector";
 import GlobalData from "src/common/GlobalData";
-import { Console } from "console";
+import { number } from "@intlify/core-base";
 
 export default defineComponent({
-  name: "ComponentFourPointCalibration",
+  name: "ComponentDensityCorrection",
   components: {
-    vue3ResizeDrag,
+    Vue3DraggableResizable
   },
   setup() {
+    let set = GlobalData.getInstance().getCurrentClient();
     let $store = useStore();
     let $t = useI18n();
+    const ste_status = ref(0);
     let config = JSON.parse($store.state.fusion_configuration).projectors[0];
-    let set = GlobalData.getInstance().getCurrentClient();
     const configselsect = computed(() => {
       return $store.state.selected_projector;
     });
+
     //用于计算当前投影仪的索引
     let serverconfig = JSON.parse($store.state.fusion_configuration);
     const selectedprojector = computed(() => {
@@ -123,58 +100,10 @@ export default defineComponent({
         $store.getters.GetTheCurrentlySelectedCamera[1]
       );
     });
-    const set_cache: any = ref([]);
-    let four = reactive([
-      { x: config.point4[0].x, y: config.point4[0].y },
-      { x: config.point4[1].x, y: config.point4[1].y },
-      { x: config.point4[2].x, y: config.point4[2].x },
-      { x: config.point4[3].x, y: config.point4[3].y },
-    ]);
-    let defaultfour = ref([
-      { x: 0, y: 1080 },
-      { x: 1920, y: 1080 },
-      { x: 0, y: 0 },
-      { x: 1920, y: 0 },
-    ]);
-    let defaultfourpostion: any = ref([
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-    ]);
-    let fourpostion: any = ref([
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-    ]);
-    let div: any = ref(null);
-    let Proportion = ref({ x: 0, y: 0 }); //缩放比例
-    let points = reactive([
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-      { x: 0, y: 0 },
-    ]); //点的位置
-    const now_index = ref(0)
-    const isshowarray = ref([true, true, true, true]);
-    const isactivearray = ref([true, true, true, true]);
-    const ste_status = ref(0);
-    const save = () => {
-      set?.SaveBlendingConfig("");
-      setTimeout(() => {
-        set?.GetBlendingConfig("").then((res) => {
-          $store.commit("setfusion_configuration", res?.config);
-        });
-      }, 1000);
-    };
-    const use_set_cache = () => {
-      if (set_cache.value[selectedprojector.value] != null) {
-        let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
-        deepcopy(four, tmp);
-      }
-      syncpoint();
-    };
+
+    const value_point_amount = ref(5)
+
+
     const deepcopy = (o1: any, o2: any) => {
       for (let k in o2) {
         if (typeof o2[k] === "object") {
@@ -185,240 +114,39 @@ export default defineComponent({
         }
       }
     };
-    const save_set_cache = () => {
-      set_cache.value[selectedprojector.value] = JSON.stringify(four);
-    };
-    onBeforeUnmount(() => {
-      sessionStorage.FourPointCalibration = JSON.stringify(set_cache.value);
-    });
-    const activeMouseDown = (index: number) => {
-      isactivearray.value[index] = true;
-      now_index.value = index
-    };
-    const mouseUpHandler = (index: number) => {
-      isactivearray.value[index] = false;
-    };
-    const keyDown = () => {
-      document.onkeydown = (e) => {
-        let lock = 0
-        let e1 = e || window.event || arguments.callee.caller.arguments[0]
-        switch (e.code) {
-          case "KeyW":
-            points[now_index.value].x
-            points[now_index.value].y--
-            break;
-          case "KeyA":
-            points[now_index.value].x--;
-            points[now_index.value].y
-            break;
-          case "KeyS":
-            points[now_index.value].x;
-            points[now_index.value].y++
-            break;
-          case "KeyD":
-            points[now_index.value].x++;
-            points[now_index.value].y
-            break;
-          default:
-            lock = 1
-            break;
-        }
-        if (lock == 0) {
-          let tmp = { left: points[now_index.value].x, top: points[now_index.value].y }
-          eval(`moveHandler_${now_index.value + 1}(tmp)`);
-          isactivearray.value[now_index.value] = false;
-          isshowarray.value[now_index.value] = false;
-          setTimeout(() => {
-            isshowarray.value[now_index.value] = true;
-          }, 100);
-        }
-
-      }
-    }
-    onMounted(() => {
-      ste_status.value = 1;
-      keyDown()
-      setpoa();
-
-      setTimeout(() => {
-        ste_status.value = 0;
-      }, 100);
-    });
 
     const use_server_config = () => {
-      for (let index = 0; index < fourpostion.value.length; index++) {
-        defaultfour.value[index].x = config.point4[index].def_x;
-        defaultfour.value[index].y = config.point4[index].def_y;
-        four[index].x = config.point4[index].x;
-        four[index].y = config.point4[index].y;
+      value.value = []
+      value_point.value = []
+      for (let index = 0; index < config.point4.length; index++) {
+        let tmp: DensityCorrectionPoint = config.point4[index];
+        value.value.push(tmp)
+        let x_y = coordinate_transformation_value_to_xy(tmp.x, tmp.y)
+        let def_x_f = coordinate_transformation_value_to_xy(tmp.def_x, tmp.def_y)
+        let tmp_point: DensityCorrectionPoint = {
+          control_point: tmp.control_point,
+          x: x_y.x,
+          y: x_y.y,
+          def_x: def_x_f.x,
+          def_y: def_x_f.y
+        }
+        value_point.value.push(tmp_point)
       }
-    };
-
-    const setpoa = () => {
-      try {
-        points[0].x = 0;
-        points[0].y = 0;
-
-        points[1].x = div.value.offsetWidth - 25;
-        points[1].y = 0;
-
-        points[2].x = 0;
-        points[2].y = div.value.offsetHeight - 25;
-
-        points[3].x = div.value.offsetWidth - 25;
-        points[3].y = div.value.offsetHeight - 25;
-
-        fourpostion.value[0].x = 0;
-        fourpostion.value[0].y = 0;
-
-        fourpostion.value[1].x = div.value.offsetWidth - 25;
-        fourpostion.value[1].y = 0;
-
-        fourpostion.value[2].x = 0;
-        fourpostion.value[2].y = div.value.offsetHeight - 25;
-
-        fourpostion.value[3].x = div.value.offsetWidth - 25;
-        fourpostion.value[3].y = div.value.offsetHeight - 25;
-
-        Proportion.value.x = config.width / (div.value.offsetWidth - 25);
-        Proportion.value.y = config.height / (div.value.offsetHeight - 25);
-        for (let index = 0; index < fourpostion.value.length; index++) {
-          defaultfourpostion.value[index].x = fourpostion.value[index].x;
-          defaultfourpostion.value[index].y = fourpostion.value[index].y;
-          defaultfour.value[index].x = config.point4[index].def_x;
-          defaultfour.value[index].y = config.point4[index].def_y;
-          four[index].x = config.point4[index].x;
-          four[index].y = config.point4[index].y;
-        }
-        if (
-          sessionStorage.FourPointCalibration &&
-          sessionStorage.FourPointCalibration.length > 0
-        ) {
-          set_cache.value = JSON.parse(sessionStorage.FourPointCalibration);
-          use_set_cache();
-        } else {
-        }
-        set_point_x();
-      } catch (error) {
+    }
 
+    const use_set_cache = () => {
+      if (set_cache.value[selectedprojector.value] != null) {
+        let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
+        deepcopy(value.value, tmp.value)
+        deepcopy(value_point.value, tmp.value_point)
+        recalculate_coordinates()
       }
-    };
-    watch(
-      () => four[0],
-      (newVal, oldVal) => {
-        if ($store.state.enablefusion && ste_status.value == 0)
-          set?.setBlendingCorrection(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-            4, 4,
-            1,
-            Number(newVal.x),
-            Number(newVal.y)
-          );
-        if (!isactivearray.value[0]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          points[0].x = x;
-          points[0].y = y;
-          isshowarray.value[0] = false;
-          isactivearray.value[0] = false;
-          setTimeout(() => {
-            isshowarray.value[0] = true;
-          }, 100);
-        }
-        now_index.value = 0
-        save_set_cache();
-      },
-      { deep: true }
-    );
-    watch(
-      () => four[1],
-      (newVal, oldVal) => {
-        if ($store.state.enablefusion && ste_status.value == 0)
-          set?.setBlendingCorrection(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-            4, 4,
-            2,
-            Number(newVal.x),
-            Number(newVal.y)
-          );
-        if (!isactivearray.value[1]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          points[1].x = x;
-          points[1].y = y;
-          isshowarray.value[1] = false;
-          isactivearray.value[1] = false;
-          setTimeout(() => {
-            isshowarray.value[1] = true;
-          }, 100);
-        }
-        now_index.value = 1
-        save_set_cache();
-      },
-      { deep: true }
-    );
-    watch(
-      () => four[2],
-      (newVal, oldVal) => {
-        if ($store.state.enablefusion && ste_status.value == 0)
-          set?.setBlendingCorrection(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-            4, 4,
-            3,
-            Number(newVal.x),
-            Number(newVal.y)
-          );
-        if (!isactivearray.value[2]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = Math.ceil(
-            config.height / Proportion.value.y - newVal.y / Proportion.value.y
-          );
+    }
 
-          points[2].x = x;
-          points[2].y = y;
-          isshowarray.value[2] = false;
-          setTimeout(() => {
-            isshowarray.value[2] = true;
-          }, 100);
-        }
-        now_index.value = 2
-        save_set_cache();
-      },
-      { deep: true }
-    );
-    watch(
-      () => four[3],
-      (newVal, oldVal) => {
-        if ($store.state.enablefusion && ste_status.value == 0)
-          set?.setBlendingCorrection(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-            4, 4,
-            4,
-            Number(newVal.x),
-            Number(newVal.y)
-          );
-        if (!isactivearray.value[3]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = Math.ceil(
-            config.height / Proportion.value.y - newVal.y / Proportion.value.y
-          );
-
-          points[3].x = x;
-          points[3].y = y;
-          isshowarray.value[3] = false;
-          setTimeout(() => {
-            isshowarray.value[3] = true;
-          }, 100);
-        }
-        now_index.value = 3
-        save_set_cache();
-      },
-      { deep: true }
-    );
+    const save_set_cache = () => {
+      let tmp = { value: value.value, value_point: value_point.value }
+      set_cache.value[selectedprojector.value] = JSON.stringify(tmp);
+    }
 
     watch(
       () => configselsect,
@@ -441,176 +169,206 @@ export default defineComponent({
         setTimeout(() => {
           ste_status.value = 0;
         }, 100);
-        set_point_x();
       },
       { deep: true }
     );
-    watch(() => now_index, (newval, oldval) => {
-      if (ste_status.value == 1) return
-      set?.SetBlendingOption("blending_grids_select_point", `4:${now_index.value + 1}`)
+
+
+
+    const set_cache: any = ref([]);
+    //值
+    let value = ref(<DensityCorrection[]>[]);
+    //位置
+    let value_point = ref(<DensityCorrectionPoint[]>[]);
+    /**
+     * 当前选中的点的索引
+     */
+    const options_model = ref(0)
+
+    const div = ref();
+    const max = ref({ x: 0, y: 0 })
+    const point = ref({ w: 20, h: 20 })
+
+    watch(() => options_model, (newval, oldval) => {
+      set?.SetBlendingOption("blending_grids_select_point", `4:${options_model.value + 1}`)
     }, { deep: true })
-    //为了加载 缓存的配置时 同步点的位置
-    const syncpoint = () => {
-      for (let index = 0; index < fourpostion.value.length; index++) {
-        isactivearray.value[index] = false;
+
+    /**
+     * 分辨率和页面的比例
+     */
+    let Proportion = ref({ x: 100, y: 1000 });
+    nextTick(() => {
+      max.value.x = div.value.offsetWidth
+      max.value.y = div.value.offsetHeight
+    })
+
+    const options = computed(() => {
+      let tmp = []
+      for (let index = 0; index < value_point.value.length; index++) {
+        tmp.push({
+          label: `${index + 1}`,
+          value: index,
+        })
       }
-    };
-    //手动同步
-    const set_point_x = () => {
-      let x = Math.ceil(four[0].x / Proportion.value.x);
-      let y = Math.ceil((config.height - four[0].y) / Proportion.value.y);
-      set_point(0, x, y);
+      return tmp
+    })
 
-      x = Math.ceil(four[1].x / Proportion.value.x);
-      y = Math.ceil((config.height - four[1].y) / Proportion.value.y);
-      set_point(1, x, y);
+    const chang_point_amount = (val: number) => {
+      start_point()
+    }
 
-      x = Math.ceil(four[2].x / Proportion.value.x);
-      y = Math.ceil(
-        config.height / Proportion.value.y - four[2].y / Proportion.value.y
-      );
-      set_point(2, x, y);
+    const dragStartHandle = ($event: any, index: number) => {
+      let obj_x = $event.x
+      let obj_y = $event.y
+      let tmp = coordinate_transformation_xy_to_value(obj_x, obj_y)
+      value.value[index].x = Math.round(tmp.x)
+      value.value[index].y = Math.round(tmp.y)
+      send_value(index, Math.round(tmp.x), Math.round(tmp.y))
+      save_set_cache()
+    }
 
-      x = Math.ceil(four[3].x / Proportion.value.x);
-      y = Math.ceil(
-        config.height / Proportion.value.y - four[3].y / Proportion.value.y
-      );
-      set_point(3, x, y);
-    };
+    const chang = (index: number, $event: any, type: string) => {
+      index = Number(index)
+      let tmp = coordinate_transformation_value_to_xy(value.value[index].x, value.value[index].y)
+      console.log(tmp)
+      value_point.value[index].y = Math.round(tmp.y)
+      value_point.value[index].x = Math.round(tmp.x)
+      console.log(value_point.value[index])
+      send_value(index, Math.round(value.value[index].x), Math.round(value.value[index].y))
 
-    const set_point = (index: number, x: number, y: number) => {
-      points[index].x = x;
-      points[index].y = y;
-      isshowarray.value[index] = false;
-      isactivearray.value[index] = false;
-      setTimeout(() => {
-        isshowarray.value[index] = true;
-      }, 100);
-    };
-    const reset = (index: number, send: boolean) => {
-      send = send ?? true;
-      isactivearray.value[index] = false;
-      fourpostion.value[index].x = defaultfourpostion.value[index].x;
-      fourpostion.value[index].y = defaultfourpostion.value[index].y;
+      save_set_cache()
+    }
 
-      four[index].x = config.point4[index].def_x;
-      four[index].y = config.point4[index].def_y;
+    /**
+     * 将分辨率的坐标转换为 页面的坐标
+     * @param x x坐标
+     * @param y y坐标
+     */
+    const coordinate_transformation_value_to_xy = (x: number, y: number): { x: number, y: number } => {
+      x = x / Proportion.value.x
+      y = (config.height - y) / Proportion.value.y
+      return { x, y }
+    }
 
-      if (send) {
-        set?.setBlendingCorrection(
-          $store.getters.GetTheCurrentlySelectedCamera[0],
-          $store.getters.GetTheCurrentlySelectedCamera[1],
-          4, 4,
-          index + 1,
-          Number(config.point4[index].def_x),
-          Number(config.point4[index].def_y)
-        );
+
+    /**
+     * 将页面的坐标转换为 分辨率的坐标
+     * @param x x坐标
+     * @param y y坐标
+     */
+    const coordinate_transformation_xy_to_value = (x: number, y: number): { x: number, y: number } => {
+      x = (x + point.value.w / 14) * Proportion.value.x
+      // x = (x-point.value.w) * Proportion.value.x
+      y = (max.value.y - (y + point.value.h)) * Proportion.value.y
+      return { x, y }
+    }
+
+    const start_point = () => {
+      value.value = []
+      value_point.value = []
+      for (let index = 0; index < config.point4.length; index++) {
+        let tmp: DensityCorrectionPoint = config.point4[index];
+        value.value.push(tmp)
+        let x_y = coordinate_transformation_value_to_xy(tmp.x, tmp.y)
+        let def_x_f = coordinate_transformation_value_to_xy(tmp.def_x, tmp.def_y)
+        let tmp_point: DensityCorrectionPoint = {
+          control_point: tmp.control_point,
+          x: x_y.x,
+          y: x_y.y,
+          def_x: def_x_f.x,
+          def_y: def_x_f.y
+        }
+        value_point.value.push(tmp_point)
       }
+    }
 
-      isshowarray.value[index] = false;
-      setTimeout(() => {
-        isshowarray.value[index] = true;
-      }, 100);
-    };
-
-    const resetall = () => {
-      for (let index = 0; index < fourpostion.value.length; index++) {
-        reset(index, false);
-      }
-      set?.setBlendingCorrection(
-        $store.getters.GetTheCurrentlySelectedCamera[0],
-        $store.getters.GetTheCurrentlySelectedCamera[1],
-        4, 4, 0, 0, 0
-      );
-    };
-
-    const moveHandler_1 = (data: any) => {
-      let x = Math.round(
-        (data.left - fourpostion.value[0].x) * Proportion.value.x + 0
-      );
-      let y = Math.round(
-        config.height - data.top * Proportion.value.y - fourpostion.value[0].y
-      );
-
-      four[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      four[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-      isactivearray.value[0] = true;
-      points[now_index.value].x = data.left
-      points[now_index.value].y = data.top
-
-      save_set_cache();
-    };
-    const moveHandler_2 = (data: any) => {
-      let x = Math.round(
-        (data.left - fourpostion.value[1].x) * Proportion.value.x + config.width
-      );
-      let y = Math.round(
-        config.height - data.top * Proportion.value.y - fourpostion.value[1].y
-      );
-      four[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      four[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-      points[now_index.value].x = data.left
-      points[now_index.value].y = data.top
-      save_set_cache();
-    };
-    const moveHandler_3 = (data: any) => {
-      let x = Math.round(
-        (data.left - fourpostion.value[2].x) * Proportion.value.x
-      );
-      let y = Math.abs(
-        Math.round((data.top - fourpostion.value[2].y) * Proportion.value.y)
-      );
-      four[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      four[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-      points[now_index.value].x = data.left
-      points[now_index.value].y = data.top
-      save_set_cache();
-    };
-    const moveHandler_4 = (data: any) => {
-      let x = Math.round(
-        (data.left - fourpostion.value[3].x) * Proportion.value.x + config.width
-      );
-      let y = Math.abs(
-        Math.round((data.top - fourpostion.value[3].y) * Proportion.value.y)
-      );
-      four[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      four[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-      points[now_index.value].x = data.left
-      points[now_index.value].y = data.top
-      save_set_cache();
-    };
-    //窗口变动重新渲染
+    /**
+     * 创建空值 让dom先渲染
+     */
+    const start = () => {
+      let tmp: DensityCorrectionPoint = { control_point: 0, x: 0, y: 0, def_x: 0, def_y: 0 };
+      value.value.push(tmp)
+      value_point.value.push(tmp)
+    }
+    start()
     onMounted(() => {
-      //监听窗口变化
+      Proportion.value.x = config.width / (div.value.offsetWidth - point.value.w)
+      Proportion.value.y = config.height / (div.value.offsetHeight - point.value.h)
+      start_point()
+      start()
+      use_server_config()
+      if (
+        sessionStorage.FourPointCalibration &&
+        sessionStorage.FourPointCalibration.length > 0
+      ) {
+        set_cache.value = JSON.parse(sessionStorage.FourPointCalibration);
+        use_set_cache();
+      }
       window.onresize = () => {
         return (() => {
-          ste_status.value = 1;
-          if (div != null) setpoa();
-
-          setTimeout(() => {
-            ste_status.value = 0;
-          }, 100);
+          if (div != null) {
+            recalculate_coordinates()
+          }
         })();
       };
+    })
+
+    onBeforeUnmount(() => {
+      sessionStorage.FourPointCalibration = JSON.stringify(set_cache.value);
     });
+
+    const reset = (index: number, send: boolean, type: string) => {
+      value.value[index].x = value.value[index].def_x
+      value.value[index].y = value.value[index].def_y
+      // value_point.value[index].x = value_point.value[index].def_x
+      // value_point.value[index].y = value_point.value[index].def_y
+      chang(index, value.value[index].def_y, type)
+      save_set_cache()
+    }
+    const send_value = (index: number, x: number, y: number) => {
+      let row = $store.getters.GetTheCurrentlySelectedCamera[0]
+      let col = $store.getters.GetTheCurrentlySelectedCamera[1]
+      set?.setBlendingCorrection(row, col, 4, value_point.value.length, index + 1, Number(x), Number(y));
+    }
+    const resetall = () => {
+      for (let index = 0; index < value_point.value.length; index++) {
+        reset(index, true, 'v')
+      }
+    }
+    const recalculate_coordinates = () => {
+      try {
+        Proportion.value.x = config.width / (div.value.offsetWidth - point.value.w)
+        Proportion.value.y = config.height / (div.value.offsetHeight - point.value.h)
+        max.value.x = div.value.offsetWidth
+        max.value.y = div.value.offsetHeight
+        for (let index = 0; index < value.value.length; index++) {
+          let x_y = coordinate_transformation_value_to_xy(value.value[index].x, value.value[index].y)
+          let def_x_y = coordinate_transformation_value_to_xy(value.value[index].def_x, value.value[index].def_x)
+          value_point.value[index].x = x_y.x
+          value_point.value[index].y = x_y.y
+          value_point.value[index].def_x = def_x_y.x
+          value_point.value[index].def_y = def_x_y.y
+        }
+      } catch (error) {
+
+      }
+    }
     return {
-      now_index,
-      div,
-      fourpostion,
-      reset,
       resetall,
-      moveHandler_1,
-      moveHandler_2,
-      moveHandler_3,
-      moveHandler_4,
-      four,
-      save,
-      isshowarray,
-      isactivearray,
-      activeMouseDown,
-      mouseUpHandler,
-      points,
-    };
-  },
-});
+      div,
+      max,
+      point,
+      options_model,
+      value,
+      value_point,
+      dragStartHandle,
+      chang,
+      reset,
+      value_point_amount,
+      chang_point_amount,
+      options
+    }
+  }
+})
+
 </script>
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 71d21ad..60e6750 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -1,222 +1,133 @@
 <template>
   <div class="row">
-    <div class="col-4">
-      <div class="row">
-        <div class="col-6"></div>
-        <div class="col-6">
-          <q-input filled type="number" class="q-pb-xs q-pt-md" @focus="isactivearray[0] = false" :dense="true"
-            v-model="nine[0].x" label="x" lazy-rules />
-          <q-input filled type="number"  @focus="isactivearray[0] = false" :dense="true"
-            v-model="nine[0].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(0,false)" text-color="black" :label="$t('reset') + $t('point') + '1'" />
-        </div>
-      </div>
-    </div>
-    <div class="col-4">
-      <div class="row">
-        <div class="col-4"></div>
-        <div class="col-4">
-          <q-input filled type="number" class="q-pb-xs q-pt-md" @focus="isactivearray[1] = false" :dense="true"
-            v-model="nine[1].x" label="x" lazy-rules />
-          <q-input filled type="number"  @focus="isactivearray[1] = false" :dense="true"
-            v-model="nine[1].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(1,false)" text-color="black" :label="$t('reset') + $t('point') + '2'" />
-        </div>
-
-        <div class="col-4" style="padding-left: 2px">
-          <q-input filled type="number" class="q-pb-xs  q-pt-md" :dense="true" v-model="nine[4].x" label="x"
-            @focus="isactivearray[4] = false" lazy-rules />
-          <q-input filled type="number"  :dense="true" v-model="nine[4].y" label="y"
-            @focus="isactivearray[4] = false" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(4,false)" text-color="black" :label="$t('reset') + $t('point') + '5'" />
-        </div>
-      </div>
-    </div>
-    <div class="col-4">
-      <div class="row">
-        <div class="col-3"></div>
-        <div class="col-6">
-          <q-input filled type="number" @focus="isactivearray[2] = false" class="q-pb-xs q-pt-md" :dense="true"
-            v-model="nine[2].x" label="x" lazy-rules />
-          <q-input filled type="number"  @focus="isactivearray[2] = false" :dense="true"
-            v-model="nine[2].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(2,false)" text-color="black" :label="$t('reset') + $t('point') + '3'" />
-        </div>
-      </div>
-    </div>
-    <div class="col-2">
-      <div class="row" style="margin-top: 10vh">
-        <div class="col-2"></div>
-        <div class="col-10">
-          <q-input filled type="number" @focus="isactivearray[3] = false" class="q-pb-xs q-pt-md" :dense="true"
-            v-model="nine[3].x" label="x" lazy-rules />
-          <q-input filled type="number"  @focus="isactivearray[3] = false" :dense="true"
-            v-model="nine[3].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(3,false)" text-color="black" :label="$t('reset') + $t('point') + '4'" />
-        </div>
-      </div>
-    </div>
-    <div class="col-8">
-      <div ref="div" style="background-color: #646464; height: 40vh">
+    <div class="col-1"></div>
+    <div class="col-10 q-pt-md">
+      <div ref="div" style="width: 100%; background-color: #646464; height: 40vh">
         <div style="position: absolute">
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==0?'action':'point']" :isActive="isactivearray[0]" v-if="isshowarray[0]" :w="20" :h="20" :x="ninepostion[0].x"
-            :y="ninepostion[0].y" @mousedown="activeMouseDown(0)" :isResizable="false" @moveHandler="moveHandler_1">
-            <div >1</div>
-          </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==1?'action':'point']" :isActive="isactivearray[1]" v-if="isshowarray[1]" :w="20" :h="20" :x="ninepostion[1].x"
-            :y="ninepostion[1].y" @mousedown="activeMouseDown(1)" :isResizable="false" @moveHandler="moveHandler_2">
-            <div >2</div>
-          </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==2?'action':'point']" :isActive="isactivearray[2]" v-if="isshowarray[2]" :w="20" :h="20" :x="ninepostion[2].x"
-            :y="ninepostion[2].y" @mousedown="activeMouseDown(2)" :isResizable="false" @moveHandler="moveHandler_3">
-            <div >3</div>
-          </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==3?'action':'point']" :isActive="isactivearray[3]" v-if="isshowarray[3]" :w="20" :h="20" :x="ninepostion[3].x"
-            :y="ninepostion[3].y" @mousedown="activeMouseDown(3)" :isResizable="false" @moveHandler="moveHandler_4">
-            <div >4</div>
-          </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==4?'action':'point']" :isActive="isactivearray[4]" v-if="isshowarray[4]" :w="20" :h="20" :x="ninepostion[4].x"
-            :y="ninepostion[4].y" @mousedown="activeMouseDown(4)" :isResizable="false" @moveHandler="moveHandler_5">
-            <div >5</div>
-          </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==5?'action':'point']" :isActive="isactivearray[5]" v-if="isshowarray[5]" :w="20" :h="20" :x="ninepostion[5].x"
-            :y="ninepostion[5].y" @mousedown="activeMouseDown(5)" :isResizable="false" @moveHandler="moveHandler_6">
-            <div >6</div>
-          </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==6?'action':'point']" :isActive="isactivearray[6]" v-if="isshowarray[6]" :w="20" :h="20" :x="ninepostion[6].x"
-            :y="ninepostion[6].y" @mousedown="activeMouseDown(6)" :isResizable="false" @moveHandler="moveHandler_7">
-            <div >7</div>
-          </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==7?'action':'point']" :isActive="isactivearray[7]" v-if="isshowarray[7]" :w="20" :h="20" :x="ninepostion[7].x"
-            :y="ninepostion[7].y" @mousedown="activeMouseDown(7)" :isResizable="false" @moveHandler="moveHandler_8">
-            <div >8</div>
-          </vue3ResizeDrag>
-          <vue3ResizeDrag  style="border: 0;"  :class="[now_index==8?'action':'point']" :isActive="isactivearray[8]" v-if="isshowarray[8]" :w="20" :h="20" :x="ninepostion[8].x"
-            :y="ninepostion[8].y" @mousedown="activeMouseDown(8)" :isResizable="false" @moveHandler="moveHandler_9">
-            <div >9</div>
-          </vue3ResizeDrag>
-        </div>
-      </div>
-    </div>
-    <div class="col-2">
-      <div class="row" style="margin-top: 10vh">
-        <div class="col-10">
-          <q-input filled type="number" @focus="isactivearray[5] = false" class="q-pb-xs" :dense="true"
-            v-model="nine[5].x" label="x" lazy-rules />
-          <q-input filled type="number"  @focus="isactivearray[5] = false" :dense="true"
-            v-model="nine[5].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(5,false)" text-color="black" :label="$t('reset') + $t('point') + '6'" />
-        </div>
-      </div>
-    </div>
-    <div class="col-4">
-      <div class="row">
-        <div class="col-6">
-          <q-btn color="white"  @click="resetall" text-color="black" :label="$t('resetall')" />
-        </div>
-        <div class="col-6">
-          <q-input filled type="number" @focus="isactivearray[6] = false" class="q-pb-xs" :dense="true"
-            v-model="nine[6].x" label="x" lazy-rules />
-          <q-input filled type="number"  @focus="isactivearray[6] = false" :dense="true"
-            v-model="nine[6].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(6,false)" text-color="black" :label="$t('reset') + $t('point') + '7'" />
-        </div>
-      </div>
-    </div>
-    <div class="col-4">
-      <div class="row">
-        <div class="col-4"></div>
-        <div class="col-6">
-          <q-input filled type="number" @focus="isactivearray[7] = false" class="q-pb-xs" :dense="true"
-            v-model="nine[7].x" label="x" lazy-rules />
-          <q-input filled type="number"  @focus="isactivearray[7] = false" :dense="true"
-            v-model="nine[7].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(7,false)" text-color="black" :label="$t('reset') + $t('point') + '8'" />
-        </div>
-      </div>
-    </div>
-    <div class="col-4">
-      <div class="row">
-        <div class="col-3"></div>
-        <div class="col-6">
-          <q-input filled type="number" @focus="isactivearray[8] = false" class="q-pb-xs" :dense="true"
-            v-model="nine[8].x" label="x" lazy-rules />
-          <q-input filled type="number"  @focus="isactivearray[8] = false" :dense="true"
-            v-model="nine[8].y" label="y" lazy-rules />
-          <q-btn size="sm" dense color="white" @click="reset(8,false)" text-color="black" :label="$t('reset') + $t('point') + '9'" />
+          <Vue3DraggableResizable :class="[options_model == index ? 'action' : 'point']"
+            v-for="(item, index) in value_point.length" :initW="point.w" :initH="point.h" :resizable="false"
+            v-model:x="value_point[index].x" v-model:y="value_point[index].y" @activated="options_model = index"
+            @click="options_model = index" @dragging="dragStartHandle($event, index)">
+            <span>{{
+              index+ 1
+            }}</span>
+          </Vue3DraggableResizable>
         </div>
       </div>
     </div>
   </div>
+  <div>
+    <div class="row">
+      <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')"
+            @update:model-value="(val) => { chang_point_amount(val) }" :dense="true" filled v-model="value_point_amount"
+            :options="options_value_point_amount" emit-value map-options />
+        </div>
+      </div>
+      <div class="col-2">
+
+        <div class="col-1 q-pt-md "><q-btn color="white" @click="add_control_points(Number(value_point_amount))"
+            text-color="black" :label="$t('add control points')" /></div>
+
+      </div>
+      <div class="col-2">
+
+        <div class="col-1 q-pt-md "><q-btn color="white" @click="() => { del_dialog = true }" text-color="black"
+            :label="$t('reduce control points')" /></div>
+
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-1"></div>
+      <div class="col-2 q-px-md"> <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"> <q-input 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 />
+      </div>
+      <div class="col-2 q-px-md"><q-input 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 /></div>
+      <div class="q-pt-md col-2">
+        <q-btn color="white" @click="reset(options_model, true, 'h')" text-color="black" :label="$t('reset')" />
+      </div>
+      <div class="col-2 q-pt-md ">
+        <div><q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" /></div>
+      </div>
+    </div>
+
+
+  </div>
+  <q-dialog v-model="del_dialog">
+    <q-card style="width: 700px; max-width: 80vw;">
+      <q-card-section>
+        <div class="text-h6">{{ $t('confirm delete') }}</div>
+      </q-card-section>
+      <q-card-section class="q-pt-none">
+        {{ $t('OK to delete you will lose the data you adjusted now') }}
+      </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="del_control_points(value_point_amount)" color="primary" v-close-popup />
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+
 </template>
 
 <style scoped>
-.point{
-  border-radius: 50%;background: #00ff00;color: aliceblue;
-}
-.action{
+.action {
+  background-color: rgb(27, 180, 111);
+  border-radius: 50%;
+}
+
+.point {
+  background-color: rgb(186, 245, 245);
   border-radius: 50%;
-  background-color: aqua;
 }
 </style>
+
 <script lang="ts">
-import vue3ResizeDrag from "/src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue";
-import GlobalData from "src/common/GlobalData";
 import {
   defineComponent,
-  ref,
-  watch,
-  computed,
-  defineProps,
-  withDefaults,
   onMounted,
-  onBeforeUnmount,
-  reactive,
+  ref,
+  computed,
+  watch,
+  nextTick,
+  onBeforeUnmount
 } from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
+import Vue3DraggableResizable from 'vue3-draggable-resizable'
+import 'vue3-draggable-resizable/dist/Vue3DraggableResizable.css'
+
+
+import DensityCorrection from "src/entities/DensityCorrection";
+import DensityCorrectionPoint from "src/entities/DensityCorrectionPoint";
+import { config } from "process";
+import { QSelect, QInput, QBtn } from "quasar";
+import { div } from "zrender/lib/core/vector";
+import GlobalData from "src/common/GlobalData";
+import { number } from "@intlify/core-base";
 
 export default defineComponent({
-  name: "ComponentSurfaceCorrection",
+  name: "ComponentDensityCorrection",
   components: {
-    vue3ResizeDrag,
+    Vue3DraggableResizable
   },
   setup() {
+    let set = GlobalData.getInstance().getCurrentClient();
     let $store = useStore();
     let $t = useI18n();
+    const ste_status = ref(0);
     let config = JSON.parse($store.state.fusion_configuration).projectors[0];
     const configselsect = computed(() => {
       return $store.state.selected_projector;
     });
-    let Proportion = ref({ x: 0, y: 0 });
-    const div = ref();
-    const now_index = ref(0);
-    let nine = reactive([
-      { x: 0, y: 1080 },
-      { x: 960, y: 1920 },
-      { x: 1920, y: 1080 },
-      { x: 0, y: 540 },
-      { x: 960, y: 540 },
-      { x: 1920, y: 540 },
-      { x: 0, y: 0 },
-      { x: 960, y: 0 },
-      { x: 1920, y: 0 },
-    ]);
-    let defaultnine = ref([
-      { x: 0, y: 1080 },
-      { x: 960, y: 1920 },
-      { x: 1920, y: 1080 },
-      { x: 0, y: 540 },
-      { x: 960, y: 540 },
-      { x: 1920, y: 540 },
-      { x: 0, y: 0 },
-      { x: 960, y: 0 },
-      { x: 1920, y: 0 },
-    ]);
-    const activeMouseDown = (index: number) => {
-      isactivearray.value[index] = true;
-      now_index.value=index
-    };
+
     //用于计算当前投影仪的索引
     let serverconfig = JSON.parse($store.state.fusion_configuration);
     const selectedprojector = computed(() => {
@@ -225,169 +136,15 @@ export default defineComponent({
         $store.getters.GetTheCurrentlySelectedCamera[1]
       );
     });
-    const set_cache: any = ref([]);
-    const ste_status = ref(0);
-    const isshowarray = ref([
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-    ]);
-    const isactivearray = ref([
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-    ]);
-    let ninepostion: any = ref([
-      { x: 0, y: 1920 },
-      { x: 960, y: 1920 },
-      { x: 1080, y: 1920 },
-      { x: 0, y: 540 },
-      { x: 960, y: 540 },
-      { x: 1080, y: 540 },
-      { x: 0, y: 0 },
-      { x: 540, y: 0 },
-      { x: 1080, y: 0 },
-    ]);
-    let defaultninepostion: any = ref([
-      { x: 0, y: 1920 },
-      { x: 960, y: 1920 },
-      { x: 1080, y: 1920 },
-      { x: 0, y: 540 },
-      { x: 960, y: 540 },
-      { x: 1080, y: 540 },
-      { x: 0, y: 0 },
-      { x: 540, y: 0 },
-      { x: 1080, y: 0 },
-    ]);
-    const moveHandler_1 = (data: any) => {
-      let x = Math.ceil(
-        (data.left - ninepostion.value[0].x) * Proportion.value.x
-      );
-      let y =
-        config.height -
-        Math.ceil((data.top - ninepostion.value[0].y) * Proportion.value.y);
-      nine[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-      save_set_cache();
-    };
-    const moveHandler_2 = (data: any) => {
-      let x =
-        config.width / 2 +
-        Math.ceil((data.left - ninepostion.value[1].x) * Proportion.value.x);
-      let y =
-        config.height -
-        Math.ceil((data.top - ninepostion.value[1].y) * Proportion.value.y);
-      nine[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-      save_set_cache();
-    };
-    const moveHandler_3 = (data: any) => {
-      let x =
-        config.width +
-        Math.ceil((data.left - ninepostion.value[2].x) * Proportion.value.x);
-      let y =
-        config.height -
-        Math.ceil((data.top - ninepostion.value[2].y) * Proportion.value.y);
-      nine[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-      save_set_cache();
-    };
-    const moveHandler_4 = (data: any) => {
-      let x = Math.ceil(
-        (data.left - ninepostion.value[3].x) * Proportion.value.x
-      );
-      let y =
-        config.height / 2 -
-        Math.ceil((data.top - ninepostion.value[3].y) * Proportion.value.y);
-      nine[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-      save_set_cache();
-    };
-    const moveHandler_5 = (data: any) => {
-      let x =
-        config.width / 2 +
-        Math.ceil((data.left - ninepostion.value[4].x) * Proportion.value.x);
-      let y =
-        config.height / 2 -
-        Math.ceil((data.top - ninepostion.value[4].y) * Proportion.value.y);
-      nine[4].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[4].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-      save_set_cache();
-    };
-    const moveHandler_6 = (data: any) => {
-      let x =
-        config.width +
-        Math.ceil((data.left - ninepostion.value[5].x) * Proportion.value.x);
-      let y =
-        config.height / 2 -
-        Math.ceil((data.top - ninepostion.value[5].y) * Proportion.value.y);
-      nine[5].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[5].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
-      save_set_cache();
-    };
-    const moveHandler_7 = (data: any) => {
-      let x = Math.ceil(
-        (data.left - ninepostion.value[6].x) * Proportion.value.x
-      );
-      let y = Math.abs(
-        Math.ceil((data.top - ninepostion.value[6].y) * Proportion.value.y)
-      );
-      if(data.top>ninepostion.value[6].y)y= Math.ceil((ninepostion.value[6].y-data.top ) * Proportion.value.y)
-      nine[6].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[6].y = y > config.height ? config.height : y;
-      save_set_cache();
-    };
-    const moveHandler_8 = (data: any) => {
-      let x =
-        config.width / 2 +
-        Math.ceil((data.left - ninepostion.value[7].x) * Proportion.value.x);
-      let y = Math.abs(
-        Math.ceil((data.top - ninepostion.value[7].y) * Proportion.value.y)
-      );
-      if(data.top>ninepostion.value[7].y)y= Math.ceil((ninepostion.value[7].y-data.top ) * Proportion.value.y)
-      nine[7].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[7].y = y > config.height ? config.height : y ;
-      save_set_cache();
-    };
-    const moveHandler_9 = (data: any) => {
-      let x =
-        config.width +
-        Math.ceil((data.left - ninepostion.value[8].x) * Proportion.value.x);
-      let y = Math.abs(
-        Math.ceil((data.top - ninepostion.value[8].y) * Proportion.value.y)
-      );
-      if(data.top>ninepostion.value[8].y)y= Math.ceil((ninepostion.value[8].y-data.top ) * Proportion.value.y)
-      nine[8].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
-      nine[8].y = y > config.height ? config.height : y ;
-      save_set_cache();
-    };
 
-    //为了加载 缓存的配置时 同步点的位置
-    const syncpoint = () => {
-      for (let index = 0; index < ninepostion.value.length; index++) {
-        isactivearray.value[index] = false;
-      }
-    };
+    const value_point_amount = ref(9)
+    const del_dialog = ref(false)
+    // const options_value_point_amount = computed(() => {
+    //   return Object.keys(config.multi_curved_surface)
+    // })
+
+    const options_value_point_amount = ref(<string[]>[])
 
-    const use_set_cache = () => {
-      if (set_cache.value[selectedprojector.value] != null) {
-        let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
-        deepcopy(nine, tmp);
-      }
-      syncpoint();
-    };
     const deepcopy = (o1: any, o2: any) => {
       for (let k in o2) {
         if (typeof o2[k] === "object") {
@@ -395,17 +152,46 @@ export default defineComponent({
           deepcopy(o1[k], o2[k]);
         } else {
           o1[k] = o2[k];
+
         }
       }
     };
-    const save_set_cache = () => {
-      set_cache.value[selectedprojector.value] = JSON.stringify(nine);
-    };
-    onBeforeUnmount(() => {
-      if (set_cache.value[selectedprojector.value] != null) {
-        sessionStorage.SurfaceCorrection = JSON.stringify(set_cache.value);
+
+    const use_server_config = () => {
+      let a = 9
+      value.value = []
+      value_point.value = []
+      for (let index = 0; index < config.multi_curved_surface[a].length; index++) {
+        let tmp: DensityCorrectionPoint = config.multi_curved_surface[a][index];
+        value.value.push(tmp)
+        let x_y = coordinate_transformation_value_to_xy(tmp.x, tmp.y)
+        let def_x_f = coordinate_transformation_value_to_xy(tmp.def_x, tmp.def_y)
+        let tmp_point: DensityCorrectionPoint = {
+          control_point: tmp.control_point,
+          x: x_y.x,
+          y: x_y.y,
+          def_x: def_x_f.x,
+          def_y: def_x_f.y
+        }
+        value_point.value.push(tmp_point)
       }
-    });
+    }
+
+    const use_set_cache = () => {
+      if (set_cache.value[selectedprojector.value] != null) {
+        let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
+        value_point_amount.value = tmp.value_point_amount
+        deepcopy(value.value, tmp.value)
+        deepcopy(value_point.value, tmp.value_point)
+        recalculate_coordinates()
+      }
+    }
+
+    const save_set_cache = () => {
+      let tmp = { value: value.value, value_point_amount: value_point_amount.value, value_point: value_point.value}
+      set_cache.value[selectedprojector.value] = JSON.stringify(tmp);
+    }
+
 
     watch(
       () => configselsect,
@@ -425,383 +211,311 @@ export default defineComponent({
         config = JSON.parse(JSON.stringify(fortmp));
         use_server_config();
         use_set_cache();
+        options_value_point_amount.value = Object.keys(config.multi_curved_surface)
         setTimeout(() => {
           ste_status.value = 0;
         }, 100);
       },
       { deep: true }
     );
-    onMounted(() => {
-      ste_status.value = 1;
-      startpostion();
-      setninepostion();
-      use_set_cache();
-      setTimeout(() => {
-        ste_status.value = 0;
-      }, 100);
-    });
 
-    //窗口变动重新渲染
-    onMounted(() => {
-      window.onresize = () => {
-        return (() => {
-          try {
-            ste_status.value = 1;
-          startpostion();
-          for (
-            let index = 0;
-            index < defaultninepostion.value.length;
-            index++
-          ) {
-            defaultninepostion.value[index].x = ninepostion.value[index].x;
-            defaultninepostion.value[index].y = ninepostion.value[index].y;
-            defaultnine.value[index].x = config.point9[index].def_x;
-            defaultnine.value[index].y = config.point9[index].def_y;
-          }
-          setninepostion();
-          use_set_cache();
-          setTimeout(() => {
-            ste_status.value = 0;
-          }, 100);
-          } catch (error) {
 
-          }
-        })();
-      };
-    });
 
-    const setninepostion = () => {
-      for (let index = 0; index < defaultninepostion.value.length; index++) {
-        nine[index].x = config.point9[index].x;
-        nine[index].y = config.point9[index].y;
+    const set_cache: any = ref([]);
+    //值
+    let value = ref(<DensityCorrection[]>[]);
+    //位置
+    let value_point = ref(<DensityCorrectionPoint[]>[]);
+    /**
+     * 当前选中的点的索引
+     */
+    const options_model = ref(0)
+
+    const div = ref();
+    const max = ref({ x: 0, y: 0 })
+    const point = ref({ w: 20, h: 20 })
+
+    watch(() => options_model, (newval, oldval) => {
+      set?.SetBlendingOption("blending_grids_select_point", `9:${newval.value + 1}`)
+    }, { deep: true })
+
+    watch(() => value_point_amount, (newval, oldval) => {
+      set?.SetBlendingOption("blending_grids_control_point_count", `${newval.value}`)
+    }, { deep: true })
+
+    /**
+     * 分辨率和页面的比例
+     */
+    let Proportion = ref({ x: 100, y: 1000 });
+    nextTick(() => {
+      max.value.x = div.value.offsetWidth
+      max.value.y = div.value.offsetHeight
+    })
+
+
+    const chang_point_amount = (val: number) => {
+      start_point(val)
+      //use_set_cache()
+    }
+
+    const dragStartHandle = ($event: any, index: number) => {
+      let obj_x = $event.x
+      let obj_y = $event.y
+      let tmp = coordinate_transformation_xy_to_value(obj_x, obj_y)
+      value.value[index].x = Math.trunc(tmp.x)
+      value.value[index].y = Math.trunc(tmp.y)
+      send_value(index, Math.trunc(tmp.x), Math.trunc(tmp.y))
+      save_set_cache()
+    }
+
+    const chang = (index: number, $event: any, type: string) => {
+      index = Number(index)
+      let tmp = coordinate_transformation_value_to_xy(value.value[index].x, value.value[index].y)
+      value_point.value[index].y = Math.trunc(tmp.y)
+      value_point.value[index].x = Math.trunc(tmp.x)
+      send_value(index, Math.trunc(value.value[index].x), Math.trunc(value.value[index].y))
+
+      save_set_cache()
+    }
+    const options = computed(() => {
+      let tmp = []
+      for (let index = 0; index < value_point.value.length; index++) {
+        tmp.push({
+          label: `${index + 1}`,
+          value: index,
+        })
       }
-    };
-    const startpostion = () => {
-      try {
-      ninepostion.value[0].x = 0;
-      ninepostion.value[0].y = 0;
-
-      ninepostion.value[1].x = div.value.offsetWidth / 2 - 20;  //
-      ninepostion.value[1].y = 0;
-
-      ninepostion.value[2].x = div.value.offsetWidth - 10;
-      ninepostion.value[2].y = 0;
-
-      ninepostion.value[3].x = 0;
-      ninepostion.value[3].y = div.value.offsetHeight / 2 - 20;
-
-      ninepostion.value[4].x = div.value.offsetWidth / 2 - 20; //
-      ninepostion.value[4].y = div.value.offsetHeight / 2 - 20;
-
-      ninepostion.value[5].x = div.value.offsetWidth - 10;
-      ninepostion.value[5].y = div.value.offsetHeight / 2 -20;
-
-      ninepostion.value[6].x = 0;
-      ninepostion.value[6].y = div.value.offsetHeight - 20;
-
-      ninepostion.value[7].x = div.value.offsetWidth / 2 - 20; //
-      ninepostion.value[7].y = div.value.offsetHeight - 20;
-
-      ninepostion.value[8].x = div.value.offsetWidth - 10;
-      ninepostion.value[8].y = div.value.offsetHeight - 20;
-
-      Proportion.value.x = config.width / (div.value.offsetWidth - 20);
-      Proportion.value.y = config.height / (div.value.offsetHeight - 20);
+      return tmp
+    })
 
 
-      for (let index = 0; index < defaultninepostion.value.length; index++) {
-        defaultninepostion.value[index].x = ninepostion.value[index].x;
-        defaultninepostion.value[index].y = ninepostion.value[index].y;
-        defaultnine.value[index].x =  config.point9[index].def_x;
-        defaultnine.value[index].y =  config.point9[index].def_y;
+    /**
+     * 将分辨率的坐标转换为 页面的坐标
+     * @param x x坐标
+     * @param y y坐标
+     */
+    const coordinate_transformation_value_to_xy = (x: number, y: number): { x: number, y: number } => {
+      x = x / Proportion.value.x
+      y = (config.height - y) / Proportion.value.y
+      return { x, y }
+    }
+
+
+    /**
+     * 将页面的坐标转换为 分辨率的坐标
+     * @param x x坐标
+     * @param y y坐标
+     */
+    const coordinate_transformation_xy_to_value = (x: number, y: number): { x: number, y: number } => {
+      x = x * Proportion.value.x
+      y = (max.value.y - (y + point.value.h)) * Proportion.value.y
+      return { x, y }
+    }
+
+    const start_point = (a: number) => {
+      value.value = []
+      value_point.value = []
+      for (let index = 0; index < config.multi_curved_surface[a].length; index++) {
+        let tmp: DensityCorrectionPoint = config.multi_curved_surface[a][index];
+        value.value.push(tmp)
+        let x_y = coordinate_transformation_value_to_xy(tmp.x, tmp.y)
+        let def_x_f = coordinate_transformation_value_to_xy(tmp.def_x, tmp.def_y)
+        let tmp_point: DensityCorrectionPoint = {
+          control_point: tmp.control_point,
+          x: x_y.x,
+          y: x_y.y,
+          def_x: def_x_f.x,
+          def_y: def_x_f.y
+        }
+        value_point.value.push(tmp_point)
       }
-      if (sessionStorage.SurfaceCorrection) {
+    }
+
+
+    const start = () => {
+      let tmp: DensityCorrectionPoint = { control_point: 0, x: 0, y: 0, def_x: 0, def_y: 0 };
+      value.value.push(tmp)
+      value_point.value.push(tmp)
+    }
+    start()
+    onMounted(() => {
+      Proportion.value.x = config.width / (div.value.offsetWidth - point.value.w)
+      Proportion.value.y = config.height / (div.value.offsetHeight - point.value.h)
+      start_point(9)
+      start()
+      use_server_config()
+      if (
+        sessionStorage.SurfaceCorrection &&
+        sessionStorage.SurfaceCorrection.length > 0
+      ) {
         set_cache.value = JSON.parse(sessionStorage.SurfaceCorrection);
         use_set_cache();
       }
-      syncpoint();
-    } catch (error) {
+      options_value_point_amount.value = Object.keys(config.multi_curved_surface)
+      window.onresize = () => {
+        return (() => {
+          if (div != null) {
+            recalculate_coordinates()
+          }
+        })();
+      };
+    })
 
-      }
-    };
-    const use_server_config = () => {
-      for (let index = 0; index < defaultninepostion.value.length; index++) {
-        defaultnine.value[index].x =  config.point9[index].def_x;
-        defaultnine.value[index].y =  config.point9[index].def_y;
-        nine[index].x = config.point9[index].x;
-        nine[index].y = config.point9[index].y;
-      }
-    };
-    const reset = (index: number, send: boolean) => {
-	  send = send?? true;
+    onBeforeUnmount(() => {
+      sessionStorage.SurfaceCorrection = JSON.stringify(set_cache.value);
+    });
 
-      nine[index].x = config.point9[index].def_x;
-      nine[index].y = config.point9[index].def_y;
-
-	  if (send)
-	  {
-        set?.setBlendingCorrection(
-          $store.getters.GetTheCurrentlySelectedCamera[0],
-          $store.getters.GetTheCurrentlySelectedCamera[1],
-          9, 9,
-          index + 1,
-          Number(config.point9[index].def_x),
-          Number(config.point9[index].def_y)
-        );
-	  }
-
-      isshowarray.value[index] = false;
-      setTimeout(() => {
-        isshowarray.value[index] = true;
-      }, 100);
-    };
+    const reset = (index: number, send: boolean, type: string) => {
+      value.value[index].x = value.value[index].def_x
+      value.value[index].y = value.value[index].def_y
+      chang(index, value.value[index].def_y, type)
+      save_set_cache()
+    }
+    const send_value = (index: number, x: number, y: number) => {
+      let row = $store.getters.GetTheCurrentlySelectedCamera[0]
+      let col = $store.getters.GetTheCurrentlySelectedCamera[1]
+      set?.setBlendingCorrection(row, col, 9, value_point.value.length, index + 1, Number(x), Number(y));
+    }
     const resetall = () => {
-      for (let index = 0; index < nine.length; index++) {
-        reset(index, false);
+      for (let index = 0; index < value_point.value.length; index++) {
+        reset(index, true, 'v')
+
       }
-      set?.setBlendingCorrection(
-        $store.getters.GetTheCurrentlySelectedCamera[0],
-        $store.getters.GetTheCurrentlySelectedCamera[1],
-        9, 9, 0, 0, 0
-      );
-    };
-    watch(
-      () => nine[0],
-      (newVal, oldVal) => {
-        if ($store.state.enablefusion && ste_status.value == 0)
-          set?.setBlendingCorrection(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-            9, 9,
-            1,
-            Number(newVal.x),
-            Number(newVal.y)
-          );
+    }
+    const recalculate_coordinates = () => {
+      try {
+        Proportion.value.x = config.width / (div.value.offsetWidth - point.value.w)
+        Proportion.value.y = config.height / (div.value.offsetHeight - point.value.h)
+        max.value.x = div.value.offsetWidth
+        max.value.y = div.value.offsetHeight
+        for (let index = 0; index < value.value.length; index++) {
+          let x_y = coordinate_transformation_value_to_xy(value.value[index].x, value.value[index].y)
+          let def_x_y = coordinate_transformation_value_to_xy(value.value[index].def_x, value.value[index].def_y)
+          value_point.value[index].x = x_y.x
+          value_point.value[index].y = x_y.y
+          value_point.value[index].def_x = def_x_y.x
+          value_point.value[index].def_y = def_x_y.y
+        }
+      } catch (error) {
 
-        if (!isactivearray.value[0]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          setdianposin(0, x, y);
-        }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-    watch(
-      () => nine[1],
-      (newVal, oldVal) => {
-        if ($store.state.enablefusion && ste_status.value == 0)
-          set?.setBlendingCorrection(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-            9, 9,
-            2,
-            Number(newVal.x),
-            Number(newVal.y)
-          );
+      }
+    }
+    const add_control_points = (amount: number) => {
+      if (amount < 9) return
+      let cardinality = Math.sqrt(amount)
+      amount = (cardinality + 1) ** 2
+      let tmpconfig: any = null
+      let row = $store.getters.GetTheCurrentlySelectedCamera[0]
+      let col = $store.getters.GetTheCurrentlySelectedCamera[1]
 
-        if (!isactivearray.value[1]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          setdianposin(1, x, y);
+      set?.AddBlendingCtrlPoint('9', row, col, amount).then((res) => {
+        if (res == null || typeof (res) == "undefined") return
+        let tmp = JSON.parse(res?.config);
+        let fortmp = null;
+        let i;
+        for (i of tmp.projectors) {
+          if (
+            i.col === $store.getters.GetTheCurrentlySelectedCamera[1] &&
+            i.row === $store.getters.GetTheCurrentlySelectedCamera[0]
+          ) {
+            fortmp = JSON.parse(JSON.stringify(i));
+          }
         }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-    watch(
-      () => nine[2],
-      (newVal, oldVal) => {
-        if ($store.state.enablefusion && ste_status.value == 0)
-          set?.setBlendingCorrection(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-            9, 9,
-            3,
-            Number(newVal.x),
-            Number(newVal.y)
-          );
-        if (!isactivearray.value[2]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          setdianposin(2, x, y);
+        ste_status.value = 1;
+        tmpconfig = JSON.parse(JSON.stringify(fortmp));
+        options_value_point_amount.value = []
+        for (let key in tmpconfig.multi_curved_surface) {
+          options_value_point_amount.value.push(key)
         }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-    watch(
-      () => nine[3],
-      (newVal, oldVal) => {
-        if ($store.state.enablefusion && ste_status.value == 0)
-          set?.setBlendingCorrection(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-            9, 9,
-            4,
-            Number(newVal.x),
-            Number(newVal.y)
-          );
-        if (!isactivearray.value[3]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          setdianposin(3, x, y);
+        value_point_amount.value = amount
+        config = tmpconfig
+        $store.commit("setfusion_configuration", res?.config);
+        value.value = []
+        value_point.value = []
+        for (let index = 0; index < tmpconfig.multi_curved_surface[amount].length; index++) {
+          let tmp: DensityCorrectionPoint = tmpconfig.multi_curved_surface[amount][index];
+          value.value.push(tmp)
+          let x_y = coordinate_transformation_value_to_xy(tmp.x, tmp.y)
+          let def_x_f = coordinate_transformation_value_to_xy(tmp.def_x, tmp.def_y)
+          let tmp_point: DensityCorrectionPoint = {
+            control_point: tmp.control_point,
+            x: x_y.x,
+            y: x_y.y,
+            def_x: def_x_f.x,
+            def_y: def_x_f.y
+          }
+          value_point.value.push(tmp_point)
         }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-    watch(
-      () => nine[4],
-      (newVal, oldVal) => {
-        if ($store.state.enablefusion && ste_status.value == 0)
-          set?.setBlendingCorrection(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-            9, 9,
-            5,
-            Number(newVal.x),
-            Number(newVal.y)
-          );
-        if (!isactivearray.value[4]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          setdianposin(4, x, y);
+      });
+    }
+    const del_control_points = (amount: number) => {
+      if (amount <= 9) return
+      let cardinality = Math.sqrt(amount)
+      amount = (cardinality + -1) ** 2
+      let tmpconfig: any = null
+      let row = $store.getters.GetTheCurrentlySelectedCamera[0]
+      let col = $store.getters.GetTheCurrentlySelectedCamera[1]
+
+      set?.DelBlendingCtrlPoint('9', row, col, amount).then((res) => {
+        if (res == null || typeof (res) == "undefined") return
+        let tmp = JSON.parse(res?.config);
+        let fortmp = null;
+        let i;
+        for (i of tmp.projectors) {
+          if (
+            i.col === $store.getters.GetTheCurrentlySelectedCamera[1] &&
+            i.row === $store.getters.GetTheCurrentlySelectedCamera[0]
+          ) {
+            fortmp = JSON.parse(JSON.stringify(i));
+          }
         }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-    watch(
-      () => nine[5],
-      (newVal, oldVal) => {
-        if ($store.state.enablefusion && ste_status.value == 0)
-          set?.setBlendingCorrection(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-            9, 9,
-            6,
-            Number(newVal.x),
-            Number(newVal.y)
-          );
-        if (!isactivearray.value[5]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          setdianposin(5, x, y);
+        ste_status.value = 1;
+        tmpconfig = JSON.parse(JSON.stringify(fortmp));
+        options_value_point_amount.value = []
+        for (let key in tmpconfig.multi_curved_surface) {
+          options_value_point_amount.value.push(key)
         }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-    watch(
-      () => nine[6],
-      (newVal, oldVal) => {
-        if ($store.state.enablefusion && ste_status.value == 0)
-          set?.setBlendingCorrection(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-            9, 9,
-            7,
-            Number(newVal.x),
-            Number(newVal.y)
-          );
-        if (!isactivearray.value[6]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          setdianposin(6, x, y);
+        value_point_amount.value = amount
+        config = tmpconfig
+        $store.commit("setfusion_configuration", res?.config);
+        value.value = []
+        value_point.value = []
+        for (let index = 0; index < tmpconfig.multi_curved_surface[amount].length; index++) {
+          let tmp: DensityCorrectionPoint = tmpconfig.multi_curved_surface[amount][index];
+          value.value.push(tmp)
+          let x_y = coordinate_transformation_value_to_xy(tmp.x, tmp.y)
+          let def_x_f = coordinate_transformation_value_to_xy(tmp.def_x, tmp.def_y)
+          let tmp_point: DensityCorrectionPoint = {
+            control_point: tmp.control_point,
+            x: x_y.x,
+            y: x_y.y,
+            def_x: def_x_f.x,
+            def_y: def_x_f.y
+          }
+          value_point.value.push(tmp_point)
         }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-    watch(
-      () => nine[7],
-      (newVal, oldVal) => {
-        if ($store.state.enablefusion && ste_status.value == 0)
-          set?.setBlendingCorrection(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-            9, 9,
-            8,
-            Number(newVal.x),
-            Number(newVal.y)
-          );
-        if (!isactivearray.value[7]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          setdianposin(7, x, y);
-        }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-    watch(
-      () => nine[8],
-      (newVal, oldVal) => {
-        if ($store.state.enablefusion && ste_status.value == 0)
-          set?.setBlendingCorrection(
-            $store.getters.GetTheCurrentlySelectedCamera[0],
-            $store.getters.GetTheCurrentlySelectedCamera[1],
-            9, 9,
-            9,
-            Number(newVal.x),
-            Number(newVal.y)
-          );
-        if (!isactivearray.value[8]) {
-          let x = Math.ceil(newVal.x / Proportion.value.x);
-          let y = Math.ceil((config.height - newVal.y) / Proportion.value.y);
-          setdianposin(8, x, y);
-        }
-        save_set_cache();
-      },
-      { deep: true }
-    );
-    let model = ref(null);
-    let set = GlobalData.getInstance().getCurrentClient();
-    const setdianposin = (index: number, x: number, y: number) => {
-      ninepostion.value[index].x = x;
-      ninepostion.value[index].y = y;
-      isshowarray.value[index] = false;
-      isactivearray.value[index] = false;
-      setTimeout(() => {
-        isshowarray.value[index] = true;
-      }, 100);
-      if(ste_status.value == 0)now_index.value=index
-    };
-    const save = () => {
-      set?.SaveBlendingConfig("");
-      setTimeout(() => {
-        set?.GetBlendingConfig("").then((res) => {
-          $store.commit("setfusion_configuration", res?.config);
-        });
-      }, 1000);
-    };
-    watch(()=>now_index,(newval,oldval)=>{
-      set?.SetBlendingOption("blending_grids_select_point",`9:${now_index.value+1}`)
-    },{ deep: true })
+      });
+    }
     return {
-      now_index,
-      model,
-      save,
-      nine,
-      moveHandler_1,
-      moveHandler_2,
-      moveHandler_3,
-      moveHandler_4,
-      moveHandler_5,
-      moveHandler_6,
-      moveHandler_7,
-      moveHandler_8,
-      moveHandler_9,
-      div,
       resetall,
-      ninepostion,
+      div,
+      max,
+      point,
+      options_model,
+      value,
+      value_point,
+      dragStartHandle,
+      chang,
+      options,
       reset,
-      isshowarray,
-      isactivearray,
-      activeMouseDown,
-      set_cache,
-    };
-  },
-});
+      options_value_point_amount,
+      value_point_amount,
+      chang_point_amount,
+      del_dialog,
+      add_control_points,
+      del_control_points
+    }
+  }
+})
+
 </script>
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 8d555a8..5e7abdc 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -321,7 +321,7 @@ export default defineComponent({
             tmp = '9'
             break;
           case 'DensityCorrection':
-            tmp = 'density'
+            tmp = 'hor_density'
             break;
           default:
             break;
diff --git a/src/entities/DensityCorrection.ts b/src/entities/DensityCorrection.ts
new file mode 100644
index 0000000..2b43f5c
--- /dev/null
+++ b/src/entities/DensityCorrection.ts
@@ -0,0 +1,7 @@
+export default class DensityCorrection {
+  control_point = 0;
+  x = 0;
+  y = 0;
+  def_x = 0;
+  def_y = 0;
+}
diff --git a/src/entities/DensityCorrectionPoint.ts b/src/entities/DensityCorrectionPoint.ts
new file mode 100644
index 0000000..6c1cf6b
--- /dev/null
+++ b/src/entities/DensityCorrectionPoint.ts
@@ -0,0 +1,7 @@
+export default class DensityCorrectionPoint {
+  control_point = 0;
+  x = 0;
+  y = 0;
+  def_x = 0;
+  def_y = 0;
+}
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index ef22767..184cc91 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -453,5 +453,13 @@ export default {
   "line width":"line width",
   "level":"level",
   "vertical":"vertical",
-  "auxiliary lines":"auxiliary lines"
+  "auxiliary lines":"auxiliary lines",
+  "level point":"level point amount",
+  "vertical point ":"vertical point amount",
+  "point amount":"point amount",
+  "add control points":"add control points",
+  "reduce control points":"reduce control points",
+  "OK to delete you will lose the data you adjusted now":"OK to delete you will lose the data you adjusted now",
+  "Please enter the points you need to add":"Please enter the points you need to add",
+  "Whether to add control points":"Whether to add control points"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 7b55ac1..ffc897e 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -722,5 +722,13 @@ export default {
   "line width":"线宽",
   "level":"水平",
   "vertical":"垂直",
-  "auxiliary lines":"辅助线"
+  "auxiliary lines":"辅助线",
+  "level point":"水平点数量",
+  "vertical point":"垂直点数量",
+  "point amount":"点数量",
+  "add control points":"增加",
+  "reduce control points":"减少",
+  "OK to delete you will lose the data you adjusted now":"确定删除你将失去现在调整的数据",
+  "Please enter the points you need to add":"请输入你所需要添加的点数",
+  "Whether to add control points":"是否添加控制点"
 };

From 12a940a55f4f88e51af261422612e98d00f78fe7 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Wed, 15 Feb 2023 15:08:47 +0800
Subject: [PATCH 78/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9A=84=E4=B8=80=E4=BA=9B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 34 ++++++++++++------
 .../FusionSettings/FourPointCalibration.vue   |  6 +++-
 .../FusionSettings/GridSettings.vue           |  2 +-
 .../FusionSettings/SurfaceCorrection.vue      | 22 ++++++++----
 src/components/FusionSettingsDialog.vue       | 36 +++++++++++++++++--
 src/i18n/en-US/index.ts                       |  2 +-
 src/i18n/zh-CN/index.ts                       |  2 +-
 7 files changed, 80 insertions(+), 24 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index f61e155..9e61992 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -67,7 +67,7 @@
       <div class="col-1 q-pt-md "><q-btn color="white"
           @click="add_dialog=true" text-color="black"
           :label="$t('add control points')" /></div>
-      <div class="col-1 q-pt-md "><q-btn color="white" @click="() => { del_dialog = true }" text-color="black"
+      <div class="col-1 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>
     <div class="row" v-show="now_v_h == 'level'">
@@ -87,7 +87,7 @@
       <div class="col-1 q-pt-md "><q-btn color="white"
           @click="add_dialog=true" text-color="black"
           :label="$t('add control points')" /></div>
-      <div class="col-1 q-pt-md "><q-btn color="white" @click="() => { del_dialog = true }" text-color="black"
+      <div class="col-1 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>
     <div class="q-pt-md"> <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" /></div>
@@ -150,7 +150,8 @@ import {
   computed,
   watch,
   nextTick,
-  onBeforeUnmount
+  onBeforeUnmount,
+  defineExpose
 } from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
@@ -208,6 +209,8 @@ export default defineComponent({
     };
 
     const use_server_config = () => {
+      value_h_point_amount.value = 5
+      value_v_point_amount.value = 5
       let a = 5
       value_h.value = []
       value_h_point.value = []
@@ -256,8 +259,8 @@ export default defineComponent({
         value_v_point.value = []
         deepcopy(value_h.value, tmp.value_h)
         deepcopy(value_v.value, tmp.value_v)
-        value_h_point_amount.value = Number(tmp.value_h_point_amount)
-        value_v_point_amount.value = Number(tmp.value_v_point_amount)
+        value_h_point_amount.value = tmp.value_h_point_amount
+        value_v_point_amount.value = tmp.value_v_point_amount
         deepcopy(value_h_point.value, tmp.value_h_point)
         deepcopy(value_v_point.value, tmp.value_v_point)
         recalculate_coordinates()
@@ -297,7 +300,7 @@ export default defineComponent({
         use_server_config();
         use_set_cache();
         options_value_h_point_amount.value = Object.keys(config.multi_hor_density)
-      options_value_v_point_amount.value = Object.keys(config.multi_ver_density)
+        options_value_v_point_amount.value = Object.keys(config.multi_ver_density)
         setTimeout(() => {
           ste_status.value = 0;
         }, 100);
@@ -339,6 +342,7 @@ export default defineComponent({
       } else {
         set?.SetBlendingOption("blending_grids_select_ui", "ver_density")
       }
+      save_set_cache()
     }, { deep: true })
     watch(() => value_h_point_amount, (newval, oldval) => {
       set?.SetBlendingOption("blending_grids_control_point_count", `${newval.value}`)
@@ -347,6 +351,7 @@ export default defineComponent({
       } else {
         set?.SetBlendingOption("blending_grids_select_ui", "ver_density")
       }
+      save_set_cache()
     }, { deep: true })
 
     watch(() => options_model_h, (newval, oldval) => {
@@ -368,6 +373,7 @@ export default defineComponent({
 
     const chang_point_amount = (val: number, type: string) => {
       start_point(val, type)
+      save_set_cache()
     }
 
     const dragStartHandle = ($event: any, index: number, type: string) => {
@@ -570,7 +576,7 @@ export default defineComponent({
       let col = $store.getters.GetTheCurrentlySelectedCamera[1]
       switch (type) {
         case 'v':
-          set?.AddBlendingCtrlPoint('ver_density', row, col, amount).then((res) => {
+          set?.AddBlendingCtrlPoint('ver_density', row, col, Number(amount)).then((res) => {
             if (res == null || typeof (res) == "undefined") return
             update(res?.config)
             let tmp = JSON.parse(res?.config);
@@ -615,7 +621,7 @@ export default defineComponent({
           });
           break;
         case 'h':
-          set?.AddBlendingCtrlPoint('hor_density', row, col, amount).then((res) => {
+          set?.AddBlendingCtrlPoint('hor_density', row, col, Number(amount)).then((res) => {
             if (res == null || typeof (res) == "undefined") return
             update(res?.config)
             let tmp = JSON.parse(res?.config);
@@ -700,7 +706,7 @@ export default defineComponent({
       let col = $store.getters.GetTheCurrentlySelectedCamera[1]
       switch (type) {
         case 'v':
-          set?.DelBlendingCtrlPoint('ver_density', row, col, amount).then((res) => {
+          set?.DelBlendingCtrlPoint('ver_density', row, col, Number(amount)).then((res) => {
             if (res == null || typeof (res) == "undefined") return
             let tmp = JSON.parse(res?.config);
             let fortmp = null;
@@ -747,7 +753,7 @@ export default defineComponent({
           });
           break;
         case 'h':
-          set?.DelBlendingCtrlPoint('hor_density', row, col, amount).then((res) => {
+          set?.DelBlendingCtrlPoint('hor_density', row, col, Number(amount)).then((res) => {
             if (res == null || typeof (res) == "undefined") return
             let tmp = JSON.parse(res?.config);
             let fortmp = null;
@@ -830,6 +836,11 @@ export default defineComponent({
       let tmp = now_v_h.value == "vertical" ? "v" : "h"
       add_control_points(Number(now_amount.value), tmp);
     }
+    defineExpose({
+      now_v_h,
+      options_model_v,
+      options_model_h
+    });
     return {
       resetall,
       div,
@@ -860,7 +871,8 @@ export default defineComponent({
       add,
       del_dialog,
       add_dialog,
-      now_amount
+      now_amount,
+      set_cache
     }
   }
 })
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 88c0f28..265b4e2 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -61,7 +61,8 @@ import {
   computed,
   watch,
   nextTick,
-  onBeforeUnmount
+  onBeforeUnmount,
+  defineExpose
 } from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
@@ -353,6 +354,9 @@ export default defineComponent({
 
       }
     }
+    defineExpose({
+      options_model,
+    });
     return {
       resetall,
       div,
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 0b18b4d..bc3aa3c 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -80,7 +80,7 @@
             <div class="col-4 q-pt-sm">
               <q-item>
                 <q-item-section avatar class="head_1">
-                  {{ $t("center line color") }}
+                  {{ $t("center circle color") }}
                 </q-item-section>
                 <q-item-section>
                   <q-input v-model="color[2]" :rules="['anyColor']">
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 60e6750..b044fb4 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -17,7 +17,7 @@
     </div>
   </div>
   <div>
-    <div class="row">
+    <div class="row" v-show="false">
       <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')"
@@ -33,7 +33,7 @@
       </div>
       <div class="col-2">
 
-        <div class="col-1 q-pt-md "><q-btn color="white" @click="() => { del_dialog = true }" text-color="black"
+        <div class="col-1 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>
@@ -97,7 +97,8 @@ import {
   computed,
   watch,
   nextTick,
-  onBeforeUnmount
+  onBeforeUnmount,
+  defineExpose
 } from "vue";
 import { useStore } from "src/store";
 import { useI18n } from "vue-i18n";
@@ -158,6 +159,7 @@ export default defineComponent({
     };
 
     const use_server_config = () => {
+      value_point_amount.value=9
       let a = 9
       value.value = []
       value_point.value = []
@@ -241,6 +243,7 @@ export default defineComponent({
 
     watch(() => value_point_amount, (newval, oldval) => {
       set?.SetBlendingOption("blending_grids_control_point_count", `${newval.value}`)
+      save_set_cache()
     }, { deep: true })
 
     /**
@@ -423,6 +426,7 @@ export default defineComponent({
         }
         ste_status.value = 1;
         tmpconfig = JSON.parse(JSON.stringify(fortmp));
+        config = JSON.parse(JSON.stringify(fortmp));
         options_value_point_amount.value = []
         for (let key in tmpconfig.multi_curved_surface) {
           options_value_point_amount.value.push(key)
@@ -449,6 +453,7 @@ export default defineComponent({
       });
     }
     const del_control_points = (amount: number) => {
+      let tmp=amount
       if (amount <= 9) return
       let cardinality = Math.sqrt(amount)
       amount = (cardinality + -1) ** 2
@@ -456,7 +461,7 @@ export default defineComponent({
       let row = $store.getters.GetTheCurrentlySelectedCamera[0]
       let col = $store.getters.GetTheCurrentlySelectedCamera[1]
 
-      set?.DelBlendingCtrlPoint('9', row, col, amount).then((res) => {
+      set?.DelBlendingCtrlPoint('9', row, col, Number(tmp)).then((res) => {
         if (res == null || typeof (res) == "undefined") return
         let tmp = JSON.parse(res?.config);
         let fortmp = null;
@@ -471,12 +476,13 @@ export default defineComponent({
         }
         ste_status.value = 1;
         tmpconfig = JSON.parse(JSON.stringify(fortmp));
+        config = JSON.parse(JSON.stringify(fortmp));
         options_value_point_amount.value = []
         for (let key in tmpconfig.multi_curved_surface) {
           options_value_point_amount.value.push(key)
         }
-        value_point_amount.value = amount
-        config = tmpconfig
+        value_point_amount.value = 9
+        amount=9
         $store.commit("setfusion_configuration", res?.config);
         value.value = []
         value_point.value = []
@@ -494,8 +500,12 @@ export default defineComponent({
           }
           value_point.value.push(tmp_point)
         }
+
       });
     }
+    defineExpose({
+      options_model,
+    });
     return {
       resetall,
       div,
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 5e7abdc..4f9ea05 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -70,7 +70,7 @@
                 ]" />
               </div>
               <div style="min-height: 72vh">
-                <component :is="options" />
+                <component ref="child" :is="options" />
               </div>
             </div>
           </div>
@@ -233,6 +233,7 @@ export default defineComponent({
     const send_disable_blending_params = () => {
       set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0");
     };
+    const child :any = ref(null);
     const send_show_blending_grids = () => {
       let tmp = ""
         switch (optionsstr.value) {
@@ -246,7 +247,12 @@ export default defineComponent({
             tmp = '9'
             break;
           case 'DensityCorrection':
-            tmp = 'density'
+            if(child.value!.now_v_h=='vertical'){
+              tmp = 'ver_density'
+            }else{
+              tmp = 'hor_density'
+            }
+
             break;
           default:
             break;
@@ -254,6 +260,29 @@ export default defineComponent({
       set?.SetBlendingOption("blending_grids_select_ui", tmp)
       set?.SetBlendingOption('blending_grids_select_projector', now_selsect_projector.value);
       set?.SetBlendingOption(show_blending_grids_id.value, show_blending_grids.value ? "1" : "0");
+
+      switch (optionsstr.value) {
+          case 'FusionLocale':
+
+            break;
+          case 'FourPointCalibration':
+          set?.SetBlendingOption("blending_grids_select_point", `4:${child.value!.options_model+1}`)
+            break;
+          case 'SurfaceCorrection':
+          set?.SetBlendingOption("blending_grids_select_point", `9:${child.value!.options_model+1}`)
+            break;
+          case 'DensityCorrection':
+            console.log(child.value!.now_v_h)
+            if(child.value!.now_v_h=='vertical'){
+              set?.SetBlendingOption("blending_grids_select_point", `${child.value!.options_model_v+1}`)
+            }else{
+              set?.SetBlendingOption("blending_grids_select_point", `${child.value!.options_model_h+1}`)
+            }
+            break;
+          default:
+            break;
+        }
+
     };
     const resetall = () => {
       set?.ResetBlendingConfig().then((res) => {
@@ -490,7 +519,8 @@ export default defineComponent({
       record_times,
       saveconfig,
       isdebug,
-      del_dialog
+      del_dialog,
+      child
     };
   },
 });
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 184cc91..6df0ffd 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -458,7 +458,7 @@ export default {
   "vertical point ":"vertical point amount",
   "point amount":"point amount",
   "add control points":"add control points",
-  "reduce control points":"reduce control points",
+  "reduce control points":"delete control points",
   "OK to delete you will lose the data you adjusted now":"OK to delete you will lose the data you adjusted now",
   "Please enter the points you need to add":"Please enter the points you need to add",
   "Whether to add control points":"Whether to add control points"
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index ffc897e..028f14a 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -727,7 +727,7 @@ export default {
   "vertical point":"垂直点数量",
   "point amount":"点数量",
   "add control points":"增加",
-  "reduce control points":"减少",
+  "reduce control points":"删除",
   "OK to delete you will lose the data you adjusted now":"确定删除你将失去现在调整的数据",
   "Please enter the points you need to add":"请输入你所需要添加的点数",
   "Whether to add control points":"是否添加控制点"