From 039d2d2de3aa28ccea68fe474c4e591537722db9 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Tue, 28 Feb 2023 09:31:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E6=9D=BF=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=E7=96=8F=E5=AF=86=E4=B8=8D=E5=85=81=E8=AE=B8=E6=8B=96=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 24 ++++---------------
 .../FusionSettings/FourPointCalibration.vue   |  2 +-
 .../FusionSettings/SurfaceCorrection.vue      |  2 +-
 src/i18n/en-US/index.ts                       |  1 -
 src/i18n/zh-CN/index.ts                       |  1 -
 5 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index a74f741..0861dd0 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -7,7 +7,7 @@
           <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')">
+            @click="options_model_v = index; now_v_h = 'vertical'" :draggable="url.indexOf('pad')==-1" @dragging="dragStartHandle($event, index, 'v')">
             <span>v{{
               index + 1
             }}</span>
@@ -15,7 +15,7 @@
           <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')">
+            @activated="options_model_v = index; now_v_h = 'vertical'" :draggable="url.indexOf('pad')==-1" @dragging="dragStartHandle($event, index, 'v')">
             <span>v{{
               index + 1
             }}</span>
@@ -23,7 +23,7 @@
           <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')">
+            @click="options_model_h = index; now_v_h = 'level'" :draggable="url.indexOf('pad')==-1" @dragging="dragStartHandle($event, index, 'h')">
             <span>h{{
               index + 1
             }}</span>
@@ -31,7 +31,7 @@
           <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')">
+            @click="options_model_h = index; now_v_h = 'level'" :draggable="url.indexOf('pad')==-1" @dragging="dragStartHandle($event, index, 'h')">
             <span>h{{
               index + 1
             }}</span>
@@ -134,20 +134,6 @@
     </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> -->
   <q-dialog position="bottom" v-model="add_dialog">
     <q-card style="width: 500px; max-width: 80vw;">
       <q-card-section>
@@ -179,7 +165,7 @@
   <q-dialog v-model="ipad_chang">
     <q-card style="width: 40vw; max-width: 80vw;">
       <q-card-section>
-        <div class="text-h6">{{ $t('modification point') +(now_v_h == 'level'?options_model_h+1:options_model_v+1)}}</div>
+        <div class="text-h6">{{ $t('point') +(now_v_h == 'level'?options_model_h+1:options_model_v+1)}}</div>
       </q-card-section>
       <q-card-section class="q-pt-none">
         <div class="row" v-show="now_v_h != 'level'">
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 45726af..7760987 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -40,7 +40,7 @@
     <q-dialog v-model="ipad_chang">
     <q-card style="width: 40vw; max-width: 80vw;">
       <q-card-section>
-        <div class="text-h6">{{ $t('modification point') +(options_model+1 )}}</div>
+        <div class="text-h6">{{ $t('point') +(options_model+1 )}}</div>
       </q-card-section>
       <q-card-section class="q-pt-none">
         <div class="row">
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index afc4dfa..646cfb4 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -110,7 +110,7 @@
   <q-dialog v-model="ipad_chang">
     <q-card style="width: 40vw; max-width: 80vw;">
       <q-card-section>
-        <div class="text-h6">{{ $t('modification point') +(options_model+1 )}}</div>
+        <div class="text-h6">{{ $t('point') +(options_model+1 )}}</div>
       </q-card-section>
       <q-card-section class="q-pt-none">
         <div class="row">
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index df1229c..d4cfe98 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -506,5 +506,4 @@ export default {
     "Whether to change the projector layout to",
   "after upgrade, please clear browser cache Or refresh hard (Ctrl/Shift + F5 Or Ctrl + Shift + R)":
     "After Upgrade, Please Clear Browser Cache Or Refresh Hard (Ctrl/Shift + F5 Or Ctrl + Shift + R)",
-    "modification point":"modification point",
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 1c9f4b6..b72021a 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -772,5 +772,4 @@ export default {
   "Whether to change the projector layout to": "是否更改投影机布局为",
   "after upgrade, please clear browser cache Or refresh hard (Ctrl/Shift + F5 Or Ctrl + Shift + R)":
     "升级完成后请清空浏览器缓存或者进行硬刷新(Ctrl/Shift + F5 或者 CTRL + SHIFT + R)",
-    "modification point":"修改点"
 };