lingling
/
media_player_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新翻译 修复网格行判断

This commit is contained in:
shefengchun 2023-02-03 10:37:22 +08:00
parent 86834823b7
commit 08c19d630d
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/FusionSettings/FusionLocale.vue
View File

@ -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
};
},
});

4
src/components/FusionSettings/GridSettings.vue
View File

@ -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

14
src/i18n/en-US/index.ts
View File

@ -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",