Commit Graph

527 Commits

Author SHA1 Message Date
shefengchun fe3d2695a1 修复保存不需要重新读取 2023-02-03 09:35:21 +08:00
shefengchun e11b1fbc32 Merge branch 'blending' of http://www.cloudview.work/git/fangxiang/media_player_client into blending 2023-02-03 09:30:49 +08:00
shefengchun 1e19299d1f 更改网格颜色设置ui 2023-02-03 09:28:29 +08:00
ljqing e388f61a9c 修改显示字符串 2023-02-02 19:10:09 +08:00
ljqing 6e04641016 判断对象是否存在 2023-02-02 18:53:50 +08:00
shefengchun 09f20b4123 删除多余代码 2023-02-02 16:21:37 +08:00
shefengchun f44f60d038 增加单独调试页面 2023-02-02 15:48:40 +08:00
shefengchun 1bee760998 增加删除场景功能 2023-02-02 11:24:28 +08:00
ljqing deeb73cf26 增加删除融合场景接口 2023-02-02 09:39:30 +08:00
shefengchun 361c2c06c5 增加125缩放下不显示滑动条 2023-02-01 15:01:00 +08:00
miao e940f24b52 Merge branch 'magic_wall'
# Conflicts:
#	src/common/ClientConnection.ts
#	src/components/RegisterDialog.vue
#	src/components/SystemSettingDialog.vue
#	src/entities/MagicWallConfig.ts
#	src/entities/RectF.ts
#	src/entities/WSProtocol.ts
#	src/i18n/en-US/index.ts
#	src/i18n/zh-CN/index.ts
#	src/pages/TopToolBar.vue
#	src/store/index.ts
2023-02-01 13:41:33 +08:00
miao 3accecee65 魔墙:将导出按钮换成shift+s 2023-02-01 09:26:29 +08:00
miao 17118497e2 增加翻译 2023-01-31 14:30:55 +08:00
miao 939ce286f3 魔墙:导出格式优化 2023-01-31 14:26:51 +08:00
miao 9c211e13bf 魔墙:增加导出坐标 2023-01-31 14:17:21 +08:00
shefengchun 069ef341ce Merge branch 'blending' of http://www.cloudview.work/git/fangxiang/media_player_client into blending 2023-01-31 11:31:37 +08:00
ljqing 2586774c4a 修改最大值 2023-01-31 10:54:20 +08:00
ljqing 6723d28701 修改id名 2023-01-31 10:34:43 +08:00
ljqing 104a5cead6 增加枚举融合场景名称列表及应用融合场景接口 2023-01-30 18:14:33 +08:00
shefengchun 15bc9a11c9 修复ui 2023-01-30 17:41:18 +08:00
ljqing e7a3489054 修改id名 2023-01-30 17:18:11 +08:00
ljqing aadd579327 关闭窗口不需要读取融合配置 2023-01-30 17:09:00 +08:00
miao 6864213d67 添加更新魔墙翻译 2023-01-30 14:37:53 +08:00
miao d47ebdf1d4 魔墙:修复因恢复导致的控制台缩放导致显示错误 2023-01-30 14:35:50 +08:00
shefengchun 3607edc45a 修复div大小获取失败时发出错误 2023-01-30 14:11:42 +08:00
shefengchun 6765c47ef3 增加保存配置和读取配置的界面 2023-01-30 10:33:09 +08:00
shefengchun 2de84af0fe 针对低分辨率做适配 2023-01-29 16:52:38 +08:00
miao 3c20ba2461 添加魔墙在主页面的显示 2023-01-29 15:07:46 +08:00
shefengchun 21fc52f85b 规范代码 2023-01-29 14:04:08 +08:00
shefengchun 1e0e2a529c 增加网格设置界面切换时缓存 2023-01-29 14:03:39 +08:00
shefengchun ee4166abc3 增加同步操作选项 2023-01-29 13:34:54 +08:00
shefengchun 0148c2e3e4 Merge branch 'blending' of http://www.cloudview.work/git/fangxiang/media_player_client into blending 2023-01-28 14:22:59 +08:00
shefengchun 48f5a8a25c 开启网格设置 2023-01-28 14:22:55 +08:00
ljqing 08bbfd9b73 关闭融合设置窗口时隐藏删格图 2023-01-28 14:08:18 +08:00
fangxiang ed2632279b 更新翻译 2023-01-19 13:42:01 +08:00
ljqing e8f2d4eb9c 修改id 2023-01-19 11:21:18 +08:00
ljqing 5f03edeb6c 设置融合选项参数改为字符串类型 2023-01-18 20:09:23 +08:00
fangxiang d9c0368b7b 合并钟仕骏提交的配置服务器IP界面(需要Debug) 2023-01-18 19:08:28 +08:00
ljqing 1862b885b3 增加显示融合网格选项 2023-01-18 18:00:17 +08:00
fangxiang 2b60548fa9 添加无界模式初始化代码 2023-01-18 17:32:02 +08:00
ljqing ee96b91aef 增加禁用融合参数选项 2023-01-17 19:41:25 +08:00
fangxiang e5b8380fe3 修复信号源组修改失败的BUG 2023-01-16 09:59:28 +08:00
方 向 d37e1bfd43 Merge pull request '添加无界连接对象' (#1) from iswebserve into master
Reviewed-on: http://www.cloudview.work/git/fangxiang/media_player_client/pulls/1
2023-01-16 09:34:41 +08:00
miao 385b5a230f 添加无界连接对象 2023-01-16 09:20:28 +08:00
shefengchun ddb5e15800 修复是否隐藏桌面数据来源错误 2023-01-14 19:52:05 +08:00
shefengchun bc64cbceff 修复微调bug 2023-01-14 19:34:21 +08:00
shefengchun 066d97efb1 加入融合界面微调功能 2023-01-14 17:49:41 +08:00
shefengchun c52654e124 增加重置所有 2023-01-14 17:00:48 +08:00
shefengchun e76fc75f48 修复切换投影机数据不同步 2023-01-14 13:47:01 +08:00
shefengchun 086df91486 修复使用错误的缓存数据导致重置错误 2023-01-14 13:31:29 +08:00