Commit Graph

592 Commits

Author SHA1 Message Date
shefengchun d10ad12ba0 完成新开发分支的合并 2023-03-09 11:35:08 +08:00
miao ed0e427cd3 修改角度不能设置为小数 2023-03-09 10:12:35 +08:00
miao 946f2dda3f Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2
# Conflicts:
#	src/components/FusionSettings/FusionLocale.vue
2023-03-09 10:12:35 +08:00
miao 7213e6bddb 魔墙:修改角度超出问题,以及显示器列表全部设置为一样的默认值 2023-03-09 10:10:20 +08:00
miao caac3e3d60 魔墙:打开对话框时初始化变量,多选对齐完清空多选 2023-03-09 10:10:20 +08:00
miao 1f1a26de65 魔墙:加开窗避免显示为空 2023-03-09 10:10:19 +08:00
miao 8583f77627 魔墙:删除合并信息 2023-03-09 10:10:19 +08:00
miao 0f6972635c WIP on master_v2: c318910 删除合并信息 2023-03-09 10:10:19 +08:00
miao 590ea06f2f index on master_v2: c318910 删除合并信息 2023-03-09 10:10:18 +08:00
miao 7b25ddfee0 删除合并信息 2023-03-09 10:10:17 +08:00
miao b6820b4368 Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2
# Conflicts:
#	src/components/ControlPanelDialog.vue
2023-03-09 10:10:09 +08:00
miao 4aef830905 魔墙:修复清屏未及时通知
# Conflicts:
#	src/components/ControlPanelDialog.vue
2023-03-09 10:09:43 +08:00
miao f0c6ad03d9 魔墙:修复清屏未及时通知 2023-03-09 10:09:24 +08:00
miao 191beed68d 魔墙:修改对话框大小 2023-03-09 10:09:24 +08:00
miao b2f2805247 魔墙:增加翻译,修复虚拟窗口选中,修改角度坐标会乱选中窗口,添加魔墙的显示器列表宽高信息,增加恢复时恢复显示器列表信息 2023-03-09 10:09:24 +08:00
miao 7a0842ea24 魔墙:保持显示器宽高不变 2023-03-09 10:09:23 +08:00
miao 67d3799550 魔墙:修复多次删除其他窗口消失 2023-03-09 10:09:23 +08:00
miao a6842221ad Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2
# Conflicts:
#	src/components/ControlPanelDialog.vue
2023-03-03 17:21:28 +08:00
miao be5bffaaff 修复点击更换数据未及时更换 2023-03-03 17:17:48 +08:00
miao 9eee4a4d1f 修复点击更换数据未及时更换 2023-03-03 17:15:41 +08:00
shefengchun 44ae08f0c1 修复疏密校正键盘操作点不移动 2023-03-03 14:19:36 +08:00
shefengchun c62a34e34b 加入键盘awsd交互 2023-03-03 14:09:59 +08:00
shefengchun 70cb05c4ce 将平板模式下的长按识别设置为15ms 2023-03-03 11:34:06 +08:00
shefengchun 12504e0ff6 优化疏密校正ui 修复融合带平板模式下 不能选中融合带的问题 2023-03-03 11:25:22 +08:00
shefengchun 55cba70a1c 为平板增加融合带操作弹窗 2023-03-03 09:52:25 +08:00
shefengchun 52dd69a9a5 增加保存配置时的删除 2023-03-02 15:58:31 +08:00
shefengchun e5a142fad4 修复投影机只显示一行的bug 2023-03-02 14:30:46 +08:00
shefengchun 33e76ee393 修复曲面校正和疏密校正多点切换时不修改当前选中的点数 2023-03-01 17:11:04 +08:00
shefengchun 0a5f561bd6 只在平板模式下语言为英语时更改ui适配 2023-03-01 15:18:07 +08:00
shefengchun 2c498c05f0 为平板模式下英文做适配 2023-03-01 15:09:50 +08:00
shefengchun 75311073cb 优化ui细节 2023-03-01 13:47:26 +08:00
shefengchun 14076866ec 修复 融合设置参数同步问题 投影机布局从后端获取 2023-03-01 11:19:56 +08:00
fangxiang 44aadff1d2 注册码可以鼠标选中复制 2023-02-28 17:15:42 +08:00
shefengchun 82fc72c185 修复快速 多次点击重置所有导致界面不显示 2023-02-28 16:08:49 +08:00
shefengchun 006d13af6a 修复疏密调整数据下发错误 2023-02-28 15:49:17 +08:00
shefengchun 1eb926d029 修复曲面校正不发送默认点数 2023-02-28 14:39:32 +08:00
shefengchun a87b1bc380 修复数据发送顺序不对导致的问题 2023-02-28 14:04:01 +08:00
shefengchun 593323a934 修复疏密数据计算错误导致的错误 2023-02-28 10:29:17 +08:00
shefengchun 039d2d2de3 平板模式下疏密不允许拖动 2023-02-28 09:31:05 +08:00
shefengchun 3f499105d9 增加平板支持 2023-02-27 17:36:04 +08:00
shefengchun 243516ca6d Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2 2023-02-27 10:51:11 +08:00
shefengchun 6360f499da 修改融合带值保证为偶数 2023-02-27 10:20:28 +08:00
fangxiang bb438b9eec 增加升级完后刷新浏览器或者清空缓存的提示 2023-02-27 09:59:37 +08:00
miao 61b3766012 修复文件上传不能及时看见文件 2023-02-27 09:12:38 +08:00
shefengchun f8dd60edbd 删除无效代码 2023-02-24 17:37:34 +08:00
shefengchun d59a111b0d Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2 2023-02-24 17:36:17 +08:00
shefengchun 48466524bb 修复首页数据 不同步 2023-02-24 17:36:13 +08:00
miao 46dee256f3 Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2 2023-02-24 16:56:42 +08:00
miao 84ae856c71 魔墙修复多次点击恢复异常 2023-02-24 16:56:31 +08:00
shefengchun 55b518facc Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2 2023-02-24 16:47:50 +08:00