From ff00c6e65241113c5a33f2eb13d6440665437724 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 17 Feb 2023 09:37:37 +0800
Subject: [PATCH] =?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/DensityCorrection.vue      | 40 +++++++++++--------
 .../FusionSettings/FourPointCalibration.vue   |  4 +-
 src/components/FusionSettingsDialog.vue       | 32 +++++++++++++--
 3 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index ffa6a99..a86aad8 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -48,6 +48,19 @@
       </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-3 q-px-md"> <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-3 q-pt-md  q-px-md"><q-btn color="white" @click="add_dialog = true" text-color="black"
+          :label="$t('add control points')" /></div>
+      <div class="col-3 q-pt-md q-px-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 == 'vertical'">
       <div class="col-1"></div>
       <div class="col-3 q-px-md"> <q-select class="q-pt-md " :label="$t('vertical')"
@@ -62,16 +75,19 @@
       </div>
 
     </div>
-    <div class="row" v-show="now_v_h == 'vertical'">
+
+    <div class="row" v-show="now_v_h == 'level'">
       <div class="col-1"></div>
-      <div class="col-3 q-px-md"> <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-3 q-pt-md  q-px-md"><q-btn color="white" @click="add_dialog = true" text-color="black"
+      <div class="col-3 q-px-md"> <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-3 q-pt-md "><q-btn color="white" @click="add_dialog = true" text-color="black"
           :label="$t('add control points')" /></div>
-      <div class="col-3 q-pt-md q-px-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 class="col-3 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="row" v-show="now_v_h == 'level'">
       <div class="col-1"></div>
       <div class="col-3 q-px-md"> <q-select class="q-pt-md" :label="$t('level')"
@@ -86,17 +102,7 @@
       </div>
 
     </div>
-    <div class="row" v-show="now_v_h == 'level'">
-      <div class="col-1"></div>
-      <div class="col-3 q-px-md"> <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-3 q-pt-md "><q-btn color="white" @click="add_dialog = true" text-color="black"
-          :label="$t('add control points')" /></div>
-      <div class="col-3 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="row">
       <div class="col-1"></div>
       <div class="q-pt-md q-px-md col-5"> <q-btn color="white" @click="resetall" text-color="black"
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index f0ab08c..6cef96a 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -94,7 +94,9 @@ export default defineComponent({
       return $store.state.selected_projector;
     });
 
-    //用于计算当前投影仪的索引
+    /**
+     * 用于计算当前投影仪的索引
+     */
     let serverconfig = JSON.parse($store.state.fusion_configuration);
     const selectedprojector = computed(() => {
       return (
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 5571ce4..b7fb86b 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -240,6 +240,9 @@ export default defineComponent({
     };
     const now_resolution=ref(1)
     // let allconfig = JSON.parse($store.state.fusion_configuration);
+    /**
+     * 模拟数据完成dom渲染再次获取真实后台数据
+     */
     let allconfig = JSON.parse("{\"resolution\": [{\"width\": 1024,\"height\": 768}]}");
     const options_resolution = computed(() => {
       let tmp=[];
@@ -252,6 +255,10 @@ export default defineComponent({
       return tmp
     })
     const child :any = ref(null);
+    /**
+     * 开启网格时发送全部参数
+     *
+     */
     const send_show_blending_grids = () => {
       let tmp = ""
         switch (optionsstr.value) {
@@ -303,6 +310,9 @@ export default defineComponent({
         }
 
     };
+    /**
+     * 重置全部参数
+     */
     const resetall = () => {
       set?.ResetBlendingConfig().then((res) => {
         let tmp = JSON.parse(res ? res.config : "");
@@ -320,6 +330,9 @@ export default defineComponent({
         options.value = tmp
       }, 300);
     }
+    /**
+     * 清除sessionStorage缓存
+     */
     const clear_sessionStorage = () => {
       sessionStorage.removeItem("FusionLocale");
       sessionStorage.removeItem("SurfaceCorrection");
@@ -346,6 +359,9 @@ export default defineComponent({
         optionsstr.value = newValue;
       },
     });
+    /**
+     * 监听是否开启融合
+     */
     watch(
       () => EnableBlending,
       (newVal, oldVal) => {
@@ -355,8 +371,11 @@ export default defineComponent({
       { deep: true }
     );
 
+    /**
+     * 设置分辨率
+     * @param index 索引号
+     */
     const set_resolution=(index:number)=>{
-      //SetProjectorResolution
       $q.loading.show({
           message: 'Loading please wait'
         })
@@ -375,7 +394,9 @@ export default defineComponent({
       }, 800);
       getconfig()
     }
-
+    /**
+     * 监听ui切换
+     */
     watch(() => optionsstr,
       (newVal) => {
         let tmp = ""
@@ -406,6 +427,9 @@ export default defineComponent({
       //读取场景
       get_scenes()
     };
+    /**
+     * 读取服务器配置
+     */
     const getconfig = () => {
       try {
         set?.GetBlendingConfig("").then((res) => {
@@ -427,7 +451,9 @@ export default defineComponent({
       options.value = "FusionLocale"
     };
 
-
+    /**
+     * 读取服务器场景
+     */
     const get_scenes = () => {
       set?.EnumBlendingScene().then((res) => {
         if (res == null || res.scenes.length == 0) return