miao
|
a45c188c1e
|
判断是否为无界，显示隐藏底图升级数据恢复等操作
|
2023-02-17 14:28:03 +08:00 |
ljqing
|
a254c7d118
|
修改融合界面
|
2023-02-17 14:20:00 +08:00 |
|
ljqing
|
dea3713269
|
修改字符串
|
2023-02-17 14:00:04 +08:00 |
|
ljqing
|
652f6bfd2e
|
Merge branch 'blending' into master_v2
|
2023-02-17 09:38:52 +08:00 |
 shefengchun
|
ff00c6e652
|
更改ui
|
2023-02-17 09:37:37 +08:00 |
|
shefengchun
|
b4338153f9
|
增加交互增加设置分辨率
|
2023-02-16 16:31:29 +08:00 |
|
ljqing
|
3fcd25ec96
|
增加设置投影机布局接口
|
2023-02-16 15:44:52 +08:00 |
|
shefengchun
|
7f833fd6f2
|
加入选择分辨率
|
2023-02-16 15:40:48 +08:00 |
|
shefengchun
|
06dfea0815
|
修复动态添加的bug
|
2023-02-16 14:53:36 +08:00 |
|
ljqing
|
8a197be56a
|
增加设置投影机分辨率
|
2023-02-16 14:44:43 +08:00 |
|
miao
|
601a95a33e
|
修复文件上传中列表滚动
|
2023-02-16 11:34:55 +08:00 |
|
miao
|
27f914c995
|
升级对话框显示服务器版本
|
2023-02-16 11:10:49 +08:00 |
|
ljqing
|
1bfb5af0a5
|
Merge branch 'blending' into master_v2
|
2023-02-15 19:42:09 +08:00 |
|
ljqing
|
5f3f9fd074
|
重置所有只发一条指令
|
2023-02-15 19:37:17 +08:00 |
|
ljqing
|
3afdf5c3bc
|
非空判断
|
2023-02-15 19:22:18 +08:00 |
fangxiang
|
80c44141e0
|
Merge commit 'a5df1e0635866baf7b8c1bc91c4a2334572c9298' into master_v2
|
2023-02-15 19:08:58 +08:00 |
|
fangxiang
|
f9207cd6eb
|
Merge branch 'FileManager' into master_v2
|
2023-02-15 19:08:18 +08:00 |
|
miao
|
b2bd16128a
|
修改文件上传之后的提示
|
2023-02-15 18:10:38 +08:00 |
|
miao
|
fc6b23432c
|
新增文件夹时添加限制
|
2023-02-15 18:10:38 +08:00 |
|
miao
|
e68eb4c8d6
|
将数据恢复，底图上传，查看底图，升级的http转化
|
2023-02-15 18:10:37 +08:00 |
|
fangxiang
|
71abf1bba2
|
修改为最新的数据库备份协议
|
2023-02-15 18:10:20 +08:00 |
|
fangxiang
|
a2102bdb5e
|
适配最新的文件上传接口
|
2023-02-15 18:10:20 +08:00 |
|
miao
|
5a1dba7a8f
|
检查索引的http请求改为websocket
|
2023-02-15 18:10:19 +08:00 |
|
miao
|
e4827b4fe6
|
修改文件上传为多个
|
2023-02-15 18:10:18 +08:00 |
|
fangxiang
|
3e2a941f80
|
Merge remote-tracking branch 'remotes/origin/blending' into merge_fm_fusion
# Conflicts:
# src/common/ClientConnection.ts
# src/components/FileManageDialog.vue
# 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-15 18:03:06 +08:00 |
|
fangxiang
|
a5df1e0635
|
WIP on merge_fm: d16df7a 合并FileManager
|
2023-02-15 16:36:57 +08:00 |
|
fangxiang
|
d16df7ada8
|
合并FileManager
|
2023-02-15 16:36:51 +08:00 |
|
shefengchun
|
12a940a55f
|
修复动态添加的一些错误
|
2023-02-15 15:08:47 +08:00 |
|
shefengchun
|
dbecb1ff15
|
增加动态添加点
|
2023-02-15 09:34:42 +08:00 |
|
miao
|
c35ff719c6
|
判断是否为无界，显示文件对话框的上传文件
|
2023-02-14 10:18:13 +08:00 |
|
miao
|
febcf00d94
|
升级对话框显示服务器版本
|
2023-02-14 09:45:09 +08:00 |
|
miao
|
8b6949f087
|
勾选融合，输出设置固定
|
2023-02-14 09:23:45 +08:00 |
|
miao
|
aee328fb82
|
将文件管理的http请求改为websocket
|
2023-02-12 15:58:54 +08:00 |
|
fangxiang
|
2a6e8e78c0
|
修复网络高级设置访问未定义变量的错误
|
2023-02-10 17:09:38 +08:00 |
|
fangxiang
|
f4b2e6cd15
|
修改在线注册的IP校验
|
2023-02-10 16:31:39 +08:00 |
|
fangxiang
|
2930add85f
|
修改IP、子网掩码的校验逻辑
|
2023-02-10 16:29:47 +08:00 |
|
fangxiang
|
225fbd4faf
|
网络设置调换子网掩码和默认网关的位置，保持和Windows网络设置的顺序一致
|
2023-02-10 16:29:46 +08:00 |
|
ljqing
|
da82416bd1
|
添加删除控制点数量
|
2023-02-10 14:07:33 +08:00 |
|
miao
|
b0751a1b18
|
添加融合选项在高级调试和在线注册
|
2023-02-10 11:03:11 +08:00 |
|
shefengchun
|
c88033899b
|
删除调试信息
|
2023-02-10 09:56:24 +08:00 |
|
shefengchun
|
b3cc026b41
|
修复键盘监听导致的输入问题
|
2023-02-10 09:55:11 +08:00 |
|
shefengchun
|
e37999a924
|
增加辅助线和服务端数据同步
|
2023-02-10 09:38:20 +08:00 |
|
miao
|
c6c4522be7
|
完善无界模式显示全屏效果
|
2023-02-09 20:06:55 +08:00 |
|
miao
|
33413fbb27
|
增加全屏
|
2023-02-09 20:06:54 +08:00 |
|
fangxiang
|
b2aff3720c
|
开放云服务设置,增加加载完后通知主应用功能
|
2023-02-09 20:06:54 +08:00 |
|
shefengchun
|
15088f9d5e
|
增加疏密界面选择点时发送当前点
|
2023-02-09 16:57:08 +08:00 |
|
shefengchun
|
c35349b6e4
|
修复疏密校正索引错误
|
2023-02-09 15:05:10 +08:00 |
|
shefengchun
|
112ea9195b
|
更改ui
|
2023-02-09 14:28:33 +08:00 |
|
miao
|
9ad2665b0d
|
魔墙：修复滑动条及输入控件随键盘而改变；加中心坐标变为3840*2160；修改主界面的魔墙颜色；
|
2023-02-09 14:10:01 +08:00 |
|
shefengchun
|
e095bcb9fb
|
修改ui
|
2023-02-09 11:12:11 +08:00 |
|
shefengchun
|
73b1a2bc05
|
修复错误 完成合并
|
2023-02-09 10:26:14 +08:00 |
|
shefengchun
|
34aba5bcf4
|
修复四点校正重置错误的问题
|
2023-02-09 10:17:41 +08:00 |
|
ljqing
|
fa0194d4b9
|
修改id
|
2023-02-09 09:50:54 +08:00 |
|
ljqing
|
0e413d7aee
|
融合代码调整
|
2023-02-09 09:28:10 +08:00 |
|
shefengchun
|
b00fb02efb
|
修复切换投影仪时发送数据
|
2023-02-08 17:51:10 +08:00 |
|
shefengchun
|
063d9d8652
|
修复4点校正先拖动在使用键盘移动时位置不对
|
2023-02-08 15:33:12 +08:00 |
|
shefengchun
|
c7eb71ee72
|
加入对4点校正的键盘支持
|
2023-02-08 15:20:20 +08:00 |
|
miao
|
71bb5d58e7
|
魔墙：添加更新通知
|
2023-02-08 09:08:01 +08:00 |
|
shefengchun
|
f6dd438627
|
使用其他插件重写疏密校正
|
2023-02-07 16:59:58 +08:00 |
|
miao
|
b58ad2a4fd
|
魔墙：添加更新通知
|
2023-02-07 14:59:33 +08:00 |
|
shefengchun
|
5addd49c3a
|
修复界面切换不保存bug
|
2023-02-07 09:31:58 +08:00 |
|
shefengchun
|
263c2acbc1
|
修复切换界面时发送选中点
|
2023-02-06 15:07:31 +08:00 |
|
shefengchun
|
7141313c8c
|
优化ui界面
|
2023-02-06 10:49:55 +08:00 |
|
shefengchun
|
93c3a89a6d
|
加入 选择投影机 选择调节页面 选择控制点
|
2023-02-03 20:05:10 +08:00 |
|
shefengchun
|
a9f61b1651
|
修复 融合参数在界面关闭后再次打开数据不正确
|
2023-02-03 19:01:51 +08:00 |
|
shefengchun
|
fed77c3e81
|
修复调试页面切换时数据重置
|
2023-02-03 17:21:36 +08:00 |
|
miao
|
2ca40619d5
|
魔墙：添加栅格图按钮
|
2023-02-03 16:27:28 +08:00 |
|
shefengchun
|
b17435d0dd
|
修复九点校正分辨率数据从服务端获取
|
2023-02-03 14:00:18 +08:00 |
|
shefengchun
|
17b91ca8ee
|
允许9点校正7-9点为负数
|
2023-02-03 13:49:06 +08:00 |
|
shefengchun
|
13d71b2a6b
|
修复疏密校正点不同步
|
2023-02-03 11:12:16 +08:00 |
|
shefengchun
|
08c19d630d
|
更新翻译 修复网格行判断
|
2023-02-03 10:37:22 +08:00 |
|
shefengchun
|
86834823b7
|
修复读取场景时的bug
|
2023-02-03 09:55:28 +08:00 |
|
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 |
|
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 |
|
shefengchun
|
e9f0be2607
|
修复计算错误
|
2023-01-14 13:24:27 +08:00 |
|
shefengchun
|
97c52eabb2
|
增加是否隐藏桌面
|
2023-01-14 11:05:26 +08:00 |
|
shefengchun
|
bd8be8954a
|
修复指令下发时变成字符串的问题
|
2023-01-13 17:10:30 +08:00 |
|
shefengchun
|
e229f9acb3
|
Merge branch 'blending' of http://www.cloudview.work/git/fangxiang/media_player_client into blending
|
2023-01-13 16:47:59 +08:00 |
|
shefengchun
|
5ca7e6e495
|
规范代码
|
2023-01-13 16:46:00 +08:00 |
|
ljqing
|
652fb277df
|
增加设置融合选项接口
|
2023-01-13 16:34:05 +08:00 |
|
shefengchun
|
6d3a838cfa
|
修复数据索引错误
|
2023-01-13 16:33:20 +08:00 |
|
ljqing
|
998ef225fc
|
增加重置融合参数的接口
|
2023-01-13 11:50:00 +08:00 |
|
shefengchun
|
b58044d5b7
|
删除debug信息
|
2023-01-13 11:16:10 +08:00 |
|
shefengchun
|
b982b66a31
|
修复融合界面切换时数据不改变
|
2023-01-13 11:07:58 +08:00 |
|
shefengchun
|
ff63d3dc67
|
优化窗口大小更改时逻辑
|
2023-01-13 09:27:00 +08:00 |
|
miao
|
a20a1c916c
|
魔墙：打开及时更新
|
2023-01-13 08:57:39 +08:00 |
|
shefengchun
|
4d967cb4ae
|
增加窗口大小变化跟随
|
2023-01-12 16:34:48 +08:00 |
|
shefengchun
|
2a74a78e99
|
修复逻辑错误
|
2023-01-12 16:06:00 +08:00 |
|
shefengchun
|
9545a4c45d
|
完成接口对接 及一些小细节
|
2023-01-12 11:37:40 +08:00 |
|
fangxiang
|
a81b7bbbc4
|
修复无界eventBus类型错误的问题
|
2023-01-11 16:26:12 +08:00 |
|
miao
|
e38899754e
|
魔墙：添加对齐
|
2023-01-11 15:52:05 +08:00 |
|
ljqing
|
4ec209def6
|
修改类名错误的问题
|
2023-01-11 10:53:05 +08:00 |
|
ljqing
|
6defd6ffad
|
修改命令字
|
2023-01-11 10:44:15 +08:00 |
|
miao
|
b64ba60922
|
魔墙：添加对齐
|
2023-01-10 15:19:01 +08:00 |
|
miao
|
d41b0843b1
|
魔墙：修复添加宽高后出现的bug
|
2023-01-10 08:49:46 +08:00 |
|
ljqing
|
a6a4a0860d
|
疏密调节接口
|
2023-01-09 16:51:15 +08:00 |
|
fangxiang
|
c44a2076f3
|
字幕默认字体强制设置为60pt
|
2023-01-07 16:52:03 +08:00 |
|
fangxiang
|
273a141823
|
更新Tinymce到6版本并增加wordcount插件显示字数。
增加服务端返回自定义标题功能
更新Quasar版本
更新英文翻译
|
2023-01-07 14:20:48 +08:00 |
|
fangxiang
|
b8319dee50
|
离线注册增加功能选项
|
2023-01-06 14:11:33 +08:00 |
|
fangxiang
|
089ce906d4
|
Merge branch 'wujie'
|
2023-01-06 13:59:19 +08:00 |
|
shefengchun
|
584f228c91
|
更改 命名
|
2023-01-06 12:14:17 +08:00 |
|
miao
|
cbdaa5ee92
|
魔墙：修复添加宽高后，控制台显示宽高不变
|
2023-01-06 11:29:50 +08:00 |
|
shefengchun
|
19c9dbe459
|
隐藏融合
|
2023-01-06 11:20:23 +08:00 |