diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue new file mode 100644 index 0000000..97c8359 --- /dev/null +++ b/src/components/FusionSettings/DensityCorrection.vue @@ -0,0 +1,82 @@ + + + + \ No newline at end of file diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue new file mode 100644 index 0000000..89be1b2 --- /dev/null +++ b/src/components/FusionSettings/FourPointCalibration.vue @@ -0,0 +1,309 @@ + + + + \ No newline at end of file diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue new file mode 100644 index 0000000..9ec23d5 --- /dev/null +++ b/src/components/FusionSettings/FusionLocale.vue @@ -0,0 +1,334 @@ + + + + + diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue new file mode 100644 index 0000000..d876e31 --- /dev/null +++ b/src/components/FusionSettings/GridSettings.vue @@ -0,0 +1,87 @@ + + + + + \ No newline at end of file diff --git a/src/components/FusionSettings/ProjectorItem.vue b/src/components/FusionSettings/ProjectorItem.vue new file mode 100644 index 0000000..09105d3 --- /dev/null +++ b/src/components/FusionSettings/ProjectorItem.vue @@ -0,0 +1,47 @@ + + + + \ No newline at end of file diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue new file mode 100644 index 0000000..79d52a4 --- /dev/null +++ b/src/components/FusionSettings/SurfaceCorrection.vue @@ -0,0 +1,465 @@ + + + + \ No newline at end of file diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue new file mode 100644 index 0000000..791c5b9 --- /dev/null +++ b/src/components/FusionSettingsDialog.vue @@ -0,0 +1,146 @@ + + + + + + \ No newline at end of file diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue index 8a51d81..b0bdd97 100644 --- a/src/components/SystemSettingDialog.vue +++ b/src/components/SystemSettingDialog.vue @@ -1390,10 +1390,11 @@ const _time_zones = [ "UTC+11(Solomon Islands)", "UTC+12(New Zealand)", ]; +import vue3ResizeDrag from "src/third_lib/vue3-resize-drag/components/vue3-resize-drag/index.vue"; export default defineComponent({ name: "ComponentSystemSettingDialog", - components: { TimingTaskDialog, SystenSettingAdvancedNetworkDialog }, + components: { TimingTaskDialog, SystenSettingAdvancedNetworkDialog ,vue3ResizeDrag}, setup() { let $store = useStore(); @@ -2064,7 +2065,6 @@ export default defineComponent({ } } ); - return { show_dialog, e_week_Days: ref(EWeekDays), diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts index e2194b3..2b192f6 100644 --- a/src/i18n/en-US/index.ts +++ b/src/i18n/en-US/index.ts @@ -401,4 +401,21 @@ 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", + "FusionLocale":"Fusion Locale", + "FourPointCalibration":"Four Pint Calibration", + "SurfaceCorrection":"Surface Correction", + "DensityCorrection":"Density Correction", + "GridSettings":"Grid Settings", + "point":"dot", + "reset":"reset", + "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", + "Set the fusion band width":"Set the fusion band width", + "Please enter a number":"Please enter a number", + "Please enter 0-100":"Please enter 0-100", + "Set Fusion Band Parameters":"Set Fusion Band Parameters", + "Projector":"Projector" }; diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index 94c433b..81c2389 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -671,4 +671,21 @@ export default { "Please input vaild host. example: 192.168.1.1 or 192.168.1.1:8080": "请输入合法地址. 例: 192.168.1.1 或 192.168.1.1:8080", "equipment data": "联动设备", + "fusion settings":"融合设置", + "FusionLocale":"融合区域设置", + "FourPointCalibration":"四点校正", + "SurfaceCorrection":"曲面校正", + "DensityCorrection":"疏密校正", + "GridSettings":"网格设置", + "point":"点", + "reset":"重置", + "upper fusion zone parameters":"上融合带参数", + "Left fusion Band Parameters":"左融合带参数", + "Lower fusion Zone Parameters":"下融合带参数", + "Right fusion Band Parameters":"右融合带参数", + "Set the fusion band width":"设置融合带宽度", + "Please enter a number":"请输入数字", + "Please enter 0-100":"请输入 0-100", + "Set Fusion Band Parameters":"设置融合带参数", + "Projector":"投影机" }; diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue index 8a4fc22..39d11bc 100644 --- a/src/pages/TopToolBar.vue +++ b/src/pages/TopToolBar.vue @@ -408,6 +408,21 @@ {{ $t("register device") }} + + + + + + + + {{ $t("fusion settings") }} + + + +